HOR-3851
This commit is contained in:
@@ -393,7 +393,6 @@ class UsersProperties extends BaseUsersProperties
|
|||||||
$oConf = new Configurations();
|
$oConf = new Configurations();
|
||||||
$oConf->loadConfig( $x, 'USER_PREFERENCES', '', '', $_SESSION['USER_LOGGED'], '' );
|
$oConf->loadConfig( $x, 'USER_PREFERENCES', '', '', $_SESSION['USER_LOGGED'], '' );
|
||||||
|
|
||||||
//$baseUrl = '/sys' . config("system.workspace") . '/' . $this->lang . '/' . SYS_SKIN . '/';
|
|
||||||
if (isset($_COOKIE['workspaceSkin'])) {
|
if (isset($_COOKIE['workspaceSkin'])) {
|
||||||
$baseUrl = '/sys' . config("system.workspace") . '/' . $this->lang . '/' . $_COOKIE['workspaceSkin'] . '/';
|
$baseUrl = '/sys' . config("system.workspace") . '/' . $this->lang . '/' . $_COOKIE['workspaceSkin'] . '/';
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -81,8 +81,6 @@ class enterprisePlugin extends PMPlugin
|
|||||||
$js = "window.open(\"/sys" . config("system.workspace") . "/" . SYS_LANG . "/" . SYS_SKIN . "/setup/main?s=PLUGINS\", \"_top\", \"\");";
|
$js = "window.open(\"/sys" . config("system.workspace") . "/" . SYS_LANG . "/" . SYS_SKIN . "/setup/main?s=PLUGINS\", \"_top\", \"\");";
|
||||||
|
|
||||||
if (substr(SYS_SKIN, 0, 2) == "ux" && SYS_SKIN != "uxs") {
|
if (substr(SYS_SKIN, 0, 2) == "ux" && SYS_SKIN != "uxs") {
|
||||||
//$js = "parent.window.location.href = \"/sys" . config("system.workspace") . "/" . SYS_LANG . "/" . SYS_SKIN . "/setup/main_init?s=PLUGINS\";";
|
|
||||||
//$js = "window.location.href = \"/sys" . config("system.workspace") . "/" . SYS_LANG . "/" . SYS_SKIN . "/setup/pluginsImport\";";
|
|
||||||
$js = "window.open(\"/sys" . config("system.workspace") . "/" . SYS_LANG . "/" . SYS_SKIN . "/main\", \"_top\", \"\");";
|
$js = "window.open(\"/sys" . config("system.workspace") . "/" . SYS_LANG . "/" . SYS_SKIN . "/main\", \"_top\", \"\");";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -94,7 +94,6 @@ switch ($_POST['action']) {
|
|||||||
$_SESSION['_DBArray'] = $_DBArray;
|
$_SESSION['_DBArray'] = $_DBArray;
|
||||||
|
|
||||||
if (! isset( $_SESSION['END_POINT'] )) {
|
if (! isset( $_SESSION['END_POINT'] )) {
|
||||||
//$wsdl = 'http://'.$_SERVER['HTTP_HOST'].'/sys'.config("system.workspace"). '/'. SYS_LANG .'/classic/services/wsdl';
|
|
||||||
$wsdl = 'http://' . $_SERVER['HTTP_HOST'];
|
$wsdl = 'http://' . $_SERVER['HTTP_HOST'];
|
||||||
$workspace = config("system.workspace");
|
$workspace = config("system.workspace");
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -38,7 +38,6 @@ if (isset ( $_GET ['x'] )) {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (! isset ( $_SESSION ['END_POINT'] )) {
|
if (! isset ( $_SESSION ['END_POINT'] )) {
|
||||||
//$wsdl = 'http://'.$_SERVER['HTTP_HOST'].'/sys'.config("system.workspace").'/en/classic/services/wsdl';
|
|
||||||
$wsdl = 'http://' . $_SERVER ['HTTP_HOST'];
|
$wsdl = 'http://' . $_SERVER ['HTTP_HOST'];
|
||||||
$workspace = config("system.workspace");
|
$workspace = config("system.workspace");
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user