Merge branch 'master' of github.com:colosa/processmaker

gulliver/js/codemirrorOld/contrib/php/style/phpcolors.css

@@ -0,0 +1,114 @@
+/*
+Copyright (c) 2008-2009 Yahoo! Inc. All rights reserved.
+The copyrights embodied in the content of this file are licensed by
+Yahoo! Inc. under the BSD (revised) open source license
+
+@author Dan Vlad Dascalescu <dandv@yahoo-inc.com>
+*/
+
+html {
+  cursor: text;
+}
+
+.editbox {
+  margin: .4em;
+  padding: 0;
+  font-family: monospace;
+  font-size: 10pt;
+}
+
+/*We should define specific styles for every element of the syntax.
+  the setting below will cause some annoying color to show through if we missed
+  defining a style for a token. This is also the "color" of the whitespace and
+  of the cursor.
+*/
+pre.code, .editbox {
+  color: red;
+}
+
+.editbox p {
+  margin: 0;
+}
+
+span.php-punctuation {
+  color: blue;
+}
+
+span.php-keyword {
+  color: #770088;
+  font-weight: bold;
+}
+
+span.php-operator {
+  color: blue;
+}
+
+/* __FILE__ etc.; http://php.net/manual/en/reserved.php */
+span.php-compile-time-constant {
+  color: #776088;
+  font-weight: bold;
+}
+
+/* output of get_defined_constants(). Differs from http://php.net/manual/en/reserved.constants.php */
+span.php-predefined-constant {
+  color: darkgreen;
+  font-weight: bold;
+}
+
+/* PHP reserved "language constructs"... echo() etc.; http://php.net/manual/en/reserved.php */
+span.php-reserved-language-construct {
+  color: green;
+  font-weight: bold;
+}
+
+/* PHP built-in functions: glob(), chr() etc.; output of get_defined_functions()["internal"] */
+span.php-predefined-function {
+  color: green;
+}
+
+/* PHP predefined classes: PDO, Exception etc.; output of get_declared_classes() and different from http://php.net/manual/en/reserved.classes.php */
+span.php-predefined-class {
+  color: green;
+}
+
+span.php-atom {
+  color: #228811;
+}
+
+/* class, interface, namespace or function names, but not $variables */
+span.php-t_string {
+  color: black;
+}
+
+span.php-variable {
+  color: black;
+  font-weight: bold;
+}
+
+
+span.js-localvariable {
+  color: #004499;
+}
+
+span.php-comment {
+  color: #AA7700;
+  font-stretch: condensed;
+/*  font-style: italic;  This causes line height to slightly change, getting line numbers out of sync */
+}
+
+span.php-string-single-quoted {
+  color: #AA2222;
+}
+/* double quoted strings allow interpolation */
+span.php-string-double-quoted {
+  color: #AA2222;
+  font-weight: bold;
+}
+
+span.syntax-error {
+  background-color: red;
+}
+
+span.deprecated {
+  font-size: smaller;
+}

gulliver/js/codemirrorOld/style/csscolors.css

@@ -0,0 +1,55 @@
+html {
+  cursor: text;
+}
+
+.editbox {
+  margin: .4em;
+  padding: 0;
+  font-family: monospace;
+  font-size: 10pt;
+  color: black;
+}
+
+pre.code, .editbox {
+  color: #666;
+}
+
+.editbox p {
+  margin: 0;
+}
+
+span.css-at {
+  color: #708;
+}
+
+span.css-unit {
+  color: #281;
+}
+
+span.css-value {
+  color: #708;
+}
+
+span.css-identifier {
+  color: black;
+}
+
+span.css-selector {
+  color: #11B;
+}
+
+span.css-important {
+  color: #00F;
+}
+
+span.css-colorcode {
+  color: #299;
+}
+
+span.css-comment {
+  color: #A70;
+}
+
+span.css-string {
+  color: #A22;
+}

gulliver/js/codemirrorOld/style/docs.css

@@ -0,0 +1,158 @@
+body {
+  font-family: Arial, sans-serif;
+  line-height: 1.5;
+  max-width: 64.3em;
+  margin: 3em auto;
+  padding: 0 1em;
+}
+body.droid {
+  font-family: Droid Sans, Arial, sans-serif;
+}
+
+h1 {
+  letter-spacing: -3px;
+  font-size: 3.23em;
+  font-weight: bold;
+  margin: 0;
+}
+
+h2 {
+  font-size: 1.23em;
+  font-weight: bold;
+  margin: .5em 0;
+  letter-spacing: -1px;
+}
+
+h3 {
+  font-size: 1em;
+  font-weight: bold;
+  margin: .4em 0;
+}
+
+pre {
+  font-family: Courier New, monospaced;
+  background-color: #eee;
+  -moz-border-radius: 6px;
+  -webkit-border-radius: 6px;
+  border-radius: 6px;
+  padding: 1em;
+}
+
+pre.code {
+  margin: 0 1em;
+}
+
+.grey {
+  font-size: 2em;
+  padding: .5em 1em;
+  line-height: 1.2em;
+  margin-top: .5em;
+  position: relative;
+}
+
+img.logo {
+  position: absolute;
+  right: -25px;
+  bottom: 4px;
+}
+
+a:link, a:visited, .quasilink {
+  color: #df0019;
+  cursor: pointer;
+  text-decoration: none;
+}
+
+a:hover, .quasilink:hover {
+  color: #800004;
+}
+
+h1 a:link, h1 a:visited, h1 a:hover {
+  color: black;
+}
+
+ul {
+  margin: 0;
+  padding-left: 1.2em;
+}
+
+a.download {
+  color: white;
+  background-color: #df0019;
+  width: 100%;
+  display: block;
+  text-align: center;
+  font-size: 1.23em;
+  font-weight: bold;
+  text-decoration: none;
+  -moz-border-radius: 6px;
+  -webkit-border-radius: 6px;
+  border-radius: 6px;
+  padding: .5em 0;
+  margin-bottom: 1em;
+}
+
+a.download:hover {
+  background-color: #bb0010;
+}
+
+.rel {
+  margin-bottom: 0;
+}
+
+.rel-note {
+  color: #777;
+  font-size: .9em;
+  margin-top: .1em;
+}
+
+.logo-braces {
+  color: #df0019;
+  position: relative;
+  top: -4px;
+}
+
+.blk {
+  float: left;
+}
+
+.left {
+  width: 37em;
+  padding-right: 6.53em;
+  padding-bottom: 1em;
+}
+
+.left1 {
+  width: 15.24em;
+  padding-right: 6.45em;
+}
+
+.left2 {
+  width: 15.24em;
+}
+
+.right {
+  width: 20.68em;
+}
+
+.leftbig {
+  width: 42.44em;
+  padding-right: 6.53em;
+}
+
+.rightsmall {
+  width: 15.24em;
+}
+
+.clear:after {
+  visibility: hidden;
+  display: block;
+  font-size: 0;
+  content: " ";
+  clear: both;
+  height: 0;
+}
+.clear { display: inline-block; }
+/* start commented backslash hack \*/
+* html .clear { height: 1%; }
+.clear { display: block; }
+/* close commented backslash hack */

gulliver/js/codemirrorOld/style/font.js

@@ -0,0 +1,15 @@
+function waitForStyles() {
+  for (var i = 0; i < document.styleSheets.length; i++)
+    if (/googleapis/.test(document.styleSheets[i].href))
+      return document.body.className += " droid";
+  setTimeout(waitForStyles, 100);
+}
+setTimeout(function() {
+  if (/AppleWebKit/.test(navigator.userAgent) && /iP[oa]d|iPhone/.test(navigator.userAgent)) return;
+  var link = document.createElement("LINK");
+  link.type = "text/css";
+  link.rel = "stylesheet";
+  link.href = "http://fonts.googleapis.com/css?family=Droid+Sans|Droid+Sans:bold";
+  document.documentElement.getElementsByTagName("HEAD")[0].appendChild(link);
+  waitForStyles();
+}, 20);

gulliver/js/codemirrorOld/style/jscolors.css

@@ -0,0 +1,59 @@
+html {
+  cursor: text;
+}
+
+.editbox {
+  margin: .4em;
+  padding: 0;
+  font-family: monospace;
+  font-size: 10pt;
+  color: black;
+}
+
+pre.code, .editbox {
+  color: #666666;
+}
+
+.editbox p {
+  margin: 0;
+}
+
+span.js-punctuation {
+  color: #666666;
+}
+
+span.js-operator {
+  color: #666666;
+}
+
+span.js-keyword {
+  color: #770088;
+}
+
+span.js-atom {
+  color: #228811;
+}
+
+span.js-variable {
+  color: black;
+}
+
+span.js-variabledef {
+  color: #0000FF;
+}
+
+span.js-localvariable {
+  color: #004499;
+}
+
+span.js-property {
+  color: black;
+}
+
+span.js-comment {
+  color: #AA7700;
+}
+
+span.js-string {
+  color: #AA2222;
+}

gulliver/js/codemirrorOld/style/sparqlcolors.css

@@ -0,0 +1,43 @@
+html {
+  cursor: text;
+}
+
+.editbox {
+  margin: .4em;
+  padding: 0;
+  font-family: monospace;
+  font-size: 10pt;
+  color: black;
+}
+
+.editbox p {
+  margin: 0;
+}
+
+span.sp-keyword {
+  color: #708;
+}
+
+span.sp-prefixed {
+  color: #5d1;
+}
+
+span.sp-var {
+  color: #00c;
+}
+
+span.sp-comment {
+  color: #a70;
+}
+
+span.sp-literal {
+  color: #a22;
+}
+
+span.sp-uri {
+  color: #292;
+}
+
+span.sp-operator {
+  color: #088;
+}

gulliver/js/codemirrorOld/style/xmlcolors.css

@@ -0,0 +1,55 @@
+html {
+  cursor: text;
+}
+
+.editbox {
+  margin: .4em;
+  padding: 0;
+  font-family: monospace;
+  font-size: 10pt;
+  color: black;
+}
+
+.editbox p {
+  margin: 0;
+}
+
+span.xml-tagname {
+  color: #A0B;
+}
+
+span.xml-attribute {
+  color: #281;
+}
+
+span.xml-punctuation {
+  color: black;
+}
+
+span.xml-attname {
+  color: #00F;
+}
+
+span.xml-comment {
+  color: #A70;
+}
+
+span.xml-cdata {
+  color: #48A;
+}
+
+span.xml-processing {
+  color: #999;
+}
+
+span.xml-entity {
+  color: #A22;
+}
+
+span.xml-error {
+ color: #F00 !important;
+}
+
+span.xml-text {
+  color: black;
+}

gulliver/system/class.g.php

@@ -1760,12 +1760,6 @@ class G
 
                         if (isset($aFields[$grdName]) && is_array($aFields[$grdName])) {
                             foreach ($aFields[$grdName] as $aRow) {
-                                foreach ($aRow as $sKey => $vValue) {
-                                    if (!is_array($vValue)) {
-                                        $aRow[$sKey] = nl2br($aRow[$sKey]);
-                                    }
-                                }
-
                                 $strData = $strData . G::replaceDataField($arrayMatch2[2], $aRow);
                             }
                         }
@@ -1784,12 +1778,6 @@ class G
 
         $sContent = $strContentAux;
 
-        foreach ($aFields as $sKey => $vValue) {
-            if (!is_array($vValue)) {
-                $aFields[$sKey] = nl2br($aFields[$sKey]);
-            }
-        }
-
         $sContent = G::replaceDataField($sContent, $aFields);
 
         return $sContent;

rbac/engine/classes/model/RbacUsers.php

@@ -59,6 +59,7 @@ class RbacUsers extends BaseRbacUsers
      *  -2: password errado
      *  -3: usuario inactivo
      *  -4: usuario vencido
+     *  -6: role inactivo
      *  n : uid de usuario
      */
     public function verifyLogin($sUsername, $sPassword)
@@ -89,6 +90,10 @@ class RbacUsers extends BaseRbacUsers
                         if ($aFields['USR_STATUS'] != 1) {
                             return -3;
                         }
+                        $role = $this->getUserRole($aFields['USR_UID']);
+                        if ($role['ROL_STATUS'] == 0) {
+                            return -6;
+                        }
                         return $aFields['USR_UID'];
                     } else {
                         return -2;
@@ -293,6 +298,28 @@ class RbacUsers extends BaseRbacUsers
         }
         return $aUsers;
     }
+
+    public function getUserRole($UsrUid)
+    {
+        $con = Propel::getConnection(UsersRolesPeer::DATABASE_NAME);
+        try {
+            $c = new Criteria( 'rbac' );
+            $c->clearSelectColumns();
+            $c->addSelectColumn ( RolesPeer::ROL_UID );
+            $c->addSelectColumn ( RolesPeer::ROL_CODE );
+            $c->addSelectColumn ( RolesPeer::ROL_STATUS );
+            $c->addJoin ( UsersRolesPeer::ROL_UID, RolesPeer::ROL_UID );
+            $c->add ( UsersRolesPeer::USR_UID, $UsrUid );
+            $rs = UsersRolesPeer::doSelectRs( $c );
+            $rs->setFetchmode (ResultSet::FETCHMODE_ASSOC);
+            $rs->next();
+            $row = $rs->getRow();
+            return $row;
+        }
+        catch (Exception $oError) {
+          throw($oError);
+        }
+    }
 }
 
 // Users

workflow/engine/classes/class.configuration.php

@@ -535,13 +535,13 @@ class Configurations // extends Configuration
         return $formats;
     }
 
-    public function getSystemDate($dateTime)
+    public function getSystemDate($dateTime, $type='dateFormat')
     {
         $oConf = new Configurations();
         $oConf->getFormats();
         $dateFormat = $oConf->UserConfig['dateFormat'];
         $oConf->loadConfig($obj, 'ENVIRONMENT_SETTINGS', '');
-        $creationDateMask = isset($oConf->aConfig['dateFormat']) ? $oConf->aConfig['dateFormat'] : '';
+        $creationDateMask = isset($oConf->aConfig[$type]) ? $oConf->aConfig[$type] : '';
         $creationDateMask = ($creationDateMask == '') ? $dateFormat : $creationDateMask;
         if ($creationDateMask != '') {
             if (strpos($dateTime, ' ') !== false) {

workflow/engine/classes/model/AppNotes.php

@@ -254,7 +254,9 @@ class AppNotes extends BaseAppNotes
             $noteRecipientsList = array();
 
             foreach ($p["array"] as $key => $userParticipated) {
-                $noteRecipientsList[] = $key;
+                if ($key != '') {
+                    $noteRecipientsList[] = $key;
+                }
             }
 
             $noteRecipients = implode(",", $noteRecipientsList);

workflow/engine/classes/model/OutputDocument.php

@@ -477,7 +477,7 @@ class OutputDocument extends BaseOutputDocument
     public function generate($sUID, $aFields, $sPath, $sFilename, $sContent, $sLandscape = false, $sTypeDocToGener = 'BOTH', $aProperties = array())
     {
         if (($sUID != '') && is_array($aFields) && ($sPath != '')) {
-            $sContent = G::replaceDataGridField($sContent, $aFields);
+            $sContent = nl2br(G::replaceDataGridField($sContent, $aFields));
 
             G::verifyPath($sPath, true);
 

workflow/engine/controllers/home.php

@@ -332,7 +332,18 @@ class Home extends Controller
             }
 
             if (isset( $row['DEL_DELEGATE_DATE'] )) {
-                $cases['data'][$i]['DEL_DELEGATE_DATE'] = G::getformatedDate( $row['DEL_DELEGATE_DATE'], 'M d, yyyy - h:i:s' );
+                G::LoadClass( "configuration" );
+                $conf = new Configurations();
+                $generalConfCasesList = $conf->getConfiguration( 'ENVIRONMENT_SETTINGS', '' );
+                $cases['data'][$i]['DEL_DELEGATE_DATE'] = '';
+                if (defined('SYS_SYS')) {
+                    if (isset( $generalConfCasesList['casesListDateFormat'] ) && ! empty( $generalConfCasesList['casesListDateFormat'] )) {
+                        $cases['data'][$i]['DEL_DELEGATE_DATE'] = $conf->getSystemDate($row['DEL_DELEGATE_DATE'], 'casesListDateFormat');
+                    }
+                }
+                if ($cases['data'][$i]['DEL_DELEGATE_DATE'] == '') {
+                    $cases['data'][$i]['DEL_DELEGATE_DATE'] = $conf->getSystemDate($row['DEL_DELEGATE_DATE']);
+                }
             }
             if (isset( $row['APP_DEL_PREVIOUS_USER'] )) {
                 $cases['data'][$i]['APP_DEL_PREVIOUS_USER'] = ucwords( $row['APP_DEL_PREVIOUS_USER'] );

workflow/engine/methods/cases/proxySaveReassignCasesList.php

@@ -54,6 +54,7 @@ if (is_array( $aData )) {
     $currentCasesReassigned = 0;
     foreach ($aData as $data) {
         $oTmpReassignCriteria = $oCasesReassignList;
+        $oTmpReassignCriteria->add( AppCacheViewPeer::APP_UID, $data->APP_UID );
         $oTmpReassignCriteria->add( AppCacheViewPeer::TAS_UID, $data->TAS_UID );
         $rs = AppCacheViewPeer::doSelectRS( $oTmpReassignCriteria );
         $rs->setFetchmode( ResultSet::FETCHMODE_ASSOC );

workflow/engine/methods/login/authentication.php

@@ -81,6 +81,9 @@ try {
             case -5:
                 $errLabel = 'ID_AUTHENTICATION_SOURCE_INVALID';
                 break;
+            case -6:
+                $errLabel = 'ID_ROLE_INACTIVE';
+                break;
         }
 
         //to avoid empty string in user field.  This will avoid a weird message "this row doesn't exist"

workflow/engine/methods/users/usersAjax.php

@@ -160,7 +160,7 @@ switch ($_POST['action']) {
                 $aData['USR_AUTH_USER_DN'] = $form['USR_AUTH_USER_DN'];
                 //fixing bug in inactive user when the admin create a new user.
                 $statusWF = $form['USR_STATUS'];
-                $aData['USR_STATUS'] = $form['USR_STATUS'] == 'ACTIVE' ? 1 : 0;
+                $aData['USR_STATUS'] = $form['USR_STATUS'] ;//== 'ACTIVE' ? 1 : 0;
                 try {
                     $sUserUID = $RBAC->createUser($aData, $form['USR_ROLE']);
                 } catch(Exception $oError) {

workflow/engine/templates/cases/casesList.js

@@ -1975,7 +1975,7 @@ var gridForm = new Ext.FormPanel({
                     }*/
                 }),
                 //autoExpandColumn: 'company',
-                height: 350,
+                height: 265,
                 title  : _('ID_CASES_TO_REASSIGN_TASK_LIST'),
                 border : true,
 

workflow/engine/templates/pmTables/edit.js

@@ -681,6 +681,7 @@ Ext.onReady(function(){
                   xtype: "checkbox",
                   id: "chkKeepData",
                   name: "chkKeepData",
+                  checked : true,
                   boxLabel: _("ID_PMTABLE_DATA_KEEP")
               }
           ]

workflow/engine/xmlform/triggers/triggers_Edit.xml

@@ -89,10 +89,12 @@ function cancel(){
 
 function triggerSave1(form){
     ajax_post(form.action, form, 'POST');
-    if(@QSTEP_UID!="" && @QST_TYPE!="" && opener.showTriggers)
+    if(opener) {
-        opener.showTriggers(@QSTEP_UID,@QST_TYPE);
+        if(@QSTEP_UID!="" && @QST_TYPE!="" && opener.showTriggers)
-    if(opener.reloadTriggersShortList)
+            opener.showTriggers(@QSTEP_UID,@QST_TYPE);
-        opener.reloadTriggersShortList();
+        if(opener.reloadTriggersShortList)
+            opener.reloadTriggersShortList();
+    }
     window.close();
 }