fernando/luos
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of git://github.com/colosa/processmaker into BUG-15394

Browse Source
This commit is contained in:
Luis Fernando Saisa Lopez
2014-08-13 11:48:42 -04:00
parent 713b39d29d a18722b573
commit ff9d101692
7 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -682,14 +682,14 @@ class System
return System::getSchema( PATH_TRUNK . "workflow/engine/config/schema.xml" );
}
/**
* Retrieves the system schema rbac.
*
* @return schema content in an array
*/
public static function getSystemSchemaRbac ()
{
return System::getSchema( PATH_TRUNK . "rbac/engine/config/schema.xml" );
/**
* Retrieves the system schema rbac.
*
* @return schema content in an array
*/
public static function getSystemSchemaRbac ()
{
return System::getSchema( PATH_TRUNK . "rbac/engine/config/schema.xml" );
}
/**
@@ -1138,7 +1138,7 @@ class System
@preg_match( $patt, $content, $match );
if (is_array( $match ) && count( $match ) > 0 && isset( $match[1] )) {
$newUrl = 'sys/' . $conf['lang'] . '/' . $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] );
$newContent = str_replace( $match[0], $newMetaStr, $content );

1
workflow/engine/controllers/admin.php
View File

@@ -30,6 +30,7 @@ class Admin extends Controller
$timeZonesList = array_keys( $timeZonesList );
$mainController = new Main();
$languagesList = $mainController->getLanguagesList();
$languagesList[] = array ("", G::LoadTranslation("ID_USE_LANGUAGE_URL"));
$sysConf = System::getSystemConfiguration( PATH_CONFIG . 'env.ini' );
foreach ($skinsList['skins'] as $skin) {

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

@@ -119,7 +119,7 @@ class adminProxy extends HttpProxyController
$this->success = true;
$this->restart = $restart;
$this->url = '/sys' . SYS_SYS . '/' . $sysConf['default_lang'] . '/' . $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';
}

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

@@ -149,9 +149,14 @@ G::LoadClass('configuration');
$oConf = new Configurations();
$oConf->loadConfig($obj, 'ENVIRONMENT_SETTINGS', '');
$aFields['USER_LANG'] = isset($oConf->aConfig['login_defaultLanguage'])
? $oConf->aConfig['login_defaultLanguage']
: 'en';
$myUrl = explode("/", $_SERVER["REQUEST_URI"]);
if (isset($myUrl) && $myUrl != "") {
$aFields["USER_LANG"] = $myUrl[2];
} else {
$aFields["USER_LANG"] = isset($oConf->aConfig["login_defaultLanguage"])? $oConf->aConfig["login_defaultLanguage"] : SYS_LANG;
}
$G_PUBLISH = new Publisher();
$G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/login', '', $aFields, SYS_URI . 'login/authentication.php');

2
workflow/engine/methods/setup/loginSettingsAjax.php
View File

@@ -14,6 +14,8 @@ switch ($request) {
);
}
$result->rows[] = array ("LAN_ID" => "", "LAN_NAME" => G::LoadTranslation("ID_USE_LANGUAGE_URL"));
print (G::json_encode( $result )) ;
break;
case 'saveSettings':

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
file_put_contents(
PATH_HTML . 'index.html',
G::parseTemplate(PATH_TPL . 'index.html', array('lang' => SYS_LANG, '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
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,'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
) ) );
}