Merged master into dashboards2

2015-04-01 09:08:57 -04:00
parent dc89b7dbe8 2ef493d4f0
commit db31fbe173
40 changed files with 119 additions and 86 deletions
--- a/workflow/engine/methods/authSources/authSources_ImportUsers.php
+++ b/workflow/engine/methods/authSources/authSources_ImportUsers.php
@@ -40,7 +40,7 @@ foreach ($_POST['aUsers'] as $sUser) {
    $matches = array ();
    $aUser = (array) Bootstrap::json_decode( stripslashes( $sUser ) );
    $aData['USR_USERNAME'] = str_replace( "*", "'", $aUser['sUsername'] );
-    $aData['USR_PASSWORD'] = md5( str_replace( "*", "'", $aUser['sUsername'] ) );
+    $aData['USR_PASSWORD'] = G::encryptOld( str_replace( "*", "'", $aUser['sUsername'] ) );
    // note added by gustavo gustavo-at-colosa.com
    // asign the FirstName and LastName variables
    // add replace to change D*Souza to D'Souza by krlos
@@ -72,7 +72,7 @@ foreach ($_POST['aUsers'] as $sUser) {
    }
    $aData['USR_STATUS'] = 'ACTIVE';
    $aData['USR_UID'] = $sUserUID;
-    $aData['USR_PASSWORD'] = md5( $sUserUID ); //fake :p
+    $aData['USR_PASSWORD'] = G::encryptOld( $sUserUID ); //fake :p
    $aData['USR_ROLE'] = 'PROCESSMAKER_OPERATOR';

    if (count($aAttributes)) {
--- a/workflow/engine/methods/cases/ajaxListener.php
+++ b/workflow/engine/methods/cases/ajaxListener.php
@@ -851,7 +851,7 @@ class Ajax
        $_POST["DYN_UID"] = $_REQUEST["DYN_UID"];

        $G_PUBLISH = new Publisher();
-        $FieldsHistory = unserialize($_SESSION["HISTORY_DATA"]);
+        $FieldsHistory = $_SESSION["HISTORY_DATA"];
        $Fields["APP_DATA"] = $FieldsHistory[$_POST["HISTORY_ID"]]; //isset($FieldsHistory[$_POST["HISTORY_ID"]])? $FieldsHistory[$_POST["HISTORY_ID"]] : "";
        $Fields["APP_DATA"]["__DYNAFORM_OPTIONS"]["PREVIOUS_STEP_LABEL"] = "";
        $Fields["APP_DATA"]["__DYNAFORM_OPTIONS"]["NEXT_STEP_LABEL"] = "";
--- a/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php
+++ b/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php
@@ -383,7 +383,7 @@ if ($actionAjax == 'dynaformChangeLogViewHistory') {

    global $G_PUBLISH;
    $G_PUBLISH = new Publisher();
-    $FieldsHistory = unserialize( $_SESSION['HISTORY_DATA'] );
+    $FieldsHistory = $_SESSION['HISTORY_DATA'];
    $Fields['APP_DATA'] = $FieldsHistory[$_POST['HISTORY_ID']];
    $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
    $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = '';
--- a/workflow/engine/methods/cases/casesList_Ajax.php
+++ b/workflow/engine/methods/cases/casesList_Ajax.php
@@ -549,7 +549,7 @@ if ($actionAjax == 'dynaformChangeLogViewHistory') {

    global $G_PUBLISH;
    $G_PUBLISH = new Publisher();
-    $FieldsHistory = unserialize( $_SESSION['HISTORY_DATA'] );
+    $FieldsHistory = $_SESSION['HISTORY_DATA'];
    $Fields['APP_DATA'] = $FieldsHistory[$_POST['HISTORY_ID']];
    $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
    $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = '';
--- a/workflow/engine/methods/cases/casesStartPage_Ajax.php
+++ b/workflow/engine/methods/cases/casesStartPage_Ajax.php
@@ -75,7 +75,7 @@ function getProcessList ()
        if (1) {
            foreach ($processList as $key => $processInfo) {
                $tempTree['text'] = $key;
-                $tempTree['id'] = md5($key);
+                $tempTree['id'] = G::encryptOld($key);
                $tempTree['cls'] = 'folder';
                $tempTree['draggable'] = true;
                $tempTree['optionType'] = "category";
@@ -92,7 +92,7 @@ function getProcessList ()
                    //print_r($processInfo);
                    $tempTreeChild['text'] = htmlentities($keyChild, ENT_QUOTES, 'UTF-8'); //ellipsis ( $keyChild, 50 );
                    //$tempTree['text']=$key;
-                    $tempTreeChild['id'] = md5($keyChild);
+                    $tempTreeChild['id'] = G::encryptOld($keyChild);
                    $tempTreeChild['draggable'] = true;
                    $tempTreeChild['leaf'] = true;
                    $tempTreeChild['icon'] = '/images/icon.trigger.png';
--- a/workflow/engine/methods/cases/cases_Ajax.php
+++ b/workflow/engine/methods/cases/cases_Ajax.php
@@ -700,7 +700,7 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
        break;
    case 'showDynaformHistory':
        $G_PUBLISH = new Publisher();
-        $FieldsHistory = unserialize( $_SESSION['HISTORY_DATA'] );
+        $FieldsHistory = $_SESSION['HISTORY_DATA'];
        $Fields['APP_DATA'] = $FieldsHistory[$_POST['HISTORY_ID']];
        $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
        $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = '';
--- a/workflow/engine/methods/enterprise/processMakerAjax.php
+++ b/workflow/engine/methods/enterprise/processMakerAjax.php
@@ -129,7 +129,7 @@ switch ($option) {
            }

            ///////
-            $boundary = "---------------------" . substr(md5(rand(0, 32000)), 0, 10);
+            $boundary = "---------------------" . substr(G::encryptOld(rand(0, 32000)), 0, 10);
            $data = null;

            $data = $data . "--$boundary\n";
--- a/workflow/engine/methods/events/eventsEditAction.php
+++ b/workflow/engine/methods/events/eventsEditAction.php
@@ -45,7 +45,7 @@ $parameters = unserialize( $oEvent->getEvnActionParameters() );
 //g::pr($parameters); die;
 $aTrigger = $oTrigger->load( $aFields['TRI_UID'] );

-$hash = md5( $oTrigger->getTriWebbot() );
+$hash = G::encryptOld( $oTrigger->getTriWebbot() );
 //var_dump($hash,$parameters->hash);die;
 //if the hash is different, the script was edited , so we will show the trigger editor.
 if ((isset( $parameters->hash ) && $hash != $parameters->hash) || $aFields['EVN_ACTION'] == 'EXECUTE_TRIGGER' || $aFields['EVN_ACTION'] == 'EXECUTE_CONDITIONAL_TRIGGER') {
--- a/workflow/engine/methods/install/r.php
+++ b/workflow/engine/methods/install/r.php
@@ -27,14 +27,14 @@ if(isset($_GET['gen'])) {
 <?php

 if (isset( $_GET['gen'] )) {
-    $sh = md5( filemtime( PATH_GULLIVER . "/class.g.php" ) );
+    $sh = G::encryptOld( filemtime( PATH_GULLIVER . "/class.g.php" ) );
    $h = G::encrypt( $_GET['srv'] . $sh . $_GET['usr'] . $sh . $_GET['pass'] . $sh . (1), $sh );
    echo "HASH_INSTALLATION<br/>";
    echo "<textarea cols=120>$h</textarea><br/>";
    echo "SYSTEM_HASH<br/>";
    echo "<textarea cols=120>$sh</textarea>";
 } elseif (isset( $_GET['reg'] )) {
-    $sh = md5( filemtime( PATH_GULLIVER . "/class.g.php" ) );
+    $sh = G::encryptOld( filemtime( PATH_GULLIVER . "/class.g.php" ) );
    $h = G::encrypt( $_GET['srv'] . $sh . $_GET['usr'] . $sh . $_GET['pass'] . $sh . (1), $sh );
    echo "HASH_INSTALLATION<br/>";
    echo "<textarea cols=120>$h</textarea><br/>";
--- a/workflow/engine/methods/login/authentication.php
+++ b/workflow/engine/methods/login/authentication.php
@@ -253,7 +253,7 @@ try {
        file_put_contents(PATH_DATA_SITE . PATH_SEP . '.server_info', $cput);
    } else {
        $c = file_get_contents(PATH_DATA_SITE . PATH_SEP . '.server_info');
-        if (md5($c) != md5($cput)) {
+        if (G::encryptOld($c) != G::encryptOld($cput)) {
            file_put_contents(PATH_DATA_SITE . PATH_SEP . '.server_info', $cput);
        }
    }
@@ -286,7 +286,7 @@ try {
        die();
    }

-    $aUserProperty = $oUserProperty->loadOrCreateIfNotExists($_SESSION['USER_LOGGED'], array('USR_PASSWORD_HISTORY' => serialize(array(md5($pwd)))));
+    $aUserProperty = $oUserProperty->loadOrCreateIfNotExists($_SESSION['USER_LOGGED'], array('USR_PASSWORD_HISTORY' => serialize(array(G::encryptOld($pwd)))));
    $aErrors       = $oUserProperty->validatePassword($_POST['form']['USR_PASSWORD'], $aUserProperty['USR_LAST_UPDATE_DATE'], $aUserProperty['USR_LOGGED_NEXT_TIME'], true);

    if (!empty($aErrors) && in_array("ID_PPP_CHANGE_PASSWORD_AFTER_NEXT_LOGIN", $aErrors)) {
--- a/workflow/engine/methods/login/login.php
+++ b/workflow/engine/methods/login/login.php
@@ -146,7 +146,7 @@ if (!class_exists('pmLicenseManager')) {
  G::LoadClass('pmLicenseManager');
 }
 $licenseManager =& pmLicenseManager::getSingleton();
-if (in_array(md5($licenseManager->result), array('38afd7ae34bd5e3e6fc170d8b09178a3', 'ba2b45bdc11e2a4a6e86aab2ac693cbb'))) {
+if (in_array(G::encryptOld($licenseManager->result), array('38afd7ae34bd5e3e6fc170d8b09178a3', 'ba2b45bdc11e2a4a6e86aab2ac693cbb'))) {
    $G_PUBLISH = new Publisher();
    $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/licenseExpired', '', array(), 'licenseUpdate');
    G::RenderPage('publish');
--- a/workflow/engine/methods/roles/roles_Ajax.php
+++ b/workflow/engine/methods/roles/roles_Ajax.php
@@ -31,7 +31,7 @@ switch ($REQUEST) {
        G::RenderPage( 'publish', 'raw' );
        break;
    case 'saveNewRole':
-        $newid = md5( $_POST['code'] . date( "d-M-Y_H:i:s" ) );
+        $newid = G::encryptOld( $_POST['code'] . date( "d-M-Y_H:i:s" ) );
        $aData['ROL_UID'] = $newid;
        //$aData['ROL_PARENT'] = $_POST['parent'];
        $aData['ROL_SYSTEM'] = '00000000000000000000000000000002';
@@ -162,13 +162,13 @@ switch ($REQUEST) {
        foreach ($aUserIuds as $key => $val) {
            $sData['USR_UID'] = $val;
            $sData['ROL_UID'] = $ROL_UID;
-            if ($sData['USR_UID'] == '00000000000000000000000000000001') {
+            if ($sData['USR_UID'] == '00000000000000000000000000000001') {
                if ($sData['ROL_UID'] != 'PROCESSMAKER_ADMIN') {
                    $response = new stdclass();
 					$response->userRole = true;
-					echo G::json_encode($response);
-                    break;
-                }
+					echo G::json_encode($response);
+                    break;
+                }
            }
            $RBAC->assignUserToRole( $sData );
        }
--- a/workflow/engine/methods/services/demoSoap.php
+++ b/workflow/engine/methods/services/demoSoap.php
@@ -178,7 +178,7 @@ ini_set( "soap.wsdl_cache_enabled", "0" ); // disabling WSDL cache
 switch ($action) {
    case 'login':
        $user = $_POST["user"];
-        $pass = md5( $_POST["pass"] );
+        $pass = G::encryptOld( $_POST["pass"] );
        $wsdl = $endpoint;
        //$client = new SoapClient( $endpoint );
        $client = new SoapClient( null, array ('location' => $endpoint,'uri' => 'http://www.sugarcrm.com/sugarcrm','soap_version' => SOAP_1_1,        //SOAP_1_2 - 1.2 not supported by sugar nusoap
--- a/workflow/engine/methods/triggers/triggers_Edit.php
+++ b/workflow/engine/methods/triggers/triggers_Edit.php
@@ -40,7 +40,7 @@ if (isset( $_GET['TRI_UID'] )) {
    if ($aFields['TRI_PARAM'] != '' && ! $editWizardSource) {
        $aTriggerData = unserialize( $aFields['TRI_PARAM'] );
        // if the trigger has been modified manually, it cant be edited with the wizard.
-        if (md5( $aFields['TRI_WEBBOT'] ) == $aTriggerData['hash']) {
+        if (G::encryptOld( $aFields['TRI_WEBBOT'] ) == $aTriggerData['hash']) {
            $triUid = $_GET['TRI_UID'];
            $STEP_UID = isset($_GET['STEP_UID'])?$_GET['STEP_UID']:'';
            $ST_TYPE = isset($_GET['ST_TYPE'])?$_GET['ST_TYPE']:'';
--- a/workflow/engine/methods/triggers/triggers_WizardSave.php
+++ b/workflow/engine/methods/triggers/triggers_WizardSave.php
@@ -99,7 +99,7 @@ $sPMfunction .= $aDataTriggers['PMFUNTION_NAME'] . " (" . implode(",", $methodPa
 //Create Trigger
 $aDataTriggers['TRI_WEBBOT'] = $sPMfunction;
 $aDataTriggersParams = array();
-$aDataTriggersParams['hash'] = md5($sPMfunction);
+$aDataTriggersParams['hash'] = G::encryptOld($sPMfunction);
 $aDataTriggersParams['params'] = $aDataTriggers;

 $aDataTriggers['TRI_PARAM'] = serialize($aDataTriggersParams);
--- a/workflow/engine/methods/triggers/triggers_WizardUpdate.php
+++ b/workflow/engine/methods/triggers/triggers_WizardUpdate.php
@@ -102,7 +102,7 @@ $sPMfunction .= $aDataTriggers['PMFUNTION_NAME'] . " (" . implode(",", $methodPa
 //Create Trigger
 $aDataTriggers['TRI_WEBBOT'] = $sPMfunction;
 $aDataTriggersParams = array();
-$aDataTriggersParams['hash'] = md5($sPMfunction);
+$aDataTriggersParams['hash'] = G::encryptOld($sPMfunction);
 $aDataTriggersParams['params'] = $aDataTriggers;

 $aDataTriggers['TRI_PARAM'] = serialize($aDataTriggersParams);
--- a/workflow/engine/methods/users/myInfo_Save.php
+++ b/workflow/engine/methods/users/myInfo_Save.php
@@ -68,7 +68,7 @@ try {
            $aData['USR_PASSWORD'] = $_POST['form']['USR_PASSWORD'];
            require_once 'classes/model/UsersProperties.php';
            $oUserProperty = new UsersProperties();
-            $aUserProperty = $oUserProperty->loadOrCreateIfNotExists( $_POST['form']['USR_UID'], array ('USR_PASSWORD_HISTORY' => serialize( array (md5( $_POST['form']['USR_NEW_PASS'] )
+            $aUserProperty = $oUserProperty->loadOrCreateIfNotExists( $_POST['form']['USR_UID'], array ('USR_PASSWORD_HISTORY' => serialize( array (G::encryptOld( $_POST['form']['USR_NEW_PASS'] )
            ) )
            ) );
            $aErrors = $oUserProperty->validatePassword( $_POST['form']['USR_NEW_PASS'], $aUserProperty['USR_LAST_UPDATE_DATE'], $aUserProperty['USR_LOGGED_NEXT_TIME'] );
@@ -120,7 +120,7 @@ try {
    $aData['USR_DUE_DATE'] = $_POST['form']['USR_DUE_DATE'];
    $aData['USR_UPDATE_DATE'] = date( 'Y-m-d H:i:s' );
    $RBAC->updateUser( $aData );
-    $aData['USR_PASSWORD'] = md5( $_POST['form']['USR_USERNAME'] ); //fake :p
+    $aData['USR_PASSWORD'] = G::encryptOld( $_POST['form']['USR_USERNAME'] ); //fake :p
    $aData['USR_COUNTRY'] = $_POST['form']['USR_COUNTRY'];
    $aData['USR_CITY'] = $_POST['form']['USR_CITY'];
    $aData['USR_LOCATION'] = $_POST['form']['USR_LOCATION'];
--- a/workflow/engine/methods/users/users_Save.php
+++ b/workflow/engine/methods/users/users_Save.php
@@ -91,7 +91,7 @@ try {
        $sUserUID = $RBAC->createUser( $aData, $form['USR_ROLE'] );
        $aData['USR_STATUS'] = $statusWF;
        $aData['USR_UID'] = $sUserUID;
-        $aData['USR_PASSWORD'] = md5( $sUserUID ); //fake :p
+        $aData['USR_PASSWORD'] = G::encryptOld( $sUserUID ); //fake :p
        $aData['USR_COUNTRY'] = $form['USR_COUNTRY'];
        $aData['USR_CITY'] = $form['USR_CITY'];
        $aData['USR_LOCATION'] = $form['USR_LOCATION'];
@@ -130,7 +130,7 @@ try {
                $aData['USR_PASSWORD'] = $form['USR_PASSWORD'];
                require_once 'classes/model/UsersProperties.php';
                $oUserProperty = new UsersProperties();
-                $aUserProperty = $oUserProperty->loadOrCreateIfNotExists( $form['USR_UID'], array ('USR_PASSWORD_HISTORY' => serialize( array (md5( $form['USR_PASSWORD'] )
+                $aUserProperty = $oUserProperty->loadOrCreateIfNotExists( $form['USR_UID'], array ('USR_PASSWORD_HISTORY' => serialize( array (G::encryptOld( $form['USR_PASSWORD'] )
                ) )
                ) );