diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php index 48229d133..59b387a27 100755 --- a/gulliver/system/class.g.php +++ b/gulliver/system/class.g.php @@ -5160,6 +5160,47 @@ class G return $url; } + + public static function skinGetPathToSrcByVirtualUri($option) + { + $path = ""; + $ereg = ""; + $strSearch = ""; + + switch ($option) { + case "errors": + $ereg = "/^\/errors\/.*$/"; + $strSearch = "/errors/"; + break; + case "update": + $ereg = "/^\/update\/.*$/"; + $strSearch = "/update/"; + break; + } + + if (preg_match($ereg, $_SERVER["REQUEST_URI"])) { + $strAux = str_replace($strSearch, null, $_SERVER["REQUEST_URI"]); + + if ($strAux != "") { + $arrayAux = explode("?", $strAux); + $fileTemplate = $arrayAux[0]; + + if (file_exists(PATH_SKIN_ENGINE . $_SESSION["currentSkin"] . PATH_SEP . $fileTemplate)) { + $path = PATH_SKIN_ENGINE . $_SESSION["currentSkin"] . PATH_SEP; + } + + if (file_exists(PATH_SKINS . $_SESSION["currentSkin"] . PATH_SEP . $fileTemplate)) { + $path = PATH_SKINS . $_SESSION["currentSkin"] . PATH_SEP; + } + + if (file_exists(PATH_CUSTOM_SKINS . $_SESSION["currentSkin"] . PATH_SEP . $fileTemplate)) { + $path = PATH_CUSTOM_SKINS . $_SESSION["currentSkin"] . PATH_SEP; + } + } + } + + return $path; + } } /** diff --git a/workflow/engine/skinEngine/base/css2/style1.css b/workflow/engine/skinEngine/base/css2/style1.css new file mode 100644 index 000000000..9700e9595 --- /dev/null +++ b/workflow/engine/skinEngine/base/css2/style1.css @@ -0,0 +1,287 @@ + + /* Reset */ + * { + margin: 0 auto; + padding: 0; + } + + /* Body */ + body { + background: url(../images/background.jpg) no-repeat top #00B4CD; + text-align: center; + } + + /* No borders around images */ + img { + border: none; + } + + /* Warp around everything */ + #warp { + margin: 0 auto; + margin-top: 10px; + width: 985px; + font-family: Helvetica; + text-align: left; + } + + /* Header */ + #header_top { + background: url(../images/top.png) no-repeat; + width: 985px; + height: 30px; + } + + /* Header content */ + #header { + background: url(../images/box_bg.png) repeat-y; + width: 985px; + text-align: center; + } + + /* Page title */ + #header h2 { + padding-top: 10px; + } + + /* Subtitle */ + #header h5 { + margin-top: 5px; + padding-bottom: 15px; + color: #acacac; + } + + /* Content div */ + #content { + background: url(../images/content_bg.png) repeat-y; + width: 985px; + } + + /* The info text */ + #text { + float: left; + margin: 10px 0 10px 60px; + width: 420px; + /* IE margin fix */ + display: inline; + font-size: 13px; + } + + /* The info text P */ + #text p { + margin-top: 5px; + font-size: 14px; + line-height: 20px; + color: #292929; + } + + /* The links list */ + + /* The list items */ + + /* The links */ + #text a { + color: #292929; + text-decoration: none; + } + + /* Link hover */ + #text a:hover { + text-decoration: none; + } + + /* The book icon */ + #book { + float: right; + width: 472px; + height: 332px; + margin: 20px 20px 10px 0; + + + } + + /* Footer */ + #footer { + background: url(../images/box_bg.png) repeat-y; + width: 985px; + + } + + /* Footer bottom */ + #footer_bottom { + background: url(../images/bottom.png) no-repeat; + width: 985px; + height: 28px; + + } + + /* Twitter icon */ + #twitter { + margin: 10px 0px 0px 60px; + float: left; + } + + /* The tweet text */ + #twitter_text { + float: left; + margin-left: 10px; + margin-top: 15px; + width: 300px; + color: #878787; + float: left; + font-size: 10px; + } + + /* Twitter links */ + #twitter_text a { + text-decoration: none; + font-weight: bold; + } + + /* Search form */ + #searchform { + float: right; + margin: 15px 60px 0px 0px; + /* IE margin fix */ + display: inline; + } + + /* Search input */ + input#search { + background: url(../images/searchfield_bg.png) no-repeat; + border: none; + height: 31px; + width: 244px; + float: right; + line-height: 30px; + padding-left: 10px; + } + + /* The Send button */ + input#submit { + border: none; + float: right; + margin-left: 5px; + height: 31px; + width: 74px; + color: #fff; + } + + input:focus { + outline: none; + } + + /* Social media */ + #socialmedia { + margin-top: 5px; + margin-right: 40px; + margin-bottom: 10px; + display: inline; + list-style: none; + float: right; + } + + /* Social media list items */ + #socialmedia a{ + text-decoration: none; + } + + /* COLOR CHANGER */ + #colorchanger { + text-align: left; + } + + #showChanger { + margin-left: 10px; + } + + #colors { + padding: 10px; + background: #425a5e; + height: 17px; + } + + /* The div around the color change links */ + .colorbox { + width:15px; + height:15px; + border:1px solid #050505; + float:left; + margin:0px 2px; + cursor:pointer; + display:block; + } + + /* Blue */ + .colorblue { + background-color:#1e82ac; + } + /* Blue Hover */ + .colorblue:hover { + background-color:#177197; + } + + /* Red */ + .colorred { + background-color:#cc2b2b; + } + /* Red Hover */ + .colorred:hover { + background-color:#af1a1a; + } + + /* Grey */ + .colorgrey { + background-color:#4d4d4d; + } + /* Grey Hover */ + .colorgrey:hover { + background-color:#7c7c7c; + } + + /* Brown */ + .colorbrown { + background-color:#4b3a15; + } + /* Brown Hover */ + .colorbrown:hover { + background-color:#5e4b20; + } + + /* Green */ + .colorgreen { + background-color:#6c8b2f; + } + /* Green Hover */ + .cologreen:hover { + background-color:#7da137; + } + /* Page title */ + #header h2 { + color: #187086; + } + + /* Page links */ + #text a:hover { + color: #16687d; + } + + /* Search button */ + input#submit { + background: url(../images/searchbutton_bg.png) no-repeat; + } + + /* Twitter links */ + #twitter_text a { + color: #135869; + } + #textInfo{ + list-style: square inside none; + padding: 0px; + margin: 0px; + line-height: 20px; + } + #textInfo li{ + padding: 5px 0px; + text-align: justify; + } \ No newline at end of file diff --git a/gulliver/methods/errors/error404.php b/workflow/engine/skinEngine/base/error404.php similarity index 75% rename from gulliver/methods/errors/error404.php rename to workflow/engine/skinEngine/base/error404.php index 86d526574..eb95ff9cd 100644 --- a/gulliver/methods/errors/error404.php +++ b/workflow/engine/skinEngine/base/error404.php @@ -1,46 +1,8 @@ - - - + + @@ -60,7 +22,7 @@

Oops, page not found!

This page may be busy or the URL incorrect.
- www.colosa.com + www.colosa.com diff --git a/workflow/engine/skinEngine/base/images/background.jpg b/workflow/engine/skinEngine/base/images/background.jpg new file mode 100644 index 000000000..9e914649f Binary files /dev/null and b/workflow/engine/skinEngine/base/images/background.jpg differ diff --git a/workflow/engine/skinEngine/base/images/background2.jpg b/workflow/engine/skinEngine/base/images/background2.jpg new file mode 100644 index 000000000..5e507b40d Binary files /dev/null and b/workflow/engine/skinEngine/base/images/background2.jpg differ diff --git a/workflow/engine/skinEngine/base/images/bottom.png b/workflow/engine/skinEngine/base/images/bottom.png new file mode 100644 index 000000000..ccbc9214c Binary files /dev/null and b/workflow/engine/skinEngine/base/images/bottom.png differ diff --git a/workflow/engine/skinEngine/base/images/box_bg.png b/workflow/engine/skinEngine/base/images/box_bg.png new file mode 100644 index 000000000..be16d33c6 Binary files /dev/null and b/workflow/engine/skinEngine/base/images/box_bg.png differ diff --git a/workflow/engine/skinEngine/base/images/colortab.png b/workflow/engine/skinEngine/base/images/colortab.png new file mode 100644 index 000000000..127b67e85 Binary files /dev/null and b/workflow/engine/skinEngine/base/images/colortab.png differ diff --git a/workflow/engine/skinEngine/base/images/colosa.png b/workflow/engine/skinEngine/base/images/colosa.png new file mode 100644 index 000000000..141e7a34c Binary files /dev/null and b/workflow/engine/skinEngine/base/images/colosa.png differ diff --git a/workflow/engine/skinEngine/base/images/content_bg.png b/workflow/engine/skinEngine/base/images/content_bg.png new file mode 100644 index 000000000..97744be85 Binary files /dev/null and b/workflow/engine/skinEngine/base/images/content_bg.png differ diff --git a/workflow/engine/skinEngine/base/images/img-01.png b/workflow/engine/skinEngine/base/images/img-01.png new file mode 100644 index 000000000..673df81bf Binary files /dev/null and b/workflow/engine/skinEngine/base/images/img-01.png differ diff --git a/workflow/engine/skinEngine/base/images/img-02.png b/workflow/engine/skinEngine/base/images/img-02.png new file mode 100644 index 000000000..5951ffe3e Binary files /dev/null and b/workflow/engine/skinEngine/base/images/img-02.png differ diff --git a/workflow/engine/skinEngine/base/images/pm.png b/workflow/engine/skinEngine/base/images/pm.png new file mode 100644 index 000000000..9182318e3 Binary files /dev/null and b/workflow/engine/skinEngine/base/images/pm.png differ diff --git a/workflow/engine/skinEngine/base/images/pmlogo.png b/workflow/engine/skinEngine/base/images/pmlogo.png new file mode 100644 index 000000000..7709d1aee Binary files /dev/null and b/workflow/engine/skinEngine/base/images/pmlogo.png differ diff --git a/workflow/engine/skinEngine/base/images/processmaker.logo.jpg b/workflow/engine/skinEngine/base/images/processmaker.logo.jpg new file mode 100644 index 000000000..e8b1265be Binary files /dev/null and b/workflow/engine/skinEngine/base/images/processmaker.logo.jpg differ diff --git a/workflow/engine/skinEngine/base/images/socialmedia/fb.png b/workflow/engine/skinEngine/base/images/socialmedia/fb.png new file mode 100644 index 000000000..d68edfbb9 Binary files /dev/null and b/workflow/engine/skinEngine/base/images/socialmedia/fb.png differ diff --git a/workflow/engine/skinEngine/base/images/socialmedia/rs.png b/workflow/engine/skinEngine/base/images/socialmedia/rs.png new file mode 100644 index 000000000..abb50e2c1 Binary files /dev/null and b/workflow/engine/skinEngine/base/images/socialmedia/rs.png differ diff --git a/workflow/engine/skinEngine/base/images/socialmedia/tw.png b/workflow/engine/skinEngine/base/images/socialmedia/tw.png new file mode 100644 index 000000000..0c0942fd1 Binary files /dev/null and b/workflow/engine/skinEngine/base/images/socialmedia/tw.png differ diff --git a/workflow/engine/skinEngine/base/images/socialmedia/yb.png b/workflow/engine/skinEngine/base/images/socialmedia/yb.png new file mode 100644 index 000000000..b36a57f0d Binary files /dev/null and b/workflow/engine/skinEngine/base/images/socialmedia/yb.png differ diff --git a/workflow/engine/skinEngine/base/images/top.png b/workflow/engine/skinEngine/base/images/top.png new file mode 100644 index 000000000..c936fa7fc Binary files /dev/null and b/workflow/engine/skinEngine/base/images/top.png differ diff --git a/workflow/public_html/images/updating/button.png b/workflow/engine/skinEngine/base/images/updating/button.png similarity index 100% rename from workflow/public_html/images/updating/button.png rename to workflow/engine/skinEngine/base/images/updating/button.png diff --git a/workflow/public_html/images/updating/deviantart.png b/workflow/engine/skinEngine/base/images/updating/deviantart.png similarity index 100% rename from workflow/public_html/images/updating/deviantart.png rename to workflow/engine/skinEngine/base/images/updating/deviantart.png diff --git a/workflow/public_html/images/updating/fonts/PTS55F-webfont.eot b/workflow/engine/skinEngine/base/images/updating/fonts/PTS55F-webfont.eot similarity index 100% rename from workflow/public_html/images/updating/fonts/PTS55F-webfont.eot rename to workflow/engine/skinEngine/base/images/updating/fonts/PTS55F-webfont.eot diff --git a/workflow/public_html/images/updating/fonts/PTS55F-webfont.svg b/workflow/engine/skinEngine/base/images/updating/fonts/PTS55F-webfont.svg similarity index 100% rename from workflow/public_html/images/updating/fonts/PTS55F-webfont.svg rename to workflow/engine/skinEngine/base/images/updating/fonts/PTS55F-webfont.svg diff --git a/workflow/public_html/images/updating/fonts/PTS55F-webfont.ttf b/workflow/engine/skinEngine/base/images/updating/fonts/PTS55F-webfont.ttf similarity index 100% rename from workflow/public_html/images/updating/fonts/PTS55F-webfont.ttf rename to workflow/engine/skinEngine/base/images/updating/fonts/PTS55F-webfont.ttf diff --git a/workflow/public_html/images/updating/fonts/PTS55F-webfont.woff b/workflow/engine/skinEngine/base/images/updating/fonts/PTS55F-webfont.woff similarity index 100% rename from workflow/public_html/images/updating/fonts/PTS55F-webfont.woff rename to workflow/engine/skinEngine/base/images/updating/fonts/PTS55F-webfont.woff diff --git a/workflow/public_html/images/updating/fonts/Paratype PT Sans Free Font License.txt b/workflow/engine/skinEngine/base/images/updating/fonts/Paratype PT Sans Free Font License.txt similarity index 100% rename from workflow/public_html/images/updating/fonts/Paratype PT Sans Free Font License.txt rename to workflow/engine/skinEngine/base/images/updating/fonts/Paratype PT Sans Free Font License.txt diff --git a/workflow/public_html/images/updating/logo.png b/workflow/engine/skinEngine/base/images/updating/logo.png similarity index 100% rename from workflow/public_html/images/updating/logo.png rename to workflow/engine/skinEngine/base/images/updating/logo.png diff --git a/workflow/public_html/images/updating/page_background.png b/workflow/engine/skinEngine/base/images/updating/page_background.png similarity index 100% rename from workflow/public_html/images/updating/page_background.png rename to workflow/engine/skinEngine/base/images/updating/page_background.png diff --git a/workflow/public_html/images/updating/stumbleupon.png b/workflow/engine/skinEngine/base/images/updating/stumbleupon.png similarity index 100% rename from workflow/public_html/images/updating/stumbleupon.png rename to workflow/engine/skinEngine/base/images/updating/stumbleupon.png diff --git a/workflow/public_html/images/updating/underConstruction.png b/workflow/engine/skinEngine/base/images/updating/underConstruction.png similarity index 100% rename from workflow/public_html/images/updating/underConstruction.png rename to workflow/engine/skinEngine/base/images/updating/underConstruction.png diff --git a/gulliver/methods/update/updating.php b/workflow/engine/skinEngine/base/updating.php similarity index 84% rename from gulliver/methods/update/updating.php rename to workflow/engine/skinEngine/base/updating.php index f4fc7b076..9b3605a60 100644 --- a/gulliver/methods/update/updating.php +++ b/workflow/engine/skinEngine/base/updating.php @@ -1,7 +1,7 @@ - + Site under Updating + + +
+ + +
+ +
+ +
+ +
+

This application is being updated.

+

It will be back online shortly.

+

Thank you for your patience.

+
+



+



+
+

+ Privacy Statement | + Security Statement | + Terms of Service | + Commercial License | + Contact Us | + + RSS +
+ © Copyright 2000 - Colosa, Inc. www.colosa.com +
+
+ +
+ +
+ + + \ No newline at end of file diff --git a/workflow/public_html/sysGeneric.php b/workflow/public_html/sysGeneric.php index 068dfa17f..73005774e 100755 --- a/workflow/public_html/sysGeneric.php +++ b/workflow/public_html/sysGeneric.php @@ -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