From 0f22c97c6ea701dcdb6fc86fd0a1843cbbbbd699 Mon Sep 17 00:00:00 2001 From: fSerny Date: Wed, 29 Feb 2012 10:29:12 +0000 Subject: [PATCH] [-] BO : AdminModule shows when connected to Addons and have a logout button git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13731 b9a71923-0436-4b27-9f14-aed3839534dd --- .../themes/default/img/module-logout.png | Bin 0 -> 1481 bytes .../themes/default/img/module-profile.png | Bin 0 -> 1538 bytes .../template/controllers/modules/filters.tpl | 20 +++++++- .../template/controllers/modules/js.tpl | 43 +++++++++++++++++- controllers/admin/AdminModulesController.php | 10 ++++ 5 files changed, 70 insertions(+), 3 deletions(-) create mode 100755 admin-dev/themes/default/img/module-logout.png create mode 100755 admin-dev/themes/default/img/module-profile.png diff --git a/admin-dev/themes/default/img/module-logout.png b/admin-dev/themes/default/img/module-logout.png new file mode 100755 index 0000000000000000000000000000000000000000..7a9647dcee7df7f7b2512bb163bc360133eee178 GIT binary patch literal 1481 zcmV;)1vdJLP)2000B4Tx04R}-Ro!pfR1`mnZ(O7nKcKOW4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW z$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj_Ok5(v`JGz71bo9J#^YYXp{DWs&KBa zQ@dTpxRI}aIp=pi@6k0t$5)!;m`NF6-tt{FpOKHBn3g+MAqmexC-gw4rh87hTrL7G z#)U`L!(So6-Zux@>;H3gR;i~0B%VTSS3P|m@o9jRsXML@Al^p#@G0Lx-0?i(9WEw_ zSYddU<1E8793KxjQ|c&UmW!mTC>k>?{om1c9S zUx<6_jj_!T&^M{wWM#>IBbOSf*xP<^F{$j$aOQ5Y{cT zROCL1M7^NKKL z&(yA}mSw#iM0^;IB{ZO5!wl{^Sg-*ysE~&Yz8!E;Qv(A`lu*=Clo*MpVGd>OdF6n^ zam1Jntk;<}MrqIC5$=Q>n{*R}?8oOIDUw5En2dl--Xw34!z7E+5pr-OgyQ-soSab)C%saskMla`aQLVzg0+MZf20tJU&K{hZoBrUc+U4e9&3o zw|KmGEe4#xz17wBu{f`SS_4i66?j31EjY7n{zGfhONK~c+td!TS#B}JoR}5UAd7p& z5phTyXSkK0xCeD3xaYP^o&J~#Xp9xFb0C;HHml5fA<%h1eR|qw7wxF+oNL9T1Aits?sKNIwvGaN)^WO$I^cUV)HzL_| z1K?{9p!>B*)`xfEv!4N6IG{J&h49W#Bz^(#YWw%`e_a{8n{G9m5AeR~_yl0%<7V@p z(*wC^Q({eNm&S%7 zkOqhB1Lz=>*$dW10_kIj(x5e%pyZGrpcgO*A@jm@3v2Zb(NM!RaIGQkCCQstDEe>D zIsfMe&w0){BTvtrcYax;zYY9aA=9_1h@qwD%`(1aXARTYE~%y@lfe8%fT z2!X09B;=TVXfB&U)7l6jNTqWG0zoqu2n0!`a|j{Ov^KeH#vb&#dIiAtj%?O06pj!I zM*xtdIktD?9`9H6{rzSCJVFT0FKd0DXJ~cBPq*9s))AI9^-N9w2n2AsCi=!Lp^pzO z%io31?$ETheW-6%0-$_au!I^p!#fbVu@MKLa#p5P%zw+5ig_w$S&nI`n5S@Z z41m+=VqtL!fX3Y|udgov#5Uust#8?f0#vIP9Aytph#{xb#jd>H)4#T%hK%{2bh~l8 jJ%jA_x70BDlO_ED^vRe!Q;&OS00000NkvXXu0mjff)Uo? literal 0 HcmV?d00001 diff --git a/admin-dev/themes/default/img/module-profile.png b/admin-dev/themes/default/img/module-profile.png new file mode 100755 index 0000000000000000000000000000000000000000..b15ad4b91d810ed094cb1ae2ae37db9e98f95fd9 GIT binary patch literal 1538 zcmV+d2L1VoP)2000B4Tx04R}-Ro!pfR1`mnZ(O7nKcKOW4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW z$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj_Ok5(v`JGz71bo9J#^YYXp{DWs&KBa zQ@dTpxRI}aIp=pi@6k0t$5)!;m`NF6-tt{FpOKHBn3g+MAqmexC-gw4rh87hTrL7G z#)U`L!(So6-Zux@>;H3gR;i~0B%VTSS3P|m@o9jRsXML@Al^p#@G0Lx-0?i(9WEw_ zSYddU<1E8793KxjQ|c&UmW!mTC>k>?{om1c9S zUx<6_jj_!T&^M{wWM#>IBbOSf*xP<^F{$j$aOQ5Y{cT zROCL1M7^NKKL z&(yA}mSw#iM0^;IB{ZO5!wl{^Sg-*ysE~&Yz8!E;Qv(A`lu*=Clo*MpVGd>OdF6n^ zam1Jntk;<}MrqIC5$=Q>n{*R}?8oOIDUw5En2dl--Xw34!z7E+5pr-OgyQ-soSab)C%saskMla`aQLVzg0+MZf20tJU&K{hZoBrUc+U4e9&3o zw|KmGEe4#xz17wBu{f`SS_4i66?j31EjY7n{zGfhONK~c+td!TS#B}JoR}5UAd7p& z5phTyXSkK0xCeD3xaYP^o&J~#Xp9xFb0C;HHml5fA<%h1eR|qw7wxF+oNL9T1Aits?sKNIwvGaN)^WO$I^cUV)HzL_| z1K?{9p!>B*)`xfEv!4N6IG{J&h49W#Bz^(#YWw%`e_a{8n{G9m5AeR~_yl0%<7V@p zd7BPz( z!mcI(zulWR^O^U)^G2+H>1OP+!FmQR;wYU#2CZC`@KQ6 zmIxv8SO|fTqU6M1K;!rzqw#2AEeOKBL9-0b&&-fz+3z@`UO!t2t$h9ApwFq3lK@0f zMDz6$)(&@HDL_q)Am!$^ZnsOC+R92Rp(`uPq{-&MJLh;fd%qI8WBcoCYs}9-;{Cg~ ztge103myMVVT>vFObC=xD5Vfm&}w}s +
+ +

{l s='You are logged on PrestaShop Addons'}

+ +
+ + + +
+ +
+ + + {else} {if $check_url_fopen eq 'ko' OR $check_openssl eq 'ko'} @@ -45,7 +61,7 @@ - +
diff --git a/admin-dev/themes/default/template/controllers/modules/js.tpl b/admin-dev/themes/default/template/controllers/modules/js.tpl index b85d37424..953b80176 100644 --- a/admin-dev/themes/default/template/controllers/modules/js.tpl +++ b/admin-dev/themes/default/template/controllers/modules/js.tpl @@ -35,7 +35,7 @@ var dirNameCurrentIndex = '{$dirNameCurrentIndex}'; var ajaxCurrentIndex = '{$ajaxCurrentIndex}'; var by = '{l s='by'}'; - var errorLogin = '{l s='Could not login to Addons'}'; + var errorLogin = '{l s='Could not login to Addons, please check your credentials and your internet connection.'}'; var confirmPreferencesSaved = '{l s='Preferences saved'}'; {if isset($smarty.get.anchor)}var anchor = '{$smarty.get.anchor|htmlentities|replace:'(':''|replace:')':''|replace:'{':''|replace:'}':''|replace:'\'':''|replace:'/':''}';{else}var anchor = '';{/if} @@ -233,6 +233,47 @@ }); + // Method to log out PrestaShop Addons WebServices + $('#addons_logout_button').click(function() + { + try + { + resAjax = $.ajax({ + type:"POST", + url : ajaxCurrentIndex, + async: true, + data : { + ajax : "1", + token : token, + controller : "AdminModules", + action : "logOutAddonsWebservices" + }, + beforeSend: function(xhr) + { + $('#addons_loading').html(''); + }, + success : function(data) + { + // res.status = cache or refresh + if (data == 'OK') + { + $('#addons_loading').html(''); + $('#addons_login_div').fadeOut(); + window.location.href = window.location.href; + } + else + $('#addons_loading').html(errorLogin); + }, + error: function(res,textStatus,jqXHR) + { + //jAlert("TECHNICAL ERROR"+res); + } + }); + } + catch(e){} + return false; + }); + // Method to set filter on modules function setFilter() diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php index 99b64a176..f8d5b14d4 100644 --- a/controllers/admin/AdminModulesController.php +++ b/controllers/admin/AdminModulesController.php @@ -289,6 +289,13 @@ class AdminModulesControllerCore extends AdminController die($result); } + public function ajaxProcessLogOutAddonsWebservices() + { + $this->context->cookie->username_addons = ''; + $this->context->cookie->password_addons = ''; + die('OK'); + } + public function ajaxProcessReloadModulesList() { if (Tools::getValue('filterCategory')) @@ -1084,7 +1091,10 @@ class AdminModulesControllerCore extends AdminController $tpl_vars['check_openssl'] = (extension_loaded('openssl') ? 'ok' : 'ko'); if ($this->logged_on_addons) + { $tpl_vars['logged_on_addons'] = 1; + $tpl_vars['username_addons'] = $this->context->cookie->username_addons; + } $smarty->assign($tpl_vars); }