Merged in gproly/processmaker/PM-3474 (pull request #2846)

PM-3474
2015-09-28 12:09:59 -03:00
parent fc0b225ecc 8f740ed72a
commit 1355d3d0aa
10 changed files with 227 additions and 103 deletions
--- a/gulliver/system/class.bootstrap.php
+++ b/gulliver/system/class.bootstrap.php
@@ -1149,8 +1149,14 @@ class Bootstrap
        //Read Configuration File
        $xmlConfiguration = file_get_contents($configurationFile);
        $xmlConfigurationObj = Bootstrap::xmlParser($xmlConfiguration);
-
+        
+        if (!isset($xmlConfigurationObj->result['skinConfiguration']['__CONTENT__']['cssFiles']['__CONTENT__'][$skinVariant]['__CONTENT__'])) {
+            $xmlConfigurationObj->result['skinConfiguration']['__CONTENT__']['cssFiles']['__CONTENT__'][$skinVariant]['__CONTENT__'] = array('cssFile' => array());
+        }
        $skinFilesArray = $xmlConfigurationObj->result['skinConfiguration']['__CONTENT__']['cssFiles']['__CONTENT__'][$skinVariant]['__CONTENT__']['cssFile'];
+        if (isset($skinFilesArray['__ATTRIBUTES__'])) {
+            $skinFilesArray = array($skinFilesArray);
+        }
        foreach ($skinFilesArray as $keyFile => $cssFileInfo) {
            $enabledBrowsers = explode(",", $cssFileInfo['__ATTRIBUTES__']['enabledBrowsers']);
            $disabledBrowsers = explode(",", $cssFileInfo['__ATTRIBUTES__']['disabledBrowsers']);
--- a/workflow/engine/classes/class.pmDynaform.php
+++ b/workflow/engine/classes/class.pmDynaform.php
--- a/workflow/engine/controllers/designer.php
+++ b/workflow/engine/controllers/designer.php
@@ -125,6 +125,8 @@ class Designer extends Controller
            $translation = new Translation();
            $translation->generateFileTranslationMafe();
        }
+        
+        $this->setVar('sys_skin', SYS_SKIN);

        $this->setView('designer/index');
        $this->render();
--- a/workflow/engine/methods/login/authentication.php
+++ b/workflow/engine/methods/login/authentication.php
@@ -319,7 +319,9 @@ try {
        }
        $aFields['DESCRIPTION'] .= '<br />' . G::LoadTranslation('ID_PLEASE_CHANGE_PASSWORD_POLICY') . '<br /><br /></span>';
        $G_PUBLISH = new Publisher;
-        if(SYS_SKIN == 'neoclassic'){
+        $version = explode('.', trim(file_get_contents(PATH_GULLIVER . 'VERSION')));
+        $version = isset($version[0]) ? intval($version[0]) : 0;
+        if ($version >= 3) {
            $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/changePasswordpm3', '', $aFields, 'changePassword');
        }else{
            $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/changePassword', '', $aFields, 'changePassword');
--- a/workflow/engine/methods/login/forgotPassword.php
+++ b/workflow/engine/methods/login/forgotPassword.php
@@ -23,7 +23,9 @@
 *
 */
 $G_PUBLISH = new Publisher ();
-if(SYS_SKIN == 'neoclassic'){    
+$version = explode('.', trim(file_get_contents(PATH_GULLIVER . 'VERSION')));
+$version = isset($version[0]) ? intval($version[0]) : 0;
+if ($version >= 3) { 
    $G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'login/forgotPasswordpm3', '', array(), 'retrivePassword.php');
 }else{    
    $G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'login/forgotPassword', '', array(), 'retrivePassword.php');
--- a/workflow/engine/methods/login/login.php
+++ b/workflow/engine/methods/login/login.php
@@ -171,7 +171,9 @@ if (!class_exists('pmLicenseManager')) {
 $licenseManager =& pmLicenseManager::getSingleton();
 if (in_array(G::encryptOld($licenseManager->result), array('38afd7ae34bd5e3e6fc170d8b09178a3', 'ba2b45bdc11e2a4a6e86aab2ac693cbb'))) {
    $G_PUBLISH = new Publisher();
-    if(SYS_SKIN == 'neoclassic'){
+    $version = explode('.', trim(file_get_contents(PATH_GULLIVER . 'VERSION')));
+    $version = isset($version[0]) ? intval($version[0]) : 0;
+    if ($version >= 3) {
        $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/licenseExpiredpm3', '', array(), 'licenseUpdate');
    }else{
        $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/licenseExpired', '', array(), 'licenseUpdate');
@@ -219,7 +221,9 @@ if (isset($oConf->aConfig["login_defaultLanguage"]) && $oConf->aConfig["login_de
 }

 $G_PUBLISH = new Publisher();
-if(SYS_SKIN == 'neoclassic'){
+$version = explode('.', trim(file_get_contents(PATH_GULLIVER . 'VERSION')));
+$version = isset($version[0]) ? intval($version[0]) : 0;
+if ($version >= 3) {
    $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/loginpm3', '', $aFields, SYS_URI . 'login/authentication.php');
 }else{
    $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/login', '', $aFields, SYS_URI . 'login/authentication.php');
--- a/workflow/engine/methods/login/sysLogin.php
+++ b/workflow/engine/methods/login/sysLogin.php
@@ -155,26 +155,20 @@ if (!defined('WS_IN_LOGIN')) {
    define('WS_IN_LOGIN', 'serverconf');
 }
 $fileLogin = 'login/sysLogin';
+$version = explode('.', trim(file_get_contents(PATH_GULLIVER . 'VERSION')));
+$version = isset($version[0]) ? intval($version[0]) : 0;
 switch (WS_IN_LOGIN) {
    case 'serverconf':
        //Get Server Configuration
        $oServerConf = & serverConf::getSingleton ();
        if ($oServerConf->getProperty ('LOGIN_NO_WS')) {
-            if(SYS_SKIN == 'neoclassic'){
-                $fileLogin = 'login/sysLoginNoWSpm3';
-            }else{
-                $fileLogin = 'login/sysLoginNoWS';
-            }            
+            $fileLogin = $version >= 3 ? 'login/sysLoginNoWSpm3' : 'login/sysLoginNoWS';
        } else {
            $fileLogin = 'login/sysLogin';
        }
        break;
    case 'no':
-        if(SYS_SKIN == 'neoclassic'){
-            $fileLogin = 'login/sysLoginNoWSpm3';
-        }else{
-            $fileLogin = 'login/sysLoginNoWS';
-        }
+        $fileLogin = $version >= 3 ? 'login/sysLoginNoWSpm3' : 'login/sysLoginNoWS';
        break;
    case 'yes':
        $fileLogin = 'login/sysLogin';
@@ -183,6 +177,6 @@ switch (WS_IN_LOGIN) {
        $fileLogin = 'login/sysLogin';
        break;
 }
-
+error_log($fileLogin);
 $G_PUBLISH->AddContent ('xmlform', 'xmlform', $fileLogin, '', $aField, 'sysLogin');
 G::RenderPage ("publish");
--- a/workflow/engine/methods/tracker/login.php
+++ b/workflow/engine/methods/tracker/login.php
@@ -31,7 +31,9 @@

 $G_PUBLISH = new Publisher();
 //echo G::generateUniqueNumber();
-if(SYS_SKIN == 'neoclassic'){
+$version = explode('.', trim(file_get_contents(PATH_GULLIVER . 'VERSION')));
+$version = isset($version[0]) ? intval($version[0]) : 0;
+if ($version >= 3) {
    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'tracker/loginpm3', '', '', SYS_URI . 'tracker/authentication.php' );
 }else{
    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'tracker/login', '', '', SYS_URI . 'tracker/authentication.php' );
--- a/workflow/engine/templates/cases/pmdynaform.html
+++ b/workflow/engine/templates/cases/pmdynaform.html
@@ -9,6 +9,7 @@
        <link rel="stylesheet" href="/lib/pmdynaform/libs/bootstrap-3.1.1/css/bootstrap.min.css">
        <link rel="stylesheet" href="/lib/pmdynaform/libs/datepicker/bootstrap-datetimepicker.css">
        <link rel="stylesheet" href="/lib/pmdynaform/build/css/PMDynaform.css">
+        <link rel="stylesheet" href="/css/{sys_skin}-pm3.css">
        <script type="text/javascript" src="/lib/pmdynaform/libs/jquery/jquery-1.11.js"></script>
        <script type="text/javascript" src="/lib/pmdynaform/libs/bootstrap-3.1.1/js/bootstrap.min.js"></script>
        <script type="text/javascript" src="/lib/pmdynaform/libs/datepicker/bootstrap-datetimepicker.js"></script>
--- a/workflow/engine/templates/designer/index.html
+++ b/workflow/engine/templates/designer/index.html
@@ -66,6 +66,7 @@
 {else}

    <link rel="stylesheet" type="text/css" href="/lib/css/mafe-{$buildhash}.css" />
+    <link rel="stylesheet" type="text/css" href="/css/{$sys_skin}-pm3.css" />
    <script type="text/javascript">
        var prj_uid = "{$prj_uid}";
        var app_uid = "{$app_uid}";