diff --git a/application/modules/default/views/scripts/partials/header/template.phtml b/application/modules/default/views/scripts/partials/header/template.phtml index 032ba4ac4..741e32f92 100644 --- a/application/modules/default/views/scripts/partials/header/template.phtml +++ b/application/modules/default/views/scripts/partials/header/template.phtml @@ -1,439 +1,443 @@ . **/ $helperFetchCategory = new Default_View_Helper_CatTitle(); $helperFetchCatParent = new Default_View_Helper_CatParent(); $getAuthUser = new Default_View_Helper_GetAuthUser(); $helperBuildMemberUrl = new Default_View_Helper_BuildMemberUrl(); $helperBuildBaseUrl = new Default_View_Helper_BuildBaseUrl(); $helperImage = new Default_View_Helper_Image(); $auth = Zend_Auth::getInstance(); $member = $getAuthUser->getAuthUser(); $phash = null; $ltat = null; if ($auth->hasIdentity()) { $sess = new Zend_Session_Namespace('ocs_meta'); $phash = $sess->phash; $ltat = $sess->openid; } $jsonmember = null; if($member && !empty($member->username)){ $jsonmember=array( 'member_id' => $member->member_id, 'username' => $member->username, 'avatar' => $member->avatar, 'profile_image_url' => $member->profile_image_url ); } $serverUrl = $this->serverUrl(); //$baseurl = Zend_Registry::get('config')->settings->client->default->baseurl; $baseurl = $helperBuildBaseUrl->buildBaserUrl(); $searchbaseurl = $this->buildSearchBaseUrl(); $sname = Zend_Registry::get('store_host'); $store_config = Zend_Registry::get('store_config'); $store_order = $store_config->order; $store_name = $store_config->name; $is_show_title = $store_config->is_show_title; $last_char_store_order = substr($store_order, -1); $url_forum = Zend_Registry::get('config')->settings->client->default->url_forum; $url_gitlab = Zend_Registry::get('config')->settings->client->default->url_gitlab; $url_blog = Zend_Registry::get('config')->settings->client->default->url_blog; $config_domain = $config = Zend_Registry::get('config')->settings->domain; $url_openid = $config_domain->openid->host; /** @var Zend_Controller_Request_Http $request */ $request = Zend_Controller_Front::getInstance()->getRequest(); $http_scheme = $request->getScheme(); $json_menu = $this->fetchMetaheaderMenuJson(); $filter = new Local_Filter_Url_Encrypt(); -$thisurl = $helperBuildBaseUrl->buildBaserUrl(); +//$thisurl = $helperBuildBaseUrl->buildBaserUrl(); +$thisurl = "/"; +if(isset($_GET['url'])) { + $thisurl = $_GET['url']; +} $url_logout = "/logout?redirect=".$filter->filter($thisurl); $url_login = "/logint?redirect=".$filter->filter($thisurl); $cat_title = $helperFetchCategory->catTitle($this->cat_id); $category_id = $this->cat_id; $category_id_parent = $helperFetchCatParent->getCatParentId(array('project_category_id' => $category_id)); $cat_title_length = strlen($cat_title); //check logo-width: $logoWidth = (int)$this->template['header-logo']['width']; $cat_title_left = $logoWidth+60; $tabs_left = (int)$this->template['header-nav-tabs']['absolute-left']; $tabs_left += $cat_title_length*10; //$idCat = Zend_Registry::isRegistered('store_category_list') ? Zend_Registry::get('store_category_list') : null; //$helperUserRole = new Backend_View_Helper_UserRole(); //$userRoleName = $helperUserRole->userRole(); //$forum_url_postfix = Zend_Auth::getInstance()->hasIdentity() ? '/session/sso' : ''; echo $this->render('partials/header/metaheader.phtml'); ?>
hasIdentity() && empty($member->username)) { $helperEncryptUrl = new Default_View_Helper_EncryptUrl(); $redirectString = '/redirect/' . $helperEncryptUrl->EncryptUrl(Zend_Controller_Front::getInstance()->getRequest()->getScheme() . '://' . Zend_Controller_Front::getInstance()->getRequest()->getHttpHost().$_SERVER["REQUEST_URI"]); ?>
cat_id) ? $this->cat_id : 'all' ?>/order/latest"> *//*?>
*/?>
inlineScript()->appendScript( '$(document).ready(function(){ MenuHover.setup(); Popuppanel.setup(); LoginContainer.update(); PlingsRedirect.setup(); });' ); diff --git a/application/modules/default/views/scripts/partials/header/template_react.phtml b/application/modules/default/views/scripts/partials/header/template_react.phtml index c5633a99d..f2d76cdfd 100755 --- a/application/modules/default/views/scripts/partials/header/template_react.phtml +++ b/application/modules/default/views/scripts/partials/header/template_react.phtml @@ -1,243 +1,247 @@ . **/ $helperBuildBaseUrl = new Default_View_Helper_BuildBaseUrl(); //$baseurl = Zend_Registry::get('config')->settings->client->default->baseurl; $baseurl = $helperBuildBaseUrl->buildBaserUrl(); $sname = Zend_Registry::get('store_host'); $store_config = Zend_Registry::get('store_config'); $getAuthUser = new Default_View_Helper_GetAuthUser(); $helperBuildMemberUrl = new Default_View_Helper_BuildMemberUrl(); $helperImage = new Default_View_Helper_Image(); $auth = Zend_Auth::getInstance(); $member = $getAuthUser->getAuthUser(); $serverUrl = $this->serverUrl(); $store_order = $store_config->order; $store_name = $store_config->name; $is_show_title = $store_config->is_show_title; $last_char_store_order = substr($store_order, -1); $helperFetchCategory = new Default_View_Helper_CatTitle(); $cat_title = $helperFetchCategory->catTitle($this->cat_id); $cat_title_length = strlen($cat_title); //check logo-width: $logoWidth = (int)$this->template['header-logo']['width']; $cat_title_left = $logoWidth+60; $tabs_left = (int)$this->template['header-nav-tabs']['absolute-left']; $tabs_left += $cat_title_length*10; $filter = new Local_Filter_Url_Encrypt(); -$thisurl = $helperBuildBaseUrl->buildBaserUrl(); +//$thisurl = $helperBuildBaseUrl->buildBaserUrl(); +$thisurl = "/"; +if(isset($_GET['url'])) { + $thisurl = $_GET['url']; +} $url_logout = "/logout?redirect=".$filter->filter($thisurl); ?> render('partials/header/metaheader_react.phtml'); ?>
hasIdentity() && empty($member->username)) { $helperEncryptUrl = new Default_View_Helper_EncryptUrl(); $redirectString = '/redirect/' . $helperEncryptUrl->EncryptUrl(Zend_Controller_Front::getInstance()->getRequest()->getScheme() . '://' . Zend_Controller_Front::getInstance()->getRequest()->getHttpHost().$_SERVER["REQUEST_URI"]); ?>
cat_id) ? $this->cat_id : 'all' ?>/order/latest"> */?>
inlineScript()->appendScript( ' $(document).ready(function(){ MenuHover.setup(); Popuppanel.setup(); LoginContainer.update(); PlingsRedirect.setup(); }); ');