fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG 15524 "Mantener el Idioma de la URL..." SOLVED

Browse Source 
- Mantener el Idioma de la URL al iniciar sesion
- Problema resuelto, al iniciar sesion con un determinado idioma en la url y cerrar sesion, al iniciar sesion nuevamente
  en el login el idioma se mantendra al idioma definido en la url, tambien se adiciona una opcion mas al guardar la configuracion
  del idioma cuya opcion es "Use the language of URL".
This commit is contained in:
Luis Fernando Saisa Lopez
2014-08-12 12:27:32 -04:00
parent ab5800fb48
commit 2d891371c4
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/class.system.php
View File

@@ -1138,7 +1138,7 @@ class System
@preg_match( $patt, $content, $match ); @preg_match( $patt, $content, $match );
if (is_array( $match ) && count( $match ) > 0 && isset( $match[1] )) { if (is_array( $match ) && count( $match ) > 0 && isset( $match[1] )) {
$newUrl = "sys/" . (($conf["lang"] != "")? $conf["lang"] : "en") . "/" . $conf["skin"] . "/login/login"; $newUrl = "sys/" . (($conf["lang"] != "")? $conf["lang"] : ((defined("SYS_LANG") && SYS_LANG != "")? SYS_LANG : "en")) . "/" . $conf["skin"] . "/login/login";
$newMetaStr = str_replace( $match[1], $newUrl, $match[0] ); $newMetaStr = str_replace( $match[1], $newUrl, $match[0] );
$newContent = str_replace( $match[0], $newMetaStr, $content ); $newContent = str_replace( $match[0], $newMetaStr, $content );

2
workflow/engine/controllers/adminProxy.php
View File

@@ -119,7 +119,7 @@ class adminProxy extends HttpProxyController
$this->success = true; $this->success = true;
$this->restart = $restart; $this->restart = $restart;
$this->url = "/sys" . SYS_SYS . "/" . (($sysConf["default_lang"] != "")? $sysConf["default_lang"] : "en") . "/" . $sysConf["default_skin"] . $urlPart; $this->url = "/sys" . SYS_SYS . "/" . (($sysConf["default_lang"] != "")? $sysConf["default_lang"] : ((defined("SYS_LANG") && SYS_LANG != "")? SYS_LANG : "en")) . "/" . $sysConf["default_skin"] . $urlPart;
$this->message = 'Saved Successfully'; $this->message = 'Saved Successfully';
} }

2
workflow/engine/methods/login/login.php
View File

@@ -155,7 +155,7 @@ $myUrl = explode("/", $_SERVER["REQUEST_URI"]);
if (isset($myUrl) && $myUrl != "") { if (isset($myUrl) && $myUrl != "") {
$aFields["USER_LANG"] = $myUrl[2]; $aFields["USER_LANG"] = $myUrl[2];
} else { } else {
$aFields["USER_LANG"] = isset($oConf->aConfig["login_defaultLanguage"])? $oConf->aConfig["login_defaultLanguage"] : "en"; $aFields["USER_LANG"] = isset($oConf->aConfig["login_defaultLanguage"])? $oConf->aConfig["login_defaultLanguage"] : SYS_LANG;
} }
$G_PUBLISH = new Publisher(); $G_PUBLISH = new Publisher();

2
workflow/public_html/bootstrap.php
View File

@@ -226,7 +226,7 @@
if (!file_exists(PATH_HTML . 'index.html')) { // if not, create it from template if (!file_exists(PATH_HTML . 'index.html')) { // if not, create it from template
file_put_contents( file_put_contents(
PATH_HTML . 'index.html', PATH_HTML . 'index.html',
G::parseTemplate(PATH_TPL . "index.html", array("lang" => ((SYS_LANG != "")? SYS_LANG : "en"), "skin" => SYS_SKIN)) G::parseTemplate(PATH_TPL . "index.html", array("lang" => ((defined("SYS_LANG") && SYS_LANG != "")? SYS_LANG : "en"), "skin" => SYS_SKIN))
); );
} }

2
workflow/public_html/sysGeneric.php
View File

@@ -478,7 +478,7 @@ if (Bootstrap::isPMUnderUpdating()) {
// verify if index.html exists // verify if index.html exists
if (! file_exists( PATH_HTML . 'index.html' )) { // if not, create it from template if (! file_exists( PATH_HTML . 'index.html' )) { // if not, create it from template
file_put_contents( PATH_HTML . "index.html", Bootstrap::parseTemplate( PATH_TPL . "index.html", array ("lang" => ((SYS_LANG != "")? SYS_LANG : "en"), "skin" => SYS_SKIN file_put_contents( PATH_HTML . "index.html", Bootstrap::parseTemplate( PATH_TPL . "index.html", array ("lang" => ((defined("SYS_LANG") && SYS_LANG != "")? SYS_LANG : "en"), "skin" => SYS_SKIN
) ) ); ) ) );
} }