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

BUG 11603 "Please consider include 'special' pages..." SOLVED

Browse Source 
- Please consider include "special" pages layout to the SKIN.
- Problema resuelto, se han customizado las interfaces "error404" y "updating", ahora estan disponibles en los
  skins "neoclassic" y "classic". Se ha validado esta interfaz en los skins, de no existir los templates en un
  determinado skin, automaticamente utilizara el template del skin "classic".
* Available from version ProcessMaker-2.5.1-testing.3
This commit is contained in:
Luis Fernando Saisa Lopez
2013-06-24 20:42:29 +00:00
parent 6c42135f30
commit a4aba26f07
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
gulliver/system/class.g.php
View File

@@ -5182,19 +5182,35 @@ class G
$strAux = str_replace($strSearch, null, $_SERVER["REQUEST_URI"]); $strAux = str_replace($strSearch, null, $_SERVER["REQUEST_URI"]);
if ($strAux != "") { if ($strAux != "") {
$skin = "base"; //classic
if (isset($_SESSION["currentSkin"])) {
$skin = $_SESSION["currentSkin"];
} else {
$sysConf = System::getSystemConfiguration(PATH_CONFIG . "env.ini");
if (isset($sysConf["default_skin"])) {
$skin = $sysConf["default_skin"];
}
}
$arrayAux = explode("?", $strAux); $arrayAux = explode("?", $strAux);
$fileTemplate = $arrayAux[0]; $fileTemplate = $arrayAux[0];
if (file_exists(PATH_SKIN_ENGINE . $_SESSION["currentSkin"] . PATH_SEP . $fileTemplate)) { if (file_exists(PATH_SKIN_ENGINE . "base" . PATH_SEP . $fileTemplate)) {
$path = PATH_SKIN_ENGINE . $_SESSION["currentSkin"] . PATH_SEP; $path = PATH_SKIN_ENGINE . "base" . PATH_SEP;
} }
if (file_exists(PATH_SKINS . $_SESSION["currentSkin"] . PATH_SEP . $fileTemplate)) { if (file_exists(PATH_SKIN_ENGINE . $skin . PATH_SEP . $fileTemplate)) {
$path = PATH_SKINS . $_SESSION["currentSkin"] . PATH_SEP; $path = PATH_SKIN_ENGINE . $skin . PATH_SEP;
} }
if (file_exists(PATH_CUSTOM_SKINS . $_SESSION["currentSkin"] . PATH_SEP . $fileTemplate)) { if (file_exists(PATH_SKINS . $skin . PATH_SEP . $fileTemplate)) {
$path = PATH_CUSTOM_SKINS . $_SESSION["currentSkin"] . PATH_SEP; $path = PATH_SKINS . $skin . PATH_SEP;
}
if (file_exists(PATH_CUSTOM_SKINS . $skin . PATH_SEP . $fileTemplate)) {
$path = PATH_CUSTOM_SKINS . $skin . PATH_SEP;
} }
} }
} }

5
workflow/public_html/sysGeneric.php
View File

@@ -344,7 +344,7 @@ if (defined( 'PATH_C' )) {
$virtualURITable['/htmlarea/(*)'] = PATH_THIRDPARTY . 'htmlarea/'; $virtualURITable['/htmlarea/(*)'] = PATH_THIRDPARTY . 'htmlarea/';
//$virtualURITable['/sys[a-zA-Z][a-zA-Z0-9]{0,}()/'] = 'sysNamed'; //$virtualURITable['/sys[a-zA-Z][a-zA-Z0-9]{0,}()/'] = 'sysNamed';
$virtualURITable['/(sys*)'] = FALSE; $virtualURITable['/(sys*)'] = FALSE;
$virtualURITable["/errors/(*)"] = ($skinPathErrors != "")? $skinPathErrors : PATH_SKIN_ENGINE . "base" . PATH_SEP; $virtualURITable["/errors/(*)"] = ($skinPathErrors != "")? $skinPathErrors : PATH_GULLIVER_HOME . "methods" . PATH_SEP . "errors" . PATH_SEP;
$virtualURITable['/gulliver/(*)'] = PATH_GULLIVER_HOME . 'methods/'; $virtualURITable['/gulliver/(*)'] = PATH_GULLIVER_HOME . 'methods/';
$virtualURITable['/controls/(*)'] = PATH_GULLIVER_HOME . 'methods/controls/'; $virtualURITable['/controls/(*)'] = PATH_GULLIVER_HOME . 'methods/controls/';
$virtualURITable['/html2ps_pdf/(*)'] = PATH_THIRDPARTY . 'html2ps_pdf/'; $virtualURITable['/html2ps_pdf/(*)'] = PATH_THIRDPARTY . 'html2ps_pdf/';
@@ -352,7 +352,7 @@ $virtualURITable['/html2ps_pdf/(*)'] = PATH_THIRDPARTY . 'html2ps_pdf/';
//$virtualURITable['/skins/'] = 'errorFile'; //$virtualURITable['/skins/'] = 'errorFile';
//$virtualURITable['/files/'] = 'errorFile'; //$virtualURITable['/files/'] = 'errorFile';
$virtualURITable['/rest/(*)'] = 'rest-service'; $virtualURITable['/rest/(*)'] = 'rest-service';
$virtualURITable["/update/(*)"] = ($skinPathUpdate != "")? $skinPathUpdate : PATH_SKIN_ENGINE . "base" . PATH_SEP; $virtualURITable["/update/(*)"] = ($skinPathUpdate != "")? $skinPathUpdate : PATH_GULLIVER_HOME . "methods" . PATH_SEP . "update" . PATH_SEP;
//$virtualURITable['/(*)'] = PATH_HTML; //$virtualURITable['/(*)'] = PATH_HTML;
$virtualURITable['/css/(*)'] = PATH_HTML . 'css/'; //ugly $virtualURITable['/css/(*)'] = PATH_HTML . 'css/'; //ugly
$virtualURITable['/skin/(*)'] = PATH_HTML; $virtualURITable['/skin/(*)'] = PATH_HTML;
@@ -454,7 +454,6 @@ if (Bootstrap::virtualURI( $_SERVER['REQUEST_URI'], $virtualURITable, $realPath
Bootstrap::parseURI( getenv( "REQUEST_URI" ), $isRestRequest ); Bootstrap::parseURI( getenv( "REQUEST_URI" ), $isRestRequest );
//Bootstrap::mylog("sys_temp: ".SYS_TEMP); //Bootstrap::mylog("sys_temp: ".SYS_TEMP);
if (Bootstrap::isPMUnderUpdating()) { if (Bootstrap::isPMUnderUpdating()) {
header( "location: /update/updating.php" ); header( "location: /update/updating.php" );
if (DEBUG_TIME_LOG) if (DEBUG_TIME_LOG)