From 351df843a93f2a6b0c78025e96f3156f78c49f91 Mon Sep 17 00:00:00 2001 From: paritshivani <58217306+paritshivani@users.noreply.github.com> Date: Wed, 26 Feb 2020 10:22:42 +0530 Subject: [PATCH] =?UTF-8?q?Bug=20#36:=20Frontend=20-=20Notice=20displayed?= =?UTF-8?q?=20to=20users=20above=20Terms=20and=20con=E2=80=A6=20(#37)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Bug #157922: Frontend - Notice displayed to users above Terms and condition * Bug #157922 fix: Frontend - Notice displayed to users above Terms and condition * Bug #157922 fix: Frontend - Notice displayed to users above Terms and condition * Bug #157922 fix: Frontend - Notice displayed to users above Terms and condition * Bug #157922 fix: Frontend - Notice displayed to users above Terms and condition --- src/pkg_tc.xml | 4 ++-- .../language/en-GB/en-GB.plug_system_tc.ini | 5 ----- .../language/en-GB/en-GB.plug_system_tc.sys.ini | 2 -- .../system/plug_system_tc/plug_system_tc.zip | Bin 3259 -> 0 bytes .../tc/language/en-GB/en-GB.plg_system_tc.ini | 5 +++++ .../language/en-GB/en-GB.plg_system_tc.sys.ini | 2 ++ .../plug_system_tc.php => tc/tc.php} | 11 +++++++++-- .../plug_system_tc.xml => tc/tc.xml} | 10 +++++----- src/script.pkg_tc.php | 2 +- 9 files changed, 24 insertions(+), 17 deletions(-) delete mode 100755 src/plugins/system/plug_system_tc/language/en-GB/en-GB.plug_system_tc.ini delete mode 100755 src/plugins/system/plug_system_tc/language/en-GB/en-GB.plug_system_tc.sys.ini delete mode 100644 src/plugins/system/plug_system_tc/plug_system_tc.zip create mode 100755 src/plugins/system/tc/language/en-GB/en-GB.plg_system_tc.ini create mode 100755 src/plugins/system/tc/language/en-GB/en-GB.plg_system_tc.sys.ini rename src/plugins/system/{plug_system_tc/plug_system_tc.php => tc/tc.php} (92%) rename src/plugins/system/{plug_system_tc/plug_system_tc.xml => tc/tc.xml} (66%) diff --git a/src/pkg_tc.xml b/src/pkg_tc.xml index 2e620eb..da3784b 100755 --- a/src/pkg_tc.xml +++ b/src/pkg_tc.xml @@ -20,9 +20,9 @@ components/com_tc.zip - plugins/system/plug_system_tc.zip + plugins/system/tc.zip - + diff --git a/src/plugins/system/plug_system_tc/language/en-GB/en-GB.plug_system_tc.ini b/src/plugins/system/plug_system_tc/language/en-GB/en-GB.plug_system_tc.ini deleted file mode 100755 index c0db8d3..0000000 --- a/src/plugins/system/plug_system_tc/language/en-GB/en-GB.plug_system_tc.ini +++ /dev/null @@ -1,5 +0,0 @@ -PLUG_SYSTEM_TC="Terms & conditions" -PLUG_SYSTEM_TC_DESC="This is system plug-in will work on after load page URL for T and C accept to user if system administrator has created T and C for that loaded page." -PLG_USER_TC_LBL_VERSION_NUMBER="Version no" -PLG_USER_TC_DESC_VERSION_NUMBER="Version no should be unique" -PLUG_SYSTEM_TC_TERMS_AND_CONDITIONS_MSG="Please accept following 'Terms and Conditions' to continue" \ No newline at end of file diff --git a/src/plugins/system/plug_system_tc/language/en-GB/en-GB.plug_system_tc.sys.ini b/src/plugins/system/plug_system_tc/language/en-GB/en-GB.plug_system_tc.sys.ini deleted file mode 100755 index 7f6a968..0000000 --- a/src/plugins/system/plug_system_tc/language/en-GB/en-GB.plug_system_tc.sys.ini +++ /dev/null @@ -1,2 +0,0 @@ -PLUG_SYSTEM_TC="Terms & conditions" -PLUG_SYSTEM_TC_DESC="This is system plug-in will work on after load page URL for T and C accept to user if system administrator has created T and C for that loaded page." diff --git a/src/plugins/system/plug_system_tc/plug_system_tc.zip b/src/plugins/system/plug_system_tc/plug_system_tc.zip deleted file mode 100644 index 84c0982e94513663c91211f3ab36ca6e24f3fcdb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3259 zcmbW32{=^y8^^~omZ`{2W1ow%HL_%c>?Xqy22IGC#;#`U)R22CWG1pkmiiC6x{@WO zT*^{WT*jVh80$1;4H18%>t46|KTrSrp65C5InQ~X&+m7>?|a_!wL!443j&zYjXq+t zb@Atk8z2qvcMtTzx%+q@MA`2Fa27|Zx{~vaUCF0luDI}B02cNsHUMDjWb+pWo@Vk7 z4DU{icc6;7(HB^UA8ZT8%-@A^0k{CBJ75MZ0D!``uq~u&us_b{)VYXrSnq&SSWi_< zAZBaFFE-&Sw~bwy`Kv`@QVcDgK}8dm;=;nQRAdk|N9?II)(kVi;wYnap46aG@?47J z^>`yB0@%d|bm0nGd7QGOKRhfo9e9UU%0ZEBZ}8vk;0#h8d~1h`m<8L`7^%|E z2w42#=aCJ46kS&>sX!M;%IHJFC-DawfdNoDq`=R2w@hKeM-K4h6H-4_V~{X%5tP%z2Ox(wWnh6VV zcH|sA9W9|B@Znt`bueXkP&(7FM!A9R1Z@PJJ2;oVWM^>|s$bca2-X&|5Orwuj!9Gq z7Pj{3k6}%!^g@bO1Rl;|XgQy0z0EhoGV1I!=sWJAe7*HPRzrJz@j=GjRFtYI$JF)m zSMc{Hl2u)ck5A7dkxBv1>CMV56@opfG^t|~wV*qSy9ux)-<1_P^5vZLvMXX*LZZuv zeW(*6woSZJ$Cc@|zYoxa{auK7dmwcGZCri}v`&d6+%=)f(L`*|?Fsc8w0nj) zt#Vz@J{Kyy2k_(t7xckGU;ELVWJQ~sZVsaGcv(!FF$>AP(cTs02D+%$s@$uXA;V?A z@WNc*<=3fuy#ObKe@v9QX&lwWRdwzZ25MBc~W(BMBz45jad;n_rQNKXyuVs#RN-1ua$7el?n2|Z$1Qr1UTPTF&;G>ao`T9Z(TZwTx=WyBQ2^CLU%$Z2 z*6!A8r^3n0lDf^}AmWnHvXIm=W72O#49X2H*?%cW^L;8&{tu3fH`Lcf@2w|3C$2Bflpa|d z1EC4kA-oP~_be5?tKvb{ou0=ig2*&KY9LatJj2dyVj)-_)GU?9k@+#s>LK?OA*u>) zB#T0gwywFnbUy)q?m6|Mm;b&gZx;)WlSA`uQpm_t@6}{wvj)QTVoNl z587<@4F<;ItEfyic$n=?LreVG$rNM4%aDu|4U3B-T)4~OE^{wm<;jt`t|&sm_#fq*i3ik~ zWpeTbwXbT!A;d2ODR*LW%u5M zw6_)dJyuXhBmCUeByV}erPE{m!Id%-A5!io)LJei4MoH&*o`l<*T|A7`iy(?E5uw_ zU(z@}lXj|oT!1zig3&r9`rPT2<1cfICvIpORp_e4X!cmE$71q^#fuDPN=I+QvX`hE zgXSB>H6^(9BKfDip7RHplaw$sCq2y$05Ip}-;>m7$0XI;bO+y=q~QVnTa$G5&wmLs ze>F*S?Op~BLig(So-&;2mQ)@%(7_ID62$FhGqq(ekC{9sy+7N-kjQ?FJWB~H$>^#i zx!#Itd-dMeVPXBY=48h1<3~=8;O;fT(Ny06)a6H5^e{E5I)6^?SdN^-X6x%s-S+?AI_Ok3}TB(b%^DN~z)9EMEp4TVS9BD(* zgJ%Q!>H^oUjk|-W1DJdkEk}uXcPoo^b(x9z+T}1S4#R{_)(2yLbrmkuI9X3c{;~GC z|2PR*vEo80DPBu!a1vHt4CN**DwoPOi#Fq{e0?)s@2F%LdA()5Jf@T!1%$a0 A&Hw-a diff --git a/src/plugins/system/tc/language/en-GB/en-GB.plg_system_tc.ini b/src/plugins/system/tc/language/en-GB/en-GB.plg_system_tc.ini new file mode 100755 index 0000000..91d8302 --- /dev/null +++ b/src/plugins/system/tc/language/en-GB/en-GB.plg_system_tc.ini @@ -0,0 +1,5 @@ +PLG_SYSTEM_TC="Terms & conditions" +PLG_SYSTEM_TC_DESC="This is system plug-in will work on after load page URL for T and C accept to user if system administrator has created T and C for that loaded page." +PLG_USER_TC_LBL_VERSION_NUMBER="Version no" +PLG_USER_TC_DESC_VERSION_NUMBER="Version no should be unique" +PLG_SYSTEM_TC_TERMS_AND_CONDITIONS_MSG="Please accept following 'Terms and Conditions' to continue" diff --git a/src/plugins/system/tc/language/en-GB/en-GB.plg_system_tc.sys.ini b/src/plugins/system/tc/language/en-GB/en-GB.plg_system_tc.sys.ini new file mode 100755 index 0000000..c22355b --- /dev/null +++ b/src/plugins/system/tc/language/en-GB/en-GB.plg_system_tc.sys.ini @@ -0,0 +1,2 @@ +PLG_SYSTEM_TC="Terms & conditions" +PLG_SYSTEM_TC_DESC="This is system plug-in will work on after load page URL for T and C accept to user if system administrator has created T and C for that loaded page." diff --git a/src/plugins/system/plug_system_tc/plug_system_tc.php b/src/plugins/system/tc/tc.php similarity index 92% rename from src/plugins/system/plug_system_tc/plug_system_tc.php rename to src/plugins/system/tc/tc.php index 3b33b3c..6fd29a0 100755 --- a/src/plugins/system/plug_system_tc/plug_system_tc.php +++ b/src/plugins/system/tc/tc.php @@ -20,10 +20,17 @@ * * @since 1.0.0 */ -class PlgSystemplug_System_Tc extends JPlugin +class PlgSystemTc extends JPlugin { public $app; + /** + * Load plugin language file automatically so that it can be used inside component + * + * @var boolean + * @since 2.3.4 + */ + protected $autoloadLanguage = true; /** * Method to handle an error condition. * @@ -94,7 +101,7 @@ public function onAfterRoute() $tc_url = 'index.php?option=com_tc&view=content&tc_id='; // Redirect to Terms and condtitions view - $this->app->redirect(JRoute::_(JURI::root() . $tc_url . $getGlobalTCAcceptIdList[$i]->tc_id . '&return=' . $url, false), JText::_('PLUG_SYSTEM_TC_TERMS_AND_CONDITIONS_MSG'), 'Notice'); + $this->app->redirect(JRoute::_(JURI::root() . $tc_url . $getGlobalTCAcceptIdList[$i]->tc_id . '&return=' . $url, false), JText::_('PLG_SYSTEM_TC_TERMS_AND_CONDITIONS_MSG'), 'Notice'); } } } diff --git a/src/plugins/system/plug_system_tc/plug_system_tc.xml b/src/plugins/system/tc/tc.xml similarity index 66% rename from src/plugins/system/plug_system_tc/plug_system_tc.xml rename to src/plugins/system/tc/tc.xml index b7f79ff..a16339b 100755 --- a/src/plugins/system/plug_system_tc/plug_system_tc.xml +++ b/src/plugins/system/tc/tc.xml @@ -1,6 +1,6 @@ - plug_system_tc + plg_system_tc Techjoomla March 2017 Copyright(C)2016-17 TechJoomla @@ -8,13 +8,13 @@ http://www.techjoomla.com http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL 1.0 - PLUG_SYSTEM_TC_DESC + PLG_SYSTEM_TC_DESC - plug_system_tc.php + tc.php - en-GB/en-GB.plug_system_tc.ini - en-GB/en-GB.plug_system_tc.sys.ini + en-GB/en-GB.plg_system_tc.ini + en-GB/en-GB.plg_system_tc.sys.ini diff --git a/src/script.pkg_tc.php b/src/script.pkg_tc.php index 0bf0cd6..bf7077e 100644 --- a/src/script.pkg_tc.php +++ b/src/script.pkg_tc.php @@ -38,7 +38,7 @@ class Pkg_TcInstallerScript extends TJInstaller // Plugins => { (folder) => { (element) => (published) }* }* 'plugins' => array( 'system' => array( - 'plug_system_tc' => 1 + 'tc' => 1 ) ) )