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

- 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-18 22:14:40 +00:00
parent a2b850f272
commit d1124ea6dc
65 changed files with 1163 additions and 55 deletions

View File

@@ -326,6 +326,9 @@ spl_autoload_register(array("Bootstrap", "autoloadClass"));
Bootstrap::registerClass("G", PATH_GULLIVER . "class.g.php");
Bootstrap::registerClass("System", PATH_HOME . "engine/classes/class.system.php");
$skinPathErrors = G::skinGetPathToSrcByVirtualUri("errors");
$skinPathUpdate = G::skinGetPathToSrcByVirtualUri("update");
// defining Virtual URLs
$virtualURITable = array ();
$virtualURITable['/plugin/(*)'] = 'plugin';
@@ -341,7 +344,7 @@ if (defined( 'PATH_C' )) {
$virtualURITable['/htmlarea/(*)'] = PATH_THIRDPARTY . 'htmlarea/';
//$virtualURITable['/sys[a-zA-Z][a-zA-Z0-9]{0,}()/'] = 'sysNamed';
$virtualURITable['/(sys*)'] = FALSE;
$virtualURITable['/errors/(*)'] = PATH_GULLIVER_HOME . 'methods/errors/';
$virtualURITable["/errors/(*)"] = ($skinPathErrors != "")? $skinPathErrors : PATH_SKIN_ENGINE . "base" . PATH_SEP;
$virtualURITable['/gulliver/(*)'] = PATH_GULLIVER_HOME . 'methods/';
$virtualURITable['/controls/(*)'] = PATH_GULLIVER_HOME . 'methods/controls/';
$virtualURITable['/html2ps_pdf/(*)'] = PATH_THIRDPARTY . 'html2ps_pdf/';
@@ -349,7 +352,7 @@ $virtualURITable['/html2ps_pdf/(*)'] = PATH_THIRDPARTY . 'html2ps_pdf/';
//$virtualURITable['/skins/'] = 'errorFile';
//$virtualURITable['/files/'] = 'errorFile';
$virtualURITable['/rest/(*)'] = 'rest-service';
$virtualURITable['/update/(*)'] = PATH_GULLIVER_HOME . 'methods/update/';
$virtualURITable["/update/(*)"] = ($skinPathUpdate != "")? $skinPathUpdate : PATH_SKIN_ENGINE . "base" . PATH_SEP;
//$virtualURITable['/(*)'] = PATH_HTML;
$virtualURITable['/css/(*)'] = PATH_HTML . 'css/'; //ugly
$virtualURITable['/skin/(*)'] = PATH_HTML;
@@ -813,7 +816,7 @@ if (substr( SYS_COLLECTION, 0, 8 ) === 'gulliver') {
$pluginName = SYS_COLLECTION;
$pluginResourceRequest = explode('/', rtrim(SYS_TARGET, '/'));
$isPluginController = true;
if ($pluginResourceRequest > 0) {
$controllerClass = $pluginResourceRequest[0];
@@ -821,7 +824,7 @@ if (substr( SYS_COLLECTION, 0, 8 ) === 'gulliver') {
$controllerAction = 'index';
} else {
$controllerAction = $pluginResourceRequest[1];
}
}
}
$pluginControllerPath = PATH_PLUGINS . $pluginName . PATH_SEP . 'controllers' . PATH_SEP;
@@ -986,12 +989,12 @@ if (! defined( 'EXECUTE_BY_CRON' )) {
$controller = new $controllerClass();
$controller->setHttpRequestData($_REQUEST);//NewRelic Snippet - By JHL
transactionLog($controllerAction);
if ($isPluginController) {
$controller->setPluginName($pluginName);
$controller->setPluginHomeDir(PATH_PLUGINS . $pluginName . PATH_SEP);
}
$controller->call($controllerAction);
} elseif ($isRestRequest) {
//NewRelic Snippet - By JHL