From 0f6644bcb012343c452b0f21bcbdc21627470a57 Mon Sep 17 00:00:00 2001
From: jennylee <jennylee@colosa.com>
Date: Wed, 17 Oct 2012 17:21:35 -0400
Subject: [PATCH 1/4] CODE STYLE, workflow/engine/methods/setup/ PART 3 (final)

FILES:
setup.js
setup.php
setupAjax.php
showLogoFile.php
skin_Ajax.php
skinsExport.php
skinsList.php
skinsNew.php
skinsSave.php
upgrade.php
upgrade_RBAC.php
upgrade_System.php
upgrade_SystemAjax.php
uplogo.php
webServices.php
webServicesAjax.php
webServicesList.php
webServicesSetup.php
webServicesSetupSave.php
weekend.php
weekendAjax.php
workPeriod.js
workPeriod.php
workPeriodGraph.php
workPeriodSave.php
---
 workflow/engine/methods/setup/setup.js        |  135 +-
 workflow/engine/methods/setup/setup.php       |   69 +-
 workflow/engine/methods/setup/setupAjax.php   |   44 +-
 .../engine/methods/setup/showLogoFile.php     |  141 +-
 workflow/engine/methods/setup/skin_Ajax.php   |  330 +-
 workflow/engine/methods/setup/skinsExport.php |  267 +-
 workflow/engine/methods/setup/skinsList.php   |  200 +-
 workflow/engine/methods/setup/skinsNew.php    |  115 +-
 workflow/engine/methods/setup/skinsSave.php   |  115 +-
 workflow/engine/methods/setup/upgrade.php     |  146 +-
 .../engine/methods/setup/upgrade_RBAC.php     |    3 +-
 .../engine/methods/setup/upgrade_System.php   |  218 +-
 .../methods/setup/upgrade_SystemAjax.php      |  785 ++---
 workflow/engine/methods/setup/uplogo.php      |   83 +-
 workflow/engine/methods/setup/webServices.php |  317 +-
 .../engine/methods/setup/webServicesAjax.php  | 2734 +++++++++--------
 .../engine/methods/setup/webServicesList.php  |   36 +-
 .../engine/methods/setup/webServicesSetup.php |   62 +-
 .../methods/setup/webServicesSetupSave.php    |   32 +-
 workflow/engine/methods/setup/weekend.php     |   61 +-
 workflow/engine/methods/setup/weekendAjax.php |   72 +-
 workflow/engine/methods/setup/workPeriod.js   |   30 +-
 workflow/engine/methods/setup/workPeriod.php  |   56 +-
 .../engine/methods/setup/workPeriodGraph.php  |  148 +-
 .../engine/methods/setup/workPeriodSave.php   |   50 +-
 25 files changed, 3146 insertions(+), 3103 deletions(-)

diff --git a/workflow/engine/methods/setup/setup.js b/workflow/engine/methods/setup/setup.js
index 2faaf5fda..bc590f9ba 100755
--- a/workflow/engine/methods/setup/setup.js
+++ b/workflow/engine/methods/setup/setup.js
@@ -1,73 +1,84 @@
+function abc(panel, txt) {
+    /*
+     * commonDialog ( '', 'saved' , 'saved', {}, '' ) ; setTimeout (
+     * leimnud.closure({instance:myDialog,method:function(panel){
+     *
+     * myDialog.remove(); panel.tabLastSelected=false; panel.tabSelected=1;
+     * panel.makeTab(); },args:panel}) , 1000 );
+     */
+    var img = document.getElementById('workPeriodGraph');
+    img.src = 'workPeriodGraph?b=' + Math.random();
 
-function abc( panel, txt ) {
-/*  commonDialog ( '', 'saved' , 'saved', {}, '' )  ;
-  setTimeout ( leimnud.closure({instance:myDialog,method:function(panel){
-  	
-  	myDialog.remove();
-  	panel.tabLastSelected=false;
-  	panel.tabSelected=1;
-  	panel.makeTab();  
-  },args:panel}) , 1000 );
-*/
-		var img = document.getElementById( 'workPeriodGraph' );
-		img.src = 'workPeriodGraph?b=' + Math.random() ;
-
-//  panel.clearContent();
-//  panel.addContent ( txt );  
-  return false;
+    // panel.clearContent();
+    // panel.addContent ( txt );
+    return false;
 }
 
-function showHideFilterForm( divName)
-{
-  if (document.getElementById( divName ).style.display==='none')
-    document.getElementById( divName).style.display = '';
-  else
-    document.getElementById( divName).style.display = 'none';
+function showHideFilterForm(divName) {
+    if (document.getElementById(divName).style.display === 'none')
+        document.getElementById(divName).style.display = '';
+    else
+        document.getElementById(divName).style.display = 'none';
 }
 
-
-
-
 function newHoliday(ev) {
-	var coor = leimnud.dom.mouse(ev); 	
-	var myPanel=new leimnud.module.panel();
-	myPanel.options={
-		size:{w:500,h:200},
-		position:{x:coor.x-200,y:coor.y},
-		title:"New Holiday",
-		theme:"panel",
-		control:{
-			close:true,
-			drag:true
-		},
-	  fx: { modal:true }
-	};
-	
-	myPanel.make();
+    var coor = leimnud.dom.mouse(ev);
+    var myPanel = new leimnud.module.panel();
+    myPanel.options = {
+        size : {
+            w : 500,
+            h : 200
+        },
+        position : {
+            x : coor.x - 200,
+            y : coor.y
+        },
+        title : "New Holiday",
+        theme : "panel",
+        control : {
+            close : true,
+            drag : true
+        },
+        fx : {
+            modal : true
+        }
+    };
 
-	var r = new leimnud.module.rpc.xmlhttp({url:"holidayNew.php"});
-	r.callback=leimnud.closure({Function:function(rpc){
-		myPanel.addContent(rpc.xmlhttp.responseText);
-	},args:r})
-	r.make();
+    myPanel.make();
+
+    var r = new leimnud.module.rpc.xmlhttp({
+        url : "holidayNew.php"
+    });
+    r.callback = leimnud.closure({
+        Function : function(rpc) {
+            myPanel.addContent(rpc.xmlhttp.responseText);
+        },
+        args : r
+    })
+    r.make();
 
 }
 
-function deleteHoliday( uid ) {
-	url = "setupAjax.php?action=deleteHoliday&uid=" + uid;
-	var r = new leimnud.module.rpc.xmlhttp({url: url });
-	r.callback=leimnud.closure({Function:function(rpc){
-		//myPanel.addContent(rpc.xmlhttp.responseText);
-		myPanel = setupPanel.panels.control;
-  	myPanel.tabLastSelected=false;
-  	myPanel.tabSelected=0;
-  	myPanel.makeTab();  
+function deleteHoliday(uid) {
+    url = "setupAjax.php?action=deleteHoliday&uid=" + uid;
+    var r = new leimnud.module.rpc.xmlhttp({
+        url : url
+    });
+    r.callback = leimnud.closure({
+        Function : function(rpc) {
+            // myPanel.addContent(rpc.xmlhttp.responseText);
+            myPanel = setupPanel.panels.control;
+            myPanel.tabLastSelected = false;
+            myPanel.tabSelected = 0;
+            myPanel.makeTab();
+
+        },
+        args : r
+    })
+    r.make();
+
+    // myPanel.clearContent();
+    // myPanel.addContent ( uid );
+
+}
 
-	},args:r})
-	r.make();
-	
-		
-//	  myPanel.clearContent();
-//    myPanel.addContent ( uid );  
-	
-}
\ No newline at end of file
diff --git a/workflow/engine/methods/setup/setup.php b/workflow/engine/methods/setup/setup.php
index d14deb371..3474063f4 100755
--- a/workflow/engine/methods/setup/setup.php
+++ b/workflow/engine/methods/setup/setup.php
@@ -12,76 +12,71 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
  */
 
 /**
  * New Admin User interface
+ *
  * @author Erik A. O. <erik@colosa.com, aortiz.erik@gmail.com>
  * @date Apr 5th, 2010
  */
 
-if (($RBAC_Response=$RBAC->userCanAccess("PM_SETUP"))!=1) return $RBAC_Response;
+if (($RBAC_Response = $RBAC->userCanAccess( "PM_SETUP" )) != 1)
+    return $RBAC_Response;
 
 $G_MAIN_MENU = "processmaker";
-$G_ID_MENU_SELECTED     = "SETUP";
-$G_PUBLISH = new Publisher;
+$G_ID_MENU_SELECTED = "SETUP";
+$G_PUBLISH = new Publisher();
 global $G_TMP_MENU;
 $oMenu = new Menu();
-$oMenu->load('setup');
-$toolItems = Array();
+$oMenu->load( 'setup' );
+$toolItems = Array ();
 
-foreach( $oMenu->Options as $i=>$option) {
-  $toolItems[] = Array(
-    'id'    => $oMenu->Id[$i],
-    'link'  => ($oMenu->Options[$i]!='')? $oMenu->Options[$i]: '#',
-    'onclick' => ($oMenu->JS[$i]!='')? $oMenu->JS[$i]: '',
-    'label' => $oMenu->Labels[$i],
-    'icon'  => ($oMenu->Icons[$i]!='')? $oMenu->Icons[$i]: 'icon-pmlogo.png',
-    'target'=> ($oMenu->JS[$i]!='')? '': 'admToolsContent'
-  );
+foreach ($oMenu->Options as $i => $option) {
+    $toolItems[] = Array ('id' => $oMenu->Id[$i],'link' => ($oMenu->Options[$i] != '') ? $oMenu->Options[$i] : '#','onclick' => ($oMenu->JS[$i] != '') ? $oMenu->JS[$i] : '','label' => $oMenu->Labels[$i],'icon' => ($oMenu->Icons[$i] != '') ? $oMenu->Icons[$i] : 'icon-pmlogo.png','target' => ($oMenu->JS[$i] != '') ? '' : 'admToolsContent'
+    );
 }
 
 $template = new TemplatePower( PATH_TPL . 'setup' . PATH_SEP . 'tools.html' );
 $template->prepare();
 
-$template->assign ('LeftWidth', '230');
-$template->assign ('contentHeight', '520');
+$template->assign( 'LeftWidth', '230' );
+$template->assign( 'contentHeight', '520' );
 
-if( isset($_GET['i18']) ){
-  $_SESSION['TOOLS_VIEWTYPE'] = true;
-  $template->assign ('displayLanguageTool', 'block');
+if (isset( $_GET['i18'] )) {
+    $_SESSION['TOOLS_VIEWTYPE'] = true;
+    $template->assign( 'displayLanguageTool', 'block' );
 } else {
-  $template->assign ('displayLanguageTool', 'none');
+    $template->assign( 'displayLanguageTool', 'none' );
 }
-if( isset($_GET['newSite']) ){
-  $template->assign ('displayNewSiteTool', 'block');
+if (isset( $_GET['newSite'] )) {
+    $template->assign( 'displayNewSiteTool', 'block' );
 } else {
-  $template->assign ('displayNewSiteTool', 'none');
+    $template->assign( 'displayNewSiteTool', 'none' );
 }
 
-
-foreach($toolItems as $item) {
-  $template->newBlock( 'tool_options');
-  foreach($item as $propertyName=>$propertyValue)
-    $template->assign ($propertyName, $propertyValue);
+foreach ($toolItems as $item) {
+    $template->newBlock( 'tool_options' );
+    foreach ($item as $propertyName => $propertyValue)
+        $template->assign( $propertyName, $propertyValue );
 }
 
-$G_PUBLISH->AddContent('template', '', '', '', $template );
-G::RenderPage('publish');
-if(isset($_GET['module'])){
+$G_PUBLISH->AddContent( 'template', '', '', '', $template );
+G::RenderPage( 'publish' );
+if (isset( $_GET['module'] )) {
 
-	 print "
+    print "
   <script>
-  admToolsContent.location='".$_GET['module']."';
+  admToolsContent.location='" . $_GET['module'] . "';
   </script>
   ";
-}
\ No newline at end of file
+}
+
diff --git a/workflow/engine/methods/setup/setupAjax.php b/workflow/engine/methods/setup/setupAjax.php
index b5f11bcfa..8c6df6445 100755
--- a/workflow/engine/methods/setup/setupAjax.php
+++ b/workflow/engine/methods/setup/setupAjax.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * setupAjax.php
- *  
+ *
  * ProcessMaker Open Source Edition
  * Copyright (C) 2004 - 2008 Colosa Inc.23
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
@@ -12,30 +12,30 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd., 
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- * 
  */
-if (($RBAC_Response=$RBAC->userCanAccess("PM_SETUP"))!=1) return $RBAC_Response;
-//$oSMTPJSON   = new Services_JSON();
-//$oSMTPData   = $oSMTPJSON->decode(stripslashes($_POST['data']));
-//$sOutput = '';
-	G::LoadClass('setup');
+if (($RBAC_Response = $RBAC->userCanAccess( "PM_SETUP" )) != 1)
+    return $RBAC_Response;
+    //$oSMTPJSON   = new Services_JSON();
+    //$oSMTPData   = $oSMTPJSON->decode(stripslashes($_POST['data']));
+    //$sOutput = '';
+G::LoadClass( 'setup' );
 
-	$oSMTPSetup = new Setup(new DBConnection);
+$oSMTPSetup = new Setup( new DBConnection() );
 
-	$action = strtolower ( $_GET['action'] );
-	$data   = $_GET;
+$action = strtolower( $_GET['action'] );
+$data = $_GET;
+
+$arr = get_class_methods( get_class( $oSMTPSetup ) );
+foreach ($arr as $method) {
+    if ($method == $action)
+        $oSMTPSetup->{$action}( $_GET );
+}
 
-	$arr = get_class_methods( get_class($oSMTPSetup) );
-	foreach ($arr as $method) {
-	if ( $method == $action )
-		$oSMTPSetup->{$action} ( $_GET );
-	}
-?>
\ No newline at end of file
diff --git a/workflow/engine/methods/setup/showLogoFile.php b/workflow/engine/methods/setup/showLogoFile.php
index a2c4e747b..756d08500 100755
--- a/workflow/engine/methods/setup/showLogoFile.php
+++ b/workflow/engine/methods/setup/showLogoFile.php
@@ -12,105 +12,104 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
  */
 //  if (($RBAC_Response = $RBAC->userCanAccess("PM_CASES"))!=1) return $RBAC_Response;
 
-  $idDecode64 = base64_decode($_GET['id']);
-  $idExploded = explode( '/', $idDecode64 );
-  if ( $idExploded[0] == '' ) array_shift($idExploded);
-  if ( $idExploded[0] == 'plugin' ) {
+
+$idDecode64 = base64_decode( $_GET['id'] );
+$idExploded = explode( '/', $idDecode64 );
+if ($idExploded[0] == '')
+    array_shift( $idExploded );
+if ($idExploded[0] == 'plugin') {
     //Get the Plugin Folder, always the first element
-    $pluginFolder   = $idExploded[1];
-    $pluginFilename = PATH_PLUGINS . $pluginFolder . PATH_SEP . 'public_html'. PATH_SEP . $idExploded[2];
-    if ( file_exists ( $pluginFilename ) ) {
-      G::streamFile ( $pluginFilename );
+    $pluginFolder = $idExploded[1];
+    $pluginFilename = PATH_PLUGINS . $pluginFolder . PATH_SEP . 'public_html' . PATH_SEP . $idExploded[2];
+    if (file_exists( $pluginFilename )) {
+        G::streamFile( $pluginFilename );
     }
-    die;
-  }
+    die();
+}
 
-	$ainfoSite = explode("/",$_SERVER["REQUEST_URI"]);
+$ainfoSite = explode( "/", $_SERVER["REQUEST_URI"] );
 //it was added to show the logo into management plugin add by krlos
-  if(isset($_GET['wsName']) && $_GET['wsName']!=''){
+if (isset( $_GET['wsName'] ) && $_GET['wsName'] != '') {
     $ainfoSite[1] = $_GET['wsName'];
-  }
+}
 //end add
-	$dir=PATH_DATA."sites".PATH_SEP.str_replace("sys","",$ainfoSite[1]).PATH_SEP."files/logos";
-	$imagen = $dir .PATH_SEP.$idDecode64;
+$dir = PATH_DATA . "sites" . PATH_SEP . str_replace( "sys", "", $ainfoSite[1] ) . PATH_SEP . "files/logos";
+$imagen = $dir . PATH_SEP . $idDecode64;
 
+if (is_file( $imagen )) {
+    showLogo( $imagen );
 
-  if (is_file($imagen))
-	{
-    showLogo($imagen);
+} else {
 
-	}
-  else {
+    $newDir = PATH_DATA . "sites" . PATH_SEP . str_replace( "sys", "", $ainfoSite[1] ) . PATH_SEP . "files/logos";
+    $dir = PATH_HOME . "public_html/files/logos";
 
-  $newDir = PATH_DATA."sites".PATH_SEP.str_replace("sys","",$ainfoSite[1]).PATH_SEP."files/logos"; 
-  $dir = PATH_HOME . "public_html/files/logos";
-  
-  if(!is_dir($newDir)){
-   G::mk_dir($newDir);
-  }
-  //this function does copy all logos from public_html/files/logos to /shared/site/yourSite/files/logos
-  //cpyMoreLogos($dir,$newDir);
-  $newDir .= PATH_SEP.$idDecode64;
-  $dir    .= PATH_SEP.$idDecode64;
-  copy($dir,$newDir);
-  showLogo($newDir);
-  die;
-
-  }
-
-
-  function showLogo($imagen){
-    $info = @getimagesize($imagen);
-    $fp = fopen($imagen, "rb");
-    if ($info && $fp) {
-        header("Content-type: {$info['mime']}");
-        fpassthru($fp);
-        exit;
-    } else {
-        throw new Exception("Image format not valid");
+    if (! is_dir( $newDir )) {
+        G::mk_dir( $newDir );
     }
-  }
+    //this function does copy all logos from public_html/files/logos to /shared/site/yourSite/files/logos
+    //cpyMoreLogos($dir,$newDir);
+    $newDir .= PATH_SEP . $idDecode64;
+    $dir .= PATH_SEP . $idDecode64;
+    copy( $dir, $newDir );
+    showLogo( $newDir );
+    die();
 
-  function cpyMoreLogos($dir,$newDir){
-    if (file_exists($dir)) {
-        if ($handle = opendir($dir)) {
-          while (false !== ($file = readdir($handle))) {
-            if(($file!=".")&&($file!="..")) {
-              $extention=explode(".", $file);
-              $aImageProp=getimagesize($dir.'/'.$file, $info);
-              $sfileExtention = strtoupper($extention[count($extention)-1]);
-              if( in_array($sfileExtention, array('JPG','JPEG','PNG','GIF') ) ) {
+}
 
-                $dir1 = $dir.PATH_SEP.$file;
-                $dir2 = $newDir.PATH_SEP.$file;
-                //print $dir1 ."  *** ".$dir2."<br><br>";
-                copy($dir1,$dir2);
+function showLogo ($imagen)
+{
+    $info = @getimagesize( $imagen );
+    $fp = fopen( $imagen, "rb" );
+    if ($info && $fp) {
+        header( "Content-type: {$info['mime']}" );
+        fpassthru( $fp );
+        exit();
+    } else {
+        throw new Exception( "Image format not valid" );
+    }
+}
 
+function cpyMoreLogos ($dir, $newDir)
+{
+    if (file_exists( $dir )) {
+        if ($handle = opendir( $dir )) {
+            while (false !== ($file = readdir( $handle ))) {
+                if (($file != ".") && ($file != "..")) {
+                    $extention = explode( ".", $file );
+                    $aImageProp = getimagesize( $dir . '/' . $file, $info );
+                    $sfileExtention = strtoupper( $extention[count( $extention ) - 1] );
+                    if (in_array( $sfileExtention, array ('JPG','JPEG','PNG','GIF'
+                    ) )) {
 
-              }
+                        $dir1 = $dir . PATH_SEP . $file;
+                        $dir2 = $newDir . PATH_SEP . $file;
+                        //print $dir1 ."  *** ".$dir2."<br><br>";
+                        copy( $dir1, $dir2 );
+
+                    }
+                }
             }
-          }
-          closedir($handle);
+            closedir( $handle );
         }
-      }
-  }
+    }
+}
 
-die;
-	
+die();
 
 ?>
 <script>
- 
+
 </script>
+
diff --git a/workflow/engine/methods/setup/skin_Ajax.php b/workflow/engine/methods/setup/skin_Ajax.php
index 695dae0f6..3fb3e8161 100755
--- a/workflow/engine/methods/setup/skin_Ajax.php
+++ b/workflow/engine/methods/setup/skin_Ajax.php
@@ -1,255 +1,250 @@
 <?php
 
-if (!isset($_REQUEST ['action'])) {
-    $res ['success'] = false;
-    $res ['error']=$res ['message'] = 'You may request an action';
+if (! isset( $_REQUEST['action'] )) {
+    $res['success'] = false;
+    $res['error'] = $res['message'] = 'You may request an action';
 
-    print G::json_encode($res);
-    die ();
+    print G::json_encode( $res );
+    die();
 }
-if (!function_exists($_REQUEST ['action'])) {
-    $res ['success'] = false;
-    $res ['error']=$res ['message'] = 'The requested action does not exist';
+if (! function_exists( $_REQUEST['action'] )) {
+    $res['success'] = false;
+    $res['error'] = $res['message'] = 'The requested action does not exist';
 
-    print G::json_encode($res);
-    die ();
+    print G::json_encode( $res );
+    die();
 }
-$restrictedFunctions=array('copy_skin_folder','addTarFolder');
-if (in_array($_REQUEST ['action'],$restrictedFunctions)) {
-    $res ['success'] = false;
-    $res ['error']=$res ['message'] = 'The requested action does not exist *';
-    print G::json_encode($res);
-    die ();
+$restrictedFunctions = array ('copy_skin_folder','addTarFolder'
+);
+if (in_array( $_REQUEST['action'], $restrictedFunctions )) {
+    $res['success'] = false;
+    $res['error'] = $res['message'] = 'The requested action does not exist *';
+    print G::json_encode( $res );
+    die();
 }
 
-
-$functionName = $_REQUEST ['action'];
-$functionParams = isset($_REQUEST ['params']) ? $_REQUEST ['params'] : array();
+$functionName = $_REQUEST['action'];
+$functionParams = isset( $_REQUEST['params'] ) ? $_REQUEST['params'] : array ();
 
 $functionName();
 
-function updatePageSize()
+function updatePageSize ()
 {
-    G::LoadClass('configuration');
+    G::LoadClass( 'configuration' );
     $c = new Configurations();
     $arr['pageSize'] = $_REQUEST['size'];
-    $arr['dateSave'] = date('Y-m-d H:i:s');
-    $config = Array();
+    $arr['dateSave'] = date( 'Y-m-d H:i:s' );
+    $config = Array ();
     $config[] = $arr;
     $c->aConfig = $config;
-    $c->saveConfig('skinsList', 'pageSize', '', $_SESSION['USER_LOGGED']);
+    $c->saveConfig( 'skinsList', 'pageSize', '', $_SESSION['USER_LOGGED'] );
     echo '{success: true}';
 }
 
-function skinList()
+function skinList ()
 {
-    G::loadClass('system');
+    G::loadClass( 'system' );
 
     $skinList = System::getSkingList();
-    
+
     $wildcard = '';
-    if(isset($_REQUEST['activeskin']))
-    {
+    if (isset( $_REQUEST['activeskin'] )) {
         $wildcard = '@';
     }
     foreach ($skinList['skins'] as $key => $value) {
         if ($value['SKIN_FOLDER_ID'] != 'simplified' && $value['SKIN_FOLDER_ID'] != 'uxs') {
-            if($skinList['currentSkin'] == $value['SKIN_FOLDER_ID']){ 
-                $value['SKIN_STATUS'] = $wildcard . G::LoadTranslation('ID_ACTIVE');
+            if ($skinList['currentSkin'] == $value['SKIN_FOLDER_ID']) {
+                $value['SKIN_STATUS'] = $wildcard . G::LoadTranslation( 'ID_ACTIVE' );
                 $value['SKIN_NAME'] = $wildcard . $value['SKIN_NAME'];
                 $value['SKIN_DESCRIPTION'] = $wildcard . $value['SKIN_DESCRIPTION'];
                 $value['SKIN_AUTHOR'] = $wildcard . $value['SKIN_AUTHOR'];
                 $value['SKIN_CREATEDATE'] = $wildcard . $value['SKIN_CREATEDATE'];
                 $value['SKIN_MODIFIEDDATE'] = $wildcard . $value['SKIN_MODIFIEDDATE'];
-            }
-            else{
-                $value['SKIN_STATUS'] = G::LoadTranslation('ID_INACTIVE');
+            } else {
+                $value['SKIN_STATUS'] = G::LoadTranslation( 'ID_INACTIVE' );
             }
             $skinListArray['skins'][] = $value;
         }
     }
     $skinListArray['currentSkin'] = $skinList['currentSkin'];
-    echo G::json_encode($skinListArray);
+    echo G::json_encode( $skinListArray );
 }
 
-function newSkin($baseSkin='classic')
+function newSkin ($baseSkin = 'classic')
 {
-    $skinBase = $baseSkin != "" ? strtolower($baseSkin) : 'classic';
-    if ((isset($_REQUEST['skinBase'])) && ($_REQUEST['skinBase'] != "")) {
-        $skinBase = strtolower($_REQUEST['skinBase']);
+    $skinBase = $baseSkin != "" ? strtolower( $baseSkin ) : 'classic';
+    if ((isset( $_REQUEST['skinBase'] )) && ($_REQUEST['skinBase'] != "")) {
+        $skinBase = strtolower( $_REQUEST['skinBase'] );
     }
 
     try {
-        if (!(isset($_REQUEST['skinName']))) {
-            throw ( new Exception(G::LoadTranslation('ID_SKIN_NAME_REQUIRED')) );
+        if (! (isset( $_REQUEST['skinName'] ))) {
+            throw (new Exception( G::LoadTranslation( 'ID_SKIN_NAME_REQUIRED' ) ));
         }
-        if (!(isset($_REQUEST['skinFolder']))) {
-            throw ( new Exception(G::LoadTranslation('ID_SKIN_FOLDER_REQUIRED')) );
+        if (! (isset( $_REQUEST['skinFolder'] ))) {
+            throw (new Exception( G::LoadTranslation( 'ID_SKIN_FOLDER_REQUIRED' ) ));
         }
         //Should validate skin folder name here
         //if....
 
+
         $skinName = $_REQUEST['skinName'];
         $skinFolder = $_REQUEST['skinFolder'];
-        $skinDescription = isset($_REQUEST['skinDescription']) ? $_REQUEST['skinDescription'] : '';
-        $skinAuthor = isset($_REQUEST['skinAuthor']) ? $_REQUEST['skinAuthor'] : 'ProcessMaker Team';
+        $skinDescription = isset( $_REQUEST['skinDescription'] ) ? $_REQUEST['skinDescription'] : '';
+        $skinAuthor = isset( $_REQUEST['skinAuthor'] ) ? $_REQUEST['skinAuthor'] : 'ProcessMaker Team';
 
-        if (is_dir(PATH_CUSTOM_SKINS . $skinFolder)) {
-            throw ( new Exception(G::LoadTranslation('ID_SKIN_ALREADY_EXISTS')) );
+        if (is_dir( PATH_CUSTOM_SKINS . $skinFolder )) {
+            throw (new Exception( G::LoadTranslation( 'ID_SKIN_ALREADY_EXISTS' ) ));
         }
-        if (strtolower($skinFolder) == 'classic') {
-            throw ( new Exception(G::LoadTranslation('ID_SKIN_ALREADY_EXISTS')) );
+        if (strtolower( $skinFolder ) == 'classic') {
+            throw (new Exception( G::LoadTranslation( 'ID_SKIN_ALREADY_EXISTS' ) ));
         }
 
         //All validations OK then create skin
         switch ($skinBase) {
             //Validate skin base
             case 'uxmodern':
-                copy_skin_folder(G::ExpandPath("skinEngine") . 'uxmodern' . PATH_SEP, PATH_CUSTOM_SKINS .
-                    $skinFolder,array("config.xml"));
-                $pathBase=G::ExpandPath("skinEngine") . 'base' . PATH_SEP;
+                copy_skin_folder( G::ExpandPath( "skinEngine" ) . 'uxmodern' . PATH_SEP, PATH_CUSTOM_SKINS . $skinFolder, array ("config.xml"
+                ) );
+                $pathBase = G::ExpandPath( "skinEngine" ) . 'base' . PATH_SEP;
                 break;
             case 'classic':
                 //Special Copy of this dir + xmlreplace
-                copy_skin_folder(G::ExpandPath("skinEngine") . 'base' . PATH_SEP, PATH_CUSTOM_SKINS .
-                    $skinFolder,array("config.xml","baseCss"));
-                $pathBase=G::ExpandPath("skinEngine") . 'base' . PATH_SEP;
+                copy_skin_folder( G::ExpandPath( "skinEngine" ) . 'base' . PATH_SEP, PATH_CUSTOM_SKINS . $skinFolder, array ("config.xml","baseCss"
+                ) );
+                $pathBase = G::ExpandPath( "skinEngine" ) . 'base' . PATH_SEP;
                 break;
             default:
                 //Commmon copy/paste of a folder + xmlrepalce
-                copy_skin_folder(PATH_CUSTOM_SKINS . $skinBase, PATH_CUSTOM_SKINS . $skinFolder,array("config.xml"));
-                $pathBase=PATH_CUSTOM_SKINS.$skinBase;
+                copy_skin_folder( PATH_CUSTOM_SKINS . $skinBase, PATH_CUSTOM_SKINS . $skinFolder, array ("config.xml"
+                ) );
+                $pathBase = PATH_CUSTOM_SKINS . $skinBase;
                 break;
         }
         //ReBuild config file
         //TODO: Improve this pre_replace lines
-        $configFileOriginal = $pathBase .  PATH_SEP . 'config.xml';
+        $configFileOriginal = $pathBase . PATH_SEP . 'config.xml';
         $configFileFinal = PATH_CUSTOM_SKINS . $skinFolder . PATH_SEP . 'config.xml';
-        $xmlConfiguration = file_get_contents($configFileOriginal);
-        $xmlConfiguration = preg_replace('/(<id>)(.+?)(<\/id>)/i', '<id>' . G::generateUniqueID() .
-            '</id><!-- $2 -->', $xmlConfiguration);
-        $xmlConfiguration = preg_replace("/(<name>)(.+?)(<\/name>)/i", "<name>" . $skinName .
-            "</name><!-- $2 -->", $xmlConfiguration);
-        $xmlConfiguration = preg_replace("/(<description>)(.+?)(<\/description>)/i", "<description>" .
-            $skinDescription . "</description><!-- $2 -->", $xmlConfiguration);
-        $xmlConfiguration = preg_replace("/(<author>)(.+?)(<\/author>)/i", "<author>" . $skinAuthor .
-            "</author><!-- $2 -->", $xmlConfiguration);
-        $xmlConfiguration = preg_replace("/(<createDate>)(.+?)(<\/createDate>)/i", "<createDate>" .
-            date("Y-m-d H:i:s") . "</createDate><!-- $2 -->", $xmlConfiguration);
-        $xmlConfiguration = preg_replace("/(<modifiedDate>)(.+?)(<\/modifiedDate>)/i", "<modifiedDate>" .
-            date("Y-m-d H:i:s") . "</modifiedDate><!-- $2 -->", $xmlConfiguration);
-        file_put_contents($configFileFinal, $xmlConfiguration);
+        $xmlConfiguration = file_get_contents( $configFileOriginal );
+        $xmlConfiguration = preg_replace( '/(<id>)(.+?)(<\/id>)/i', '<id>' . G::generateUniqueID() . '</id><!-- $2 -->', $xmlConfiguration );
+        $xmlConfiguration = preg_replace( "/(<name>)(.+?)(<\/name>)/i", "<name>" . $skinName . "</name><!-- $2 -->", $xmlConfiguration );
+        $xmlConfiguration = preg_replace( "/(<description>)(.+?)(<\/description>)/i", "<description>" . $skinDescription . "</description><!-- $2 -->", $xmlConfiguration );
+        $xmlConfiguration = preg_replace( "/(<author>)(.+?)(<\/author>)/i", "<author>" . $skinAuthor . "</author><!-- $2 -->", $xmlConfiguration );
+        $xmlConfiguration = preg_replace( "/(<createDate>)(.+?)(<\/createDate>)/i", "<createDate>" . date( "Y-m-d H:i:s" ) . "</createDate><!-- $2 -->", $xmlConfiguration );
+        $xmlConfiguration = preg_replace( "/(<modifiedDate>)(.+?)(<\/modifiedDate>)/i", "<modifiedDate>" . date( "Y-m-d H:i:s" ) . "</modifiedDate><!-- $2 -->", $xmlConfiguration );
+        file_put_contents( $configFileFinal, $xmlConfiguration );
 
         $response['success'] = true;
-        $response['message'] = G::LoadTranslation('ID_SKIN_SUCCESS_CREATE');
-        print_r(G::json_encode($response));
+        $response['message'] = G::LoadTranslation( 'ID_SKIN_SUCCESS_CREATE' );
+        print_r( G::json_encode( $response ) );
     } catch (Exception $e) {
         $response['success'] = false;
         $response['message'] = $e->getMessage();
         $response['error'] = $e->getMessage();
-        print_r(G::json_encode($response));
+        print_r( G::json_encode( $response ) );
     }
 }
 
-function importSkin()
+function importSkin ()
 {
     try {
-        if (!isset($_FILES['uploadedFile'])) {
-            throw ( new Exception(G::LoadTranslation('ID_SKIN_FILE_REQUIRED')) );
+        if (! isset( $_FILES['uploadedFile'] )) {
+            throw (new Exception( G::LoadTranslation( 'ID_SKIN_FILE_REQUIRED' ) ));
         }
-        $uploadedInstances = count($_FILES['uploadedFile']['name']);
+        $uploadedInstances = count( $_FILES['uploadedFile']['name'] );
         $sw_error = false;
-        $sw_error_exists = isset($_FILES['uploadedFile']['error']);
+        $sw_error_exists = isset( $_FILES['uploadedFile']['error'] );
         $emptyInstances = 0;
-        $quequeUpload = array();
+        $quequeUpload = array ();
 
         // upload files & check for errors
         $tmp = $_FILES['uploadedFile']['tmp_name'];
-        $items = stripslashes($_FILES['uploadedFile']['name']);
+        $items = stripslashes( $_FILES['uploadedFile']['name'] );
         if ($sw_error_exists) {
             $up_err = $_FILES['uploadedFile']['error'];
         } else {
-            $up_err= ( file_exists($tmp) ? 0 : 4);
+            $up_err = (file_exists( $tmp ) ? 0 : 4);
         }
 
         if ($items == "" || $up_err == 4) {
-            throw ( new Exception(G::LoadTranslation('ID_SKIN_FILE_REQUIRED')));
+            throw (new Exception( G::LoadTranslation( 'ID_SKIN_FILE_REQUIRED' ) ));
         }
         if ($up_err == 1 || $up_err == 2) {
-            throw ( new Exception(G::LoadTranslation('ID_FILE_TOO_BIG')));
+            throw (new Exception( G::LoadTranslation( 'ID_FILE_TOO_BIG' ) ));
             //$errors[$i]='miscfilesize';
         }
         if ($up_err == 3) {
-            throw ( new Exception(G::LoadTranslation('ID_ERROR_UPLOAD_FILE_CONTACT_ADMINISTRATOR')));
+            throw (new Exception( G::LoadTranslation( 'ID_ERROR_UPLOAD_FILE_CONTACT_ADMINISTRATOR' ) ));
             //$errors[$i]='miscfilepart';
         }
-        if (!@is_uploaded_file($tmp)) {
-            throw ( new Exception(G::LoadTranslation('ID_ERROR_UPLOAD_FILE_CONTACT_ADMINISTRATOR')));
+        if (! @is_uploaded_file( $tmp )) {
+            throw (new Exception( G::LoadTranslation( 'ID_ERROR_UPLOAD_FILE_CONTACT_ADMINISTRATOR' ) ));
             //$errors[$i]='uploadfile';
         }
-        $fileInfo = pathinfo($items);
-        $validType = array('tar', 'gz');
+        $fileInfo = pathinfo( $items );
+        $validType = array ('tar','gz'
+        );
 
-        if (!in_array($fileInfo['extension'], $validType)) {
-            throw ( new Exception(G::LoadTranslation('ID_FILE_UPLOAD_INCORRECT_EXTENSION')));
+        if (! in_array( $fileInfo['extension'], $validType )) {
+            throw (new Exception( G::LoadTranslation( 'ID_FILE_UPLOAD_INCORRECT_EXTENSION' ) ));
             //$errors[$i]='wrongtype';
         }
 
         $filename = $items;
         $tempPath = PATH_CUSTOM_SKINS . '.tmp' . PATH_SEP;
-        G::verifyPath($tempPath, true);
+        G::verifyPath( $tempPath, true );
         $tempName = $tmp;
-        G::uploadFile($tempName, $tempPath, $filename);
-        G::LoadThirdParty('pear/Archive', 'Tar');
-        $tar = new Archive_Tar($tempPath . $filename);
+        G::uploadFile( $tempName, $tempPath, $filename );
+        G::LoadThirdParty( 'pear/Archive', 'Tar' );
+        $tar = new Archive_Tar( $tempPath . $filename );
         $aFiles = $tar->listContent();
         $swConfigFile = false;
 
         foreach ($aFiles as $key => $val) {
-            if (basename($val['filename']) == 'config.xml') {
-                $skinName = dirname($val['filename']);
-                $skinArray = explode("/", $skinName);
-                if (count($skinArray) == 1) {
+            if (basename( $val['filename'] ) == 'config.xml') {
+                $skinName = dirname( $val['filename'] );
+                $skinArray = explode( "/", $skinName );
+                if (count( $skinArray ) == 1) {
                     $swConfigFile = true;
                 }
             }
         }
 
-        if (!$swConfigFile) {
-            @unlink(PATH_CUSTOM_SKINS . '.tmp' . PATH_SEP . $filename);
-            throw ( new Exception(G::LoadTranslation('ID_SKIN_CONFIGURATION_MISSING')));
+        if (! $swConfigFile) {
+            @unlink( PATH_CUSTOM_SKINS . '.tmp' . PATH_SEP . $filename );
+            throw (new Exception( G::LoadTranslation( 'ID_SKIN_CONFIGURATION_MISSING' ) ));
         }
 
-        if (is_dir(PATH_CUSTOM_SKINS . $skinName)) {
-            if ((isset($_REQUEST['overwrite_files'])) && ($_REQUEST['overwrite_files'] == 'on')) {
-                G::rm_dir(PATH_CUSTOM_SKINS . $skinName, false);
+        if (is_dir( PATH_CUSTOM_SKINS . $skinName )) {
+            if ((isset( $_REQUEST['overwrite_files'] )) && ($_REQUEST['overwrite_files'] == 'on')) {
+                G::rm_dir( PATH_CUSTOM_SKINS . $skinName, false );
             } else {
-                throw ( new Exception(G::LoadTranslation('ID_SKIN_ALREADY_EXISTS')));
+                throw (new Exception( G::LoadTranslation( 'ID_SKIN_ALREADY_EXISTS' ) ));
             }
         }
-        $res = $tar->extract(PATH_CUSTOM_SKINS);
-        if (!$res) {
-            throw ( new Exception(G::LoadTranslation('ID_SKIN_ERROR_EXTRACTING')));
+        $res = $tar->extract( PATH_CUSTOM_SKINS );
+        if (! $res) {
+            throw (new Exception( G::LoadTranslation( 'ID_SKIN_ERROR_EXTRACTING' ) ));
         }
         //Delete Temporal
-        @unlink(PATH_CUSTOM_SKINS . '.tmp' . PATH_SEP . $filename);
+        @unlink( PATH_CUSTOM_SKINS . '.tmp' . PATH_SEP . $filename );
 
         $response['success'] = true;
-        $response['message'] = G::LoadTranslation('ID_SKIN_SUCCESSFUL_IMPORTED');
-        print_r(G::json_encode($response));
+        $response['message'] = G::LoadTranslation( 'ID_SKIN_SUCCESSFUL_IMPORTED' );
+        print_r( G::json_encode( $response ) );
     } catch (Exception $e) {
         $response['success'] = false;
         $response['message'] = $e->getMessage();
         $response['error'] = $e->getMessage();
-        print_r(G::json_encode($response));
+        print_r( G::json_encode( $response ) );
     }
 }
 
-function exportSkin($skinToExport="")
+function exportSkin ($skinToExport = "")
 {
     try {
-        if (!isset($_REQUEST['SKIN_FOLDER_ID'])) {
-            throw ( new Exception(G::LoadTranslation('ID_SKIN_NAME_REQUIRED')) );
+        if (! isset( $_REQUEST['SKIN_FOLDER_ID'] )) {
+            throw (new Exception( G::LoadTranslation( 'ID_SKIN_NAME_REQUIRED' ) ));
         }
 
         $skinName = $_REQUEST['SKIN_FOLDER_ID'];
@@ -257,113 +252,116 @@ function exportSkin($skinToExport="")
         $skinFolderBase = PATH_CUSTOM_SKINS . $skinName;
         $skinFolder = $skinFolderBase . PATH_SEP;
         $skinTar = PATH_CUSTOM_SKINS . $skinName . '.tar';
-        if (!is_dir($skinFolder)) {
-            throw ( new Exception(G::LoadTranslation('ID_SKIN_DOESNT_EXIST')) );
+        if (! is_dir( $skinFolder )) {
+            throw (new Exception( G::LoadTranslation( 'ID_SKIN_DOESNT_EXIST' ) ));
         }
-        if (!file_exists($skinFolder . "config.xml")) {
-            throw ( new Exception(G::LoadTranslation('ID_SKIN_CONFIGURATION_MISSING')) );
+        if (! file_exists( $skinFolder . "config.xml" )) {
+            throw (new Exception( G::LoadTranslation( 'ID_SKIN_CONFIGURATION_MISSING' ) ));
         }
 
-        if (file_exists($skinTar)) {
+        if (file_exists( $skinTar )) {
             //try to delete
-            if (!unlink($skinTar)) {
-                throw ( new Exception(G::LoadTranslation('ID_SKIN_FOLDER_PERMISSIONS')) );
+            if (! unlink( $skinTar )) {
+                throw (new Exception( G::LoadTranslation( 'ID_SKIN_FOLDER_PERMISSIONS' ) ));
             }
         }
 
         //Try to generate tar file
-        G::LoadThirdParty('pear/Archive', 'Tar');
-        $tar = new Archive_Tar($skinTar);
+        G::LoadThirdParty( 'pear/Archive', 'Tar' );
+        $tar = new Archive_Tar( $skinTar );
         $tar->_compress = false;
 
-        addTarFolder($tar, $skinFolder, PATH_CUSTOM_SKINS);
+        addTarFolder( $tar, $skinFolder, PATH_CUSTOM_SKINS );
 
         $response['success'] = true;
         $response['message'] = $skinTar;
 
-        print_r(G::json_encode($response));
+        print_r( G::json_encode( $response ) );
     } catch (Exception $e) {
         $response['success'] = false;
         $response['message'] = $e->getMessage();
-        print_r(G::json_encode($response));
+        print_r( G::json_encode( $response ) );
     }
 }
-function deleteSkin()
+
+function deleteSkin ()
 {
     try {
-        if (!(isset($_REQUEST['SKIN_FOLDER_ID']))) {
-            throw (new Exception(G::LoadTranslation('ID_SKIN_FOLDER_REQUIRED')));
+        if (! (isset( $_REQUEST['SKIN_FOLDER_ID'] ))) {
+            throw (new Exception( G::LoadTranslation( 'ID_SKIN_FOLDER_REQUIRED' ) ));
         }
-        if (($_REQUEST['SKIN_FOLDER_ID'])=="classic") {
-            throw (new Exception(G::LoadTranslation('ID_SKIN_FOLDER_NOT_DELETEABLE')));
+        if (($_REQUEST['SKIN_FOLDER_ID']) == "classic") {
+            throw (new Exception( G::LoadTranslation( 'ID_SKIN_FOLDER_NOT_DELETEABLE' ) ));
         }
-        $folderId=$_REQUEST['SKIN_FOLDER_ID'];
-        if (!is_dir(PATH_CUSTOM_SKINS.$folderId)) {
-            throw (new Exception(G::LoadTranslation('ID_SKIN_NOT_EXISTS')));
+        $folderId = $_REQUEST['SKIN_FOLDER_ID'];
+        if (! is_dir( PATH_CUSTOM_SKINS . $folderId )) {
+            throw (new Exception( G::LoadTranslation( 'ID_SKIN_NOT_EXISTS' ) ));
         }
         //Delete
-        G::rm_dir(PATH_CUSTOM_SKINS.$folderId);
+        G::rm_dir( PATH_CUSTOM_SKINS . $folderId );
         $response['success'] = true;
         $response['message'] = "$folderId deleted";
     } catch (Exception $e) {
         $response['success'] = false;
-        $response['error']=$response['message'] = $e->getMessage();
-        print_r(G::json_encode($response));
+        $response['error'] = $response['message'] = $e->getMessage();
+        print_r( G::json_encode( $response ) );
     }
 }
-function streamSkin()
+
+function streamSkin ()
 {
     $skinTar = $_REQUEST['file'];
     $bDownload = true;
-    G::streamFile($skinTar, $bDownload, basename($skinTar));
-    @unlink($fileTar);
+    G::streamFile( $skinTar, $bDownload, basename( $skinTar ) );
+    @unlink( $fileTar );
 }
 
-function addTarFolder($tar, $pathBase, $pluginHome)
+function addTarFolder ($tar, $pathBase, $pluginHome)
 {
-    $aux = explode(PATH_SEP, $pathBase);
-    if ($aux[count($aux) - 2] == '.svn') {
+    $aux = explode( PATH_SEP, $pathBase );
+    if ($aux[count( $aux ) - 2] == '.svn') {
         return;
     }
 
-    if ($handle = opendir($pathBase)) {
-        while (false !== ($file = readdir($handle))) {
-            if (is_file($pathBase . $file)) {
+    if ($handle = opendir( $pathBase )) {
+        while (false !== ($file = readdir( $handle ))) {
+            if (is_file( $pathBase . $file )) {
                 //print "file $file \n";
-                $tar->addModify($pathBase . $file, '', $pluginHome);
+                $tar->addModify( $pathBase . $file, '', $pluginHome );
             }
-            if (is_dir($pathBase . $file) && $file != '..' && $file != '.') {
+            if (is_dir( $pathBase . $file ) && $file != '..' && $file != '.') {
                 //print "dir $pathBase$file \n";
-                addTarFolder($tar, $pathBase . $file . PATH_SEP, $pluginHome);
+                addTarFolder( $tar, $pathBase . $file . PATH_SEP, $pluginHome );
             }
         }
-        closedir($handle);
+        closedir( $handle );
     }
 }
 
-function copy_skin_folder($path, $dest, $exclude=array())
+function copy_skin_folder ($path, $dest, $exclude = array())
 {
-    $defaultExcluded=array(".","..");
-    $excludedItems=array_merge($defaultExcluded,$exclude);
-    if (is_dir($path)) {
-        @mkdir($dest);
-        $objects = scandir($path);
-        if (sizeof($objects) > 0) {
+    $defaultExcluded = array (".",".."
+    );
+    $excludedItems = array_merge( $defaultExcluded, $exclude );
+    if (is_dir( $path )) {
+        @mkdir( $dest );
+        $objects = scandir( $path );
+        if (sizeof( $objects ) > 0) {
             foreach ($objects as $file) {
-                if (in_array($file,$excludedItems)) {
+                if (in_array( $file, $excludedItems )) {
                     continue;
                 }
                 // go on
-                if (is_dir($path . PATH_SEP . $file)) {
-                    copy_skin_folder($path . PATH_SEP . $file, $dest . PATH_SEP . $file,$exclude);
+                if (is_dir( $path . PATH_SEP . $file )) {
+                    copy_skin_folder( $path . PATH_SEP . $file, $dest . PATH_SEP . $file, $exclude );
                 } else {
-                    copy($path . PATH_SEP . $file, $dest . PATH_SEP . $file);
+                    copy( $path . PATH_SEP . $file, $dest . PATH_SEP . $file );
                 }
             }
         }
         return true;
-    } elseif (is_file($path)) {
-        return copy($path, $dest);
+    } elseif (is_file( $path )) {
+        return copy( $path, $dest );
     } else {
         return false;
     }
diff --git a/workflow/engine/methods/setup/skinsExport.php b/workflow/engine/methods/setup/skinsExport.php
index 0262986f0..87e29798b 100755
--- a/workflow/engine/methods/setup/skinsExport.php
+++ b/workflow/engine/methods/setup/skinsExport.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * skinsExport.php
  *
@@ -12,173 +13,175 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
  */
- 
-  function copyFile ( $input, $output ) {
-    $content = file_get_contents ( $input );
-    $filename = $output . PATH_SEP . basename ( $input );
-    return file_put_contents ( $filename, $content );
-  }
 
-  function savePluginFile ( $tplName, $fileName, $fields ) {
-    $pluginTpl      = PATH_GULLIVER_HOME . 'bin' . PATH_SEP . 'tasks' .PATH_SEP . 'templates' . PATH_SEP . $tplName . '.tpl';
+function copyFile ($input, $output)
+{
+    $content = file_get_contents( $input );
+    $filename = $output . PATH_SEP . basename( $input );
+    return file_put_contents( $filename, $content );
+}
+
+function savePluginFile ($tplName, $fileName, $fields)
+{
+    $pluginTpl = PATH_GULLIVER_HOME . 'bin' . PATH_SEP . 'tasks' . PATH_SEP . 'templates' . PATH_SEP . $tplName . '.tpl';
     $template = new TemplatePower( $pluginTpl );
     $template->prepare();
-    
-    if ( is_array ($fields) ) {
-      foreach ( $fields as $block => $data ) {
-        $template->gotoBlock( "_ROOT" );
-        if ( is_array( $data) )
-          foreach ( $data as $rowId => $row ) {
-            $template->newBlock( $block );
-            foreach ( $row as $key => $val ) 
-              $template->assign( $key, $val );
-          }
-        else
-          $template->assign( $block, $data );
-      }
-    }
-        
-    $content = $template->getOutputContent();
-    $iSize = file_put_contents ( $fileName, $content );
-    return $iSize;
-  }  
 
-  function addTarFolder ( $tar, $pathBase,$pluginHome ) {
-    $aux = explode( PATH_SEP, $pathBase);
-    if ( $aux[count($aux) -2 ] == '.svn' ) return;
-  
-    if ($handle = opendir( $pathBase  )) {
-      while ( false !== ($file = readdir($handle))) {
-        if ( is_file ( $pathBase . $file ) ) {
-        //print "file $file \n";
-          $tar->addModify( $pathBase . $file,'', $pluginHome);
+    if (is_array( $fields )) {
+        foreach ($fields as $block => $data) {
+            $template->gotoBlock( "_ROOT" );
+            if (is_array( $data ))
+            foreach ($data as $rowId => $row) {
+                    $template->newBlock( $block );
+                    foreach ($row as $key => $val)
+                        $template->assign( $key, $val );
+            }
+            else
+                $template->assign( $block, $data );
         }
-        if ( is_dir (  $pathBase . $file ) && $file != '..' && $file != '.' ) {
-        //print "dir $pathBase$file \n";
-          addTarFolder ( $tar, $pathBase . $file . PATH_SEP ,$pluginHome);
-        } 
-      }
-      closedir($handle);
     }
-  }
-  
 
-  function packPlugin ( $pluginName, $version  ) {
+    $content = $template->getOutputContent();
+    $iSize = file_put_contents( $fileName, $content );
+    return $iSize;
+}
 
-    $pathBase   = PATH_DATA . 'skins' . PATH_SEP . $pluginName . PATH_SEP;
-    $pathHome   = PATH_DATA . 'skins' . PATH_SEP . $pluginName ;
-    $fileTar    = PATH_DATA . 'skins' . PATH_SEP . $pluginName . '-' . $version . '.tar';
-  
-    G::LoadSystem ('templatePower');
-/*
+function addTarFolder ($tar, $pathBase, $pluginHome)
+{
+    $aux = explode( PATH_SEP, $pathBase );
+    if ($aux[count( $aux ) - 2] == '.svn')
+        return;
+
+    if ($handle = opendir( $pathBase )) {
+        while (false !== ($file = readdir( $handle ))) {
+            if (is_file( $pathBase . $file )) {
+                //print "file $file \n";
+                $tar->addModify( $pathBase . $file, '', $pluginHome );
+            }
+            if (is_dir( $pathBase . $file ) && $file != '..' && $file != '.') {
+                //print "dir $pathBase$file \n";
+                addTarFolder( $tar, $pathBase . $file . PATH_SEP, $pluginHome );
+            }
+        }
+        closedir( $handle );
+    }
+}
+
+function packPlugin ($pluginName, $version)
+{
+
+    $pathBase = PATH_DATA . 'skins' . PATH_SEP . $pluginName . PATH_SEP;
+    $pathHome = PATH_DATA . 'skins' . PATH_SEP . $pluginName;
+    $fileTar = PATH_DATA . 'skins' . PATH_SEP . $pluginName . '-' . $version . '.tar';
+
+    G::LoadSystem( 'templatePower' );
+    /*
     $pluginDirectory    = PATH_PLUGINS  . $pluginName;
     $pluginOutDirectory = PATH_OUTTRUNK . 'plugins' . PATH_SEP . $pluginName;
     $pluginHome         = PATH_OUTTRUNK . 'plugins' . PATH_SEP . $pluginName;
 
-    //verify if plugin exists, 
+    //verify if plugin exists,
     $pluginClassFilename = PATH_PLUGINS . $pluginName . PATH_SEP . 'class.' . $pluginName . '.php';
-    if ( !is_file ( $pluginClassFilename ) ) { 
+    if ( !is_file ( $pluginClassFilename ) ) {
       printf("The plugin %s doesn't exist in this file %s \n", pakeColor::colorize( $pluginName, 'ERROR'), pakeColor::colorize( $pluginClassFilename, 'INFO') );
       die ;
     }
-  */
-    G::LoadThirdParty( 'pear/Archive','Tar');
-    $tar = new Archive_Tar ( $fileTar);
-    $tar->_compress=false;
+    */
+    G::LoadThirdParty( 'pear/Archive', 'Tar' );
+    $tar = new Archive_Tar( $fileTar );
+    $tar->_compress = false;
 
     //$tar->createModify( $pathHome . PATH_SEP . $pluginName . '.php' ,'', $pathHome);
-    addTarFolder ( $tar, $pathBase, $pathHome );
-    $aFiles = $tar->listContent(); 
-    return $fileTar;     
-  }
- 
-global $RBAC;
-switch ($RBAC->userCanAccess('PM_SETUP'))
-{
-  case -2:
-    G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-    G::header('location: ../login/login');
-    die;
-  break;
-  case -1:
-    G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-    G::header('location: ../login/login');
-    die;
-  break;
+    addTarFolder( $tar, $pathBase, $pathHome );
+    $aFiles = $tar->listContent();
+    return $fileTar;
 }
 
-  G::LoadClass("system");
+global $RBAC;
+switch ($RBAC->userCanAccess( 'PM_SETUP' )) {
+    case - 2:
+        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
+        G::header( 'location: ../login/login' );
+        die();
+        break;
+    case - 1:
+        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+        G::header( 'location: ../login/login' );
+        die();
+        break;
+}
 
-  $id = $_GET['id'];
-  
-  $fileObj = PATH_SKINS . $id . '.cnf';
-  
-  if ( !file_exists($fileObj) ) {
+G::LoadClass( "system" );
+
+$id = $_GET['id'];
+
+$fileObj = PATH_SKINS . $id . '.cnf';
+
+if (! file_exists( $fileObj )) {
     $oConf = new stdClass();
     $oConf->name = $id;
     $oConf->description = "description of skin $id ";
-    $oConf->version     = 1;
-    file_put_contents ( $fileObj, serialize ( $oConf) );
-  }
+    $oConf->version = 1;
+    file_put_contents( $fileObj, serialize( $oConf ) );
+}
+
+$oConf = unserialize( file_get_contents( $fileObj ) );
+$oConf->version += 1;
+file_put_contents( $fileObj, serialize( $oConf ) );
+
+$pathHome = PATH_DATA . 'skins' . PATH_SEP . $id . PATH_SEP;
+$pathBase = PATH_DATA . 'skins' . PATH_SEP . $id . PATH_SEP . $id . PATH_SEP;
+$pathPublic = $pathBase . 'data' . PATH_SEP . 'public_html' . PATH_SEP;
+$pathImages = PATH_HTML . 'skins' . PATH_SEP . $id . PATH_SEP . 'images' . PATH_SEP;
+
+G::mk_dir( $pathBase );
+G::mk_dir( $pathBase . 'data' );
+G::mk_dir( $pathPublic );
+G::mk_dir( $pathPublic . 'images' );
 
-  $oConf = unserialize ( file_get_contents ( $fileObj ));
-  $oConf->version += 1;
-  file_put_contents ( $fileObj, serialize ( $oConf) );
-  
-  $pathHome   = PATH_DATA . 'skins' . PATH_SEP . $id . PATH_SEP;
-  $pathBase   = PATH_DATA . 'skins' . PATH_SEP . $id . PATH_SEP . $id . PATH_SEP;
-  $pathPublic = $pathBase . 'data' . PATH_SEP . 'public_html' . PATH_SEP ;
-  $pathImages = PATH_HTML . 'skins' . PATH_SEP . $id . PATH_SEP . 'images' . PATH_SEP;
-  
-  G::mk_dir ( $pathBase );
-  G::mk_dir ( $pathBase . 'data' );
-  G::mk_dir ( $pathPublic );
-  G::mk_dir ( $pathPublic . 'images' );
-  
 //  file_put_contents ( PATH_DATA . 'skins' . PATH_SEP . $id  , "hello world" );
-  $fields['className']   = $id;
-  $fields['version']     = $oConf->version;
-  $fields['description'] = $oConf->description;
-  $fields['PMversion']   = System::getVersion();
-  savePluginFile ( 'skinPluginMainClass' , $pathHome . $id . '.php', $fields );
+$fields['className'] = $id;
+$fields['version'] = $oConf->version;
+$fields['description'] = $oConf->description;
+$fields['PMversion'] = System::getVersion();
+savePluginFile( 'skinPluginMainClass', $pathHome . $id . '.php', $fields );
 
-  savePluginFile ( 'skinPluginClass' , $pathBase . 'class.' . $id . '.php', $fields );
-  
-  copyFile ( PATH_SKINS . $id . '.php'  , $pathBase . 'data' );
-  copyFile ( PATH_SKINS . $id . '.html' , $pathBase . 'data' );
-  copyFile ( PATH_SKINS . $id . '.cnf'  , $pathBase . 'data' );
-  
-  copyFile ( PATH_HTML . 'skins' . PATH_SEP . $id . PATH_SEP . 'iepngfix.htc'  , $pathPublic );
-  copyFile ( PATH_HTML . 'skins' . PATH_SEP . $id . PATH_SEP . 'style.css'  ,    $pathPublic );
+savePluginFile( 'skinPluginClass', $pathBase . 'class.' . $id . '.php', $fields );
 
+copyFile( PATH_SKINS . $id . '.php', $pathBase . 'data' );
+copyFile( PATH_SKINS . $id . '.html', $pathBase . 'data' );
+copyFile( PATH_SKINS . $id . '.cnf', $pathBase . 'data' );
 
-  $aFiles = array ();
-  if ($handle = opendir( $pathImages )) {
-    while ( false !== ($file = readdir($handle))) {
-      if ( substr($file,0,1) != '.' ) {
-        if ( isset($aFiles[ $file ]) ) $aFiles[$file] = 0; 
-        copyFile ( $pathImages. $file , $pathPublic . 'images' . PATH_SEP );
-        
-      }
+copyFile( PATH_HTML . 'skins' . PATH_SEP . $id . PATH_SEP . 'iepngfix.htc', $pathPublic );
+copyFile( PATH_HTML . 'skins' . PATH_SEP . $id . PATH_SEP . 'style.css', $pathPublic );
+
+$aFiles = array ();
+if ($handle = opendir( $pathImages )) {
+    while (false !== ($file = readdir( $handle ))) {
+        if (substr( $file, 0, 1 ) != '.') {
+            if (isset( $aFiles[$file] ))
+                $aFiles[$file] = 0;
+            copyFile( $pathImages . $file, $pathPublic . 'images' . PATH_SEP );
+
+        }
     }
-    closedir($handle);
-  }
-  
-  $fileTar = packPlugin ( $id, $oConf->version );
-  
+    closedir( $handle );
+}
+
+$fileTar = packPlugin( $id, $oConf->version );
+
+$bDownload = true;
+G::streamFile( $fileTar, $bDownload, basename( $fileTar ) );
+
+@G::rm_dir( $pathHome );
+@unlink( $fileTar );
 
-  $bDownload = true;
-  G::streamFile ( $fileTar, $bDownload, basename($fileTar) );
-  
-  @G::rm_dir ($pathHome);
-  @unlink ($fileTar);
diff --git a/workflow/engine/methods/setup/skinsList.php b/workflow/engine/methods/setup/skinsList.php
index 31ee281dc..85006b1b2 100755
--- a/workflow/engine/methods/setup/skinsList.php
+++ b/workflow/engine/methods/setup/skinsList.php
@@ -1,4 +1,4 @@
-<?php  
+<?php
 /**
  * pluginsList.php
  *
@@ -12,142 +12,138 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
  */
 
-if($RBAC->userCanAccess('PM_SETUP') != 1 && $RBAC->userCanAccess('PM_SETUP_ADVANCE') != 1){
-  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-  //G::header('location: ../login/login');
-  die;
+if ($RBAC->userCanAccess( 'PM_SETUP' ) != 1 && $RBAC->userCanAccess( 'PM_SETUP_ADVANCE' ) != 1) {
+    G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+    //G::header('location: ../login/login');
+    die();
 }
- 
+
 $G_MAIN_MENU = 'processmaker';
 $G_SUB_MENU = 'setup';
 $G_ID_MENU_SELECTED = 'SETUP';
 $G_ID_SUB_MENU_SELECTED = 'CALENDAR';
 
-$G_PUBLISH = new Publisher;
+$G_PUBLISH = new Publisher();
 
-G::LoadClass('configuration');
+G::LoadClass( 'configuration' );
 $c = new Configurations();
-$configPage = $c->getConfiguration('skinList', 'pageSize','',$_SESSION['USER_LOGGED']);
-$Config['pageSize'] = isset($configPage['pageSize']) ? $configPage['pageSize'] : 20;
+$configPage = $c->getConfiguration( 'skinList', 'pageSize', '', $_SESSION['USER_LOGGED'] );
+$Config['pageSize'] = isset( $configPage['pageSize'] ) ? $configPage['pageSize'] : 20;
 
-$oHeadPublisher =& headPublisher::getSingleton();
-$oHeadPublisher->addExtJsScript('setup/skinList', false);    //adding a javascript file .js
-$oHeadPublisher->addContent('setup/skinList'); //adding a html file  .html.
-$oHeadPublisher->assign('CONFIG', $Config);
-$oHeadPublisher->assign('SYS_SKIN', SYS_SKIN);
+$oHeadPublisher = & headPublisher::getSingleton();
+$oHeadPublisher->addExtJsScript( 'setup/skinList', false ); //adding a javascript file .js
+$oHeadPublisher->addContent( 'setup/skinList' ); //adding a html file  .html.
+$oHeadPublisher->assign( 'CONFIG', $Config );
+$oHeadPublisher->assign( 'SYS_SKIN', SYS_SKIN );
 
-$oHeadPublisher->assign('FORMATS',$c->getFormats());
+$oHeadPublisher->assign( 'FORMATS', $c->getFormats() );
 
-G::RenderPage('publish', 'extJs');
-die;
+G::RenderPage( 'publish', 'extJs' );
+die();
 
 global $RBAC;
-$access = $RBAC->userCanAccess('PM_SETUP');
-if( $access != 1 ){
-  switch ($access)
-  {
-    case -1:
-      G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-      G::header('location: ../login/login');
-      die;
-    break;
-    case -2:
-      G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-      G::header('location: ../login/login');
-      die;
-    break;
-    default:
-      G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-      G::header('location: ../login/login');
-      die;
-    break;
-  }
+$access = $RBAC->userCanAccess( 'PM_SETUP' );
+if ($access != 1) {
+    switch ($access) {
+        case - 1:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+        case - 2:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+        default:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+    }
 }
-  // lets display the items
-  $items[] = array ( 'id' => 'char', 'title' => 'char', 'type' => 'char', 'creator' => 'char' ,
-                   'modifiedBy' => 'char', 'filename' => 'char', 'size' => 'char', 'mime' => 'char');
+// lets display the items
+$items[] = array ('id' => 'char','title' => 'char','type' => 'char','creator' => 'char','modifiedBy' => 'char','filename' => 'char','size' => 'char','mime' => 'char'
+);
 
-  //***************** Skins **************************
-  $aFiles = array ();
-  if ($handle = opendir( PATH_SKINS  )) {
-    while ( false !== ($file = readdir($handle))) {
-        G::pr($file);
-      $filename = substr ( $file,0, strrpos($file, '.'));
+//***************** Skins **************************
+$aFiles = array ();
+if ($handle = opendir( PATH_SKINS )) {
+    while (false !== ($file = readdir( $handle ))) {
+        G::pr( $file );
+        $filename = substr( $file, 0, strrpos( $file, '.' ) );
 
-      // list of no complete skins
-      $aFilterSkinsList = Array('blank', 'green', 'raw', 'tracker', 'iphone', 'green-submenu', 'extJsInitLoad', 'extJs' );
-      
-      if ( !is_dir(PATH_SKINS. $file) ) {
-        if ( !in_array($filename, $aFilterSkinsList) /*&& /*/ && !strpos($file, '.tar', 1) ) {
-          if ( !isset($aFiles[ $filename ]) ) $aFiles[$filename] = 0;
-          if ( strpos($file, '.php', 1) ) $aFiles[ $filename ] += 1;
-          if ( strpos($file, '.html',1) ) $aFiles[ $filename ] += 2;
+        // list of no complete skins
+        $aFilterSkinsList = Array ('blank','green','raw','tracker','iphone','green-submenu','extJsInitLoad','extJs'
+        );
+
+        if (! is_dir( PATH_SKINS . $file )) {
+            if (! in_array( $filename, $aFilterSkinsList ) /*&& /*/ && ! strpos( $file, '.tar', 1 )) {
+                if (! isset( $aFiles[$filename] ))
+                    $aFiles[$filename] = 0;
+                if (strpos( $file, '.php', 1 ))
+                    $aFiles[$filename] += 1;
+                if (strpos( $file, '.html', 1 ))
+                    $aFiles[$filename] += 2;
+            }
         }
-      }
     }
 
-    closedir($handle);
-
+    closedir( $handle );
 
     //now walk in the array to get the .cnf file and display properties
-    foreach ( $aFiles as $key => $val ) {
-      $description = '';
-      $version     = '';
-      if ( file_exists ( PATH_SKINS . $key . '.cnf' ) ) {
-        $serial = file_get_contents ( PATH_SKINS . $key . '.cnf' );
-        $previousErrorRep = ini_get("error_reporting");
-        error_reporting( E_ERROR ) ;
-        $prop = unserialize ( $serial );
-        error_reporting( $previousErrorRep );
-        if ( !is_object( $prop ) ) {
-          @unlink ( PATH_SKINS . $key . '.cnf');
+    foreach ($aFiles as $key => $val) {
+        $description = '';
+        $version = '';
+        if (file_exists( PATH_SKINS . $key . '.cnf' )) {
+            $serial = file_get_contents( PATH_SKINS . $key . '.cnf' );
+            $previousErrorRep = ini_get( "error_reporting" );
+            error_reporting( E_ERROR );
+            $prop = unserialize( $serial );
+            error_reporting( $previousErrorRep );
+            if (! is_object( $prop )) {
+                @unlink( PATH_SKINS . $key . '.cnf' );
+            }
+            if (isset( $prop ) && isset( $prop->description ))
+                $description = $prop->description;
+            if (isset( $prop ) && isset( $prop->version ))
+                $version = $prop->version;
         }
-        if ( isset ( $prop) && isset($prop->description) ) $description = $prop->description;
-        if ( isset ( $prop) && isset($prop->version    ) ) $version     = $prop->version;
-      }
-      
-      $linkPackValue = G::LoadTranslation('ID_EXPORT') ;
-      $link = 'skinsExport?id=' . $key ;
-      $items[] = array (
-                 'id'            => count($items),
-                 'name'          => $key,
-                 'filename'      => $key,
-                 'description'   => $description,
-                 'version'       => $version,
-                 'url'           => $link,
-                 'linkPackValue' => $linkPackValue
-                 );
+
+        $linkPackValue = G::LoadTranslation( 'ID_EXPORT' );
+        $link = 'skinsExport?id=' . $key;
+        $items[] = array ('id' => count( $items ),'name' => $key,'filename' => $key,'description' => $description,'version' => $version,'url' => $link,'linkPackValue' => $linkPackValue
+        );
     }
     $folders['items'] = $items;
-  }
-  
-  $_DBArray['plugins'] = $items;
-  $_SESSION['_DBArray'] = $_DBArray;
+}
 
-  G::LoadClass( 'ArrayPeer');
-  $c = new Criteria ('dbarray');
-  $c->setDBArrayTable('plugins');
-    $c->addAscendingOrderByColumn ('id');
+$_DBArray['plugins'] = $items;
+$_SESSION['_DBArray'] = $_DBArray;
 
-  $G_MAIN_MENU            = 'processmaker';
-  $G_ID_MENU_SELECTED     = 'SETUP';
-  $G_SUB_MENU             = 'setup';
-  $G_ID_SUB_MENU_SELECTED = 'SKINS';
+G::LoadClass( 'ArrayPeer' );
+$c = new Criteria( 'dbarray' );
+$c->setDBArrayTable( 'plugins' );
+$c->addAscendingOrderByColumn( 'id' );
 
-  $G_PUBLISH = new Publisher;
+$G_MAIN_MENU = 'processmaker';
+$G_ID_MENU_SELECTED = 'SETUP';
+$G_SUB_MENU = 'setup';
+$G_ID_SUB_MENU_SELECTED = 'SKINS';
 
-  $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'setup/skinsList', $c );
+$G_PUBLISH = new Publisher();
 
-  G::RenderPage('publishBlank', 'blank');
+$G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'setup/skinsList', $c );
+
+G::RenderPage( 'publishBlank', 'blank' );
 
diff --git a/workflow/engine/methods/setup/skinsNew.php b/workflow/engine/methods/setup/skinsNew.php
index 7875f9dd3..2bdd99ed0 100755
--- a/workflow/engine/methods/setup/skinsNew.php
+++ b/workflow/engine/methods/setup/skinsNew.php
@@ -1,58 +1,57 @@
-<?php
-/**
- * holidayNew.php
- *  
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- * 
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd., 
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- * 
- */
-
-$access = $RBAC->userCanAccess('PM_SETUP');
-if( $access != 1 ){
-  switch ($access)
-  {
-  	case -1:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;
-  	case -2:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;
-  	default:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;  	
-  }
-}  
-if (($RBAC_Response=$RBAC->userCanAccess("PM_SETUP"))!=1) return $RBAC_Response;
-	
-  $dbc = new DBConnection;
-  $G_PUBLISH = new Publisher;
-  $G_MAIN_MENU            = 'processmaker';
-  $G_ID_MENU_SELECTED     = 'SETUP';
-  $G_SUB_MENU             = 'setup';
-  $G_ID_SUB_MENU_SELECTED = 'SKINS';
-  	
-  $G_PUBLISH->AddContent( 'xmlform', 'xmlform', "setup/skinsNew", '', null, "skinsSave");	
-  G::RenderPage( 'publishBlank', 'blank' );
-	
\ No newline at end of file
+<?php
+/**
+ * holidayNew.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
+ * Coral Gables, FL, 33134, USA, or email info@colosa.com.
+ */
+
+$access = $RBAC->userCanAccess( 'PM_SETUP' );
+if ($access != 1) {
+    switch ($access) {
+        case - 1:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+        case - 2:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+        default:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+    }
+}
+if (($RBAC_Response = $RBAC->userCanAccess( "PM_SETUP" )) != 1)
+    return $RBAC_Response;
+
+$dbc = new DBConnection();
+$G_PUBLISH = new Publisher();
+$G_MAIN_MENU = 'processmaker';
+$G_ID_MENU_SELECTED = 'SETUP';
+$G_SUB_MENU = 'setup';
+$G_ID_SUB_MENU_SELECTED = 'SKINS';
+
+$G_PUBLISH->AddContent( 'xmlform', 'xmlform', "setup/skinsNew", '', null, "skinsSave" );
+G::RenderPage( 'publishBlank', 'blank' );
+
diff --git a/workflow/engine/methods/setup/skinsSave.php b/workflow/engine/methods/setup/skinsSave.php
index 13ddf9f7f..5c09fc002 100755
--- a/workflow/engine/methods/setup/skinsSave.php
+++ b/workflow/engine/methods/setup/skinsSave.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * skinsSave.php
  *
@@ -12,84 +13,76 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
  */
- 
 
-  function xcopy ( $pathSource, $pathTarget ) {
-    G::mk_dir ($pathTarget);
-    if ($handle = opendir( $pathSource )) {
-      while ( false !== ($file = readdir($handle))) {
-        if ( substr($file,0,1) != '.' && !is_dir ($file)  ) {
-          $content = file_get_contents ( $pathSource . $file );
-          $filename = $pathTarget . $file ;
-          file_put_contents ( $filename, $content );
-        }
-      }
-      closedir($handle);
-    }
-  }
-  
- 
-global $RBAC;
-switch ($RBAC->userCanAccess('PM_SETUP'))
+function xcopy ($pathSource, $pathTarget)
 {
-  case -2:
-    G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-    G::header('location: ../login/login');
-    die;
-  break;
-  case -1:
-    G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-    G::header('location: ../login/login');
-    die;
-  break;
+    G::mk_dir( $pathTarget );
+    if ($handle = opendir( $pathSource )) {
+        while (false !== ($file = readdir( $handle ))) {
+            if (substr( $file, 0, 1 ) != '.' && ! is_dir( $file )) {
+                $content = file_get_contents( $pathSource . $file );
+                $filename = $pathTarget . $file;
+                file_put_contents( $filename, $content );
+            }
+        }
+        closedir( $handle );
+    }
 }
 
-  G::LoadClass("system");
+global $RBAC;
+switch ($RBAC->userCanAccess( 'PM_SETUP' )) {
+    case - 2:
+        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
+        G::header( 'location: ../login/login' );
+        die();
+        break;
+    case - 1:
+        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+        G::header( 'location: ../login/login' );
+        die();
+        break;
+}
 
-  $id   = strip_tags ( str_replace ( ' ', '_', trim ($_POST['form']['NAME']) ) );
-  $desc = $_POST['form']['DESCRIPTION'];
-  
-  $fileObj = PATH_SKINS . $id . '.cnf';
-  
-  if ( !file_exists($fileObj) ) {
+G::LoadClass( "system" );
+
+$id = strip_tags( str_replace( ' ', '_', trim( $_POST['form']['NAME'] ) ) );
+$desc = $_POST['form']['DESCRIPTION'];
+
+$fileObj = PATH_SKINS . $id . '.cnf';
+
+if (! file_exists( $fileObj )) {
     $oConf = new stdClass();
     $oConf->name = $id;
     $oConf->description = $desc;
-    $oConf->version     = 1;
-    file_put_contents ( $fileObj, serialize ( $oConf) );
-  }
+    $oConf->version = 1;
+    file_put_contents( $fileObj, serialize( $oConf ) );
+}
 
-  $oConf = unserialize ( file_get_contents ( $fileObj ));
+$oConf = unserialize( file_get_contents( $fileObj ) );
 
-  $contentPHP = file_get_contents ( PATH_SKINS . 'green.php' );
-  $contentPHP = str_replace ( 'green.html', $id.'.html', $contentPHP );
-  file_put_contents ( PATH_SKINS . $id . '.php', $contentPHP );
-  
-  $contentHTML = file_get_contents ( PATH_SKINS . 'green.html' );
-  $contentHTML = str_replace ( 'green', $id , $contentHTML );
-  file_put_contents ( PATH_SKINS . $id . '.html', $contentHTML );
+$contentPHP = file_get_contents( PATH_SKINS . 'green.php' );
+$contentPHP = str_replace( 'green.html', $id . '.html', $contentPHP );
+file_put_contents( PATH_SKINS . $id . '.php', $contentPHP );
 
-  $pathImages = PATH_HTML . 'skins' . PATH_SEP . $id . PATH_SEP . 'images' . PATH_SEP;
-  G::mk_dir ( $pathImages );
-  
-  xcopy ( 
-    PATH_HTML . 'skins' . PATH_SEP . 'green' . PATH_SEP ,
-    PATH_HTML . 'skins' . PATH_SEP . $id . PATH_SEP 
-  );
+$contentHTML = file_get_contents( PATH_SKINS . 'green.html' );
+$contentHTML = str_replace( 'green', $id, $contentHTML );
+file_put_contents( PATH_SKINS . $id . '.html', $contentHTML );
 
-  xcopy ( 
-    PATH_HTML . 'skins' . PATH_SEP . 'green' . PATH_SEP . 'images'. PATH_SEP,
-    PATH_HTML . 'skins' . PATH_SEP . $id . PATH_SEP . 'images'. PATH_SEP 
-  );
+$pathImages = PATH_HTML . 'skins' . PATH_SEP . $id . PATH_SEP . 'images' . PATH_SEP;
+G::mk_dir( $pathImages );
+
+xcopy( PATH_HTML . 'skins' . PATH_SEP . 'green' . PATH_SEP, PATH_HTML . 'skins' . PATH_SEP . $id . PATH_SEP );
+
+xcopy( PATH_HTML . 'skins' . PATH_SEP . 'green' . PATH_SEP . 'images' . PATH_SEP, PATH_HTML . 'skins' . PATH_SEP . $id . PATH_SEP . 'images' . PATH_SEP );
+
+G::Header( 'Location: ../../' . $id . '/setup/skinsList' );
 
-  G::Header ( 'Location: ../../' . $id . '/setup/skinsList' ); 
diff --git a/workflow/engine/methods/setup/upgrade.php b/workflow/engine/methods/setup/upgrade.php
index ee4e912dd..b9fd189c3 100755
--- a/workflow/engine/methods/setup/upgrade.php
+++ b/workflow/engine/methods/setup/upgrade.php
@@ -1,74 +1,72 @@
-<?php
-/**
- * upgrade.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
- */
-global $RBAC;
-$access = $RBAC->userCanAccess('PM_SETUP_ADVANCE');
-if( $access != 1 ){
-  switch ($access)
-  {
-  	case -1:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;
-  	case -2:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;
-  	default:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;  	
-  }
-}  
-//calculating the max upload file size;
-  $POST_MAX_SIZE   = ini_get('post_max_size');
-  $mul = substr($POST_MAX_SIZE, -1);
-  $mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
-  $postMaxSize = (int)$POST_MAX_SIZE * $mul;
-  
-  $UPLOAD_MAX_SIZE = ini_get('upload_max_filesize');
-  $mul = substr($UPLOAD_MAX_SIZE, -1);
-  $mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
-  $uploadMaxSize = (int)$UPLOAD_MAX_SIZE * $mul;
-
-  if ( $postMaxSize < $uploadMaxSize ) $uploadMaxSize = $postMaxSize;
-
-
-  $G_MAIN_MENU            = 'processmaker';
-  $G_SUB_MENU             = 'setup';
-  $G_ID_MENU_SELECTED     = 'SETUP';
-  $G_ID_SUB_MENU_SELECTED = 'UPGRADE';
-  
-  G::LoadClass("system");
-  
-  $Fields['PM_VERSION']    = System::getVersion();
-  $Fields['MAX_FILE_SIZE'] = $uploadMaxSize .  " (" . $UPLOAD_MAX_SIZE . ") ";
-  
-  $G_PUBLISH = new Publisher;
-  $G_PUBLISH->AddContent('xmlform', 'xmlform', 'setup/upgrade', '', $Fields, 'upgrade_System');
-  G::RenderPage('publishBlank', 'blank');
-  
+<?php
+/**
+ * upgrade.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
+ * Coral Gables, FL, 33134, USA, or email info@colosa.com.
+ */
+global $RBAC;
+$access = $RBAC->userCanAccess( 'PM_SETUP_ADVANCE' );
+if ($access != 1) {
+    switch ($access) {
+        case - 1:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+        case - 2:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+        default:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+    }
+}
+//calculating the max upload file size;
+$POST_MAX_SIZE = ini_get( 'post_max_size' );
+$mul = substr( $POST_MAX_SIZE, - 1 );
+$mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
+$postMaxSize = (int) $POST_MAX_SIZE * $mul;
+
+$UPLOAD_MAX_SIZE = ini_get( 'upload_max_filesize' );
+$mul = substr( $UPLOAD_MAX_SIZE, - 1 );
+$mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
+$uploadMaxSize = (int) $UPLOAD_MAX_SIZE * $mul;
+
+if ($postMaxSize < $uploadMaxSize)
+    $uploadMaxSize = $postMaxSize;
+
+$G_MAIN_MENU = 'processmaker';
+$G_SUB_MENU = 'setup';
+$G_ID_MENU_SELECTED = 'SETUP';
+$G_ID_SUB_MENU_SELECTED = 'UPGRADE';
+
+G::LoadClass( "system" );
+
+$Fields['PM_VERSION'] = System::getVersion();
+$Fields['MAX_FILE_SIZE'] = $uploadMaxSize . " (" . $UPLOAD_MAX_SIZE . ") ";
+
+$G_PUBLISH = new Publisher();
+$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'setup/upgrade', '', $Fields, 'upgrade_System' );
+G::RenderPage( 'publishBlank', 'blank' );
+
diff --git a/workflow/engine/methods/setup/upgrade_RBAC.php b/workflow/engine/methods/setup/upgrade_RBAC.php
index 647b39652..372af5d9d 100755
--- a/workflow/engine/methods/setup/upgrade_RBAC.php
+++ b/workflow/engine/methods/setup/upgrade_RBAC.php
@@ -39,4 +39,5 @@ $aRequiredPermissions = array('PM_LOGIN',
                               'PM_FOLDERS_VIEW',
                               'PM_FOLDERS_ADD_FOLDER',
                               'PM_FOLDERS_ADD_FILE'
-                              );
\ No newline at end of file
+                              );
+
diff --git a/workflow/engine/methods/setup/upgrade_System.php b/workflow/engine/methods/setup/upgrade_System.php
index 96db604be..fdc4d9e6c 100755
--- a/workflow/engine/methods/setup/upgrade_System.php
+++ b/workflow/engine/methods/setup/upgrade_System.php
@@ -1,110 +1,108 @@
-<?php
-/**
- * upgrade_System.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
- */
-
-/**
- *  New System Upgrade controller
- *  
- *  @author Erik A. O. <erik@colosa.com>
- *  @date May 12th, 2010
- */
-global $RBAC;
-switch ($RBAC->userCanAccess('PM_SETUP_ADVANCE'))
-{
-  case -2:
-    G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-    G::header('location: ../login/login');
-    die;
-  break;
-  case -1:
-    G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-    G::header('location: ../login/login');
-    die;
-  break;
-}
-set_time_limit(0);
-
-$G_MAIN_MENU            = 'processmaker';
-$G_SUB_MENU             = 'setup';
-$G_ID_MENU_SELECTED     = 'SETUP';
-$G_ID_SUB_MENU_SELECTED = 'UPGRADE';
-  
-require_once "classes/class.system.php";
-$oSystem = new System();
-
-try {
-  if( ! $oSystem->verifyFileForUpgrade() ){
-    throw ( new Exception ("There was an error uploading the file, probably the file size if greater than upload_max_filesize parameter in php.ini, please check this parameter and try again." ) );
-  }
-  $oSystem->cleanupUpgradeDirectory();
-  $oSystem->getUpgradedFilesList();
-  
-  $ver = $oSystem->upgrade();
-  $G_PUBLISH = new Publisher;
-  $aMessage['THEMESSAGE1'] = G::LoadTranslation('ID_UPGRADE_READY') ." <b>". $ver[0] ."</b> ". G::LoadTranslation('ID_TO') ." <b>". $ver[1] ."</b>";
-  $aMessage['THEMESSAGE2'] = file_get_contents($oSystem->sUpgradeFileList);
-  $aMessage['THEMESSAGE3'] = '';
-  
-  if ( !is_Array($oSystem->aErrors) || count($oSystem->aErrors) == 0 )
-    $aMessage['THEMESSAGE4'] = G::LoadTranslation('ID_NONE');
-  else
-    $aMessage['THEMESSAGE4'] = implode( "\n", $oSystem->aErrors) ;
-  
-  $oHeadPublisher =& headPublisher::getSingleton();
-  if( file_exists(PATH_CORE . 'js' . PATH_SEP . 'setup' . PATH_SEP . 'upgrade_System.js') ){
-    $oHeadPublisher->addScriptFile('/jscore/setup/upgrade_System.js');
-  } else {
-    $oHeadPublisher->addScriptCode("function upgradeSystem(wsCount) {
-      document.getElementById('form[THETITLE3]').innerHTML = wsCount + ' workspaces to update.';
-      document.getElementById('form[SUBTITLE4]').innerHTML = '&nbsp;&nbsp;<img src='/images/alert.gif' width='13' height='13' border='0'> Please wait...'; 
-      updateWorkspace(wsCount);  
-    };
-    function updateWorkspace(id) {
-      if(id < 0) return false;
-      var oRPC = new leimnud.module.rpc.xmlhttp({
-        async : true,
-        method: 'POST',
-        url:  '../setup/upgrade_SystemAjax',
-        args  : 'id=' + id
-      });
-      oRPC.callback = function(rpc) {
-        document.getElementById('form[SUBTITLE4]').innerHTML = rpc.xmlhttp.responseText;
-        updateWorkspace(id-1);
-      }.extend(this);
-      oRPC.make();
-    };");
-  }
-  $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showInfoUpdate', '', $aMessage );
-  
-  G::RenderPage( 'publishBlank', 'blank' );
-  G::evalJScript('upgradeSystem('.count($oSystem->aWorkspaces).')'); 
-  exit(0);  
-}
-catch (Exception $e) {
-  $G_PUBLISH = new Publisher;
-  $aMessage['MESSAGE'] = $e->getMessage();
-  $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', $aMessage );
-  G::RenderPage( 'publishBlank', 'blank' );
-  exit(0);
-} 
+<?php
+/**
+ * upgrade_System.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
+ * Coral Gables, FL, 33134, USA, or email info@colosa.com.
+ */
+
+/**
+ * New System Upgrade controller
+ *
+ * @author Erik A. O. <erik@colosa.com>
+ * @date May 12th, 2010
+ */
+global $RBAC;
+switch ($RBAC->userCanAccess( 'PM_SETUP_ADVANCE' )) {
+    case - 2:
+        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
+        G::header( 'location: ../login/login' );
+        die();
+        break;
+    case - 1:
+        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+        G::header( 'location: ../login/login' );
+        die();
+        break;
+}
+set_time_limit( 0 );
+
+$G_MAIN_MENU = 'processmaker';
+$G_SUB_MENU = 'setup';
+$G_ID_MENU_SELECTED = 'SETUP';
+$G_ID_SUB_MENU_SELECTED = 'UPGRADE';
+
+require_once "classes/class.system.php";
+$oSystem = new System();
+
+try {
+    if (! $oSystem->verifyFileForUpgrade()) {
+        throw (new Exception( "There was an error uploading the file, probably the file size if greater than upload_max_filesize parameter in php.ini, please check this parameter and try again." ));
+    }
+    $oSystem->cleanupUpgradeDirectory();
+    $oSystem->getUpgradedFilesList();
+
+    $ver = $oSystem->upgrade();
+    $G_PUBLISH = new Publisher();
+    $aMessage['THEMESSAGE1'] = G::LoadTranslation( 'ID_UPGRADE_READY' ) . " <b>" . $ver[0] . "</b> " . G::LoadTranslation( 'ID_TO' ) . " <b>" . $ver[1] . "</b>";
+    $aMessage['THEMESSAGE2'] = file_get_contents( $oSystem->sUpgradeFileList );
+    $aMessage['THEMESSAGE3'] = '';
+
+    if (! is_Array( $oSystem->aErrors ) || count( $oSystem->aErrors ) == 0)
+        $aMessage['THEMESSAGE4'] = G::LoadTranslation( 'ID_NONE' );
+    else
+        $aMessage['THEMESSAGE4'] = implode( "\n", $oSystem->aErrors );
+
+    $oHeadPublisher = & headPublisher::getSingleton();
+    if (file_exists( PATH_CORE . 'js' . PATH_SEP . 'setup' . PATH_SEP . 'upgrade_System.js' )) {
+        $oHeadPublisher->addScriptFile( '/jscore/setup/upgrade_System.js' );
+    } else {
+        $oHeadPublisher->addScriptCode( "function upgradeSystem(wsCount) {
+      document.getElementById('form[THETITLE3]').innerHTML = wsCount + ' workspaces to update.';
+      document.getElementById('form[SUBTITLE4]').innerHTML = '&nbsp;&nbsp;<img src='/images/alert.gif' width='13' height='13' border='0'> Please wait...';
+      updateWorkspace(wsCount);
+    };
+    function updateWorkspace(id) {
+      if(id < 0) return false;
+      var oRPC = new leimnud.module.rpc.xmlhttp({
+        async : true,
+        method: 'POST',
+        url:  '../setup/upgrade_SystemAjax',
+        args  : 'id=' + id
+      });
+      oRPC.callback = function(rpc) {
+        document.getElementById('form[SUBTITLE4]').innerHTML = rpc.xmlhttp.responseText;
+        updateWorkspace(id-1);
+      }.extend(this);
+      oRPC.make();
+    };" );
+    }
+    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showInfoUpdate', '', $aMessage );
+
+    G::RenderPage( 'publishBlank', 'blank' );
+    G::evalJScript( 'upgradeSystem(' . count( $oSystem->aWorkspaces ) . ')' );
+    exit( 0 );
+} catch (Exception $e) {
+    $G_PUBLISH = new Publisher();
+    $aMessage['MESSAGE'] = $e->getMessage();
+    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', $aMessage );
+    G::RenderPage( 'publishBlank', 'blank' );
+    exit( 0 );
+}
+
diff --git a/workflow/engine/methods/setup/upgrade_SystemAjax.php b/workflow/engine/methods/setup/upgrade_SystemAjax.php
index 7fa78bb32..74c928e88 100755
--- a/workflow/engine/methods/setup/upgrade_SystemAjax.php
+++ b/workflow/engine/methods/setup/upgrade_SystemAjax.php
@@ -1,389 +1,396 @@
-<?php
-/**
- * upgrade_SystemAjax.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2010 Colosa Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
- */
-  global $DB_ADAPTER;
-  global $DB_HOST;
-  global $DB_USER;
-  global $DB_PASS;
-  global $DB_NAME;
-  set_time_limit (0);
-  
-  $id = '';
-  if ( isset($_POST['id'] ) ) $id = $_POST['id'];
-  
-  G::LoadClass('languages');
-  G::LoadSystem('database_mysql');
-  
-  $aUpgradeData = unserialize( file_get_contents (PATH_DATA . 'log' . PATH_SEP . "upgrade.data.bin" ));
-  $aWorkspaces = $aUpgradeData['workspaces'];
-
-  if ( is_array ( $aWorkspaces ) && count($aWorkspaces) > 0 ) {
-    $workspace = array_shift ( $aUpgradeData['workspaces']);
-
-    eval ( getDatabaseCredentials(PATH_DB . $workspace . PATH_SEP . 'db.php')) ;
-    $oDataBase = new database($DB_ADAPTER, $DB_HOST, $DB_USER, $DB_PASS, $DB_NAME);
-    $oDataBase->iFetchType = MYSQL_NUM;
-
-    //processing .po file
-    if ( $aUpgradeData['sPoFile'] != '' ) {  
-      $oLanguages = new languages();
-      $oLanguages->importLanguage($aUpgradeData['sPoFile'], $aUpgradeData['bForceXmlPoFile'] );
-      $aUpgradeData['bForceXmlPoFile'] = false; 
-    } 
-
-    if ($aUpgradeData['sSchemaFile'] != '') 
-      processMasterSchemaFile( $aUpgradeData['sSchemaFile'] );
-
-
-    //draw a gauge control indicating the progress in workspaces
-    $gauge = intval( (( $aUpgradeData['wsQuantity'] - count($aWorkspaces) + 1 ) / $aUpgradeData['wsQuantity'] ) * 301 );
-    print "<table cellpadding=0><tr><td><img src='/images/ajax-loader.gif' border=0/></td><td>";
-    print "<div style='border-style:solid;border-width:1px; border-color: #A1C868; width:300px; height:19px;' >";
-    print "<div style='color:#FFF; height:16px; text-align:center; padding-top:3px; background-image: url(/skins/green/images/bm.jpg); background-repeat: repeat-x; width: {$gauge}px' ></div> </div>";
-    print "</td><td width='40%'><font color=black> Upgrading the workspace </font><b><font color=green>$workspace</font></b></td><td width=250 align=right>| $id Remaining</td></tr></table>";
-    file_put_contents (PATH_DATA . 'log' . PATH_SEP . "upgrade.data.bin", serialize($aUpgradeData) );
-  }
-  else {
-  	print "<table cellpadding=0><tr><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td>";
-    print "<div style='border-style:solid;border-width:1px; border-color: #A1C868; width:300px; height:19px;' >";
-    print "<div style='color:#FFF; height:16px; text-align:center; padding-top:3px; background-image: url(/skins/green/images/bm.jpg); background-repeat: repeat-x; width: 301px' ></div> </div>";
-    print "</td><td> Finished! All workspaces were upgraded successfully.</td></tr></table>";
-  }
-
-die;  
-
-function getDatabaseCredentials ( $dbFile ) {
-  $sContent = file_get_contents( $dbFile );
-  $sContent = str_replace('<?php',  '',  $sContent);
-  $sContent = str_replace('<?',     '',  $sContent);
-  $sContent = str_replace('?>',     '',  $sContent);
-  $sContent = str_replace('define', '',  $sContent);
-  $sContent = str_replace("('",     '$', $sContent);
-  $sContent = str_replace("',",     '=', $sContent);
-  $sContent = str_replace(");",     ';', $sContent);
-  return $sContent;
-}
-
-function processMasterSchemaFile ( $sSchemaFile ) {
-  global $DB_ADAPTER;
-  global $DB_HOST;
-  global $DB_USER;
-  global $DB_PASS;
-  global $DB_NAME;
-  global $aUpgradeData;
-  
-  //convert newSchema to array
-  if ( isset($aUpgradeData['aNewSchema']) ) {
-    $aNewSchema = $aUpgradeData['aNewSchema'];
-  }
-  else {
-    $aNewSchema   = schemaToArray($sSchemaFile);
-    $aUpgradeData['aNewSchema'] = $aNewSchema;
-  }
-  $aOldSchema = processSchemaFile();
-  if ( is_null($aOldSchema) ) {
-    return;
-  }
-  $aChanges = obtainChanges($aOldSchema, $aNewSchema);
-
-  $oDataBase = new database($DB_ADAPTER, $DB_HOST, $DB_USER, $DB_PASS, $DB_NAME);
-  if ( !$oDataBase->isConnected() ) {
-    return;
-  }
-  $oDataBase->iFetchType = MYSQL_NUM;
-
-  $oDataBase->logQuery ( count ($aChanges ) );
-
-  foreach ($aChanges['tablesToAdd'] as $sTable => $aColumns) {
-    $oDataBase->executeQuery($oDataBase->generateCreateTableSQL($sTable, $aColumns));
-    if (isset($aChanges['tablesToAdd'][$sTable]['INDEXES'])) {
-      foreach ($aChanges['tablesToAdd'][$sTable]['INDEXES'] as $indexName => $aIndex) {
-        $oDataBase->executeQuery($oDataBase->generateAddKeysSQL($sTable, $indexName, $aIndex ) );
-      }
-    }
-  }            
-  
-  foreach ($aChanges['tablesToAlter'] as $sTable => $aActions) {
-    foreach ($aActions as $sAction => $aAction) {
-      foreach ($aAction as $sColumn => $vData) {
-        switch ($sAction) {
-          case 'DROP':
-            $oDataBase->executeQuery($oDataBase->generateDropColumnSQL($sTable, $vData));
-          break;
-          case 'ADD':
-            $oDataBase->executeQuery($oDataBase->generateAddColumnSQL($sTable, $sColumn, $vData));
-          break;
-          case 'CHANGE':
-            $oDataBase->executeQuery($oDataBase->generateChangeColumnSQL($sTable, $sColumn, $vData));
-          break;
-        }
-      }
-    }
-  }
-
-  foreach ($aChanges['tablesWithNewIndex'] as $sTable => $aIndexes) {
-    foreach ($aIndexes as $sIndexName => $aIndexFields ) {
-      $oDataBase->executeQuery($oDataBase->generateAddKeysSQL($sTable, $sIndexName, $aIndexFields ));
-    }
-  }
-
-  foreach ($aChanges['tablesToAlterIndex'] as $sTable => $aIndexes) {
-    foreach ($aIndexes as $sIndexName => $aIndexFields ) {
-      $oDataBase->executeQuery($oDataBase->generateDropKeySQL($sTable, $sIndexName ));
-      $oDataBase->executeQuery($oDataBase->generateAddKeysSQL($sTable, $sIndexName, $aIndexFields ));
-    }
-  }
-  $oDataBase->close();
-}
-
-
-function processSchemaFile( ) {
-	global $DB_ADAPTER;
-	global $DB_HOST;
-	global $DB_USER;
-	global $DB_PASS;
-	global $DB_NAME;
-
-  try {
-    G::LoadSystem( 'database_' . strtolower($DB_ADAPTER));
-  
-    $aOldSchema = array();
-    $oDataBase = new database($DB_ADAPTER, $DB_HOST, $DB_USER, $DB_PASS, $DB_NAME);
-
-    if ( !$oDataBase->isConnected() ) {
-      $oDataBase->logQuery ('Does not exist an available connection!');
-      return NULL;
-    }
-
-    $oDataBase->iFetchType = MYSQL_NUM;
-    $oDataset1 = $oDataBase->executeQuery($oDataBase->generateShowTablesSQL());
- 
-  } catch ( Exception $e ) {
-    $oDataBase->logQuery ( $e->getmessage() );
-  	return NULL;
-  }
-  
-  //going thru all tables in current WF_ database
-  while ($aRow1 = $oDataBase->getRegistry( $oDataset1) ) {
-    $aPrimaryKeys = array();
-    $sTable = strtoupper($aRow1[0]);
-    
-    //get description of each table, ( column and primary keys )
-    //$oDataset2 = $oDataBase->executeQuery( $oDataBase->generateDescTableSQL($aRow1[0]) );
-    $oDataset2 = $oDataBase->executeQuery( $oDataBase->generateDescTableSQL($sTable ) );
-    $aOldSchema[ $sTable ] = array();
-    $oDataBase->iFetchType = MYSQL_ASSOC;
-    while ($aRow2 = $oDataBase->getRegistry($oDataset2)) {
-      $aOldSchema[$sTable][$aRow2['Field']]['Field']   = $aRow2['Field'];
-      $aOldSchema[$sTable][$aRow2['Field']]['Type']    = $aRow2['Type'];
-      $aOldSchema[$sTable][$aRow2['Field']]['Null']    = $aRow2['Null'];
-      $aOldSchema[$sTable][$aRow2['Field']]['Default'] = $aRow2['Default'];
-    }
-
-    //get indexes of each table  SHOW INDEX FROM `ADDITIONAL_TABLES`;   -- WHERE Key_name <> 'PRIMARY'
-    $oDataset2 = $oDataBase->executeQuery($oDataBase->generateTableIndexSQL($aRow1[0]));
-    $oDataBase->iFetchType = MYSQL_ASSOC;
-    while ($aRow2 = $oDataBase->getRegistry($oDataset2)) {
-    	if ( !isset($aOldSchema[$sTable]['INDEXES']) ) {
-        $aOldSchema[$sTable]['INDEXES'] = array();
-    	}
-    	if (!isset($aOldSchema[$sTable]['INDEXES'][$aRow2['Key_name']] ) )  {
-    	  $aOldSchema[$sTable]['INDEXES'][$aRow2['Key_name']] = array(); 
-    	}
-      $aOldSchema[$sTable]['INDEXES'][$aRow2['Key_name']][] = $aRow2['Column_name'];
-    }
-    
-    $oDataBase->iFetchType = MYSQL_NUM; //this line is neccesary because the next fetch needs to be with MYSQL_NUM
-  }
-  //finally return the array with old schema obtained from the Database
-  if ( count($aOldSchema) == 0 ) $aOldSchema = null;
-  return $aOldSchema;
-}
-
-//process the schema file in the patch file, and obtain an array
-function schemaToArray($sSchemaFile) {
-  try {
-    $aSchema = array();
-    $oXml = new DomDocument();
-    $oXml->load($sSchemaFile);
-    $aTables = $oXml->getElementsByTagName('table');
-    foreach ($aTables as $oTable) {
-      $aPrimaryKeys = array();
-      $sTableName = $oTable->getAttribute('name');
-      $aSchema[$sTableName] = array();
-      $aColumns = $oTable->getElementsByTagName('column');
-      foreach ($aColumns as $oColumn) {
-        $sColumName = $oColumn->getAttribute('name');
-        $aSchema[$sTableName][$sColumName] = array();
-        $aVendors = $oColumn->getElementsByTagName('vendor');
-        foreach ($aVendors as $oVendor) {
-          if ($oVendor->getAttribute('type') == DB_ADAPTER) {
-            break;
-          }
-        }
-        $aParameters = $oColumn->getElementsByTagName('parameter');
-        foreach ($aParameters as $oParameter) {
-          $parameterName = ucwords($oParameter->getAttribute('name'));
-          if ( $parameterName == 'Key' && strtoupper($oParameter->getAttribute('value')) == 'PRI' ) {
-          	$aPrimaryKeys[] = $oColumn->getAttribute('name');
-          }
-
-        	if ( in_array ( $parameterName, array('Field','Type','Null','Default') ) ) {
-            $aSchema[$sTableName][$sColumName][$parameterName] = $oParameter->getAttribute('value');
-          }
-        }
-      }
-      
-      if ( is_array($aPrimaryKeys) && count($aPrimaryKeys) > 0 ) {
-        $aSchema[$sTableName]['INDEXES']['PRIMARY'] = $aPrimaryKeys;
-      }
-      $aIndexes = $oTable->getElementsByTagName('index');
-      foreach ($aIndexes as $oIndex) {
-      	$aIndex = array();
-        $aIndexesColumns = $oIndex->getElementsByTagName('index-column');
-        foreach ($aIndexesColumns as $oIndexColumn) {
-          $aIndex[] = $oIndexColumn->getAttribute('name');
-        }
-        $aSchema[$sTableName]['INDEXES'][ $oIndex->getAttribute('name') ] = $aIndex; 
-      }
-    }
-    return $aSchema;
-  }
-  catch (Exception $oError) {
-    throw $oError;
-  }
-}
-
-function obtainChanges($aOldSchema, $aNewSchema) {
-  //$aChanges = array('tablesToDelete' => array(), 'tablesToAdd' => array(), 'tablesToAlter' => array());
-  //Tables to delete, but this is disabled 
-  //foreach ($aOldSchema as $sTableName => $aColumns) {
-  //  if ( !isset($aNewSchema[$sTableName])) {
-  //    if (!in_array($sTableName, array('KT_APPLICATION', 'KT_DOCUMENT', 'KT_PROCESS'))) {
-  //      $aChanges['tablesToDelete'][] = $sTableName;
-  //    }
-  //  }
-  //}
-  
-  $aChanges = array('tablesToAdd' => array(), 'tablesToAlter' => array(), 'tablesWithNewIndex' => array(), 'tablesToAlterIndex'=> array());
-
-  //new tables  to create and alter 
-  foreach ($aNewSchema as $sTableName => $aColumns) {
-    if (!isset($aOldSchema[$sTableName])) {
-      $aChanges['tablesToAdd'][$sTableName] = $aColumns;
-    }
-    else {
-    	//drop old columns
-      foreach ($aOldSchema[$sTableName] as $sColumName => $aParameters) {
-        if (!isset($aNewSchema[$sTableName][$sColumName])) {
-          if (!isset($aChanges['tablesToAlter'][$sTableName])) {
-            $aChanges['tablesToAlter'][$sTableName] = array('DROP' => array(), 'ADD' => array(), 'CHANGE' => array());
-          }
-          $aChanges['tablesToAlter'][$sTableName]['DROP'][$sColumName] = $sColumName;
-        }
-      }
-      
-      //create new columns
-      //foreach ($aNewSchema[$sTableName] as $sColumName => $aParameters) {
-      foreach ($aColumns as $sColumName => $aParameters) {
-        if ($sColumName != 'INDEXES') {
-          if (!isset($aOldSchema[$sTableName][$sColumName])) { //this column doesnt exist in oldschema
-            if (!isset($aChanges['tablesToAlter'][$sTableName])) {
-              $aChanges['tablesToAlter'][$sTableName] = array('DROP' => array(), 'ADD' => array(), 'CHANGE' => array());
-            }
-            $aChanges['tablesToAlter'][$sTableName]['ADD'][$sColumName] = $aParameters;
-          }
-          else {  //the column exists
-            $newField = $aNewSchema[$sTableName][$sColumName];
-            $oldField = $aOldSchema[$sTableName][$sColumName];
-            //both are null, no change is required
-            if ( !isset($newField['Default']) && !isset($oldField['Default'])) $changeDefaultAttr = false; 
-            //one of them is null, change IS required
-            if ( !isset($newField['Default']) && isset($oldField['Default']) && $oldField['Default']!= '')  $changeDefaultAttr = true; 
-            if (  isset($newField['Default']) && !isset($oldField['Default'])) $changeDefaultAttr = true; 
-            //both are defined and they are different.
-            if ( isset($newField['Default']) && isset($oldField['Default']) ) {
-               if ( $newField['Default'] != $oldField['Default'] ) 
-                 $changeDefaultAttr = true; 
-               else
-                 $changeDefaultAttr = false; 
-            }
-            //special cases
-            // BLOB and TEXT columns cannot have DEFAULT values.  http://dev.mysql.com/doc/refman/5.0/en/blob.html     
-            if ( in_array(strtolower($newField['Type']), array('text','mediumtext') ) ) 
-              $changeDefaultAttr = false; 
-            
-            //#1067 - Invalid default value for datetime field
-            if ( in_array($newField['Type'], array('datetime')) && isset($newField['Default']) && $newField['Default']== '' ) 
-              $changeDefaultAttr = false; 
-          
-            //#1067 - Invalid default value for int field           
-            if ( substr($newField['Type'], 0, 3 ) && isset($newField['Default']) && $newField['Default']== '' ) 
-              $changeDefaultAttr = false; 
-            
-            //if any difference exists, then insert the difference in aChanges
-            if ( $newField['Field']   != $oldField['Field'] ||
-                 $newField['Type']    != $oldField['Type'] ||
-                 $newField['Null']    != $oldField['Null'] ||
-                 $changeDefaultAttr ) {
-              if (!isset($aChanges['tablesToAlter'][$sTableName])) {
-                $aChanges['tablesToAlter'][$sTableName] = array('DROP' => array(), 'ADD' => array(), 'CHANGE' => array());
-              }
-              $aChanges['tablesToAlter'][$sTableName]['CHANGE'][$sColumName]['Field']   = $newField['Field'];
-              $aChanges['tablesToAlter'][$sTableName]['CHANGE'][$sColumName]['Type']    = $newField['Type'];
-              $aChanges['tablesToAlter'][$sTableName]['CHANGE'][$sColumName]['Null']    = $newField['Null'];
-              if ( isset($newField['Default']) )
-                $aChanges['tablesToAlter'][$sTableName]['CHANGE'][$sColumName]['Default'] = $newField['Default'];
-              else
-                $aChanges['tablesToAlter'][$sTableName]['CHANGE'][$sColumName]['Default'] = null;
-          
-            }
-          }
-        } //only columns, no the indexes column
-      }//foreach $aColumns
-      
-      //now check the indexes of table
-      if ( isset($aNewSchema[$sTableName]['INDEXES']) ) {
-        foreach ( $aNewSchema[$sTableName]['INDEXES'] as $indexName => $indexFields ) {
-          if (!isset( $aOldSchema[$sTableName]['INDEXES'][$indexName]) ) {
-            if (!isset($aChanges['tablesWithNewIndex'][$sTableName])) {
-              $aChanges['tablesWithNewIndex'][$sTableName] = array();
-            }
-            $aChanges['tablesWithNewIndex'][$sTableName][$indexName] = $indexFields;
-          }
-          else {
-            if ( $aOldSchema[$sTableName]['INDEXES'][$indexName] != $indexFields ) {
-              if (!isset($aChanges['tablesToAlterIndex'][$sTableName])) {
-                $aChanges['tablesToAlterIndex'][$sTableName] = array();
-              }
-              $aChanges['tablesToAlterIndex'][$sTableName][$indexName] = $indexFields;
-            }
-          }  
-        }
-      }
-    }  //for-else table exists
-  }  //for new schema
-  return $aChanges;
-}
-
+<?php
+/**
+ * upgrade_SystemAjax.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2010 Colosa Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
+ * Coral Gables, FL, 33134, USA, or email info@colosa.com.
+ */
+global $DB_ADAPTER;
+global $DB_HOST;
+global $DB_USER;
+global $DB_PASS;
+global $DB_NAME;
+set_time_limit( 0 );
+
+$id = '';
+if (isset( $_POST['id'] ))
+    $id = $_POST['id'];
+
+G::LoadClass( 'languages' );
+G::LoadSystem( 'database_mysql' );
+
+$aUpgradeData = unserialize( file_get_contents( PATH_DATA . 'log' . PATH_SEP . "upgrade.data.bin" ) );
+$aWorkspaces = $aUpgradeData['workspaces'];
+
+if (is_array( $aWorkspaces ) && count( $aWorkspaces ) > 0) {
+    $workspace = array_shift( $aUpgradeData['workspaces'] );
+
+    eval( getDatabaseCredentials( PATH_DB . $workspace . PATH_SEP . 'db.php' ) );
+    $oDataBase = new database( $DB_ADAPTER, $DB_HOST, $DB_USER, $DB_PASS, $DB_NAME );
+    $oDataBase->iFetchType = MYSQL_NUM;
+
+    //processing .po file
+    if ($aUpgradeData['sPoFile'] != '') {
+        $oLanguages = new languages();
+        $oLanguages->importLanguage( $aUpgradeData['sPoFile'], $aUpgradeData['bForceXmlPoFile'] );
+        $aUpgradeData['bForceXmlPoFile'] = false;
+    }
+
+    if ($aUpgradeData['sSchemaFile'] != '')
+        processMasterSchemaFile( $aUpgradeData['sSchemaFile'] );
+
+        //draw a gauge control indicating the progress in workspaces
+    $gauge = intval( (($aUpgradeData['wsQuantity'] - count( $aWorkspaces ) + 1) / $aUpgradeData['wsQuantity']) * 301 );
+    print "<table cellpadding=0><tr><td><img src='/images/ajax-loader.gif' border=0/></td><td>";
+    print "<div style='border-style:solid;border-width:1px; border-color: #A1C868; width:300px; height:19px;' >";
+    print "<div style='color:#FFF; height:16px; text-align:center; padding-top:3px; background-image: url(/skins/green/images/bm.jpg); background-repeat: repeat-x; width: {$gauge}px' ></div> </div>";
+    print "</td><td width='40%'><font color=black> Upgrading the workspace </font><b><font color=green>$workspace</font></b></td><td width=250 align=right>| $id Remaining</td></tr></table>";
+    file_put_contents( PATH_DATA . 'log' . PATH_SEP . "upgrade.data.bin", serialize( $aUpgradeData ) );
+} else {
+    print "<table cellpadding=0><tr><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td>";
+    print "<div style='border-style:solid;border-width:1px; border-color: #A1C868; width:300px; height:19px;' >";
+    print "<div style='color:#FFF; height:16px; text-align:center; padding-top:3px; background-image: url(/skins/green/images/bm.jpg); background-repeat: repeat-x; width: 301px' ></div> </div>";
+    print "</td><td> Finished! All workspaces were upgraded successfully.</td></tr></table>";
+}
+
+die();
+
+function getDatabaseCredentials ($dbFile)
+{
+    $sContent = file_get_contents( $dbFile );
+    $sContent = str_replace( '<?php', '', $sContent );
+    $sContent = str_replace( '<?', '', $sContent );
+    $sContent = str_replace( '?>', '', $sContent );
+    $sContent = str_replace( 'define', '', $sContent );
+    $sContent = str_replace( "('", '$', $sContent );
+    $sContent = str_replace( "',", '=', $sContent );
+    $sContent = str_replace( ");", ';', $sContent );
+    return $sContent;
+}
+
+function processMasterSchemaFile ($sSchemaFile)
+{
+    global $DB_ADAPTER;
+    global $DB_HOST;
+    global $DB_USER;
+    global $DB_PASS;
+    global $DB_NAME;
+    global $aUpgradeData;
+
+    //convert newSchema to array
+    if (isset( $aUpgradeData['aNewSchema'] )) {
+        $aNewSchema = $aUpgradeData['aNewSchema'];
+    } else {
+        $aNewSchema = schemaToArray( $sSchemaFile );
+        $aUpgradeData['aNewSchema'] = $aNewSchema;
+    }
+    $aOldSchema = processSchemaFile();
+    if (is_null( $aOldSchema )) {
+        return;
+    }
+    $aChanges = obtainChanges( $aOldSchema, $aNewSchema );
+
+    $oDataBase = new database( $DB_ADAPTER, $DB_HOST, $DB_USER, $DB_PASS, $DB_NAME );
+    if (! $oDataBase->isConnected()) {
+        return;
+    }
+    $oDataBase->iFetchType = MYSQL_NUM;
+
+    $oDataBase->logQuery( count( $aChanges ) );
+
+    foreach ($aChanges['tablesToAdd'] as $sTable => $aColumns) {
+        $oDataBase->executeQuery( $oDataBase->generateCreateTableSQL( $sTable, $aColumns ) );
+        if (isset( $aChanges['tablesToAdd'][$sTable]['INDEXES'] )) {
+            foreach ($aChanges['tablesToAdd'][$sTable]['INDEXES'] as $indexName => $aIndex) {
+                $oDataBase->executeQuery( $oDataBase->generateAddKeysSQL( $sTable, $indexName, $aIndex ) );
+            }
+        }
+    }
+
+    foreach ($aChanges['tablesToAlter'] as $sTable => $aActions) {
+        foreach ($aActions as $sAction => $aAction) {
+            foreach ($aAction as $sColumn => $vData) {
+                switch ($sAction) {
+                    case 'DROP':
+                        $oDataBase->executeQuery( $oDataBase->generateDropColumnSQL( $sTable, $vData ) );
+                        break;
+                    case 'ADD':
+                        $oDataBase->executeQuery( $oDataBase->generateAddColumnSQL( $sTable, $sColumn, $vData ) );
+                        break;
+                    case 'CHANGE':
+                        $oDataBase->executeQuery( $oDataBase->generateChangeColumnSQL( $sTable, $sColumn, $vData ) );
+                        break;
+                }
+            }
+        }
+    }
+
+    foreach ($aChanges['tablesWithNewIndex'] as $sTable => $aIndexes) {
+        foreach ($aIndexes as $sIndexName => $aIndexFields) {
+            $oDataBase->executeQuery( $oDataBase->generateAddKeysSQL( $sTable, $sIndexName, $aIndexFields ) );
+        }
+    }
+
+    foreach ($aChanges['tablesToAlterIndex'] as $sTable => $aIndexes) {
+        foreach ($aIndexes as $sIndexName => $aIndexFields) {
+            $oDataBase->executeQuery( $oDataBase->generateDropKeySQL( $sTable, $sIndexName ) );
+            $oDataBase->executeQuery( $oDataBase->generateAddKeysSQL( $sTable, $sIndexName, $aIndexFields ) );
+        }
+    }
+    $oDataBase->close();
+}
+
+function processSchemaFile ()
+{
+    global $DB_ADAPTER;
+    global $DB_HOST;
+    global $DB_USER;
+    global $DB_PASS;
+    global $DB_NAME;
+
+    try {
+        G::LoadSystem( 'database_' . strtolower( $DB_ADAPTER ) );
+
+        $aOldSchema = array ();
+        $oDataBase = new database( $DB_ADAPTER, $DB_HOST, $DB_USER, $DB_PASS, $DB_NAME );
+
+        if (! $oDataBase->isConnected()) {
+            $oDataBase->logQuery( 'Does not exist an available connection!' );
+            return null;
+        }
+
+        $oDataBase->iFetchType = MYSQL_NUM;
+        $oDataset1 = $oDataBase->executeQuery( $oDataBase->generateShowTablesSQL() );
+
+    } catch (Exception $e) {
+        $oDataBase->logQuery( $e->getmessage() );
+        return null;
+    }
+
+    //going thru all tables in current WF_ database
+    while ($aRow1 = $oDataBase->getRegistry( $oDataset1 )) {
+        $aPrimaryKeys = array ();
+        $sTable = strtoupper( $aRow1[0] );
+
+        //get description of each table, ( column and primary keys )
+        //$oDataset2 = $oDataBase->executeQuery( $oDataBase->generateDescTableSQL($aRow1[0]) );
+        $oDataset2 = $oDataBase->executeQuery( $oDataBase->generateDescTableSQL( $sTable ) );
+        $aOldSchema[$sTable] = array ();
+        $oDataBase->iFetchType = MYSQL_ASSOC;
+        while ($aRow2 = $oDataBase->getRegistry( $oDataset2 )) {
+            $aOldSchema[$sTable][$aRow2['Field']]['Field'] = $aRow2['Field'];
+            $aOldSchema[$sTable][$aRow2['Field']]['Type'] = $aRow2['Type'];
+            $aOldSchema[$sTable][$aRow2['Field']]['Null'] = $aRow2['Null'];
+            $aOldSchema[$sTable][$aRow2['Field']]['Default'] = $aRow2['Default'];
+        }
+
+        //get indexes of each table  SHOW INDEX FROM `ADDITIONAL_TABLES`;   -- WHERE Key_name <> 'PRIMARY'
+        $oDataset2 = $oDataBase->executeQuery( $oDataBase->generateTableIndexSQL( $aRow1[0] ) );
+        $oDataBase->iFetchType = MYSQL_ASSOC;
+        while ($aRow2 = $oDataBase->getRegistry( $oDataset2 )) {
+            if (! isset( $aOldSchema[$sTable]['INDEXES'] )) {
+                $aOldSchema[$sTable]['INDEXES'] = array ();
+            }
+            if (! isset( $aOldSchema[$sTable]['INDEXES'][$aRow2['Key_name']] )) {
+                $aOldSchema[$sTable]['INDEXES'][$aRow2['Key_name']] = array ();
+            }
+            $aOldSchema[$sTable]['INDEXES'][$aRow2['Key_name']][] = $aRow2['Column_name'];
+        }
+
+        $oDataBase->iFetchType = MYSQL_NUM; //this line is neccesary because the next fetch needs to be with MYSQL_NUM
+    }
+    //finally return the array with old schema obtained from the Database
+    if (count( $aOldSchema ) == 0)
+        $aOldSchema = null;
+    return $aOldSchema;
+}
+
+//process the schema file in the patch file, and obtain an array
+function schemaToArray ($sSchemaFile)
+{
+    try {
+        $aSchema = array ();
+        $oXml = new DomDocument();
+        $oXml->load( $sSchemaFile );
+        $aTables = $oXml->getElementsByTagName( 'table' );
+        foreach ($aTables as $oTable) {
+            $aPrimaryKeys = array ();
+            $sTableName = $oTable->getAttribute( 'name' );
+            $aSchema[$sTableName] = array ();
+            $aColumns = $oTable->getElementsByTagName( 'column' );
+            foreach ($aColumns as $oColumn) {
+                $sColumName = $oColumn->getAttribute( 'name' );
+                $aSchema[$sTableName][$sColumName] = array ();
+                $aVendors = $oColumn->getElementsByTagName( 'vendor' );
+                foreach ($aVendors as $oVendor) {
+                    if ($oVendor->getAttribute( 'type' ) == DB_ADAPTER) {
+                        break;
+                    }
+                }
+                $aParameters = $oColumn->getElementsByTagName( 'parameter' );
+                foreach ($aParameters as $oParameter) {
+                    $parameterName = ucwords( $oParameter->getAttribute( 'name' ) );
+                    if ($parameterName == 'Key' && strtoupper( $oParameter->getAttribute( 'value' ) ) == 'PRI') {
+                        $aPrimaryKeys[] = $oColumn->getAttribute( 'name' );
+                    }
+
+                    if (in_array( $parameterName, array ('Field','Type','Null','Default'
+                    ) )) {
+                        $aSchema[$sTableName][$sColumName][$parameterName] = $oParameter->getAttribute( 'value' );
+                    }
+                }
+            }
+
+            if (is_array( $aPrimaryKeys ) && count( $aPrimaryKeys ) > 0) {
+                $aSchema[$sTableName]['INDEXES']['PRIMARY'] = $aPrimaryKeys;
+            }
+            $aIndexes = $oTable->getElementsByTagName( 'index' );
+            foreach ($aIndexes as $oIndex) {
+                $aIndex = array ();
+                $aIndexesColumns = $oIndex->getElementsByTagName( 'index-column' );
+                foreach ($aIndexesColumns as $oIndexColumn) {
+                    $aIndex[] = $oIndexColumn->getAttribute( 'name' );
+                }
+                $aSchema[$sTableName]['INDEXES'][$oIndex->getAttribute( 'name' )] = $aIndex;
+            }
+        }
+        return $aSchema;
+    } catch (Exception $oError) {
+        throw $oError;
+    }
+}
+
+function obtainChanges ($aOldSchema, $aNewSchema)
+{
+    //$aChanges = array('tablesToDelete' => array(), 'tablesToAdd' => array(), 'tablesToAlter' => array());
+    //Tables to delete, but this is disabled
+    //foreach ($aOldSchema as $sTableName => $aColumns) {
+    //  if ( !isset($aNewSchema[$sTableName])) {
+    //    if (!in_array($sTableName, array('KT_APPLICATION', 'KT_DOCUMENT', 'KT_PROCESS'))) {
+    //      $aChanges['tablesToDelete'][] = $sTableName;
+    //    }
+    //  }
+    //}
+
+
+    $aChanges = array ('tablesToAdd' => array (),'tablesToAlter' => array (),'tablesWithNewIndex' => array (),'tablesToAlterIndex' => array ()
+    );
+
+    //new tables  to create and alter
+    foreach ($aNewSchema as $sTableName => $aColumns) {
+        if (! isset( $aOldSchema[$sTableName] )) {
+            $aChanges['tablesToAdd'][$sTableName] = $aColumns;
+        } else {
+            //drop old columns
+            foreach ($aOldSchema[$sTableName] as $sColumName => $aParameters) {
+                if (! isset( $aNewSchema[$sTableName][$sColumName] )) {
+                    if (! isset( $aChanges['tablesToAlter'][$sTableName] )) {
+                        $aChanges['tablesToAlter'][$sTableName] = array ('DROP' => array (),'ADD' => array (),'CHANGE' => array ()
+                        );
+                    }
+                    $aChanges['tablesToAlter'][$sTableName]['DROP'][$sColumName] = $sColumName;
+                }
+            }
+
+            //create new columns
+            //foreach ($aNewSchema[$sTableName] as $sColumName => $aParameters) {
+            foreach ($aColumns as $sColumName => $aParameters) {
+                if ($sColumName != 'INDEXES') {
+                    if (! isset( $aOldSchema[$sTableName][$sColumName] )) { //this column doesnt exist in oldschema
+                        if (! isset( $aChanges['tablesToAlter'][$sTableName] )) {
+                            $aChanges['tablesToAlter'][$sTableName] = array ('DROP' => array (),'ADD' => array (),'CHANGE' => array ()
+                            );
+                        }
+                        $aChanges['tablesToAlter'][$sTableName]['ADD'][$sColumName] = $aParameters;
+                    } else { //the column exists
+                        $newField = $aNewSchema[$sTableName][$sColumName];
+                        $oldField = $aOldSchema[$sTableName][$sColumName];
+                        //both are null, no change is required
+                        if (! isset( $newField['Default'] ) && ! isset( $oldField['Default'] ))
+                            $changeDefaultAttr = false;
+                            //one of them is null, change IS required
+                        if (! isset( $newField['Default'] ) && isset( $oldField['Default'] ) && $oldField['Default'] != '')
+                            $changeDefaultAttr = true;
+                        if (isset( $newField['Default'] ) && ! isset( $oldField['Default'] ))
+                            $changeDefaultAttr = true;
+                            //both are defined and they are different.
+                        if (isset( $newField['Default'] ) && isset( $oldField['Default'] )) {
+                            if ($newField['Default'] != $oldField['Default'])
+                                $changeDefaultAttr = true;
+                            else
+                                $changeDefaultAttr = false;
+                        }
+                        //special cases
+                        // BLOB and TEXT columns cannot have DEFAULT values.  http://dev.mysql.com/doc/refman/5.0/en/blob.html
+                        if (in_array( strtolower( $newField['Type'] ), array ('text','mediumtext'
+                        ) ))
+                            $changeDefaultAttr = false;
+
+                            //#1067 - Invalid default value for datetime field
+                        if (in_array( $newField['Type'], array ('datetime'
+                        ) ) && isset( $newField['Default'] ) && $newField['Default'] == '')
+                            $changeDefaultAttr = false;
+
+                            //#1067 - Invalid default value for int field
+                        if (substr( $newField['Type'], 0, 3 ) && isset( $newField['Default'] ) && $newField['Default'] == '')
+                            $changeDefaultAttr = false;
+
+                            //if any difference exists, then insert the difference in aChanges
+                        if ($newField['Field'] != $oldField['Field'] || $newField['Type'] != $oldField['Type'] || $newField['Null'] != $oldField['Null'] || $changeDefaultAttr) {
+                            if (! isset( $aChanges['tablesToAlter'][$sTableName] )) {
+                                $aChanges['tablesToAlter'][$sTableName] = array ('DROP' => array (),'ADD' => array (),'CHANGE' => array ()
+                                );
+                            }
+                            $aChanges['tablesToAlter'][$sTableName]['CHANGE'][$sColumName]['Field'] = $newField['Field'];
+                            $aChanges['tablesToAlter'][$sTableName]['CHANGE'][$sColumName]['Type'] = $newField['Type'];
+                            $aChanges['tablesToAlter'][$sTableName]['CHANGE'][$sColumName]['Null'] = $newField['Null'];
+                            if (isset( $newField['Default'] ))
+                                $aChanges['tablesToAlter'][$sTableName]['CHANGE'][$sColumName]['Default'] = $newField['Default'];
+                            else
+                                $aChanges['tablesToAlter'][$sTableName]['CHANGE'][$sColumName]['Default'] = null;
+
+                        }
+                    }
+                } //only columns, no the indexes column
+            } //foreach $aColumns
+
+
+            //now check the indexes of table
+            if (isset( $aNewSchema[$sTableName]['INDEXES'] )) {
+                foreach ($aNewSchema[$sTableName]['INDEXES'] as $indexName => $indexFields) {
+                    if (! isset( $aOldSchema[$sTableName]['INDEXES'][$indexName] )) {
+                        if (! isset( $aChanges['tablesWithNewIndex'][$sTableName] )) {
+                            $aChanges['tablesWithNewIndex'][$sTableName] = array ();
+                        }
+                        $aChanges['tablesWithNewIndex'][$sTableName][$indexName] = $indexFields;
+                    } else {
+                        if ($aOldSchema[$sTableName]['INDEXES'][$indexName] != $indexFields) {
+                            if (! isset( $aChanges['tablesToAlterIndex'][$sTableName] )) {
+                                $aChanges['tablesToAlterIndex'][$sTableName] = array ();
+                            }
+                            $aChanges['tablesToAlterIndex'][$sTableName][$indexName] = $indexFields;
+                        }
+                    }
+                }
+            }
+        } //for-else table exists
+    } //for new schema
+    return $aChanges;
+}
+
diff --git a/workflow/engine/methods/setup/uplogo.php b/workflow/engine/methods/setup/uplogo.php
index 9f133afc8..20691d262 100755
--- a/workflow/engine/methods/setup/uplogo.php
+++ b/workflow/engine/methods/setup/uplogo.php
@@ -12,50 +12,50 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
  */
- 
-  global $RBAC;
-  G::LoadClass('replacementLogo');
-  
-  if($RBAC->userCanAccess('PM_SETUP') != 1 && $RBAC->userCanAccess('PM_SETUP_ADVANCE') != 1){ 
-    G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-    die;
-  }
 
-  //calculating the max upload file size;
-  $POST_MAX_SIZE   = ini_get('post_max_size');
-  $mul = substr($POST_MAX_SIZE, -1);
-  $mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
-  $postMaxSize = (int)$POST_MAX_SIZE * $mul;
-  
-  $UPLOAD_MAX_SIZE = ini_get('upload_max_filesize');
-  $mul = substr($UPLOAD_MAX_SIZE, -1);
-  $mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
-  $uploadMaxSize = (int)$UPLOAD_MAX_SIZE * $mul;
+global $RBAC;
+G::LoadClass( 'replacementLogo' );
 
-  if ( $postMaxSize < $uploadMaxSize ) $uploadMaxSize = $postMaxSize;
-  $Fields['MAX_FILE_SIZE'] = $uploadMaxSize .  " (" . $UPLOAD_MAX_SIZE . ") ";
+if ($RBAC->userCanAccess( 'PM_SETUP' ) != 1 && $RBAC->userCanAccess( 'PM_SETUP_ADVANCE' ) != 1) {
+    G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+    die();
+}
 
-  $G_MAIN_MENU            = 'processmaker';
-  $G_SUB_MENU             = 'setup';
-  $G_ID_MENU_SELECTED     = 'SETUP';
-  $G_ID_SUB_MENU_SELECTED = 'LOGO';
-  
-  $G_PUBLISH = new Publisher;
-  $oHeadPublisher =& headPublisher::getSingleton();
-  $G_PUBLISH->AddContent('xmlform', 'xmlform', 'setup/uplogo', '', $Fields );
-  
-  $G_PUBLISH->AddContent('view', 'setup/uplogo' );
-  G::RenderPage( "publishBlank", "blank");
+//calculating the max upload file size;
+$POST_MAX_SIZE = ini_get( 'post_max_size' );
+$mul = substr( $POST_MAX_SIZE, - 1 );
+$mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
+$postMaxSize = (int) $POST_MAX_SIZE * $mul;
+
+$UPLOAD_MAX_SIZE = ini_get( 'upload_max_filesize' );
+$mul = substr( $UPLOAD_MAX_SIZE, - 1 );
+$mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
+$uploadMaxSize = (int) $UPLOAD_MAX_SIZE * $mul;
+
+if ($postMaxSize < $uploadMaxSize)
+    $uploadMaxSize = $postMaxSize;
+$Fields['MAX_FILE_SIZE'] = $uploadMaxSize . " (" . $UPLOAD_MAX_SIZE . ") ";
+
+$G_MAIN_MENU = 'processmaker';
+$G_SUB_MENU = 'setup';
+$G_ID_MENU_SELECTED = 'SETUP';
+$G_ID_SUB_MENU_SELECTED = 'LOGO';
+
+$G_PUBLISH = new Publisher();
+$oHeadPublisher = & headPublisher::getSingleton();
+$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'setup/uplogo', '', $Fields );
+
+$G_PUBLISH->AddContent( 'view', 'setup/uplogo' );
+G::RenderPage( "publishBlank", "blank" );
 
 ?>
 <script>
@@ -63,22 +63,22 @@
    * By krlos April 07, 2010
    * we're going to change to the logo choosed
    * parameter logo name
-   */   
-  var changeLogo= function (nameLogo){ 
+   */
+  var changeLogo= function (nameLogo){
     new leimnud.module.app.confirm().make({
       label:G_STRINGS.ID_APPLY_LOGO,
       action:function(){
       ajax_function('replacementLogo','replacementLogo','NAMELOGO='+encodeURIComponent(nameLogo),'GET') ;
       parent.parent.window.location = 'main?s=LOGO';
     }});
-  
+
   }
-  
+
   /*
    * By krlos April 07, 2010
    * to delete logo choosed
    * parameter logo name
-   */ 
+   */
   function deleteLogo(nameLogo) {
     new leimnud.module.app.confirm().make({
       label:G_STRINGS.ID_REMOVE_LOGO,
@@ -95,8 +95,9 @@
    * to put processmaker logo
    * parameters file db and user id
    */
-  var restoreLogo = function (optfiledb, usrUid){ 
+  var restoreLogo = function (optfiledb, usrUid){
     ajax_function('replacementLogo','restoreLogo','OPTFILEDB='+optfiledb+'&USRUID='+usrUid,'GET') ;
     window.location = 'uplogo';
-  }  
+  }
 </script>
+
diff --git a/workflow/engine/methods/setup/webServices.php b/workflow/engine/methods/setup/webServices.php
index b0092e326..24cec672c 100755
--- a/workflow/engine/methods/setup/webServices.php
+++ b/workflow/engine/methods/setup/webServices.php
@@ -1,161 +1,158 @@
-<?php
-/**
- * control.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
- */
-
-if($RBAC->userCanAccess('PM_SETUP') != 1 && $RBAC->userCanAccess('PM_FACTORY') != 1){	
-  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-  //G::header('location: ../login/login');
-  die;
-}
-
-  $G_MAIN_MENU            = 'processmaker';
-  //$G_SUB_MENU             = 'setup';
-  $G_ID_MENU_SELECTED     = 'SETUP';
-  //$G_ID_SUB_MENU_SELECTED = 'WEBSERVICES';
-  
-  if (!extension_loaded('soap')) {	    	   			    		
-	    		$G_PUBLISH = new Publisher;
-	  	    $G_PUBLISH->AddContent('xmlform', 'xmlform', 'setup/wsMessage');
-	    		G::RenderPage( "publish" );	 
-	 }
-	else
-	 {	
-	  	$G_PUBLISH = new Publisher;
-	  	$G_PUBLISH->AddContent('view', 'setup/webServicesTree' );
-	  	$G_PUBLISH->AddContent('smarty', 'groups/groups_usersList', '', '', array());
-	
-	    G::RenderPage( "publish-treeview", 'blank');
-	 }	
-	
-  $link_Edit = G::encryptlink('webServicesSetup');
-  $link_List = G::encryptlink('webServicesList');
-  
-  
-?>
-<script>
-  document.body.style.backgroundColor="#fff";
-  var oAux = document.getElementById("publisherContent[0]");
-  oAux.id = "publisherContent[666]";
-  var currentGroup=false;
-
-  function webServicesSetup(){
-    popupWindow('' , '<?php echo $link_Edit ?>' , 500 , 225 );
-  }
-   
-  function showFormWS( uid, element ){
-   
-    currentGroup = uid;
-    var oRPC = new leimnud.module.rpc.xmlhttp({
-      url   : '../setup/webServicesAjax',
-      async : false,
-      method: 'POST',
-      args  : 'action=showForm&wsID=' + uid
-    });
-    oRPC.make();
-    document.getElementById('spanUsersList').innerHTML = oRPC.xmlhttp.responseText;
-    if ((uid == 'NewCase') || (uid == 'NewCaseImpersonate')) {
-      var scs=oRPC.xmlhttp.responseText.extractScript();scs.evalScript();
-    }
-  }
-  function execWebService( uid) {
-    var oRPC = new leimnud.module.rpc.xmlhttp({
-      url   : '../setup/webServicesAjax',
-      async : true,
-      method: 'POST',
-      args  : 'action=execWebService&wsID=' + uid
-    });
-
-    oRPC.callback = function(rpc) {
-	  	
-	  	var scs = rpc.xmlhttp.responseText.extractScript();
-	  	document.getElementById('spanUsersList').innerHTML = rpc.xmlhttp.responseText;
-	  	scs.evalScript();
-	  	
-  	}.extend(this);
-  	
-    oRPC.make();
-    
-  }
-
-  submitThisForm = function(oForm) {
-    var oAux;
-    var bContinue = true;
-    if(bContinue) {
-	  result = ajax_post(oForm.action, oForm, 'POST', function(response){
-		var scs = response.extractScript();
-		document.getElementById('spanUsersList').innerHTML = response;
-		scs.evalScript();
-	  });
-      refreshTree();
-    }
-  };
-
-	
-
-
-  function callbackWebService( ) {
-/*
-    var oRPC = new leimnud.module.rpc.xmlhttp({
-      url   : '../setup/webServicesAjax',
-      async : false,
-      method: 'POST',
-      args  : 'action=execWebService&wsID=' + uid
-    });
-    oRPC.make();
-    document.getElementById('spanUsersList').innerHTML = oRPC.xmlhttp.responseText;
-*/
-    document.getElementById('spanUsersList').innerHTML = 'hola';
-  }
-  function saveGroup( form ) {
-    ajax_post( form.action, form, 'POST' );
-    currentPopupWindow.remove();
-    refreshTree();
-  }
-  
-  function refreshTree(){
-    tree.refresh( document.getElementById("publisherContent[666]") , '<?php echo $link_List ?>');
-  }
-
-  function showDetails(){
-	  var oRPC = new leimnud.module.rpc.xmlhttp({
-	      url   : '../setup/webServicesAjax',
-	      async : false,
-	      method: 'POST',
-	      args  : 'action=showDetails'
-	    });
-	    oRPC.make();
-	    document.getElementById('spanUsersList').innerHTML = oRPC.xmlhttp.responseText;
-  }
-  showDetails();
-
-  function showUploadFilesForm(){
-     oIFrame = window.document.createElement('iframe');
-     oIFrame.style.border = '0';
-     oIFrame.style.width  = '700px';
-     oIFrame.style.height = '400px';
-     oIFrame.src          = 'webServicesAjax?action=showUploadFilesForm&';
-     document.getElementById('spanUsersList').innerHTML = '';
-     document.getElementById('spanUsersList').appendChild(oIFrame);
-  }
+<?php
+/**
+ * control.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
+ * Coral Gables, FL, 33134, USA, or email info@colosa.com.
+ */
+
+if ($RBAC->userCanAccess( 'PM_SETUP' ) != 1 && $RBAC->userCanAccess( 'PM_FACTORY' ) != 1) {
+    G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+    //G::header('location: ../login/login');
+    die();
+}
+
+$G_MAIN_MENU = 'processmaker';
+//$G_SUB_MENU             = 'setup';
+$G_ID_MENU_SELECTED = 'SETUP';
+//$G_ID_SUB_MENU_SELECTED = 'WEBSERVICES';
+
+
+if (! extension_loaded( 'soap' )) {
+    $G_PUBLISH = new Publisher();
+    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'setup/wsMessage' );
+    G::RenderPage( "publish" );
+} else {
+    $G_PUBLISH = new Publisher();
+    $G_PUBLISH->AddContent( 'view', 'setup/webServicesTree' );
+    $G_PUBLISH->AddContent( 'smarty', 'groups/groups_usersList', '', '', array () );
+
+    G::RenderPage( "publish-treeview", 'blank' );
+}
+
+$link_Edit = G::encryptlink( 'webServicesSetup' );
+$link_List = G::encryptlink( 'webServicesList' );
+
+?>
+<script>
+  document.body.style.backgroundColor="#fff";
+  var oAux = document.getElementById("publisherContent[0]");
+  oAux.id = "publisherContent[666]";
+  var currentGroup=false;
+
+  function webServicesSetup(){
+    popupWindow('' , '<?php echo $link_Edit ?>' , 500 , 225 );
+  }
+
+  function showFormWS( uid, element ){
+
+    currentGroup = uid;
+    var oRPC = new leimnud.module.rpc.xmlhttp({
+      url   : '../setup/webServicesAjax',
+      async : false,
+      method: 'POST',
+      args  : 'action=showForm&wsID=' + uid
+    });
+    oRPC.make();
+    document.getElementById('spanUsersList').innerHTML = oRPC.xmlhttp.responseText;
+    if ((uid == 'NewCase') || (uid == 'NewCaseImpersonate')) {
+      var scs=oRPC.xmlhttp.responseText.extractScript();scs.evalScript();
+    }
+  }
+  function execWebService( uid) {
+    var oRPC = new leimnud.module.rpc.xmlhttp({
+      url   : '../setup/webServicesAjax',
+      async : true,
+      method: 'POST',
+      args  : 'action=execWebService&wsID=' + uid
+    });
+
+    oRPC.callback = function(rpc) {
+
+	  	var scs = rpc.xmlhttp.responseText.extractScript();
+	  	document.getElementById('spanUsersList').innerHTML = rpc.xmlhttp.responseText;
+	  	scs.evalScript();
+
+  	}.extend(this);
+
+    oRPC.make();
+
+  }
+
+  submitThisForm = function(oForm) {
+    var oAux;
+    var bContinue = true;
+    if(bContinue) {
+	  result = ajax_post(oForm.action, oForm, 'POST', function(response){
+		var scs = response.extractScript();
+		document.getElementById('spanUsersList').innerHTML = response;
+		scs.evalScript();
+	  });
+      refreshTree();
+    }
+  };
+
+
+
+
+  function callbackWebService( ) {
+/*
+    var oRPC = new leimnud.module.rpc.xmlhttp({
+      url   : '../setup/webServicesAjax',
+      async : false,
+      method: 'POST',
+      args  : 'action=execWebService&wsID=' + uid
+    });
+    oRPC.make();
+    document.getElementById('spanUsersList').innerHTML = oRPC.xmlhttp.responseText;
+*/
+    document.getElementById('spanUsersList').innerHTML = 'hola';
+  }
+  function saveGroup( form ) {
+    ajax_post( form.action, form, 'POST' );
+    currentPopupWindow.remove();
+    refreshTree();
+  }
+
+  function refreshTree(){
+    tree.refresh( document.getElementById("publisherContent[666]") , '<?php echo $link_List ?>');
+  }
+
+  function showDetails(){
+	  var oRPC = new leimnud.module.rpc.xmlhttp({
+	      url   : '../setup/webServicesAjax',
+	      async : false,
+	      method: 'POST',
+	      args  : 'action=showDetails'
+	    });
+	    oRPC.make();
+	    document.getElementById('spanUsersList').innerHTML = oRPC.xmlhttp.responseText;
+  }
+  showDetails();
+
+  function showUploadFilesForm(){
+     oIFrame = window.document.createElement('iframe');
+     oIFrame.style.border = '0';
+     oIFrame.style.width  = '700px';
+     oIFrame.style.height = '400px';
+     oIFrame.src          = 'webServicesAjax?action=showUploadFilesForm&';
+     document.getElementById('spanUsersList').innerHTML = '';
+     document.getElementById('spanUsersList').appendChild(oIFrame);
+  }
 </script>
\ No newline at end of file
diff --git a/workflow/engine/methods/setup/webServicesAjax.php b/workflow/engine/methods/setup/webServicesAjax.php
index 40af50272..56c37eedd 100755
--- a/workflow/engine/methods/setup/webServicesAjax.php
+++ b/workflow/engine/methods/setup/webServicesAjax.php
@@ -1,1346 +1,1396 @@
-<?php
-/**
- * webServiceAjax.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
- */
-ini_set ( "soap.wsdl_cache_enabled", "0" ); // enabling WSDL cache
-
-G::LoadClass ( 'ArrayPeer' );
-if($RBAC->userCanAccess('PM_SETUP') != 1 && $RBAC->userCanAccess('PM_FACTORY') != 1){
-  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-  //G::header('location: ../login/login');
-  die;
-}
-
-G::LoadInclude ( 'ajax' );
+<?php
+/**
+ * webServiceAjax.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
+ * Coral Gables, FL, 33134, USA, or email info@colosa.com.
+ */
+ini_set( "soap.wsdl_cache_enabled", "0" ); // enabling WSDL cache
+
+
+G::LoadClass( 'ArrayPeer' );
+if ($RBAC->userCanAccess( 'PM_SETUP' ) != 1 && $RBAC->userCanAccess( 'PM_FACTORY' ) != 1) {
+    G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+    //G::header('location: ../login/login');
+    die();
+}
+
+G::LoadInclude( 'ajax' );
 //G::pr($_SESSION);
-$_POST['action'] = get_ajax_value ( 'action' );
-if( $_POST['action'] == '' ){
-    $_POST['action'] = (isset($_GET['action']))?$_GET['action']: '';
-}
-
-switch ($_POST ['action']) {
-	case 'showForm' :
-		global $G_PUBLISH;
-		$xmlform = isset ( $_POST ['wsID'] ) ? 'setup/ws' . $_POST ['wsID'] : '';
-		if (file_exists ( PATH_XMLFORM . $xmlform . '.xml' )) {
-
-			global $_DBArray;
-			$_DBArray = (isset ( $_SESSION ['_DBArray'] ) ? $_SESSION ['_DBArray'] : '');
-			$G_PUBLISH = new Publisher ( );
-			$fields ['SESSION_ID'] = isset ( $_SESSION ['WS_SESSION_ID'] ) ? $_SESSION ['WS_SESSION_ID'] : '';
-			$fields ['ACTION'] = $_POST ['wsID'];
-			$G_PUBLISH->AddContent ( 'xmlform', 'xmlform', $xmlform, '', $fields, '../setup/webServicesAjax' );
-			G::RenderPage ( 'publish', 'raw' );
-		}
-		break;
-
-	case 'showDetails' :
-		G::LoadClass ( 'groups' );
-
-		$dbc = new DBConnection ( );
-		$ses = new DBSession ( $dbc );
-
-		if (! isset ( $_SESSION ['END_POINT'] )) {
-			$aFields ['WS_HOST'] = $_SERVER ['HTTP_HOST'];
-			$aFields ['WS_WORKSPACE'] = SYS_SYS;
-		} else {
-			if (strpos ( $_SESSION ['END_POINT'], 'https' ) !== false) {
-				preg_match ( '@^(?:https://)?([^/]+)@i', $_SESSION ['END_POINT'], $coincidencias );
-			} else {
-				preg_match ( '@^(?:http://)?([^/]+)@i', $_SESSION ['END_POINT'], $coincidencias );
-			}
-			$aAux = explode ( ':', $coincidencias [1] );
-			$aFields ['WS_HOST'] = $aAux [0];
-			$aFields ['WS_PORT'] = (isset ( $aAux [1] ) ? $aAux [1] : '');
-			$aAux = explode ( $aAux [0] . (isset ( $aAux [1] ) ? ':' . $aAux [1] : ''), $_SESSION ['END_POINT'] );
-			$aAux = explode ( '/', $aAux [1] );
-			$aFields ['WS_WORKSPACE'] = substr ( $aAux [1], 3 );
-		}
-
-		$rows [] = array ('uid' => 'char', 'name' => 'char', 'age' => 'integer', 'balance' => 'float' );
-		$rows [] = array ('uid' => 'http', 'name' => 'http' );
-		$rows [] = array ('uid' => 'https', 'name' => 'https' );
-
-		global $_DBArray;
-  	    $_DBArray = (isset ( $_SESSION ['_DBArray'] ) ? $_SESSION ['_DBArray'] : '');
-		$_DBArray ['protocol'] = $rows;
-		$_SESSION ['_DBArray'] = $_DBArray;
-
-		if (! isset ( $_SESSION ['END_POINT'] )) {
-			//$wsdl = 'http://'.$_SERVER['HTTP_HOST'].'/sys'.SYS_SYS. '/'. SYS_LANG .'/classic/services/wsdl';
-			$wsdl = 'http://' . $_SERVER ['HTTP_HOST'];
-			$workspace = SYS_SYS;
-		} else {
-			$wsdl = $_SESSION ['END_POINT'];
-			$workspace = $_SESSION ['WS_WORKSPACE'];
-		}
-
-		$defaultEndpoint = 'http://' . $_SERVER ['SERVER_NAME'] . ':' . $_SERVER ['SERVER_PORT'] . '/sys' . SYS_SYS . '/'. SYS_LANG .'/classic/services/wsdl2';
-
-		$wsdl = isset ( $_SESSION ['END_POINT'] ) ? $_SESSION ['END_POINT'] : $defaultEndpoint;
-
-		$wsSessionId = '';
-		if (isset ( $_SESSION ['WS_SESSION_ID'] )) {
-			$wsSessionId = $_SESSION ['WS_SESSION_ID'];
-		}
-
-		$aFields ['WSDL'] = $wsdl;
-		$aFields ['OS'] = $workspace;
-		$aFields ['WSID'] = $wsSessionId;
-
-		$G_PUBLISH = new Publisher ( );
-		$G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'setup/webServicesDetails', '', $aFields, 'webServicesSetupSave' );
-
-		G::RenderPage ( "publish", "raw" );
-
-		break;
-        case 'showUploadFilesForm':
-            global $G_PUBLISH;
-		$xmlform = 'setup/wsSendFiles';
-		if (file_exists ( PATH_XMLFORM . $xmlform . '.xml' )) {
-
-			global $_DBArray;
-			$_DBArray = (isset ( $_SESSION ['_DBArray'] ) ? $_SESSION ['_DBArray'] : '');
-
-			$G_PUBLISH = new Publisher ( );
-			$fields ['SESSION_ID'] = isset ( $_SESSION ['WS_SESSION_ID'] ) ? $_SESSION ['WS_SESSION_ID'] : '';
-			$fields ['ACTION'] = 'wsSendFiles';
-			$G_PUBLISH->AddContent ( 'xmlform', 'xmlform', $xmlform, '', $fields, '../setup/webServicesAjax');
-			G::RenderPage ( 'publish', 'blank' );
-		}
-            break;
-    }try {
-	global $G_PUBLISH;
-	if (isset ( $_POST ['form'] ['ACTION'] )) {
-		$frm = $_POST ['form'];
-		$action = $frm ['ACTION'];
-		if (isset ( $_POST ["epr"] )) {
-			$_SESSION ['END_POINT'] = $_POST ["epr"];
-		}
-		$defaultEndpoint = 'http://' . $_SERVER ['SERVER_NAME'] . ':' . $_SERVER ['SERVER_PORT'] . '/sys' . SYS_SYS . '/'. SYS_LANG .'/classic/services/wsdl2';
-
-		$endpoint = isset ( $_SESSION ['END_POINT'] ) ? $_SESSION ['END_POINT'] : $defaultEndpoint;
-
-		$sessionId = isset ( $_SESSION ['SESSION_ID'] ) ? $_SESSION ['SESSION_ID'] : '';
-
-		//Apply proxy settings
-        $proxy = array();
-        $sysConf = System::getSystemConfiguration();
-        if ($sysConf['proxy_host'] != '') {
-          $proxy['proxy_host'] = $sysConf['proxy_host'];
-          if ($sysConf['proxy_port'] != '') {
-            $proxy['proxy_port'] = $sysConf['proxy_port'];
-          }
-          if ($sysConf['proxy_user'] != '') {
-            $proxy['proxy_login'] = $sysConf['proxy_user'];
-          }
-          if ($sysConf['proxy_pass'] != '') {
-            $proxy['proxy_password'] = $sysConf['proxy_pass'];
-          }
-        }
-
-		@$client = new SoapClient($endpoint, $proxy);
-
-		switch ($action) {
-			case "Login" :
-				$user = $frm ["USER_ID"];
-				$pass = $frm ["PASSWORD"];
-				$params = array ('userid' => $user, 'password' => $pass );
-				$result = $client->__SoapCall ( 'login', array ($params ) );
-				$_SESSION ['WS_SESSION_ID'] = '';
-				if ($result->status_code == 0) {
-					$_SESSION ['WS_SESSION_ID'] = $result->message;
-				}
-				$G_PUBLISH = new Publisher ( );
-				$fields ['status_code'] = $result->status_code;
-				$fields ['message'] = 'ProcessMaker WebService version: ' . $result->version . "\n" . $result->message;
-				$fields ['version'] = $result->version;
-				$fields ['time_stamp'] = $result->timestamp;
-				$G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
-				G::RenderPage ( 'publish', 'raw' );
-				break;
-			case "ProcessList" :
-				$sessionId = $frm ["SESSION_ID"];
-				$params = array ('sessionId' => $sessionId );
-
-				$wsResponse = $client->__SoapCall ( 'ProcessList', array ($params ) );
-				$result = G::PMWSCompositeResponse($wsResponse, 'processes');
-
-				$G_PUBLISH = new Publisher();
-				$rows [] = array ('guid' => 'char', 'name' => 'char' );
-
-				if( is_array($result) ){
-					foreach ( $result as $key => $item ) {
-						if (isset ( $item->item ))
-							foreach ( $item->item as $index => $val ) {
-								if ($val->key == 'guid')
-									$guid = $val->value;
-								if ($val->key == 'name')
-									$name = $val->value;
-							}
-						else if (is_array ( $item ))
-							foreach ( $item as $index => $val ) {
-								if ($val->key == 'guid')
-									$guid = $val->value;
-								if ($val->key == 'name')
-									$name = $val->value;
-							}
-						else {
-							if (isset ( $item->guid ))
-								$guid = $item->guid;
-							if (isset ( $item->name ))
-								$name = $item->name;
-						}
-
-						$rows [] = array ('guid' => $guid, 'name' => $name );
-					}
-					global $_DBArray;
-        	   		$_DBArray = (isset ( $_SESSION ['_DBArray'] ) ? $_SESSION ['_DBArray'] : '');
-    				$_DBArray ['process'] = $rows;
-    				$_SESSION ['_DBArray'] = $_DBArray;
-
-    				$c = new Criteria ( 'dbarray' );
-    				$c->setDBArrayTable ( 'process' );
-    				$c->addAscendingOrderByColumn ( 'name' );
-    				$G_PUBLISH->AddContent ( 'propeltable', 'paged-table', 'setup/wsrProcessList', $c );
-				} else if( is_object($result) ){
-				    $_SESSION ['WS_SESSION_ID'] = '';
-				    $fields ['status_code'] = $result->status_code;
-    				$fields ['message']     =  $result->message;
-    				$fields ['time_stamp']  = date("Y-m-d H:i:s");
-    				$G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
-				}
-
-				G::RenderPage ( 'publish', 'raw' );
-				break;
-			case "RoleList" :
-				$sessionId = $frm ["SESSION_ID"];
-				$params = array ('sessionId' => $sessionId );
-				$wsResponse = $client->__SoapCall ( 'RoleList', array ($params ) );
-				$result = G::PMWSCompositeResponse($wsResponse, 'roles');
-
-				$G_PUBLISH = new Publisher ();
-
-				$rows [] = array ('guid' => 'char', 'name' => 'char');
-				if ( is_array ( $result )){
-
-					foreach ( $result as $key => $item ) {
-						if (isset ( $item->item ))
-							foreach ( $item->item as $index => $val ) {
-								if ($val->key == 'guid')
-									$guid = $val->value;
-								if ($val->key == 'name')
-									$name = $val->value;
-							}
-						else if (is_array ( $item ))
-							foreach ( $item as $index => $val ) {
-								if ($val->key == 'guid')
-									$guid = $val->value;
-								if ($val->key == 'name')
-									$name = $val->value;
-							}
-						else {
-							if (isset ( $item->guid ))
-								$guid = $item->guid;
-							if (isset ( $item->name ))
-								$name = $item->name;
-						}
-
-						$rows [] = array ('guid' => $guid, 'name' => $name );
-					}
-					global $_DBArray;
-        	  		$_DBArray = (isset ( $_SESSION ['_DBArray'] ) ? $_SESSION ['_DBArray'] : '');
-    				$_DBArray ['role'] = $rows;
-    				$_SESSION ['_DBArray'] = $_DBArray;
-
-    				G::LoadClass ( 'ArrayPeer' );
-    				$c = new Criteria ( 'dbarray' );
-    				$c->setDBArrayTable ( 'role' );
-    				$c->addAscendingOrderByColumn ( 'name' );
-    				$G_PUBLISH->AddContent ( 'propeltable', 'paged-table', 'setup/wsrRoleList', $c );
-				} else if( is_object($result) ){
-				    $_SESSION ['WS_SESSION_ID'] = '';
-				    $fields ['status_code'] = $result->status_code;
-    				$fields ['message']     =  $result->message;
-    				$fields ['time_stamp']  = date("Y-m-d H:i:s");
-    				$G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
-				}
-
-				G::RenderPage ( 'publish', 'raw' );
-				break;
-
-			case "GroupList" :
-				$sessionId = $frm ["SESSION_ID"];
-				$params = array ('sessionId' => $sessionId );
-				$wsResponse = $client->__SoapCall ( 'GroupList', array ($params ) );
-				$result = G::PMWSCompositeResponse($wsResponse, 'groups');
-
-				$G_PUBLISH = new Publisher ( );
-				$rows [] = array ('guid' => 'char', 'name' => 'char' );
-				if (is_array ( $result )){
-					foreach ( $result as $key => $item ) {
-						if (isset ( $item->item ))
-							foreach ( $item->item as $index => $val ) {
-								if ($val->key == 'guid')
-									$guid = $val->value;
-								if ($val->key == 'name')
-									$name = $val->value;
-							}
-						else if (is_array ( $item ))
-							foreach ( $item as $index => $val ) {
-								if ($val->key == 'guid')
-									$guid = $val->value;
-								if ($val->key == 'name')
-									$name = $val->value;
-							}
-						else {
-							if (isset ( $item->guid ))
-								$guid = $item->guid;
-							if (isset ( $item->name ))
-								$name = $item->name;
-						}
-
-						$rows [] = array ('guid' => $guid, 'name' => $name );
-					}
-					global $_DBArray;
-        	  		$_DBArray = (isset ( $_SESSION ['_DBArray'] ) ? $_SESSION ['_DBArray'] : '');
-    				$_DBArray ['group'] = $rows;
-    				$_SESSION ['_DBArray'] = $_DBArray;
-
-    				G::LoadClass ( 'ArrayPeer' );
-    				$c = new Criteria ( 'dbarray' );
-    				$c->setDBArrayTable ( 'group' );
-    				$c->addAscendingOrderByColumn ( 'name' );
-    				$G_PUBLISH->AddContent ( 'propeltable', 'paged-table', 'setup/wsrGroupList', $c );
-				} else if( is_object($result) ){
-				    $_SESSION ['WS_SESSION_ID'] = '';
-				    $fields ['status_code'] = $result->status_code;
-    				$fields ['message']     =  $result->message;
-    				$fields ['time_stamp']  = date("Y-m-d H:i:s");
-    				$G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
-				}
-
-				G::RenderPage ( 'publish', 'raw' );
-				break;
-
-			case "CaseList" :
-				$sessionId = $frm ["SESSION_ID"];
-				$params = array ('sessionId' => $sessionId );
-				$wsResponse = $client->__SoapCall ( 'CaseList', array ($params ) );
-
-				$G_PUBLISH = new Publisher ( );
-				$rows [] = array ('guid' => 'char', 'name' => 'char', 'status' => 'char', 'delIndex' => 'char' );
-
-				$result = G::PMWSCompositeResponse($wsResponse, 'cases');
-
-				if ( is_array( $result )) {
-					foreach ( $result as $key => $item ) {
-						if (isset ( $item->item ))
-							foreach ( $item->item as $index => $val ) {
-								if ($val->key == 'guid')
-									$guid = $val->value;
-								if ($val->key == 'name')
-									$name = $val->value;
-								if ($val->key == 'status')
-									$status = $val->value;
-								if ($val->key == 'delIndex')
-									$delIndex = $val->value;
-							}
-						else if (is_array ( $item ))
-							foreach ( $item as $index => $val ) {
-								if ($val->key == 'guid')
-									$guid = $val->value;
-								if ($val->key == 'name')
-									$name = $val->value;
-								if ($val->key == 'status')
-									$status = $val->value;
-								if ($val->key == 'delIndex')
-									$delIndex = $val->value;
-							}
-					    else {
-							if (isset ( $item->guid ))
-								$guid = $item->guid;
-							if (isset ( $item->name ))
-								$name = $item->name;
-							if (isset ( $item->status ))
-								$status = $item->status;
-							if (isset ( $item->delIndex ))
-								$delIndex = $item->delIndex;
-
-					    }
-					    $rows [] = array ('guid' => $guid, 'name' => $name, 'status' => $status, 'delIndex' => $delIndex );
-
-		            }
-
-		            global $_DBArray;
-          		    $_DBArray = (isset ( $_SESSION ['_DBArray'] ) ? $_SESSION ['_DBArray'] : '');
-        			$_DBArray ['case'] = $rows;
-        			$_SESSION ['_DBArray'] = $_DBArray;
-
-        			G::LoadClass ( 'ArrayPeer' );
-        			$c = new Criteria ( 'dbarray' );
-        			$c->setDBArrayTable ( 'case' );
-        			//$c->addAscendingOrderByColumn ( 'name' );
-        			$G_PUBLISH->AddContent ( 'propeltable', 'paged-table', 'setup/wsrCaseList', $c );
-
-		        } else if( is_object($result) ){
-		            $_SESSION ['WS_SESSION_ID'] = '';
-		            $fields ['status_code'] = $result->status_code;
-    				$fields ['message']     =  $result->message;
-    				$fields ['time_stamp']  = date("Y-m-d H:i:s");
-    				$G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
-		        }
-
-				G::RenderPage ( 'publish', 'raw' );
-			break;
-
-
-      case "UnassignedCaseList" :
-
-      $sessionId = $frm ["SESSION_ID"];
-      $params = array ('sessionId' => $sessionId );
-
-      $wsResponse = $client->__SoapCall ( 'UnassignedCaseList', array ($params ));
-
-      $G_PUBLISH = new Publisher ( );
-      $rows [] = array ('guid' => 'char', 'name' => 'char', 'delIndex' => 'char' );
-      $result = G::PMWSCompositeResponse($wsResponse, 'cases');
-
-      if ( is_array( $result )) {
-        foreach ( $result as $key => $item ) {
-          if (isset ( $item->item ))
-          foreach ( $item->item as $index => $val ) {
-            if ($val->key == 'guid')
-             $guid = $val->value;
-            if ($val->key == 'name')
-              $name = $val->value;
-            if ($val->key == 'delIndex')
-              $delIndex = $val->value;
-          }
-          else if (is_array ( $item ))
-          foreach ( $item as $index => $val ) {
-            if ($val->key == 'guid')
-             $guid = $val->value;
-            if ($val->key == 'name')
-             $name = $val->value;
-            if ($val->key == 'delIndex')
-             $delIndex = $val->value;
-          }
-          else {
-            if (isset ( $item->guid ))
-            $guid = $item->guid;
-            if (isset ( $item->name ))
-            $name = $item->name;
-            if (isset ( $item->delIndex ))
-            $delIndex = $item->delIndex;
-          }
-          $rows [] = array ('guid' => $guid, 'name' => $name,  'delIndex' => $delIndex );
-        }
-
-        global $_DBArray;
-        $_DBArray = (isset ( $_SESSION ['_DBArray'] ) ? $_SESSION ['_DBArray'] : '');
-        $_DBArray ['case'] = $rows;
-        $_SESSION ['_DBArray'] = $_DBArray;
-
-        G::LoadClass ( 'ArrayPeer' );
-        $c = new Criteria ( 'dbarray' );
-        $c->setDBArrayTable ( 'case' );
-        $G_PUBLISH->AddContent ( 'propeltable', 'paged-table', 'setup/wsrUnassignedCaseList', $c );
-
-      }
-        else if( is_object($result) ){
-          $_SESSION ['WS_SESSION_ID'] = '';
-          $fields ['status_code'] = $result->status_code;
-          $fields ['message']     =  $result->message;
-          $fields ['time_stamp']  = date("Y-m-d H:i:s");
-          $G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
-        }
-
-      G::RenderPage ( 'publish', 'raw' );
-      break;
-
-			case "UserList" :
-				$sessionId = $frm ["SESSION_ID"];
-				$params = array ('sessionId' => $sessionId );
-				$wsResponse = $client->__SoapCall ( 'UserList', array ($params ) );
-				$result = G::PMWSCompositeResponse($wsResponse, 'users');
-
-				$G_PUBLISH = new Publisher();
-				$rows [] = array ('guid' => 'char', 'name' => 'char' );
-				if (is_array ( $result )){
-
-					foreach ( $result as $key => $item ) {
-						if (isset ( $item->item ))
-							foreach ( $item->item as $index => $val ) {
-								if ($val->key == 'guid')
-									$guid = $val->value;
-								if ($val->key == 'name')
-									$name = $val->value;
-							}
-						else if (is_array ( $item ))
-							foreach ( $item as $index => $val ) {
-								if ($val->key == 'guid')
-									$guid = $val->value;
-								if ($val->key == 'name')
-									$name = $val->value;
-							}
-						else {
-							if (isset ( $item->guid ))
-								$guid = $item->guid;
-							if (isset ( $item->name ))
-								$name = $item->name;
-						}
-
-						$rows [] = array ('guid' => $guid, 'name' => $name );
-					}
-
-
-          			global $_DBArray;
-        	  		$_DBArray = (isset ( $_SESSION ['_DBArray'] ) ? $_SESSION ['_DBArray'] : '');
-    				$_DBArray ['user'] = $rows;
-    				$_SESSION ['_DBArray'] = $_DBArray;
-
-    				G::LoadClass ( 'ArrayPeer' );
-    				$c = new Criteria ( 'dbarray' );
-    				$c->setDBArrayTable ( 'user' );
-    				$c->addAscendingOrderByColumn ( 'name' );
-    				$G_PUBLISH->AddContent ( 'propeltable', 'paged-table', 'setup/wsrUserList', $c );
-
-				} else if( is_object($result) ){
-				    $_SESSION ['WS_SESSION_ID'] = '';
-		            $fields ['status_code'] = $result->status_code;
-    				$fields ['message']     =  $result->message;
-    				$fields ['time_stamp']  = date("Y-m-d H:i:s");
-    				$G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
-		        }
-    			G::RenderPage ( 'publish', 'raw' );
-				break;
-
-			case "SendMessage" :
-        require_once('classes/model/Application.php');
-				$sessionId = $frm ["SESSION_ID"];
-				$from    = $frm ["FROM"];
-        $to      = $frm ["TO_EMAIL"];
-        $cc      = isset($frm ["CC_MAIL"]) ?$frm ["CC_MAIL"]  :'';
-        $bcc     = isset($frm ["BCC_MAIL"])?$frm ["BCC_MAIL"] :'';
-				$caseId  = $frm ["CASE_ID"];
-				$subject = $frm ["SUBJECT"];
-				$message = $frm ["MESSAGE"];
-        // getting the proUid variable
-        $oCases = new Application();
-        $oCases->load($caseId);
-        $proUid     = $oCases->getProUid();
-        $caseNumber = $oCases->getAppNumber();
-
-        // generating the path for the template msj
-        $templateFile = PATH_DB.SYS_SYS.PATH_SEP.'mailTemplates'.PATH_SEP.$proUid.PATH_SEP.'tempTemplate.hml';
-          // generating the file adding the msj variable
-        $messageBody = "message for case: ".$caseNumber. "<br>" . $message;
-        file_put_contents($templateFile, $messageBody);
-
-				$params = array ( 'sessionId' => $sessionId,
-                          'caseId' => $caseId,
-                          'from' => $from,
-                          'to' => $to,
-                          'cc' => $cc,
-                          'bcc' => $bcc,
-                          'subject' => $subject,
-                          'template' => 'tempTemplate.hml' );
-				$result = $client->__SoapCall ( 'sendMessage', array ($params ) );
-				$G_PUBLISH = new Publisher ( );
-				$fields ['status_code'] = $result->status_code;
-				$fields ['message'] = $result->message;
-				$fields ['time_stamp'] = $result->timestamp;
-
-		        if( $result->status_code == 9 ){
-				    $_SESSION ['WS_SESSION_ID'] = '';
-				}
-
-				$G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
-				G::RenderPage ( 'publish', 'raw' );
-				break;
-
-			case "SendVariables" :
-				$sessionId = $frm ["SESSION_ID"];
-				$caseId = $frm ["CASE_ID"];
-				$variables = Array();
-
-				$o = new stdClass();
-				$o->name = $frm ["NAME1"];
-				$o->value = $frm ["VALUE1"];
-				array_push($variables, $o);
-				$o = new stdClass();
-				$o->name = $frm ["NAME2"];
-				$o->value = $frm ["VALUE2"];
-				array_push($variables, $o);
-
-				$params = array ('sessionId' => $sessionId, 'caseId' => $caseId, 'variables' => $variables );
-				$result = $client->__SoapCall ( 'SendVariables', array ($params ) );
-				$G_PUBLISH = new Publisher();
-				$fields ['status_code'] = $result->status_code;
-				$fields ['message'] = $result->message;
-				$fields ['time_stamp'] = $result->timestamp;
-
-				if( $result->status_code == 9 ){
-				    $_SESSION ['WS_SESSION_ID'] = '';
-				}
-
-				$G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
-				G::RenderPage ( 'publish', 'raw' );
-				break;
-
-			case "DerivateCase" :
-				$sessionId = $frm ["SESSION_ID"];
-				$caseId = $frm ["CASE_ID"];
-				$delIndex = $frm ["DEL_INDEX"];
-
-				$params = array ('sessionId' => $sessionId, 'caseId' => $caseId, 'delIndex' => $delIndex );
-				$result = $client->__SoapCall ( 'RouteCase', array ($params ) );
-				$G_PUBLISH = new Publisher ( );
-				$fields ['status_code'] = $result->status_code;
-				$fields ['message'] = $result->message;
-				$fields ['time_stamp'] = $result->timestamp;
-
-		        if( $result->status_code == 9 ){
-				    $_SESSION ['WS_SESSION_ID'] = '';
-				}
-
-				$G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
-				G::RenderPage ( 'publish', 'raw' );
-				break;
-
-			case "ReassignCase" :
-				$sessionId = $frm ["SESSION_ID"];
-				$caseId = $frm ["CASE_ID"];
-				$delIndex = $frm ["DEL_INDEX"];
-				$userIdSource = $frm ['USERIDSOURCE'];
-				$userIdTarget = $frm ['USERIDTARGET'];
-
-				$params = array ('sessionId' => $sessionId, 'caseId' => $caseId, 'delIndex' => $delIndex, 'userIdSource' => $userIdSource, 'userIdTarget' => $userIdTarget );
-				$result = $client->__SoapCall ( 'reassignCase', array ($params ) );
-
-				$G_PUBLISH = new Publisher ( );
-				$fields ['status_code'] = $result->status_code;
-				$fields ['message'] = $result->message;
-				$fields ['time_stamp'] = $result->timestamp;
-
-		        if( $result->status_code == 9 ){
-				    $_SESSION ['WS_SESSION_ID'] = '';
-				}
-
-				$G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
-				G::RenderPage ( 'publish', 'raw' );
-
-				break;
-
-			case "NewCaseImpersonate" :
-				$sessionId = $frm ["SESSION_ID"];
-				$processId = $frm ["PROCESS_ID"];
-				$userId = $frm ["USER_ID"];
-				$variables = Array();
-				foreach ( $frm ['VARIABLES'] as $iRow => $aRow ) {
-					$o = new stdClass();
-    				$o->name  = $aRow ['NAME'];
-    				$o->value = $aRow ['VALUE'];
-				    array_push($variables, $o);
-				}
-				$params = array ('sessionId' => $sessionId, 'processId' => $processId, 'userId' => $userId, 'variables' => $variables );
-				$result = $client->__SoapCall ( 'NewCaseImpersonate', array ($params ) );
-				$G_PUBLISH = new Publisher ( );
-				$fields ['status_code'] = $result->status_code;
-				$fields ['message'] = $result->message;
-				$fields ['time_stamp'] = $result->timestamp;
-
-		        if( $result->status_code == 9 ){
-				    $_SESSION ['WS_SESSION_ID'] = '';
-				}
-
-				$G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
-				G::RenderPage ( 'publish', 'raw' );
-				break;
-
-			case "NewCase" :
-				$sessionId = $frm ["SESSION_ID"];
-				$processId = $frm ["PROCESS_ID"];
-				$taskId = $frm ["TASK_ID"];
-
-				$variables = Array();
-				foreach ( $frm ['VARIABLES'] as $iRow => $aRow ) {
-				    $o = new stdClass();
-    				$o->name  = $aRow ['NAME'];
-    				$o->value = $aRow ['VALUE'];
-				    array_push($variables, $o);
-				}
-				$params = array ('sessionId' => $sessionId, 'processId' => $processId, 'taskId' => $taskId, 'variables' => $variables );
-				$result = $client->__SoapCall ( 'NewCase', array ($params ) );
-
-				$G_PUBLISH = new Publisher ( );
-
-                $fields ['status_code'] = $result->status_code;
-                $fields ['time_stamp'] = $result->timestamp;
-                if( isset($result->caseId) ){
-                    $fields ['message'] = "Case ID: ".$result->caseId."\nCase Number: ".$result->caseNumber."\n".$result->message;
-                } else {
-                    $fields ['message'] = '';
-                }
-		        if( $result->status_code == 9 ){
-				    $_SESSION ['WS_SESSION_ID'] = '';
-				}
-
-				$G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
-				G::RenderPage ( 'publish', 'raw' );
-				break;
-
-			case "AssignUserToGroup" :
-				$sessionId = $frm ["SESSION_ID"];
-				$userId = $frm ["USER_ID"];
-				$groupId = $frm ["GROUP_ID"];
-				$params = array ('sessionId' => $sessionId, 'userId' => $userId, 'groupId' => $groupId );
-				$result = $client->__SoapCall ( 'AssignUserToGroup', array ($params ) );
-				$G_PUBLISH = new Publisher ( );
-				$fields ['status_code'] = $result->status_code;
-				$fields ['message'] = $result->message;
-				$fields ['time_stamp'] = $result->timestamp;
-
-		        if( $result->status_code == 9 ){
-				    $_SESSION ['WS_SESSION_ID'] = '';
-				}
-
-				$G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
-				G::RenderPage ( 'publish', 'raw' );
-				break;
-
-			case "CreateUser" :
-				$sessionId = $frm ["SESSION_ID"];
-				$userId = $frm ["USER_ID"];
-				$firstname = $frm ["FIRST_NAME"];
-				$lastname = $frm ["LAST_NAME"];
-				$email = $frm ["EMAIL"];
-				$role = $frm ["ROLE"];
-				$password = $frm ["PASSWORD"];
-
-				$params = array ('sessionId' => $sessionId, 'userId' => $userId, 'firstname' => $firstname, 'lastname' => $lastname, 'email' => $email, 'role' => $role, 'password' => $password );
-				$result = $client->__SoapCall ( 'CreateUser', array ($params ) );
-				$G_PUBLISH = new Publisher ( );
-				$fields ['status_code'] = $result->status_code;
-				$fields ['message'] = $result->message;
-				$fields ['time_stamp'] = $result->timestamp;
-
-		        if( $result->status_code == 9 ){
-				    $_SESSION ['WS_SESSION_ID'] = '';
-				}
-
-				$G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
-				G::RenderPage ( 'publish', 'raw' );
-				break;
-
-			case "TaskList" :
-				$sessionId = $frm ["SESSION_ID"];
-				$params = array ('sessionId' => $sessionId );
-				$wsResponse = $client->__SoapCall ( 'TaskList', array ($params ) );
-				$result = G::PMWSCompositeResponse($wsResponse, 'tasks');
-
-				$G_PUBLISH = new Publisher ( );
-				$rows [] = array ('guid' => 'char', 'name' => 'char' );
-
-				if (is_array ( $result )){
-
-					foreach ( $result as $key => $item ) {
-						if (isset ( $item->item ))
-							foreach ( $item->item as $index => $val ) {
-								if ($val->key == 'guid')
-									$guid = $val->value;
-								if ($val->key == 'name')
-									$name = $val->value;
-							}
-						else if (is_array ( $item ))
-							foreach ( $item as $index => $val ) {
-								if ($val->key == 'guid')
-									$guid = $val->value;
-								if ($val->key == 'name')
-									$name = $val->value;
-							}
-						else {
-							if (isset ( $item->guid ))
-								$guid = $item->guid;
-							if (isset ( $item->name ))
-								$name = $item->name;
-						}
-
-						$rows [] = array ('guid' => $guid, 'name' => $name );
-					}
-          			global $_DBArray;
-        	  		$_DBArray = (isset ( $_SESSION ['_DBArray'] ) ? $_SESSION ['_DBArray'] : '');
-    				$_DBArray ['task'] = $rows;
-    				$_SESSION ['_DBArray'] = $_DBArray;
-
-    				G::LoadClass ( 'ArrayPeer' );
-    				$c = new Criteria ( 'dbarray' );
-    				$c->setDBArrayTable ( 'task' );
-    				$c->addAscendingOrderByColumn ( 'name' );
-    				$G_PUBLISH->AddContent ( 'propeltable', 'paged-table', 'setup/wsrTaskList', $c );
-		        } else if( is_object($result) ){
-		            $_SESSION ['WS_SESSION_ID'] = '';
-		            $fields ['status_code'] = $result->status_code;
-    				$fields ['message']     =  $result->message;
-    				$fields ['time_stamp']  = date("Y-m-d H:i:s");
-    				$G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
-		        }
-				G::RenderPage ( 'publish', 'raw' );
-				break;
-
-			case "TriggerList" :
-				$sessionId = $frm ["SESSION_ID"];
-				$params = array ('sessionId' => $sessionId );
-
-				$wsResponse = $client->__SoapCall ( 'triggerList', array ($params ) );
-				$result = G::PMWSCompositeResponse($wsResponse, 'triggers');
-
-				$G_PUBLISH = new Publisher ();
-				$rows [] = array ('guid' => 'char', 'name' => 'char', 'processId' => 'char' );
-
-				if (is_array ( $result )){
-					foreach ( $result as $key => $item ) {
-						if (isset ( $item->item ))
-							foreach ( $item->item as $index => $val ) {
-								if ($val->key == 'guid')
-									$guid = $val->value;
-								if ($val->key == 'name')
-									$name = $val->value;
-								if ($val->key == 'processId')
-									$processId = $val->value;
-							}
-						else if (is_array ( $item ))
-							foreach ( $item as $index => $val ) {
-								if ($val->key == 'guid')
-									$guid = $val->value;
-								if ($val->key == 'name')
-									$name = $val->value;
-								if ($val->key == 'processId')
-									$processId = $val->value;
-							}
-						else {
-							if (isset ( $item->guid ))
-								$guid = $item->guid;
-							if (isset ( $item->name ))
-								$name = $item->name;
-							if (isset ( $item->processId ))
-								$processId = $item->processId;
-						}
-						$rows [] = array ('guid' => $guid, 'name' => $name, 'processId' => $processId );
-					}
-
-          			global $_DBArray;
-        	  		$_DBArray = (isset ( $_SESSION ['_DBArray'] ) ? $_SESSION ['_DBArray'] : '');
-
-                    foreach ( $rows as $key => $row ) {
-                    	$proId = $row['processId'];
-                    	if ( isset ($_DBArray ['process']) && is_array ($_DBArray ['process']) )
-                        foreach ( $_DBArray ['process'] as $pkey => $prow ) {
-                      	  if ( $proId == $prow['guid'] ) {
-                      	    $rows[ $key ]['processId'] = $prow['name'];
-                          }
-                        }
+$_POST['action'] = get_ajax_value( 'action' );
+if ($_POST['action'] == '') {
+    $_POST['action'] = (isset( $_GET['action'] )) ? $_GET['action'] : '';
+}
+
+switch ($_POST['action']) {
+    case 'showForm':
+        global $G_PUBLISH;
+        $xmlform = isset( $_POST['wsID'] ) ? 'setup/ws' . $_POST['wsID'] : '';
+        if (file_exists( PATH_XMLFORM . $xmlform . '.xml' )) {
+
+            global $_DBArray;
+            $_DBArray = (isset( $_SESSION['_DBArray'] ) ? $_SESSION['_DBArray'] : '');
+            $G_PUBLISH = new Publisher();
+            $fields['SESSION_ID'] = isset( $_SESSION['WS_SESSION_ID'] ) ? $_SESSION['WS_SESSION_ID'] : '';
+            $fields['ACTION'] = $_POST['wsID'];
+            $G_PUBLISH->AddContent( 'xmlform', 'xmlform', $xmlform, '', $fields, '../setup/webServicesAjax' );
+            G::RenderPage( 'publish', 'raw' );
+        }
+        break;
+    case 'showDetails':
+        G::LoadClass( 'groups' );
+
+        $dbc = new DBConnection();
+        $ses = new DBSession( $dbc );
+
+        if (! isset( $_SESSION['END_POINT'] )) {
+            $aFields['WS_HOST'] = $_SERVER['HTTP_HOST'];
+            $aFields['WS_WORKSPACE'] = SYS_SYS;
+        } else {
+            if (strpos( $_SESSION['END_POINT'], 'https' ) !== false) {
+                preg_match( '@^(?:https://)?([^/]+)@i', $_SESSION['END_POINT'], $coincidencias );
+            } else {
+                preg_match( '@^(?:http://)?([^/]+)@i', $_SESSION['END_POINT'], $coincidencias );
+            }
+            $aAux = explode( ':', $coincidencias[1] );
+            $aFields['WS_HOST'] = $aAux[0];
+            $aFields['WS_PORT'] = (isset( $aAux[1] ) ? $aAux[1] : '');
+            $aAux = explode( $aAux[0] . (isset( $aAux[1] ) ? ':' . $aAux[1] : ''), $_SESSION['END_POINT'] );
+            $aAux = explode( '/', $aAux[1] );
+            $aFields['WS_WORKSPACE'] = substr( $aAux[1], 3 );
+        }
+
+        $rows[] = array ('uid' => 'char','name' => 'char','age' => 'integer','balance' => 'float'
+        );
+        $rows[] = array ('uid' => 'http','name' => 'http'
+        );
+        $rows[] = array ('uid' => 'https','name' => 'https'
+        );
+
+        global $_DBArray;
+        $_DBArray = (isset( $_SESSION['_DBArray'] ) ? $_SESSION['_DBArray'] : '');
+        $_DBArray['protocol'] = $rows;
+        $_SESSION['_DBArray'] = $_DBArray;
+
+        if (! isset( $_SESSION['END_POINT'] )) {
+            //$wsdl = 'http://'.$_SERVER['HTTP_HOST'].'/sys'.SYS_SYS. '/'. SYS_LANG .'/classic/services/wsdl';
+            $wsdl = 'http://' . $_SERVER['HTTP_HOST'];
+            $workspace = SYS_SYS;
+        } else {
+            $wsdl = $_SESSION['END_POINT'];
+            $workspace = $_SESSION['WS_WORKSPACE'];
+        }
+
+        $defaultEndpoint = 'http://' . $_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT'] . '/sys' . SYS_SYS . '/' . SYS_LANG . '/classic/services/wsdl2';
+
+        $wsdl = isset( $_SESSION['END_POINT'] ) ? $_SESSION['END_POINT'] : $defaultEndpoint;
+
+        $wsSessionId = '';
+        if (isset( $_SESSION['WS_SESSION_ID'] )) {
+            $wsSessionId = $_SESSION['WS_SESSION_ID'];
+        }
+
+        $aFields['WSDL'] = $wsdl;
+        $aFields['OS'] = $workspace;
+        $aFields['WSID'] = $wsSessionId;
+
+        $G_PUBLISH = new Publisher();
+        $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'setup/webServicesDetails', '', $aFields, 'webServicesSetupSave' );
+
+        G::RenderPage( "publish", "raw" );
+        break;
+    case 'showUploadFilesForm':
+        global $G_PUBLISH;
+        $xmlform = 'setup/wsSendFiles';
+        if (file_exists( PATH_XMLFORM . $xmlform . '.xml' )) {
+
+            global $_DBArray;
+            $_DBArray = (isset( $_SESSION['_DBArray'] ) ? $_SESSION['_DBArray'] : '');
+
+            $G_PUBLISH = new Publisher();
+            $fields['SESSION_ID'] = isset( $_SESSION['WS_SESSION_ID'] ) ? $_SESSION['WS_SESSION_ID'] : '';
+            $fields['ACTION'] = 'wsSendFiles';
+            $G_PUBLISH->AddContent( 'xmlform', 'xmlform', $xmlform, '', $fields, '../setup/webServicesAjax' );
+            G::RenderPage( 'publish', 'blank' );
+        }
+        break;
+}
+try {
+    global $G_PUBLISH;
+    if (isset( $_POST['form']['ACTION'] )) {
+        $frm = $_POST['form'];
+        $action = $frm['ACTION'];
+        if (isset( $_POST["epr"] )) {
+            $_SESSION['END_POINT'] = $_POST["epr"];
+        }
+        $defaultEndpoint = 'http://' . $_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT'] . '/sys' . SYS_SYS . '/' . SYS_LANG . '/classic/services/wsdl2';
+
+        $endpoint = isset( $_SESSION['END_POINT'] ) ? $_SESSION['END_POINT'] : $defaultEndpoint;
+
+        $sessionId = isset( $_SESSION['SESSION_ID'] ) ? $_SESSION['SESSION_ID'] : '';
+
+        //Apply proxy settings
+        $proxy = array ();
+        $sysConf = System::getSystemConfiguration();
+        if ($sysConf['proxy_host'] != '') {
+            $proxy['proxy_host'] = $sysConf['proxy_host'];
+            if ($sysConf['proxy_port'] != '') {
+                $proxy['proxy_port'] = $sysConf['proxy_port'];
+            }
+            if ($sysConf['proxy_user'] != '') {
+                $proxy['proxy_login'] = $sysConf['proxy_user'];
+            }
+            if ($sysConf['proxy_pass'] != '') {
+                $proxy['proxy_password'] = $sysConf['proxy_pass'];
+            }
+        }
+
+        @$client = new SoapClient( $endpoint, $proxy );
+
+        switch ($action) {
+            case "Login":
+                $user = $frm["USER_ID"];
+                $pass = $frm["PASSWORD"];
+                $params = array ('userid' => $user,'password' => $pass
+                );
+                $result = $client->__SoapCall( 'login', array ($params
+                ) );
+                $_SESSION['WS_SESSION_ID'] = '';
+                if ($result->status_code == 0) {
+                    $_SESSION['WS_SESSION_ID'] = $result->message;
+                }
+                $G_PUBLISH = new Publisher();
+                $fields['status_code'] = $result->status_code;
+                $fields['message'] = 'ProcessMaker WebService version: ' . $result->version . "\n" . $result->message;
+                $fields['version'] = $result->version;
+                $fields['time_stamp'] = $result->timestamp;
+                $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
+                G::RenderPage( 'publish', 'raw' );
+                break;
+            case "ProcessList":
+                $sessionId = $frm["SESSION_ID"];
+                $params = array ('sessionId' => $sessionId
+                );
+
+                $wsResponse = $client->__SoapCall( 'ProcessList', array ($params
+                ) );
+                $result = G::PMWSCompositeResponse( $wsResponse, 'processes' );
+
+                $G_PUBLISH = new Publisher();
+                $rows[] = array ('guid' => 'char','name' => 'char'
+                );
+
+                if (is_array( $result )) {
+                    foreach ($result as $key => $item) {
+                        if (isset( $item->item ))
+                            foreach ($item->item as $index => $val) {
+                                if ($val->key == 'guid')
+                                    $guid = $val->value;
+                                if ($val->key == 'name')
+                                    $name = $val->value;
+                            }
+                        else if (is_array( $item ))
+                            foreach ($item as $index => $val) {
+                                if ($val->key == 'guid')
+                                    $guid = $val->value;
+                                if ($val->key == 'name')
+                                    $name = $val->value;
+                            }
+                        else {
+                            if (isset( $item->guid ))
+                                $guid = $item->guid;
+                            if (isset( $item->name ))
+                                $name = $item->name;
+                        }
+
+                        $rows[] = array ('guid' => $guid,'name' => $name
+                        );
+                    }
+                    global $_DBArray;
+                    $_DBArray = (isset( $_SESSION['_DBArray'] ) ? $_SESSION['_DBArray'] : '');
+                    $_DBArray['process'] = $rows;
+                    $_SESSION['_DBArray'] = $_DBArray;
+
+                    $c = new Criteria( 'dbarray' );
+                    $c->setDBArrayTable( 'process' );
+                    $c->addAscendingOrderByColumn( 'name' );
+                    $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'setup/wsrProcessList', $c );
+                } else if (is_object( $result )) {
+                    $_SESSION['WS_SESSION_ID'] = '';
+                    $fields['status_code'] = $result->status_code;
+                    $fields['message'] = $result->message;
+                    $fields['time_stamp'] = date( "Y-m-d H:i:s" );
+                    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
+                }
+
+                G::RenderPage( 'publish', 'raw' );
+                break;
+            case "RoleList":
+                $sessionId = $frm["SESSION_ID"];
+                $params = array ('sessionId' => $sessionId
+                );
+                $wsResponse = $client->__SoapCall( 'RoleList', array ($params
+                ) );
+                $result = G::PMWSCompositeResponse( $wsResponse, 'roles' );
+
+                $G_PUBLISH = new Publisher();
+
+                $rows[] = array ('guid' => 'char','name' => 'char'
+                );
+                if (is_array( $result )) {
+
+                    foreach ($result as $key => $item) {
+                        if (isset( $item->item ))
+                            foreach ($item->item as $index => $val) {
+                                if ($val->key == 'guid')
+                                    $guid = $val->value;
+                                if ($val->key == 'name')
+                                    $name = $val->value;
+                            }
+                        else if (is_array( $item ))
+                            foreach ($item as $index => $val) {
+                                if ($val->key == 'guid')
+                                    $guid = $val->value;
+                                if ($val->key == 'name')
+                                    $name = $val->value;
+                            }
+                        else {
+                            if (isset( $item->guid ))
+                                $guid = $item->guid;
+                            if (isset( $item->name ))
+                                $name = $item->name;
+                        }
+
+                        $rows[] = array ('guid' => $guid,'name' => $name
+                        );
+                    }
+                    global $_DBArray;
+                    $_DBArray = (isset( $_SESSION['_DBArray'] ) ? $_SESSION['_DBArray'] : '');
+                    $_DBArray['role'] = $rows;
+                    $_SESSION['_DBArray'] = $_DBArray;
+
+                    G::LoadClass( 'ArrayPeer' );
+                    $c = new Criteria( 'dbarray' );
+                    $c->setDBArrayTable( 'role' );
+                    $c->addAscendingOrderByColumn( 'name' );
+                    $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'setup/wsrRoleList', $c );
+                } else if (is_object( $result )) {
+                    $_SESSION['WS_SESSION_ID'] = '';
+                    $fields['status_code'] = $result->status_code;
+                    $fields['message'] = $result->message;
+                    $fields['time_stamp'] = date( "Y-m-d H:i:s" );
+                    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
+                }
+
+                G::RenderPage( 'publish', 'raw' );
+                break;
+            case "GroupList":
+                $sessionId = $frm["SESSION_ID"];
+                $params = array ('sessionId' => $sessionId
+                );
+                $wsResponse = $client->__SoapCall( 'GroupList', array ($params
+                ) );
+                $result = G::PMWSCompositeResponse( $wsResponse, 'groups' );
+
+                $G_PUBLISH = new Publisher();
+                $rows[] = array ('guid' => 'char','name' => 'char'
+                );
+                if (is_array( $result )) {
+                    foreach ($result as $key => $item) {
+                        if (isset( $item->item ))
+                            foreach ($item->item as $index => $val) {
+                                if ($val->key == 'guid')
+                                    $guid = $val->value;
+                                if ($val->key == 'name')
+                                    $name = $val->value;
+                            }
+                        else if (is_array( $item ))
+                            foreach ($item as $index => $val) {
+                                if ($val->key == 'guid')
+                                    $guid = $val->value;
+                                if ($val->key == 'name')
+                                    $name = $val->value;
+                            }
+                        else {
+                            if (isset( $item->guid ))
+                                $guid = $item->guid;
+                            if (isset( $item->name ))
+                                $name = $item->name;
+                        }
+
+                        $rows[] = array ('guid' => $guid,'name' => $name
+                        );
+                    }
+                    global $_DBArray;
+                    $_DBArray = (isset( $_SESSION['_DBArray'] ) ? $_SESSION['_DBArray'] : '');
+                    $_DBArray['group'] = $rows;
+                    $_SESSION['_DBArray'] = $_DBArray;
+
+                    G::LoadClass( 'ArrayPeer' );
+                    $c = new Criteria( 'dbarray' );
+                    $c->setDBArrayTable( 'group' );
+                    $c->addAscendingOrderByColumn( 'name' );
+                    $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'setup/wsrGroupList', $c );
+                } else if (is_object( $result )) {
+                    $_SESSION['WS_SESSION_ID'] = '';
+                    $fields['status_code'] = $result->status_code;
+                    $fields['message'] = $result->message;
+                    $fields['time_stamp'] = date( "Y-m-d H:i:s" );
+                    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
+                }
+
+                G::RenderPage( 'publish', 'raw' );
+                break;
+            case "CaseList":
+                $sessionId = $frm["SESSION_ID"];
+                $params = array ('sessionId' => $sessionId
+                );
+                $wsResponse = $client->__SoapCall( 'CaseList', array ($params
+                ) );
+
+                $G_PUBLISH = new Publisher();
+                $rows[] = array ('guid' => 'char','name' => 'char','status' => 'char','delIndex' => 'char'
+                );
+
+                $result = G::PMWSCompositeResponse( $wsResponse, 'cases' );
+
+                if (is_array( $result )) {
+                    foreach ($result as $key => $item) {
+                        if (isset( $item->item ))
+                            foreach ($item->item as $index => $val) {
+                                if ($val->key == 'guid')
+                                    $guid = $val->value;
+                                if ($val->key == 'name')
+                                    $name = $val->value;
+                                if ($val->key == 'status')
+                                    $status = $val->value;
+                                if ($val->key == 'delIndex')
+                                    $delIndex = $val->value;
+                            }
+                        else if (is_array( $item ))
+                            foreach ($item as $index => $val) {
+                                if ($val->key == 'guid')
+                                    $guid = $val->value;
+                                if ($val->key == 'name')
+                                    $name = $val->value;
+                                if ($val->key == 'status')
+                                    $status = $val->value;
+                                if ($val->key == 'delIndex')
+                                    $delIndex = $val->value;
+                            }
+                        else {
+                            if (isset( $item->guid ))
+                                $guid = $item->guid;
+                            if (isset( $item->name ))
+                                $name = $item->name;
+                            if (isset( $item->status ))
+                                $status = $item->status;
+                            if (isset( $item->delIndex ))
+                                $delIndex = $item->delIndex;
+
+                        }
+                        $rows[] = array ('guid' => $guid,'name' => $name,'status' => $status,'delIndex' => $delIndex
+                        );
+
+                    }
+
+                    global $_DBArray;
+                    $_DBArray = (isset( $_SESSION['_DBArray'] ) ? $_SESSION['_DBArray'] : '');
+                    $_DBArray['case'] = $rows;
+                    $_SESSION['_DBArray'] = $_DBArray;
+
+                    G::LoadClass( 'ArrayPeer' );
+                    $c = new Criteria( 'dbarray' );
+                    $c->setDBArrayTable( 'case' );
+                    //$c->addAscendingOrderByColumn ( 'name' );
+                    $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'setup/wsrCaseList', $c );
+
+                } else if (is_object( $result )) {
+                    $_SESSION['WS_SESSION_ID'] = '';
+                    $fields['status_code'] = $result->status_code;
+                    $fields['message'] = $result->message;
+                    $fields['time_stamp'] = date( "Y-m-d H:i:s" );
+                    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
+                }
+
+                G::RenderPage( 'publish', 'raw' );
+                break;
+            case "UnassignedCaseList":
+                $sessionId = $frm["SESSION_ID"];
+                $params = array ('sessionId' => $sessionId
+                );
+
+                $wsResponse = $client->__SoapCall( 'UnassignedCaseList', array ($params
+                ) );
+
+                $G_PUBLISH = new Publisher();
+                $rows[] = array ('guid' => 'char','name' => 'char','delIndex' => 'char'
+                );
+                $result = G::PMWSCompositeResponse( $wsResponse, 'cases' );
+
+                if (is_array( $result )) {
+                    foreach ($result as $key => $item) {
+                        if (isset( $item->item ))
+                            foreach ($item->item as $index => $val) {
+                                if ($val->key == 'guid')
+                                    $guid = $val->value;
+                                if ($val->key == 'name')
+                                    $name = $val->value;
+                                if ($val->key == 'delIndex')
+                                    $delIndex = $val->value;
+                            }
+                        else if (is_array( $item ))
+                            foreach ($item as $index => $val) {
+                                if ($val->key == 'guid')
+                                    $guid = $val->value;
+                                if ($val->key == 'name')
+                                    $name = $val->value;
+                                if ($val->key == 'delIndex')
+                                    $delIndex = $val->value;
+                            }
+                        else {
+                            if (isset( $item->guid ))
+                                $guid = $item->guid;
+                            if (isset( $item->name ))
+                                $name = $item->name;
+                            if (isset( $item->delIndex ))
+                                $delIndex = $item->delIndex;
+                        }
+                        $rows[] = array ('guid' => $guid,'name' => $name,'delIndex' => $delIndex
+                        );
+                    }
+
+                    global $_DBArray;
+                    $_DBArray = (isset( $_SESSION['_DBArray'] ) ? $_SESSION['_DBArray'] : '');
+                    $_DBArray['case'] = $rows;
+                    $_SESSION['_DBArray'] = $_DBArray;
+
+                    G::LoadClass( 'ArrayPeer' );
+                    $c = new Criteria( 'dbarray' );
+                    $c->setDBArrayTable( 'case' );
+                    $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'setup/wsrUnassignedCaseList', $c );
+
+                } else if (is_object( $result )) {
+                    $_SESSION['WS_SESSION_ID'] = '';
+                    $fields['status_code'] = $result->status_code;
+                    $fields['message'] = $result->message;
+                    $fields['time_stamp'] = date( "Y-m-d H:i:s" );
+                    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
+                }
+
+                G::RenderPage( 'publish', 'raw' );
+                break;
+            case "UserList":
+                $sessionId = $frm["SESSION_ID"];
+                $params = array ('sessionId' => $sessionId
+                );
+                $wsResponse = $client->__SoapCall( 'UserList', array ($params
+                ) );
+                $result = G::PMWSCompositeResponse( $wsResponse, 'users' );
+
+                $G_PUBLISH = new Publisher();
+                $rows[] = array ('guid' => 'char','name' => 'char'
+                );
+                if (is_array( $result )) {
+
+                    foreach ($result as $key => $item) {
+                        if (isset( $item->item ))
+                            foreach ($item->item as $index => $val) {
+                                if ($val->key == 'guid')
+                                    $guid = $val->value;
+                                if ($val->key == 'name')
+                                    $name = $val->value;
+                            }
+                        else if (is_array( $item ))
+                            foreach ($item as $index => $val) {
+                                if ($val->key == 'guid')
+                                    $guid = $val->value;
+                                if ($val->key == 'name')
+                                    $name = $val->value;
+                            }
+                        else {
+                            if (isset( $item->guid ))
+                                $guid = $item->guid;
+                            if (isset( $item->name ))
+                                $name = $item->name;
+                        }
+
+                        $rows[] = array ('guid' => $guid,'name' => $name
+                        );
+                    }
+
+                    global $_DBArray;
+                    $_DBArray = (isset( $_SESSION['_DBArray'] ) ? $_SESSION['_DBArray'] : '');
+                    $_DBArray['user'] = $rows;
+                    $_SESSION['_DBArray'] = $_DBArray;
+
+                    G::LoadClass( 'ArrayPeer' );
+                    $c = new Criteria( 'dbarray' );
+                    $c->setDBArrayTable( 'user' );
+                    $c->addAscendingOrderByColumn( 'name' );
+                    $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'setup/wsrUserList', $c );
+
+                } else if (is_object( $result )) {
+                    $_SESSION['WS_SESSION_ID'] = '';
+                    $fields['status_code'] = $result->status_code;
+                    $fields['message'] = $result->message;
+                    $fields['time_stamp'] = date( "Y-m-d H:i:s" );
+                    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
+                }
+                G::RenderPage( 'publish', 'raw' );
+                break;
+            case "SendMessage":
+                require_once ('classes/model/Application.php');
+                $sessionId = $frm["SESSION_ID"];
+                $from = $frm["FROM"];
+                $to = $frm["TO_EMAIL"];
+                $cc = isset( $frm["CC_MAIL"] ) ? $frm["CC_MAIL"] : '';
+                $bcc = isset( $frm["BCC_MAIL"] ) ? $frm["BCC_MAIL"] : '';
+                $caseId = $frm["CASE_ID"];
+                $subject = $frm["SUBJECT"];
+                $message = $frm["MESSAGE"];
+                // getting the proUid variable
+                $oCases = new Application();
+                $oCases->load( $caseId );
+                $proUid = $oCases->getProUid();
+                $caseNumber = $oCases->getAppNumber();
+
+                // generating the path for the template msj
+                $templateFile = PATH_DB . SYS_SYS . PATH_SEP . 'mailTemplates' . PATH_SEP . $proUid . PATH_SEP . 'tempTemplate.hml';
+                // generating the file adding the msj variable
+                $messageBody = "message for case: " . $caseNumber . "<br>" . $message;
+                file_put_contents( $templateFile, $messageBody );
+
+                $params = array ('sessionId' => $sessionId,'caseId' => $caseId,'from' => $from,'to' => $to,'cc' => $cc,'bcc' => $bcc,'subject' => $subject,'template' => 'tempTemplate.hml'
+                );
+                $result = $client->__SoapCall( 'sendMessage', array ($params
+                ) );
+                $G_PUBLISH = new Publisher();
+                $fields['status_code'] = $result->status_code;
+                $fields['message'] = $result->message;
+                $fields['time_stamp'] = $result->timestamp;
+
+                if ($result->status_code == 9) {
+                    $_SESSION['WS_SESSION_ID'] = '';
+                }
+
+                $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
+                G::RenderPage( 'publish', 'raw' );
+                break;
+            case "SendVariables":
+                $sessionId = $frm["SESSION_ID"];
+                $caseId = $frm["CASE_ID"];
+                $variables = Array ();
+
+                $o = new stdClass();
+                $o->name = $frm["NAME1"];
+                $o->value = $frm["VALUE1"];
+                array_push( $variables, $o );
+                $o = new stdClass();
+                $o->name = $frm["NAME2"];
+                $o->value = $frm["VALUE2"];
+                array_push( $variables, $o );
+
+                $params = array ('sessionId' => $sessionId,'caseId' => $caseId,'variables' => $variables
+                );
+                $result = $client->__SoapCall( 'SendVariables', array ($params
+                ) );
+                $G_PUBLISH = new Publisher();
+                $fields['status_code'] = $result->status_code;
+                $fields['message'] = $result->message;
+                $fields['time_stamp'] = $result->timestamp;
+
+                if ($result->status_code == 9) {
+                    $_SESSION['WS_SESSION_ID'] = '';
+                }
+
+                $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
+                G::RenderPage( 'publish', 'raw' );
+                break;
+            case "DerivateCase":
+                $sessionId = $frm["SESSION_ID"];
+                $caseId = $frm["CASE_ID"];
+                $delIndex = $frm["DEL_INDEX"];
+
+                $params = array ('sessionId' => $sessionId,'caseId' => $caseId,'delIndex' => $delIndex
+                );
+                $result = $client->__SoapCall( 'RouteCase', array ($params
+                ) );
+                $G_PUBLISH = new Publisher();
+                $fields['status_code'] = $result->status_code;
+                $fields['message'] = $result->message;
+                $fields['time_stamp'] = $result->timestamp;
+
+                if ($result->status_code == 9) {
+                    $_SESSION['WS_SESSION_ID'] = '';
+                }
+
+                $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
+                G::RenderPage( 'publish', 'raw' );
+                break;
+            case "ReassignCase":
+                $sessionId = $frm["SESSION_ID"];
+                $caseId = $frm["CASE_ID"];
+                $delIndex = $frm["DEL_INDEX"];
+                $userIdSource = $frm['USERIDSOURCE'];
+                $userIdTarget = $frm['USERIDTARGET'];
+
+                $params = array ('sessionId' => $sessionId,'caseId' => $caseId,'delIndex' => $delIndex,'userIdSource' => $userIdSource,'userIdTarget' => $userIdTarget
+                );
+                $result = $client->__SoapCall( 'reassignCase', array ($params
+                ) );
+
+                $G_PUBLISH = new Publisher();
+                $fields['status_code'] = $result->status_code;
+                $fields['message'] = $result->message;
+                $fields['time_stamp'] = $result->timestamp;
+
+                if ($result->status_code == 9) {
+                    $_SESSION['WS_SESSION_ID'] = '';
+                }
+
+                $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
+                G::RenderPage( 'publish', 'raw' );
+                break;
+            case "NewCaseImpersonate":
+                $sessionId = $frm["SESSION_ID"];
+                $processId = $frm["PROCESS_ID"];
+                $userId = $frm["USER_ID"];
+                $variables = Array ();
+                foreach ($frm['VARIABLES'] as $iRow => $aRow) {
+                    $o = new stdClass();
+                    $o->name = $aRow['NAME'];
+                    $o->value = $aRow['VALUE'];
+                    array_push( $variables, $o );
+                }
+                $params = array ('sessionId' => $sessionId,'processId' => $processId,'userId' => $userId,'variables' => $variables
+                );
+                $result = $client->__SoapCall( 'NewCaseImpersonate', array ($params
+                ) );
+                $G_PUBLISH = new Publisher();
+                $fields['status_code'] = $result->status_code;
+                $fields['message'] = $result->message;
+                $fields['time_stamp'] = $result->timestamp;
+
+                if ($result->status_code == 9) {
+                    $_SESSION['WS_SESSION_ID'] = '';
+                }
+
+                $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
+                G::RenderPage( 'publish', 'raw' );
+                break;
+            case "NewCase":
+                $sessionId = $frm["SESSION_ID"];
+                $processId = $frm["PROCESS_ID"];
+                $taskId = $frm["TASK_ID"];
+
+                $variables = Array ();
+                foreach ($frm['VARIABLES'] as $iRow => $aRow) {
+                    $o = new stdClass();
+                    $o->name = $aRow['NAME'];
+                    $o->value = $aRow['VALUE'];
+                    array_push( $variables, $o );
+                }
+                $params = array ('sessionId' => $sessionId,'processId' => $processId,'taskId' => $taskId,'variables' => $variables
+                );
+                $result = $client->__SoapCall( 'NewCase', array ($params
+                ) );
+
+                $G_PUBLISH = new Publisher();
+
+                $fields['status_code'] = $result->status_code;
+                $fields['time_stamp'] = $result->timestamp;
+                if (isset( $result->caseId )) {
+                    $fields['message'] = "Case ID: " . $result->caseId . "\nCase Number: " . $result->caseNumber . "\n" . $result->message;
+                } else {
+                    $fields['message'] = '';
+                }
+                if ($result->status_code == 9) {
+                    $_SESSION['WS_SESSION_ID'] = '';
+                }
+
+                $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
+                G::RenderPage( 'publish', 'raw' );
+                break;
+            case "AssignUserToGroup":
+                $sessionId = $frm["SESSION_ID"];
+                $userId = $frm["USER_ID"];
+                $groupId = $frm["GROUP_ID"];
+                $params = array ('sessionId' => $sessionId,'userId' => $userId,'groupId' => $groupId
+                );
+                $result = $client->__SoapCall( 'AssignUserToGroup', array ($params
+                ) );
+                $G_PUBLISH = new Publisher();
+                $fields['status_code'] = $result->status_code;
+                $fields['message'] = $result->message;
+                $fields['time_stamp'] = $result->timestamp;
+
+                if ($result->status_code == 9) {
+                    $_SESSION['WS_SESSION_ID'] = '';
+                }
+
+                $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
+                G::RenderPage( 'publish', 'raw' );
+                break;
+            case "CreateUser":
+                $sessionId = $frm["SESSION_ID"];
+                $userId = $frm["USER_ID"];
+                $firstname = $frm["FIRST_NAME"];
+                $lastname = $frm["LAST_NAME"];
+                $email = $frm["EMAIL"];
+                $role = $frm["ROLE"];
+                $password = $frm["PASSWORD"];
+
+                $params = array ('sessionId' => $sessionId,'userId' => $userId,'firstname' => $firstname,'lastname' => $lastname,'email' => $email,'role' => $role,'password' => $password
+                );
+                $result = $client->__SoapCall( 'CreateUser', array ($params
+                ) );
+                $G_PUBLISH = new Publisher();
+                $fields['status_code'] = $result->status_code;
+                $fields['message'] = $result->message;
+                $fields['time_stamp'] = $result->timestamp;
+
+                if ($result->status_code == 9) {
+                    $_SESSION['WS_SESSION_ID'] = '';
+                }
+
+                $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
+                G::RenderPage( 'publish', 'raw' );
+                break;
+            case "TaskList":
+                $sessionId = $frm["SESSION_ID"];
+                $params = array ('sessionId' => $sessionId
+                );
+                $wsResponse = $client->__SoapCall( 'TaskList', array ($params
+                ) );
+                $result = G::PMWSCompositeResponse( $wsResponse, 'tasks' );
+
+                $G_PUBLISH = new Publisher();
+                $rows[] = array ('guid' => 'char','name' => 'char'
+                );
+
+                if (is_array( $result )) {
+
+                    foreach ($result as $key => $item) {
+                        if (isset( $item->item ))
+                            foreach ($item->item as $index => $val) {
+                                if ($val->key == 'guid')
+                                    $guid = $val->value;
+                                if ($val->key == 'name')
+                                    $name = $val->value;
+                            }
+                        else if (is_array( $item ))
+                            foreach ($item as $index => $val) {
+                                if ($val->key == 'guid')
+                                    $guid = $val->value;
+                                if ($val->key == 'name')
+                                    $name = $val->value;
+                            }
+                        else {
+                            if (isset( $item->guid ))
+                                $guid = $item->guid;
+                            if (isset( $item->name ))
+                                $name = $item->name;
+                        }
+
+                        $rows[] = array ('guid' => $guid,'name' => $name
+                        );
+                    }
+                    global $_DBArray;
+                    $_DBArray = (isset( $_SESSION['_DBArray'] ) ? $_SESSION['_DBArray'] : '');
+                    $_DBArray['task'] = $rows;
+                    $_SESSION['_DBArray'] = $_DBArray;
+
+                    G::LoadClass( 'ArrayPeer' );
+                    $c = new Criteria( 'dbarray' );
+                    $c->setDBArrayTable( 'task' );
+                    $c->addAscendingOrderByColumn( 'name' );
+                    $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'setup/wsrTaskList', $c );
+                } else if (is_object( $result )) {
+                    $_SESSION['WS_SESSION_ID'] = '';
+                    $fields['status_code'] = $result->status_code;
+                    $fields['message'] = $result->message;
+                    $fields['time_stamp'] = date( "Y-m-d H:i:s" );
+                    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
+                }
+                G::RenderPage( 'publish', 'raw' );
+                break;
+            case "TriggerList":
+                $sessionId = $frm["SESSION_ID"];
+                $params = array ('sessionId' => $sessionId
+                );
+
+                $wsResponse = $client->__SoapCall( 'triggerList', array ($params
+                ) );
+                $result = G::PMWSCompositeResponse( $wsResponse, 'triggers' );
+
+                $G_PUBLISH = new Publisher();
+                $rows[] = array ('guid' => 'char','name' => 'char','processId' => 'char'
+                );
+
+                if (is_array( $result )) {
+                    foreach ($result as $key => $item) {
+                        if (isset( $item->item ))
+                            foreach ($item->item as $index => $val) {
+                                if ($val->key == 'guid')
+                                    $guid = $val->value;
+                                if ($val->key == 'name')
+                                    $name = $val->value;
+                                if ($val->key == 'processId')
+                                    $processId = $val->value;
+                            }
+                        else if (is_array( $item ))
+                            foreach ($item as $index => $val) {
+                                if ($val->key == 'guid')
+                                    $guid = $val->value;
+                                if ($val->key == 'name')
+                                    $name = $val->value;
+                                if ($val->key == 'processId')
+                                    $processId = $val->value;
+                            }
+                        else {
+                            if (isset( $item->guid ))
+                                $guid = $item->guid;
+                            if (isset( $item->name ))
+                                $name = $item->name;
+                            if (isset( $item->processId ))
+                                $processId = $item->processId;
+                        }
+                        $rows[] = array ('guid' => $guid,'name' => $name,'processId' => $processId
+                        );
+                    }
+
+                    global $_DBArray;
+                    $_DBArray = (isset( $_SESSION['_DBArray'] ) ? $_SESSION['_DBArray'] : '');
+
+                    foreach ($rows as $key => $row) {
+                        $proId = $row['processId'];
+                        if (isset( $_DBArray['process'] ) && is_array( $_DBArray['process'] ))
+                            foreach ($_DBArray['process'] as $pkey => $prow) {
+                                if ($proId == $prow['guid']) {
+                                    $rows[$key]['processId'] = $prow['name'];
+                                }
+                            }
+                    }
+
+                    $_DBArray['triggers'] = $rows;
+                    $_SESSION['_DBArray'] = $_DBArray;
+
+                    G::LoadClass( 'ArrayPeer' );
+                    $c = new Criteria( 'dbarray' );
+                    $c->setDBArrayTable( 'triggers' );
+                    $c->addAscendingOrderByColumn( 'name' );
+                    $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'setup/wsrTriggerList', $c );
+
+                } else if (is_object( $result )) {
+                    $_SESSION['WS_SESSION_ID'] = '';
+                    $fields['status_code'] = $result->status_code;
+                    $fields['message'] = $result->message;
+                    $fields['time_stamp'] = date( "Y-m-d H:i:s" );
+                    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
+                }
+
+                G::RenderPage( 'publish', 'raw' );
+                break;
+            case "InputDocumentList":
+                $caseId = $frm["CASE_ID"];
+                $sessionId = $frm["SESSION_ID"];
+                $params = array ('sessionId' => $sessionId,'caseId' => $caseId
+                );
+
+                $wsResponse = $client->__SoapCall( 'InputDocumentList', array ($params
+                ) );
+
+                //g::pr($wsResponse);
+                $result = G::PMWSCompositeResponse( $wsResponse, 'documents' );
+
+                $G_PUBLISH = new Publisher();
+                $rows[] = array ('guid' => 'char','name' => 'char','processId' => 'char'
+                );
+
+                if (is_array( $result )) {
+                    foreach ($result as $key => $item) {
+                        if (isset( $item->item ))
+                            foreach ($item->item as $index => $val) {
+                                if ($val->key == 'guid')
+                                    $guid = $val->value;
+                                if ($val->key == 'filename')
+                                    $filename = $val->value;
+                                if ($val->key == 'docId')
+                                    $docId = $val->value;
+                                if ($val->key == 'version')
+                                    $version = $val->value;
+                                if ($val->key == 'createDate')
+                                    $createDate = $val->value;
+                                if ($val->key == 'createBy')
+                                    $createBy = $val->value;
+                                if ($val->key == 'type')
+                                    $type = $val->value;
+                                if ($val->key == 'link')
+                                    $link = $val->value;
+                            }
+                        else if (is_array( $item ))
+                            foreach ($item as $index => $val) {
+                                if ($val->key == 'guid')
+                                    $guid = $val->value;
+                                if ($val->key == 'filename')
+                                    $filename = $val->value;
+                                if ($val->key == 'docId')
+                                    $docId = $val->value;
+                                if ($val->key == 'version')
+                                    $version = $val->value;
+                                if ($val->key == 'createDate')
+                                    $createDate = $val->value;
+                                if ($val->key == 'createBy')
+                                    $createBy = $val->value;
+                                if ($val->key == 'type')
+                                    $type = $val->value;
+                                if ($val->key == 'link')
+                                    $link = $val->value;
+                            }
+                        else {
+                            if (isset( $item->guid ))
+                                $guid = $item->guid;
+                            if (isset( $item->filename ))
+                                $filename = $item->filename;
+                            if (isset( $item->docId ))
+                                $docId = $item->docId;
+                            if (isset( $item->version ))
+                                $version = $item->version;
+                            if (isset( $item->createDate ))
+                                $createDate = $item->createDate;
+                            if (isset( $item->createBy ))
+                                $createBy = $item->createBy;
+                            if (isset( $item->type ))
+                                $type = $item->type;
+                            if (isset( $item->link ))
+                                $link = $item->link;
+                        }
+                        $rows[] = array ('guid' => $guid,'filename' => $filename,'docId' => $docId,'version' => $version,'createDate' => $createDate,'createBy' => $createBy,'type' => $type,'link' => $link
+                        );
+                    }
+
+                    global $_DBArray;
+                    $_DBArray = (isset( $_SESSION['_DBArray'] ) ? $_SESSION['_DBArray'] : '');
+                    $_DBArray['inputDocument'] = $rows;
+                    $documentArray = array ();
+                    $documentArray[] = array ('guid' => 'char','filename' => 'char'
+                    );
+                    if (isset( $_DBArray['inputDocument'] ))
+                        foreach ($_DBArray['inputDocument'] as $key => $val)
+                            if ($key != 0 && isset( $val['filename'] ))
+                                $documentArray[] = array ('guid' => $val['guid'],'filename' => $val['filename']
+                                );
+                    if (isset( $_DBArray['outputDocument'] ))
+                        foreach ($_DBArray['outputDocument'] as $key => $val)
+                            if ($key != 0 && isset( $val['filename'] ))
+                                $documentArray[] = array ('guid' => $val['guid'],'filename' => $val['filename']
+                                );
+                    $_DBArray['documents'] = $documentArray;
+                    $_DBArray['WS_TMP_CASE_UID'] = $frm["CASE_ID"];
+                    $_SESSION['_DBArray'] = $_DBArray;
+
+                    G::LoadClass( 'ArrayPeer' );
+                    $c = new Criteria( 'dbarray' );
+                    $c->setDBArrayTable( 'inputDocument' );
+                    $c->addAscendingOrderByColumn( 'name' );
+                    $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'setup/wsrInputDocumentList', $c );
+
+                } else if (is_object( $result )) {
+                    $_SESSION['WS_SESSION_ID'] = '';
+                    $fields['status_code'] = $result->status_code;
+                    $fields['message'] = $result->message;
+                    $fields['time_stamp'] = date( "Y-m-d H:i:s" );
+                    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
+                }
+                G::RenderPage( 'publish', 'raw' );
+                break;
+            case "InputDocumentProcessList":
+                $processId = $frm["PROCESS_ID"];
+                $sessionId = $frm["SESSION_ID"];
+                $params = array ('sessionId' => $sessionId,'processId' => $processId
+                );
+
+                $wsResponse = $client->__SoapCall( 'InputDocumentProcessList', array ($params
+                ) );
+                $result = G::PMWSCompositeResponse( $wsResponse, 'documents' );
+
+                $G_PUBLISH = new Publisher();
+                $rows[] = array ('guid' => 'char','name' => 'char','description' => 'char'
+                );
+                if (is_array( $result )) {
+                    foreach ($result as $key => $item) {
+                        if (isset( $item->item ))
+                            foreach ($item->item as $index => $val) {
+                                if ($val->key == 'guid')
+                                    $guid = $val->value;
+                                if ($val->key == 'name')
+                                    $name = $val->value;
+                                if ($val->key == 'description')
+                                    $description = $val->value;
+                            }
+                        else if (is_array( $item ))
+                            foreach ($item as $index => $val) {
+                                if ($val->key == 'guid')
+                                    $guid = $val->value;
+                                if ($val->key == 'name')
+                                    $name = $val->value;
+                                if ($val->key == 'description')
+                                    $description = $val->value;
+                            }
+                        else {
+                            if (isset( $item->guid ))
+                                $guid = $item->guid;
+                            if (isset( $item->name ))
+                                $name = $item->name;
+                            if (isset( $item->description ))
+                                $description = $item->description;
+                        }
+                        $rows[] = array ('guid' => $guid,'name' => $name,'description' => $description
+                        );
+                    }
+                    global $_DBArray;
+                    $_DBArray = (isset( $_SESSION['_DBArray'] ) ? $_SESSION['_DBArray'] : '');
+                    $_DBArray['inputDocuments'] = $rows;
+                    $_SESSION['_DBArray'] = $_DBArray;
+
+                    G::LoadClass( 'ArrayPeer' );
+                    $c = new Criteria( 'dbarray' );
+                    $c->setDBArrayTable( 'inputDocuments' );
+                    $c->addAscendingOrderByColumn( 'name' );
+                    $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'setup/wsrInputDocumentProcessList', $c );
+                } else if (is_object( $result )) {
+                    $_SESSION['WS_SESSION_ID'] = '';
+                    $fields['status_code'] = $result->status_code;
+                    $fields['message'] = $result->message;
+                    $fields['time_stamp'] = date( "Y-m-d H:i:s" );
+                    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
+                }
+                G::RenderPage( 'publish', 'raw' );
+                break;
+            case "OutputDocumentList":
+                $caseId = $frm["CASE_ID"];
+                $sessionId = $frm["SESSION_ID"];
+                $params = array ('sessionId' => $sessionId,'caseId' => $caseId
+                );
+
+                $wsResponse = $client->__SoapCall( 'outputDocumentList', array ($params
+                ) );
+                $result = G::PMWSCompositeResponse( $wsResponse, 'documents' );
+
+                $G_PUBLISH = new Publisher();
+                $rows = array ();
+                $rows[] = array ('guid' => 'char','name' => 'char'
+                );
+                if (is_array( $result )) {
+
+                    foreach ($result as $key => $item) {
+                        if (isset( $item->item ))
+                            foreach ($item->item as $index => $val) {
+                                if ($val->key == 'guid')
+                                    $guid = $val->value;
+                                if ($val->key == 'filename')
+                                    $filename = $val->value;
+                                if ($val->key == 'docId')
+                                    $docId = $val->value;
+                                if ($val->key == 'version')
+                                    $version = $val->value;
+                                if ($val->key == 'createDate')
+                                    $createDate = $val->value;
+                                if ($val->key == 'createBy')
+                                    $createBy = $val->value;
+                                if ($val->key == 'type')
+                                    $type = $val->value;
+                                if ($val->key == 'link')
+                                    $link = $val->value;
+                            }
+                        else if (is_array( $item ))
+                            foreach ($item as $index => $val) {
+                                if ($val->key == 'guid')
+                                    $guid = $val->value;
+                                if ($val->key == 'filename')
+                                    $filename = $val->value;
+                                if ($val->key == 'docId')
+                                    $docId = $val->value;
+                                if ($val->key == 'version')
+                                    $version = $val->value;
+                                if ($val->key == 'createDate')
+                                    $createDate = $val->value;
+                                if ($val->key == 'createBy')
+                                    $createBy = $val->value;
+                                if ($val->key == 'type')
+                                    $type = $val->value;
+                                if ($val->key == 'link')
+                                    $link = $val->value;
+                            }
+                        else {
+                            if (isset( $item->guid ))
+                                $guid = $item->guid;
+                            if (isset( $item->filename ))
+                                $filename = $item->filename;
+                            if (isset( $item->docId ))
+                                $docId = $item->docId;
+                            if (isset( $item->version ))
+                                $version = $item->version;
+                            if (isset( $item->createDate ))
+                                $createDate = $item->createDate;
+                            if (isset( $item->createBy ))
+                                $createBy = $item->createBy;
+                            if (isset( $item->type ))
+                                $type = $item->type;
+                            if (isset( $item->link ))
+                                $link = $item->link;
+                        }
+                        $rows[] = array ('guid' => $guid,'filename' => $filename,'docId' => $docId,'version' => $version,'createDate' => $createDate,'createBy' => $createBy,'type' => $type,'link' => $link
+                        );
+                    }
+                    global $_DBArray;
+                    $_DBArray = (isset( $_SESSION['_DBArray'] ) ? $_SESSION['_DBArray'] : '');
+                    $_DBArray['outputDocument'] = $rows;
+                    $documentArray = array ();
+                    $documentArray[] = array ('guid' => 'char','filename' => 'char'
+                    );
+                    if (isset( $_DBArray['inputDocument'] ))
+                        foreach ($_DBArray['inputDocument'] as $key => $val)
+                            if ($key != 0 && isset( $val['filename'] ))
+                                $documentArray[] = array ('guid' => $val['guid'],'filename' => $val['filename']
+                                );
+                    if (isset( $_DBArray['outputDocument'] ))
+                        foreach ($_DBArray['outputDocument'] as $key => $val)
+                            if ($key != 0 && isset( $val['filename'] ))
+                                $documentArray[] = array ('guid' => $val['guid'],'filename' => $val['filename']
+                                );
+                    $_DBArray['documents'] = $documentArray;
+                    $_SESSION['_DBArray'] = $_DBArray;
+
+                    G::LoadClass( 'ArrayPeer' );
+                    $c = new Criteria( 'dbarray' );
+                    $c->setDBArrayTable( 'outputDocument' );
+                    $c->addAscendingOrderByColumn( 'name' );
+                    $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'setup/wsrOutputDocumentList', $c );
+                } else if (is_object( $result )) {
+                    $_SESSION['WS_SESSION_ID'] = '';
+                    $fields['status_code'] = $result->status_code;
+                    $fields['message'] = $result->message;
+                    $fields['time_stamp'] = date( "Y-m-d H:i:s" );
+                    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
+                }
+
+                G::RenderPage( 'publish', 'raw' );
+                break;
+            //add removeUserFromGroup
+            case "removeUserFromGroup":
+                $sessionId = $frm["SESSION_ID"];
+                $userId = $frm["USER_ID"];
+                $groupId = $frm["GROUP_ID"];
+                $params = array ('sessionId' => $sessionId,'userId' => $userId,'groupId' => $groupId
+                );
+                $result = $client->__SoapCall( 'removeUserFromGroup', array ($params
+                ) );
+                $G_PUBLISH = new Publisher();
+                $fields['status_code'] = $result->status_code;
+                $fields['message'] = $result->message;
+                $fields['time_stamp'] = $result->timestamp;
+                if ($result->status_code == 9) {
+                    $_SESSION['WS_SESSION_ID'] = '';
+                }
+
+                $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
+                G::RenderPage( 'publish', 'raw' );
+                break;
+            //end add
+            case "RemoveDocument":
+                $appDocUid = $frm["APP_DOC_UID"];
+                $sessionId = $frm["SESSION_ID"];
+                $params = array ('sessionId' => $sessionId,'appDocUid' => $appDocUid
+                );
+                $result = $client->__SoapCall( 'RemoveDocument', array ($params
+                ) );
+                $fields['status_code'] = $result->status_code;
+                $fields['message'] = $result->message;
+                $fields['time_stamp'] = $result->timestamp;
+
+                if ($result->status_code == 9) {
+                    $_SESSION['WS_SESSION_ID'] = '';
+                }
+
+                $G_PUBLISH = new Publisher();
+                $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
+                G::RenderPage( 'publish', 'raw' );
+                break;
+            case "TaskCase":
+                $sessionId = $frm["SESSION_ID"];
+                $caseId = $frm["CASE_ID"];
+
+                $params = array ('sessionId' => $sessionId,'caseId' => $caseId
+                );
+                $wsResponse = $client->__SoapCall( 'TaskCase', array ($params
+                ) );
+                $result = G::PMWSCompositeResponse( $wsResponse, 'taskCases' );
+
+                $G_PUBLISH = new Publisher();
+                $rows[] = array ('guid' => 'char','name' => 'char'
+                );
+
+                if (is_array( $result )) {
+
+                    foreach ($result as $key => $item) {
+                        if (isset( $item->item ))
+                            foreach ($item->item as $index => $val) {
+                                if ($val->key == 'guid') {
+                                    $guid = $val->value;
+                                }
+                                if ($val->key == 'name') {
+                                    $name = $val->value;
+                                }
+                            }
+                        else if (is_array( $item ))
+                            foreach ($item as $index => $val) {
+                                if ($val->key == 'guid')
+                                    $guid = $val->value;
+                            }
+                        if ($val->key == 'name') {
+                            $name = $val->value;
+                        }
                     }
-
-    				$_DBArray ['triggers'] = $rows;
-    				$_SESSION ['_DBArray'] = $_DBArray;
-
-    				G::LoadClass ( 'ArrayPeer' );
-    				$c = new Criteria ( 'dbarray' );
-    				$c->setDBArrayTable ( 'triggers' );
-    				$c->addAscendingOrderByColumn ( 'name' );
-    				$G_PUBLISH->AddContent ( 'propeltable', 'paged-table', 'setup/wsrTriggerList', $c );
-
-				} else if ( is_object($result) ){
-				    $_SESSION ['WS_SESSION_ID'] = '';
-		            $fields ['status_code'] = $result->status_code;
-    				$fields ['message']     =  $result->message;
-    				$fields ['time_stamp']  = date("Y-m-d H:i:s");
-    				$G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
-		        }
-
-				G::RenderPage ( 'publish', 'raw' );
-				break;
-
-			case "InputDocumentList" :
-				$caseId = $frm ["CASE_ID"];
-				$sessionId = $frm ["SESSION_ID"];
-				$params = array ('sessionId' => $sessionId, 'caseId' => $caseId );
-
-				$wsResponse = $client->__SoapCall ( 'InputDocumentList', array ($params ) );
-
-				//g::pr($wsResponse);
-				$result = G::PMWSCompositeResponse($wsResponse, 'documents');
-
-				$G_PUBLISH = new Publisher ( );
-				$rows [] = array ('guid' => 'char', 'name' => 'char', 'processId' => 'char' );
-
-				if (is_array( $result )){
-				    foreach ( $result as $key => $item ) {
-						if (isset ( $item->item ))
-							foreach ( $item->item as $index => $val ) {
-								if ($val->key == 'guid')
-									$guid = $val->value;
-								if ($val->key == 'filename')
-									$filename = $val->value;
-								if ($val->key == 'docId')
-									$docId = $val->value;
-								if ($val->key == 'version')
-									$version = $val->value;
-								if ($val->key == 'createDate')
-									$createDate = $val->value;
-								if ($val->key == 'createBy')
-									$createBy = $val->value;
-								if ($val->key == 'type')
-									$type = $val->value;
-								if ($val->key == 'link')
-									$link = $val->value;
-							}
-						else if (is_array ( $item ))
-							foreach ( $item as $index => $val ) {
-								if ($val->key == 'guid')
-									$guid = $val->value;
-								if ($val->key == 'filename')
-									$filename = $val->value;
-								if ($val->key == 'docId')
-									$docId = $val->value;
-								if ($val->key == 'version')
-									$version = $val->value;
-								if ($val->key == 'createDate')
-									$createDate = $val->value;
-								if ($val->key == 'createBy')
-									$createBy = $val->value;
-								if ($val->key == 'type')
-									$type = $val->value;
-								if ($val->key == 'link')
-									$link = $val->value;
-							}
-						else {
-							if (isset ( $item->guid ))
-								$guid = $item->guid;
-							if (isset ( $item->filename ))
-								$filename = $item->filename;
-							if (isset ( $item->docId ))
-								$docId = $item->docId;
-							if (isset ( $item->version ))
-								$version = $item->version;
-							if (isset ( $item->createDate ))
-								$createDate = $item->createDate;
-							if (isset ( $item->createBy ))
-								$createBy = $item->createBy;
-							if (isset ( $item->type ))
-								$type = $item->type;
-							if (isset ( $item->link ))
-								$link = $item->link;
-						}
-						$rows [] = array ('guid' => $guid, 'filename' => $filename, 'docId' => $docId, 'version' => $version,
-					                  'createDate' => $createDate, 'createBy' => $createBy, 'type' => $type, 'link' => $link );
-					}
-
-          			global $_DBArray;
-        	  		$_DBArray = (isset ( $_SESSION ['_DBArray'] ) ? $_SESSION ['_DBArray'] : '');
-    				$_DBArray ['inputDocument'] = $rows;
-    				$documentArray = array();
-    				$documentArray[] = array ('guid' => 'char', 'filename' => 'char' );
-    				if ( isset($_DBArray ['inputDocument']) )
-    					foreach ( $_DBArray ['inputDocument'] as $key => $val )
-    					  if ( $key != 0 && isset ($val['filename']) )
-        				  $documentArray[] = array ('guid' => $val['guid'], 'filename' => $val['filename'] );
-    				if ( isset($_DBArray ['outputDocument']) )
-    					foreach ( $_DBArray ['outputDocument'] as $key => $val )
-    					  if ( $key != 0 && isset ($val['filename']) )
-                    $documentArray[] = array ('guid' => $val['guid'], 'filename' => $val['filename'] );
-    				$_DBArray ['documents'] = $documentArray;
-    				$_DBArray ['WS_TMP_CASE_UID'] = $frm ["CASE_ID"];
-    				$_SESSION ['_DBArray'] = $_DBArray;
-
-    				G::LoadClass ( 'ArrayPeer' );
-    				$c = new Criteria ( 'dbarray' );
-    				$c->setDBArrayTable ( 'inputDocument' );
-    				$c->addAscendingOrderByColumn ( 'name' );
-    				$G_PUBLISH->AddContent ( 'propeltable', 'paged-table', 'setup/wsrInputDocumentList', $c );
-
-				} else if ( is_object($result) ){
-				    $_SESSION ['WS_SESSION_ID'] = '';
-		            $fields ['status_code'] = $result->status_code;
-    				$fields ['message']     =  $result->message;
-    				$fields ['time_stamp']  = date("Y-m-d H:i:s");
-    				$G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
-		        }
-    			G::RenderPage ( 'publish', 'raw' );
-
-				break;
-
-			case "InputDocumentProcessList" :
-				$processId = $frm ["PROCESS_ID"];
-				$sessionId = $frm ["SESSION_ID"];
-				$params = array ('sessionId' => $sessionId, 'processId' => $processId );
-
-				$wsResponse = $client->__SoapCall ( 'InputDocumentProcessList', array ($params ) );
-				$result = G::PMWSCompositeResponse($wsResponse, 'documents');
-
-				$G_PUBLISH = new Publisher();
-				$rows [] = array ('guid' => 'char', 'name' => 'char', 'description' => 'char' );
-				if (is_array ( $result )){
-				    foreach ( $result as $key => $item ) {
-						if (isset ( $item->item ))
-							foreach ( $item->item as $index => $val ) {
-								if ($val->key == 'guid')
-									$guid = $val->value;
-								if ($val->key == 'name')
-									$name = $val->value;
-								if ($val->key == 'description')
-									$description = $val->value;
-							}
-						else if (is_array ( $item ))
-							foreach ( $item as $index => $val ) {
-								if ($val->key == 'guid')
-									$guid = $val->value;
-								if ($val->key == 'name')
-									$name = $val->value;
-								if ($val->key == 'description')
-									$description = $val->value;
-							}
-						else {
-							if (isset ( $item->guid ))
-								$guid = $item->guid;
-							if (isset ( $item->name ))
-								$name = $item->name;
-							if (isset ( $item->description ))
-								$description = $item->description;
-						}
-                        $rows [] = array ('guid' => $guid, 'name' => $name, 'description' => $description );
-			        }
-          			global $_DBArray;
-        	  		$_DBArray = (isset ( $_SESSION ['_DBArray'] ) ? $_SESSION ['_DBArray'] : '');
-    				$_DBArray ['inputDocuments'] = $rows;
-    				$_SESSION ['_DBArray'] = $_DBArray;
-
-    				G::LoadClass ( 'ArrayPeer' );
-    				$c = new Criteria ( 'dbarray' );
-    				$c->setDBArrayTable ( 'inputDocuments' );
-    				$c->addAscendingOrderByColumn ( 'name' );
-    				$G_PUBLISH->AddContent ( 'propeltable', 'paged-table', 'setup/wsrInputDocumentProcessList', $c );
-				} else if ( is_object($result) ){
-				    $_SESSION ['WS_SESSION_ID'] = '';
-		            $fields ['status_code'] = $result->status_code;
-    				$fields ['message']     =  $result->message;
-    				$fields ['time_stamp']  = date("Y-m-d H:i:s");
-    				$G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
-		        }
-    			G::RenderPage ( 'publish', 'raw' );
-				break;
-
-
-			case "OutputDocumentList" :
-				$caseId = $frm ["CASE_ID"];
-				$sessionId = $frm ["SESSION_ID"];
-				$params = array ('sessionId' => $sessionId, 'caseId' => $caseId );
-
-				$wsResponse = $client->__SoapCall ( 'outputDocumentList', array ($params ) );
-				$result = G::PMWSCompositeResponse($wsResponse, 'documents');
-
-				$G_PUBLISH = new Publisher ( );
-				$rows = array();
-				$rows [] = array ('guid' => 'char', 'name' => 'char' );
-				if (is_array ( $result )){
-
-					foreach ( $result as $key => $item ) {
-						if (isset ( $item->item ))
-							foreach ( $item->item as $index => $val ) {
-								if ($val->key == 'guid')
-									$guid = $val->value;
-								if ($val->key == 'filename')
-									$filename = $val->value;
-								if ($val->key == 'docId')
-									$docId = $val->value;
-								if ($val->key == 'version')
-									$version = $val->value;
-								if ($val->key == 'createDate')
-									$createDate = $val->value;
-								if ($val->key == 'createBy')
-									$createBy = $val->value;
-								if ($val->key == 'type')
-									$type = $val->value;
-								if ($val->key == 'link')
-									$link = $val->value;
-							}
-						else if (is_array ( $item ))
-							foreach ( $item as $index => $val ) {
-								if ($val->key == 'guid')
-									$guid = $val->value;
-								if ($val->key == 'filename')
-									$filename = $val->value;
-								if ($val->key == 'docId')
-									$docId = $val->value;
-								if ($val->key == 'version')
-									$version = $val->value;
-								if ($val->key == 'createDate')
-									$createDate = $val->value;
-								if ($val->key == 'createBy')
-									$createBy = $val->value;
-								if ($val->key == 'type')
-									$type = $val->value;
-								if ($val->key == 'link')
-									$link = $val->value;
-							}
-						else {
-							if (isset ( $item->guid ))
-								$guid = $item->guid;
-							if (isset ( $item->filename ))
-								$filename = $item->filename;
-							if (isset ( $item->docId ))
-								$docId = $item->docId;
-							if (isset ( $item->version ))
-								$version = $item->version;
-							if (isset ( $item->createDate ))
-								$createDate = $item->createDate;
-							if (isset ( $item->createBy ))
-								$createBy = $item->createBy;
-							if (isset ( $item->type ))
-								$type = $item->type;
-							if (isset ( $item->link ))
-								$link = $item->link;
-						}
-						$rows [] = array ('guid' => $guid, 'filename' => $filename, 'docId' => $docId, 'version' => $version,
-					                  'createDate' => $createDate, 'createBy' => $createBy, 'type' => $type, 'link' => $link );
-					}
-          			global $_DBArray;
-        	  		$_DBArray = (isset ( $_SESSION ['_DBArray'] ) ? $_SESSION ['_DBArray'] : '');
-    				$_DBArray ['outputDocument'] = $rows;
-    				$documentArray = array();
-    				$documentArray[] = array ('guid' => 'char', 'filename' => 'char' );
-    				if ( isset($_DBArray ['inputDocument']) )
-    					foreach ( $_DBArray ['inputDocument'] as $key => $val )
-    					  if ( $key != 0 && isset ($val['filename']) )
-        				  $documentArray[] = array ('guid' => $val['guid'], 'filename' => $val['filename'] );
-    				if ( isset($_DBArray ['outputDocument']) )
-    					foreach ( $_DBArray ['outputDocument'] as $key => $val )
-    					  if ( $key != 0 && isset ($val['filename']) )
-                    $documentArray[] = array ('guid' => $val['guid'], 'filename' => $val['filename'] );
-    				$_DBArray ['documents'] = $documentArray;
-    				$_SESSION ['_DBArray'] = $_DBArray;
-
-    				G::LoadClass ( 'ArrayPeer' );
-    				$c = new Criteria ( 'dbarray' );
-    				$c->setDBArrayTable ( 'outputDocument' );
-    				$c->addAscendingOrderByColumn ( 'name' );
-    				$G_PUBLISH->AddContent ( 'propeltable', 'paged-table', 'setup/wsrOutputDocumentList', $c );
-				} else if ( is_object($result) ){
-				    $_SESSION ['WS_SESSION_ID'] = '';
-		            $fields ['status_code'] = $result->status_code;
-    				$fields ['message']     =  $result->message;
-    				$fields ['time_stamp']  = date("Y-m-d H:i:s");
-    				$G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
-		        }
-
-				G::RenderPage ( 'publish', 'raw' );
-				break;
-//add removeUserFromGroup
-case "removeUserFromGroup" :
-				$sessionId = $frm ["SESSION_ID"];
-				$userId = $frm ["USER_ID"];
-				$groupId = $frm ["GROUP_ID"];
-				$params = array ('sessionId' => $sessionId, 'userId' => $userId, 'groupId' => $groupId );
-				$result = $client->__SoapCall ( 'removeUserFromGroup', array ($params ) );
-				$G_PUBLISH = new Publisher ( );
-				$fields ['status_code'] = $result->status_code;
-				$fields ['message'] = $result->message;
-				$fields ['time_stamp'] = $result->timestamp;
-		                if( $result->status_code == 9 ){
-				    $_SESSION ['WS_SESSION_ID'] = '';
-				}
-
-				$G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
-				G::RenderPage ( 'publish', 'raw' );
-				break;
-//end add
-			case "RemoveDocument" :
-				$appDocUid = $frm ["APP_DOC_UID"];
-				$sessionId = $frm ["SESSION_ID"];
-				$params = array ('sessionId' => $sessionId, 'appDocUid' => $appDocUid );
-				$result = $client->__SoapCall ( 'RemoveDocument', array ($params ) );
-				$fields ['status_code'] = $result->status_code;
-				$fields ['message'] = $result->message;
-				$fields ['time_stamp'] = $result->timestamp;
-
-				if( $result->status_code == 9 ){
-				    $_SESSION ['WS_SESSION_ID'] = '';
-				}
-
-				$G_PUBLISH = new Publisher ( );
-				$G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
-				G::RenderPage ( 'publish', 'raw' );
-				break;
-
-			case "TaskCase" :
-				$sessionId = $frm ["SESSION_ID"];
-				$caseId = $frm ["CASE_ID"];
-
-				$params = array ('sessionId' => $sessionId, 'caseId' => $caseId );
-				$wsResponse = $client->__SoapCall ( 'TaskCase', array ($params ) );
-				$result = G::PMWSCompositeResponse($wsResponse, 'taskCases');
-
-				$G_PUBLISH = new Publisher ( );
-				$rows [] = array ('guid' => 'char', 'name' => 'char' );
-
-				if (is_array ( $result )){
-
-					foreach ( $result as $key => $item ) {
-						if (isset ( $item->item ))
-							foreach ( $item->item as $index => $val ) {
-								if ($val->key == 'guid')
-									$guid = $val->value;
-								if ($val->key == 'name')
-									$name = $val->value;
-							}
-						else if (is_array ( $item ))
-							foreach ( $item as $index => $val ) {
-								if ($val->key == 'guid')
-									$guid = $val->value;
-								if ($val->key == 'name')
-									$name = $val->value;
-							}
-						else {
-							if (isset ( $item->guid ))
-								$guid = $item->guid;
-							if (isset ( $item->name ))
-								$name = $item->name;
-						}
-
-						$rows [] = array ('guid' => $guid, 'name' => $name );
-					}
-
-          			global $_DBArray;
-        	  		$_DBArray = (isset ( $_SESSION ['_DBArray'] ) ? $_SESSION ['_DBArray'] : '');
-    				$_DBArray ['taskCases'] = $rows;
-    				$_SESSION ['_DBArray'] = $_DBArray;
-
-                                G::LoadClass ( 'ArrayPeer' );
-    				$c = new Criteria ( 'dbarray' );
-    				$c->setDBArrayTable ( 'taskCases' );
-    				$c->addAscendingOrderByColumn ( 'name' );
-    				$G_PUBLISH->AddContent ( 'propeltable', 'paged-table', 'setup/wsrTaskCase', $c );
-				} else if ( is_object($result) ){
-				    $_SESSION ['WS_SESSION_ID'] = '';
-		            $fields ['status_code'] = $result->status_code;
-    				$fields ['message']     =  $result->message;
-    				$fields ['time_stamp']  = date("Y-m-d H:i:s");
-    				$G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
-		        }
-
-    			G::RenderPage ( 'publish', 'raw' );
-				break;
-
-			case "wsSendFiles" :
-                                if ( isset($_FILES['form']) ) {
-                                    foreach ($_FILES['form']['name'] as $sFieldName => $vValue) {
-                                        if ( $_FILES['form']['error'][$sFieldName] == 0 ){
-                                            file_put_contents(G::sys_get_temp_dir().PATH_SEP.$_FILES['form']['name'][$sFieldName], file_get_contents($_FILES['form']['tmp_name'][$sFieldName]));
-                                            $filename = G::sys_get_temp_dir().PATH_SEP.$_FILES['form']['name'][$sFieldName];
-                                        }
-                                    }
-                                }
-
-//                              G::pr ( $_SESSION );
-                           if(!isset($_POST['form']['INPUT_DOCUMENT'])){
-                               $_POST['form']['INPUT_DOCUMENT'] = '';
-                           }
-
-
-                                if (isset($_SESSION['_DBArray']['inputDocument'])){
-                                    foreach($_SESSION['_DBArray']['inputDocument'] as $inputDocument){
-                                        if ($inputDocument['guid']==$_POST['form']['INPUT_DOCUMENT']){
-                                            $doc_uid  = $inputDocument['docId'];
-                                        }
-                                    }
-                                } else {
-                                    $doc_uid  = "default";
-                                }
-                                if(!isset($_SESSION['_DBArray']['WS_TMP_CASE_UID'])){
-                               $_SESSION['_DBArray']['WS_TMP_CASE_UID'] = '';
-                                }
-                                $usr_uid  = $_SESSION['USER_LOGGED'];
-                                $app_uid  = $_SESSION['_DBArray']['WS_TMP_CASE_UID'];
-                                $del_index = 1;
-
-                                function sendFile($FILENAME, $USR_UID, $APP_UID, $DEL_INDEX = 1, $DOC_UID = NULL, $title = NULL, $comment = NULL) {
-                                    $defaultEndpoint = 'http://' . $_SERVER ['SERVER_NAME'] . ':' . $_SERVER ['SERVER_PORT'] . '/sys' . SYS_SYS . '/'. SYS_LANG .'/classic/services/upload';
-                                    $upload = isset ( $_SESSION ['END_POINT'] ) ? $_SESSION ['END_POINT'] : $defaultEndpoint;
-
-                                    $DOC_UID = ($DOC_UID != NULL) ? $DOC_UID : - 1;
-                                    $APP_DOC_TYPE = ($DOC_UID == - 1) ? 'ATTACHED' : 'INPUT';
-                                    $title = ($title != NULL) ? $title : $FILENAME;
-                                    $comment = ($comment != NULL) ? $comment : '';
-
-                                    $params = array (
-                                        'ATTACH_FILE' => "@$FILENAME",
-                                        'APPLICATION' => $APP_UID,
-                                        'INDEX' => $DEL_INDEX,
-                                        'USR_UID' => $USR_UID,
-                                        'DOC_UID' => $DOC_UID,
-                                        'APP_DOC_TYPE' => $APP_DOC_TYPE,
-                                        'TITLE' => $title,
-                                        'COMMENT' => $comment
-                                    );
-
-                                    $ch = curl_init();
-                                    curl_setopt($ch, CURLOPT_URL, $defaultEndpoint);
-                                    //curl_setopt($ch, CURLOPT_VERBOSE, 1);
-                                    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-                                    curl_setopt($ch, CURLOPT_POST, 1);
-                                    curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
-                                    $response = curl_exec($ch);
-                                    curl_close($ch);
-                                  return $response;
-                                }
-
-                                $fields ['status_code'] = 0;
-                                $fields ['time_stamp']  = date( "Y-m-d H:i:s" );
-                                if ($_POST['form']['UPLOAD_OPTION']=='1'){
-                                     // G::pr($doc_uid);
-                                      $fields ['message'] = sendFile($filename, $usr_uid, $app_uid, 1, $doc_uid);
-
-                                } else {
-                                      $fields ['message'] = sendFile($filename, $usr_uid, $app_uid);
-                                }
-                                $G_PUBLISH = new Publisher ( );
-                                $G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
-                                G::RenderPage ( 'publish', 'blank' );
-				die ();
-				break;
-			default :
-				print_r ( $_POST );
-		}
-	}
-	global $_DBArray;
-
-
-} catch ( Exception $e ) {
-	$G_PUBLISH = new Publisher ( );
-	$aMessage ['MESSAGE'] = $e->getMessage ();
-	$G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'login/showMessage', '', $aMessage );
-	G::RenderPage ( 'publish', 'raw' );
+                        else
+
+                    {
+                        if (isset( $item->guid )) {
+                            $guid = $item->guid;
+                        }
+                        if (isset( $item->name )) {
+                            $name = $item->name;
+                        }
+                    }
+
+                    $rows[] = array ('guid' => $guid,'name' => $name
+                    );
+                }
+
+                global $_DBArray;
+                $_DBArray = (isset( $_SESSION['_DBArray'] ) ? $_SESSION['_DBArray'] : '');
+                $_DBArray['taskCases'] = $rows;
+                $_SESSION['_DBArray'] = $_DBArray;
+
+                G::LoadClass( 'ArrayPeer' );
+                $c = new Criteria( 'dbarray' );
+                $c->setDBArrayTable( 'taskCases' );
+                $c->addAscendingOrderByColumn( 'name' );
+                $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'setup/wsrTaskCase', $c );
+        } else
+
+        if (is_object( $result )) {
+            $_SESSION['WS_SESSION_ID'] = '';
+            $fields['status_code'] = $result->status_code;
+            $fields['message'] = $result->message;
+            $fields['time_stamp'] = date( "Y-m-d H:i:s" );
+            $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
+        }
+
+        G::RenderPage( 'publish', 'raw' );
+        break;
+            case "wsSendFiles":
+
+
+        if (isset( $_FILES['form'] )) {
+            foreach ($_FILES['form']['name'] as $sFieldName => $vValue) {
+                if ($_FILES['form']['error'][$sFieldName] == 0) {
+                    file_put_contents( G::sys_get_temp_dir() . PATH_SEP . $_FILES['form']['name'][$sFieldName], file_get_contents( $_FILES['form']['tmp_name'][$sFieldName] ) );
+                    $filename = G::sys_get_temp_dir() . PATH_SEP . $_FILES['form']['name'][$sFieldName];
+                }
+            }
+        }
+
+        //                              G::pr ( $_SESSION );
+        if (! isset( $_POST['form']['INPUT_DOCUMENT'] )) {
+            $_POST['form']['INPUT_DOCUMENT'] = '';
+        }
+
+        if (isset( $_SESSION['_DBArray']['inputDocument'] )) {
+            foreach ($_SESSION['_DBArray']['inputDocument'] as $inputDocument) {
+                if ($inputDocument['guid'] == $_POST['form']['INPUT_DOCUMENT']) {
+                    $doc_uid = $inputDocument['docId'];
+                }
+            }
+        } else {
+            $doc_uid = "default";
+        }
+        if (! isset( $_SESSION['_DBArray']['WS_TMP_CASE_UID'] )) {
+            $_SESSION['_DBArray']['WS_TMP_CASE_UID'] = '';
+        }
+        $usr_uid = $_SESSION['USER_LOGGED'];
+        $app_uid = $_SESSION['_DBArray']['WS_TMP_CASE_UID'];
+        $del_index = 1;
+
+        function sendFile ($FILENAME, $USR_UID, $APP_UID, $DEL_INDEX = 1, $DOC_UID = null, $title = null, $comment = null)
+        {
+            $defaultEndpoint = 'http://' . $_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT'] . '/sys' . SYS_SYS . '/' . SYS_LANG . '/classic/services/upload';
+            $upload = isset( $_SESSION['END_POINT'] ) ? $_SESSION['END_POINT'] : $defaultEndpoint;
+
+            $DOC_UID = ($DOC_UID != null) ? $DOC_UID : - 1;
+            $APP_DOC_TYPE = ($DOC_UID == - 1) ? 'ATTACHED' : 'INPUT';
+            $title = ($title != null) ? $title : $FILENAME;
+            $comment = ($comment != null) ? $comment : '';
+
+            $params = array ('ATTACH_FILE' => "@$FILENAME",'APPLICATION' => $APP_UID,'INDEX' => $DEL_INDEX,'USR_UID' => $USR_UID,'DOC_UID' => $DOC_UID,'APP_DOC_TYPE' => $APP_DOC_TYPE,'TITLE' => $title,'COMMENT' => $comment
+            );
+
+            $ch = curl_init();
+            curl_setopt( $ch, CURLOPT_URL, $defaultEndpoint );
+            //curl_setopt($ch, CURLOPT_VERBOSE, 1);
+            curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 );
+            curl_setopt( $ch, CURLOPT_POST, 1 );
+            curl_setopt( $ch, CURLOPT_POSTFIELDS, $params );
+            $response = curl_exec( $ch );
+            curl_close( $ch );
+            return $response;
+        }
+
+        $fields['status_code'] = 0;
+        $fields['time_stamp'] = date( "Y-m-d H:i:s" );
+        if ($_POST['form']['UPLOAD_OPTION'] == '1') {
+            // G::pr($doc_uid);
+            $fields['message'] = sendFile( $filename, $usr_uid, $app_uid, 1, $doc_uid );
+
+        } else {
+            $fields['message'] = sendFile( $filename, $usr_uid, $app_uid );
+        }
+        $G_PUBLISH = new Publisher();
+        $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'setup/wsShowResult', null, $fields );
+        G::RenderPage( 'publish', 'blank' );
+        die();
+        break;
+        default:
+
+
+        print_r( $_POST );
+    }
+}
+
+
+    global $_DBArray;
+
+} catch (Exception $e) {
+    $G_PUBLISH = new Publisher();
+    $aMessage['MESSAGE'] = $e->getMessage();
+    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', $aMessage );
+    G::RenderPage( 'publish', 'raw' );
 }
 
diff --git a/workflow/engine/methods/setup/webServicesList.php b/workflow/engine/methods/setup/webServicesList.php
index 665b34163..652f8188a 100755
--- a/workflow/engine/methods/setup/webServicesList.php
+++ b/workflow/engine/methods/setup/webServicesList.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * webServicesList.php
- *  
+ *
  * ProcessMaker Open Source Edition
  * Copyright (C) 2004 - 2008 Colosa Inc.23
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
@@ -12,25 +12,25 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd., 
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- * 
  */
-if($RBAC->userCanAccess('PM_SETUP') != 1 && $RBAC->userCanAccess('PM_FACTORY') != 1){	
-  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-  //G::header('location: ../login/login');
-  die;
+if ($RBAC->userCanAccess( 'PM_SETUP' ) != 1 && $RBAC->userCanAccess( 'PM_FACTORY' ) != 1) {
+    G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+    //G::header('location: ../login/login');
+    die();
 }
-  
-  //G::genericForceLogin( 'WF_MYINFO' , 'login/noViewPage', $urlLogin = 'login/login' );
 
-  $G_PUBLISH = new Publisher;
-  $G_PUBLISH->AddContent('view', 'setup/webServicesTree' );
-  G::RenderPage( "publish-raw" , "raw" );  
-?>
+//G::genericForceLogin( 'WF_MYINFO' , 'login/noViewPage', $urlLogin = 'login/login' );
+
+
+$G_PUBLISH = new Publisher();
+$G_PUBLISH->AddContent( 'view', 'setup/webServicesTree' );
+G::RenderPage( "publish-raw", "raw" );
+
diff --git a/workflow/engine/methods/setup/webServicesSetup.php b/workflow/engine/methods/setup/webServicesSetup.php
index 36cc27741..ba3426e42 100755
--- a/workflow/engine/methods/setup/webServicesSetup.php
+++ b/workflow/engine/methods/setup/webServicesSetup.php
@@ -12,52 +12,52 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
  */
-if (($RBAC_Response=$RBAC->userCanAccess("PM_FACTORY"))!=1) return $RBAC_Response;
+if (($RBAC_Response = $RBAC->userCanAccess( "PM_FACTORY" )) != 1)
+    return $RBAC_Response;
 
-  G::LoadClass('groups');
+G::LoadClass( 'groups' );
 
-  $dbc = new DBConnection();
-  $ses = new DBSession($dbc);
+$dbc = new DBConnection();
+$ses = new DBSession( $dbc );
 
-  if (!isset($_SESSION['END_POINT'])) {
-    $aFields['WS_HOST']	= $_SERVER['HTTP_HOST'];
-	  $aFields['WS_WORKSPACE'] = SYS_SYS;
-  }
-  else {
-    if (strpos($_SESSION['END_POINT'], 'https') !== false) {
-      preg_match('@^(?:https://)?([^/]+)@i', $_SESSION['END_POINT'], $coincidencias);
+if (! isset( $_SESSION['END_POINT'] )) {
+    $aFields['WS_HOST'] = $_SERVER['HTTP_HOST'];
+    $aFields['WS_WORKSPACE'] = SYS_SYS;
+} else {
+    if (strpos( $_SESSION['END_POINT'], 'https' ) !== false) {
+        preg_match( '@^(?:https://)?([^/]+)@i', $_SESSION['END_POINT'], $coincidencias );
+    } else {
+        preg_match( '@^(?:http://)?([^/]+)@i', $_SESSION['END_POINT'], $coincidencias );
     }
-    else {
-      preg_match('@^(?:http://)?([^/]+)@i', $_SESSION['END_POINT'], $coincidencias);
-    }
-    $aAux = explode(':', $coincidencias[1]);
-    $aFields['WS_HOST']	= $aAux[0];
-    $aFields['WS_PORT'] = (isset($aAux[1]) ? $aAux[1] : '');
-    $aAux = explode($aAux[0] . (isset($aAux[1]) ? ':' . $aAux[1] : ''), $_SESSION['END_POINT']);
-    $aAux = explode('/', $aAux[1]);
-    $aFields['WS_WORKSPACE'] = substr($aAux[1], 3);
-  }
+    $aAux = explode( ':', $coincidencias[1] );
+    $aFields['WS_HOST'] = $aAux[0];
+    $aFields['WS_PORT'] = (isset( $aAux[1] ) ? $aAux[1] : '');
+    $aAux = explode( $aAux[0] . (isset( $aAux[1] ) ? ':' . $aAux[1] : ''), $_SESSION['END_POINT'] );
+    $aAux = explode( '/', $aAux[1] );
+    $aFields['WS_WORKSPACE'] = substr( $aAux[1], 3 );
+}
 
-$rows[] = array ( 'uid' => 'char', 'name' => 'char', 'age' => 'integer', 'balance' => 'float' );
-$rows[] = array ( 'uid' => 'http', 'name' => 'http'  );
-$rows[] = array ( 'uid' => 'https', 'name' => 'https' );
+$rows[] = array ('uid' => 'char','name' => 'char','age' => 'integer','balance' => 'float'
+);
+$rows[] = array ('uid' => 'http','name' => 'http'
+);
+$rows[] = array ('uid' => 'https','name' => 'https'
+);
 
 $_DBArray['protocol'] = $rows;
 $_SESSION['_DBArray'] = $_DBArray;
 
-  $G_PUBLISH = new Publisher();
-  $G_PUBLISH->AddContent('xmlform', 'xmlform', 'setup/webServicesSetup', '', $aFields , 'webServicesSetupSave');
+$G_PUBLISH = new Publisher();
+$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'setup/webServicesSetup', '', $aFields, 'webServicesSetupSave' );
 
-  G::RenderPage( "publish" , "raw" );
+G::RenderPage( "publish", "raw" );
 
-?>
\ No newline at end of file
diff --git a/workflow/engine/methods/setup/webServicesSetupSave.php b/workflow/engine/methods/setup/webServicesSetupSave.php
index 7e0cbf0c7..c7cf800fe 100755
--- a/workflow/engine/methods/setup/webServicesSetupSave.php
+++ b/workflow/engine/methods/setup/webServicesSetupSave.php
@@ -1,22 +1,16 @@
 <?php
-unset($_SESSION['WS_SESSION_ID']);
+unset( $_SESSION['WS_SESSION_ID'] );
 
-if($_POST['form']['WS_PROTOCOL']!='' && $_POST['form']['WS_WORKSPACE']!='')
-  {
-  	if($_POST['form']['WS_PORT']!='')
-  	{
-  			$_SESSION['END_POINT']=$_POST['form']['WS_PROTOCOL'].'://' .$_POST['form']['WS_HOST'] . ':' .$_POST['form']['WS_PORT'] .'/sys' .$_POST['form']['WS_WORKSPACE'].'/en/classic/services/wsdl2';
-  			G::header('location: webServices?x=1');
-  	}
-  	else
-  	{		$_SESSION['END_POINT']=$_POST['form']['WS_PROTOCOL'].'://' .$_POST['form']['WS_HOST'] .'/sys' .$_POST['form']['WS_WORKSPACE'].'/en/classic/services/wsdl2';
-  			G::header('location: webServices?x=1');
-  	}
-  	$_SESSION['WS_WORKSPACE']=$_POST['form']['WS_WORKSPACE'];
-  }
-else
-  {
-		G::header('location: webServices?x=0');
-  }
+if ($_POST['form']['WS_PROTOCOL'] != '' && $_POST['form']['WS_WORKSPACE'] != '') {
+    if ($_POST['form']['WS_PORT'] != '') {
+        $_SESSION['END_POINT'] = $_POST['form']['WS_PROTOCOL'] . '://' . $_POST['form']['WS_HOST'] . ':' . $_POST['form']['WS_PORT'] . '/sys' . $_POST['form']['WS_WORKSPACE'] . '/en/classic/services/wsdl2';
+        G::header( 'location: webServices?x=1' );
+    } else {
+        $_SESSION['END_POINT'] = $_POST['form']['WS_PROTOCOL'] . '://' . $_POST['form']['WS_HOST'] . '/sys' . $_POST['form']['WS_WORKSPACE'] . '/en/classic/services/wsdl2';
+        G::header( 'location: webServices?x=1' );
+    }
+    $_SESSION['WS_WORKSPACE'] = $_POST['form']['WS_WORKSPACE'];
+} else {
+    G::header( 'location: webServices?x=0' );
+}
 
-?>
\ No newline at end of file
diff --git a/workflow/engine/methods/setup/weekend.php b/workflow/engine/methods/setup/weekend.php
index 1c2599273..4f1de3a69 100755
--- a/workflow/engine/methods/setup/weekend.php
+++ b/workflow/engine/methods/setup/weekend.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * weekend.php
- *  
+ *
  * ProcessMaker Open Source Edition
  * Copyright (C) 2004 - 2008 Colosa Inc.23
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
@@ -12,40 +12,43 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd., 
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- * 
  */
-if (($RBAC_Response=$RBAC->userCanAccess("PM_SETUP"))!=1) return $RBAC_Response;
-G::LoadInclude('ajax');
+if (($RBAC_Response = $RBAC->userCanAccess( "PM_SETUP" )) != 1)
+    return $RBAC_Response;
+G::LoadInclude( 'ajax' );
 
-	$G_ENABLE_BLANK_SKIN = true;
+$G_ENABLE_BLANK_SKIN = true;
 
-$ARR_WEEKDAYS[0] = array('SUNDAY', 'MONDAY', 'TUESDAY', 'WEDNESDAY', 'THURSDAY', 'FRIDAY', 'SATURDAY');
-$ARR_WEEKDAYS['es'] = array("Domingo?", "Lunes?", "Martes?", "Miércoles?", "Jueves?", "Viernes?", "Sábado?");
-$ARR_WEEKDAYS['en'] = array("Sunday?", "Monday?", "Tuesday?", "Wednesday?", "Thursday?", "Friday?", "Saturday?");
-$ARR_WEEKDAYS['fa'] = array('یکشنبه','دوشنبه','سه شنبه','چهارشنبه','پنجشنبه ','جمعه','آدینه');
+$ARR_WEEKDAYS[0] = array ('SUNDAY','MONDAY','TUESDAY','WEDNESDAY','THURSDAY','FRIDAY','SATURDAY'
+);
+$ARR_WEEKDAYS['es'] = array ("Domingo?","Lunes?","Martes?","Miércoles?","Jueves?","Viernes?","Sábado?"
+);
+$ARR_WEEKDAYS['en'] = array ("Sunday?","Monday?","Tuesday?","Wednesday?","Thursday?","Friday?","Saturday?"
+);
+$ARR_WEEKDAYS['fa'] = array ('یکشنبه','دوشنبه','سه شنبه','چهارشنبه','پنجشنبه ','جمعه','آدینه'
+);
 
-$dbc = new DBConnection;
-$ses = new DBSession($dbc);
+$dbc = new DBConnection();
+$ses = new DBSession( $dbc );
 
-$holidays=$ses->execute( "SELECT LEX_VALUE FROM LEXICO WHERE LEX_TOPIC ='NOWORKINGDAY' ");
+$holidays = $ses->execute( "SELECT LEX_VALUE FROM LEXICO WHERE LEX_TOPIC ='NOWORKINGDAY' " );
 
-$config=array();
-for($id=0;$id<7;$id++)
-{
-	$res=$ses->execute(" SELECT * FROM LEXICO WHERE LEX_KEY = '".$ARR_WEEKDAYS[0][$id]."' AND LEX_TOPIC ='HOLIDAY' ");
-	$res=$res->read();
-	$config[$ARR_WEEKDAYS[0][$id]]=$res['LEX_VALUE'];
+$config = array ();
+for ($id = 0; $id < 7; $id ++) {
+    $res = $ses->execute( " SELECT * FROM LEXICO WHERE LEX_KEY = '" . $ARR_WEEKDAYS[0][$id] . "' AND LEX_TOPIC ='HOLIDAY' " );
+    $res = $res->read();
+    $config[$ARR_WEEKDAYS[0][$id]] = $res['LEX_VALUE'];
 }
-$G_PUBLISH = new Publisher;
-$G_PUBLISH->AddContent('xmlform', 'xmlform', 'setup/weekend', '',$config ,'' );
+$G_PUBLISH = new Publisher();
+$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'setup/weekend', '', $config, '' );
 G::RenderPage( 'publish' );
 ?>
 <script language="JavaScript">
@@ -77,14 +80,14 @@ function on_submit(myForm)
 }
 function ajax_function(ajax_server, funcion, parameters)
 {
-    objetus = get_xmlhttp();    
+    objetus = get_xmlhttp();
     var response;
     try
     {
     	if (parameters) parameters = '&' + encodeURI(parameters);
-    	objetus.open("GET", ajax_server + "?function=" + funcion + parameters, false); 
+    	objetus.open("GET", ajax_server + "?function=" + funcion + parameters, false);
   	}catch(ss)
-  	{  	
+  	{
   		alert("error"+ss.message);
   	}
     objetus.send(null);
diff --git a/workflow/engine/methods/setup/weekendAjax.php b/workflow/engine/methods/setup/weekendAjax.php
index 7f384f6fd..b9eca81ee 100755
--- a/workflow/engine/methods/setup/weekendAjax.php
+++ b/workflow/engine/methods/setup/weekendAjax.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * weekendAjax.php
- *  
+ *
  * ProcessMaker Open Source Edition
  * Copyright (C) 2004 - 2008 Colosa Inc.23
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
@@ -12,19 +12,19 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd., 
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- * 
  */
-if (($RBAC_Response=$RBAC->userCanAccess("PM_SETUP"))!=1) return $RBAC_Response;
+if (($RBAC_Response = $RBAC->userCanAccess( "PM_SETUP" )) != 1)
+    return $RBAC_Response;
 G::ForceLogin( 'WF_PROCESS' );
-G::LoadInclude('ajax');
+G::LoadInclude( 'ajax' );
 
 $G_HELP_PAGE = "setup-environment-time-controls-weekend";
 
@@ -36,35 +36,37 @@ $G_ID_MENU_SELECTED = "SETUP";
 $G_ID_SUB_MENU_SELECTED = "ENVIRONMENT";
 $G_ID_THIRD_MENU_SELECTED = "WEEKEND";
 
-$dbc = new DBConnection;
-$ses = new DBSession($dbc);
+$dbc = new DBConnection();
+$ses = new DBSession( $dbc );
 
-$holidays=$ses->execute('SELECT LEX_VALUE FROM LEXICO WHERE LEX_TOPIC ="HOLIDAY"');
+$holidays = $ses->execute( 'SELECT LEX_VALUE FROM LEXICO WHERE LEX_TOPIC ="HOLIDAY"' );
 
-$funcion=strtolower(get_ajax_value('function'));
-$funcions=get_defined_functions();
-if (in_array($funcion,$funcions['user'])) eval($funcion.'();');
+$funcion = strtolower( get_ajax_value( 'function' ) );
+$funcions = get_defined_functions();
+if (in_array( $funcion, $funcions['user'] ))
+    eval( $funcion . '();' );
 
-function setDays()
+function setDays ()
 {
-	$days=get_ajax_value('days');
-	$values=get_ajax_value('values');
-	$days=explode(',',$days);
-	$values=explode(',',$values);
-	for($r=1;$r<sizeof($days);$r++)
-		setDay($days[$r],$values[$r]);
+    $days = get_ajax_value( 'days' );
+    $values = get_ajax_value( 'values' );
+    $days = explode( ',', $days );
+    $values = explode( ',', $values );
+    for ($r = 1; $r < sizeof( $days ); $r ++)
+        setDay( $days[$r], $values[$r] );
 }
-function setDay($day,$dayValue)
+
+function setDay ($day, $dayValue)
 {
-	global $ses;
-	$dayValue = (strcasecmp($dayValue,'true')==0)?1:0;
-	$res=$ses->execute(" SELECT * FROM LEXICO WHERE LEX_KEY = '$day' AND LEX_TOPIC ='HOLIDAY' ");
-	if ($res->count()==0)
-		$res=$ses->execute(" INSERT INTO LEXICO (LEX_TOPIC, LEX_KEY, LEX_VALUE) VALUES ('HOLIDAY', '$day', $dayValue) ");
-	else
-		$res=$ses->execute(" UPDATE LEXICO SET LEX_VALUE = $dayValue WHERE LEX_KEY = '$day' AND LEX_TOPIC ='HOLIDAY' ");
-	$res=$ses->execute(" SELECT * FROM LEXICO WHERE LEX_KEY = '$day' AND LEX_TOPIC ='HOLIDAY' ");
-	$res=$res->read();
-	echo ($res['LEX_VALUE']=='1')?'true':'false';
+    global $ses;
+    $dayValue = (strcasecmp( $dayValue, 'true' ) == 0) ? 1 : 0;
+    $res = $ses->execute( " SELECT * FROM LEXICO WHERE LEX_KEY = '$day' AND LEX_TOPIC ='HOLIDAY' " );
+    if ($res->count() == 0)
+        $res = $ses->execute( " INSERT INTO LEXICO (LEX_TOPIC, LEX_KEY, LEX_VALUE) VALUES ('HOLIDAY', '$day', $dayValue) " );
+    else
+        $res = $ses->execute( " UPDATE LEXICO SET LEX_VALUE = $dayValue WHERE LEX_KEY = '$day' AND LEX_TOPIC ='HOLIDAY' " );
+    $res = $ses->execute( " SELECT * FROM LEXICO WHERE LEX_KEY = '$day' AND LEX_TOPIC ='HOLIDAY' " );
+    $res = $res->read();
+    echo ($res['LEX_VALUE'] == '1') ? 'true' : 'false';
 }
-?>
\ No newline at end of file
+
diff --git a/workflow/engine/methods/setup/workPeriod.js b/workflow/engine/methods/setup/workPeriod.js
index e0f6f0711..c8a8d11a2 100755
--- a/workflow/engine/methods/setup/workPeriod.js
+++ b/workflow/engine/methods/setup/workPeriod.js
@@ -1,20 +1,16 @@
+function abc(panel, txt) {
+    /*
+     * commonDialog ( '', 'saved' , 'saved', {}, '' ) ; setTimeout (
+     * leimnud.closure({instance:myDialog,method:function(panel){
+     *
+     * myDialog.remove(); panel.tabLastSelected=false; panel.tabSelected=1;
+     * panel.makeTab(); },args:panel}) , 1000 );
+     */
+    var img = document.getElementById('workPeriodGraph');
+    img.src = 'workPeriodGraph?b=' + Math.random();
 
-function abc( panel, txt ) {
-/*  commonDialog ( '', 'saved' , 'saved', {}, '' )  ;
-  setTimeout ( leimnud.closure({instance:myDialog,method:function(panel){
-  	
-  	myDialog.remove();
-  	panel.tabLastSelected=false;
-  	panel.tabSelected=1;
-  	panel.makeTab();  
-  },args:panel}) , 1000 );
-*/
-		var img = document.getElementById( 'workPeriodGraph' );
-		img.src = 'workPeriodGraph?b=' + Math.random() ;
-
-//  panel.clearContent();
-//  panel.addContent ( txt );  
-  return false;
+    // panel.clearContent();
+    // panel.addContent ( txt );
+    return false;
 }
 
-  	
\ No newline at end of file
diff --git a/workflow/engine/methods/setup/workPeriod.php b/workflow/engine/methods/setup/workPeriod.php
index 6d1bc7967..db5679318 100755
--- a/workflow/engine/methods/setup/workPeriod.php
+++ b/workflow/engine/methods/setup/workPeriod.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * workPeriod.php
- *  
+ *
  * ProcessMaker Open Source Edition
  * Copyright (C) 2004 - 2008 Colosa Inc.23
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
@@ -12,38 +12,38 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd., 
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- * 
  */
-if (($RBAC_Response=$RBAC->userCanAccess("PM_SETUP"))!=1) return $RBAC_Response;
-	$G_ENABLE_BLANK_SKIN = true;
+if (($RBAC_Response = $RBAC->userCanAccess( "PM_SETUP" )) != 1)
+    return $RBAC_Response;
+$G_ENABLE_BLANK_SKIN = true;
 
-	G::LoadClass( "workPeriod" );
+G::LoadClass( "workPeriod" );
 
-	$dbc = new DBConnection;
-	$ses = new DBSession( $dbc );
-	$obj = new workPeriod( $dbc );
-	
-	$row = $obj->Load ();
+$dbc = new DBConnection();
+$ses = new DBSession( $dbc );
+$obj = new workPeriod( $dbc );
 
-	$row['SUNDAY']    = $row['noWorkingDays'][0];
-	$row['MONDAY']    = $row['noWorkingDays'][1];
-	$row['TUESDAY']   = $row['noWorkingDays'][2];
-	$row['WEDNESDAY'] = $row['noWorkingDays'][3];
-	$row['THURSDAY']  = $row['noWorkingDays'][4];
-	$row['FRIDAY']    = $row['noWorkingDays'][5];
-	$row['SATURDAY']  = $row['noWorkingDays'][6];
+$row = $obj->Load();
 
-  $G_PUBLISH = new Publisher;
-  $G_PUBLISH->AddContent( "image", "image", "workPeriodGraph" );
-  $G_PUBLISH->AddContent( "xmlform", "xmlform", "setup/workPeriod","", $row , "workPeriodSave" );
+$row['SUNDAY'] = $row['noWorkingDays'][0];
+$row['MONDAY'] = $row['noWorkingDays'][1];
+$row['TUESDAY'] = $row['noWorkingDays'][2];
+$row['WEDNESDAY'] = $row['noWorkingDays'][3];
+$row['THURSDAY'] = $row['noWorkingDays'][4];
+$row['FRIDAY'] = $row['noWorkingDays'][5];
+$row['SATURDAY'] = $row['noWorkingDays'][6];
+
+$G_PUBLISH = new Publisher();
+$G_PUBLISH->AddContent( "image", "image", "workPeriodGraph" );
+$G_PUBLISH->AddContent( "xmlform", "xmlform", "setup/workPeriod", "", $row, "workPeriodSave" );
+
+G::RenderPage( 'publish' );
 
-  G::RenderPage( 'publish' );
-?>
\ No newline at end of file
diff --git a/workflow/engine/methods/setup/workPeriodGraph.php b/workflow/engine/methods/setup/workPeriodGraph.php
index dda6f9596..2a7e6eef4 100755
--- a/workflow/engine/methods/setup/workPeriodGraph.php
+++ b/workflow/engine/methods/setup/workPeriodGraph.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * workPeriodGraph.php
- *  
+ *
  * ProcessMaker Open Source Edition
  * Copyright (C) 2004 - 2008 Colosa Inc.23
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
@@ -12,91 +12,93 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd., 
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- * 
  */
-if (($RBAC_Response=$RBAC->userCanAccess("PM_SETUP"))!=1) return $RBAC_Response;
-  Header("Content-type: image/jpeg");
+if (($RBAC_Response = $RBAC->userCanAccess( "PM_SETUP" )) != 1)
+    return $RBAC_Response;
+Header( "Content-type: image/jpeg" );
 
-	G::LoadClass( "workPeriod" );
+G::LoadClass( "workPeriod" );
 
-	$dbc = new DBConnection;
-	$ses = new DBSession( $dbc );
-	$obj = new workPeriod( $dbc );
-	
-	$row = $obj->Load ();
+$dbc = new DBConnection();
+$ses = new DBSession( $dbc );
+$obj = new workPeriod( $dbc );
 
-	$initPeriod1     = $row['initPeriod1']/ 60;
-	$endPeriod1      = $row['endPeriod1'] / 60;
-	$initPeriod2     = $row['initPeriod2']/ 60;
-	$endPeriod2      = $row['endPeriod2'] / 60;
-	$noWorkingDays   = $row['noWorkingDays'];
+$row = $obj->Load();
 
-  $cant = 7;
+$initPeriod1 = $row['initPeriod1'] / 60;
+$endPeriod1 = $row['endPeriod1'] / 60;
+$initPeriod2 = $row['initPeriod2'] / 60;
+$endPeriod2 = $row['endPeriod2'] / 60;
+$noWorkingDays = $row['noWorkingDays'];
 
-  $w = 660;
-  $h = $cant*18 + 20;
-  $im= ImageCreate($w, $h);
-  $width = $w;
-  $height = $h;
-  $center_x = intval($width / 2);
-  $center_y = intval($height / 2);
- 
-  $bgcolor = ImageColorAllocate($im, 250, 250, 255);
-  $plomo   = ImageColorAllocate($im, 220, 220, 220);
-  $orange  = ImageColorAllocate($im, 255, 64, 64);
-  $gris    = ImageColorAllocate($im, 150, 150, 155);
-  $white   = ImageColorAllocate($im, 255, 255, 255);
-  $red     = ImageColorAllocate($im, 255, 0, 0);
-  $brown   = ImageColorAllocate($im, 160, 80, 0);
-  $black   = ImageColorAllocate($im,   0,0,0);
-  ImageFilledRectangle($im, 0, 0, $width-1, $height-1, $bgcolor);
-  ImageRectangle      ($im, 0, 0, $width-1, $height-1, $black);
+$cant = 7;
 
+$w = 660;
+$h = $cant * 18 + 20;
+$im = ImageCreate( $w, $h );
+$width = $w;
+$height = $h;
+$center_x = intval( $width / 2 );
+$center_y = intval( $height / 2 );
 
-  $x = 10; $y = 20;
-  $x1 = 78;
-  $x2 = $x1 + 2*6;
+$bgcolor = ImageColorAllocate( $im, 250, 250, 255 );
+$plomo = ImageColorAllocate( $im, 220, 220, 220 );
+$orange = ImageColorAllocate( $im, 255, 64, 64 );
+$gris = ImageColorAllocate( $im, 150, 150, 155 );
+$white = ImageColorAllocate( $im, 255, 255, 255 );
+$red = ImageColorAllocate( $im, 255, 0, 0 );
+$brown = ImageColorAllocate( $im, 160, 80, 0 );
+$black = ImageColorAllocate( $im, 0, 0, 0 );
+ImageFilledRectangle( $im, 0, 0, $width - 1, $height - 1, $bgcolor );
+ImageRectangle( $im, 0, 0, $width - 1, $height - 1, $black );
 
-  $weekday[0] = 'Sunday'; 
-  $weekday[1] = 'Monday'; 
-  $weekday[2] = 'Tuesday'; 
-  $weekday[3] = 'Wednesday'; 
-  $weekday[4] = 'Thursday'; 
-  $weekday[5] = 'Friday'; 
-  $weekday[6] = 'Saturday'; 
- 
-  for ( $day = 0; $day < count ($weekday ); $day ++ ) {
-    ImageString($im, 2, $x, $y, $weekday[$day], $black);
-    for ($i = 0; $i < 24*6; $i++) {
-      ImageRectangle($im, $x1+$i* 4, $y, $x1+ ($i+1)*4, $y+12, $plomo );
-    	  if ( $i >= $initPeriod1 * 6 && $i < $endPeriod2 * 6 && ( $i < $endPeriod1 * 6 || $i >= $initPeriod2 * 6 ) ) 
-    	    $color = $orange;
-    	  else
-    	    $color = $white; 
-			if ( isset ( $noWorkingDays[ $day ]) && $noWorkingDays[ $day ] ) $color = $white;
- 	    ImageFillToBorder($im, $x1+$i*4+1, $y+1, $plomo, $color );
+$x = 10;
+$y = 20;
+$x1 = 78;
+$x2 = $x1 + 2 * 6;
+
+$weekday[0] = 'Sunday';
+$weekday[1] = 'Monday';
+$weekday[2] = 'Tuesday';
+$weekday[3] = 'Wednesday';
+$weekday[4] = 'Thursday';
+$weekday[5] = 'Friday';
+$weekday[6] = 'Saturday';
+
+for ($day = 0; $day < count( $weekday ); $day ++) {
+    ImageString( $im, 2, $x, $y, $weekday[$day], $black );
+    for ($i = 0; $i < 24 * 6; $i ++) {
+        ImageRectangle( $im, $x1 + $i * 4, $y, $x1 + ($i + 1) * 4, $y + 12, $plomo );
+        if ($i >= $initPeriod1 * 6 && $i < $endPeriod2 * 6 && ($i < $endPeriod1 * 6 || $i >= $initPeriod2 * 6))
+            $color = $orange;
+        else
+            $color = $white;
+        if (isset( $noWorkingDays[$day] ) && $noWorkingDays[$day])
+            $color = $white;
+        ImageFillToBorder( $im, $x1 + $i * 4 + 1, $y + 1, $plomo, $color );
     }
 
-    $y+=18;
-  }
+    $y += 18;
+}
 
-  $y = 20;  
-  for ($i = 0; $i <= 24; $i++) {
-    ImageLine($im, $x1+$i* 4*6, $y-5,    $x1+ $i*4*6, $y-5+18*$cant, $gris);
-  	if ( $i < 24 ) {
-      ImageLine($im, $x2+$i* 4*6, $y-5,    $x2+ $i*4*6, $y-5+18*$cant, $plomo);
-      ImageString($im, 1, $x1+$i* 4*6, $y-10, $i, $black);
+$y = 20;
+for ($i = 0; $i <= 24; $i ++) {
+    ImageLine( $im, $x1 + $i * 4 * 6, $y - 5, $x1 + $i * 4 * 6, $y - 5 + 18 * $cant, $gris );
+    if ($i < 24) {
+        ImageLine( $im, $x2 + $i * 4 * 6, $y - 5, $x2 + $i * 4 * 6, $y - 5 + 18 * $cant, $plomo );
+        ImageString( $im, 1, $x1 + $i * 4 * 6, $y - 10, $i, $black );
     }
-  }
-      //ImageString($im, 2, 5, 5, $initPeriod1*6 . ", $endPeriod1, $initPeriod2, $endPeriod2 ", $black);
+}
+//ImageString($im, 2, 5, 5, $initPeriod1*6 . ", $endPeriod1, $initPeriod2, $endPeriod2 ", $black);
+
+
+ImageJpeg( $im );
 
-  ImageJpeg($im);
-?>
\ No newline at end of file
diff --git a/workflow/engine/methods/setup/workPeriodSave.php b/workflow/engine/methods/setup/workPeriodSave.php
index cdf27dc58..611aa0307 100755
--- a/workflow/engine/methods/setup/workPeriodSave.php
+++ b/workflow/engine/methods/setup/workPeriodSave.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * workPeriodSave.php
- *  
+ *
  * ProcessMaker Open Source Edition
  * Copyright (C) 2004 - 2008 Colosa Inc.23
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
@@ -12,32 +12,32 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd., 
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- * 
  */
-if (($RBAC_Response=$RBAC->userCanAccess("PM_SETUP"))!=1) return $RBAC_Response;
-	G::LoadClass( "workPeriod" );
+if (($RBAC_Response = $RBAC->userCanAccess( "PM_SETUP" )) != 1)
+    return $RBAC_Response;
+G::LoadClass( "workPeriod" );
 
-  $frm = $_POST['form'];  
-	$noWorkingDays[0] = isset ( $frm['SUNDAY']   ) && $frm['SUNDAY']    != '';
-	$noWorkingDays[1] = isset ( $frm['MONDAY']   ) && $frm['MONDAY']    != '';
-	$noWorkingDays[2] = isset ( $frm['TUESDAY']  ) && $frm['TUESDAY']   != '';
-	$noWorkingDays[3] = isset ( $frm['WEDNESDAY']) && $frm['WEDNESDAY'] != '';
-	$noWorkingDays[4] = isset ( $frm['THURSDAY'] ) && $frm['THURSDAY']  != '';
-	$noWorkingDays[5] = isset ( $frm['FRIDAY']   ) && $frm['FRIDAY']    != '';
-	$noWorkingDays[6] = isset ( $frm['SATURDAY'] ) && $frm['SATURDAY']  != '';
+$frm = $_POST['form'];
+$noWorkingDays[0] = isset( $frm['SUNDAY'] ) && $frm['SUNDAY'] != '';
+$noWorkingDays[1] = isset( $frm['MONDAY'] ) && $frm['MONDAY'] != '';
+$noWorkingDays[2] = isset( $frm['TUESDAY'] ) && $frm['TUESDAY'] != '';
+$noWorkingDays[3] = isset( $frm['WEDNESDAY'] ) && $frm['WEDNESDAY'] != '';
+$noWorkingDays[4] = isset( $frm['THURSDAY'] ) && $frm['THURSDAY'] != '';
+$noWorkingDays[5] = isset( $frm['FRIDAY'] ) && $frm['FRIDAY'] != '';
+$noWorkingDays[6] = isset( $frm['SATURDAY'] ) && $frm['SATURDAY'] != '';
+
+$dbc = new DBConnection();
+$obj = new workPeriod( $dbc );
+$obj->Save( $frm['initPeriod1'], $frm['endPeriod1'], $frm['initPeriod2'], $frm['endPeriod2'], $noWorkingDays );
+
+print "ok";
+die();
 
-  $dbc = new DBConnection();
-	$obj = new workPeriod( $dbc );
-	$obj->Save ( $frm['initPeriod1'], $frm['endPeriod1'], $frm['initPeriod2'], $frm['endPeriod2'], $noWorkingDays ); 
-	
-  print "ok";
-  die;
-?>
\ No newline at end of file

From 35225d9e7b8639cc7712925f8c158772488ea399 Mon Sep 17 00:00:00 2001
From: jennylee <jennylee@colosa.com>
Date: Wed, 17 Oct 2012 17:36:05 -0400
Subject: [PATCH 2/4] CODE STYLE, workflow/engine/methods/steps/

FILES:
conditions_Edit.php
conditions_Save.php
steps_Ajax.php
steps_Delete.php
steps_Down.php
steps_New.php
steps_Save.php
steps_SupervisorAjax.php
steps_Up.php
---
 .../engine/methods/steps/conditions_Edit.php  |  62 ++--
 .../engine/methods/steps/conditions_Save.php  |  69 ++--
 workflow/engine/methods/steps/steps_Ajax.php  | 303 +++++++++---------
 .../engine/methods/steps/steps_Delete.php     |  63 ++--
 workflow/engine/methods/steps/steps_Down.php  |  61 ++--
 workflow/engine/methods/steps/steps_New.php   |  60 ++--
 workflow/engine/methods/steps/steps_Save.php  |  58 ++--
 .../methods/steps/steps_SupervisorAjax.php    |  86 +++--
 workflow/engine/methods/steps/steps_Up.php    |  61 ++--
 9 files changed, 399 insertions(+), 424 deletions(-)

diff --git a/workflow/engine/methods/steps/conditions_Edit.php b/workflow/engine/methods/steps/conditions_Edit.php
index cf499c796..fdc60c1e7 100755
--- a/workflow/engine/methods/steps/conditions_Edit.php
+++ b/workflow/engine/methods/steps/conditions_Edit.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * conditions_Edit.php
- *  
+ *
  * ProcessMaker Open Source Edition
  * Copyright (C) 2004 - 2008 Colosa Inc.23
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
@@ -12,39 +12,37 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd., 
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- * 
  */
 try {
-	global $RBAC;
-  switch ($RBAC->userCanAccess('PM_FACTORY')) {
-  	case -2:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;
-  	case -1:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;
-  }
-  require_once 'classes/model/Step.php';
-  $oStep     = new Step();
-  $aFields   = $oStep->load($_GET['UID']);
-  G::LoadClass('xmlfield_InputPM');
-  $G_PUBLISH = new Publisher();
-  $G_PUBLISH->AddContent('xmlform', 'xmlform', 'steps/conditions_Edit', '', $aFields, '../steps/conditions_Save');
-  G::RenderPage('publish-raw' , 'raw');
+    global $RBAC;
+    switch ($RBAC->userCanAccess( 'PM_FACTORY' )) {
+        case - 2:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+        case - 1:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+    }
+    require_once 'classes/model/Step.php';
+    $oStep = new Step();
+    $aFields = $oStep->load( $_GET['UID'] );
+    G::LoadClass( 'xmlfield_InputPM' );
+    $G_PUBLISH = new Publisher();
+    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'steps/conditions_Edit', '', $aFields, '../steps/conditions_Save' );
+    G::RenderPage( 'publish-raw', 'raw' );
+} catch (Exception $oException) {
+    die( $oException->getMessage() );
 }
-catch (Exception $oException) {
-	die($oException->getMessage());
-}
-?>
\ No newline at end of file
+
diff --git a/workflow/engine/methods/steps/conditions_Save.php b/workflow/engine/methods/steps/conditions_Save.php
index 488983d40..343e3a1ef 100755
--- a/workflow/engine/methods/steps/conditions_Save.php
+++ b/workflow/engine/methods/steps/conditions_Save.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * conditions_Save.php
- *  
+ *
  * ProcessMaker Open Source Edition
  * Copyright (C) 2004 - 2008 Colosa Inc.23
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
@@ -12,42 +12,41 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd., 
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- * 
  */
 try {
-	global $RBAC;
-  switch ($RBAC->userCanAccess('PM_FACTORY')) {
-  	case -2:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;
-  	case -1:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;
-  }
-  require_once 'classes/model/Step.php';
-  $oStep = new Step();
-  if(isset ($_POST['form']))
-      $value=$_POST['form'];
-  else
-      $value=$_POST;
-  $oStep->update(array('STEP_UID' => $value['STEP_UID'], 'STEP_CONDITION' => $value['STEP_CONDITION']));
-  G::LoadClass('processMap');
-  $oProcessMap = new ProcessMap();
-  $oProcessMap->getStepsCriteria($value['TAS_UID']);
+    global $RBAC;
+    switch ($RBAC->userCanAccess( 'PM_FACTORY' )) {
+        case - 2:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+        case - 1:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+    }
+    require_once 'classes/model/Step.php';
+    $oStep = new Step();
+    if (isset( $_POST['form'] ))
+        $value = $_POST['form'];
+    else
+        $value = $_POST;
+    $oStep->update( array ('STEP_UID' => $value['STEP_UID'],'STEP_CONDITION' => $value['STEP_CONDITION']
+    ) );
+    G::LoadClass( 'processMap' );
+    $oProcessMap = new ProcessMap();
+    $oProcessMap->getStepsCriteria( $value['TAS_UID'] );
+} catch (Exception $oException) {
+    die( $oException->getMessage() );
 }
-catch (Exception $oException) {
-	die($oException->getMessage());
-}
-?>
\ No newline at end of file
+
diff --git a/workflow/engine/methods/steps/steps_Ajax.php b/workflow/engine/methods/steps/steps_Ajax.php
index 281c399ef..3270bf504 100755
--- a/workflow/engine/methods/steps/steps_Ajax.php
+++ b/workflow/engine/methods/steps/steps_Ajax.php
@@ -12,171 +12,166 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
  */
 try {
-	global $RBAC;
-  switch ($RBAC->userCanAccess('PM_FACTORY'))
-  {
-  	case -2:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;
-  	case -1:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;
-  }
-
-  require_once 'classes/model/StepTrigger.php';
-  require_once 'classes/model/Triggers.php';
-  G::LoadInclude('ajax');
-  if (!empty($_GET)) {
-  	$aData = urldecode_values($_GET);
-  }
-  else {
-  	if (!isset($_POST['form'])) {
-  	  $aData = urldecode_values($_POST);
+    global $RBAC;
+    switch ($RBAC->userCanAccess( 'PM_FACTORY' )) {
+        case - 2:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+        case - 1:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
     }
-    else {
-    	$aData = urldecode_values($_POST['form']);
+
+    require_once 'classes/model/StepTrigger.php';
+    require_once 'classes/model/Triggers.php';
+    G::LoadInclude( 'ajax' );
+    if (! empty( $_GET )) {
+        $aData = urldecode_values( $_GET );
+    } else {
+        if (! isset( $_POST['form'] )) {
+            $aData = urldecode_values( $_POST );
+        } else {
+            $aData = urldecode_values( $_POST['form'] );
+        }
     }
-  }
-  switch ($aData['action']) {
-  	case 'showTriggers':
-  	  G::LoadClass('processMap');
-  	  $oProcessMap = new ProcessMap();
-  	  global $G_PUBLISH;
-    	$G_PUBLISH = new Publisher();
-    	if ($aData['sType'] == 'BEFORE') {
-    	  $G_PUBLISH->AddContent('propeltable', 'paged-table', 'steps/triggersBefore_List', $oProcessMap->getStepTriggersCriteria($aData['sStep'], $_SESSION['TASK'], $aData['sType']), array('STEP' => $aData['sStep']));
-      }
-      else {
-      	$G_PUBLISH->AddContent('propeltable', 'paged-table', 'steps/triggersAfter_List', $oProcessMap->getStepTriggersCriteria($aData['sStep'], $_SESSION['TASK'], $aData['sType']), array('STEP' => $aData['sStep']));
-      }
-      G::RenderPage('publish-twocolumns', 'raw');
-  	break;
-  	case 'availableTriggers':
-  	  $oCriteria = new Criteria('workflow');
-  	  $oCriteria->addSelectColumn('TRI_UID');
-  	  $oCriteria->add(StepTriggerPeer::TAS_UID , $_SESSION['TASK']);
-  	  $oCriteria->add(StepTriggerPeer::STEP_UID, $aData['sStep']);
-  	  $oCriteria->add(StepTriggerPeer::ST_TYPE , $aData['sType']);
-  	  $oDataset = StepTriggerPeer::doSelectRS($oCriteria);
-  	  $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-      $oDataset->next();
-      $sUIDs = "'0'";
-      $aUIDs = array();
-      while ($aRow = $oDataset->getRow()) {
-      	$sUIDs .= ",'" . $aRow['TRI_UID'] . "'";
-      	$aUIDs[] = $aRow['TRI_UID'];
-      	$oDataset->next();
-      }
-      $oCriteria = new Criteria('workflow');
-  	  $oCriteria->addSelectColumn('COUNT(TRI_UID) AS CANTITY');
-  	  $oCriteria->add(TriggersPeer::TRI_UID, $aUIDs, Criteria::NOT_IN);
-  	  $oCriteria->add(TriggersPeer::PRO_UID, $aData['sProcess']);
-  	  $oDataset = TriggersPeer::doSelectRS($oCriteria);
-  	  $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-      $oDataset->next();
-      $aRow = $oDataset->getRow();
-  	  if ((int)$aRow['CANTITY'] > 0) {
-  	  	$aFields['LANG']     = SYS_LANG;
-  	  	$aFields['UIDS']     = $sUIDs;
-  	  	$aFields['PROCESS']  = $aData['sProcess'];
-  	  	$aFields['action']   = 'assignTrigger';
-  	  	$aFields['STEP_UID'] = $aData['sStep'];
-  	  	$aFields['ST_TYPE']  = $aData['sType'];
-  	  	global $G_PUBLISH;
-    	  G::LoadClass('xmlfield_InputPM');
-    	  $G_PUBLISH = new Publisher();
-        $G_PUBLISH->AddContent('xmlform', 'xmlform', 'steps/triggers_Assign', '', $aFields, '../steps/steps_Ajax');
-        G::RenderPage('publish', 'raw');
-  	  }
-  	  else {
-  	  	global $G_PUBLISH;
-    	  $G_PUBLISH = new Publisher();
-        $G_PUBLISH->AddContent('xmlform', 'xmlform', 'steps/triggers_NoAssign', '');
-        G::RenderPage('publish', 'raw');
-  	  }
-  	break;
-  	case 'assignTrigger':
-  	  $aFields      = array('STEP_UID' => $aData['STEP_UID'], 'TAS_UID' => $_SESSION['TASK'], 'TRI_UID' => $aData['TRI_UID'], 'ST_TYPE' => $aData['ST_TYPE']);
-  	  $oStepTrigger = new StepTrigger();
-  	  $oStepTrigger->create($aFields);
-  	  $aFields['ST_CONDITION'] = $aData['ST_CONDITION'];
-  	  $aFields['ST_POSITION']  = ($oStepTrigger->getNextPosition($aData['STEP_UID'], $aData['ST_TYPE']) - 1);
-  	  $oStepTrigger->update($aFields);
-  	break;
-  	case 'editTriggerCondition':
-  	  require_once 'classes/model/Step.php';
-  	  require_once 'classes/model/Triggers.php';
-  	  $oStep = new Step();
+    switch ($aData['action']) {
+        case 'showTriggers':
+            G::LoadClass( 'processMap' );
+            $oProcessMap = new ProcessMap();
+            global $G_PUBLISH;
+            $G_PUBLISH = new Publisher();
+            if ($aData['sType'] == 'BEFORE') {
+                $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'steps/triggersBefore_List', $oProcessMap->getStepTriggersCriteria( $aData['sStep'], $_SESSION['TASK'], $aData['sType'] ), array ('STEP' => $aData['sStep']
+                ) );
+            } else {
+                $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'steps/triggersAfter_List', $oProcessMap->getStepTriggersCriteria( $aData['sStep'], $_SESSION['TASK'], $aData['sType'] ), array ('STEP' => $aData['sStep']
+                ) );
+            }
+            G::RenderPage( 'publish-twocolumns', 'raw' );
+            break;
+        case 'availableTriggers':
+            $oCriteria = new Criteria( 'workflow' );
+            $oCriteria->addSelectColumn( 'TRI_UID' );
+            $oCriteria->add( StepTriggerPeer::TAS_UID, $_SESSION['TASK'] );
+            $oCriteria->add( StepTriggerPeer::STEP_UID, $aData['sStep'] );
+            $oCriteria->add( StepTriggerPeer::ST_TYPE, $aData['sType'] );
+            $oDataset = StepTriggerPeer::doSelectRS( $oCriteria );
+            $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+            $oDataset->next();
+            $sUIDs = "'0'";
+            $aUIDs = array ();
+            while ($aRow = $oDataset->getRow()) {
+                $sUIDs .= ",'" . $aRow['TRI_UID'] . "'";
+                $aUIDs[] = $aRow['TRI_UID'];
+                $oDataset->next();
+            }
+            $oCriteria = new Criteria( 'workflow' );
+            $oCriteria->addSelectColumn( 'COUNT(TRI_UID) AS CANTITY' );
+            $oCriteria->add( TriggersPeer::TRI_UID, $aUIDs, Criteria::NOT_IN );
+            $oCriteria->add( TriggersPeer::PRO_UID, $aData['sProcess'] );
+            $oDataset = TriggersPeer::doSelectRS( $oCriteria );
+            $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+            $oDataset->next();
+            $aRow = $oDataset->getRow();
+            if ((int) $aRow['CANTITY'] > 0) {
+                $aFields['LANG'] = SYS_LANG;
+                $aFields['UIDS'] = $sUIDs;
+                $aFields['PROCESS'] = $aData['sProcess'];
+                $aFields['action'] = 'assignTrigger';
+                $aFields['STEP_UID'] = $aData['sStep'];
+                $aFields['ST_TYPE'] = $aData['sType'];
+                global $G_PUBLISH;
+                G::LoadClass( 'xmlfield_InputPM' );
+                $G_PUBLISH = new Publisher();
+                $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'steps/triggers_Assign', '', $aFields, '../steps/steps_Ajax' );
+                G::RenderPage( 'publish', 'raw' );
+            } else {
+                global $G_PUBLISH;
+                $G_PUBLISH = new Publisher();
+                $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'steps/triggers_NoAssign', '' );
+                G::RenderPage( 'publish', 'raw' );
+            }
+            break;
+        case 'assignTrigger':
+            $aFields = array ('STEP_UID' => $aData['STEP_UID'],'TAS_UID' => $_SESSION['TASK'],'TRI_UID' => $aData['TRI_UID'],'ST_TYPE' => $aData['ST_TYPE']
+            );
+            $oStepTrigger = new StepTrigger();
+            $oStepTrigger->create( $aFields );
+            $aFields['ST_CONDITION'] = $aData['ST_CONDITION'];
+            $aFields['ST_POSITION'] = ($oStepTrigger->getNextPosition( $aData['STEP_UID'], $aData['ST_TYPE'] ) - 1);
+            $oStepTrigger->update( $aFields );
+            break;
+        case 'editTriggerCondition':
+            require_once 'classes/model/Step.php';
+            require_once 'classes/model/Triggers.php';
+            $oStep = new Step();
 
-  	  $aFields['STEP_UID'] = $aData['sStep'];
-  	  $aFields['TRI_UID']  = $aData['sTrigger'];
-  	  $aFields['ST_TYPE']  = $aData['sType'];
+            $aFields['STEP_UID'] = $aData['sStep'];
+            $aFields['TRI_UID'] = $aData['sTrigger'];
+            $aFields['ST_TYPE'] = $aData['sType'];
 
-  	  $Trigger = new Triggers();
-  	  $aRow  = $Trigger->load($aData['sTrigger']);
+            $Trigger = new Triggers();
+            $aRow = $Trigger->load( $aData['sTrigger'] );
 
-  	  $oStepTrigger = new StepTrigger();
-  	  $aFields = $oStepTrigger->load($aFields['STEP_UID'], $_SESSION['TASK'], $aFields['TRI_UID'], $aFields['ST_TYPE']);
-  	  $aFields['action'] = 'saveTriggerCondition';
-  	  $aFields['PROCESS']  = $aRow['PRO_UID'];
-  	  global $G_PUBLISH;
-    	G::LoadClass('xmlfield_InputPM');
-    	$G_PUBLISH = new Publisher();
-      $G_PUBLISH->AddContent('xmlform', 'xmlform', 'steps/triggersCondition_Edit', '', $aFields, '../steps/steps_Ajax');
-      G::RenderPage('publish', 'raw');
-  	break;
-  	case 'saveTriggerCondition':
-  	  $oStepTrigger = new StepTrigger();
-  	  $oStepTrigger->update(array('STEP_UID' => $aData['STEP_UID'], 'TAS_UID' => $_SESSION['TASK'], 'TRI_UID' => $aData['TRI_UID'], 'ST_TYPE' => $aData['ST_TYPE'], 'ST_CONDITION' => $aData['ST_CONDITION']));
-  	break;
-  	case 'upTrigger':
-  	  $aData['iPosition'] = (int)$aData['iPosition'];
-  	  $oStepTrigger = new StepTrigger();
-  	  $oStepTrigger->up($aData['sStep'], $_SESSION['TASK'], $aData['sTrigger'], $aData['sType'], $aData['iPosition']);
-  	break;
-  	case 'downTrigger':
-  	  $aData['iPosition'] = (int)$aData['iPosition'];
-  	  $oStepTrigger = new StepTrigger();
-  	  $oStepTrigger->down($aData['sStep'], $_SESSION['TASK'], $aData['sTrigger'], $aData['sType'], $aData['iPosition']);
-  	break;
-  	case 'ofToAssignTrigger':
-  	  $oStepTrigger = new StepTrigger();
-  	  $oStepTrigger->reOrder($aData['sStep'], $_SESSION['TASK'], $aData['sType'], $aData['iPosition']);
-  	  $oStepTrigger->remove($aData['sStep'], $_SESSION['TASK'], $aData['sTrigger'], $aData['sType']);
-  	break;
-
-  	case 'counterTriggers':
-  	  G::LoadClass('processMap');
-	    $oProcessMap = new ProcessMap();
-  	  $oCriteria1 = $oProcessMap->getStepTriggersCriteria($aData['sStep'], $_SESSION['TASK'], $aData['sType']);
-  	  if ($aData['sType'] == 'BEFORE') {
-  	  	$oCriteria2 = $oProcessMap->getStepTriggersCriteria($aData['sStep'], $_SESSION['TASK'], 'AFTER');
-  	  }
-  	  else {
-  	  	$oCriteria2 = $oProcessMap->getStepTriggersCriteria($aData['sStep'], $_SESSION['TASK'], 'BEFORE');
-  	  }
-  	  $iCantity = StepTriggerPeer::doCount($oCriteria1);
-  	  $iTotal = $iCantity + StepTriggerPeer::doCount($oCriteria2);
-      echo $iTotal . '|' . $iCantity;
-  	break;
-  }
+            $oStepTrigger = new StepTrigger();
+            $aFields = $oStepTrigger->load( $aFields['STEP_UID'], $_SESSION['TASK'], $aFields['TRI_UID'], $aFields['ST_TYPE'] );
+            $aFields['action'] = 'saveTriggerCondition';
+            $aFields['PROCESS'] = $aRow['PRO_UID'];
+            global $G_PUBLISH;
+            G::LoadClass( 'xmlfield_InputPM' );
+            $G_PUBLISH = new Publisher();
+            $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'steps/triggersCondition_Edit', '', $aFields, '../steps/steps_Ajax' );
+            G::RenderPage( 'publish', 'raw' );
+            break;
+        case 'saveTriggerCondition':
+            $oStepTrigger = new StepTrigger();
+            $oStepTrigger->update( array ('STEP_UID' => $aData['STEP_UID'],'TAS_UID' => $_SESSION['TASK'],'TRI_UID' => $aData['TRI_UID'],'ST_TYPE' => $aData['ST_TYPE'],'ST_CONDITION' => $aData['ST_CONDITION']
+            ) );
+            break;
+        case 'upTrigger':
+            $aData['iPosition'] = (int) $aData['iPosition'];
+            $oStepTrigger = new StepTrigger();
+            $oStepTrigger->up( $aData['sStep'], $_SESSION['TASK'], $aData['sTrigger'], $aData['sType'], $aData['iPosition'] );
+            break;
+        case 'downTrigger':
+            $aData['iPosition'] = (int) $aData['iPosition'];
+            $oStepTrigger = new StepTrigger();
+            $oStepTrigger->down( $aData['sStep'], $_SESSION['TASK'], $aData['sTrigger'], $aData['sType'], $aData['iPosition'] );
+            break;
+        case 'ofToAssignTrigger':
+            $oStepTrigger = new StepTrigger();
+            $oStepTrigger->reOrder( $aData['sStep'], $_SESSION['TASK'], $aData['sType'], $aData['iPosition'] );
+            $oStepTrigger->remove( $aData['sStep'], $_SESSION['TASK'], $aData['sTrigger'], $aData['sType'] );
+            break;
+        case 'counterTriggers':
+            G::LoadClass( 'processMap' );
+            $oProcessMap = new ProcessMap();
+            $oCriteria1 = $oProcessMap->getStepTriggersCriteria( $aData['sStep'], $_SESSION['TASK'], $aData['sType'] );
+            if ($aData['sType'] == 'BEFORE') {
+                $oCriteria2 = $oProcessMap->getStepTriggersCriteria( $aData['sStep'], $_SESSION['TASK'], 'AFTER' );
+            } else {
+                $oCriteria2 = $oProcessMap->getStepTriggersCriteria( $aData['sStep'], $_SESSION['TASK'], 'BEFORE' );
+            }
+            $iCantity = StepTriggerPeer::doCount( $oCriteria1 );
+            $iTotal = $iCantity + StepTriggerPeer::doCount( $oCriteria2 );
+            echo $iTotal . '|' . $iCantity;
+            break;
+    }
+} catch (Exception $oException) {
+    die( $oException->getMessage() );
 }
-catch (Exception $oException) {
-	die($oException->getMessage());
-}
-?>
\ No newline at end of file
+
diff --git a/workflow/engine/methods/steps/steps_Delete.php b/workflow/engine/methods/steps/steps_Delete.php
index 5ee58aba9..70bc82c5b 100755
--- a/workflow/engine/methods/steps/steps_Delete.php
+++ b/workflow/engine/methods/steps/steps_Delete.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * steps_Delete.php
- *  
+ *
  * ProcessMaker Open Source Edition
  * Copyright (C) 2004 - 2008 Colosa Inc.23
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
@@ -12,40 +12,37 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd., 
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- * 
  */
 try {
-  global $RBAC;
-  switch ($RBAC->userCanAccess('PM_FACTORY'))
-  {
-  	case -2:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;
-  	case -1:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;
-  }
-  require_once 'classes/model/Step.php';
-  $oStep = new Step();
-  $oStep->reOrder($_POST['STEP_UID'], $_POST['STEP_POSITION']);
-  $oStep->remove($_POST['STEP_UID']);
-  G::LoadClass('processMap');
-  $oProcessMap = new ProcessMap();
-  $oProcessMap->getStepsCriteria($_POST['TASK']);
+    global $RBAC;
+    switch ($RBAC->userCanAccess( 'PM_FACTORY' )) {
+        case - 2:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+        case - 1:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+    }
+    require_once 'classes/model/Step.php';
+    $oStep = new Step();
+    $oStep->reOrder( $_POST['STEP_UID'], $_POST['STEP_POSITION'] );
+    $oStep->remove( $_POST['STEP_UID'] );
+    G::LoadClass( 'processMap' );
+    $oProcessMap = new ProcessMap();
+    $oProcessMap->getStepsCriteria( $_POST['TASK'] );
+} catch (Exception $oException) {
+    die( $oException->getMessage() );
 }
-catch (Exception $oException) {
-	die($oException->getMessage());
-}
-?>
\ No newline at end of file
+
diff --git a/workflow/engine/methods/steps/steps_Down.php b/workflow/engine/methods/steps/steps_Down.php
index 3d56bca7e..5e0a70f57 100755
--- a/workflow/engine/methods/steps/steps_Down.php
+++ b/workflow/engine/methods/steps/steps_Down.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * steps_Down.php
- *  
+ *
  * ProcessMaker Open Source Edition
  * Copyright (C) 2004 - 2008 Colosa Inc.23
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
@@ -12,39 +12,36 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd., 
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- * 
  */
 try {
-  global $RBAC;
-  switch ($RBAC->userCanAccess('PM_FACTORY'))
-  {
-  	case -2:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;
-  	case -1:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;
-  }
-  require_once 'classes/model/Step.php';
-  $oStep = new Step();
-  $oStep->down($_POST['STEP_UID'], $_POST['TASK'] ,$_POST['STEP_POSITION']);
-  G::LoadClass('processMap');
-  $oProcessMap = new ProcessMap();
-  $oProcessMap->getStepsCriteria($_POST['TASK']);
+    global $RBAC;
+    switch ($RBAC->userCanAccess( 'PM_FACTORY' )) {
+        case - 2:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+        case - 1:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+    }
+    require_once 'classes/model/Step.php';
+    $oStep = new Step();
+    $oStep->down( $_POST['STEP_UID'], $_POST['TASK'], $_POST['STEP_POSITION'] );
+    G::LoadClass( 'processMap' );
+    $oProcessMap = new ProcessMap();
+    $oProcessMap->getStepsCriteria( $_POST['TASK'] );
+} catch (Exception $oException) {
+    die( $oException->getMessage() );
 }
-catch (Exception $oException) {
-	die($oException->getMessage());
-}
-?>
\ No newline at end of file
+
diff --git a/workflow/engine/methods/steps/steps_New.php b/workflow/engine/methods/steps/steps_New.php
index b88f410a5..5ff23800d 100755
--- a/workflow/engine/methods/steps/steps_New.php
+++ b/workflow/engine/methods/steps/steps_New.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * steps_New.php
- *  
+ *
  * ProcessMaker Open Source Edition
  * Copyright (C) 2004 - 2008 Colosa Inc.23
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
@@ -12,38 +12,36 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd., 
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- * 
  */
 try {
-  global $RBAC;
-  switch ($RBAC->userCanAccess('PM_FACTORY')) {
-  	case -2:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;
-  	case -1:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;
-  }
-  G::LoadClass('processMap');
-  $oProcessMap = new ProcessMap();
-  $G_PUBLISH   = new Publisher();
-  
-  $G_PUBLISH->AddContent('propeltable', 'paged-table', 'steps/steps_availableBB', $oProcessMap->getAvailableBBCriteria($_GET['PROCESS'], $_GET['TASK']), $_GET);
-  G::RenderPage('publish-raw', 'raw');  
+    global $RBAC;
+    switch ($RBAC->userCanAccess( 'PM_FACTORY' )) {
+        case - 2:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+        case - 1:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+    }
+    G::LoadClass( 'processMap' );
+    $oProcessMap = new ProcessMap();
+    $G_PUBLISH = new Publisher();
+
+    $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'steps/steps_availableBB', $oProcessMap->getAvailableBBCriteria( $_GET['PROCESS'], $_GET['TASK'] ), $_GET );
+    G::RenderPage( 'publish-raw', 'raw' );
+} catch (Exception $oException) {
+    die( $oException->getMessage() );
 }
-catch (Exception $oException) {
-	die($oException->getMessage());
-}
-?>
\ No newline at end of file
+
diff --git a/workflow/engine/methods/steps/steps_Save.php b/workflow/engine/methods/steps/steps_Save.php
index 2ad3f912a..fecd184ee 100755
--- a/workflow/engine/methods/steps/steps_Save.php
+++ b/workflow/engine/methods/steps/steps_Save.php
@@ -12,43 +12,39 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
  */
 try {
-  global $RBAC;
-  switch ($RBAC->userCanAccess('PM_FACTORY')) {
-  	case -2:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;
-  	case -1:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;
-  }
-  require_once 'classes/model/Step.php';
-  $oStep    = new Step();
-  $sStepUID = $oStep->create(array('PRO_UID' => $_POST['sProcess'], 'TAS_UID' => $_POST['sTask']));
-  $oStep->update(array('STEP_UID'      => $sStepUID,
-                       'STEP_TYPE_OBJ' => $_POST['sType'],
-                       'STEP_UID_OBJ'  => $_POST['sUID'],
-                       'STEP_POSITION' => ($oStep->getNextPosition($_POST['sTask']) - 1),
-                       'STEP_MODE'     => (isset($_POST['sMode'])) ? $_POST['sMode'] : 'EDIT'));
-  G::LoadClass('processMap');
-  $oProcessMap = new ProcessMap();
-  $oProcessMap->getStepsCriteria($_POST['sTask']);
+    global $RBAC;
+    switch ($RBAC->userCanAccess( 'PM_FACTORY' )) {
+        case - 2:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+        case - 1:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+    }
+    require_once 'classes/model/Step.php';
+    $oStep = new Step();
+    $sStepUID = $oStep->create( array ('PRO_UID' => $_POST['sProcess'],'TAS_UID' => $_POST['sTask']
+    ) );
+    $oStep->update( array ('STEP_UID' => $sStepUID,'STEP_TYPE_OBJ' => $_POST['sType'],'STEP_UID_OBJ' => $_POST['sUID'],'STEP_POSITION' => ($oStep->getNextPosition( $_POST['sTask'] ) - 1),'STEP_MODE' => (isset( $_POST['sMode'] )) ? $_POST['sMode'] : 'EDIT'
+    ) );
+    G::LoadClass( 'processMap' );
+    $oProcessMap = new ProcessMap();
+    $oProcessMap->getStepsCriteria( $_POST['sTask'] );
+} catch (Exception $oException) {
+    die( $oException->getMessage() );
 }
-catch (Exception $oException) {
-	die($oException->getMessage());
-}
-?>
\ No newline at end of file
+
diff --git a/workflow/engine/methods/steps/steps_SupervisorAjax.php b/workflow/engine/methods/steps/steps_SupervisorAjax.php
index 09be6c198..e9039ee50 100755
--- a/workflow/engine/methods/steps/steps_SupervisorAjax.php
+++ b/workflow/engine/methods/steps/steps_SupervisorAjax.php
@@ -12,59 +12,57 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
  */
 try {
-	global $RBAC;
-  switch ($RBAC->userCanAccess('PM_FACTORY'))
-  {
-  	case -2:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;
-  	case -1:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;
-  }
+    global $RBAC;
+    switch ($RBAC->userCanAccess( 'PM_FACTORY' )) {
+        case - 2:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+        case - 1:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+    }
 
-  //srequire_once 'classes/model/StepTrigger.php';
+    //srequire_once 'classes/model/StepTrigger.php';
 
-  G::LoadClass('processMap');
-  $oProcessMap = new ProcessMap();
 
-  switch ($_POST['action']) {
-  	case 'availableSupervisorDynaforms':
-  	  $oProcessMap->availableSupervisorDynaforms($_POST['PRO_UID']);
-    break;
-    case 'assignSupervisorDynaform':
-      $oProcessMap->assignSupervisorStep($_POST['PRO_UID'], 'DYNAFORM', $_POST['DYN_UID']);
-    break;
-    case 'removeSupervisorDynaform':
-      $oProcessMap->removeSupervisorStep($_POST['STEP_UID'], $_POST['PRO_UID'], 'DYNAFORM', $_POST['DYN_UID'], $_POST['STEP_POSITION']);
-    break;
-    case 'availableSupervisorInputs':
-  	  $oProcessMap->availableSupervisorInputs($_POST['PRO_UID']);
-    break;
-    case 'assignSupervisorInput':
-      $oProcessMap->assignSupervisorStep($_POST['PRO_UID'], 'INPUT_DOCUMENT', $_POST['INP_DOC_UID']);
-    break;
-    case 'removeSupervisorInput':
-      $oProcessMap->removeSupervisorStep($_POST['STEP_UID'], $_POST['PRO_UID'], 'INPUT_DOCUMENT', $_POST['INP_DOC_UID'], $_POST['STEP_POSITION']);
-    break;
-  }
+    G::LoadClass( 'processMap' );
+    $oProcessMap = new ProcessMap();
+
+    switch ($_POST['action']) {
+        case 'availableSupervisorDynaforms':
+            $oProcessMap->availableSupervisorDynaforms( $_POST['PRO_UID'] );
+            break;
+        case 'assignSupervisorDynaform':
+            $oProcessMap->assignSupervisorStep( $_POST['PRO_UID'], 'DYNAFORM', $_POST['DYN_UID'] );
+            break;
+        case 'removeSupervisorDynaform':
+            $oProcessMap->removeSupervisorStep( $_POST['STEP_UID'], $_POST['PRO_UID'], 'DYNAFORM', $_POST['DYN_UID'], $_POST['STEP_POSITION'] );
+            break;
+        case 'availableSupervisorInputs':
+            $oProcessMap->availableSupervisorInputs( $_POST['PRO_UID'] );
+            break;
+        case 'assignSupervisorInput':
+            $oProcessMap->assignSupervisorStep( $_POST['PRO_UID'], 'INPUT_DOCUMENT', $_POST['INP_DOC_UID'] );
+            break;
+        case 'removeSupervisorInput':
+            $oProcessMap->removeSupervisorStep( $_POST['STEP_UID'], $_POST['PRO_UID'], 'INPUT_DOCUMENT', $_POST['INP_DOC_UID'], $_POST['STEP_POSITION'] );
+            break;
+    }
+} catch (Exception $oException) {
+    die( $oException->getMessage() );
 }
-catch (Exception $oException) {
-	die($oException->getMessage());
-}
-?>
\ No newline at end of file
+
diff --git a/workflow/engine/methods/steps/steps_Up.php b/workflow/engine/methods/steps/steps_Up.php
index 5ef6e0d88..bc780cff5 100755
--- a/workflow/engine/methods/steps/steps_Up.php
+++ b/workflow/engine/methods/steps/steps_Up.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * steps_Up.php
- *  
+ *
  * ProcessMaker Open Source Edition
  * Copyright (C) 2004 - 2008 Colosa Inc.23
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
@@ -12,39 +12,36 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd., 
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- * 
  */
 try {
-  global $RBAC;
-  switch ($RBAC->userCanAccess('PM_FACTORY'))
-  {
-  	case -2:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;
-  	case -1:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;
-  }
-  require_once 'classes/model/Step.php';
-  $oStep = new Step();
-  $oStep->up($_POST['STEP_UID'], $_POST['TASK'] ,$_POST['STEP_POSITION']);
-  G::LoadClass('processMap');
-  $oProcessMap = new ProcessMap();
-  $oProcessMap->getStepsCriteria($_POST['TASK']);
+    global $RBAC;
+    switch ($RBAC->userCanAccess( 'PM_FACTORY' )) {
+        case - 2:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+        case - 1:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+    }
+    require_once 'classes/model/Step.php';
+    $oStep = new Step();
+    $oStep->up( $_POST['STEP_UID'], $_POST['TASK'], $_POST['STEP_POSITION'] );
+    G::LoadClass( 'processMap' );
+    $oProcessMap = new ProcessMap();
+    $oProcessMap->getStepsCriteria( $_POST['TASK'] );
+} catch (Exception $oException) {
+    die( $oException->getMessage() );
 }
-catch (Exception $oException) {
-	die($oException->getMessage());
-}
-?>
\ No newline at end of file
+

From e16048052d5e11ade3a0a3959bba1689b570f6e6 Mon Sep 17 00:00:00 2001
From: jennylee <jennylee@colosa.com>
Date: Wed, 17 Oct 2012 17:56:47 -0400
Subject: [PATCH 3/4] CODE STYLE, workflow/engine/methods/tools/

FILES:
ajaxListener.php
dvServices.php
index.php
main.php
methodsPermissions.php
methodsPermissions_Ajax.php
translations.php
translationsAdd.php
translationsAjax.php
translationsDelete.php
translationsEdit.php
translationsSave.php
updateTranslation.php
---
 .../engine/methods/tools/ajaxListener.php     | 157 +++---
 workflow/engine/methods/tools/dvServices.php  |  99 ++--
 workflow/engine/methods/tools/index.php       |  24 +-
 workflow/engine/methods/tools/main.php        |   8 +-
 .../methods/tools/methodsPermissions.php      |  24 +-
 .../methods/tools/methodsPermissions_Ajax.php | 486 ++++++++----------
 .../engine/methods/tools/translations.php     |  31 +-
 .../engine/methods/tools/translationsAdd.php  |  29 +-
 .../engine/methods/tools/translationsAjax.php | 366 +++++++------
 .../methods/tools/translationsDelete.php      |  46 +-
 .../engine/methods/tools/translationsEdit.php |  80 ++-
 .../engine/methods/tools/translationsSave.php |  37 +-
 .../methods/tools/updateTranslation.php       |  35 +-
 13 files changed, 676 insertions(+), 746 deletions(-)

diff --git a/workflow/engine/methods/tools/ajaxListener.php b/workflow/engine/methods/tools/ajaxListener.php
index 8e95e5ebc..9c1c0fd9b 100755
--- a/workflow/engine/methods/tools/ajaxListener.php
+++ b/workflow/engine/methods/tools/ajaxListener.php
@@ -12,107 +12,108 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
  */
- 
- /**
-  * @author Erik Amaru Ortiz <erik@colosa.com>
-  * @date Jan 10th, 2010
-  */
+
+/**
+ *
+ * @author Erik Amaru Ortiz <erik@colosa.com>
+ * @date Jan 10th, 2010
+ */
 
 require "classes/model/Translation.php";
 
 $action = $_REQUEST['action'];
-unset($_REQUEST['action']);
+unset( $_REQUEST['action'] );
 $ajax = new Ajax();
-$ajax->$action($_REQUEST);
+$ajax->$action( $_REQUEST );
 
 class Ajax
 {
-  function getList($params)
-  {  
-    $search = isset($params['search']) ? $params['search'] : null;
-    $params['dateFrom'] = str_replace('T00:00:00','',$params['dateFrom']);
-    $params['dateTo'] = str_replace('T00:00:00','',$params['dateTo']);
-    $result = Translation::getAll('en', $params['start'], $params['limit'], $search, $params['dateFrom'], $params['dateTo']);
-    //$result = Translation::getAll('en', $params['start'], $params['limit'], $search);
-    
-    /*foreach($result->data as $i=>$row){
-      $result->data[$i]['TRN_VALUE'] = substr($row['TRN_VALUE'], 0, 15) . '...';
-    }*/
-    
-    echo G::json_encode($result);
-  }
 
-  function save()
-  {
-    try{
-      require_once ( "classes/model/Translation.php" );
-      $id = $_POST['id'];
-      $label = preg_replace("[\n|\r|\n\r]", ' ', $_POST['label']);
+    function getList ($params)
+    {
+        $search = isset( $params['search'] ) ? $params['search'] : null;
+        $params['dateFrom'] = str_replace( 'T00:00:00', '', $params['dateFrom'] );
+        $params['dateTo'] = str_replace( 'T00:00:00', '', $params['dateTo'] );
+        $result = Translation::getAll( 'en', $params['start'], $params['limit'], $search, $params['dateFrom'], $params['dateTo'] );
+        //$result = Translation::getAll('en', $params['start'], $params['limit'], $search);
 
-      $res = Translation::addTranslation('LABEL', $id, 'en', $label);
-      if ( $res['codError'] < 0 ) {
-        $result->success = false;
-        $result->msg = $res['message'];
-      } else {
-        $result->success = true;
-        $result->msg = 'Label '.$id.' saved Successfully!';
-      }
-      
-    } catch(Exception $e){
-      $result->success = false;
-      $result->msg = $e->getMessage();
+
+        /*foreach($result->data as $i=>$row){
+        $result->data[$i]['TRN_VALUE'] = substr($row['TRN_VALUE'], 0, 15) . '...';
+        }*/
+
+        echo G::json_encode( $result );
     }
-    print G::json_encode($result);
-  }
 
-  function delete()
-  {
-    require_once ( "classes/model/Translation.php" );
-    $ids = explode(',', $_POST['IDS']);
-    $category = 'LABEL';
+    function save ()
+    {
+        try {
+            require_once ("classes/model/Translation.php");
+            $id = $_POST['id'];
+            $label = preg_replace( "[\n|\r|\n\r]", ' ', $_POST['label'] );
 
-    try{
-      foreach($ids as $id){
-        $tr = TranslationPeer::retrieveByPK( $category, $id, 'en' );
-        if ( ( is_object ( $tr ) &&  get_class ($tr) == 'Translation' ) ) {
-          $tr->delete();
+            $res = Translation::addTranslation( 'LABEL', $id, 'en', $label );
+            if ($res['codError'] < 0) {
+                $result->success = false;
+                $result->msg = $res['message'];
+            } else {
+                $result->success = true;
+                $result->msg = 'Label ' . $id . ' saved Successfully!';
+            }
+
+        } catch (Exception $e) {
+            $result->success = false;
+            $result->msg = $e->getMessage();
         }
-      }
-
-      $result->success = true;
-      $result->msg = 'Deleted Successfully!';
-      
-    } catch(Exception $e){
-      $result->success = false;
-      $result->msg = $e->getMessage();
+        print G::json_encode( $result );
     }
-    print G::json_encode($result);
-  }
 
-  function rebuild()
-  {
-    try{
-      require_once ( "classes/model/Translation.php" );
-      $t = new Translation;
-      $result = Translation::generateFileTranslation('en');
-      $result['success'] = true;
-      
-    } catch(Exception $e){
-      $result->success = false;
-      $result->msg = $e->getMessage();
+    function delete ()
+    {
+        require_once ("classes/model/Translation.php");
+        $ids = explode( ',', $_POST['IDS'] );
+        $category = 'LABEL';
+
+        try {
+            foreach ($ids as $id) {
+                $tr = TranslationPeer::retrieveByPK( $category, $id, 'en' );
+                if ((is_object( $tr ) && get_class( $tr ) == 'Translation')) {
+                    $tr->delete();
+                }
+            }
+
+            $result->success = true;
+            $result->msg = 'Deleted Successfully!';
+
+        } catch (Exception $e) {
+            $result->success = false;
+            $result->msg = $e->getMessage();
+        }
+        print G::json_encode( $result );
+    }
+
+    function rebuild ()
+    {
+        try {
+            require_once ("classes/model/Translation.php");
+            $t = new Translation();
+            $result = Translation::generateFileTranslation( 'en' );
+            $result['success'] = true;
+
+        } catch (Exception $e) {
+            $result->success = false;
+            $result->msg = $e->getMessage();
+        }
+        print G::json_encode( $result );
     }
-    print G::json_encode($result);
-  }
 }
 
-
diff --git a/workflow/engine/methods/tools/dvServices.php b/workflow/engine/methods/tools/dvServices.php
index 264403ed6..b143d5609 100755
--- a/workflow/engine/methods/tools/dvServices.php
+++ b/workflow/engine/methods/tools/dvServices.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * dvServices.php
- *  
+ *
  * ProcessMaker Open Source Edition
  * Copyright (C) 2004 - 2008 Colosa Inc.23
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
@@ -12,72 +12,71 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd., 
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- * 
  */
 /*
  * Created on 11-02-2008
  *
  * @author David Callizaya <davidsantos@colosa.com>
  */
-G::LoadSystem("webResource");
+G::LoadSystem( "webResource" );
+
 class dvServices extends WebResource
 {
-  function get_session_vars()
-  {
-    $cur=array_keys($_SESSION);
-    $res='';
-    foreach($cur as $key)
+
+    function get_session_vars ()
     {
-      $res.='* '.$key.'<br/>';
-    }
-    return $res;
-  }
-  function get_session_xmlforms()
-  {
-    $cur=array_keys($_SESSION);
-    $res='';
-    $colors=array('white','#EEFFFF');
-    $colori=0;$count=0;
-    //Get xmlforms in session
-    foreach($cur as $key)
-    {
-      $res.='<div style="background-color:'.$colors[$colori].';">';
-        $xml=G::getUIDName($key,'');
-        if (strpos($xml,'.xml')!==false)
-        {
-          $res.='<i>FORM:</i>  '.$xml;
-          $colori=$colori ^ 1;
-          $count++;
+        $cur = array_keys( $_SESSION );
+        $res = '';
+        foreach ($cur as $key) {
+            $res .= '* ' . $key . '<br/>';
         }
-      $res.='</div>';
+        return $res;
     }
-    //Get pagedTable in session
-    foreach($cur as $key)
+
+    function get_session_xmlforms ()
     {
-      $res.='<div style="background-color:'.$colors[$colori].';">';
-      if (substr($key,0,11)==="pagedTable[")
-      {
-        $xml=G::getUIDName(substr($key,11,-1),'');
-        $res.='<i>TABLE:</i> '.$xml;
-        $colori=$colori ^ 1;
-        $count++;
-      }
-      $res.='</div>';
+        $cur = array_keys( $_SESSION );
+        $res = '';
+        $colors = array ('white','#EEFFFF'
+        );
+        $colori = 0;
+        $count = 0;
+        //Get xmlforms in session
+        foreach ($cur as $key) {
+            $res .= '<div style="background-color:' . $colors[$colori] . ';">';
+            $xml = G::getUIDName( $key, '' );
+            if (strpos( $xml, '.xml' ) !== false) {
+                $res .= '<i>FORM:</i>  ' . $xml;
+                $colori = $colori ^ 1;
+                $count ++;
+            }
+            $res .= '</div>';
+        }
+        //Get pagedTable in session
+        foreach ($cur as $key) {
+            $res .= '<div style="background-color:' . $colors[$colori] . ';">';
+            if (substr( $key, 0, 11 ) === "pagedTable[") {
+                $xml = G::getUIDName( substr( $key, 11, - 1 ), '' );
+                $res .= '<i>TABLE:</i> ' . $xml;
+                $colori = $colori ^ 1;
+                $count ++;
+            }
+            $res .= '</div>';
+        }
+        return array ("count" => $count,"html" => $res
+        );
     }
-    return array("count"=>$count,"html"=>$res);
-  }
 }
-$o=new dvServices($_SERVER['REQUEST_URI'],$_POST);
+$o = new dvServices( $_SERVER['REQUEST_URI'], $_POST );
 //av.buenos aires maxparedes
 //tienda viva.
 //122
 
-?>
\ No newline at end of file
diff --git a/workflow/engine/methods/tools/index.php b/workflow/engine/methods/tools/index.php
index 069b0449e..80017de64 100755
--- a/workflow/engine/methods/tools/index.php
+++ b/workflow/engine/methods/tools/index.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * index.php
- *  
+ *
  * ProcessMaker Open Source Edition
  * Copyright (C) 2004 - 2008 Colosa Inc.23
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
@@ -12,18 +12,16 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd., 
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- * 
  */
-  unset($_SESSION['TOOLS_VIEWTYPE']);
-  $newFile = str_replace ( 'index.php', 'translations.php' ,  __FILE__ ) ;
-  return $newFile;
-  
-  
\ No newline at end of file
+unset( $_SESSION['TOOLS_VIEWTYPE'] );
+$newFile = str_replace( 'index.php', 'translations.php', __FILE__ );
+return $newFile;
+
diff --git a/workflow/engine/methods/tools/main.php b/workflow/engine/methods/tools/main.php
index e6a756e61..916787c0f 100755
--- a/workflow/engine/methods/tools/main.php
+++ b/workflow/engine/methods/tools/main.php
@@ -1,8 +1,8 @@
 <?php
 
-
-$oHeadPublisher =& headPublisher::getSingleton();
-$oHeadPublisher->addExtJsScript('tools/main', true);
+$oHeadPublisher = & headPublisher::getSingleton();
+$oHeadPublisher->addExtJsScript( 'tools/main', true );
 
 //$oHeadPublisher->assign('_ENV_CURRENT_DATE', $conf->getSystemDate(date('Y-m-d')));
-G::RenderPage('publish', 'extJs');
\ No newline at end of file
+G::RenderPage( 'publish', 'extJs' );
+
diff --git a/workflow/engine/methods/tools/methodsPermissions.php b/workflow/engine/methods/tools/methodsPermissions.php
index abb9b5cc7..255d18f19 100755
--- a/workflow/engine/methods/tools/methodsPermissions.php
+++ b/workflow/engine/methods/tools/methodsPermissions.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * methodsPermissions.php
- *  
+ *
  * ProcessMaker Open Source Edition
  * Copyright (C) 2004 - 2008 Colosa Inc.23
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
@@ -12,20 +12,18 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd., 
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- * 
  */
 
-  $G_PUBLISH = new Publisher;
-  $G_PUBLISH->AddContent('view', 'tools/methodsPermissions' );
-  
-  G::RenderPage( 'publish' );
+$G_PUBLISH = new Publisher();
+$G_PUBLISH->AddContent( 'view', 'tools/methodsPermissions' );
+
+G::RenderPage( 'publish' );
 
-?>
\ No newline at end of file
diff --git a/workflow/engine/methods/tools/methodsPermissions_Ajax.php b/workflow/engine/methods/tools/methodsPermissions_Ajax.php
index c5fdac374..aedaea0a5 100755
--- a/workflow/engine/methods/tools/methodsPermissions_Ajax.php
+++ b/workflow/engine/methods/tools/methodsPermissions_Ajax.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * methodsPermissions_Ajax.php
- *  
+ *
  * ProcessMaker Open Source Edition
  * Copyright (C) 2004 - 2008 Colosa Inc.23
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
@@ -12,276 +12,228 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd., 
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- * 
  */
-  G::LoadClass("webResource");
-  define('GET_PERMISSION_REG_EXP','/(G::\\s*genericForceLogin\\s*\\(\\s*[\'"])(\\w+)([\'"]\\s*,\\s*[\'"].+[\'"],.+\\)\\s*)|(\\$RBAC->userCanAccess\\s*\\(\\s*[\'"])(\\w+)([\'"]\\s*\\))/i');
-  define('GET_PERMISSION_REG_EXP2','/\\s*if\\s*\\(\\s*\\(\\s*\\$RBAC_Response\\s*=\\s*\\$RBAC->userCanAccess\\s*\\(\\s*[\'"]\\w+[\'"]\\s*\\)\\s*\\)\\s*!=1\\s*\\)\\s*return(?:.*)?;\\s*/i');
-  class phpFile extends webResource
-  {
-    function _get_permissions($filename)
-    {
-      $aSource = file( $filename);
-      $aOutSource = array();
-  	  $source = implode( '', $aSource );
-  	  $regExp=GET_PERMISSION_REG_EXP;
-  	  $permissions=array();
-  	  $lines=array();
-  	  $len=preg_match_all($regExp,$source,$matches,PREG_OFFSET_CAPTURE);
-  	  for($r=0; $r < $len; $r++)
-  	  {
-  	    $match=$matches[0][$r][0];
-  	    $permission=($matches[2][$r][0]!='') ? $matches[2][$r][0]:$matches[5][$r][0];
-  	    $toPrint=($matches[2][$r][0]!='') ? 
-  	      (
-  	        htmlentities($matches[1][$r][0],ENT_QUOTES,'utf-8').
-  	        '<b>'.htmlentities($matches[2][$r][0],ENT_QUOTES,'utf-8').'</b>'.
-  	        htmlentities($matches[3][$r][0],ENT_QUOTES,'utf-8')
-  	      )
-  	      :
-  	      (
-  	        htmlentities($matches[4][$r][0],ENT_QUOTES,'utf-8').
-  	        '<b>'.htmlentities($matches[5][$r][0],ENT_QUOTES,'utf-8').'</b>'.
-  	        htmlentities($matches[6][$r][0],ENT_QUOTES,'utf-8')
-  	      );
-      	  $row = $this->_getLine($aSource,$matches[0][$r][1]);
-    	    if (array_search($permission,$permissions)===FALSE)
-    	    {
-    	      $permissions[]=$permission;
-    	      $lines[]=$row;
-    	    }
-    	    //TODO: Need to htmlencode the rest of the line that is not in match. Ex. < ? php
-      	  if ($row>0) $aOutSource[$row-1]=str_replace($match,$toPrint,isset($aOutSource[$row-1])?$aOutSource[$row-1]:$aSource[$row-1]);
-      	  $aOutSource[$row]=str_replace($match,$toPrint,isset($aOutSource[$row])?$aOutSource[$row]:$aSource[$row]);
-      	  if ($row<(sizeof($aSource)-1)) $aOutSource[$row+1]=str_replace($match,$toPrint,isset($aOutSource[$row+1])?$aOutSource[$row+1]:$aSource[$row+1]);
-  	  }
-  	  ksort($aOutSource);
-  	  $row0=0;$html='';
-  	  foreach($aOutSource as $row => $line)
-  	  {
-  	    if (($row-1) > $row0) $html.=$this->_printLine($row,'...');
-  	    $html.=$this->_printLine($row+1,$line,true,$aSource[$row],$filename.'?'.$row);
-  	    $row0=$row;
-  	  }
-  	  return array (
-  	      ($html==='')?'Dont have RBAC validation!':('<table>'.$html.'</table>'),
-  	      $permissions,
-  	      $lines
-  	    );
-    }
-    function get_permissions($filename)
-    {
-      $res=$this->_get_permissions($filename);
-      return $res[0];
-    }
-    function modify_line($filename,$row,$value)
-    {
-      $aSource = file( $filename);
-      $line=$aSource[$row];
-      $nl=(strlen($line)>=2)&&(substr($line,-2,2)=="\r\n")?
-        "\r\n":
-        ((strlen($line)>=1)&&(substr($line,-1,1)=="\n")?"\n":"");
-      $aSource[$row]=$value.$nl;
-      /*Save change*/
-      $fp=fopen($filename,'w');
-      fwrite($fp,implode('',$aSource));
-      fclose($fp);
-      /*Format line*/
-  	  $regExp=GET_PERMISSION_REG_EXP;
-      $line=$aSource[$row];
-  	  $len=preg_match_all($regExp,$line,$matches,PREG_OFFSET_CAPTURE);
-  	  for($r=0; $r < $len; $r++)
-  	  {
-  	    $match=$matches[0][$r][0];
-  	    $toPrint=($matches[2][$r][0]!='') ? 
-  	      (
-  	        htmlentities($matches[1][$r][0],ENT_QUOTES,'utf-8').
-  	        '<b>'.htmlentities($matches[2][$r][0],ENT_QUOTES,'utf-8').'</b>'.
-  	        htmlentities($matches[3][$r][0],ENT_QUOTES,'utf-8')
-  	      )
-  	      :
-  	      (
-  	        htmlentities($matches[4][$r][0],ENT_QUOTES,'utf-8').
-  	        '<b>'.htmlentities($matches[5][$r][0],ENT_QUOTES,'utf-8').'</b>'.
-  	        htmlentities($matches[6][$r][0],ENT_QUOTES,'utf-8')
-  	      );
-      	  $line=str_replace($match,$toPrint,$line);
-  	  }
-      return array($line,$aSource[$row]);
-    }
-    function set_header($filename,$value)
-    {
-      $aFields=array("_FILENAME_"=>basename( $filename ) );
-      $value = G::replaceDataField( $value , $aFields );
-      $aOrigin = file( $filename);
-      //It suposse that allway start with <?. or <?php
-      $line=$aOrigin[0];
-      $nl=(strlen($line)>=2)&&(substr($line,-2,2)=="\r\n")?
-        "\r\n":
-        ((strlen($line)>=1)&&(substr($line,-1,1)=="\n")?"\n":"");
+G::LoadClass( "webResource" );
+define( 'GET_PERMISSION_REG_EXP', '/(G::\\s*genericForceLogin\\s*\\(\\s*[\'"])(\\w+)([\'"]\\s*,\\s*[\'"].+[\'"],.+\\)\\s*)|(\\$RBAC->userCanAccess\\s*\\(\\s*[\'"])(\\w+)([\'"]\\s*\\))/i' );
+define( 'GET_PERMISSION_REG_EXP2', '/\\s*if\\s*\\(\\s*\\(\\s*\\$RBAC_Response\\s*=\\s*\\$RBAC->userCanAccess\\s*\\(\\s*[\'"]\\w+[\'"]\\s*\\)\\s*\\)\\s*!=1\\s*\\)\\s*return(?:.*)?;\\s*/i' );
 
-      $codigo = implode('',$aOrigin);
-      $pattern='/\/\*[\w\W]+\* '.'ProcessMaker Open Source'.'[\w\W]+?\*\//i';
-      if (preg_match($pattern,$codigo))
-      {
-        $codigo=preg_replace( $pattern, $value , $codigo );
-      }
-      else
-      {
-        $aSource=array();
-        $aSource[0]=$aOrigin[0];
-        $aSource[1]=$value.$nl;
-        for($r=1;$r<sizeof($aOrigin);$r++)
-        {
-          $aSource[]=$aOrigin[$r];
+class phpFile extends webResource
+{
+
+    function _get_permissions ($filename)
+    {
+        $aSource = file( $filename );
+        $aOutSource = array ();
+        $source = implode( '', $aSource );
+        $regExp = GET_PERMISSION_REG_EXP;
+        $permissions = array ();
+        $lines = array ();
+        $len = preg_match_all( $regExp, $source, $matches, PREG_OFFSET_CAPTURE );
+        for ($r = 0; $r < $len; $r ++) {
+            $match = $matches[0][$r][0];
+            $permission = ($matches[2][$r][0] != '') ? $matches[2][$r][0] : $matches[5][$r][0];
+            $toPrint = ($matches[2][$r][0] != '') ? (htmlentities( $matches[1][$r][0], ENT_QUOTES, 'utf-8' ) . '<b>' . htmlentities( $matches[2][$r][0], ENT_QUOTES, 'utf-8' ) . '</b>' . htmlentities( $matches[3][$r][0], ENT_QUOTES, 'utf-8' )) : (htmlentities( $matches[4][$r][0], ENT_QUOTES, 'utf-8' ) . '<b>' . htmlentities( $matches[5][$r][0], ENT_QUOTES, 'utf-8' ) . '</b>' . htmlentities( $matches[6][$r][0], ENT_QUOTES, 'utf-8' ));
+            $row = $this->_getLine( $aSource, $matches[0][$r][1] );
+            if (array_search( $permission, $permissions ) === false) {
+                $permissions[] = $permission;
+                $lines[] = $row;
+            }
+            //TODO: Need to htmlencode the rest of the line that is not in match. Ex. < ? php
+            if ($row > 0)
+                $aOutSource[$row - 1] = str_replace( $match, $toPrint, isset( $aOutSource[$row - 1] ) ? $aOutSource[$row - 1] : $aSource[$row - 1] );
+            $aOutSource[$row] = str_replace( $match, $toPrint, isset( $aOutSource[$row] ) ? $aOutSource[$row] : $aSource[$row] );
+            if ($row < (sizeof( $aSource ) - 1))
+                $aOutSource[$row + 1] = str_replace( $match, $toPrint, isset( $aOutSource[$row + 1] ) ? $aOutSource[$row + 1] : $aSource[$row + 1] );
         }
-        $codigo=implode('',$aSource);
-      }
-      /*Save change*/
-      $fp=fopen($filename,'w');
-      fwrite($fp,$codigo);
-      fclose($fp);
-      return $this->get_permissions($filename);
-    }
-    function add_permission($filename,$value)
-    {
-      $aOrigin = file( $filename);
-      //It suposse that allway start with <?. or <?php
-      $aSource[0]=$aOrigin[0];
-      $line=$aOrigin[0];
-      $nl=(strlen($line)>=2)&&(substr($line,-2,2)=="\r\n")?
-        "\r\n":
-        ((strlen($line)>=1)&&(substr($line,-1,1)=="\n")?"\n":"");
-      $aSource[1]=$value.$nl;
-      for($r=1;$r<sizeof($aOrigin);$r++)
-      {
-        $aSource[]=$aOrigin[$r];
-      }
-      /*Save change*/
-      $fp=fopen($filename,'w');
-      fwrite($fp,implode('',$aSource));
-      fclose($fp);
-      return $this->get_permissions($filename);
-    }
-    function _getLine(&$aSource,$pos)
-    {
-      $i=1;
-      while ($pos>sizeof($aSource[$i])) 
-      {
-        $pos-=strlen($aSource[$i]);
-        $i++;
-      }
-      return $i-1;
-    }
-    function _printLine($row,$txt,$editable=false,$editValue='',$name='')
-    {
-      if ($editable)
-      {
-        return '<tr><td><input value="X" type="button" style="width:100%;" '.
-        ' name="'.htmlentities($name,ENT_QUOTES,'utf-8').'"'.
-        ' onclick="removeLine(this);"/></td>'.
-        '<td class="treeContent" align="right">'.$row.'</td>
-        <td class="treeNode"><span onclick="switchViewEdit(this,this.nextSibling);">'.
-        $txt.'</span>'.
-        '<input class="treeNode"'.
-        ' name="'.htmlentities($name,ENT_QUOTES,'utf-8').'"'.
-        ' style="border:none;width:100%;display:none;"'.
-        ' onblur="switchEditView(this.previousSibling,this);"'.
-        ' value="'.htmlentities($editValue,ENT_QUOTES,'utf-8').'"/></td></tr>';
-      }
-      else
-      {
-        return '<tr><td></td>'.
-        '<td class="treeContent" align="right">'.$row.'</td>'.
-        '<td class="treeNode">'.$txt.'</td></tr>';
-      }
-    }
-    function set_permission($filename,$permission)
-    {
-      list($html,$permissions)=$this->_get_permissions($filename);
-      if (array_search($permission,$permissions)===FALSE)
-      {
-        $this->add_permission
-          (
-            $filename,
-            'if (($RBAC_Response=$RBAC->userCanAccess("'.$permission.'"))!=1) return $RBAC_Response;'
-          );
-      }
-      return $this->get_permissions($filename);
-    }
-    function set_path_permission($path,$permission)
-    {
-      $files=glob($path.'*.php');
-      foreach($files as $file)
-      {
-        $this->set_permission($file,$permission);
-      }
-    }
-    function set_path_header($path,$header)
-    {
-      $files=glob($path.'*.php');
-      $filesMod=array();
-      foreach($files as $file)
-      {
-        $filesMod[]=$file;
-        $this->set_header($file,$header);
-      }
-      $dirs=glob($path.'*', GLOB_MARK  );
-      foreach($dirs as $dir)
-      {
-        if (substr( $dir , -1 , 1 )=='/') $this->set_path_header($dir,$header);
-      }
-      return $filesMod;
-    }
-    function remove_path_permission($path,$permission)
-    {
-      $files=glob($path.'*.php');
-      foreach($files as $file)
-      {
-        $this->remove_permission($file,$permission);
-      }
-    }
-    function remove_line($filename,$line)
-    {
-      $aSource = file($filename);
-      unset($aSource[$line]);
-      /*Save change*/
-      $fp=fopen($filename,'w');
-      fwrite($fp,implode('',$aSource));
-      fclose($fp);
-      return $this->get_permissions($filename);
-    }
-    function remove_permission($filename,$permission)
-    {
-      $aSource = file( $filename);
-      list($html,$permissions,$lines) = $this->_get_permissions($filename);
-      if (($row=array_search($permission,$permissions))!==FALSE)
-      {
-        $line=$lines[$row];
-        if (preg_match(GET_PERMISSION_REG_EXP2,$aSource[$line]))
-        {
-          unset($aSource[$line]);
-          $msg="Removed.";
+        ksort( $aOutSource );
+        $row0 = 0;
+        $html = '';
+        foreach ($aOutSource as $row => $line) {
+            if (($row - 1) > $row0)
+                $html .= $this->_printLine( $row, '...' );
+            $html .= $this->_printLine( $row + 1, $line, true, $aSource[$row], $filename . '?' . $row );
+            $row0 = $row;
         }
-        else
-        {
-          $msg="Can not be removed!";
-        }
-      }
-      /*Save change*/
-      $fp=fopen($filename,'w');
-      fwrite($fp,implode('',$aSource));
-      fclose($fp);
-      return $this->get_permissions($filename);
+        return array (($html === '') ? 'Dont have RBAC validation!' : ('<table>' . $html . '</table>'),$permissions,$lines
+        );
     }
-  }
-  $phpFile=new phpFile('methodsPermissions_Ajax',$_POST);
-?>
\ No newline at end of file
+
+    function get_permissions ($filename)
+    {
+        $res = $this->_get_permissions( $filename );
+        return $res[0];
+    }
+
+    function modify_line ($filename, $row, $value)
+    {
+        $aSource = file( $filename );
+        $line = $aSource[$row];
+        $nl = (strlen( $line ) >= 2) && (substr( $line, - 2, 2 ) == "\r\n") ? "\r\n" : ((strlen( $line ) >= 1) && (substr( $line, - 1, 1 ) == "\n") ? "\n" : "");
+        $aSource[$row] = $value . $nl;
+        /*Save change*/
+        $fp = fopen( $filename, 'w' );
+        fwrite( $fp, implode( '', $aSource ) );
+        fclose( $fp );
+        /*Format line*/
+        $regExp = GET_PERMISSION_REG_EXP;
+        $line = $aSource[$row];
+        $len = preg_match_all( $regExp, $line, $matches, PREG_OFFSET_CAPTURE );
+        for ($r = 0; $r < $len; $r ++) {
+            $match = $matches[0][$r][0];
+            $toPrint = ($matches[2][$r][0] != '') ? (htmlentities( $matches[1][$r][0], ENT_QUOTES, 'utf-8' ) . '<b>' . htmlentities( $matches[2][$r][0], ENT_QUOTES, 'utf-8' ) . '</b>' . htmlentities( $matches[3][$r][0], ENT_QUOTES, 'utf-8' )) : (htmlentities( $matches[4][$r][0], ENT_QUOTES, 'utf-8' ) . '<b>' . htmlentities( $matches[5][$r][0], ENT_QUOTES, 'utf-8' ) . '</b>' . htmlentities( $matches[6][$r][0], ENT_QUOTES, 'utf-8' ));
+            $line = str_replace( $match, $toPrint, $line );
+        }
+        return array ($line,$aSource[$row]
+        );
+    }
+
+    function set_header ($filename, $value)
+    {
+        $aFields = array ("_FILENAME_" => basename( $filename )
+        );
+        $value = G::replaceDataField( $value, $aFields );
+        $aOrigin = file( $filename );
+        //It suposse that allway start with <?. or <?php
+        $line = $aOrigin[0];
+        $nl = (strlen( $line ) >= 2) && (substr( $line, - 2, 2 ) == "\r\n") ? "\r\n" : ((strlen( $line ) >= 1) && (substr( $line, - 1, 1 ) == "\n") ? "\n" : "");
+
+        $codigo = implode( '', $aOrigin );
+        $pattern = '/\/\*[\w\W]+\* ' . 'ProcessMaker Open Source' . '[\w\W]+?\*\//i';
+        if (preg_match( $pattern, $codigo )) {
+            $codigo = preg_replace( $pattern, $value, $codigo );
+        } else {
+            $aSource = array ();
+            $aSource[0] = $aOrigin[0];
+            $aSource[1] = $value . $nl;
+            for ($r = 1; $r < sizeof( $aOrigin ); $r ++) {
+                $aSource[] = $aOrigin[$r];
+            }
+            $codigo = implode( '', $aSource );
+        }
+        /*Save change*/
+        $fp = fopen( $filename, 'w' );
+        fwrite( $fp, $codigo );
+        fclose( $fp );
+        return $this->get_permissions( $filename );
+    }
+
+    function add_permission ($filename, $value)
+    {
+        $aOrigin = file( $filename );
+        //It suposse that allway start with <?. or <?php
+        $aSource[0] = $aOrigin[0];
+        $line = $aOrigin[0];
+        $nl = (strlen( $line ) >= 2) && (substr( $line, - 2, 2 ) == "\r\n") ? "\r\n" : ((strlen( $line ) >= 1) && (substr( $line, - 1, 1 ) == "\n") ? "\n" : "");
+        $aSource[1] = $value . $nl;
+        for ($r = 1; $r < sizeof( $aOrigin ); $r ++) {
+            $aSource[] = $aOrigin[$r];
+        }
+        /*Save change*/
+        $fp = fopen( $filename, 'w' );
+        fwrite( $fp, implode( '', $aSource ) );
+        fclose( $fp );
+        return $this->get_permissions( $filename );
+    }
+
+    function _getLine (&$aSource, $pos)
+    {
+        $i = 1;
+        while ($pos > sizeof( $aSource[$i] )) {
+            $pos -= strlen( $aSource[$i] );
+            $i ++;
+        }
+        return $i - 1;
+    }
+
+    function _printLine ($row, $txt, $editable = false, $editValue = '', $name = '')
+    {
+        if ($editable) {
+            return '<tr><td><input value="X" type="button" style="width:100%;" ' . ' name="' . htmlentities( $name, ENT_QUOTES, 'utf-8' ) . '"' . ' onclick="removeLine(this);"/></td>' . '<td class="treeContent" align="right">' . $row . '</td>
+        <td class="treeNode"><span onclick="switchViewEdit(this,this.nextSibling);">' . $txt . '</span>' . '<input class="treeNode"' . ' name="' . htmlentities( $name, ENT_QUOTES, 'utf-8' ) . '"' . ' style="border:none;width:100%;display:none;"' . ' onblur="switchEditView(this.previousSibling,this);"' . ' value="' . htmlentities( $editValue, ENT_QUOTES, 'utf-8' ) . '"/></td></tr>';
+        } else {
+            return '<tr><td></td>' . '<td class="treeContent" align="right">' . $row . '</td>' . '<td class="treeNode">' . $txt . '</td></tr>';
+        }
+    }
+
+    function set_permission ($filename, $permission)
+    {
+        list ($html, $permissions) = $this->_get_permissions( $filename );
+        if (array_search( $permission, $permissions ) === false) {
+            $this->add_permission( $filename, 'if (($RBAC_Response=$RBAC->userCanAccess("' . $permission . '"))!=1) return $RBAC_Response;' );
+        }
+        return $this->get_permissions( $filename );
+    }
+
+    function set_path_permission ($path, $permission)
+    {
+        $files = glob( $path . '*.php' );
+        foreach ($files as $file) {
+            $this->set_permission( $file, $permission );
+        }
+    }
+
+    function set_path_header ($path, $header)
+    {
+        $files = glob( $path . '*.php' );
+        $filesMod = array ();
+        foreach ($files as $file) {
+            $filesMod[] = $file;
+            $this->set_header( $file, $header );
+        }
+        $dirs = glob( $path . '*', GLOB_MARK );
+        foreach ($dirs as $dir) {
+            if (substr( $dir, - 1, 1 ) == '/')
+                $this->set_path_header( $dir, $header );
+        }
+        return $filesMod;
+    }
+
+    function remove_path_permission ($path, $permission)
+    {
+        $files = glob( $path . '*.php' );
+        foreach ($files as $file) {
+            $this->remove_permission( $file, $permission );
+        }
+    }
+
+    function remove_line ($filename, $line)
+    {
+        $aSource = file( $filename );
+        unset( $aSource[$line] );
+        /*Save change*/
+        $fp = fopen( $filename, 'w' );
+        fwrite( $fp, implode( '', $aSource ) );
+        fclose( $fp );
+        return $this->get_permissions( $filename );
+    }
+
+    function remove_permission ($filename, $permission)
+    {
+        $aSource = file( $filename );
+        list ($html, $permissions, $lines) = $this->_get_permissions( $filename );
+        if (($row = array_search( $permission, $permissions )) !== false) {
+            $line = $lines[$row];
+            if (preg_match( GET_PERMISSION_REG_EXP2, $aSource[$line] )) {
+                unset( $aSource[$line] );
+                $msg = "Removed.";
+            } else {
+                $msg = "Can not be removed!";
+            }
+        }
+        /*Save change*/
+        $fp = fopen( $filename, 'w' );
+        fwrite( $fp, implode( '', $aSource ) );
+        fclose( $fp );
+        return $this->get_permissions( $filename );
+    }
+}
+$phpFile = new phpFile( 'methodsPermissions_Ajax', $_POST );
+
diff --git a/workflow/engine/methods/tools/translations.php b/workflow/engine/methods/tools/translations.php
index 9e4dc2ed1..91c975821 100755
--- a/workflow/engine/methods/tools/translations.php
+++ b/workflow/engine/methods/tools/translations.php
@@ -1,6 +1,6 @@
 <style>
 .tableOption {
-  color:#005791 !important;
+	color: #005791 !important;
 }
 </style>
 <?php
@@ -17,29 +17,28 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
  */
 
-  $G_MAIN_MENU = 'tools';
-  $G_SUB_MENU = 'toolsTranslations';
-  $G_ID_MENU_SELECTED = 'TRANSLATION';
-  $G_ID_SUB_MENU_SELECTED = 'TRANSLATION_LIST';
+$G_MAIN_MENU = 'tools';
+$G_SUB_MENU = 'toolsTranslations';
+$G_ID_MENU_SELECTED = 'TRANSLATION';
+$G_ID_SUB_MENU_SELECTED = 'TRANSLATION_LIST';
 
-  $table="TRANSLATION";
+$table = "TRANSLATION";
 
-  $G_PUBLISH = new Publisher;
-  $G_PUBLISH->AddContent('pagedtable', 'paged-table', 'tools/translationsList', '', array() , '');
-  if( isset($_SESSION['TOOLS_VIEWTYPE']) ) {
-    G::RenderPage('publishBlank', 'green-submenu');
-  } else {
-    G::RenderPage('publish');
-  }
+$G_PUBLISH = new Publisher();
+$G_PUBLISH->AddContent( 'pagedtable', 'paged-table', 'tools/translationsList', '', array (), '' );
+if (isset( $_SESSION['TOOLS_VIEWTYPE'] )) {
+    G::RenderPage( 'publishBlank', 'green-submenu' );
+} else {
+    G::RenderPage( 'publish' );
+}
 
diff --git a/workflow/engine/methods/tools/translationsAdd.php b/workflow/engine/methods/tools/translationsAdd.php
index 925bb86bd..4163e265f 100755
--- a/workflow/engine/methods/tools/translationsAdd.php
+++ b/workflow/engine/methods/tools/translationsAdd.php
@@ -12,27 +12,26 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
  */
-  $G_MAIN_MENU = 'tools';
-  $G_SUB_MENU = 'toolsTranslations';
-  $G_ID_MENU_SELECTED = 'TRANSLATION';
-  $G_ID_SUB_MENU_SELECTED = 'TRANSLATION_ADD';
+$G_MAIN_MENU = 'tools';
+$G_SUB_MENU = 'toolsTranslations';
+$G_ID_MENU_SELECTED = 'TRANSLATION';
+$G_ID_SUB_MENU_SELECTED = 'TRANSLATION_ADD';
 
-  $G_PUBLISH = new Publisher;
-  $G_PUBLISH->AddContent('xmlform', 'xmlform', 'tools/translationAdd', '', null, 'translationsSave' );
+$G_PUBLISH = new Publisher();
+$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'tools/translationAdd', '', null, 'translationsSave' );
+
+if (isset( $_SESSION['TOOLS_VIEWTYPE'] ) && $_SESSION['TOOLS_VIEWTYPE'] == 'blank') {
+    G::RenderPage( 'publishBlank', 'green-submenu' );
+} else {
+    G::RenderPage( 'publish' );
+}
 
-  if( isset($_SESSION['TOOLS_VIEWTYPE']) && $_SESSION['TOOLS_VIEWTYPE'] == 'blank') {
-    G::RenderPage('publishBlank', 'green-submenu');
-  } else {
-    G::RenderPage('publish');
-  }
-?>
\ No newline at end of file
diff --git a/workflow/engine/methods/tools/translationsAjax.php b/workflow/engine/methods/tools/translationsAjax.php
index 7a921b1fa..9d2544357 100755
--- a/workflow/engine/methods/tools/translationsAjax.php
+++ b/workflow/engine/methods/tools/translationsAjax.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * translationsAjax.php
- *  
+ *
  * ProcessMaker Open Source Edition
  * Copyright (C) 2004 - 2008 Colosa Inc.23
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
@@ -12,206 +12,194 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd., 
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- * 
  */
-  ini_set('display_errors','off');
-  G::LoadInclude('ajax');
-  $function = get_ajax_value('function');
-  $cat = get_ajax_value('cat');
-  $node = get_ajax_value('node');
-  $lang = get_ajax_value('lang');
-  $langLabel = get_ajax_value('langLabel');
-  $text = get_ajax_value('text');
-  $table="TRANSLATION";
-  $dbc = new DBConnection;
-  $ses = new DBSession($dbc);
-switch($function)
-{
-	case "editLabel":
-	case "changeLabel":
-		$query=$ses->execute("select * from $table where TRN_CATEGORY='$cat' and TRN_ID='$node' and TRN_LANG='$lang'",false);
-		if ($query->count()===0) {echo("Not found $cat:$node:$lang in table '$table'");return;}
-		if ($query->count()>1) {echo("The $cat:$node:$lang in table '$table' is not unique");return;}
-		$res=$query->read();
-		switch($function)
-		{
-		case "editLabel":
-			$myID="input_".$cat."_".$node."_".$lang;
-			$myID='aux';
-			echo("<input id='$myID' type='text' value='".htmlspecialchars($res['TRN_VALUE'])."' ".
-			ajax_event("onblur","translationsAjax.php",
-						 'lang_'.$cat.'_'.$node.'_'.$lang,
-						 "'function=changeLabel&cat=".urlencode($cat).
-						 "&node=".urlencode($node).
-						 "&lang=".urlencode($lang).
-						 "&langLabel='+encodeURI(getElementById('$myID').value)",'')
-			."/>");
-			break;
-		case "changeLabel":
-			$update=$ses->execute("update $table set TRN_VALUE='$langLabel' where TRN_CATEGORY='$cat' and TRN_ID='$node' and TRN_LANG='$lang'",false);
-			$query=$ses->execute("select * from $table where TRN_CATEGORY='$cat' and TRN_ID='$node' and TRN_LANG='$lang'",false);
-			if ($query->count()===0) {echo("Not found $cat:$node:$lang in table '$table'");return;}
-			if ($query->count()>1) {echo("The $cat:$node:$lang in table '$table' is not unique");return;}
-			$res=$query->read();
-			echo(htmlspecialchars($res['TRN_VALUE']));
-			break;
-			break;
-		}
-			G::LoadClass( "translation" );
+ini_set( 'display_errors', 'off' );
+G::LoadInclude( 'ajax' );
+$function = get_ajax_value( 'function' );
+$cat = get_ajax_value( 'cat' );
+$node = get_ajax_value( 'node' );
+$lang = get_ajax_value( 'lang' );
+$langLabel = get_ajax_value( 'langLabel' );
+$text = get_ajax_value( 'text' );
+$table = "TRANSLATION";
+$dbc = new DBConnection();
+$ses = new DBSession( $dbc );
+switch ($function) {
+    case "editLabel":
+    case "changeLabel":
+        $query = $ses->execute( "select * from $table where TRN_CATEGORY='$cat' and TRN_ID='$node' and TRN_LANG='$lang'", false );
+        if ($query->count() === 0) {
+            echo ("Not found $cat:$node:$lang in table '$table'");
+            return;
+        }
+        if ($query->count() > 1) {
+            echo ("The $cat:$node:$lang in table '$table' is not unique");
+            return;
+        }
+        $res = $query->read();
+        switch ($function) {
+            case "editLabel":
+                $myID = "input_" . $cat . "_" . $node . "_" . $lang;
+                $myID = 'aux';
+                echo ("<input id='$myID' type='text' value='" . htmlspecialchars( $res['TRN_VALUE'] ) . "' " . ajax_event( "onblur", "translationsAjax.php", 'lang_' . $cat . '_' . $node . '_' . $lang, "'function=changeLabel&cat=" . urlencode( $cat ) . "&node=" . urlencode( $node ) . "&lang=" . urlencode( $lang ) . "&langLabel='+encodeURI(getElementById('$myID').value)", '' ) . "/>");
+                break;
+            case "changeLabel":
+                $update = $ses->execute( "update $table set TRN_VALUE='$langLabel' where TRN_CATEGORY='$cat' and TRN_ID='$node' and TRN_LANG='$lang'", false );
+                $query = $ses->execute( "select * from $table where TRN_CATEGORY='$cat' and TRN_ID='$node' and TRN_LANG='$lang'", false );
+                if ($query->count() === 0) {
+                    echo ("Not found $cat:$node:$lang in table '$table'");
+                    return;
+                }
+                if ($query->count() > 1) {
+                    echo ("The $cat:$node:$lang in table '$table' is not unique");
+                    return;
+                }
+                $res = $query->read();
+                echo (htmlspecialchars( $res['TRN_VALUE'] ));
+                break;
+                break;
+        }
+        G::LoadClass( "translation" );
 
-		$dbc = new DBConnection;
-		$obj = new Translation;
-		$obj->SetTo($dbc );
-		$translation2 = $obj->generateFileTranslation();
-		break;
-	case "listLanguage":
-		$query=$ses->execute("select distinct TRN_LANG from $table",false);
-		$template = new TemplatePower(PATH_CORE . 'templates/tools/translationsTP.html');
-		$template->prepare();
-		$template->newBlock("languageList");
-		$template->assign("ajaxDelLang",ajax_event("onclick","translationsAjax","showSpace",
-								"'function=delLanguage&lang='+encodeURI(getElementById('language').value)",'hideLangBar'));
+        $dbc = new DBConnection();
+        $obj = new Translation();
+        $obj->SetTo( $dbc );
+        $translation2 = $obj->generateFileTranslation();
+        break;
+    case "listLanguage":
+        $query = $ses->execute( "select distinct TRN_LANG from $table", false );
+        $template = new TemplatePower( PATH_CORE . 'templates/tools/translationsTP.html' );
+        $template->prepare();
+        $template->newBlock( "languageList" );
+        $template->assign( "ajaxDelLang", ajax_event( "onclick", "translationsAjax", "showSpace", "'function=delLanguage&lang='+encodeURI(getElementById('language').value)", 'hideLangBar' ) );
 
-		for($r=1;$r<=$query->count();$r++)
-		{
-			$res=$query->read();
-			$template->newBlock("languageItem");
-			$template->assign("langIdRadio",$res['TRN_LANG']);
-		}
-		$template->printToScreen();
-		break;
-	case "show":
-	case "search":
-	case "addField":
-	case "addLanguage":
-	case "delLanguage":
-	case "delField":
-		switch($function)
-		{
-			case "show":
-				$query=$ses->execute("select * from $table ORDER BY TRN_CATEGORY ASC , TRN_ID ASC , TRN_LANG ASC ",false);
-				break;
-			case "search":
-				$query=$ses->execute("select * from $table where (TRN_CATEGORY like '%$text%') or (TRN_ID like '%$text%') or (TRN_LANG like '%$text%') or (TRN_VALUE like '%$text%') ORDER BY TRN_CATEGORY ASC , TRN_ID ASC , TRN_LANG ASC ",false);
-				break;
-			case "addField":
-			  if (!defined('LANGUAGES')) define('LANGUAGES',SYS_LANG);
-				$languages=explode(",",LANGUAGES);
-				foreach($languages as $lang)
-				{
-					//$langLabel=$cat;
-/*					$update=$ses->execute("insert into $table(TRN_CATEGORY , TRN_ID , TRN_LANG , TRN_VALUE  )
+        for ($r = 1; $r <= $query->count(); $r ++) {
+            $res = $query->read();
+            $template->newBlock( "languageItem" );
+            $template->assign( "langIdRadio", $res['TRN_LANG'] );
+        }
+        $template->printToScreen();
+        break;
+    case "show":
+    case "search":
+    case "addField":
+    case "addLanguage":
+    case "delLanguage":
+    case "delField":
+        switch ($function) {
+            case "show":
+                $query = $ses->execute( "select * from $table ORDER BY TRN_CATEGORY ASC , TRN_ID ASC , TRN_LANG ASC ", false );
+                break;
+            case "search":
+                $query = $ses->execute( "select * from $table where (TRN_CATEGORY like '%$text%') or (TRN_ID like '%$text%') or (TRN_LANG like '%$text%') or (TRN_VALUE like '%$text%') ORDER BY TRN_CATEGORY ASC , TRN_ID ASC , TRN_LANG ASC ", false );
+                break;
+            case "addField":
+                if (! defined( 'LANGUAGES' ))
+                    define( 'LANGUAGES', SYS_LANG );
+                $languages = explode( ",", LANGUAGES );
+                foreach ($languages as $lang) {
+                    //$langLabel=$cat;
+                    /*					$update=$ses->execute("insert into $table(TRN_CATEGORY , TRN_ID , TRN_LANG , TRN_VALUE  )
 															 values ('$cat','$node','$lang','$langLabel')",false);*/
-					$update=$ses->execute("insert into $table(TRN_CATEGORY , TRN_ID , TRN_LANG , TRN_VALUE  )
-															 values ('LABEL','$node','$lang','$langLabel')",false);
-				}
-				$query=$ses->execute("select * from $table ORDER BY TRN_CATEGORY ASC , TRN_ID ASC , TRN_LANG ASC ",false);
-				break;
-			case "addLanguage":
-//SELECT distinct TRN_CATEGORY, TRN_ID, 'ne', 'new value' FROM TRANSLATION WHERE TRN_LANG<>'ne'
-//INSERT INTO TRANSLATION(TRN_CATEGORY, TRN_ID, TRN_LANG , TRN_VALUE ) SELECT distinct TRN_CATEGORY, TRN_ID, 'ne', TRN_VALUE FROM TRANSLATION WHERE TRN_LANG<>'ne'
-				$query1=$ses->execute("select * from $table where TRN_LANG='$lang'",false);
-				$query2=$ses->execute("select distinct TRN_CATEGORY, TRN_ID from $table",false);
-				$existe=array();
-				for($r=1;$r<=$query1->count();$r++)
-				{
-					$res=$query1->read();
-					$existe[$res['TRN_CATEGORY']."_".$res['TRN_ID']]=$res;
-				}
-				for($r=1;$r<=$query2->count();$r++)
-				{
-					$res=$query2->read();
-					$cat=$res['TRN_CATEGORY'];
-					$node=$res['TRN_ID'];
-					$langLabel=$res['TRN_CATEGORY'];
-					if (!array_key_exists($cat."_".$node,$existe))
+                    $update = $ses->execute( "insert into $table(TRN_CATEGORY , TRN_ID , TRN_LANG , TRN_VALUE  )
+															 values ('LABEL','$node','$lang','$langLabel')", false );
+                }
+                $query = $ses->execute( "select * from $table ORDER BY TRN_CATEGORY ASC , TRN_ID ASC , TRN_LANG ASC ", false );
+                break;
+            case "addLanguage":
+                //SELECT distinct TRN_CATEGORY, TRN_ID, 'ne', 'new value' FROM TRANSLATION WHERE TRN_LANG<>'ne'
+                //INSERT INTO TRANSLATION(TRN_CATEGORY, TRN_ID, TRN_LANG , TRN_VALUE ) SELECT distinct TRN_CATEGORY, TRN_ID, 'ne', TRN_VALUE FROM TRANSLATION WHERE TRN_LANG<>'ne'
+                $query1 = $ses->execute( "select * from $table where TRN_LANG='$lang'", false );
+                $query2 = $ses->execute( "select distinct TRN_CATEGORY, TRN_ID from $table", false );
+                $existe = array ();
+                for ($r = 1; $r <= $query1->count(); $r ++) {
+                    $res = $query1->read();
+                    $existe[$res['TRN_CATEGORY'] . "_" . $res['TRN_ID']] = $res;
+                }
+                for ($r = 1; $r <= $query2->count(); $r ++) {
+                    $res = $query2->read();
+                    $cat = $res['TRN_CATEGORY'];
+                    $node = $res['TRN_ID'];
+                    $langLabel = $res['TRN_CATEGORY'];
+                    if (! array_key_exists( $cat . "_" . $node, $existe ))
 /*						$update=$ses->execute("insert into $table(TRN_CATEGORY , TRN_ID , TRN_LANG , TRN_VALUE  )
 															 values ('$cat','$node','$lang','$langLabel')",false);*/
-					$update=$ses->execute("insert into $table(TRN_CATEGORY , TRN_ID , TRN_LANG , TRN_VALUE  )
-															 values ('LABELS','$node','en','$langLabel')",false);
-					unset($update);
-				}
-				unset($existe);
-				unset($query1);unset($query2);
-				$query=$ses->execute("select * from $table ORDER BY TRN_CATEGORY ASC , TRN_ID ASC , TRN_LANG ASC ",false);
-				break;
-			case "delLanguage":
-				$update=$ses->execute("delete from $table where TRN_LANG='$lang'",false);
-				$query=$ses->execute("select * from $table ORDER BY TRN_CATEGORY ASC , TRN_ID ASC , TRN_LANG ASC ",false);
-				break;
-			case "delField":
-				$update=$ses->execute("delete from $table where TRN_CATEGORY='$cat' and TRN_ID='$node' and TRN_LANG='$lang'",false);
-				//echo("delete from $table where TRN_CATEGORY='$cat' and TRN_ID='$node' and TRN_LANG='$lang'");
-				$query=$ses->execute("select * from $table ORDER BY TRN_CATEGORY ASC , TRN_ID ASC , TRN_LANG ASC ",false);
-				break;
-		}
-		$template = new TemplatePower(PATH_CORE . 'templates/tools/translationsTP.html');
-		$template->prepare();
-		$template->newBlock("CONTENT");
-		$template->newBlock("table");
-		$aCat="";$aNode="";
-		for($i=1;$i<=$query->count();$i++)
-		{
-			$template->newBlock("row");
-			$res=$query->read();
-			$cat=$res['TRN_CATEGORY'];
-			$node=$res['TRN_ID'];
-			$lang=$res['TRN_LANG'];
-			$langLabel=$res['TRN_VALUE'];
-			if ($cat!=$aCat)
-			{
-				$template->newBlock("TDcat");
-				$template->assign("catId",$res['TRN_CATEGORY']);
-				$template->assign("ajaxDelField",
-						ajax_event('onclick','translationsAjax','showSpace',
-						"'function=delField".
-						"&cat=".urlencode($cat).
-						"&node=".urlencode($node).
-						"&lang=".urlencode($lang)."'",''));
-			}
-			if (($cat!=$aCat) ||
-			    ($node!=$aNode))
-			{
-				$template->newBlock("TDnode");
-				$template->assign("nodeId",$res['TRN_ID']);
-			}
-			//$aCat=$cat;
-			//$aNode=$node;
-			$template->goToBlock("row");
-			$template->assign("catId",$res['TRN_CATEGORY']);
-			$template->assign("nodeId",$res['TRN_ID']);
-			$template->assign("langId",$lang);
-			$template->assign("langLabel",$langLabel);
-			$template->assign("ajaxLabel","onclick=\"if (!document.getElementById('aux'))".
-					ajax_init('translationsAjax.php',
-										 'lang_'.$cat.'_'.$node.'_'.$lang,
-										 "'function=editLabel".
-										 "&cat=".urlencode($cat).
-										 "&node=".urlencode($node).
-										 "&lang=".urlencode($lang)."'",'focusInputLabel')
-											.'"');
-		}
-		$template->printToScreen();
-		break;
+                    $update = $ses->execute( "insert into $table(TRN_CATEGORY , TRN_ID , TRN_LANG , TRN_VALUE  )
+															 values ('LABELS','$node','en','$langLabel')", false );
+                    unset( $update );
+                }
+                unset( $existe );
+                unset( $query1 );
+                unset( $query2 );
+                $query = $ses->execute( "select * from $table ORDER BY TRN_CATEGORY ASC , TRN_ID ASC , TRN_LANG ASC ", false );
+                break;
+            case "delLanguage":
+                $update = $ses->execute( "delete from $table where TRN_LANG='$lang'", false );
+                $query = $ses->execute( "select * from $table ORDER BY TRN_CATEGORY ASC , TRN_ID ASC , TRN_LANG ASC ", false );
+                break;
+            case "delField":
+                $update = $ses->execute( "delete from $table where TRN_CATEGORY='$cat' and TRN_ID='$node' and TRN_LANG='$lang'", false );
+                //echo("delete from $table where TRN_CATEGORY='$cat' and TRN_ID='$node' and TRN_LANG='$lang'");
+                $query = $ses->execute( "select * from $table ORDER BY TRN_CATEGORY ASC , TRN_ID ASC , TRN_LANG ASC ", false );
+                break;
+        }
+        $template = new TemplatePower( PATH_CORE . 'templates/tools/translationsTP.html' );
+        $template->prepare();
+        $template->newBlock( "CONTENT" );
+        $template->newBlock( "table" );
+        $aCat = "";
+        $aNode = "";
+        for ($i = 1; $i <= $query->count(); $i ++) {
+            $template->newBlock( "row" );
+            $res = $query->read();
+            $cat = $res['TRN_CATEGORY'];
+            $node = $res['TRN_ID'];
+            $lang = $res['TRN_LANG'];
+            $langLabel = $res['TRN_VALUE'];
+            if ($cat != $aCat) {
+                $template->newBlock( "TDcat" );
+                $template->assign( "catId", $res['TRN_CATEGORY'] );
+                $template->assign( "ajaxDelField", ajax_event( 'onclick', 'translationsAjax', 'showSpace', "'function=delField" . "&cat=" . urlencode( $cat ) . "&node=" . urlencode( $node ) . "&lang=" . urlencode( $lang ) . "'", '' ) );
+            }
+            if (($cat != $aCat) || ($node != $aNode)) {
+                $template->newBlock( "TDnode" );
+                $template->assign( "nodeId", $res['TRN_ID'] );
+            }
+            //$aCat=$cat;
+            //$aNode=$node;
+            $template->goToBlock( "row" );
+            $template->assign( "catId", $res['TRN_CATEGORY'] );
+            $template->assign( "nodeId", $res['TRN_ID'] );
+            $template->assign( "langId", $lang );
+            $template->assign( "langLabel", $langLabel );
+            $template->assign( "ajaxLabel", "onclick=\"if (!document.getElementById('aux'))" . ajax_init( 'translationsAjax.php', 'lang_' . $cat . '_' . $node . '_' . $lang, "'function=editLabel" . "&cat=" . urlencode( $cat ) . "&node=" . urlencode( $node ) . "&lang=" . urlencode( $lang ) . "'", 'focusInputLabel' ) . '"' );
+        }
+        $template->printToScreen();
+        break;
 }
 ?>
 <?php
-function ajax_event($event="onclick",$page,$div,$param,$freturn="")
+
+
+function ajax_event ($event = "onclick", $page, $div, $param, $freturn = "")
 {
-	if ($freturn==='') $freturn="''";
-	return "$event=\"ajax_init('$page','$div',$param,$freturn)\"";
+    if ($freturn === '')
+        $freturn = "''";
+    return "$event=\"ajax_init('$page','$div',$param,$freturn)\"";
 }
-function ajax_init($page,$div,$param,$freturn="")
+
+function ajax_init ($page, $div, $param, $freturn = "")
 {
-	if ($freturn=='') $freturn="''";
-	return "ajax_init('$page','$div',$param,$freturn);";
+    if ($freturn == '')
+        $freturn = "''";
+    return "ajax_init('$page','$div',$param,$freturn);";
 }
-?>
+
diff --git a/workflow/engine/methods/tools/translationsDelete.php b/workflow/engine/methods/tools/translationsDelete.php
index c0501df5a..f78f2d9ca 100755
--- a/workflow/engine/methods/tools/translationsDelete.php
+++ b/workflow/engine/methods/tools/translationsDelete.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * translationsDelete.php
- *  
+ *
  * ProcessMaker Open Source Edition
  * Copyright (C) 2004 - 2008 Colosa Inc.23
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
@@ -12,32 +12,32 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd., 
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- * 
  */
 
-  //to do: improve the way to pass two or more parameters in the paged-table ( link )
-    
-  $aux = explode ( '|', $_GET['id'] );
-  $category = str_replace ( '"', '', $aux[0] );
-  $id       = str_replace ( '"', '', $aux[1] );
-  
+//to do: improve the way to pass two or more parameters in the paged-table ( link )
 
-  require_once ( "classes/model/Translation.php" );
-  //if exists the row in the database propel will update it, otherwise will insert.
-  $tr = TranslationPeer::retrieveByPK( $category, $id, 'en' );
-  
-  if ( ( is_object ( $tr ) &&  get_class ($tr) == 'Translation' ) ) {
-    $tr->delete(); 
-  }
+
+$aux = explode( '|', $_GET['id'] );
+$category = str_replace( '"', '', $aux[0] );
+$id = str_replace( '"', '', $aux[1] );
+
+require_once ("classes/model/Translation.php");
+//if exists the row in the database propel will update it, otherwise will insert.
+$tr = TranslationPeer::retrieveByPK( $category, $id, 'en' );
+
+if ((is_object( $tr ) && get_class( $tr ) == 'Translation')) {
+    $tr->delete();
+}
 //  else
 
-  G::Header('location: translations');   
-?>
\ No newline at end of file
+
+G::Header( 'location: translations' );
+
diff --git a/workflow/engine/methods/tools/translationsEdit.php b/workflow/engine/methods/tools/translationsEdit.php
index 0480765d1..54c2db1db 100755
--- a/workflow/engine/methods/tools/translationsEdit.php
+++ b/workflow/engine/methods/tools/translationsEdit.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * translationsEdit.php
- *  
+ *
  * ProcessMaker Open Source Edition
  * Copyright (C) 2004 - 2008 Colosa Inc.23
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
@@ -12,49 +12,47 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd., 
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- * 
  */
 
-  //to do: improve the way to pass two or more parameters in the paged-table ( link )
-    
-  $aux = explode ( '|', $_GET['id'] );
-  $category = str_replace ( '"', '', $aux[0] );
-  $id       = str_replace ( '"', '', $aux[1] );
-  
+//to do: improve the way to pass two or more parameters in the paged-table ( link )
 
-  require_once ( "classes/model/Translation.php" );
-  //if exists the row in the database propel will update it, otherwise will insert.
-  $tr = TranslationPeer::retrieveByPK( $category, $id, 'en' );
-  
-  if ( ( is_object ( $tr ) &&  get_class ($tr) == 'Translation' ) ) { 
-     $fields['trn_category'] = $tr->getTrnCategory();
-     $fields['trn_id']       = $tr->getTrnId();
-     $fields['trn_value']    = $tr->getTrnValue();
-  }
-  else
-    $fields = array();  
-  
-  $G_MAIN_MENU = 'tools';
-  $G_SUB_MENU = 'toolsTranslations';
-  $G_ID_MENU_SELECTED = 'TOOLS';
-  $G_ID_SUB_MENU_SELECTED = 'ADD_TRANSLATION';
 
-  $G_PUBLISH = new Publisher;
-  $dbc = new DBConnection;
-  $ses = new DBSession($dbc);
-  $G_PUBLISH = new Publisher;
-  $G_PUBLISH->AddContent('xmlform', 'xmlform', 'tools/translationAdd', '', $fields, 'translationsSave' );
-  if( isset($_SESSION['TOOLS_VIEWTYPE']) && $_SESSION['TOOLS_VIEWTYPE'] == 'blank') {
-    G::RenderPage('publishBlank', 'green-submenu');
-  } else {
-    G::RenderPage('publish');
-  }
-?>
\ No newline at end of file
+$aux = explode( '|', $_GET['id'] );
+$category = str_replace( '"', '', $aux[0] );
+$id = str_replace( '"', '', $aux[1] );
+
+require_once ("classes/model/Translation.php");
+//if exists the row in the database propel will update it, otherwise will insert.
+$tr = TranslationPeer::retrieveByPK( $category, $id, 'en' );
+
+if ((is_object( $tr ) && get_class( $tr ) == 'Translation')) {
+    $fields['trn_category'] = $tr->getTrnCategory();
+    $fields['trn_id'] = $tr->getTrnId();
+    $fields['trn_value'] = $tr->getTrnValue();
+} else
+    $fields = array ();
+
+$G_MAIN_MENU = 'tools';
+$G_SUB_MENU = 'toolsTranslations';
+$G_ID_MENU_SELECTED = 'TOOLS';
+$G_ID_SUB_MENU_SELECTED = 'ADD_TRANSLATION';
+
+$G_PUBLISH = new Publisher();
+$dbc = new DBConnection();
+$ses = new DBSession( $dbc );
+$G_PUBLISH = new Publisher();
+$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'tools/translationAdd', '', $fields, 'translationsSave' );
+if (isset( $_SESSION['TOOLS_VIEWTYPE'] ) && $_SESSION['TOOLS_VIEWTYPE'] == 'blank') {
+    G::RenderPage( 'publishBlank', 'green-submenu' );
+} else {
+    G::RenderPage( 'publish' );
+}
+
diff --git a/workflow/engine/methods/tools/translationsSave.php b/workflow/engine/methods/tools/translationsSave.php
index caedd99e4..43702759d 100755
--- a/workflow/engine/methods/tools/translationsSave.php
+++ b/workflow/engine/methods/tools/translationsSave.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * translationsSave.php
- *  
+ *
  * ProcessMaker Open Source Edition
  * Copyright (C) 2004 - 2008 Colosa Inc.23
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
@@ -12,25 +12,24 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd., 
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- * 
  */
 
-  $form = $_POST['form'];
-  require_once ( "classes/model/Translation.php" );
-  $form['trn_value'] = preg_replace("[\n|\r|\n\r]", ' ', $form['trn_value']);
-  
-  //$t = new Translation;
-  $res = Translation::addTranslation(  $form['trn_category'],  $form['trn_id'], 'en' ,  $form['trn_value'] );
-  if ( $res['codError'] < 0 ) {
-    G::SendMessageText ( $res['message'] , 'error' );  
-  }
-  G::Header('location: translations');   
-?>
\ No newline at end of file
+$form = $_POST['form'];
+require_once ("classes/model/Translation.php");
+$form['trn_value'] = preg_replace( "[\n|\r|\n\r]", ' ', $form['trn_value'] );
+
+//$t = new Translation;
+$res = Translation::addTranslation( $form['trn_category'], $form['trn_id'], 'en', $form['trn_value'] );
+if ($res['codError'] < 0) {
+    G::SendMessageText( $res['message'], 'error' );
+}
+G::Header( 'location: translations' );
+
diff --git a/workflow/engine/methods/tools/updateTranslation.php b/workflow/engine/methods/tools/updateTranslation.php
index 98be99214..2a569fb08 100755
--- a/workflow/engine/methods/tools/updateTranslation.php
+++ b/workflow/engine/methods/tools/updateTranslation.php
@@ -12,32 +12,31 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
  */
 
-  require_once ( "classes/model/Translation.php" );
+require_once ("classes/model/Translation.php");
 
-  $t = new Translation;
-  $fields = Translation::generateFileTranslation('en');
+$t = new Translation();
+$fields = Translation::generateFileTranslation( 'en' );
 
-  $G_MAIN_MENU = 'tools';
-  $G_SUB_MENU = 'toolsTranslations';
-  $G_ID_MENU_SELECTED = 'TRANSLATION';
-  $G_ID_SUB_MENU_SELECTED = 'TRANSLATION_REBUILD';
+$G_MAIN_MENU = 'tools';
+$G_SUB_MENU = 'toolsTranslations';
+$G_ID_MENU_SELECTED = 'TRANSLATION';
+$G_ID_SUB_MENU_SELECTED = 'TRANSLATION_REBUILD';
+
+$G_PUBLISH = new Publisher();
+$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'tools/updateTranslation', '', $fields );
+if (isset( $_SESSION['TOOLS_VIEWTYPE'] ) && $_SESSION['TOOLS_VIEWTYPE'] == 'blank') {
+    G::RenderPage( 'publishBlank', 'green-submenu' );
+} else {
+    G::RenderPage( 'publish' );
+}
 
-  $G_PUBLISH = new Publisher;
-  $G_PUBLISH->AddContent('xmlform', 'xmlform', 'tools/updateTranslation', '', $fields);
-  if( isset($_SESSION['TOOLS_VIEWTYPE']) && $_SESSION['TOOLS_VIEWTYPE'] == 'blank') {
-    G::RenderPage('publishBlank', 'green-submenu');
-  } else {
-    G::RenderPage('publish');
-  }
-?>
\ No newline at end of file

From 5485060c3fc124c188335b372dde0a9fb50ca900 Mon Sep 17 00:00:00 2001
From: jennylee <jennylee@colosa.com>
Date: Wed, 17 Oct 2012 18:13:05 -0400
Subject: [PATCH 4/4] CODE STYLE, workflow/engine/methods/users/

FILES:
data_usersList.php
index.php
myInfo.php
myInfo_Ajax.php
myInfo_Edit.php
myInfo_Save.php
usersAjax.php
usersEdit.php
usersGroups.php
usersInit.php
usersNew.php
users_Ajax.php
users_AuthSource.php
users_AuthSourceSave.php
users_Delete.php
users_DeleteAssign.php
users_DeleteReassign.php
users_DeleteReassignEnd.php
users_Edit.php
users_Groups.php
users_List.php
users_New.php
users_Reassign.php
users_ReassignCases.php
users_Save.php
users_View.php
users_ViewPhoto.php
users_ViewPhotoGrid.php
users_ViewResume.php
---
 .../engine/methods/users/data_usersList.php   |   63 +-
 workflow/engine/methods/users/index.php       |   22 +-
 workflow/engine/methods/users/myInfo.php      |   27 +-
 workflow/engine/methods/users/myInfo_Ajax.php |   30 +-
 workflow/engine/methods/users/myInfo_Edit.php |  264 ++--
 workflow/engine/methods/users/myInfo_Save.php |  292 +++--
 workflow/engine/methods/users/usersAjax.php   | 1069 +++++++++--------
 workflow/engine/methods/users/usersEdit.php   |   21 +-
 workflow/engine/methods/users/usersGroups.php |   63 +-
 workflow/engine/methods/users/usersInit.php   |   74 +-
 workflow/engine/methods/users/usersNew.php    |   40 +-
 workflow/engine/methods/users/users_Ajax.php  |  965 ++++++++-------
 .../engine/methods/users/users_AuthSource.php |   23 +-
 .../methods/users/users_AuthSourceSave.php    |   35 +-
 .../engine/methods/users/users_Delete.php     |   91 +-
 .../methods/users/users_DeleteAssign.php      |   40 +-
 .../methods/users/users_DeleteReassign.php    |  281 ++---
 .../methods/users/users_DeleteReassignEnd.php |  127 +-
 workflow/engine/methods/users/users_Edit.php  |  315 +++--
 .../engine/methods/users/users_Groups.php     |   44 +-
 workflow/engine/methods/users/users_List.php  |  136 +--
 workflow/engine/methods/users/users_New.php   |  170 +--
 .../engine/methods/users/users_Reassign.php   |   48 +-
 .../methods/users/users_ReassignCases.php     |  181 ++-
 workflow/engine/methods/users/users_Save.php  |  606 +++++-----
 workflow/engine/methods/users/users_View.php  |  110 +-
 .../engine/methods/users/users_ViewPhoto.php  |   90 +-
 .../methods/users/users_ViewPhotoGrid.php     |   87 +-
 .../engine/methods/users/users_ViewResume.php |  100 +-
 29 files changed, 2665 insertions(+), 2749 deletions(-)

diff --git a/workflow/engine/methods/users/data_usersList.php b/workflow/engine/methods/users/data_usersList.php
index 1cc04475e..2fb6e9a26 100755
--- a/workflow/engine/methods/users/data_usersList.php
+++ b/workflow/engine/methods/users/data_usersList.php
@@ -12,63 +12,60 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
  */
 
 require_once (PATH_RBAC . "model/RolesPeer.php");
-G::LoadClass('ArrayPeer');
+G::LoadClass( 'ArrayPeer' );
 
-isset($_POST['textFilter']) ? $filter = $_POST['textFilter'] : $filter = '';
+isset( $_POST['textFilter'] ) ? $filter = $_POST['textFilter'] : $filter = '';
 
 $sDelimiter = DBAdapter::getStringDelimiter();
 require_once 'classes/model/Users.php';
-$oCriteria = new Criteria('workflow');
-$oCriteria->addSelectColumn(UsersPeer::USR_UID);
+$oCriteria = new Criteria( 'workflow' );
+$oCriteria->addSelectColumn( UsersPeer::USR_UID );
 
-$sDataBase = 'database_' . strtolower(DB_ADAPTER);
-if(G::LoadSystemExist($sDataBase)){
-  G::LoadSystem($sDataBase);
-  $oDataBase = new database();
-  $oCriteria->addAsColumn('USR_COMPLETENAME', $oDataBase->concatString("USR_LASTNAME", "' '", "USR_FIRSTNAME"));
-  //$oCriteria->addAsColumn('USR_PHOTO', $oDataBase->concatString("'".PATH_IMAGES_ENVIRONMENT_USERS."'", "USR_UID","'.gif'"));
+$sDataBase = 'database_' . strtolower( DB_ADAPTER );
+if (G::LoadSystemExist( $sDataBase )) {
+    G::LoadSystem( $sDataBase );
+    $oDataBase = new database();
+    $oCriteria->addAsColumn( 'USR_COMPLETENAME', $oDataBase->concatString( "USR_LASTNAME", "' '", "USR_FIRSTNAME" ) );
+    //$oCriteria->addAsColumn('USR_PHOTO', $oDataBase->concatString("'".PATH_IMAGES_ENVIRONMENT_USERS."'", "USR_UID","'.gif'"));
 }
 
-$oCriteria->addSelectColumn(UsersPeer::USR_USERNAME);
-$oCriteria->addSelectColumn(UsersPeer::USR_EMAIL);
-$oCriteria->addSelectColumn(UsersPeer::USR_ROLE);
-$oCriteria->addSelectColumn(UsersPeer::USR_DUE_DATE);
+$oCriteria->addSelectColumn( UsersPeer::USR_USERNAME );
+$oCriteria->addSelectColumn( UsersPeer::USR_EMAIL );
+$oCriteria->addSelectColumn( UsersPeer::USR_ROLE );
+$oCriteria->addSelectColumn( UsersPeer::USR_DUE_DATE );
 //$oCriteria->addAsColumn('USR_VIEW', $sDelimiter . G::LoadTranslation('ID_DETAIL') . $sDelimiter);
 //$oCriteria->addAsColumn('USR_EDIT', $sDelimiter . G::LoadTranslation('ID_EDIT') . $sDelimiter);
 //$oCriteria->addAsColumn('USR_DELETE', $sDelimiter . G::LoadTranslation('ID_DELETE') . $sDelimiter);
 //$oCriteria->addAsColumn('USR_AUTH', $sDelimiter . G::LoadTranslation('ID_AUTHENTICATION') . $sDelimiter);
 //$oCriteria->addAsColumn('USR_REASSIGN', $sDelimiter . G::LoadTranslation('ID_REASSIGN_CASES') . $sDelimiter);
-$oCriteria->add(UsersPeer::USR_STATUS, array('CLOSED'), Criteria::NOT_IN);
+$oCriteria->add( UsersPeer::USR_STATUS, array ('CLOSED'
+), Criteria::NOT_IN );
 
-if ($filter != ''){ 
-	$cc = $oCriteria->getNewCriterion(UsersPeer::USR_USERNAME,'%'.$filter.'%',Criteria::LIKE)->addOr(
-    	  $oCriteria->getNewCriterion(UsersPeer::USR_FIRSTNAME,'%'.$filter.'%',Criteria::LIKE)->addOr(
-      	  $oCriteria->getNewCriterion(UsersPeer::USR_LASTNAME,'%'.$filter.'%',Criteria::LIKE)));
-	$oCriteria->add($cc);
+if ($filter != '') {
+    $cc = $oCriteria->getNewCriterion( UsersPeer::USR_USERNAME, '%' . $filter . '%', Criteria::LIKE )->addOr( $oCriteria->getNewCriterion( UsersPeer::USR_FIRSTNAME, '%' . $filter . '%', Criteria::LIKE )->addOr( $oCriteria->getNewCriterion( UsersPeer::USR_LASTNAME, '%' . $filter . '%', Criteria::LIKE ) ) );
+    $oCriteria->add( $cc );
     //echo $oCriteria->toString();
 }
 
+$rs = UsersPeer::DoSelectRs( $oCriteria );
+$rs->setFetchmode( ResultSet::FETCHMODE_ASSOC );
 
-
-$rs = UsersPeer::DoSelectRs ($oCriteria);
-$rs->setFetchmode (ResultSet::FETCHMODE_ASSOC);
-
-$rows = Array();
-while($rs->next()){
-	$rows[] = $rs->getRow();
-//	if (!file_exists($aux['USR_PHOTO'])) $aux['USR_PHOTO'] = 'public_html/images/user.gif';
-//	$rows[] = $aux;
+$rows = Array ();
+while ($rs->next()) {
+    $rows[] = $rs->getRow();
+    //	if (!file_exists($aux['USR_PHOTO'])) $aux['USR_PHOTO'] = 'public_html/images/user.gif';
+    //	$rows[] = $aux;
 }
-echo '{users: '.G::json_encode($rows).'}';
\ No newline at end of file
+echo '{users: ' . G::json_encode( $rows ) . '}';
+
diff --git a/workflow/engine/methods/users/index.php b/workflow/engine/methods/users/index.php
index 7fae54b36..54efaf5d5 100755
--- a/workflow/engine/methods/users/index.php
+++ b/workflow/engine/methods/users/index.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * index.php
- *  
+ *
  * ProcessMaker Open Source Edition
  * Copyright (C) 2004 - 2008 Colosa Inc.23
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
@@ -12,17 +12,15 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd., 
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- * 
  */
-  $newFile = str_replace ( 'index.php', 'users_List.php' ,  __FILE__ ) ;
-  return $newFile;
-  
-  
\ No newline at end of file
+$newFile = str_replace( 'index.php', 'users_List.php', __FILE__ );
+return $newFile;
+
diff --git a/workflow/engine/methods/users/myInfo.php b/workflow/engine/methods/users/myInfo.php
index 608201655..e9b23a245 100755
--- a/workflow/engine/methods/users/myInfo.php
+++ b/workflow/engine/methods/users/myInfo.php
@@ -12,26 +12,25 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
  */
 
-  $G_MAIN_MENU        = 'processmaker';
-  $G_ID_MENU_SELECTED = 'MY_ACCOUNT';
-  $G_PUBLISH          = new Publisher ();
-  
-  if ( isset($_GET['type']) ){
-    $G_PUBLISH->AddContent('view', 'users/usersReload');
-    G::RenderPage( "publishBlank", "blank");
-  }
-  else {
-    $G_PUBLISH->AddContent('view', 'users/usersLoad');
+$G_MAIN_MENU = 'processmaker';
+$G_ID_MENU_SELECTED = 'MY_ACCOUNT';
+$G_PUBLISH = new Publisher();
+
+if (isset( $_GET['type'] )) {
+    $G_PUBLISH->AddContent( 'view', 'users/usersReload' );
+    G::RenderPage( "publishBlank", "blank" );
+} else {
+    $G_PUBLISH->AddContent( 'view', 'users/usersLoad' );
     G::RenderPage( "publish" );
-  }
+}
+
diff --git a/workflow/engine/methods/users/myInfo_Ajax.php b/workflow/engine/methods/users/myInfo_Ajax.php
index f9c4eb917..d2b2a3cbf 100755
--- a/workflow/engine/methods/users/myInfo_Ajax.php
+++ b/workflow/engine/methods/users/myInfo_Ajax.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * myInfo_Ajax.php
- *  
+ *
  * ProcessMaker Open Source Edition
  * Copyright (C) 2004 - 2008 Colosa Inc.23
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
@@ -12,21 +12,21 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd., 
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- * 
  */
-if (($RBAC_Response=$RBAC->userCanAccess("PM_LOGIN"))!=1) return $RBAC_Response;
-G::LoadClass("xmlMenu");
-$form = new Form ( 'myInfo/myInfoAEdit.xml' , PATH_XMLFORM );
-$form->action  = urlencode( G::encrypt( '' ,URL_KEY ) );
-$form->ajaxServer  = urlencode( G::encrypt( SYS_URI . '/gulliver/defaultAjax' ,URL_KEY ) );
+if (($RBAC_Response = $RBAC->userCanAccess( "PM_LOGIN" )) != 1)
+    return $RBAC_Response;
+G::LoadClass( "xmlMenu" );
+$form = new Form( 'myInfo/myInfoAEdit.xml', PATH_XMLFORM );
+$form->action = urlencode( G::encrypt( '', URL_KEY ) );
+$form->ajaxServer = urlencode( G::encrypt( SYS_URI . '/gulliver/defaultAjax', URL_KEY ) );
 $template = PATH_CORE . 'templates/xmlform.html';
-print $G_FORM->render( $template , $scriptCode );
-?>
\ No newline at end of file
+print $G_FORM->render( $template, $scriptCode );
+
diff --git a/workflow/engine/methods/users/myInfo_Edit.php b/workflow/engine/methods/users/myInfo_Edit.php
index 265f0dd56..e087ea4ed 100755
--- a/workflow/engine/methods/users/myInfo_Edit.php
+++ b/workflow/engine/methods/users/myInfo_Edit.php
@@ -12,157 +12,157 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
  */
 try {
-  global $RBAC;
-  $RBAC->requirePermissions('PM_LOGIN'); 
+    global $RBAC;
+    $RBAC->requirePermissions( 'PM_LOGIN' );
 
-  // deprecated the class XmlForm_Field_Image is currently part of the class.xmlform.php package
-  // the use of the external xmlfield_Image is highly discouraged
-  if (!class_exists('XmlForm_Field_Image')){
-    G::LoadClass('xmlfield_Image');
-  }
-  require_once 'classes/model/Users.php';
-  require_once 'classes/model/Department.php';
+    // deprecated the class XmlForm_Field_Image is currently part of the class.xmlform.php package
+    // the use of the external xmlfield_Image is highly discouraged
+    if (! class_exists( 'XmlForm_Field_Image' )) {
+        G::LoadClass( 'xmlfield_Image' );
+    }
+    require_once 'classes/model/Users.php';
+    require_once 'classes/model/Department.php';
 
-  unset($_SESSION['CURRENT_USER']);
-  $oUser                    = new Users();
-  $aFields                  = $oUser->load($_SESSION['USER_LOGGED']);
-  $aFields['USR_PASSWORD']  = '********';
-  $aFields['MESSAGE0']      = G::LoadTranslation('ID_USER_REGISTERED') . '!';
-  $aFields['MESSAGE1']      = G::LoadTranslation('ID_MSG_ERROR_USR_USERNAME');
-  $aFields['MESSAGE2']      = G::LoadTranslation('ID_MSG_ERROR_DUE_DATE');
-  $aFields['MESSAGE3']      = G::LoadTranslation('ID_NEW_PASS_SAME_OLD_PASS');
-  $aFields['MESSAGE4']      = G::LoadTranslation('ID_MSG_ERROR_USR_FIRSTNAME');
-  $aFields['MESSAGE5']      = G::LoadTranslation('ID_MSG_ERROR_USR_LASTNAME');
-  $aFields['NO_RESUME']     = G::LoadTranslation('ID_NO_RESUME');
-  $aFields['START_DATE']    = date('Y-m-d');
-  $aFields['END_DATE']      = date('Y-m-d', mktime(0, 0, 0, date('m'), date('d'), date('Y') + 5));
-  $aFields['RANDOM']        = rand();
+    unset( $_SESSION['CURRENT_USER'] );
+    $oUser = new Users();
+    $aFields = $oUser->load( $_SESSION['USER_LOGGED'] );
+    $aFields['USR_PASSWORD'] = '********';
+    $aFields['MESSAGE0'] = G::LoadTranslation( 'ID_USER_REGISTERED' ) . '!';
+    $aFields['MESSAGE1'] = G::LoadTranslation( 'ID_MSG_ERROR_USR_USERNAME' );
+    $aFields['MESSAGE2'] = G::LoadTranslation( 'ID_MSG_ERROR_DUE_DATE' );
+    $aFields['MESSAGE3'] = G::LoadTranslation( 'ID_NEW_PASS_SAME_OLD_PASS' );
+    $aFields['MESSAGE4'] = G::LoadTranslation( 'ID_MSG_ERROR_USR_FIRSTNAME' );
+    $aFields['MESSAGE5'] = G::LoadTranslation( 'ID_MSG_ERROR_USR_LASTNAME' );
+    $aFields['NO_RESUME'] = G::LoadTranslation( 'ID_NO_RESUME' );
+    $aFields['START_DATE'] = date( 'Y-m-d' );
+    $aFields['END_DATE'] = date( 'Y-m-d', mktime( 0, 0, 0, date( 'm' ), date( 'd' ), date( 'Y' ) + 5 ) );
+    $aFields['RANDOM'] = rand();
+
+    //getting the user and department
+    $oDepInfo = new Department();
+    $oUser = UsersPeer::retrieveByPk( $aFields['USR_REPORTS_TO'] );
+    if (is_object( $oUser ) && get_class( $oUser ) == 'Users') {
+        $userFields = $oUser->toArray( BasePeer::TYPE_FIELDNAME );
+        $aFields['USR_REPORTS_TO'] = $userFields['USR_FIRSTNAME'] . ' ' . $userFields['USR_LASTNAME'];
+        try {
+            $depFields = $oDepInfo->load( $userFields['DEP_UID'] . 'xy<' );
+            $aFields['USR_REPORTS_TO'] .= " (" . $depFields['DEPO_TITLE'] . ")";
+        } catch (Exception $e) {
+        }
+    } else {
+        $aFields['USR_REPORTS_TO'] = ' ';
+    }
 
-  //getting the user and department
-  $oDepInfo = new Department();
-  $oUser = UsersPeer::retrieveByPk( $aFields['USR_REPORTS_TO'] );
-  if (is_object($oUser) && get_class ($oUser) == 'Users' ) {
-    $userFields = $oUser->toArray(BasePeer::TYPE_FIELDNAME);
-    $aFields['USR_REPORTS_TO'] = $userFields['USR_FIRSTNAME'] . ' ' . $userFields['USR_LASTNAME'];
     try {
-      $depFields =  $oDepInfo->load($userFields['DEP_UID'] . 'xy<');
-      $aFields['USR_REPORTS_TO'] .=  " (" . $depFields['DEPO_TITLE'] . ")";
+        $depFields = $oDepInfo->load( $aFields['DEP_UID'] );
+        $aFields['USR_DEPARTMENT'] = $depFields['DEPO_TITLE'];
+    } catch (Exception $e) {
+        $oUser = UsersPeer::retrieveByPk( $_SESSION['USER_LOGGED'] );
+        $oUser->setDepUid( '' );
+        $oUser->save();
+        $aFields['USR_DEPARTMENT'] = ' ';
     }
-    catch( Exception $e ) {
+
+    $G_MAIN_MENU = 'processmaker';
+    $G_ID_MENU_SELECTED = 'MY_ACCOUNT';
+    $G_PUBLISH = new Publisher();
+
+    //$RBAC->systemObj->loadByCode('PROCESSMAKER');//('PROCESSMAKER', $_SESSION['USER_LOGGED']);
+
+
+    #verifying if it has any preferences on the configurations table
+    G::loadClass( 'configuration' );
+    $oConf = new Configurations();
+    $oConf->loadConfig( $x, 'USER_PREFERENCES', '', '', $_SESSION['USER_LOGGED'], '' );
+
+    //echo $RBAC->aUserInfo['PROCESSMAKER']['ROLE']['ROL_CODE'];
+    //G::pr($RBAC->userObj->load($_SESSION['USER_LOGGED']));
+    if (sizeof( $oConf->Fields ) > 0) { #this user has a configuration record
+        $aFields['PREF_DEFAULT_LANG'] = $oConf->aConfig['DEFAULT_LANG'];
+        $aFields['PREF_DEFAULT_MENUSELECTED'] = isset( $oConf->aConfig['DEFAULT_MENU'] ) ? $oConf->aConfig['DEFAULT_MENU'] : '';
+        $aFields['PREF_DEFAULT_CASES_MENUSELECTED'] = isset( $oConf->aConfig['DEFAULT_CASES_MENU'] ) ? $oConf->aConfig['DEFAULT_CASES_MENU'] : '';
+    } else {
+        switch ($RBAC->aUserInfo['PROCESSMAKER']['ROLE']['ROL_CODE']) {
+            case 'PROCESSMAKER_ADMIN':
+                $aFields['PREF_DEFAULT_MENUSELECTED'] = 'PM_USERS';
+                break;
+
+            case 'PROCESSMAKER_OPERATOR':
+                $aFields['PREF_DEFAULT_MENUSELECTED'] = 'PM_CASES';
+                break;
+
+        }
+        $aFields['PREF_DEFAULT_LANG'] = SYS_LANG;
     }
-  }
-  else{
-    $aFields['USR_REPORTS_TO'] = ' ';
-  }
+    //G::pr($RBAC->aUserInfo);
+    $rows[] = Array ('id' => 'char','name' => 'char'
+    );
 
-  try {
-    $depFields =  $oDepInfo->load($aFields['DEP_UID']);
-    $aFields['USR_DEPARTMENT'] = $depFields['DEPO_TITLE'];
-  }
-  catch( Exception $e ) {
-    $oUser = UsersPeer::retrieveByPk( $_SESSION['USER_LOGGED'] );
-    $oUser->setDepUid( '' );
-    $oUser->save();
-    $aFields['USR_DEPARTMENT'] = ' ';
-  }
-  
-  $G_MAIN_MENU              = 'processmaker';
-  $G_ID_MENU_SELECTED       = 'MY_ACCOUNT';
-  $G_PUBLISH                = new Publisher;
+    foreach ($RBAC->aUserInfo['PROCESSMAKER']['PERMISSIONS'] as $permission) {
 
-
-  //$RBAC->systemObj->loadByCode('PROCESSMAKER');//('PROCESSMAKER', $_SESSION['USER_LOGGED']);
-  
-  #verifying if it has any preferences on the configurations table
-  G::loadClass('configuration');
-  $oConf = new Configurations; 
-  $oConf->loadConfig($x, 'USER_PREFERENCES','','',$_SESSION['USER_LOGGED'],'');
-  
-  //echo $RBAC->aUserInfo['PROCESSMAKER']['ROLE']['ROL_CODE'];
-  //G::pr($RBAC->userObj->load($_SESSION['USER_LOGGED']));
-  if( sizeof($oConf->Fields) > 0){ #this user has a configuration record
-    $aFields['PREF_DEFAULT_LANG'] = $oConf->aConfig['DEFAULT_LANG'];
-    $aFields['PREF_DEFAULT_MENUSELECTED'] = isset($oConf->aConfig['DEFAULT_MENU']) ? $oConf->aConfig['DEFAULT_MENU']: '';
-    $aFields['PREF_DEFAULT_CASES_MENUSELECTED'] = isset($oConf->aConfig['DEFAULT_CASES_MENU']) ? $oConf->aConfig['DEFAULT_CASES_MENU']: '';
-  } else {
-    switch($RBAC->aUserInfo['PROCESSMAKER']['ROLE']['ROL_CODE']){
-      case 'PROCESSMAKER_ADMIN':
-        $aFields['PREF_DEFAULT_MENUSELECTED'] = 'PM_USERS';
-        break;
-
-      case 'PROCESSMAKER_OPERATOR':
-        $aFields['PREF_DEFAULT_MENUSELECTED'] = 'PM_CASES';
-        break;
-      
+        switch ($permission['PER_CODE']) {
+            case 'PM_USERS':
+            case 'PM_SETUP':
+                $rows[] = Array ('id' => 'PM_SETUP','name' => strtoupper( G::LoadTranslation( 'ID_SETUP' ) )
+                );
+                break;
+            case 'PM_CASES':
+                $rows[] = Array ('id' => 'PM_CASES','name' => strtoupper( G::LoadTranslation( 'ID_CASES' ) )
+                );
+                break;
+            case 'PM_FACTORY':
+                $rows[] = Array ('id' => 'PM_FACTORY','name' => strtoupper( G::LoadTranslation( 'ID_APPLICATIONS' ) )
+                );
+                break;
+        }
     }
-    $aFields['PREF_DEFAULT_LANG'] = SYS_LANG;
-  }
-  //G::pr($RBAC->aUserInfo);
-  $rows[] = Array('id'=>'char', 'name'=>'char');
 
+    global $G_TMP_MENU;
+    $oMenu = new Menu();
+    $oMenu->load( 'cases' );
 
-  foreach($RBAC->aUserInfo['PROCESSMAKER']['PERMISSIONS'] as $permission){
-    
-    switch($permission['PER_CODE']){
-      case 'PM_USERS':  
-      case 'PM_SETUP':  
-         $rows[] = Array('id'=>'PM_SETUP', 'name'=>strtoupper(G::LoadTranslation('ID_SETUP'))); 
-      break;
-      case 'PM_CASES':  
-         $rows[] = Array('id'=>'PM_CASES', 'name'=>strtoupper(G::LoadTranslation('ID_CASES'))); 
-      break;
-      case 'PM_FACTORY':  
-         $rows[] = Array('id'=>'PM_FACTORY', 'name'=>strtoupper(G::LoadTranslation('ID_APPLICATIONS'))); 
-      break;
+    $rowsCasesMenu[] = Array ('id' => 'char','name' => 'char'
+    );
+
+    foreach ($oMenu->Id as $i => $item) {
+        if ($oMenu->Types[$i] != 'blockHeader') {
+            $rowsCasesMenu[] = Array ('id' => $item,'name' => $oMenu->Labels[$i]
+            );
+        }
     }
-  }
-  
-  global $G_TMP_MENU;
-  $oMenu = new Menu();
-  $oMenu->load('cases');
-  
-  $rowsCasesMenu[] = Array('id'=>'char', 'name'=>'char');
-  
-  foreach($oMenu->Id as $i=>$item){
-    if( $oMenu->Types[$i] != 'blockHeader' ){
-      $rowsCasesMenu[] = Array('id'=>$item, 'name'=>$oMenu->Labels[$i]);
+
+    //G::pr($rows); die;
+    global $_DBArray;
+    $_DBArray['menutab'] = $rows;
+    $_SESSION['_DBArray'] = $_DBArray;
+    $_DBArray['CASES_MENU'] = $rowsCasesMenu;
+    $_SESSION['_DBArray'] = $_DBArray;
+
+    G::LoadClass( 'ArrayPeer' );
+    $oCriteria = new Criteria( 'dbarray' );
+    $oCriteria->setDBArrayTable( 'menutab' );
+
+    $oCriteria2 = new Criteria( 'dbarray' );
+    $oCriteria2->setDBArrayTable( 'CASES_MENU' );
+
+    if ($RBAC->userCanAccess( 'PM_EDITPERSONALINFO' ) == 1) { //he has permitions for edit his profile
+        $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'users/myInfo.xml', '', $aFields, 'myInfo_Save' );
+    } else { //he has not permitions for edit his profile, so just view mode will be displayed
+        $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'users/myInfo2.xml', '', $aFields, '' );
     }
-  }
-  
-  //G::pr($rows); die;
-  global $_DBArray;
-  $_DBArray['menutab']   = $rows;
-  $_SESSION['_DBArray'] = $_DBArray;
-  $_DBArray['CASES_MENU']   = $rowsCasesMenu;
-  $_SESSION['_DBArray'] = $_DBArray;
-  
-  G::LoadClass('ArrayPeer');
-  $oCriteria = new Criteria('dbarray');
-  $oCriteria->setDBArrayTable('menutab');
-  
-  $oCriteria2 = new Criteria('dbarray');
-  $oCriteria2->setDBArrayTable('CASES_MENU');
- 
-  if ($RBAC->userCanAccess('PM_EDITPERSONALINFO') == 1) { //he has permitions for edit his profile
-    $G_PUBLISH->AddContent('xmlform', 'xmlform', 'users/myInfo.xml', '', $aFields, 'myInfo_Save');
-  }  else { //he has not permitions for edit his profile, so just view mode will be displayed
-    $G_PUBLISH->AddContent('xmlform', 'xmlform', 'users/myInfo2.xml', '', $aFields, '');
-  }
-  
-  G::RenderPage('publish');
+
+    G::RenderPage( 'publish' );
+} catch (Exception $oException) {
+    die( $oException->getMessage() );
 }
-catch (Exception $oException) {
-  die($oException->getMessage());
-}
-?>
\ No newline at end of file
+
diff --git a/workflow/engine/methods/users/myInfo_Save.php b/workflow/engine/methods/users/myInfo_Save.php
index 3549793a9..66bf4c637 100755
--- a/workflow/engine/methods/users/myInfo_Save.php
+++ b/workflow/engine/methods/users/myInfo_Save.php
@@ -12,162 +12,158 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
  */
-try {ini_set('display_errors','1');
-  global $RBAC;
-  switch ($RBAC->userCanAccess('PM_LOGIN'))
-  {
-  	case -2:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;
-  	case -1:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;
-  }
-  if (isset($_FILES['form']['name']['USR_RESUME'])) {
-  	$_POST['form']['USR_RESUME'] = $_FILES['form']['name']['USR_RESUME'];
-  }
-  if ($_POST['form']['USR_EMAIL'] != '') {
-    // The ereg function has been DEPRECATED as of PHP 5.3.0.
-    // if (!ereg("^[_a-zA-Z0-9-]+(\.[_a-zA-Z0-9-]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*$", $_POST['form']['USR_EMAIL'])) {
-    if ( !preg_match("/^[_a-zA-Z0-9-]+(\.[_a-zA-Z0-9-]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*$/", $_POST['form']['USR_EMAIL'])) {
-      G::SendTemporalMessage ('ID_INCORRECT_EMAIL', 'error');
+try {
+    ini_set( 'display_errors', '1' );
+    global $RBAC;
+    switch ($RBAC->userCanAccess( 'PM_LOGIN' )) {
+        case - 2:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+        case - 1:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
     }
-	}
-	if (!isset($_POST['form']['USR_NEW_PASS'])) {
-		$_POST['form']['USR_NEW_PASS'] = '';
-	}
-	if ($_POST['form']['USR_NEW_PASS'] != '') {
-	  $_POST['form']['USR_PASSWORD'] = md5($_POST['form']['USR_NEW_PASS']);
-	}
-	if (!isset($_POST['form']['USR_CITY'])) {
-		$_POST['form']['USR_CITY'] = '';
-	}
-	if (!isset($_POST['form']['USR_LOCATION'])) {
-		$_POST['form']['USR_LOCATION'] = '';
-	}
-	if (!isset($_POST['form']['USR_ROLE'])) {
-		$_POST['form']['USR_ROLE'] = '';
-	}
-	$aData['USR_UID']      = $_POST['form']['USR_UID'];
-	$aData['USR_USERNAME'] = $_POST['form']['USR_USERNAME'];
-	if (isset($_POST['form']['USR_PASSWORD'])) {
-	  if ($_POST['form']['USR_PASSWORD'] != '') {
-	    $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'])))));
-      $aErrors       = $oUserProperty->validatePassword($_POST['form']['USR_NEW_PASS'], $aUserProperty['USR_LAST_UPDATE_DATE'], $aUserProperty['USR_LOGGED_NEXT_TIME']);
-      if (count($aErrors) > 0) {
-        $sDescription = G::LoadTranslation('ID_POLICY_ALERT').':<br /><br />';
-        foreach ($aErrors as $sError)  {
-          switch ($sError) {
-            case 'ID_PPP_MINIMUN_LENGTH':
-              $sDescription .= ' - ' . G::LoadTranslation($sError).': ' . PPP_MINIMUN_LENGTH . '<br />';
-            break;
-            case 'ID_PPP_MAXIMUN_LENGTH':
-              $sDescription .= ' - ' . G::LoadTranslation($sError).': ' . PPP_MAXIMUN_LENGTH . '<br />';
-            break;
-            case 'ID_PPP_EXPIRATION_IN':
-              $sDescription .= ' - ' . G::LoadTranslation($sError).' ' . PPP_EXPIRATION_IN . ' ' . G::LoadTranslation('ID_DAYS') . '<br />';
-            break;
-            default:
-              $sDescription .= ' - ' . G::LoadTranslation($sError).'<br />';
-            break;
-          }
+    if (isset( $_FILES['form']['name']['USR_RESUME'] )) {
+        $_POST['form']['USR_RESUME'] = $_FILES['form']['name']['USR_RESUME'];
+    }
+    if ($_POST['form']['USR_EMAIL'] != '') {
+        // The ereg function has been DEPRECATED as of PHP 5.3.0.
+        // if (!ereg("^[_a-zA-Z0-9-]+(\.[_a-zA-Z0-9-]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*$", $_POST['form']['USR_EMAIL'])) {
+        if (! preg_match( "/^[_a-zA-Z0-9-]+(\.[_a-zA-Z0-9-]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*$/", $_POST['form']['USR_EMAIL'] )) {
+            G::SendTemporalMessage( 'ID_INCORRECT_EMAIL', 'error' );
         }
-        $sDescription .= '<br />' . G::LoadTranslation('ID_PLEASE_CHANGE_PASSWORD_POLICY');
-        G::SendMessageText($sDescription, 'warning');
-        G::header('Location: ' . $_SERVER['HTTP_REFERER']);
-        die;
-      }
-      $aHistory = unserialize($aUserProperty['USR_PASSWORD_HISTORY']);
-      if (!is_array($aHistory)) {
-        $aHistory = array();
-      }
-      if (!defined('PPP_PASSWORD_HISTORY')) {
-        define('PPP_PASSWORD_HISTORY', 0);
-      }
-      if (PPP_PASSWORD_HISTORY > 0) {
-        if (count($aHistory) >= PPP_PASSWORD_HISTORY) {
-          array_shift($aHistory);
+    }
+    if (! isset( $_POST['form']['USR_NEW_PASS'] )) {
+        $_POST['form']['USR_NEW_PASS'] = '';
+    }
+    if ($_POST['form']['USR_NEW_PASS'] != '') {
+        $_POST['form']['USR_PASSWORD'] = md5( $_POST['form']['USR_NEW_PASS'] );
+    }
+    if (! isset( $_POST['form']['USR_CITY'] )) {
+        $_POST['form']['USR_CITY'] = '';
+    }
+    if (! isset( $_POST['form']['USR_LOCATION'] )) {
+        $_POST['form']['USR_LOCATION'] = '';
+    }
+    if (! isset( $_POST['form']['USR_ROLE'] )) {
+        $_POST['form']['USR_ROLE'] = '';
+    }
+    $aData['USR_UID'] = $_POST['form']['USR_UID'];
+    $aData['USR_USERNAME'] = $_POST['form']['USR_USERNAME'];
+    if (isset( $_POST['form']['USR_PASSWORD'] )) {
+        if ($_POST['form']['USR_PASSWORD'] != '') {
+            $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'] )
+            ) )
+            ) );
+            $aErrors = $oUserProperty->validatePassword( $_POST['form']['USR_NEW_PASS'], $aUserProperty['USR_LAST_UPDATE_DATE'], $aUserProperty['USR_LOGGED_NEXT_TIME'] );
+            if (count( $aErrors ) > 0) {
+                $sDescription = G::LoadTranslation( 'ID_POLICY_ALERT' ) . ':<br /><br />';
+                foreach ($aErrors as $sError) {
+                    switch ($sError) {
+                        case 'ID_PPP_MINIMUN_LENGTH':
+                            $sDescription .= ' - ' . G::LoadTranslation( $sError ) . ': ' . PPP_MINIMUN_LENGTH . '<br />';
+                            break;
+                        case 'ID_PPP_MAXIMUN_LENGTH':
+                            $sDescription .= ' - ' . G::LoadTranslation( $sError ) . ': ' . PPP_MAXIMUN_LENGTH . '<br />';
+                            break;
+                        case 'ID_PPP_EXPIRATION_IN':
+                            $sDescription .= ' - ' . G::LoadTranslation( $sError ) . ' ' . PPP_EXPIRATION_IN . ' ' . G::LoadTranslation( 'ID_DAYS' ) . '<br />';
+                            break;
+                        default:
+                            $sDescription .= ' - ' . G::LoadTranslation( $sError ) . '<br />';
+                            break;
+                    }
+                }
+                $sDescription .= '<br />' . G::LoadTranslation( 'ID_PLEASE_CHANGE_PASSWORD_POLICY' );
+                G::SendMessageText( $sDescription, 'warning' );
+                G::header( 'Location: ' . $_SERVER['HTTP_REFERER'] );
+                die();
+            }
+            $aHistory = unserialize( $aUserProperty['USR_PASSWORD_HISTORY'] );
+            if (! is_array( $aHistory )) {
+                $aHistory = array ();
+            }
+            if (! defined( 'PPP_PASSWORD_HISTORY' )) {
+                define( 'PPP_PASSWORD_HISTORY', 0 );
+            }
+            if (PPP_PASSWORD_HISTORY > 0) {
+                if (count( $aHistory ) >= PPP_PASSWORD_HISTORY) {
+                    array_shift( $aHistory );
+                }
+                $aHistory[] = $_POST['form']['USR_NEW_PASS'];
+            }
+            $aUserProperty['USR_LAST_UPDATE_DATE'] = date( 'Y-m-d H:i:s' );
+            $aUserProperty['USR_LOGGED_NEXT_TIME'] = 1;
+            $aUserProperty['USR_PASSWORD_HISTORY'] = serialize( $aHistory );
+            $oUserProperty->update( $aUserProperty );
         }
-        $aHistory[] = $_POST['form']['USR_NEW_PASS'];
-      }
-      $aUserProperty['USR_LAST_UPDATE_DATE'] = date('Y-m-d H:i:s');
-      $aUserProperty['USR_LOGGED_NEXT_TIME'] = 1;
-      $aUserProperty['USR_PASSWORD_HISTORY'] = serialize($aHistory);
-      $oUserProperty->update($aUserProperty);
-	  }
-	}
-	$aData['USR_FIRSTNAME']   = $_POST['form']['USR_FIRSTNAME'];
-	$aData['USR_LASTNAME']    = $_POST['form']['USR_LASTNAME'];
-	$aData['USR_EMAIL']       = $_POST['form']['USR_EMAIL'];
-	$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_COUNTRY']     = $_POST['form']['USR_COUNTRY'];
-	$aData['USR_CITY']        = $_POST['form']['USR_CITY'];
-	$aData['USR_LOCATION']    = $_POST['form']['USR_LOCATION'];
-	$aData['USR_ADDRESS']     = $_POST['form']['USR_ADDRESS'];
-	$aData['USR_PHONE']       = $_POST['form']['USR_PHONE'];
-	$aData['USR_ZIP_CODE']    = $_POST['form']['USR_ZIP_CODE'];
-	$aData['USR_POSITION']    = $_POST['form']['USR_POSITION'];
-	if ($_POST['form']['USR_RESUME'] != '') {
-	  $aData['USR_RESUME'] = $_POST['form']['USR_RESUME'];
-	}
-	require_once 'classes/model/Users.php';
-	$oUser = new Users();
-	$oUser->update($aData);
-	if ($_FILES['form']['tmp_name']['USR_PHOTO'] != '') {
-		$aAux = explode('.', $_FILES['form']['name']['USR_PHOTO']);
-		G::uploadFile($_FILES['form']['tmp_name']['USR_PHOTO'], PATH_IMAGES_ENVIRONMENT_USERS, $aData['USR_UID'] . '.' . $aAux[1]);
-		G::resizeImage(PATH_IMAGES_ENVIRONMENT_USERS . $aData['USR_UID'] . '.' . $aAux[1], 96, 96, PATH_IMAGES_ENVIRONMENT_USERS . $aData['USR_UID'] . '.gif');
-	}
-	if ($_FILES['form']['tmp_name']['USR_RESUME'] != '') {
-		G::uploadFile($_FILES['form']['tmp_name']['USR_RESUME'], PATH_IMAGES_ENVIRONMENT_FILES . $aData['USR_UID'] . '/', $_FILES['form']['name']['USR_RESUME']);
-	}
-	
-	/* Saving preferences */
-	$def_lang = $_POST['form']['PREF_DEFAULT_LANG'];
-	$def_menu = $_POST['form']['PREF_DEFAULT_MENUSELECTED'];
-	$def_cases_menu = $_POST['form']['PREF_DEFAULT_CASES_MENUSELECTED'];
-	
-	G::loadClass('configuration');
-	
-	$oConf = new Configurations;
-	$aConf = Array(
-		'DEFAULT_LANG'=>$def_lang,
-		'DEFAULT_MENU'=>$def_menu,
-		'DEFAULT_CASES_MENU'=>$def_cases_menu
-	);
-	
-	/*UPDATING SESSION VARIABLES*/
-	$aUser = $RBAC->userObj->load($_SESSION['USER_LOGGED']);
-	$_SESSION['USR_FULLNAME'] = $aUser['USR_FIRSTNAME'] . ' ' . $aUser['USR_LASTNAME']; 
-	
-	
-	$oConf->aConfig = $aConf;
-	$oConf->saveConfig('USER_PREFERENCES', '', '',$_SESSION['USER_LOGGED']);
-	
-	G::SendTemporalMessage('ID_CHANGES_SAVED', 'info', 'labels');
-	G::header('location: myInfo');
+    }
+    $aData['USR_FIRSTNAME'] = $_POST['form']['USR_FIRSTNAME'];
+    $aData['USR_LASTNAME'] = $_POST['form']['USR_LASTNAME'];
+    $aData['USR_EMAIL'] = $_POST['form']['USR_EMAIL'];
+    $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_COUNTRY'] = $_POST['form']['USR_COUNTRY'];
+    $aData['USR_CITY'] = $_POST['form']['USR_CITY'];
+    $aData['USR_LOCATION'] = $_POST['form']['USR_LOCATION'];
+    $aData['USR_ADDRESS'] = $_POST['form']['USR_ADDRESS'];
+    $aData['USR_PHONE'] = $_POST['form']['USR_PHONE'];
+    $aData['USR_ZIP_CODE'] = $_POST['form']['USR_ZIP_CODE'];
+    $aData['USR_POSITION'] = $_POST['form']['USR_POSITION'];
+    if ($_POST['form']['USR_RESUME'] != '') {
+        $aData['USR_RESUME'] = $_POST['form']['USR_RESUME'];
+    }
+    require_once 'classes/model/Users.php';
+    $oUser = new Users();
+    $oUser->update( $aData );
+    if ($_FILES['form']['tmp_name']['USR_PHOTO'] != '') {
+        $aAux = explode( '.', $_FILES['form']['name']['USR_PHOTO'] );
+        G::uploadFile( $_FILES['form']['tmp_name']['USR_PHOTO'], PATH_IMAGES_ENVIRONMENT_USERS, $aData['USR_UID'] . '.' . $aAux[1] );
+        G::resizeImage( PATH_IMAGES_ENVIRONMENT_USERS . $aData['USR_UID'] . '.' . $aAux[1], 96, 96, PATH_IMAGES_ENVIRONMENT_USERS . $aData['USR_UID'] . '.gif' );
+    }
+    if ($_FILES['form']['tmp_name']['USR_RESUME'] != '') {
+        G::uploadFile( $_FILES['form']['tmp_name']['USR_RESUME'], PATH_IMAGES_ENVIRONMENT_FILES . $aData['USR_UID'] . '/', $_FILES['form']['name']['USR_RESUME'] );
+    }
+
+    /* Saving preferences */
+    $def_lang = $_POST['form']['PREF_DEFAULT_LANG'];
+    $def_menu = $_POST['form']['PREF_DEFAULT_MENUSELECTED'];
+    $def_cases_menu = $_POST['form']['PREF_DEFAULT_CASES_MENUSELECTED'];
+
+    G::loadClass( 'configuration' );
+
+    $oConf = new Configurations();
+    $aConf = Array ('DEFAULT_LANG' => $def_lang,'DEFAULT_MENU' => $def_menu,'DEFAULT_CASES_MENU' => $def_cases_menu
+    );
+
+    /*UPDATING SESSION VARIABLES*/
+    $aUser = $RBAC->userObj->load( $_SESSION['USER_LOGGED'] );
+    $_SESSION['USR_FULLNAME'] = $aUser['USR_FIRSTNAME'] . ' ' . $aUser['USR_LASTNAME'];
+
+    $oConf->aConfig = $aConf;
+    $oConf->saveConfig( 'USER_PREFERENCES', '', '', $_SESSION['USER_LOGGED'] );
+
+    G::SendTemporalMessage( 'ID_CHANGES_SAVED', 'info', 'labels' );
+    G::header( 'location: myInfo' );
+} catch (Exception $oException) {
+    die( $oException->getMessage() );
 }
-catch (Exception $oException) {
-	die($oException->getMessage());
-}
-?>
+
diff --git a/workflow/engine/methods/users/usersAjax.php b/workflow/engine/methods/users/usersAjax.php
index ed0107141..70e7f313a 100644
--- a/workflow/engine/methods/users/usersAjax.php
+++ b/workflow/engine/methods/users/usersAjax.php
@@ -2,120 +2,124 @@
 
 global $RBAC;
 
-switch($_POST['action'])
-{
-  case 'countryList' :
-    require_once ("classes/model/IsoCountry.php");
-    $c = new Criteria();
-    $c->add(IsoCountryPeer::IC_UID, NULL, Criteria::ISNOTNULL);
+switch ($_POST['action']) {
+    case 'countryList':
+        require_once ("classes/model/IsoCountry.php");
+        $c = new Criteria();
+        $c->add( IsoCountryPeer::IC_UID, NULL, Criteria::ISNOTNULL );
 
-    $countries = IsoCountryPeer::doSelect($c);
-    foreach ( $countries as $rowid => $row ) {
-      $oData[] = Array('IC_UID'=>$row->getICUid(),'IC_NAME'=>$row->getICName());
-    }
-    print(G::json_encode($oData));
-    break;
+        $countries = IsoCountryPeer::doSelect( $c );
+        foreach ($countries as $rowid => $row) {
+            $oData[] = Array ('IC_UID' => $row->getICUid(),'IC_NAME' => $row->getICName()
+            );
+        }
+        print (G::json_encode( $oData )) ;
+        break;
 
-  case 'stateList' :
-    require_once ("classes/model/IsoSubdivision.php");
-    $c       = new Criteria();
-    $country = $_POST['IC_UID'];
-    $c->add(IsoSubdivisionPeer::IC_UID, $country, Criteria::EQUAL);
-    $locations = IsoSubdivisionPeer::doSelect($c);
+    case 'stateList':
+        require_once ("classes/model/IsoSubdivision.php");
+        $c = new Criteria();
+        $country = $_POST['IC_UID'];
+        $c->add( IsoSubdivisionPeer::IC_UID, $country, Criteria::EQUAL );
+        $locations = IsoSubdivisionPeer::doSelect( $c );
 
-    $oData = Array();
-    foreach( $locations as $rowid => $row ) {
-      if (($row->getISUid() != '') && ($row->getISName() != ''))
-        $oData[] = Array('IS_UID' => $row->getISUid(), 'IS_NAME' => $row->getISName());
-    }
-    print(G::json_encode($oData));
-    break;
+        $oData = Array ();
+        foreach ($locations as $rowid => $row) {
+            if (($row->getISUid() != '') && ($row->getISName() != ''))
+                $oData[] = Array ('IS_UID' => $row->getISUid(),'IS_NAME' => $row->getISName()
+                );
+        }
+        print (G::json_encode( $oData )) ;
+        break;
 
-  case 'locationList' :
-    require_once ("classes/model/IsoLocation.php");
-    $c       = new Criteria();
-    $country = $_POST['IC_UID'];
-    $state   = $_POST['IS_UID'];
-    $c->add(IsoLocationPeer::IC_UID, $country, Criteria::EQUAL);
-    $c->add(IsoLocationPeer::IS_UID, $state, Criteria::EQUAL);
-    $locations = IsoLocationPeer::doSelect($c);
+    case 'locationList':
+        require_once ("classes/model/IsoLocation.php");
+        $c = new Criteria();
+        $country = $_POST['IC_UID'];
+        $state = $_POST['IS_UID'];
+        $c->add( IsoLocationPeer::IC_UID, $country, Criteria::EQUAL );
+        $c->add( IsoLocationPeer::IS_UID, $state, Criteria::EQUAL );
+        $locations = IsoLocationPeer::doSelect( $c );
 
-    $oData = Array();
-    foreach ( $locations as $rowid => $row ) {
-      if (($row->getILUid() != '') && ($row->getILName() != ''))
-        $oData[] = Array('IL_UID' => $row->getILUid(), 'IL_NAME' => $row->getILName());
-    }
-    print(G::json_encode($oData));
-    break;
-  case 'usersList' :
-    require_once 'classes/model/Users.php';
-    $oCriteria = new Criteria();
-    $oCriteria->addSelectColumn(UsersPeer::USR_UID);
-    $oCriteria->addSelectColumn(UsersPeer::USR_USERNAME);
-    $oCriteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
-    $oCriteria->addSelectColumn(UsersPeer::USR_LASTNAME);
-    $oCriteria->addSelectColumn(UsersPeer::USR_EMAIL);
-    $oCriteria->add(UsersPeer::USR_STATUS, array('ACTIVE', 'VACATION'), Criteria::IN);
-    if (isset($_POST['USR_UID'])) {
-        $oCriteria->add(UsersPeer::USR_UID, $_POST['USR_UID'], Criteria::NOT_EQUAL);
-    }
-    $oDataset = UsersPeer::doSelectRS($oCriteria);
-    $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+        $oData = Array ();
+        foreach ($locations as $rowid => $row) {
+            if (($row->getILUid() != '') && ($row->getILName() != ''))
+                $oData[] = Array ('IL_UID' => $row->getILUid(),'IL_NAME' => $row->getILName()
+                );
+        }
+        print (G::json_encode( $oData )) ;
+        break;
+    case 'usersList':
+        require_once 'classes/model/Users.php';
+        $oCriteria = new Criteria();
+        $oCriteria->addSelectColumn( UsersPeer::USR_UID );
+        $oCriteria->addSelectColumn( UsersPeer::USR_USERNAME );
+        $oCriteria->addSelectColumn( UsersPeer::USR_FIRSTNAME );
+        $oCriteria->addSelectColumn( UsersPeer::USR_LASTNAME );
+        $oCriteria->addSelectColumn( UsersPeer::USR_EMAIL );
+        $oCriteria->add( UsersPeer::USR_STATUS, array ('ACTIVE','VACATION'
+        ), Criteria::IN );
+        if (isset( $_POST['USR_UID'] )) {
+            $oCriteria->add( UsersPeer::USR_UID, $_POST['USR_UID'], Criteria::NOT_EQUAL );
+        }
+        $oDataset = UsersPeer::doSelectRS( $oCriteria );
+        $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
 
-    G::loadClass('configuration');
-    $oConf = new Configurations;
-    $oConf->loadConfig($obj, 'ENVIRONMENT_SETTINGS','');
+        G::loadClass( 'configuration' );
+        $oConf = new Configurations();
+        $oConf->loadConfig( $obj, 'ENVIRONMENT_SETTINGS', '' );
 
-    $defaultOption = isset($oConf->aConfig['format']) ? $oConf->aConfig['format'] : '';
+        $defaultOption = isset( $oConf->aConfig['format'] ) ? $oConf->aConfig['format'] : '';
 
-    $aUserInfo = array();
-    if (isset($_POST['addNone']) && $_POST['addNone'] == '1') {
-        $aUserInfo[] = array('USR_UID' => '', 'USER_FULLNAME' => '- ' . G::LoadTranslation('ID_NONE') . ' -');
-    }
-    while ( $oDataset->next()) {
-      $aRow1 = $oDataset->getRow();
+        $aUserInfo = array ();
+        if (isset( $_POST['addNone'] ) && $_POST['addNone'] == '1') {
+            $aUserInfo[] = array ('USR_UID' => '','USER_FULLNAME' => '- ' . G::LoadTranslation( 'ID_NONE' ) . ' -'
+            );
+        }
+        while ($oDataset->next()) {
+            $aRow1 = $oDataset->getRow();
 
-      $infoUser    = G::getFormatUserList($defaultOption,$aRow1);
-      $aUserInfo[] = array(
-                    'USR_UID'       => $aRow1['USR_UID'],
-                    'USER_FULLNAME' => $infoUser
-                   );
-    }
-    print(G::json_encode($aUserInfo));
+            $infoUser = G::getFormatUserList( $defaultOption, $aRow1 );
+            $aUserInfo[] = array ('USR_UID' => $aRow1['USR_UID'],'USER_FULLNAME' => $infoUser
+            );
+        }
+        print (G::json_encode( $aUserInfo )) ;
 
-    break;
+        break;
 
-  case 'availableCalendars' :
-    G::LoadClass ( 'calendar' );
-    $calendar    = new Calendar ( );
-    $calendarObj = $calendar->getCalendarList ( true, true );
-    $oData[]     = array('CALENDAR_UID' => '', 'CALENDAR_NAME' => '- None -');
-    foreach ( $calendarObj ['array'] as $rowid => $row ) {
-      if ($rowid > 0)
-        $oData[] = array('CALENDAR_UID' => $row['CALENDAR_UID'], 'CALENDAR_NAME' => $row['CALENDAR_NAME']);
-    }
-    print(G::json_encode($oData));
-    break;
-  case 'rolesList':
-    require_once PATH_RBAC."model/Roles.php";
-    $roles     = new Roles();
-    $rolesData = $roles->getAllRoles();
-    foreach( $rolesData as $rowid => $row ) {
-       $oData[] = array('ROL_UID' => $row['ROL_CODE'],'ROL_CODE' => $row['ROL_CODE']);
-    }
-    print(G::json_encode($oData));
-    break;
-  case 'saveUser' :
-    try {
-      $form = $_POST;
+    case 'availableCalendars':
+        G::LoadClass( 'calendar' );
+        $calendar = new Calendar();
+        $calendarObj = $calendar->getCalendarList( true, true );
+        $oData[] = array ('CALENDAR_UID' => '','CALENDAR_NAME' => '- None -'
+        );
+        foreach ($calendarObj['array'] as $rowid => $row) {
+            if ($rowid > 0)
+                $oData[] = array ('CALENDAR_UID' => $row['CALENDAR_UID'],'CALENDAR_NAME' => $row['CALENDAR_NAME']
+                );
+        }
+        print (G::json_encode( $oData )) ;
+        break;
+    case 'rolesList':
+        require_once PATH_RBAC . "model/Roles.php";
+        $roles = new Roles();
+        $rolesData = $roles->getAllRoles();
+        foreach ($rolesData as $rowid => $row) {
+            $oData[] = array ('ROL_UID' => $row['ROL_CODE'],'ROL_CODE' => $row['ROL_CODE']
+            );
+        }
+        print (G::json_encode( $oData )) ;
+        break;
+    case 'saveUser':
+        try {
+            $form = $_POST;
 
-      if ( isset($_POST['USR_UID'])) {
-        $form['USR_UID'] = $_POST['USR_UID'];
-      }
-      else {
-        $form['USR_UID'] = '';
-      }
-/*
+            if (isset( $_POST['USR_UID'] )) {
+                $form['USR_UID'] = $_POST['USR_UID'];
+            } else {
+                $form['USR_UID'] = '';
+            }
+            /*
       if ( isset($_FILES['USR_RESUME']['name']) ) {
         if ($_FILES['USR_RESUME']['tmp_name'] != '') {
           $form['USR_RESUME'] = $_FILES['USR_RESUME']['name'];
@@ -125,68 +129,67 @@ switch($_POST['action'])
         }
       }
 */
-      if (!isset($form['USR_NEW_PASS'])) {
-        $form['USR_NEW_PASS'] = '';
-      }
-      if ($form['USR_NEW_PASS'] != '') {
-        $form['USR_PASSWORD'] = md5($form['USR_NEW_PASS']);
-      }
-      if (!isset($form['USR_CITY'])) {
-        $form['USR_CITY'] = '';
-      }
-      if (!isset($form['USR_LOCATION'])) {
-        $form['USR_LOCATION'] = '';
-      }
-      if (!isset($form['USR_AUTH_USER_DN'])) {
-        $form['USR_AUTH_USER_DN'] = '';
-      }
+            if (! isset( $form['USR_NEW_PASS'] )) {
+                $form['USR_NEW_PASS'] = '';
+            }
+            if ($form['USR_NEW_PASS'] != '') {
+                $form['USR_PASSWORD'] = md5( $form['USR_NEW_PASS'] );
+            }
+            if (! isset( $form['USR_CITY'] )) {
+                $form['USR_CITY'] = '';
+            }
+            if (! isset( $form['USR_LOCATION'] )) {
+                $form['USR_LOCATION'] = '';
+            }
+            if (! isset( $form['USR_AUTH_USER_DN'] )) {
+                $form['USR_AUTH_USER_DN'] = '';
+            }
 
-      if ($form['USR_UID'] == '') {
-        $aData['USR_USERNAME']     = $form['USR_USERNAME'];
-        $aData['USR_PASSWORD']     = $form['USR_PASSWORD'];
-        $aData['USR_FIRSTNAME']    = $form['USR_FIRSTNAME'];
-        $aData['USR_LASTNAME']     = $form['USR_LASTNAME'];
-        $aData['USR_EMAIL']        = $form['USR_EMAIL'];
-        $aData['USR_DUE_DATE']     = $form['USR_DUE_DATE'];
-        $aData['USR_CREATE_DATE']  = date('Y-m-d H:i:s');
-        $aData['USR_UPDATE_DATE']  = date('Y-m-d H:i:s');
-        $aData['USR_BIRTHDAY']     = date('Y-m-d');
-        $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;
-        $sUserUID                  = $RBAC->createUser($aData, $form['USR_ROLE'] );
-        $aData['USR_STATUS']       = $statusWF;
-        $aData['USR_UID']          = $sUserUID;
-        $aData['USR_PASSWORD']     = md5($sUserUID);//fake :p
-        $aData['USR_COUNTRY']      = $form['USR_COUNTRY'];
-        $aData['USR_CITY']         = $form['USR_CITY'];
-        $aData['USR_LOCATION']     = $form['USR_LOCATION'];
-        $aData['USR_ADDRESS']      = $form['USR_ADDRESS'];
-        $aData['USR_PHONE']        = $form['USR_PHONE'];
-        $aData['USR_ZIP_CODE']     = $form['USR_ZIP_CODE'];
-        $aData['USR_POSITION']     = $form['USR_POSITION'];
-//        $aData['USR_RESUME']       = $form['USR_RESUME'];
-        $aData['USR_ROLE']         = $form['USR_ROLE'];
-        $aData['USR_REPLACED_BY']  = $form['USR_REPLACED_BY'];
+            if ($form['USR_UID'] == '') {
+                $aData['USR_USERNAME'] = $form['USR_USERNAME'];
+                $aData['USR_PASSWORD'] = $form['USR_PASSWORD'];
+                $aData['USR_FIRSTNAME'] = $form['USR_FIRSTNAME'];
+                $aData['USR_LASTNAME'] = $form['USR_LASTNAME'];
+                $aData['USR_EMAIL'] = $form['USR_EMAIL'];
+                $aData['USR_DUE_DATE'] = $form['USR_DUE_DATE'];
+                $aData['USR_CREATE_DATE'] = date( 'Y-m-d H:i:s' );
+                $aData['USR_UPDATE_DATE'] = date( 'Y-m-d H:i:s' );
+                $aData['USR_BIRTHDAY'] = date( 'Y-m-d' );
+                $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;
+                $sUserUID = $RBAC->createUser( $aData, $form['USR_ROLE'] );
+                $aData['USR_STATUS'] = $statusWF;
+                $aData['USR_UID'] = $sUserUID;
+                $aData['USR_PASSWORD'] = md5( $sUserUID ); //fake :p
+                $aData['USR_COUNTRY'] = $form['USR_COUNTRY'];
+                $aData['USR_CITY'] = $form['USR_CITY'];
+                $aData['USR_LOCATION'] = $form['USR_LOCATION'];
+                $aData['USR_ADDRESS'] = $form['USR_ADDRESS'];
+                $aData['USR_PHONE'] = $form['USR_PHONE'];
+                $aData['USR_ZIP_CODE'] = $form['USR_ZIP_CODE'];
+                $aData['USR_POSITION'] = $form['USR_POSITION'];
+                //        $aData['USR_RESUME']       = $form['USR_RESUME'];
+                $aData['USR_ROLE'] = $form['USR_ROLE'];
+                $aData['USR_REPLACED_BY'] = $form['USR_REPLACED_BY'];
 
-        require_once 'classes/model/Users.php';
-        $oUser = new Users();
-        $oUser->create($aData);
+                require_once 'classes/model/Users.php';
+                $oUser = new Users();
+                $oUser->create( $aData );
 
-        if ($_FILES['USR_PHOTO']['error'] != 1) {
-          //print (PATH_IMAGES_ENVIRONMENT_USERS);
-          if ($_FILES['USR_PHOTO']['tmp_name'] != '') {
-            G::uploadFile($_FILES['USR_PHOTO']['tmp_name'], PATH_IMAGES_ENVIRONMENT_USERS, $sUserUID . '.gif');
-          }
-        }
-        else {
-          $result->success   = false;
-          $result->fileError = true;
-          print(G::json_encode($result));
-          die;
-        }
-/*
+                if ($_FILES['USR_PHOTO']['error'] != 1) {
+                    //print (PATH_IMAGES_ENVIRONMENT_USERS);
+                    if ($_FILES['USR_PHOTO']['tmp_name'] != '') {
+                        G::uploadFile( $_FILES['USR_PHOTO']['tmp_name'], PATH_IMAGES_ENVIRONMENT_USERS, $sUserUID . '.gif' );
+                    }
+                } else {
+                    $result->success = false;
+                    $result->fileError = true;
+                    print (G::json_encode( $result )) ;
+                    die();
+                }
+                /*
         if ($_FILES['USR_RESUME']['error'] != 1) {
           if ($_FILES['USR_RESUME']['tmp_name'] != '') {
             G::uploadFile($_FILES['USR_RESUME']['tmp_name'], PATH_IMAGES_ENVIRONMENT_FILES . $sUserUID . '/', $_FILES['USR_RESUME']['name']);
@@ -199,153 +202,150 @@ switch($_POST['action'])
           die;
         }
 */
-      }
-      else {
+            } else {
 
-        $aData['USR_UID']      = $form['USR_UID'];
-        $aData['USR_USERNAME'] = $form['USR_USERNAME'];
+                $aData['USR_UID'] = $form['USR_UID'];
+                $aData['USR_USERNAME'] = $form['USR_USERNAME'];
 
-        if (isset($form['USR_PASSWORD'])) {
+                if (isset( $form['USR_PASSWORD'] )) {
 
-          if ($form['USR_PASSWORD'] != '') {
-            $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'])))));
+                    if ($form['USR_PASSWORD'] != '') {
+                        $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'] )
+                        ) )
+                        ) );
 
-            $memKey = 'rbacSession' . session_id();
-            $memcache = & PMmemcached::getSingleton(defined('SYS_SYS') ? SYS_SYS : '');
-            if ( ($RBAC->aUserInfo = $memcache->get($memKey)) === false ) {
-              $RBAC->loadUserRolePermission($RBAC->sSystem, $_SESSION['USER_LOGGED'] );
-              $memcache->set( $memKey, $RBAC->aUserInfo, PMmemcached::EIGHT_HOURS );
-            }
-            if( $RBAC->aUserInfo[ 'PROCESSMAKER' ]['ROLE']['ROL_CODE']=='PROCESSMAKER_ADMIN'){
-              $aUserProperty['USR_LAST_UPDATE_DATE'] = date('Y-m-d H:i:s');
-              $aUserProperty['USR_LOGGED_NEXT_TIME'] = 1;
-              $oUserProperty->update($aUserProperty);
-            }
+                        $memKey = 'rbacSession' . session_id();
+                        $memcache = & PMmemcached::getSingleton( defined( 'SYS_SYS' ) ? SYS_SYS : '' );
+                        if (($RBAC->aUserInfo = $memcache->get( $memKey )) === false) {
+                            $RBAC->loadUserRolePermission( $RBAC->sSystem, $_SESSION['USER_LOGGED'] );
+                            $memcache->set( $memKey, $RBAC->aUserInfo, PMmemcached::EIGHT_HOURS );
+                        }
+                        if ($RBAC->aUserInfo['PROCESSMAKER']['ROLE']['ROL_CODE'] == 'PROCESSMAKER_ADMIN') {
+                            $aUserProperty['USR_LAST_UPDATE_DATE'] = date( 'Y-m-d H:i:s' );
+                            $aUserProperty['USR_LOGGED_NEXT_TIME'] = 1;
+                            $oUserProperty->update( $aUserProperty );
+                        }
 
-            $aErrors = $oUserProperty->validatePassword($form['USR_NEW_PASS'], $aUserProperty['USR_LAST_UPDATE_DATE'], 0);
+                        $aErrors = $oUserProperty->validatePassword( $form['USR_NEW_PASS'], $aUserProperty['USR_LAST_UPDATE_DATE'], 0 );
 
+                        if (count( $aErrors ) > 0) {
+                            $sDescription = G::LoadTranslation( 'ID_POLICY_ALERT' ) . ':,';
+                            foreach ($aErrors as $sError) {
+                                switch ($sError) {
+                                    case 'ID_PPP_MINIMUN_LENGTH':
+                                        $sDescription .= ' - ' . G::LoadTranslation( $sError ) . ': ' . PPP_MINIMUN_LENGTH . ',';
+                                        break;
+                                    case 'ID_PPP_MAXIMUN_LENGTH':
+                                        $sDescription .= ' - ' . G::LoadTranslation( $sError ) . ': ' . PPP_MAXIMUN_LENGTH . ',';
+                                        break;
+                                    case 'ID_PPP_EXPIRATION_IN':
+                                        $sDescription .= ' - ' . G::LoadTranslation( $sError ) . ' ' . PPP_EXPIRATION_IN . ' ' . G::LoadTranslation( 'ID_DAYS' ) . ',';
+                                        break;
+                                    default:
+                                        $sDescription .= ' - ' . G::LoadTranslation( $sError ) . ',';
+                                        break;
+                                }
+                            }
+                            $sDescription .= '' . G::LoadTranslation( 'ID_PLEASE_CHANGE_PASSWORD_POLICY' );
+                            $result->success = false;
+                            $result->msg = $sDescription;
+                            print (G::json_encode( $result )) ;
+                            die();
 
-            if (count($aErrors) > 0) {
-              $sDescription = G::LoadTranslation('ID_POLICY_ALERT').':,';
-              foreach ($aErrors as $sError)  {
-                switch ($sError) {
-                  case 'ID_PPP_MINIMUN_LENGTH':
-                    $sDescription .= ' - ' . G::LoadTranslation($sError).': ' . PPP_MINIMUN_LENGTH . ',';
-                  break;
-                  case 'ID_PPP_MAXIMUN_LENGTH':
-                    $sDescription .= ' - ' . G::LoadTranslation($sError).': ' . PPP_MAXIMUN_LENGTH . ',';
-                  break;
-                  case 'ID_PPP_EXPIRATION_IN':
-                    $sDescription .= ' - ' . G::LoadTranslation($sError).' ' . PPP_EXPIRATION_IN . ' ' . G::LoadTranslation('ID_DAYS') . ',';
-                  break;
-                  default:
-                    $sDescription .= ' - ' . G::LoadTranslation($sError).',';
-                  break;
+                        }
+                        $aHistory = unserialize( $aUserProperty['USR_PASSWORD_HISTORY'] );
+                        if (! is_array( $aHistory )) {
+                            $aHistory = array ();
+                        }
+                        if (! defined( 'PPP_PASSWORD_HISTORY' )) {
+                            define( 'PPP_PASSWORD_HISTORY', 0 );
+                        }
+                        if (PPP_PASSWORD_HISTORY > 0) {
+                            //it's looking a password igual into aHistory array that was send for post in md5 way
+                            $c = 0;
+                            $sw = 1;
+                            while (count( $aHistory ) >= 1 && count( $aHistory ) > $c && $sw) {
+                                if (strcmp( trim( $aHistory[$c] ), trim( $form['USR_PASSWORD'] ) ) == 0) {
+                                    $sw = 0;
+                                }
+                                $c ++;
+                            }
+                            if ($sw == 0) {
+                                $sDescription = G::LoadTranslation( 'ID_POLICY_ALERT' ) . ':<br /><br />';
+                                $sDescription .= ' - ' . G::LoadTranslation( 'PASSWORD_HISTORY' ) . ': ' . PPP_PASSWORD_HISTORY . '<br />';
+                                $sDescription .= '<br />' . G::LoadTranslation( 'ID_PLEASE_CHANGE_PASSWORD_POLICY' ) . '';
+                                $result->success = false;
+                                $result->msg = $sDescription;
+                                print (G::json_encode( $result )) ;
+                                die();
+                            }
+
+                            if (count( $aHistory ) >= PPP_PASSWORD_HISTORY) {
+                                $sLastPassw = array_shift( $aHistory );
+                            }
+                            $aHistory[] = $form['USR_PASSWORD'];
+                        }
+                        $aUserProperty['USR_LAST_UPDATE_DATE'] = date( 'Y-m-d H:i:s' );
+                        $aUserProperty['USR_LOGGED_NEXT_TIME'] = 1;
+                        $aUserProperty['USR_PASSWORD_HISTORY'] = serialize( $aHistory );
+                        $oUserProperty->update( $aUserProperty );
+                    }
                 }
-              }
-              $sDescription .=  ''.G::LoadTranslation('ID_PLEASE_CHANGE_PASSWORD_POLICY');
-              $result->success = false;
-              $result->msg = $sDescription;
-              print(G::json_encode($result));
-              die;
-
-
-            }
-            $aHistory      = unserialize($aUserProperty['USR_PASSWORD_HISTORY']);
-            if (!is_array($aHistory)) {
-              $aHistory = array();
-            }
-            if (!defined('PPP_PASSWORD_HISTORY')) {
-              define('PPP_PASSWORD_HISTORY', 0);
-            }
-            if (PPP_PASSWORD_HISTORY > 0) {
-              //it's looking a password igual into aHistory array that was send for post in md5 way
-              $c  = 0;
-              $sw = 1;
-              while (count($aHistory) >= 1 && count($aHistory) > $c && $sw ){
-               if (strcmp(trim($aHistory[$c]), trim($form['USR_PASSWORD'])) == 0){
-                 $sw = 0;
-               }
-               $c++;
-              }
-              if ($sw == 0) {
-                $sDescription = G::LoadTranslation('ID_POLICY_ALERT').':<br /><br />';
-                $sDescription .= ' - ' . G::LoadTranslation('PASSWORD_HISTORY').': ' . PPP_PASSWORD_HISTORY . '<br />';
-                $sDescription .= '<br />' . G::LoadTranslation('ID_PLEASE_CHANGE_PASSWORD_POLICY').'';
-                $result->success = false;
-                $result->msg   = $sDescription;
-                print(G::json_encode($result));
-                die();
-              }
-
-              if (count($aHistory) >= PPP_PASSWORD_HISTORY) {
-                $sLastPassw = array_shift($aHistory);
-              }
-              $aHistory[] = $form['USR_PASSWORD'];
-            }
-            $aUserProperty['USR_LAST_UPDATE_DATE'] = date('Y-m-d H:i:s');
-            $aUserProperty['USR_LOGGED_NEXT_TIME'] = 1;
-            $aUserProperty['USR_PASSWORD_HISTORY'] = serialize($aHistory);
-            $oUserProperty->update($aUserProperty);
-          }
-        }
-        $aData['USR_FIRSTNAME']   = $form['USR_FIRSTNAME'];
-        $aData['USR_LASTNAME']    = $form['USR_LASTNAME'];
-        $aData['USR_EMAIL']       = $form['USR_EMAIL'];
-        $aData['USR_DUE_DATE']    = $form['USR_DUE_DATE'];
-        $aData['USR_UPDATE_DATE'] = date('Y-m-d H:i:s');
-        if (isset($form['USR_STATUS'])) {
-          $aData['USR_STATUS']      = $form['USR_STATUS'];
-          }
-          if (isset($form['USR_ROLE'])) {
-          $RBAC->updateUser($aData, $form['USR_ROLE']);
-        }
-        else {
-          $RBAC->updateUser($aData);
-        }
-        $aData['USR_COUNTRY']     = $form['USR_COUNTRY'];
-        $aData['USR_CITY']        = $form['USR_CITY'];
-        $aData['USR_LOCATION']    = $form['USR_LOCATION'];
-        $aData['USR_ADDRESS']     = $form['USR_ADDRESS'];
-        $aData['USR_PHONE']       = $form['USR_PHONE'];
-        $aData['USR_ZIP_CODE']    = $form['USR_ZIP_CODE'];
-        $aData['USR_POSITION']    = $form['USR_POSITION'];
-/*
+                $aData['USR_FIRSTNAME'] = $form['USR_FIRSTNAME'];
+                $aData['USR_LASTNAME'] = $form['USR_LASTNAME'];
+                $aData['USR_EMAIL'] = $form['USR_EMAIL'];
+                $aData['USR_DUE_DATE'] = $form['USR_DUE_DATE'];
+                $aData['USR_UPDATE_DATE'] = date( 'Y-m-d H:i:s' );
+                if (isset( $form['USR_STATUS'] )) {
+                    $aData['USR_STATUS'] = $form['USR_STATUS'];
+                }
+                if (isset( $form['USR_ROLE'] )) {
+                    $RBAC->updateUser( $aData, $form['USR_ROLE'] );
+                } else {
+                    $RBAC->updateUser( $aData );
+                }
+                $aData['USR_COUNTRY'] = $form['USR_COUNTRY'];
+                $aData['USR_CITY'] = $form['USR_CITY'];
+                $aData['USR_LOCATION'] = $form['USR_LOCATION'];
+                $aData['USR_ADDRESS'] = $form['USR_ADDRESS'];
+                $aData['USR_PHONE'] = $form['USR_PHONE'];
+                $aData['USR_ZIP_CODE'] = $form['USR_ZIP_CODE'];
+                $aData['USR_POSITION'] = $form['USR_POSITION'];
+                /*
         if ($form['USR_RESUME'] != '') {
           $aData['USR_RESUME'] = $form['USR_RESUME'];
         }
 */
-        if (isset($form['USR_ROLE'])) {
-          $aData['USR_ROLE'] = $form['USR_ROLE'];
-        }
+                if (isset( $form['USR_ROLE'] )) {
+                    $aData['USR_ROLE'] = $form['USR_ROLE'];
+                }
 
-        if(isset($form['USR_REPLACED_BY'])){
-          $aData['USR_REPLACED_BY'] = $form['USR_REPLACED_BY'];
-        }
-        if(isset($form['USR_AUTH_USER_DN'])){
-          $aData['USR_AUTH_USER_DN'] = $form['USR_AUTH_USER_DN'];
-        }
+                if (isset( $form['USR_REPLACED_BY'] )) {
+                    $aData['USR_REPLACED_BY'] = $form['USR_REPLACED_BY'];
+                }
+                if (isset( $form['USR_AUTH_USER_DN'] )) {
+                    $aData['USR_AUTH_USER_DN'] = $form['USR_AUTH_USER_DN'];
+                }
 
-        require_once 'classes/model/Users.php';
-        $oUser = new Users();
-        $oUser->update($aData);
-        if ($_FILES['USR_PHOTO']['error'] != 1) {
-          if ($_FILES['USR_PHOTO']['tmp_name'] != '') {
-            $aAux = explode('.', $_FILES['USR_PHOTO']['name']);
-            G::uploadFile($_FILES['USR_PHOTO']['tmp_name'], PATH_IMAGES_ENVIRONMENT_USERS, $aData['USR_UID'] . '.' . $aAux[1]);
-            G::resizeImage(PATH_IMAGES_ENVIRONMENT_USERS . $aData['USR_UID'] . '.' . $aAux[1], 96, 96, PATH_IMAGES_ENVIRONMENT_USERS . $aData['USR_UID'] . '.gif');
-          }
-        }
-        else {
-          $result->success   = false;
-          $result->fileError = true;
-          print(G::json_encode($result));
-          die;
-        }
-/*
+                require_once 'classes/model/Users.php';
+                $oUser = new Users();
+                $oUser->update( $aData );
+                if ($_FILES['USR_PHOTO']['error'] != 1) {
+                    if ($_FILES['USR_PHOTO']['tmp_name'] != '') {
+                        $aAux = explode( '.', $_FILES['USR_PHOTO']['name'] );
+                        G::uploadFile( $_FILES['USR_PHOTO']['tmp_name'], PATH_IMAGES_ENVIRONMENT_USERS, $aData['USR_UID'] . '.' . $aAux[1] );
+                        G::resizeImage( PATH_IMAGES_ENVIRONMENT_USERS . $aData['USR_UID'] . '.' . $aAux[1], 96, 96, PATH_IMAGES_ENVIRONMENT_USERS . $aData['USR_UID'] . '.gif' );
+                    }
+                } else {
+                    $result->success = false;
+                    $result->fileError = true;
+                    print (G::json_encode( $result )) ;
+                    die();
+                }
+                /*
         if ($_FILES['USR_RESUME']['error'] != 1) {
           if ($_FILES['USR_RESUME']['tmp_name'] != '') {
             G::uploadFile($_FILES['USR_RESUME']['tmp_name'], PATH_IMAGES_ENVIRONMENT_FILES . $aData['USR_UID'] . '/', $_FILES['USR_RESUME']['name']);
@@ -359,273 +359,276 @@ switch($_POST['action'])
         }
 */
         /* Saving preferences */
-        $def_lang       = $form['PREF_DEFAULT_LANG'];
-        $def_menu       = $form['PREF_DEFAULT_MENUSELECTED'];
-        $def_cases_menu = isset($form['PREF_DEFAULT_CASES_MENUSELECTED']) ? $form['PREF_DEFAULT_CASES_MENUSELECTED'] : '';
+        $def_lang = $form['PREF_DEFAULT_LANG'];
+                $def_menu = $form['PREF_DEFAULT_MENUSELECTED'];
+                $def_cases_menu = isset( $form['PREF_DEFAULT_CASES_MENUSELECTED'] ) ? $form['PREF_DEFAULT_CASES_MENUSELECTED'] : '';
 
-        G::loadClass('configuration');
+                G::loadClass( 'configuration' );
 
-        $oConf = new Configurations;
-        $aConf = Array(
-          'DEFAULT_LANG'       => $def_lang,
-          'DEFAULT_MENU'       => $def_menu,
-          'DEFAULT_CASES_MENU' => $def_cases_menu
-        );
+                $oConf = new Configurations();
+                $aConf = Array ('DEFAULT_LANG' => $def_lang,'DEFAULT_MENU' => $def_menu,'DEFAULT_CASES_MENU' => $def_cases_menu
+                );
 
-        /*UPDATING SESSION VARIABLES*/
-        $aUser = $RBAC->userObj->load($_SESSION['USER_LOGGED']);
-        //$_SESSION['USR_FULLNAME'] = $aUser['USR_FIRSTNAME'] . ' ' . $aUser['USR_LASTNAME'];
-
-        $oConf->aConfig = $aConf;
-        $oConf->saveConfig('USER_PREFERENCES', '', '',$_SESSION['USER_LOGGED']);
-
-      }
-
-      if ( $_SESSION['USER_LOGGED'] == $form['USR_UID'] ) {
-        /* UPDATING SESSION VARIABLES */
-        $aUser                    = $RBAC->userObj->load($_SESSION['USER_LOGGED']);
-        $_SESSION['USR_FULLNAME'] = $aUser['USR_FIRSTNAME'] . ' ' . $aUser['USR_LASTNAME'];
-      }
+                /*UPDATING SESSION VARIABLES*/
+                $aUser = $RBAC->userObj->load( $_SESSION['USER_LOGGED'] );
+                //$_SESSION['USR_FULLNAME'] = $aUser['USR_FIRSTNAME'] . ' ' . $aUser['USR_LASTNAME'];
 
 
-      //Save Calendar assigment
-      if ((isset($form['USR_CALENDAR']))) {
-        //Save Calendar ID for this user
-        G::LoadClass("calendar");
-        $calendarObj = new Calendar();
-        $calendarObj->assignCalendarTo($aData['USR_UID'], $form['USR_CALENDAR'], 'USER');
-      }
-      $result->success = true;
-      print(G::json_encode($result));
-    }catch (Exception $e) {
-      $result->success = false;
-      $result->error   = $e->getMessage();
-      print(G::json_encode($result));
-    }
-    break;
+                $oConf->aConfig = $aConf;
+                $oConf->saveConfig( 'USER_PREFERENCES', '', '', $_SESSION['USER_LOGGED'] );
 
-  case 'userData':
-    require_once 'classes/model/Users.php';
-    $_SESSION['CURRENT_USER'] = $_POST['USR_UID'];
-    $oUser                    = new Users();
-    $aFields                  = $oUser->loadDetailed($_POST['USR_UID']);
+            }
 
-    //Load Calendar options and falue for this user
-    G::LoadClass ( 'calendar' );
-    $calendar = new Calendar ( );
-    $calendarInfo = $calendar->getCalendarFor ( $_POST['USR_UID'], $_POST['USR_UID'], $_POST['USR_UID'] );
-    //If the function returns a DEFAULT calendar it means that this object doesn't have assigned any calendar
-    $aFields ['USR_CALENDAR'] = $calendarInfo ['CALENDAR_APPLIED'] != 'DEFAULT' ? $calendarInfo ['CALENDAR_UID'] : "";
+            if ($_SESSION['USER_LOGGED'] == $form['USR_UID']) {
+                /* UPDATING SESSION VARIABLES */
+                $aUser = $RBAC->userObj->load( $_SESSION['USER_LOGGED'] );
+                $_SESSION['USR_FULLNAME'] = $aUser['USR_FIRSTNAME'] . ' ' . $aUser['USR_LASTNAME'];
+            }
 
-    #verifying if it has any preferences on the configurations table
-    G::loadClass('configuration');
-    $oConf = new Configurations;
-    $oConf->loadConfig($x, 'USER_PREFERENCES', '', '', $_SESSION['USER_LOGGED'], '');
+            //Save Calendar assigment
+            if ((isset( $form['USR_CALENDAR'] ))) {
+                //Save Calendar ID for this user
+                G::LoadClass( "calendar" );
+                $calendarObj = new Calendar();
+                $calendarObj->assignCalendarTo( $aData['USR_UID'], $form['USR_CALENDAR'], 'USER' );
+            }
+            $result->success = true;
+            print (G::json_encode( $result )) ;
+        } catch (Exception $e) {
+            $result->success = false;
+            $result->error = $e->getMessage();
+            print (G::json_encode( $result )) ;
+        }
+        break;
 
-    $aFields['PREF_DEFAULT_MENUSELECTED']='';
-    $aFields['PREF_DEFAULT_CASES_MENUSELECTED']='';
-    if( sizeof($oConf->Fields) > 0){ #this user has a configuration record
-      $aFields['PREF_DEFAULT_LANG']               = $oConf->aConfig['DEFAULT_LANG'];
-      $aFields['PREF_DEFAULT_MENUSELECTED']       = isset($oConf->aConfig['DEFAULT_MENU']) ? $oConf->aConfig['DEFAULT_MENU']: '';
-      $aFields['PREF_DEFAULT_CASES_MENUSELECTED'] = isset($oConf->aConfig['DEFAULT_CASES_MENU']) ? $oConf->aConfig['DEFAULT_CASES_MENU']: '';
-    } else {
-      switch($RBAC->aUserInfo['PROCESSMAKER']['ROLE']['ROL_CODE']){
-        case 'PROCESSMAKER_ADMIN':
-          $aFields['PREF_DEFAULT_MENUSELECTED'] = 'PM_SETUP';
-          break;
+    case 'userData':
+        require_once 'classes/model/Users.php';
+        $_SESSION['CURRENT_USER'] = $_POST['USR_UID'];
+        $oUser = new Users();
+        $aFields = $oUser->loadDetailed( $_POST['USR_UID'] );
 
-        case 'PROCESSMAKER_OPERATOR':
-          $aFields['PREF_DEFAULT_MENUSELECTED'] = 'PM_CASES';
-          break;
+        //Load Calendar options and falue for this user
+        G::LoadClass( 'calendar' );
+        $calendar = new Calendar();
+        $calendarInfo = $calendar->getCalendarFor( $_POST['USR_UID'], $_POST['USR_UID'], $_POST['USR_UID'] );
+        //If the function returns a DEFAULT calendar it means that this object doesn't have assigned any calendar
+        $aFields['USR_CALENDAR'] = $calendarInfo['CALENDAR_APPLIED'] != 'DEFAULT' ? $calendarInfo['CALENDAR_UID'] : "";
 
-      }
-      $aFields['PREF_DEFAULT_LANG'] = SYS_LANG;
-    }
-    if ($aFields['USR_REPLACED_BY'] != ''){
-      $user        = new Users();
-      $u           = $user->load($aFields['USR_REPLACED_BY']);
-      $c           = new Configurations();
-      $replaced_by = $c->usersNameFormat($u['USR_USERNAME'], $u['USR_FIRSTNAME'], $u['USR_LASTNAME']);
-    }else{
-      $replaced_by = '';
-    }
+        #verifying if it has any preferences on the configurations table
+        G::loadClass( 'configuration' );
+        $oConf = new Configurations();
+        $oConf->loadConfig( $x, 'USER_PREFERENCES', '', '', $_SESSION['USER_LOGGED'], '' );
 
-    $aFields['REPLACED_NAME'] = $replaced_by;
+        $aFields['PREF_DEFAULT_MENUSELECTED'] = '';
+        $aFields['PREF_DEFAULT_CASES_MENUSELECTED'] = '';
+        if (sizeof( $oConf->Fields ) > 0) { #this user has a configuration record
+            $aFields['PREF_DEFAULT_LANG'] = $oConf->aConfig['DEFAULT_LANG'];
+            $aFields['PREF_DEFAULT_MENUSELECTED'] = isset( $oConf->aConfig['DEFAULT_MENU'] ) ? $oConf->aConfig['DEFAULT_MENU'] : '';
+            $aFields['PREF_DEFAULT_CASES_MENUSELECTED'] = isset( $oConf->aConfig['DEFAULT_CASES_MENU'] ) ? $oConf->aConfig['DEFAULT_CASES_MENU'] : '';
+        } else {
+            switch ($RBAC->aUserInfo['PROCESSMAKER']['ROLE']['ROL_CODE']) {
+                case 'PROCESSMAKER_ADMIN':
+                    $aFields['PREF_DEFAULT_MENUSELECTED'] = 'PM_SETUP';
+                    break;
 
-    $menuSelected = '';
+                case 'PROCESSMAKER_OPERATOR':
+                    $aFields['PREF_DEFAULT_MENUSELECTED'] = 'PM_CASES';
+                    break;
 
-    if ($aFields['PREF_DEFAULT_MENUSELECTED'] != '') {
-        foreach ( $RBAC->aUserInfo['PROCESSMAKER']['PERMISSIONS'] as $permission ) {
-            if ($aFields['PREF_DEFAULT_MENUSELECTED']==$permission['PER_CODE']) {
-                switch ($permission['PER_CODE']) {
-                    case 'PM_USERS' :
-                    case 'PM_SETUP' :
-                        $menuSelected = strtoupper(G::LoadTranslation('ID_SETUP'));
-                        break;
-                    case 'PM_CASES' :
-                        $menuSelected = strtoupper(G::LoadTranslation('ID_CASES'));
-                        break;
-                    case 'PM_FACTORY' :
-                        $menuSelected = strtoupper(G::LoadTranslation('ID_APPLICATIONS'));
-                        break;
-                    case 'PM_DASHBOARD':
-                        $menuSelected = strtoupper(G::LoadTranslation('ID_DASHBOARD'));
-                        break;
+            }
+            $aFields['PREF_DEFAULT_LANG'] = SYS_LANG;
+        }
+        if ($aFields['USR_REPLACED_BY'] != '') {
+            $user = new Users();
+            $u = $user->load( $aFields['USR_REPLACED_BY'] );
+            $c = new Configurations();
+            $replaced_by = $c->usersNameFormat( $u['USR_USERNAME'], $u['USR_FIRSTNAME'], $u['USR_LASTNAME'] );
+        } else {
+            $replaced_by = '';
+        }
+
+        $aFields['REPLACED_NAME'] = $replaced_by;
+
+        $menuSelected = '';
+
+        if ($aFields['PREF_DEFAULT_MENUSELECTED'] != '') {
+            foreach ($RBAC->aUserInfo['PROCESSMAKER']['PERMISSIONS'] as $permission) {
+                if ($aFields['PREF_DEFAULT_MENUSELECTED'] == $permission['PER_CODE']) {
+                    switch ($permission['PER_CODE']) {
+                        case 'PM_USERS':
+                        case 'PM_SETUP':
+                            $menuSelected = strtoupper( G::LoadTranslation( 'ID_SETUP' ) );
+                            break;
+                        case 'PM_CASES':
+                            $menuSelected = strtoupper( G::LoadTranslation( 'ID_CASES' ) );
+                            break;
+                        case 'PM_FACTORY':
+                            $menuSelected = strtoupper( G::LoadTranslation( 'ID_APPLICATIONS' ) );
+                            break;
+                        case 'PM_DASHBOARD':
+                            $menuSelected = strtoupper( G::LoadTranslation( 'ID_DASHBOARD' ) );
+                            break;
+                    }
                 }
             }
         }
-    }
 
+        $aFields['MENUSELECTED_NAME'] = $menuSelected;
 
-    $aFields['MENUSELECTED_NAME'] =  $menuSelected;
+        $oMenu = new Menu();
+        $oMenu->load( 'cases' );
+        $casesMenuSelected = '';
 
-    $oMenu = new Menu();
-    $oMenu->load('cases');
-    $casesMenuSelected = '';
+        if ($aFields['PREF_DEFAULT_CASES_MENUSELECTED'] != '') {
+            foreach ($oMenu->Id as $i => $item) {
 
-    if ($aFields['PREF_DEFAULT_CASES_MENUSELECTED'] != ''){
-      foreach($oMenu->Id as $i => $item){
-
-        if ($aFields['PREF_DEFAULT_CASES_MENUSELECTED'] == $item)
-          $casesMenuSelected =$oMenu->Labels[$i];
-      }
-    }
-
-    $aFields['CASES_MENUSELECTED_NAME'] = $casesMenuSelected;
-
-    $aFields['USR_COUNTRY_NAME']  = (!empty($aFields['USR_COUNTRY_NAME']))?  $aFields['USR_COUNTRY_NAME'] : '';
-    $aFields['USR_CITY_NAME']     = (!empty($aFields['USR_CITY_NAME']))?     $aFields['USR_CITY_NAME'] : '';
-    $aFields['USR_LOCATION_NAME'] = (!empty($aFields['USR_LOCATION_NAME']))? $aFields['USR_LOCATION_NAME'] : '';
-
-    $result->success = true;
-    $result->user    = $aFields;
-
-    print(G::json_encode($result));
-    break;
-
-  case 'defaultMainMenuOptionList';
-    foreach($RBAC->aUserInfo['PROCESSMAKER']['PERMISSIONS'] as $permission){
-      switch($permission['PER_CODE']){
-        case 'PM_USERS':
-        case 'PM_SETUP':
-           $rows[] = Array('id'=>'PM_SETUP', 'name'=>strtoupper(G::LoadTranslation('ID_SETUP')));
-        break;
-        case 'PM_CASES':
-           $rows[] = Array('id'=>'PM_CASES', 'name'=>strtoupper(G::LoadTranslation('ID_CASES')));
-        break;
-        case 'PM_FACTORY':
-           $rows[] = Array('id'=>'PM_FACTORY', 'name'=>strtoupper(G::LoadTranslation('ID_APPLICATIONS')));
-        break;
-        case 'PM_DASHBOARD':
-           $rows[] = Array('id'=>'PM_DASHBOARD', 'name'=>strtoupper(G::LoadTranslation('ID_DASHBOARD')));
-        break;
-      }
-    }
-    print(G::json_encode($rows));
-    break;
-  case 'defaultCasesMenuOptionList';
-
-    $oMenu = new Menu();
-    $oMenu->load('cases');
-
-    foreach($oMenu->Id as $i=>$item){
-      if( $oMenu->Types[$i] != 'blockHeader' ){
-        $rowsCasesMenu[] = Array('id'=>$item, 'name' => $oMenu->Labels[$i]);
-      }
-    }
-    print(G::json_encode($rowsCasesMenu));
-    break;
-  case 'testPassword';
-    require_once 'classes/model/UsersProperties.php';
-    $oUserProperty = new UsersProperties();
-
-    $aFields = array();
-    $color = '';
-    $img = '';
-    $dateNow = date('Y-m-d H:i:s');
-    $aErrors = $oUserProperty->validatePassword($_POST['PASSWORD_TEXT'], $dateNow, $dateNow);
-
-    if (!empty($aErrors)) {
-      $img = '/images/delete.png';
-      $color = 'red';
-      if (!defined('NO_DISPLAY_USERNAME')) {
-        define('NO_DISPLAY_USERNAME', 1);
-      }
-      $aFields = array();
-      $aFields['DESCRIPTION'] = G::LoadTranslation('ID_POLICY_ALERT').':<br />';
-
-      foreach ($aErrors as $sError)  {
-        switch ($sError) {
-          case 'ID_PPP_MINIMUM_LENGTH':
-            $aFields['DESCRIPTION'] .= ' - ' . G::LoadTranslation($sError).': ' . PPP_MINIMUM_LENGTH . '<br />';
-            $aFields[substr($sError, 3)] = PPP_MINIMUM_LENGTH;
-          break;
-          case 'ID_PPP_MAXIMUM_LENGTH':
-            $aFields['DESCRIPTION'] .= ' - ' . G::LoadTranslation($sError).': ' . PPP_MAXIMUM_LENGTH . '<br />';
-            $aFields[substr($sError, 3)] = PPP_MAXIMUM_LENGTH;
-          break;
-          case 'ID_PPP_EXPIRATION_IN':
-            $aFields['DESCRIPTION'] .= ' - ' . G::LoadTranslation($sError).' ' . PPP_EXPIRATION_IN . ' ' . G::LoadTranslation('ID_DAYS') . '<br />';
-            $aFields[substr($sError, 3)] = PPP_EXPIRATION_IN;
-          break;
-          default:
-            $aFields['DESCRIPTION'] .= ' - ' . G::LoadTranslation($sError).'<br />';
-            $aFields[substr($sError, 3)] = 1;
-          break;
+                if ($aFields['PREF_DEFAULT_CASES_MENUSELECTED'] == $item)
+                    $casesMenuSelected = $oMenu->Labels[$i];
+            }
         }
-      }
 
-      $aFields['DESCRIPTION'] .= G::LoadTranslation('ID_PLEASE_CHANGE_PASSWORD_POLICY') . '</span>';
-      $aFields['STATUS'] = false;
-    } else {
-      $color = 'green';
-      $img = '/images/dialog-ok-apply.png';
-      $aFields['DESCRIPTION'] = G::LoadTranslation('ID_PASSWORD_COMPLIES_POLICIES') . '</span>';
-      $aFields['STATUS'] = true;
-    }
-    $span = '<span style="color: ' . $color . '; font: 9px tahoma,arial,helvetica,sans-serif;">';
-    $gif = '<img width="13" height="13" border="0" src="' . $img . '">';
-    $aFields['DESCRIPTION'] =  $span . $gif . $aFields['DESCRIPTION'];
-    print(G::json_encode($aFields));
-    break;
-  case 'testUsername';
-    require_once 'classes/model/Users.php';
-    $_POST['NEW_USERNAME'] = trim($_POST['NEW_USERNAME']);
-    $USR_UID = isset($_POST['USR_UID'])? $_POST['USR_UID'] : '';
+        $aFields['CASES_MENUSELECTED_NAME'] = $casesMenuSelected;
 
-    $response  = array( "success" => true );
+        $aFields['USR_COUNTRY_NAME'] = (! empty( $aFields['USR_COUNTRY_NAME'] )) ? $aFields['USR_COUNTRY_NAME'] : '';
+        $aFields['USR_CITY_NAME'] = (! empty( $aFields['USR_CITY_NAME'] )) ? $aFields['USR_CITY_NAME'] : '';
+        $aFields['USR_LOCATION_NAME'] = (! empty( $aFields['USR_LOCATION_NAME'] )) ? $aFields['USR_LOCATION_NAME'] : '';
 
-    $oCriteria = new Criteria();
-    $oCriteria->addSelectColumn(UsersPeer::USR_USERNAME);
+        $result->success = true;
+        $result->user = $aFields;
 
-    $oCriteria->add(UsersPeer::USR_USERNAME, $_POST['NEW_USERNAME']);
-    if ($USR_UID != '') {
-      $oCriteria->add(UsersPeer::USR_UID, array($_POST['USR_UID']), Criteria::NOT_IN);
-    }
-    $oDataset = UsersPeer::doSelectRS($oCriteria);
-    $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-    $oDataset->next();
-    $aRow = $oDataset->getRow();
+        print (G::json_encode( $result )) ;
+        break;
 
-    if (is_array($aRow) || $_POST['NEW_USERNAME'] == '') {
-      $color  = 'red';
-      $img    = '/images/delete.png';
-      $dataVar['USER_ID'] = $_POST['NEW_USERNAME'];
-      $text   = G::LoadTranslation('ID_USERNAME_ALREADY_EXISTS', $dataVar);
-      $text   = ($_POST['NEW_USERNAME'] == '') ? G::LoadTranslation('ID_MSG_ERROR_USR_USERNAME') : $text;
-      $response['exists'] = true;
-    } else {
-      $color  = 'green';
-      $img    = '/images/dialog-ok-apply.png';
-      $text   = G::LoadTranslation('ID_USERNAME_CORRECT');
-      $response['exists'] = false;
-    }
+    case 'defaultMainMenuOptionList':
+        foreach ($RBAC->aUserInfo['PROCESSMAKER']['PERMISSIONS'] as $permission) {
+            switch ($permission['PER_CODE']) {
+                case 'PM_USERS':
+                case 'PM_SETUP':
+                    $rows[] = Array ('id' => 'PM_SETUP','name' => strtoupper( G::LoadTranslation( 'ID_SETUP' ) )
+                    );
+                    break;
+                case 'PM_CASES':
+                    $rows[] = Array ('id' => 'PM_CASES','name' => strtoupper( G::LoadTranslation( 'ID_CASES' ) )
+                    );
+                    break;
+                case 'PM_FACTORY':
+                    $rows[] = Array ('id' => 'PM_FACTORY','name' => strtoupper( G::LoadTranslation( 'ID_APPLICATIONS' ) )
+                    );
+                    break;
+                case 'PM_DASHBOARD':
+                    $rows[] = Array ('id' => 'PM_DASHBOARD','name' => strtoupper( G::LoadTranslation( 'ID_DASHBOARD' ) )
+                    );
+                    break;
+            }
+        }
+        print (G::json_encode( $rows )) ;
+        break;
+    case 'defaultCasesMenuOptionList':
 
+        $oMenu = new Menu();
+        $oMenu->load( 'cases' );
 
-    $span = '<span style="color: ' . $color . '; font: 9px tahoma,arial,helvetica,sans-serif;">';
-    $gif  = '<img width="13" height="13" border="0" src="' . $img . '">';
-    $response['descriptionText'] = $span . $gif . $text . '</span>';
-    echo G::json_encode($response);
-    break;
+        foreach ($oMenu->Id as $i => $item) {
+            if ($oMenu->Types[$i] != 'blockHeader') {
+                $rowsCasesMenu[] = Array ('id' => $item,'name' => $oMenu->Labels[$i]
+                );
+            }
+        }
+        print (G::json_encode( $rowsCasesMenu )) ;
+        break;
+    case 'testPassword':
+        require_once 'classes/model/UsersProperties.php';
+        $oUserProperty = new UsersProperties();
+
+        $aFields = array ();
+        $color = '';
+        $img = '';
+        $dateNow = date( 'Y-m-d H:i:s' );
+        $aErrors = $oUserProperty->validatePassword( $_POST['PASSWORD_TEXT'], $dateNow, $dateNow );
+
+        if (! empty( $aErrors )) {
+            $img = '/images/delete.png';
+            $color = 'red';
+            if (! defined( 'NO_DISPLAY_USERNAME' )) {
+                define( 'NO_DISPLAY_USERNAME', 1 );
+            }
+            $aFields = array ();
+            $aFields['DESCRIPTION'] = G::LoadTranslation( 'ID_POLICY_ALERT' ) . ':<br />';
+
+            foreach ($aErrors as $sError) {
+                switch ($sError) {
+                    case 'ID_PPP_MINIMUM_LENGTH':
+                        $aFields['DESCRIPTION'] .= ' - ' . G::LoadTranslation( $sError ) . ': ' . PPP_MINIMUM_LENGTH . '<br />';
+                        $aFields[substr( $sError, 3 )] = PPP_MINIMUM_LENGTH;
+                        break;
+                    case 'ID_PPP_MAXIMUM_LENGTH':
+                        $aFields['DESCRIPTION'] .= ' - ' . G::LoadTranslation( $sError ) . ': ' . PPP_MAXIMUM_LENGTH . '<br />';
+                        $aFields[substr( $sError, 3 )] = PPP_MAXIMUM_LENGTH;
+                        break;
+                    case 'ID_PPP_EXPIRATION_IN':
+                        $aFields['DESCRIPTION'] .= ' - ' . G::LoadTranslation( $sError ) . ' ' . PPP_EXPIRATION_IN . ' ' . G::LoadTranslation( 'ID_DAYS' ) . '<br />';
+                        $aFields[substr( $sError, 3 )] = PPP_EXPIRATION_IN;
+                        break;
+                    default:
+                        $aFields['DESCRIPTION'] .= ' - ' . G::LoadTranslation( $sError ) . '<br />';
+                        $aFields[substr( $sError, 3 )] = 1;
+                        break;
+                }
+            }
+
+            $aFields['DESCRIPTION'] .= G::LoadTranslation( 'ID_PLEASE_CHANGE_PASSWORD_POLICY' ) . '</span>';
+            $aFields['STATUS'] = false;
+        } else {
+            $color = 'green';
+            $img = '/images/dialog-ok-apply.png';
+            $aFields['DESCRIPTION'] = G::LoadTranslation( 'ID_PASSWORD_COMPLIES_POLICIES' ) . '</span>';
+            $aFields['STATUS'] = true;
+        }
+        $span = '<span style="color: ' . $color . '; font: 9px tahoma,arial,helvetica,sans-serif;">';
+        $gif = '<img width="13" height="13" border="0" src="' . $img . '">';
+        $aFields['DESCRIPTION'] = $span . $gif . $aFields['DESCRIPTION'];
+        print (G::json_encode( $aFields )) ;
+        break;
+    case 'testUsername':
+        require_once 'classes/model/Users.php';
+        $_POST['NEW_USERNAME'] = trim( $_POST['NEW_USERNAME'] );
+        $USR_UID = isset( $_POST['USR_UID'] ) ? $_POST['USR_UID'] : '';
+
+        $response = array ("success" => true
+        );
+
+        $oCriteria = new Criteria();
+        $oCriteria->addSelectColumn( UsersPeer::USR_USERNAME );
+
+        $oCriteria->add( UsersPeer::USR_USERNAME, $_POST['NEW_USERNAME'] );
+        if ($USR_UID != '') {
+            $oCriteria->add( UsersPeer::USR_UID, array ($_POST['USR_UID']
+            ), Criteria::NOT_IN );
+        }
+        $oDataset = UsersPeer::doSelectRS( $oCriteria );
+        $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+        $oDataset->next();
+        $aRow = $oDataset->getRow();
+
+        if (is_array( $aRow ) || $_POST['NEW_USERNAME'] == '') {
+            $color = 'red';
+            $img = '/images/delete.png';
+            $dataVar['USER_ID'] = $_POST['NEW_USERNAME'];
+            $text = G::LoadTranslation( 'ID_USERNAME_ALREADY_EXISTS', $dataVar );
+            $text = ($_POST['NEW_USERNAME'] == '') ? G::LoadTranslation( 'ID_MSG_ERROR_USR_USERNAME' ) : $text;
+            $response['exists'] = true;
+        } else {
+            $color = 'green';
+            $img = '/images/dialog-ok-apply.png';
+            $text = G::LoadTranslation( 'ID_USERNAME_CORRECT' );
+            $response['exists'] = false;
+        }
+
+        $span = '<span style="color: ' . $color . '; font: 9px tahoma,arial,helvetica,sans-serif;">';
+        $gif = '<img width="13" height="13" border="0" src="' . $img . '">';
+        $response['descriptionText'] = $span . $gif . $text . '</span>';
+        echo G::json_encode( $response );
+        break;
 
 }
+
diff --git a/workflow/engine/methods/users/usersEdit.php b/workflow/engine/methods/users/usersEdit.php
index 3c701e7b9..bbfd6b575 100644
--- a/workflow/engine/methods/users/usersEdit.php
+++ b/workflow/engine/methods/users/usersEdit.php
@@ -1,20 +1 @@
-<?php
-//calculating the max upload file size;
-$POST_MAX_SIZE   = ini_get('post_max_size');
-$mul             = substr($POST_MAX_SIZE, -1);
-$mul             = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
-$postMaxSize     = (int)$POST_MAX_SIZE * $mul;
-
-$UPLOAD_MAX_SIZE = ini_get('upload_max_filesize');
-$mul             = substr($UPLOAD_MAX_SIZE, -1);
-$mul             = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
-$uploadMaxSize   = (int)$UPLOAD_MAX_SIZE * $mul;
-
-if ( $postMaxSize < $uploadMaxSize ) $uploadMaxSize = $postMaxSize;
-
-$oHeadPublisher =& headPublisher::getSingleton(); 
-$oHeadPublisher->addExtJsScript('users/users', true );    //adding a javascript file .js
-$oHeadPublisher->assign('USR_UID', $_GET['USR_UID']);
-$oHeadPublisher->assign('MODE', $_GET['MODE']);
-$oHeadPublisher->assign('MAX_FILES_SIZE', ' (' . $UPLOAD_MAX_SIZE . ') ');
-G::RenderPage('publish', 'extJs');  
+<?php
//calculating the max upload file size;
$POST_MAX_SIZE = ini_get( 'post_max_size' );
$mul = substr( $POST_MAX_SIZE, - 1 );
$mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
$postMaxSize = (int) $POST_MAX_SIZE * $mul;

$UPLOAD_MAX_SIZE = ini_get( 'upload_max_filesize' );
$mul = substr( $UPLOAD_MAX_SIZE, - 1 );
$mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
$uploadMaxSize = (int) $UPLOAD_MAX_SIZE * $mul;

if ($postMaxSize < $uploadMaxSize)
    $uploadMaxSize = $postMaxSize;

$oHeadPublisher = & headPublisher::getSingleton();
$oHeadPublisher->addExtJsScript( 'users/users', true ); //adding a javascript file .js
$oHeadPublisher->assign( 'USR_UID', $_GET['USR_UID'] );
$oHeadPublisher->assign( 'MODE', $_GET['MODE'] );
$oHeadPublisher->assign( 'MAX_FILES_SIZE', ' (' . $UPLOAD_MAX_SIZE . ') ' );
G::RenderPage( 'publish', 'extJs' );

\ No newline at end of file
diff --git a/workflow/engine/methods/users/usersGroups.php b/workflow/engine/methods/users/usersGroups.php
index b08913894..c4b13c737 100755
--- a/workflow/engine/methods/users/usersGroups.php
+++ b/workflow/engine/methods/users/usersGroups.php
@@ -13,38 +13,37 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
  */
-if (($RBAC_Response = $RBAC->userCanAccess("PM_LOGIN")) != 1) {
+if (($RBAC_Response = $RBAC->userCanAccess( "PM_LOGIN" )) != 1) {
     return $RBAC_Response;
 }
 global $RBAC;
 
-$access = $RBAC->userCanAccess('PM_USERS');
+$access = $RBAC->userCanAccess( 'PM_USERS' );
 if ($access != 1) {
     switch ($access) {
-        case -1:
-            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-            G::header('location: ../login/login');
-            die;
+        case - 1:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
             break;
-        case -2:
-            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-            G::header('location: ../login/login');
-            die;
+        case - 2:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
             break;
         default:
-            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-            G::header('location: ../login/login');
-            die;
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
             break;
     }
 }
@@ -53,21 +52,21 @@ $G_SUB_MENU = 'users';
 $G_ID_MENU_SELECTED = 'USERS';
 $G_ID_SUB_MENU_SELECTED = 'USERS';
 
-$G_PUBLISH = new Publisher;
+$G_PUBLISH = new Publisher();
 
-G::LoadClass('configuration');
+G::LoadClass( 'configuration' );
 $c = new Configurations();
-$configEnv = $c->getConfiguration('ENVIRONMENT_SETTINGS', '');
-$Config['fullNameFormat'] = isset($configEnv['format']) ? $configEnv['format'] : '@firstName @lastName (@userName)';
+$configEnv = $c->getConfiguration( 'ENVIRONMENT_SETTINGS', '' );
+$Config['fullNameFormat'] = isset( $configEnv['format'] ) ? $configEnv['format'] : '@firstName @lastName (@userName)';
 
 require_once 'classes/model/Users.php';
 $oCriteria = new Criteria();
-$oCriteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
-$oCriteria->addSelectColumn(UsersPeer::USR_LASTNAME);
-$oCriteria->addSelectColumn(UsersPeer::USR_USERNAME);
-$oCriteria->add(UsersPeer::USR_UID, $_GET['uUID']);
-$oDataset = UsersPeer::doSelectRS($oCriteria);
-$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+$oCriteria->addSelectColumn( UsersPeer::USR_FIRSTNAME );
+$oCriteria->addSelectColumn( UsersPeer::USR_LASTNAME );
+$oCriteria->addSelectColumn( UsersPeer::USR_USERNAME );
+$oCriteria->add( UsersPeer::USR_UID, $_GET['uUID'] );
+$oDataset = UsersPeer::doSelectRS( $oCriteria );
+$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
 $oDataset->next();
 $aRow = $oDataset->getRow();
 
@@ -83,7 +82,7 @@ switch ($_REQUEST['type']) {
         break;
 }
 
-$users = Array();
+$users = Array ();
 $users['USR_UID'] = $_GET['uUID'];
 $users['USR_FIRSTNAME'] = $aRow['USR_FIRSTNAME'];
 $users['USR_LASTNAME'] = $aRow['USR_LASTNAME'];
@@ -92,11 +91,11 @@ $users['fullNameFormat'] = $Config['fullNameFormat'];
 $users['CURRENT_TAB'] = $ctab;
 
 $oHeadPublisher = & headPublisher::getSingleton();
-$oHeadPublisher->addExtJsScript('users/usersGroups', false);    //adding a javascript file .js
+$oHeadPublisher->addExtJsScript( 'users/usersGroups', false ); //adding a javascript file .js
 // $oHeadPublisher->addContent('users/usersGroups'); //adding a html file  .html.
-$oHeadPublisher->assign('USERS', $users);
+$oHeadPublisher->assign( 'USERS', $users );
 
-$oHeadPublisher->assign('hasAuthPerm', ($RBAC->userCanAccess('PM_SETUP_ADVANCE') == 1));
+$oHeadPublisher->assign( 'hasAuthPerm', ($RBAC->userCanAccess( 'PM_SETUP_ADVANCE' ) == 1) );
+
+G::RenderPage( 'publish', 'extJs' );
 
-G::RenderPage('publish', 'extJs');
- 
\ No newline at end of file
diff --git a/workflow/engine/methods/users/usersInit.php b/workflow/engine/methods/users/usersInit.php
index d7e780046..fd07df439 100644
--- a/workflow/engine/methods/users/usersInit.php
+++ b/workflow/engine/methods/users/usersInit.php
@@ -1,36 +1,38 @@
-<?php
-global $RBAC;
-
-require_once 'classes/model/Users.php';
-unset($_SESSION['CURRENT_USER']);
-$oUser   = new Users();
-$aFields = $oUser->load($_SESSION['USER_LOGGED']);
-
-if ($RBAC->userCanAccess('PM_EDITPERSONALINFO') == 1) { //he has permitions for edit his profile
-  $canEdit = false;
-} else { //he has not permitions for edit his profile, so just view mode will be displayed
-  $canEdit = true;    
-}
-
-//calculating the max upload file size;
-$POST_MAX_SIZE   = ini_get('post_max_size');
-$mul             = substr($POST_MAX_SIZE, -1);
-$mul             = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
-$postMaxSize     = (int)$POST_MAX_SIZE * $mul;
-
-$UPLOAD_MAX_SIZE = ini_get('upload_max_filesize');
-$mul             = substr($UPLOAD_MAX_SIZE, -1);
-$mul             = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
-$uploadMaxSize   = (int)$UPLOAD_MAX_SIZE * $mul;
-
-if ( $postMaxSize < $uploadMaxSize ) $uploadMaxSize = $postMaxSize;
-
-$oHeadPublisher =& headPublisher::getSingleton();
-$oHeadPublisher->addExtJsScript('users/users', true );    //adding a javascript file .js
-// $oHeadPublisher->addContent('users/users'); //adding a html file  .html.
-$oHeadPublisher->assign('USR_UID', $aFields['USR_UID']);
-$oHeadPublisher->assign('infoMode', true);
-$oHeadPublisher->assign('canEdit', $canEdit);
-$oHeadPublisher->assign('MAX_FILES_SIZE', ' (' . $UPLOAD_MAX_SIZE . ') ');
-$oHeadPublisher->assign('MODE', '');
-G::RenderPage('publish', 'extJs');
+<?php
+global $RBAC;
+
+require_once 'classes/model/Users.php';
+unset( $_SESSION['CURRENT_USER'] );
+$oUser = new Users();
+$aFields = $oUser->load( $_SESSION['USER_LOGGED'] );
+
+if ($RBAC->userCanAccess( 'PM_EDITPERSONALINFO' ) == 1) { //he has permitions for edit his profile
+    $canEdit = false;
+} else { //he has not permitions for edit his profile, so just view mode will be displayed
+    $canEdit = true;
+}
+
+//calculating the max upload file size;
+$POST_MAX_SIZE = ini_get( 'post_max_size' );
+$mul = substr( $POST_MAX_SIZE, - 1 );
+$mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
+$postMaxSize = (int) $POST_MAX_SIZE * $mul;
+
+$UPLOAD_MAX_SIZE = ini_get( 'upload_max_filesize' );
+$mul = substr( $UPLOAD_MAX_SIZE, - 1 );
+$mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
+$uploadMaxSize = (int) $UPLOAD_MAX_SIZE * $mul;
+
+if ($postMaxSize < $uploadMaxSize)
+    $uploadMaxSize = $postMaxSize;
+
+$oHeadPublisher = & headPublisher::getSingleton();
+$oHeadPublisher->addExtJsScript( 'users/users', true ); //adding a javascript file .js
+// $oHeadPublisher->addContent('users/users'); //adding a html file  .html.
+$oHeadPublisher->assign( 'USR_UID', $aFields['USR_UID'] );
+$oHeadPublisher->assign( 'infoMode', true );
+$oHeadPublisher->assign( 'canEdit', $canEdit );
+$oHeadPublisher->assign( 'MAX_FILES_SIZE', ' (' . $UPLOAD_MAX_SIZE . ') ' );
+$oHeadPublisher->assign( 'MODE', '' );
+G::RenderPage( 'publish', 'extJs' );
+
diff --git a/workflow/engine/methods/users/usersNew.php b/workflow/engine/methods/users/usersNew.php
index 039019d90..a81603d06 100644
--- a/workflow/engine/methods/users/usersNew.php
+++ b/workflow/engine/methods/users/usersNew.php
@@ -1,21 +1,23 @@
-<?php
-
+<?php
+
 //calculating the max upload file size;
-$POST_MAX_SIZE   = ini_get('post_max_size');
-$mul = substr($POST_MAX_SIZE, -1);
-$mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
-$postMaxSize = (int)$POST_MAX_SIZE * $mul;
+$POST_MAX_SIZE = ini_get( 'post_max_size' );
+$mul = substr( $POST_MAX_SIZE, - 1 );
+$mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
+$postMaxSize = (int) $POST_MAX_SIZE * $mul;
+
+$UPLOAD_MAX_SIZE = ini_get( 'upload_max_filesize' );
+$mul = substr( $UPLOAD_MAX_SIZE, - 1 );
+$mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
+$uploadMaxSize = (int) $UPLOAD_MAX_SIZE * $mul;
+
+if ($postMaxSize < $uploadMaxSize)
+    $uploadMaxSize = $postMaxSize;
+
+$oHeadPublisher = & headPublisher::getSingleton();
+$oHeadPublisher->addExtJsScript( 'users/users', true ); //adding a javascript file .js
+$oHeadPublisher->assign( 'USR_UID', '' );
+$oHeadPublisher->assign( 'MODE', $_GET['MODE'] );
+$oHeadPublisher->assign( 'MAX_FILES_SIZE', ' (' . $UPLOAD_MAX_SIZE . ') ' );
+G::RenderPage( 'publish', 'extJs' );
 
-$UPLOAD_MAX_SIZE = ini_get('upload_max_filesize');
-$mul = substr($UPLOAD_MAX_SIZE, -1);
-$mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
-$uploadMaxSize = (int)$UPLOAD_MAX_SIZE * $mul;
-
-if ( $postMaxSize < $uploadMaxSize ) $uploadMaxSize = $postMaxSize;
-
-$oHeadPublisher =& headPublisher::getSingleton();
-$oHeadPublisher->addExtJsScript('users/users', true );    //adding a javascript file .js
-$oHeadPublisher->assign('USR_UID', '');
-$oHeadPublisher->assign('MODE', $_GET['MODE']);
-$oHeadPublisher->assign('MAX_FILES_SIZE', ' (' . $UPLOAD_MAX_SIZE . ') ');
-G::RenderPage('publish', 'extJs');
diff --git a/workflow/engine/methods/users/users_Ajax.php b/workflow/engine/methods/users/users_Ajax.php
index aed416375..aeb2ccadd 100755
--- a/workflow/engine/methods/users/users_Ajax.php
+++ b/workflow/engine/methods/users/users_Ajax.php
@@ -12,511 +12,496 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
  */
 try {
-  global $RBAC;
-  switch ($RBAC->userCanAccess('PM_LOGIN'))
-  {
-    case -2:
-      G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-      G::header('location: ../login/login');
-      die;
-      break;
-    case -1:
-      G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-      G::header('location: ../login/login');
-      die;
-      break;
-  }
-  G::LoadInclude('ajax');
-  if (isset($_POST['form']))
-  {
-    $_POST = $_POST['form'];
-  }
-  if(isset($_REQUEST['function'])){
-    //$value= $_POST['function'];
-    $value = get_ajax_value('function');
-  }else{
-      //$value= $_POST['functions'];
-      $value = get_ajax_value('functions');
-  }
-  switch ($value){
-    case 'verifyUsername':
-      //print_r($_POST); die;
-      $_POST['sOriginalUsername'] = get_ajax_value('sOriginalUsername');
-      $_POST['sUsername']         = get_ajax_value('sUsername');
-      if ($_POST['sOriginalUsername'] == $_POST['sUsername'])
-        {
-          echo '0';
-        }
-        else
-        {
-          require_once 'classes/model/Users.php';
-          G::LoadClass('Users');
-          $oUser = new Users();
-          $oCriteria=$oUser->loadByUsername($_POST['sUsername']);
-          $oDataset = UsersPeer::doSelectRS($oCriteria);
-          $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-          $oDataset->next();
-          $aRow = $oDataset->getRow();
-          //print_r($aRow); die;
-          //if (!$aRow)
-          if (!is_array($aRow))
-            {
-              echo '0';
+    global $RBAC;
+    switch ($RBAC->userCanAccess( 'PM_LOGIN' )) {
+        case - 2:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+        case - 1:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+    }
+    G::LoadInclude( 'ajax' );
+    if (isset( $_POST['form'] )) {
+        $_POST = $_POST['form'];
+    }
+    if (isset( $_REQUEST['function'] )) {
+        //$value= $_POST['function'];
+        $value = get_ajax_value( 'function' );
+    } else {
+        //$value= $_POST['functions'];
+        $value = get_ajax_value( 'functions' );
+    }
+    switch ($value) {
+        case 'verifyUsername':
+            //print_r($_POST); die;
+            $_POST['sOriginalUsername'] = get_ajax_value( 'sOriginalUsername' );
+            $_POST['sUsername'] = get_ajax_value( 'sUsername' );
+            if ($_POST['sOriginalUsername'] == $_POST['sUsername']) {
+                echo '0';
+            } else {
+                require_once 'classes/model/Users.php';
+                G::LoadClass( 'Users' );
+                $oUser = new Users();
+                $oCriteria = $oUser->loadByUsername( $_POST['sUsername'] );
+                $oDataset = UsersPeer::doSelectRS( $oCriteria );
+                $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+                $oDataset->next();
+                $aRow = $oDataset->getRow();
+                //print_r($aRow); die;
+                //if (!$aRow)
+                if (! is_array( $aRow )) {
+                    echo '0';
+                } else {
+                    echo '1';
+                }
             }
-            else
-            {
-              echo '1';
+            break;
+        case 'availableUsers':
+            G::LoadClass( 'processMap' );
+            $oProcessMap = new ProcessMap();
+            global $G_PUBLISH;
+            $G_PUBLISH = new Publisher();
+            $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'users/users_AvailableUsers', $oProcessMap->getAvailableUsersCriteria( $_GET['sTask'], $_GET['iType'] ) );
+            G::RenderPage( 'publish', 'raw' );
+            break;
+        case 'assign':
+            G::LoadClass( 'tasks' );
+            $oTasks = new Tasks();
+            switch ((int) $_POST['TU_RELATION']) {
+                case 1:
+                    echo $oTasks->assignUser( $_POST['TAS_UID'], $_POST['USR_UID'], $_POST['TU_TYPE'] );
+                    break;
+                case 2:
+                    echo $oTasks->assignGroup( $_POST['TAS_UID'], $_POST['USR_UID'], $_POST['TU_TYPE'] );
+                    break;
             }
-      }
-      break;
-    case 'availableUsers':
-      G::LoadClass('processMap');
-      $oProcessMap = new ProcessMap();
-      global $G_PUBLISH;
-      $G_PUBLISH = new Publisher();
-      $G_PUBLISH->AddContent('propeltable', 'paged-table', 'users/users_AvailableUsers', $oProcessMap->getAvailableUsersCriteria($_GET['sTask'], $_GET['iType']));
-      G::RenderPage('publish', 'raw');
-      break;
-    case 'assign':
-      G::LoadClass('tasks');
-      $oTasks = new Tasks();
-      switch ((int)$_POST['TU_RELATION']) {
-        case 1:
-          echo $oTasks->assignUser($_POST['TAS_UID'], $_POST['USR_UID'], $_POST['TU_TYPE']);
-          break;
-        case 2:
-          echo $oTasks->assignGroup($_POST['TAS_UID'], $_POST['USR_UID'], $_POST['TU_TYPE']);
-          break;
-      }
-      break;
-    case 'ofToAssign':
-      G::LoadClass('tasks');
-      $oTasks = new Tasks();
-      switch ((int)$_POST['TU_RELATION']) {
-        case 1:
-          echo $oTasks->ofToAssignUser($_POST['TAS_UID'], $_POST['USR_UID'], $_POST['TU_TYPE']);
-          break;
-        case 2:
-          echo $oTasks->ofToAssignGroup($_POST['TAS_UID'], $_POST['USR_UID'], $_POST['TU_TYPE']);
-          break;
-      }
-      break;
-    case 'changeView':
-      $_SESSION['iType'] = $_POST['TU_TYPE'];
-      break;
-    case 'deleteGroup':
-      G::LoadClass('groups');
-      $oGroup = new Groups();
-      $oGroup->removeUserOfGroup($_POST['GRP_UID'], $_POST['USR_UID']);
-      $_GET['sUserUID'] = $_POST['USR_UID'];
-      $G_PUBLISH = new Publisher;
-      $G_PUBLISH->AddContent('view', 'users/users_Tree' );
-      G::RenderPage('publish', 'raw');
-      break;
-    case 'showUserGroupInterface':
-      $_GET['sUserUID'] = $_POST['sUserUID'];
-      $G_PUBLISH = new Publisher;
-      $G_PUBLISH->AddContent('view', 'users/users_AssignGroup' );
-      G::RenderPage('publish', 'raw');
-      break;
-    case 'showUserGroups':
-      $_GET['sUserUID'] = $_POST['sUserUID'];
-      $G_PUBLISH = new Publisher;
-      $G_PUBLISH->AddContent('view', 'users/users_Tree' );
-      G::RenderPage('publish', 'raw');
-      break;
-    case 'assignUserToGroup':
-      G::LoadClass('groups');
-      $oGroup = new Groups();
-      $oGroup->addUserToGroup($_POST['GRP_UID'], $_POST['USR_UID']);
-      echo '<div align="center"><h2><font color="blue">'.G::LoadTranslation('ID_MSG_ASSIGN_DONE').'</font></h2></div>';
-      break;
-    case 'usersGroup':
-      G::LoadClass('groups');
-      $oGroup = new Groups();
-      $aGroup = $oGroup->getUsersOfGroup($_POST['GRP_UID']);
-      foreach ($aGroup as $iIndex => $aValues) {
-        echo $aValues['USR_FIRSTNAME'] . ' ' . $aValues['USR_LASTNAME'] . '<br>';
-      }
-      break;
+            break;
+        case 'ofToAssign':
+            G::LoadClass( 'tasks' );
+            $oTasks = new Tasks();
+            switch ((int) $_POST['TU_RELATION']) {
+                case 1:
+                    echo $oTasks->ofToAssignUser( $_POST['TAS_UID'], $_POST['USR_UID'], $_POST['TU_TYPE'] );
+                    break;
+                case 2:
+                    echo $oTasks->ofToAssignGroup( $_POST['TAS_UID'], $_POST['USR_UID'], $_POST['TU_TYPE'] );
+                    break;
+            }
+            break;
+        case 'changeView':
+            $_SESSION['iType'] = $_POST['TU_TYPE'];
+            break;
+        case 'deleteGroup':
+            G::LoadClass( 'groups' );
+            $oGroup = new Groups();
+            $oGroup->removeUserOfGroup( $_POST['GRP_UID'], $_POST['USR_UID'] );
+            $_GET['sUserUID'] = $_POST['USR_UID'];
+            $G_PUBLISH = new Publisher();
+            $G_PUBLISH->AddContent( 'view', 'users/users_Tree' );
+            G::RenderPage( 'publish', 'raw' );
+            break;
+        case 'showUserGroupInterface':
+            $_GET['sUserUID'] = $_POST['sUserUID'];
+            $G_PUBLISH = new Publisher();
+            $G_PUBLISH->AddContent( 'view', 'users/users_AssignGroup' );
+            G::RenderPage( 'publish', 'raw' );
+            break;
+        case 'showUserGroups':
+            $_GET['sUserUID'] = $_POST['sUserUID'];
+            $G_PUBLISH = new Publisher();
+            $G_PUBLISH->AddContent( 'view', 'users/users_Tree' );
+            G::RenderPage( 'publish', 'raw' );
+            break;
+        case 'assignUserToGroup':
+            G::LoadClass( 'groups' );
+            $oGroup = new Groups();
+            $oGroup->addUserToGroup( $_POST['GRP_UID'], $_POST['USR_UID'] );
+            echo '<div align="center"><h2><font color="blue">' . G::LoadTranslation( 'ID_MSG_ASSIGN_DONE' ) . '</font></h2></div>';
+            break;
+        case 'usersGroup':
+            G::LoadClass( 'groups' );
+            $oGroup = new Groups();
+            $aGroup = $oGroup->getUsersOfGroup( $_POST['GRP_UID'] );
+            foreach ($aGroup as $iIndex => $aValues) {
+                echo $aValues['USR_FIRSTNAME'] . ' ' . $aValues['USR_LASTNAME'] . '<br>';
+            }
+            break;
 
-    //This case is used to check if any of the user group has as role 'PROCESSMAKER_ADMIN',
-    case 'usersAdminGroupExtJS':
-      G::LoadClass('groups');
-      $oGroup = new Groups();
-      $aGroup = $oGroup->getUsersOfGroup($_POST['GRP_UID']);
-      $responseUser = 'false';
-      $usersAdmin = '';
-      foreach ($aGroup as $iIndex => $aValues) {
-        if ($aValues['USR_ROLE'] == 'PROCESSMAKER_ADMIN') {
-          $responseUser = 'true';
-          $usersAdmin .= $aValues['USR_FIRSTNAME'] . ' ' . $aValues['USR_LASTNAME'].', ';
-        }
-      }
-      $usersAdmin = substr($usersAdmin, 0, -2);
+        //This case is used to check if any of the user group has as role 'PROCESSMAKER_ADMIN',
+        case 'usersAdminGroupExtJS':
+            G::LoadClass( 'groups' );
+            $oGroup = new Groups();
+            $aGroup = $oGroup->getUsersOfGroup( $_POST['GRP_UID'] );
+            $responseUser = 'false';
+            $usersAdmin = '';
+            foreach ($aGroup as $iIndex => $aValues) {
+                if ($aValues['USR_ROLE'] == 'PROCESSMAKER_ADMIN') {
+                    $responseUser = 'true';
+                    $usersAdmin .= $aValues['USR_FIRSTNAME'] . ' ' . $aValues['USR_LASTNAME'] . ', ';
+                }
+            }
+            $usersAdmin = substr( $usersAdmin, 0, - 2 );
 
-      $result = new stdClass();
-      $result->reponse = $responseUser;
-      $result->users = $usersAdmin;
+            $result = new stdClass();
+            $result->reponse = $responseUser;
+            $result->users = $usersAdmin;
 
-      echo G::json_encode($result);
-      break;
-    case 'canDeleteUser':
-      G::LoadClass('case');
-      $oProcessMap = new Cases();
-      $USR_UID = $_POST['uUID'];
-      $total = 0;
-      $history = 0;
-      $c = $oProcessMap->getCriteriaUsersCases('TO_DO', $USR_UID);
-      $total += ApplicationPeer::doCount($c);
-      $c = $oProcessMap->getCriteriaUsersCases('DRAFT', $USR_UID);
-      $total += ApplicationPeer::doCount($c);
-      $c = $oProcessMap->getCriteriaUsersCases('COMPLETED', $USR_UID);
-      $history += ApplicationPeer::doCount($c);
-      $c = $oProcessMap->getCriteriaUsersCases('CANCELLED', $USR_UID);
-      $history += ApplicationPeer::doCount($c);
-      $response = '{success: true, candelete: ';
-      $response .= ($total > 0) ? 'false' : 'true';
-      $response .= ', hashistory: ';
-      $response .= ($history > 0) ? 'true' : 'false';
-      $response .= '}';
-      echo $response;
-      break;
-    case 'deleteUser':
-       $UID = $_POST['USR_UID'];
-       G::LoadClass('tasks');
-      $oTasks = new Tasks();
-      $oTasks->ofToAssignUserOfAllTasks($UID);
-      G::LoadClass('groups');
-      $oGroups = new Groups();
-      $oGroups->removeUserOfAllGroups($UID);
-      $RBAC->changeUserStatus($UID, 'CLOSED');
-      $_GET['USR_USERNAME']='';
-      $RBAC->updateUser(array('USR_UID' => $UID, 'USR_USERNAME' => $_GET['USR_USERNAME']),'');
-       require_once 'classes/model/Users.php';
-       $oUser                 = new Users();
-       $aFields               = $oUser->load($UID);
-       $aFields['USR_STATUS'] = 'CLOSED';
-       $aFields['USR_USERNAME'] = '';
-       $oUser->update($aFields);
-       break;
-    case 'changeUserStatus':
-       $response = new stdclass();
-       if (isset($_REQUEST['USR_UID']) && isset($_REQUEST['NEW_USR_STATUS'])) {
-         $RBAC->changeUserStatus($_REQUEST['USR_UID'], ($_REQUEST['NEW_USR_STATUS'] == 'ACTIVE' ? 1 : 0));
-         require_once 'classes/model/Users.php';
-         $userInstance = new Users();
-         $userData = $userInstance->load($_REQUEST['USR_UID']);
-         $userData['USR_STATUS'] = $_REQUEST['NEW_USR_STATUS'];
-         $userInstance->update($userData);
-         $response->status = 'OK';
-       }
-       else {
-         $response->status = 'ERROR';
-         $response->message = 'USR_UID and NEW_USR_STATUS parameters are required.';
-       }
-       die(G::json_encode($response));
-       break;
-    case 'availableGroups':
-       G::LoadClass('groups');
-       $filter = (isset($_POST['textFilter']))? $_POST['textFilter'] : '';
-       $groups = new Groups();
-       $criteria = $groups->getAvailableGroupsCriteria($_REQUEST['uUID'],$filter);
-       $objects  = GroupwfPeer::doSelectRS($criteria);
-       $objects->setFetchmode ( ResultSet::FETCHMODE_ASSOC );
-       $arr = Array();
-       while ($objects->next()){
-         $arr[] = $objects->getRow();
-       }
-       echo '{groups: '.G::json_encode($arr).'}';
-       break;
-    case 'assignedGroups':
-       G::LoadClass('groups');
-       $filter = (isset($_POST['textFilter']))? $_POST['textFilter'] : '';
-       $groups = new Groups();
-       $criteria = $groups->getAssignedGroupsCriteria($_REQUEST['uUID'],$filter);
-       $objects  = GroupwfPeer::doSelectRS($criteria);
-       $objects->setFetchmode ( ResultSet::FETCHMODE_ASSOC );
-       $arr = Array();
-       while ($objects->next()){
-         $arr[] = $objects->getRow();
-       }
-       echo '{groups: '.G::json_encode($arr).'}';
-       break;
-    case 'assignGroupsToUserMultiple':
-       $USR_UID = $_POST['USR_UID'];
-       $gUIDs = explode(',',$_POST['GRP_UID']);
-       G::LoadClass('groups');
-      $oGroup = new Groups();
-       foreach ($gUIDs as $GRP_UID){
-        $oGroup->addUserToGroup($GRP_UID, $USR_UID);
-       }
-       break;
-    case 'deleteGroupsToUserMultiple':
-       $USR_UID = $_POST['USR_UID'];
-       $gUIDs = explode(',',$_POST['GRP_UID']);
-       G::LoadClass('groups');
-      $oGroup = new Groups();
-       foreach ($gUIDs as $GRP_UID){
-        $oGroup->removeUserOfGroup($GRP_UID, $USR_UID);
-       }
-       break;
-    case 'authSources':
-      $criteria = $RBAC->getAllAuthSources();
-      $objects  = AuthenticationSourcePeer::doSelectRS($criteria);
-      $objects->setFetchmode ( ResultSet::FETCHMODE_ASSOC );
-      $arr = Array();
-      if (isset($_REQUEST['cmb'])){
-        if ($_REQUEST['cmb'] == 'yes'){
-          $started = Array();
-          $started['AUTH_SOURCE_UID'] = '';
-          $started['AUTH_SOURCE_SHOW'] = G::LoadTranslation('ID_ALL');
-          $arr[] = $started;
-        }
-      }
-      $started = Array();
-      $started['AUTH_SOURCE_UID'] = '00000000000000000000000000000000';
-      //$started['AUTH_SOURCE_NAME'] = 'ProcessMaker';
-      //$started['AUTH_SOURCE_TYPE'] = 'MYSQL';
-      $started['AUTH_SOURCE_SHOW'] = 'ProcessMaker (MYSQL)';
-      $arr[] = $started;
-      while ($objects->next()){
-      	$row = $objects->getRow();
-      	$aux = Array();
-        $aux['AUTH_SOURCE_UID'] =  $row['AUTH_SOURCE_UID'];
-        //$aux['AUTH_SOURCE_NAME'] =  $row['AUTH_SOURCE_NAME'];
-        //$aux['AUTH_SOURCE_TYPE'] =  $row['AUTH_SOURCE_TYPE'];
-        $aux['AUTH_SOURCE_SHOW'] = $row['AUTH_SOURCE_NAME'].' ('.$row['AUTH_SOURCE_PROVIDER'].')';
-        $arr[] = $aux;
-      }
-      echo '{sources: '.G::json_encode($arr).'}';
-      break;
-    case 'loadAuthSourceByUID':
-      require_once 'classes/model/Users.php';
-      $oCriteria=$RBAC->load($_POST['uUID']);
-      $UID_AUTH = $oCriteria['UID_AUTH_SOURCE'];
-      if (($UID_AUTH!='00000000000000000000000000000000')&&($UID_AUTH!='')){
-        $aux = $RBAC->getAuthSource($UID_AUTH);
-        $arr = Array();
-        $arr['AUTH_SOURCE_NAME'] = $aux['AUTH_SOURCE_NAME'].' ('.$aux['AUTH_SOURCE_PROVIDER'].')';
-        $arr['AUTH_SOURCE_PROVIDER'] = $aux['AUTH_SOURCE_PROVIDER'];
-        $aFields = $arr;
-      }else{
-        $arr = Array();
-        $arr['AUTH_SOURCE_NAME'] = 'ProcessMaker (MYSQL)';
-        $arr['AUTH_SOURCE_PROVIDER'] = 'MYSQL';
-        $aFields = $arr;
-      }
-      $res = Array();
-      $res['data'] = $oCriteria;
-      $res['auth'] = $aFields;
-      echo G::json_encode($res);
-      break;
-    case 'updateAuthServices':
-       $aData = $RBAC->load($_POST['usr_uid']);
-      unset($aData['USR_ROLE']);
-      $auth_uid = $_POST['auth_source'];
-      $auth_uid2 =  $_POST['auth_source_uid'];
-      if ($auth_uid == $auth_uid2){
-        $auth_uid = $aData['UID_AUTH_SOURCE'];
-      }
-      if (($auth_uid=='00000000000000000000000000000000')||($auth_uid=='')){
-        $aData['USR_AUTH_TYPE']   = 'MYSQL';
-        $aData['UID_AUTH_SOURCE'] = '';
-      }else{
-        $aFields = $RBAC->getAuthSource($auth_uid);
-        $aData['USR_AUTH_TYPE']   = $aFields['AUTH_SOURCE_PROVIDER'];
-        $aData['UID_AUTH_SOURCE'] = $auth_uid;
-      }
-      if (isset($_POST['auth_dn'])){
-         $auth_dn = $_POST['auth_dn'];
-       }else{
-         $auth_dn = "";
-       }
-       $aData['USR_AUTH_USER_DN'] = $auth_dn;
-       $RBAC->updateUser($aData);
-       echo '{success: true}';
-       break;
-    case 'usersList':
-      require_once 'classes/model/Users.php';
-      require_once 'classes/model/LoginLog.php';
-      require_once 'classes/model/Department.php';
-      require_once 'classes/model/AppCacheView.php';
-      global $RBAC;
-      G::LoadClass('configuration');
-      $co = new Configurations();
-      $config = $co->getConfiguration('usersList', 'pageSize','',$_SESSION['USER_LOGGED']);
-      $limit_size = isset($config['pageSize']) ? $config['pageSize'] : 20;
-      $start   = isset($_REQUEST['start'])  ? $_REQUEST['start'] : 0;
-      $limit   = isset($_REQUEST['limit'])  ? $_REQUEST['limit'] : $limit_size;
-      $filter = isset($_REQUEST['textFilter']) ? $_REQUEST['textFilter'] : '';
-      $auths = isset($_REQUEST['auths']) ? $_REQUEST['auths'] : '';
-      $sort = isset($_REQUEST['sort']) ? $_REQUEST['sort'] : '';
-      $dir = isset($_REQUEST['dir']) ? $_REQUEST['dir'] : 'ASC';
-      $aUsers = Array();
-      if ($auths != ''){
-        $aUsers = $RBAC->getListUsersByAuthSource($auths);
-      }
-      $oCriteria = new Criteria('workflow');
-      $oCriteria->addSelectColumn('COUNT(*) AS CNT');
-      if ($filter != ''){
-        $cc = $oCriteria->getNewCriterion(UsersPeer::USR_USERNAME,'%'.$filter.'%',Criteria::LIKE)->addOr(
-        $oCriteria->getNewCriterion(UsersPeer::USR_FIRSTNAME,'%'.$filter.'%',Criteria::LIKE)->addOr(
-        $oCriteria->getNewCriterion(UsersPeer::USR_LASTNAME,'%'.$filter.'%',Criteria::LIKE)->addOr(
-        $oCriteria->getNewCriterion(UsersPeer::USR_EMAIL,'%'.$filter.'%',Criteria::LIKE))));
-        $oCriteria->add($cc);
-      }
-      $oCriteria->add(UsersPeer::USR_STATUS, array('CLOSED'), Criteria::NOT_IN);
-      if ($auths != ''){
-        $totalRows = sizeof($aUsers);
-      }else{
-        $oDataset = UsersPeer::DoSelectRs ($oCriteria);
-        $oDataset->setFetchmode (ResultSet::FETCHMODE_ASSOC);
-        $oDataset->next();
-        $row = $oDataset->getRow();
-        $totalRows = $row['CNT'];
-      }
-      $oCriteria->clearSelectColumns();
-      $oCriteria->addSelectColumn(UsersPeer::USR_UID);
-      $oCriteria->addSelectColumn(UsersPeer::USR_USERNAME);
-      $oCriteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
-      $oCriteria->addSelectColumn(UsersPeer::USR_LASTNAME);
-      $oCriteria->addSelectColumn(UsersPeer::USR_EMAIL);
-      $oCriteria->addSelectColumn(UsersPeer::USR_ROLE);
-      $oCriteria->addSelectColumn(UsersPeer::USR_DUE_DATE);
-      $oCriteria->addSelectColumn(UsersPeer::USR_STATUS);
-      $oCriteria->addSelectColumn(UsersPeer::USR_UX);
-      $oCriteria->addSelectColumn(UsersPeer::DEP_UID);
-      $oCriteria->addAsColumn('LAST_LOGIN', 0);
-      $oCriteria->addAsColumn('DEP_TITLE', 0);
-      $oCriteria->addAsColumn('TOTAL_CASES', 0);
-      $oCriteria->addAsColumn('DUE_DATE_OK', 1);
-      $sep = "'";
-      $oCriteria->add(UsersPeer::USR_STATUS, array('CLOSED'), Criteria::NOT_IN);
-      if ($filter != ''){
-        $cc = $oCriteria->getNewCriterion(UsersPeer::USR_USERNAME,'%'.$filter.'%',Criteria::LIKE)->addOr(
-        $oCriteria->getNewCriterion(UsersPeer::USR_FIRSTNAME,'%'.$filter.'%',Criteria::LIKE)->addOr(
-        $oCriteria->getNewCriterion(UsersPeer::USR_LASTNAME,'%'.$filter.'%',Criteria::LIKE)->addOr(
-        $oCriteria->getNewCriterion(UsersPeer::USR_EMAIL,'%'.$filter.'%',Criteria::LIKE))));
-        $oCriteria->add($cc);
-      }
-//      $sw_add = false;
-//      for ($i=0; $i < sizeof($aUsers); $i++){
-//        if ($i>0){
-//          $tmpL = $tmpL->addOr($oCriteria->getNewCriterion(UsersPeer::USR_UID, $aUsers[$i],Criteria::EQUAL));
-//        }else{
-//          $uList = $oCriteria->getNewCriterion(UsersPeer::USR_UID, $aUsers[$i],Criteria::EQUAL);
-//          $tmpL = $uList;
-//          $sw_add = true;
-//        }
-//      }
-//      if ($sw_add) $oCriteria->add($uList);
-      if (sizeof($aUsers) > 0){
-        $oCriteria->add(UsersPeer::USR_UID, $aUsers, Criteria::IN);
-      }else if ($totalRows==0 && $auths != ''){
-        $oCriteria->add(UsersPeer::USR_UID,'',Criteria::IN);
-      }
-      if ($sort != '') {
-        if ($dir == 'ASC') {
-          $oCriteria->addAscendingOrderByColumn($sort);
-        }
-        else {
-          $oCriteria->addDescendingOrderByColumn($sort);
-        }
-      }
-      $oCriteria->setOffset($start);
-      $oCriteria->setLimit($limit);
-      $oDataset = UsersPeer::DoSelectRs ($oCriteria);
-      $oDataset->setFetchmode (ResultSet::FETCHMODE_ASSOC);
+            echo G::json_encode( $result );
+            break;
+        case 'canDeleteUser':
+            G::LoadClass( 'case' );
+            $oProcessMap = new Cases();
+            $USR_UID = $_POST['uUID'];
+            $total = 0;
+            $history = 0;
+            $c = $oProcessMap->getCriteriaUsersCases( 'TO_DO', $USR_UID );
+            $total += ApplicationPeer::doCount( $c );
+            $c = $oProcessMap->getCriteriaUsersCases( 'DRAFT', $USR_UID );
+            $total += ApplicationPeer::doCount( $c );
+            $c = $oProcessMap->getCriteriaUsersCases( 'COMPLETED', $USR_UID );
+            $history += ApplicationPeer::doCount( $c );
+            $c = $oProcessMap->getCriteriaUsersCases( 'CANCELLED', $USR_UID );
+            $history += ApplicationPeer::doCount( $c );
+            $response = '{success: true, candelete: ';
+            $response .= ($total > 0) ? 'false' : 'true';
+            $response .= ', hashistory: ';
+            $response .= ($history > 0) ? 'true' : 'false';
+            $response .= '}';
+            echo $response;
+            break;
+        case 'deleteUser':
+            $UID = $_POST['USR_UID'];
+            G::LoadClass( 'tasks' );
+            $oTasks = new Tasks();
+            $oTasks->ofToAssignUserOfAllTasks( $UID );
+            G::LoadClass( 'groups' );
+            $oGroups = new Groups();
+            $oGroups->removeUserOfAllGroups( $UID );
+            $RBAC->changeUserStatus( $UID, 'CLOSED' );
+            $_GET['USR_USERNAME'] = '';
+            $RBAC->updateUser( array ('USR_UID' => $UID,'USR_USERNAME' => $_GET['USR_USERNAME']
+            ), '' );
+            require_once 'classes/model/Users.php';
+            $oUser = new Users();
+            $aFields = $oUser->load( $UID );
+            $aFields['USR_STATUS'] = 'CLOSED';
+            $aFields['USR_USERNAME'] = '';
+            $oUser->update( $aFields );
+            break;
+        case 'changeUserStatus':
+            $response = new stdclass();
+            if (isset( $_REQUEST['USR_UID'] ) && isset( $_REQUEST['NEW_USR_STATUS'] )) {
+                $RBAC->changeUserStatus( $_REQUEST['USR_UID'], ($_REQUEST['NEW_USR_STATUS'] == 'ACTIVE' ? 1 : 0) );
+                require_once 'classes/model/Users.php';
+                $userInstance = new Users();
+                $userData = $userInstance->load( $_REQUEST['USR_UID'] );
+                $userData['USR_STATUS'] = $_REQUEST['NEW_USR_STATUS'];
+                $userInstance->update( $userData );
+                $response->status = 'OK';
+            } else {
+                $response->status = 'ERROR';
+                $response->message = 'USR_UID and NEW_USR_STATUS parameters are required.';
+            }
+            die( G::json_encode( $response ) );
+            break;
+        case 'availableGroups':
+            G::LoadClass( 'groups' );
+            $filter = (isset( $_POST['textFilter'] )) ? $_POST['textFilter'] : '';
+            $groups = new Groups();
+            $criteria = $groups->getAvailableGroupsCriteria( $_REQUEST['uUID'], $filter );
+            $objects = GroupwfPeer::doSelectRS( $criteria );
+            $objects->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+            $arr = Array ();
+            while ($objects->next()) {
+                $arr[] = $objects->getRow();
+            }
+            echo '{groups: ' . G::json_encode( $arr ) . '}';
+            break;
+        case 'assignedGroups':
+            G::LoadClass( 'groups' );
+            $filter = (isset( $_POST['textFilter'] )) ? $_POST['textFilter'] : '';
+            $groups = new Groups();
+            $criteria = $groups->getAssignedGroupsCriteria( $_REQUEST['uUID'], $filter );
+            $objects = GroupwfPeer::doSelectRS( $criteria );
+            $objects->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+            $arr = Array ();
+            while ($objects->next()) {
+                $arr[] = $objects->getRow();
+            }
+            echo '{groups: ' . G::json_encode( $arr ) . '}';
+            break;
+        case 'assignGroupsToUserMultiple':
+            $USR_UID = $_POST['USR_UID'];
+            $gUIDs = explode( ',', $_POST['GRP_UID'] );
+            G::LoadClass( 'groups' );
+            $oGroup = new Groups();
+            foreach ($gUIDs as $GRP_UID) {
+                $oGroup->addUserToGroup( $GRP_UID, $USR_UID );
+            }
+            break;
+        case 'deleteGroupsToUserMultiple':
+            $USR_UID = $_POST['USR_UID'];
+            $gUIDs = explode( ',', $_POST['GRP_UID'] );
+            G::LoadClass( 'groups' );
+            $oGroup = new Groups();
+            foreach ($gUIDs as $GRP_UID) {
+                $oGroup->removeUserOfGroup( $GRP_UID, $USR_UID );
+            }
+            break;
+        case 'authSources':
+            $criteria = $RBAC->getAllAuthSources();
+            $objects = AuthenticationSourcePeer::doSelectRS( $criteria );
+            $objects->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+            $arr = Array ();
+            if (isset( $_REQUEST['cmb'] )) {
+                if ($_REQUEST['cmb'] == 'yes') {
+                    $started = Array ();
+                    $started['AUTH_SOURCE_UID'] = '';
+                    $started['AUTH_SOURCE_SHOW'] = G::LoadTranslation( 'ID_ALL' );
+                    $arr[] = $started;
+                }
+            }
+            $started = Array ();
+            $started['AUTH_SOURCE_UID'] = '00000000000000000000000000000000';
+            //$started['AUTH_SOURCE_NAME'] = 'ProcessMaker';
+            //$started['AUTH_SOURCE_TYPE'] = 'MYSQL';
+            $started['AUTH_SOURCE_SHOW'] = 'ProcessMaker (MYSQL)';
+            $arr[] = $started;
+            while ($objects->next()) {
+                $row = $objects->getRow();
+                $aux = Array ();
+                $aux['AUTH_SOURCE_UID'] = $row['AUTH_SOURCE_UID'];
+                //$aux['AUTH_SOURCE_NAME'] =  $row['AUTH_SOURCE_NAME'];
+                //$aux['AUTH_SOURCE_TYPE'] =  $row['AUTH_SOURCE_TYPE'];
+                $aux['AUTH_SOURCE_SHOW'] = $row['AUTH_SOURCE_NAME'] . ' (' . $row['AUTH_SOURCE_PROVIDER'] . ')';
+                $arr[] = $aux;
+            }
+            echo '{sources: ' . G::json_encode( $arr ) . '}';
+            break;
+        case 'loadAuthSourceByUID':
+            require_once 'classes/model/Users.php';
+            $oCriteria = $RBAC->load( $_POST['uUID'] );
+            $UID_AUTH = $oCriteria['UID_AUTH_SOURCE'];
+            if (($UID_AUTH != '00000000000000000000000000000000') && ($UID_AUTH != '')) {
+                $aux = $RBAC->getAuthSource( $UID_AUTH );
+                $arr = Array ();
+                $arr['AUTH_SOURCE_NAME'] = $aux['AUTH_SOURCE_NAME'] . ' (' . $aux['AUTH_SOURCE_PROVIDER'] . ')';
+                $arr['AUTH_SOURCE_PROVIDER'] = $aux['AUTH_SOURCE_PROVIDER'];
+                $aFields = $arr;
+            } else {
+                $arr = Array ();
+                $arr['AUTH_SOURCE_NAME'] = 'ProcessMaker (MYSQL)';
+                $arr['AUTH_SOURCE_PROVIDER'] = 'MYSQL';
+                $aFields = $arr;
+            }
+            $res = Array ();
+            $res['data'] = $oCriteria;
+            $res['auth'] = $aFields;
+            echo G::json_encode( $res );
+            break;
+        case 'updateAuthServices':
+            $aData = $RBAC->load( $_POST['usr_uid'] );
+            unset( $aData['USR_ROLE'] );
+            $auth_uid = $_POST['auth_source'];
+            $auth_uid2 = $_POST['auth_source_uid'];
+            if ($auth_uid == $auth_uid2) {
+                $auth_uid = $aData['UID_AUTH_SOURCE'];
+            }
+            if (($auth_uid == '00000000000000000000000000000000') || ($auth_uid == '')) {
+                $aData['USR_AUTH_TYPE'] = 'MYSQL';
+                $aData['UID_AUTH_SOURCE'] = '';
+            } else {
+                $aFields = $RBAC->getAuthSource( $auth_uid );
+                $aData['USR_AUTH_TYPE'] = $aFields['AUTH_SOURCE_PROVIDER'];
+                $aData['UID_AUTH_SOURCE'] = $auth_uid;
+            }
+            if (isset( $_POST['auth_dn'] )) {
+                $auth_dn = $_POST['auth_dn'];
+            } else {
+                $auth_dn = "";
+            }
+            $aData['USR_AUTH_USER_DN'] = $auth_dn;
+            $RBAC->updateUser( $aData );
+            echo '{success: true}';
+            break;
+        case 'usersList':
+            require_once 'classes/model/Users.php';
+            require_once 'classes/model/LoginLog.php';
+            require_once 'classes/model/Department.php';
+            require_once 'classes/model/AppCacheView.php';
+            global $RBAC;
+            G::LoadClass( 'configuration' );
+            $co = new Configurations();
+            $config = $co->getConfiguration( 'usersList', 'pageSize', '', $_SESSION['USER_LOGGED'] );
+            $limit_size = isset( $config['pageSize'] ) ? $config['pageSize'] : 20;
+            $start = isset( $_REQUEST['start'] ) ? $_REQUEST['start'] : 0;
+            $limit = isset( $_REQUEST['limit'] ) ? $_REQUEST['limit'] : $limit_size;
+            $filter = isset( $_REQUEST['textFilter'] ) ? $_REQUEST['textFilter'] : '';
+            $auths = isset( $_REQUEST['auths'] ) ? $_REQUEST['auths'] : '';
+            $sort = isset( $_REQUEST['sort'] ) ? $_REQUEST['sort'] : '';
+            $dir = isset( $_REQUEST['dir'] ) ? $_REQUEST['dir'] : 'ASC';
+            $aUsers = Array ();
+            if ($auths != '') {
+                $aUsers = $RBAC->getListUsersByAuthSource( $auths );
+            }
+            $oCriteria = new Criteria( 'workflow' );
+            $oCriteria->addSelectColumn( 'COUNT(*) AS CNT' );
+            if ($filter != '') {
+                $cc = $oCriteria->getNewCriterion( UsersPeer::USR_USERNAME, '%' . $filter . '%', Criteria::LIKE )->addOr( $oCriteria->getNewCriterion( UsersPeer::USR_FIRSTNAME, '%' . $filter . '%', Criteria::LIKE )->addOr( $oCriteria->getNewCriterion( UsersPeer::USR_LASTNAME, '%' . $filter . '%', Criteria::LIKE )->addOr( $oCriteria->getNewCriterion( UsersPeer::USR_EMAIL, '%' . $filter . '%', Criteria::LIKE ) ) ) );
+                $oCriteria->add( $cc );
+            }
+            $oCriteria->add( UsersPeer::USR_STATUS, array ('CLOSED'
+            ), Criteria::NOT_IN );
+            if ($auths != '') {
+                $totalRows = sizeof( $aUsers );
+            } else {
+                $oDataset = UsersPeer::DoSelectRs( $oCriteria );
+                $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+                $oDataset->next();
+                $row = $oDataset->getRow();
+                $totalRows = $row['CNT'];
+            }
+            $oCriteria->clearSelectColumns();
+            $oCriteria->addSelectColumn( UsersPeer::USR_UID );
+            $oCriteria->addSelectColumn( UsersPeer::USR_USERNAME );
+            $oCriteria->addSelectColumn( UsersPeer::USR_FIRSTNAME );
+            $oCriteria->addSelectColumn( UsersPeer::USR_LASTNAME );
+            $oCriteria->addSelectColumn( UsersPeer::USR_EMAIL );
+            $oCriteria->addSelectColumn( UsersPeer::USR_ROLE );
+            $oCriteria->addSelectColumn( UsersPeer::USR_DUE_DATE );
+            $oCriteria->addSelectColumn( UsersPeer::USR_STATUS );
+            $oCriteria->addSelectColumn( UsersPeer::USR_UX );
+            $oCriteria->addSelectColumn( UsersPeer::DEP_UID );
+            $oCriteria->addAsColumn( 'LAST_LOGIN', 0 );
+            $oCriteria->addAsColumn( 'DEP_TITLE', 0 );
+            $oCriteria->addAsColumn( 'TOTAL_CASES', 0 );
+            $oCriteria->addAsColumn( 'DUE_DATE_OK', 1 );
+            $sep = "'";
+            $oCriteria->add( UsersPeer::USR_STATUS, array ('CLOSED'
+            ), Criteria::NOT_IN );
+            if ($filter != '') {
+                $cc = $oCriteria->getNewCriterion( UsersPeer::USR_USERNAME, '%' . $filter . '%', Criteria::LIKE )->addOr( $oCriteria->getNewCriterion( UsersPeer::USR_FIRSTNAME, '%' . $filter . '%', Criteria::LIKE )->addOr( $oCriteria->getNewCriterion( UsersPeer::USR_LASTNAME, '%' . $filter . '%', Criteria::LIKE )->addOr( $oCriteria->getNewCriterion( UsersPeer::USR_EMAIL, '%' . $filter . '%', Criteria::LIKE ) ) ) );
+                $oCriteria->add( $cc );
+            }
+            //      $sw_add = false;
+            //      for ($i=0; $i < sizeof($aUsers); $i++){
+            //        if ($i>0){
+            //          $tmpL = $tmpL->addOr($oCriteria->getNewCriterion(UsersPeer::USR_UID, $aUsers[$i],Criteria::EQUAL));
+            //        }else{
+            //          $uList = $oCriteria->getNewCriterion(UsersPeer::USR_UID, $aUsers[$i],Criteria::EQUAL);
+            //          $tmpL = $uList;
+            //          $sw_add = true;
+            //        }
+            //      }
+            //      if ($sw_add) $oCriteria->add($uList);
+            if (sizeof( $aUsers ) > 0) {
+                $oCriteria->add( UsersPeer::USR_UID, $aUsers, Criteria::IN );
+            } else if ($totalRows == 0 && $auths != '') {
+                $oCriteria->add( UsersPeer::USR_UID, '', Criteria::IN );
+            }
+            if ($sort != '') {
+                if ($dir == 'ASC') {
+                    $oCriteria->addAscendingOrderByColumn( $sort );
+                } else {
+                    $oCriteria->addDescendingOrderByColumn( $sort );
+                }
+            }
+            $oCriteria->setOffset( $start );
+            $oCriteria->setLimit( $limit );
+            $oDataset = UsersPeer::DoSelectRs( $oCriteria );
+            $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
 
-      $Login = new LoginLog();
-      $aLogin = $Login->getLastLoginAllUsers();
-      $Cases = new AppCacheView();
-      $aCases = $Cases->getTotalCasesByAllUsers();
-      $Department = new Department();
-      $aDepart = $Department->getAllDepartmentsByUser();
-      $aAuthSources = $RBAC->getAllAuthSourcesByUser();
+            $Login = new LoginLog();
+            $aLogin = $Login->getLastLoginAllUsers();
+            $Cases = new AppCacheView();
+            $aCases = $Cases->getTotalCasesByAllUsers();
+            $Department = new Department();
+            $aDepart = $Department->getAllDepartmentsByUser();
+            $aAuthSources = $RBAC->getAllAuthSourcesByUser();
 
-      require_once PATH_CONTROLLERS . 'adminProxy.php';
-      $uxList = adminProxy::getUxTypesList();
+            require_once PATH_CONTROLLERS . 'adminProxy.php';
+            $uxList = adminProxy::getUxTypesList();
 
-      $rows = Array();
-      while($oDataset->next()){
-        $row = $oDataset->getRow();
-        $row['DUE_DATE_OK'] = (date('Y-m-d')>date('Y-m-d',strtotime($row['USR_DUE_DATE'])))? 0 : 1;
-        $row['LAST_LOGIN']  = isset($aLogin[$row['USR_UID']]) ?  $aLogin[$row['USR_UID']] : '';
-        $row['TOTAL_CASES'] = isset($aCases[$row['USR_UID']]) ? $aCases[$row['USR_UID']] : 0;
-        $row['DEP_TITLE']   = isset($aDepart[$row['USR_UID']]) ? $aDepart[$row['USR_UID']] : '';
-        $row['USR_UX']      = isset($uxList[$row['USR_UX']]) ? $uxList[$row['USR_UX']] : $uxList['NORMAL'];
-        $row['USR_AUTH_SOURCE'] = isset($aAuthSources[$row['USR_UID']]) ? $aAuthSources[$row['USR_UID']] : 'ProcessMaker (MYSQL)';
+            $rows = Array ();
+            while ($oDataset->next()) {
+                $row = $oDataset->getRow();
+                $row['DUE_DATE_OK'] = (date( 'Y-m-d' ) > date( 'Y-m-d', strtotime( $row['USR_DUE_DATE'] ) )) ? 0 : 1;
+                $row['LAST_LOGIN'] = isset( $aLogin[$row['USR_UID']] ) ? $aLogin[$row['USR_UID']] : '';
+                $row['TOTAL_CASES'] = isset( $aCases[$row['USR_UID']] ) ? $aCases[$row['USR_UID']] : 0;
+                $row['DEP_TITLE'] = isset( $aDepart[$row['USR_UID']] ) ? $aDepart[$row['USR_UID']] : '';
+                $row['USR_UX'] = isset( $uxList[$row['USR_UX']] ) ? $uxList[$row['USR_UX']] : $uxList['NORMAL'];
+                $row['USR_AUTH_SOURCE'] = isset( $aAuthSources[$row['USR_UID']] ) ? $aAuthSources[$row['USR_UID']] : 'ProcessMaker (MYSQL)';
 
-        $rows[] = $row;
-      }
-      echo '{users: '.G::json_encode($rows).', total_users: '.$totalRows.'}';
-      break;
-    case 'updatePageSize':
-       G::LoadClass('configuration');
-       $c = new Configurations();
-      $arr['pageSize'] = $_REQUEST['size'];
-       $arr['dateSave'] = date('Y-m-d H:i:s');
-       $config = Array();
-       $config[] = $arr;
-       $c->aConfig = $config;
-       $c->saveConfig('usersList', 'pageSize','',$_SESSION['USER_LOGGED']);
-       echo '{success: true}';
-       break;
-    case 'summaryUserData':
-      require_once 'classes/model/Users.php';
-      require_once 'classes/model/Department.php';
-      require_once 'classes/model/AppCacheView.php';
-      G::LoadClass('configuration');
-      $oUser = new Users();
-      $data = $oUser->loadDetailed($_REQUEST['USR_UID']);
-      $data['USR_STATUS'] = G::LoadTranslation('ID_' . $data['USR_STATUS']);
-      $oAppCache = new AppCacheView();
-      $aTypes = Array();
-      $aTypes['to_do']       = 'CASES_INBOX';
-      $aTypes['draft']       = 'CASES_DRAFT';
-      $aTypes['cancelled']   = 'CASES_CANCELLED';
-      $aTypes['sent']        = 'CASES_SENT';
-      $aTypes['paused']      = 'CASES_PAUSED';
-      $aTypes['completed']   = 'CASES_COMPLETED';
-      $aTypes['selfservice'] = 'CASES_SELFSERVICE';
-      $aCount = $oAppCache->getAllCounters( array_keys($aTypes), $_REQUEST['USR_UID']);
-      $dep = new Department();
-      if ($dep->existsDepartment($data['DEP_UID'])){
-         $dep->Load($data['DEP_UID']);
-        $dep_name = $dep->getDepTitle();
-      }else{
-        $dep_name = '';
-      }
-      if ($data['USR_REPLACED_BY']!=''){
-        $user = new Users();
-        $u = $user->load($data['USR_REPLACED_BY']);
-        $c = new Configurations();
-        $replaced_by = $c->usersNameFormat($u['USR_USERNAME'], $u['USR_FIRSTNAME'], $u['USR_LASTNAME']);
-      }else{
-        $replaced_by = '';
-      }
-      $misc = Array();
-      $misc['DEP_TITLE'] = $dep_name;
-      $misc['REPLACED_NAME'] = $replaced_by;
-        echo '{success: true, userdata: '.G::json_encode($data).', cases: '.G::json_encode($aCount).', misc: '.G::json_encode($misc).'}';
-       break;
-   }
+                $rows[] = $row;
+            }
+            echo '{users: ' . G::json_encode( $rows ) . ', total_users: ' . $totalRows . '}';
+            break;
+        case 'updatePageSize':
+            G::LoadClass( 'configuration' );
+            $c = new Configurations();
+            $arr['pageSize'] = $_REQUEST['size'];
+            $arr['dateSave'] = date( 'Y-m-d H:i:s' );
+            $config = Array ();
+            $config[] = $arr;
+            $c->aConfig = $config;
+            $c->saveConfig( 'usersList', 'pageSize', '', $_SESSION['USER_LOGGED'] );
+            echo '{success: true}';
+            break;
+        case 'summaryUserData':
+            require_once 'classes/model/Users.php';
+            require_once 'classes/model/Department.php';
+            require_once 'classes/model/AppCacheView.php';
+            G::LoadClass( 'configuration' );
+            $oUser = new Users();
+            $data = $oUser->loadDetailed( $_REQUEST['USR_UID'] );
+            $data['USR_STATUS'] = G::LoadTranslation( 'ID_' . $data['USR_STATUS'] );
+            $oAppCache = new AppCacheView();
+            $aTypes = Array ();
+            $aTypes['to_do'] = 'CASES_INBOX';
+            $aTypes['draft'] = 'CASES_DRAFT';
+            $aTypes['cancelled'] = 'CASES_CANCELLED';
+            $aTypes['sent'] = 'CASES_SENT';
+            $aTypes['paused'] = 'CASES_PAUSED';
+            $aTypes['completed'] = 'CASES_COMPLETED';
+            $aTypes['selfservice'] = 'CASES_SELFSERVICE';
+            $aCount = $oAppCache->getAllCounters( array_keys( $aTypes ), $_REQUEST['USR_UID'] );
+            $dep = new Department();
+            if ($dep->existsDepartment( $data['DEP_UID'] )) {
+                $dep->Load( $data['DEP_UID'] );
+                $dep_name = $dep->getDepTitle();
+            } else {
+                $dep_name = '';
+            }
+            if ($data['USR_REPLACED_BY'] != '') {
+                $user = new Users();
+                $u = $user->load( $data['USR_REPLACED_BY'] );
+                $c = new Configurations();
+                $replaced_by = $c->usersNameFormat( $u['USR_USERNAME'], $u['USR_FIRSTNAME'], $u['USR_LASTNAME'] );
+            } else {
+                $replaced_by = '';
+            }
+            $misc = Array ();
+            $misc['DEP_TITLE'] = $dep_name;
+            $misc['REPLACED_NAME'] = $replaced_by;
+            echo '{success: true, userdata: ' . G::json_encode( $data ) . ', cases: ' . G::json_encode( $aCount ) . ', misc: ' . G::json_encode( $misc ) . '}';
+            break;
+    }
+} catch (Exception $oException) {
+    die( $oException->getMessage() );
 }
-catch (Exception $oException) {
-  die($oException->getMessage());
-}
-?>
\ No newline at end of file
+
diff --git a/workflow/engine/methods/users/users_AuthSource.php b/workflow/engine/methods/users/users_AuthSource.php
index fdaa04e77..6d19306df 100755
--- a/workflow/engine/methods/users/users_AuthSource.php
+++ b/workflow/engine/methods/users/users_AuthSource.php
@@ -12,28 +12,29 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
  */
 global $RBAC;
-if ($RBAC->userCanAccess('PM_SETUP_ADVANCE') != 1) {
-  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-	G::header('location: ../login/login');
-	die;
+if ($RBAC->userCanAccess( 'PM_SETUP_ADVANCE' ) != 1) {
+    G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+    G::header( 'location: ../login/login' );
+    die();
 }
 
-$G_MAIN_MENU            = 'processmaker';
+$G_MAIN_MENU = 'processmaker';
 //$G_SUB_MENU             = 'users';
-$G_ID_MENU_SELECTED     = 'USERS';
+$G_ID_MENU_SELECTED = 'USERS';
 //$G_ID_SUB_MENU_SELECTED = '-';
 
+
 $G_PUBLISH = new Publisher();
-$G_PUBLISH->AddContent('xmlform', 'xmlform', 'users/users_AuthSource', '', $RBAC->load($_GET['USR_UID']), '../users/users_AuthSourceSave');
-G::RenderPage('publish','blank');
\ No newline at end of file
+$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'users/users_AuthSource', '', $RBAC->load( $_GET['USR_UID'] ), '../users/users_AuthSourceSave' );
+G::RenderPage( 'publish', 'blank' );
+
diff --git a/workflow/engine/methods/users/users_AuthSourceSave.php b/workflow/engine/methods/users/users_AuthSourceSave.php
index 8eeccf5e9..a22f31add 100755
--- a/workflow/engine/methods/users/users_AuthSourceSave.php
+++ b/workflow/engine/methods/users/users_AuthSourceSave.php
@@ -12,35 +12,34 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
  */
 global $RBAC;
-if ($RBAC->userCanAccess('PM_SETUP_ADVANCE') != 1) {
-  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-	G::header('location: ../login/login');
-	die;
+if ($RBAC->userCanAccess( 'PM_SETUP_ADVANCE' ) != 1) {
+    G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+    G::header( 'location: ../login/login' );
+    die();
 }
 
-$aData = $RBAC->load($_POST['form']['USR_UID']);
-unset($aData['USR_ROLE']);
+$aData = $RBAC->load( $_POST['form']['USR_UID'] );
+unset( $aData['USR_ROLE'] );
 if ($_POST['form']['UID_AUTH_SOURCE'] == 'MYSQL') {
-  $aData['USR_AUTH_TYPE']   = 'MYSQL';
-  $aData['UID_AUTH_SOURCE'] = '';
-}
-else {
-  $aFields = $RBAC->getAuthSource($_POST['form']['UID_AUTH_SOURCE']);
-  $aData['USR_AUTH_TYPE']   = $aFields['AUTH_SOURCE_PROVIDER'];
-  $aData['UID_AUTH_SOURCE'] = $_POST['form']['UID_AUTH_SOURCE'];
+    $aData['USR_AUTH_TYPE'] = 'MYSQL';
+    $aData['UID_AUTH_SOURCE'] = '';
+} else {
+    $aFields = $RBAC->getAuthSource( $_POST['form']['UID_AUTH_SOURCE'] );
+    $aData['USR_AUTH_TYPE'] = $aFields['AUTH_SOURCE_PROVIDER'];
+    $aData['UID_AUTH_SOURCE'] = $_POST['form']['UID_AUTH_SOURCE'];
 }
 $aData['USR_AUTH_USER_DN'] = $_POST['form']['USR_AUTH_USER_DN'];
-$RBAC->updateUser($aData);
+$RBAC->updateUser( $aData );
+
+G::header( 'location: users_List' );
 
-G::header('location: users_List');
\ No newline at end of file
diff --git a/workflow/engine/methods/users/users_Delete.php b/workflow/engine/methods/users/users_Delete.php
index 4572ed101..ee64013d3 100755
--- a/workflow/engine/methods/users/users_Delete.php
+++ b/workflow/engine/methods/users/users_Delete.php
@@ -1,5 +1,5 @@
-<?php 
-/** 
+<?php
+/**
  * users_Delete.php
  *
  * ProcessMaker Open Source Edition
@@ -12,62 +12,59 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
  */
 try {
-  global $RBAC;
-  switch ($RBAC->userCanAccess('PM_FACTORY'))
-  {
-  	case -2:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;
-  	case -1:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;
-  }
-  if ($_GET['USR_UID'] == '00000000000000000000000000000001') {
-  	G::SendTemporalMessage('ID_CANNOT_CHANGE_STATUS_ADMIN_USER', 'error', 'usersLabels');
-  	G::header('location: ' . $_SERVER['HTTP_REFERER']);
-  	die;
-  }
-  /*$RBAC->removeUser($_GET['USR_UID']);
+    global $RBAC;
+    switch ($RBAC->userCanAccess( 'PM_FACTORY' )) {
+        case - 2:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+        case - 1:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+    }
+    if ($_GET['USR_UID'] == '00000000000000000000000000000001') {
+        G::SendTemporalMessage( 'ID_CANNOT_CHANGE_STATUS_ADMIN_USER', 'error', 'usersLabels' );
+        G::header( 'location: ' . $_SERVER['HTTP_REFERER'] );
+        die();
+    }
+    /*$RBAC->removeUser($_GET['USR_UID']);
   require_once 'classes/model/Users.php';
   $oUser = new Users();
   $oUser->remove($_GET['USR_UID']);*/
-  
-  //print_r($_GET['USR_UID']); die
-  G::LoadClass('tasks');
-  $oTasks = new Tasks();
-  $oTasks->ofToAssignUserOfAllTasks($_GET['USR_UID']);
-  G::LoadClass('groups');
-  $oGroups = new Groups();
-  $oGroups->removeUserOfAllGroups($_GET['USR_UID']);
-  $RBAC->changeUserStatus($_GET['USR_UID'], 'CLOSED');
-  $_GET['USR_USERNAME']='';
-  $RBAC->updateUser(array('USR_UID' => $_GET['USR_UID'], 'USR_USERNAME' => $_GET['USR_USERNAME']),'');
 
+    //print_r($_GET['USR_UID']); die
+    G::LoadClass( 'tasks' );
+    $oTasks = new Tasks();
+    $oTasks->ofToAssignUserOfAllTasks( $_GET['USR_UID'] );
+    G::LoadClass( 'groups' );
+    $oGroups = new Groups();
+    $oGroups->removeUserOfAllGroups( $_GET['USR_UID'] );
+    $RBAC->changeUserStatus( $_GET['USR_UID'], 'CLOSED' );
+    $_GET['USR_USERNAME'] = '';
+    $RBAC->updateUser( array ('USR_UID' => $_GET['USR_UID'],'USR_USERNAME' => $_GET['USR_USERNAME']
+    ), '' );
 
-  require_once 'classes/model/Users.php';
-  $oUser                 = new Users();
-  $aFields               = $oUser->load($_GET['USR_UID']);
-  $aFields['USR_STATUS'] = 'CLOSED';
-  $aFields['USR_USERNAME'] = '';
-  $oUser->update($aFields);
-  G::header('location: users_List');
+    require_once 'classes/model/Users.php';
+    $oUser = new Users();
+    $aFields = $oUser->load( $_GET['USR_UID'] );
+    $aFields['USR_STATUS'] = 'CLOSED';
+    $aFields['USR_USERNAME'] = '';
+    $oUser->update( $aFields );
+    G::header( 'location: users_List' );
+} catch (Exception $oException) {
+    die( $oException->getMessage() );
 }
-catch (Exception $oException) {
-	die($oException->getMessage());
-}
-?>
\ No newline at end of file
+
diff --git a/workflow/engine/methods/users/users_DeleteAssign.php b/workflow/engine/methods/users/users_DeleteAssign.php
index c228b6d11..a550455ee 100755
--- a/workflow/engine/methods/users/users_DeleteAssign.php
+++ b/workflow/engine/methods/users/users_DeleteAssign.php
@@ -12,38 +12,36 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
  */
- 
-  $USR_UID=$_GET['USR_UID'];
-  
-  G::LoadClass('case');
-  $oProcessMap = new Cases();
 
-  $c = $oProcessMap->getCriteriaUsersCases('TO_DO', $USR_UID);  
-  $array["TO_DO"] = ApplicationPeer::doCount($c);
+$USR_UID = $_GET['USR_UID'];
 
-  $c = $oProcessMap->getCriteriaUsersCases('COMPLETED', $USR_UID);
-  $array["COMPLETED"] = ApplicationPeer::doCount($c);
+G::LoadClass( 'case' );
+$oProcessMap = new Cases();
 
-  $c = $oProcessMap->getCriteriaUsersCases('DRAFT', $USR_UID);
-  $array["DRAFT"] = ApplicationPeer::doCount($c);
+$c = $oProcessMap->getCriteriaUsersCases( 'TO_DO', $USR_UID );
+$array["TO_DO"] = ApplicationPeer::doCount( $c );
 
-  $c = $oProcessMap->getCriteriaUsersCases('CANCELLED', $USR_UID);
-  $array["CANCELLED"] = ApplicationPeer::doCount($c);
+$c = $oProcessMap->getCriteriaUsersCases( 'COMPLETED', $USR_UID );
+$array["COMPLETED"] = ApplicationPeer::doCount( $c );
 
-  $array["USR_UID"]=$USR_UID;
+$c = $oProcessMap->getCriteriaUsersCases( 'DRAFT', $USR_UID );
+$array["DRAFT"] = ApplicationPeer::doCount( $c );
 
-  $G_PUBLISH = new Publisher;
-  $G_PUBLISH->AddContent('xmlform', 'xmlform', 'users/users_DeleteAssign', '', $array, '');
-  G::RenderPage('publish', 'raw');
+$c = $oProcessMap->getCriteriaUsersCases( 'CANCELLED', $USR_UID );
+$array["CANCELLED"] = ApplicationPeer::doCount( $c );
+
+$array["USR_UID"] = $USR_UID;
+
+$G_PUBLISH = new Publisher();
+$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'users/users_DeleteAssign', '', $array, '' );
+G::RenderPage( 'publish', 'raw' );
 
-?>
\ No newline at end of file
diff --git a/workflow/engine/methods/users/users_DeleteReassign.php b/workflow/engine/methods/users/users_DeleteReassign.php
index 68af07477..71f2dd902 100755
--- a/workflow/engine/methods/users/users_DeleteReassign.php
+++ b/workflow/engine/methods/users/users_DeleteReassign.php
@@ -12,153 +12,154 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
  */
- 
-try {
-  global $RBAC;
-  switch ($RBAC->userCanAccess('PM_REASSIGNCASE')) {
-  	case -2:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;
-  	case -1:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;
-  }
 
-  if (!isset($_GET['USR_UID'])) {
-    $_GET['USR_UID'] = '';
-  }
-  
-  $G_MAIN_MENU            = 'processmaker';
-  $G_SUB_MENU             = 'users';
-  $G_ID_MENU_SELECTED     = 'USERS';
-  $G_ID_SUB_MENU_SELECTED = 'USERS';  
-  $G_PUBLISH = new Publisher;
-    
-  if ($_GET['USR_UID'] != '') {
-  	$c=0;
-    $oTemplatePower = new TemplatePower(PATH_TPL . 'users/users_DeleteReassign.html');
-    $oTemplatePower->prepare();
-    G::LoadClass('tasks');
-    G::LoadClass('groups');
-    $oTasks  = new Tasks();
-    $oGroups = new Groups();
-    $oUser   = new Users();
-    G::LoadClass('case');
-    $oCases = new Cases();
-    $USR_UID=$_GET['USR_UID'];
-    list($oCriteriaToDo,$sXMLFile)  = $oCases->getConditionCasesList('to_do', $_GET['USR_UID']);
-    list($oCriteriaDraft,$sXMLFile) = $oCases->getConditionCasesList('draft', $_GET['USR_UID']);    
-    
-    if(ApplicationPeer::doCount($oCriteriaToDo)==0 && ApplicationPeer::doCount($oCriteriaDraft)==0);
-    	G::header('location: users_Delete?USR_UID='.$USR_UID);
-    
-    $oDataset = ApplicationPeer::doSelectRS($oCriteriaToDo);
-    $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-    $oDataset->next();
-    while ($aRow = $oDataset->getRow()) {
-      $c++;
-      $oTemplatePower->newBlock('cases');
-      $aKeys = array_keys($aRow);
-      foreach ($aKeys as $sKey) {
-        $oTemplatePower->assign($sKey, $aRow[$sKey]);
-      }
-      $aUsers  = array($_GET['USR_UID']);
-      $aAux1   = $oTasks->getGroupsOfTask($aRow['TAS_UID'], 1);
-    	foreach ($aAux1 as $aGroup) {
-    		$aAux2 = $oGroups->getUsersOfGroup($aGroup['GRP_UID']);
-    	  foreach ($aAux2 as $aUser) {
-          if (!in_array($aUser['USR_UID'], $aUsers)) {
-            $aUsers[] = $aUser['USR_UID'];
-            $aData    = $oUser->load($aUser['USR_UID']);
-            $oTemplatePower->newBlock('users');
-            $oTemplatePower->assign('USR_UID', $aUser['USR_UID']);
-            $oTemplatePower->assign('USR_FULLNAME', $aData['USR_FIRSTNAME'] . ' ' . $aData['USR_LASTNAME'] . ' (' . $aData['USR_USERNAME'] . ')');
-          }
-    	  }
-    	}
-    	$aAux1  = $oTasks->getUsersOfTask($aRow['TAS_UID'], 1);
-    	foreach ($aAux1 as $aUser) {
-        if (!in_array($aUser['USR_UID'], $aUsers)) {
-          $aUsers[] = $aUser['USR_UID'];
-          $aData    = $oUser->load($aUser['USR_UID']);
-          $oTemplatePower->newBlock('users');
-          $oTemplatePower->assign('USR_UID', $aUser['USR_UID']);
-          $oTemplatePower->assign('USR_FULLNAME', $aData['USR_FIRSTNAME'] . ' ' . $aData['USR_LASTNAME'] . ' (' . $aData['USR_USERNAME'] . ')');
-        }
-    	}
-    	$oTemplatePower->gotoBlock('cases');
-    	$oTemplatePower->assign('ID_STATUS', G::LoadTranslation('ID_TO_DO'));
-    	$oTemplatePower->assign('ID_NO_REASSIGN', G::LoadTranslation('ID_NO_REASSIGN'));
-      $oDataset->next();
-    }    
-    $oDataset = ApplicationPeer::doSelectRS($oCriteriaDraft);
-    $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-    $oDataset->next();
-    while ($aRow = $oDataset->getRow()) {
-    	$c++;
-      $oTemplatePower->newBlock('cases');
-      $aKeys = array_keys($aRow);
-      foreach ($aKeys as $sKey) {
-        $oTemplatePower->assign($sKey, $aRow[$sKey]);
-      }
-      $aUsers  = array($_GET['USR_UID']);
-      $aAux1   = $oTasks->getGroupsOfTask($aRow['TAS_UID'], 1);
-    	foreach ($aAux1 as $aGroup) {
-    		$aAux2 = $oGroups->getUsersOfGroup($aGroup['GRP_UID']);
-    	  foreach ($aAux2 as $aUser) {
-          if (!in_array($aUser['USR_UID'], $aUsers)) {
-            $aUsers[] = $aUser['USR_UID'];
-            $aData    = $oUser->load($aUser['USR_UID']);
-            $oTemplatePower->newBlock('users');
-            $oTemplatePower->assign('USR_UID', $aUser['USR_UID']);
-            $oTemplatePower->assign('USR_FULLNAME', $aData['USR_FIRSTNAME'] . ' ' . $aData['USR_LASTNAME'] . ' (' . $aData['USR_USERNAME'] . ')');
-          }
-    	  }
-    	}
-    	$aAux1  = $oTasks->getUsersOfTask($aRow['TAS_UID'], 1);
-    	foreach ($aAux1 as $aUser) {
-        if (!in_array($aUser['USR_UID'], $aUsers)) {
-          $aUsers[] = $aUser['USR_UID'];
-          $aData    = $oUser->load($aUser['USR_UID']);
-          $oTemplatePower->newBlock('users');
-          $oTemplatePower->assign('USR_UID', $aUser['USR_UID']);
-          $oTemplatePower->assign('USR_FULLNAME', $aData['USR_FIRSTNAME'] . ' ' . $aData['USR_LASTNAME'] . ' (' . $aData['USR_USERNAME'] . ')');
-        }
-    	}
-    	$oTemplatePower->gotoBlock('cases');
-    	$oTemplatePower->assign('ID_STATUS', G::LoadTranslation('ID_DRAFT'));
-    	$oTemplatePower->assign('ID_NO_REASSIGN', G::LoadTranslation('ID_NO_REASSIGN'));
-      $oDataset->next();
+try {
+    global $RBAC;
+    switch ($RBAC->userCanAccess( 'PM_REASSIGNCASE' )) {
+        case - 2:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+        case - 1:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
     }
-    $oTemplatePower->gotoBlock('_ROOT');
-    $oTemplatePower->assign('ID_NUMBER',      '#');
-    $oTemplatePower->assign('ID_CASE',        G::LoadTranslation('ID_CASE'));
-    $oTemplatePower->assign('ID_TASK',        G::LoadTranslation('ID_TASK'));
-    $oTemplatePower->assign('ID_PROCESS',     G::LoadTranslation('ID_PROCESS'));
-    $oTemplatePower->assign('ID_STATUS',      G::LoadTranslation('ID_STATUS'));
-    $oTemplatePower->assign('ID_REASSIGN_TO', G::LoadTranslation('ID_REASSIGN_TO'));
-    $oTemplatePower->assign('ID_REASSIGN',    G::LoadTranslation('ID_REASSIGN'));
-    $oTemplatePower->assign('USR_UID',        $_GET['USR_UID']);
-    $oTemplatePower->assign('CONT',           $c);
-    $G_PUBLISH->AddContent('template', '', '', '', $oTemplatePower);
-  }
-  G::RenderPage('publish');
+
+    if (! isset( $_GET['USR_UID'] )) {
+        $_GET['USR_UID'] = '';
+    }
+
+    $G_MAIN_MENU = 'processmaker';
+    $G_SUB_MENU = 'users';
+    $G_ID_MENU_SELECTED = 'USERS';
+    $G_ID_SUB_MENU_SELECTED = 'USERS';
+    $G_PUBLISH = new Publisher();
+
+    if ($_GET['USR_UID'] != '') {
+        $c = 0;
+        $oTemplatePower = new TemplatePower( PATH_TPL . 'users/users_DeleteReassign.html' );
+        $oTemplatePower->prepare();
+        G::LoadClass( 'tasks' );
+        G::LoadClass( 'groups' );
+        $oTasks = new Tasks();
+        $oGroups = new Groups();
+        $oUser = new Users();
+        G::LoadClass( 'case' );
+        $oCases = new Cases();
+        $USR_UID = $_GET['USR_UID'];
+        list ($oCriteriaToDo, $sXMLFile) = $oCases->getConditionCasesList( 'to_do', $_GET['USR_UID'] );
+        list ($oCriteriaDraft, $sXMLFile) = $oCases->getConditionCasesList( 'draft', $_GET['USR_UID'] );
+
+        if (ApplicationPeer::doCount( $oCriteriaToDo ) == 0 && ApplicationPeer::doCount( $oCriteriaDraft ) == 0)
+            ;
+        G::header( 'location: users_Delete?USR_UID=' . $USR_UID );
+
+        $oDataset = ApplicationPeer::doSelectRS( $oCriteriaToDo );
+        $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+        $oDataset->next();
+        while ($aRow = $oDataset->getRow()) {
+            $c ++;
+            $oTemplatePower->newBlock( 'cases' );
+            $aKeys = array_keys( $aRow );
+            foreach ($aKeys as $sKey) {
+                $oTemplatePower->assign( $sKey, $aRow[$sKey] );
+            }
+            $aUsers = array ($_GET['USR_UID']
+            );
+            $aAux1 = $oTasks->getGroupsOfTask( $aRow['TAS_UID'], 1 );
+            foreach ($aAux1 as $aGroup) {
+                $aAux2 = $oGroups->getUsersOfGroup( $aGroup['GRP_UID'] );
+                foreach ($aAux2 as $aUser) {
+                    if (! in_array( $aUser['USR_UID'], $aUsers )) {
+                        $aUsers[] = $aUser['USR_UID'];
+                        $aData = $oUser->load( $aUser['USR_UID'] );
+                        $oTemplatePower->newBlock( 'users' );
+                        $oTemplatePower->assign( 'USR_UID', $aUser['USR_UID'] );
+                        $oTemplatePower->assign( 'USR_FULLNAME', $aData['USR_FIRSTNAME'] . ' ' . $aData['USR_LASTNAME'] . ' (' . $aData['USR_USERNAME'] . ')' );
+                    }
+                }
+            }
+            $aAux1 = $oTasks->getUsersOfTask( $aRow['TAS_UID'], 1 );
+            foreach ($aAux1 as $aUser) {
+                if (! in_array( $aUser['USR_UID'], $aUsers )) {
+                    $aUsers[] = $aUser['USR_UID'];
+                    $aData = $oUser->load( $aUser['USR_UID'] );
+                    $oTemplatePower->newBlock( 'users' );
+                    $oTemplatePower->assign( 'USR_UID', $aUser['USR_UID'] );
+                    $oTemplatePower->assign( 'USR_FULLNAME', $aData['USR_FIRSTNAME'] . ' ' . $aData['USR_LASTNAME'] . ' (' . $aData['USR_USERNAME'] . ')' );
+                }
+            }
+            $oTemplatePower->gotoBlock( 'cases' );
+            $oTemplatePower->assign( 'ID_STATUS', G::LoadTranslation( 'ID_TO_DO' ) );
+            $oTemplatePower->assign( 'ID_NO_REASSIGN', G::LoadTranslation( 'ID_NO_REASSIGN' ) );
+            $oDataset->next();
+        }
+        $oDataset = ApplicationPeer::doSelectRS( $oCriteriaDraft );
+        $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+        $oDataset->next();
+        while ($aRow = $oDataset->getRow()) {
+            $c ++;
+            $oTemplatePower->newBlock( 'cases' );
+            $aKeys = array_keys( $aRow );
+            foreach ($aKeys as $sKey) {
+                $oTemplatePower->assign( $sKey, $aRow[$sKey] );
+            }
+            $aUsers = array ($_GET['USR_UID']
+            );
+            $aAux1 = $oTasks->getGroupsOfTask( $aRow['TAS_UID'], 1 );
+            foreach ($aAux1 as $aGroup) {
+                $aAux2 = $oGroups->getUsersOfGroup( $aGroup['GRP_UID'] );
+                foreach ($aAux2 as $aUser) {
+                    if (! in_array( $aUser['USR_UID'], $aUsers )) {
+                        $aUsers[] = $aUser['USR_UID'];
+                        $aData = $oUser->load( $aUser['USR_UID'] );
+                        $oTemplatePower->newBlock( 'users' );
+                        $oTemplatePower->assign( 'USR_UID', $aUser['USR_UID'] );
+                        $oTemplatePower->assign( 'USR_FULLNAME', $aData['USR_FIRSTNAME'] . ' ' . $aData['USR_LASTNAME'] . ' (' . $aData['USR_USERNAME'] . ')' );
+                    }
+                }
+            }
+            $aAux1 = $oTasks->getUsersOfTask( $aRow['TAS_UID'], 1 );
+            foreach ($aAux1 as $aUser) {
+                if (! in_array( $aUser['USR_UID'], $aUsers )) {
+                    $aUsers[] = $aUser['USR_UID'];
+                    $aData = $oUser->load( $aUser['USR_UID'] );
+                    $oTemplatePower->newBlock( 'users' );
+                    $oTemplatePower->assign( 'USR_UID', $aUser['USR_UID'] );
+                    $oTemplatePower->assign( 'USR_FULLNAME', $aData['USR_FIRSTNAME'] . ' ' . $aData['USR_LASTNAME'] . ' (' . $aData['USR_USERNAME'] . ')' );
+                }
+            }
+            $oTemplatePower->gotoBlock( 'cases' );
+            $oTemplatePower->assign( 'ID_STATUS', G::LoadTranslation( 'ID_DRAFT' ) );
+            $oTemplatePower->assign( 'ID_NO_REASSIGN', G::LoadTranslation( 'ID_NO_REASSIGN' ) );
+            $oDataset->next();
+        }
+        $oTemplatePower->gotoBlock( '_ROOT' );
+        $oTemplatePower->assign( 'ID_NUMBER', '#' );
+        $oTemplatePower->assign( 'ID_CASE', G::LoadTranslation( 'ID_CASE' ) );
+        $oTemplatePower->assign( 'ID_TASK', G::LoadTranslation( 'ID_TASK' ) );
+        $oTemplatePower->assign( 'ID_PROCESS', G::LoadTranslation( 'ID_PROCESS' ) );
+        $oTemplatePower->assign( 'ID_STATUS', G::LoadTranslation( 'ID_STATUS' ) );
+        $oTemplatePower->assign( 'ID_REASSIGN_TO', G::LoadTranslation( 'ID_REASSIGN_TO' ) );
+        $oTemplatePower->assign( 'ID_REASSIGN', G::LoadTranslation( 'ID_REASSIGN' ) );
+        $oTemplatePower->assign( 'USR_UID', $_GET['USR_UID'] );
+        $oTemplatePower->assign( 'CONT', $c );
+        $G_PUBLISH->AddContent( 'template', '', '', '', $oTemplatePower );
+    }
+    G::RenderPage( 'publish' );
+} catch (Exception $oException) {
+    die( $oException->getMessage() );
 }
-catch (Exception $oException) {
-	die($oException->getMessage());
-}
-?>
\ No newline at end of file
+
diff --git a/workflow/engine/methods/users/users_DeleteReassignEnd.php b/workflow/engine/methods/users/users_DeleteReassignEnd.php
index 06f85f2c7..3766fb29b 100755
--- a/workflow/engine/methods/users/users_DeleteReassignEnd.php
+++ b/workflow/engine/methods/users/users_DeleteReassignEnd.php
@@ -13,78 +13,75 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
  */
 
 try {
-  global $RBAC;
-  switch ($RBAC->userCanAccess('PM_REASSIGNCASE')) {
-  	case -2:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;
-  	case -1:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;
-  }
-  G::LoadClass('case');
-  $oCase  = new Cases();
-  $aCases = array();
-  $aUsers = array();
-  $c=0;  
-  if(isset($_POST['USERS']))
-  {	if (is_array($_POST['USERS'])) {
-    	foreach ($_POST['USERS'] as $sKey => $sUser) {
-      	if ($sUser != '') {
-        	$c++;
-        	$oCase->reassignCase($_POST['APPLICATIONS'][$sKey], $_POST['INDEXES'][$sKey], $_POST['USR_UID'], $sUser);
-        	$aCases[] = $_POST['APPLICATIONS'][$sKey];
-        	$aUsers[] = $sUser;
-      	}
-    	}
-  	} 
-  }
-  G::LoadClass('case');
-  $oCase = new Cases();
-  require_once 'classes/model/Users.php';
-  $oUser = new Users();
-  $sText = '';
-  foreach ($aCases as $sKey => $sCase) {
-    $aCase  = $oCase->loadCase($sCase);
-    $aUser  = $oUser->load($aUsers[$sKey]);
-    $sText .= $aCase['TITLE'] . ' => ' . $aUser['USR_FIRSTNAME'] . ' ' . $aUser['USR_LASTNAME'] . ' (' . $aUser['USR_USERNAME'] . ')' . '<br />';
-  }
-  
-  
-  $G_MAIN_MENU            = 'processmaker';
-  $G_SUB_MENU             = 'users';
-  $G_ID_MENU_SELECTED     = 'USERS';
-  $G_ID_SUB_MENU_SELECTED = 'USERS';  
-  $G_PUBLISH = new Publisher;
-  
-  $aMessage['USR_UID'] = $_POST['USR_UID'];    
-  
-  $aMessage['MESSAGE'] = $sText;    
-  if($_POST['CONT']!=$c)
-  		$aMessage['EVA']=G::LoadTranslation('ID_CASESREASSIGN');//
-  else
-  		$aMessage['EVA']=''; 
-  				
-  $G_PUBLISH->AddContent('xmlform', 'xmlform', 'users/users_ReassignShowInfo', '', $aMessage);
-  G::RenderPage('publish');
+    global $RBAC;
+    switch ($RBAC->userCanAccess( 'PM_REASSIGNCASE' )) {
+        case - 2:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+        case - 1:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+    }
+    G::LoadClass( 'case' );
+    $oCase = new Cases();
+    $aCases = array ();
+    $aUsers = array ();
+    $c = 0;
+    if (isset( $_POST['USERS'] )) {
+        if (is_array( $_POST['USERS'] )) {
+            foreach ($_POST['USERS'] as $sKey => $sUser) {
+                if ($sUser != '') {
+                    $c ++;
+                    $oCase->reassignCase( $_POST['APPLICATIONS'][$sKey], $_POST['INDEXES'][$sKey], $_POST['USR_UID'], $sUser );
+                    $aCases[] = $_POST['APPLICATIONS'][$sKey];
+                    $aUsers[] = $sUser;
+                }
+            }
+        }
+    }
+    G::LoadClass( 'case' );
+    $oCase = new Cases();
+    require_once 'classes/model/Users.php';
+    $oUser = new Users();
+    $sText = '';
+    foreach ($aCases as $sKey => $sCase) {
+        $aCase = $oCase->loadCase( $sCase );
+        $aUser = $oUser->load( $aUsers[$sKey] );
+        $sText .= $aCase['TITLE'] . ' => ' . $aUser['USR_FIRSTNAME'] . ' ' . $aUser['USR_LASTNAME'] . ' (' . $aUser['USR_USERNAME'] . ')' . '<br />';
+    }
+
+    $G_MAIN_MENU = 'processmaker';
+    $G_SUB_MENU = 'users';
+    $G_ID_MENU_SELECTED = 'USERS';
+    $G_ID_SUB_MENU_SELECTED = 'USERS';
+    $G_PUBLISH = new Publisher();
+
+    $aMessage['USR_UID'] = $_POST['USR_UID'];
+
+    $aMessage['MESSAGE'] = $sText;
+    if ($_POST['CONT'] != $c)
+        $aMessage['EVA'] = G::LoadTranslation( 'ID_CASESREASSIGN' ); //
+    else
+        $aMessage['EVA'] = '';
+
+    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'users/users_ReassignShowInfo', '', $aMessage );
+    G::RenderPage( 'publish' );
+} catch (Exception $oException) {
+    die( $oException->getMessage() );
 }
-catch (Exception $oException) {
-	die($oException->getMessage());
-}
-?>
\ No newline at end of file
+
diff --git a/workflow/engine/methods/users/users_Edit.php b/workflow/engine/methods/users/users_Edit.php
index 228e0d416..c08531f87 100755
--- a/workflow/engine/methods/users/users_Edit.php
+++ b/workflow/engine/methods/users/users_Edit.php
@@ -1,162 +1,155 @@
-<?php
-/**
- * users_Edit.php
- *  
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- * 
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd., 
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- * 
- */
-try {
-  global $RBAC;
-  $RBAC->requirePermissions('PM_USERS'); 
-  
-  // deprecated the class XmlForm_Field_Image is currently part of the class.xmlform.php package
-  // the use of the external xmlfield_Image is highly discouraged
-  if (!class_exists('XmlForm_Field_Image')){
-    G::LoadClass('xmlfield_Image');
-  }
-  require_once 'classes/model/Users.php';
-  require_once 'classes/model/Department.php';  
-  
-  $_SESSION['CURRENT_USER'] = $_GET['USR_UID'];
-  $oUser                    = new Users();
-  $aFields                  = $oUser->load($_GET['USR_UID']);
-  $aFields['USR_PASSWORD']  = '********';
-  $aFields['MESSAGE0']   = str_replace("\r\n","<br>",G::LoadTranslation('ID_USER_REGISTERED')) . '!';
-  $aFields['MESSAGE1']   = str_replace("\r\n","<br>",G::LoadTranslation('ID_MSG_ERROR_USR_USERNAME'));
-  $aFields['MESSAGE2']   = str_replace("\r\n","<br>",G::LoadTranslation('ID_MSG_ERROR_DUE_DATE'));
-  $aFields['MESSAGE3']   = str_replace("\r\n","<br>",G::LoadTranslation('ID_NEW_PASS_SAME_OLD_PASS'));
-  $aFields['MESSAGE4']   = str_replace("\r\n","<br>",G::LoadTranslation('ID_MSG_ERROR_USR_FIRSTNAME'));
-  $aFields['MESSAGE5']   = str_replace("\r\n","<br>",G::LoadTranslation('ID_MSG_ERROR_USR_LASTNAME'));
-  $aFields['MESSAGE6']   = str_replace("\r\n","<br>",G::LoadTranslation('ID_ERROR_UPLOADING_IMAGE_TYPE'));
-  $aFields['START_DATE']    = date('Y-m-d');
-  $aFields['END_DATE']      = date('Y-m-d', mktime(0, 0, 0, date('m'), date('d'), date('Y') + 5));
-  
-  $G_MAIN_MENU            = 'processmaker';
-  $G_SUB_MENU             = 'users';
-  $G_ID_MENU_SELECTED     = 'USERS';
-  $G_ID_SUB_MENU_SELECTED = 'USERS';
-
-  $G_PUBLISH                = new Publisher;
-  
-  //getting the user and department
-  $oDepInfo = new Department();
-  $oUser = UsersPeer::retrieveByPk( $aFields['USR_REPORTS_TO'] );
-  if ($oUser != '')
-  if ( get_class ($oUser) == 'Users' ) {
-    $userFields = $oUser->toArray(BasePeer::TYPE_FIELDNAME);
-    $aFields['USR_REPORTS_TO'] = $userFields['USR_FIRSTNAME'] . ' ' . $userFields['USR_LASTNAME'];
-    try {
-      $depFields =  $oDepInfo->load($userFields['DEP_UID'] );
-      $aFields['USR_REPORTS_TO'] .=  " (" . $depFields['DEPO_TITLE'] . ")";
-    }
-    catch( Exception $e ) {
-    }
-  }
-  else{
-    $aFields['USR_REPORTS_TO'] = ' ';
-  }
-
-  try {
-    $depFields =  $oDepInfo->load($aFields['DEP_UID']);
-    $aFields['USR_DEPARTMENT'] = $depFields['DEPO_TITLE'];
-  }
-  catch( Exception $e ) {
-    $oUser = UsersPeer::retrieveByPk( $_GET['USR_UID'] );
-    $oUser->setDepUid( '' );
-    $oUser->save();
-  }
-  
-  //Load Calendar options and falue for this user
-  G::LoadClass ( 'calendar' );
-  $calendar = new Calendar ( );
-  $calendarObj = $calendar->getCalendarList ( true, true );
-  global $_DBArray;
-  $_DBArray ['availableCalendars'] = $calendarObj ['array'];
-  $_SESSION ['_DBArray'] = $_DBArray;
-  $calendarInfo = $calendar->getCalendarFor ( $_GET['USR_UID'], $_GET['USR_UID'], $_GET['USR_UID'] );
-  //If the function returns a DEFAULT calendar it means that this object doesn't have assigned any calendar
-  $aFields ['USR_CALENDAR'] = $calendarInfo ['CALENDAR_APPLIED']!='DEFAULT'? $calendarInfo ['CALENDAR_UID']:"";
-	$aFields['RANDOM']        = rand();
-	
-	/////////////////////////
-	//SELECT USR_UID, CONCAT(USR_LASTNAME, " ", USR_FIRSTNAME) FROM USERS WHERE USR_STATUS = 1 AND USR_UID!= "@#USR_UID" ORDER BY USR_LASTNAME
-	require_once 'classes/model/Users.php';
-	$oCriteria=new Criteria();
-  $oCriteria->addSelectColumn(UsersPeer::USR_UID);
-  $oCriteria->addSelectColumn(UsersPeer::USR_USERNAME);
-  $oCriteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
-  $oCriteria->addSelectColumn(UsersPeer::USR_LASTNAME);
-  $oCriteria->addSelectColumn(UsersPeer::USR_EMAIL);
-  $oCriteria->add(UsersPeer::USR_STATUS,'ACTIVE');
-  $oCriteria->add(UsersPeer::USR_UID,$_GET['USR_UID'], Criteria::NOT_EQUAL);
-  $oDataset=UsersPeer::doSelectRS($oCriteria);
-  $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-  ///////////////////////
-  G::loadClass('configuration');
-  $oConf = new Configurations;
-  $oConf->loadConfig($obj, 'ENVIRONMENT_SETTINGS','');
-
-  $defaultOption = isset($oConf->aConfig['format'])? $oConf->aConfig['format']: '';
-  
-  $aUserInfo = array();
-  $aUserInfo[] = array('USR_UID' => 'char','USER_FULLNAME' => 'char');
-  while( $oDataset->next()){
-  $aRow1 = $oDataset->getRow();
-  
-  $infoUser = G::getFormatUserList($defaultOption,$aRow1);
-  $aUserInfo[]=array(
-          'USR_UID'       => $aRow1['USR_UID'],
-          'USER_FULLNAME' => $infoUser
-         );
-  }
-
-  //calculating the max upload file size;
-  $POST_MAX_SIZE   = ini_get('post_max_size');
-  $mul = substr($POST_MAX_SIZE, -1);
-  $mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
-  $postMaxSize = (int)$POST_MAX_SIZE * $mul;
-
-  $UPLOAD_MAX_SIZE = ini_get('upload_max_filesize');
-  $mul = substr($UPLOAD_MAX_SIZE, -1);
-  $mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
-  $uploadMaxSize = (int)$UPLOAD_MAX_SIZE * $mul;
-
-  if ( $postMaxSize < $uploadMaxSize ) $uploadMaxSize = $postMaxSize;
-  $aFields['MAX_FILES_SIZE'] = " (" . $UPLOAD_MAX_SIZE . ") ";
-
-
-  global $_DBArray;
-  $_DBArray['aUserInfo']  = $aUserInfo;
-  $_SESSION['_DBArray'] = $_DBArray;
-  if ($_GET['USR_AUTH_SOURCE'] == 'ProcessMaker (MYSQL)') {
-    //always show this form  users_EditRT.xml.
-    $G_PUBLISH->AddContent('xmlform', 'xmlform', 'users/users_EditRT.xml', '', $aFields, 'users_Save?USR_UID=' . $_SESSION['CURRENT_USER']);  
-  }
-  else {
-    //for users ldap always show this form users_EditLDAP.xml.
-    $G_PUBLISH->AddContent('xmlform', 'xmlform', 'users/users_EditLDAP.xml', '', $aFields, 'users_Save?USR_UID=' . $_SESSION['CURRENT_USER']);  
-  }
- 
-  G::RenderPage('publish','blank');
+<?php
+/**
+ * users_Edit.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
+ * Coral Gables, FL, 33134, USA, or email info@colosa.com.
+ */
+try {
+    global $RBAC;
+    $RBAC->requirePermissions( 'PM_USERS' );
+
+    // deprecated the class XmlForm_Field_Image is currently part of the class.xmlform.php package
+    // the use of the external xmlfield_Image is highly discouraged
+    if (! class_exists( 'XmlForm_Field_Image' )) {
+        G::LoadClass( 'xmlfield_Image' );
+    }
+    require_once 'classes/model/Users.php';
+    require_once 'classes/model/Department.php';
+
+    $_SESSION['CURRENT_USER'] = $_GET['USR_UID'];
+    $oUser = new Users();
+    $aFields = $oUser->load( $_GET['USR_UID'] );
+    $aFields['USR_PASSWORD'] = '********';
+    $aFields['MESSAGE0'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_USER_REGISTERED' ) ) . '!';
+    $aFields['MESSAGE1'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_MSG_ERROR_USR_USERNAME' ) );
+    $aFields['MESSAGE2'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_MSG_ERROR_DUE_DATE' ) );
+    $aFields['MESSAGE3'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_NEW_PASS_SAME_OLD_PASS' ) );
+    $aFields['MESSAGE4'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_MSG_ERROR_USR_FIRSTNAME' ) );
+    $aFields['MESSAGE5'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_MSG_ERROR_USR_LASTNAME' ) );
+    $aFields['MESSAGE6'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_ERROR_UPLOADING_IMAGE_TYPE' ) );
+    $aFields['START_DATE'] = date( 'Y-m-d' );
+    $aFields['END_DATE'] = date( 'Y-m-d', mktime( 0, 0, 0, date( 'm' ), date( 'd' ), date( 'Y' ) + 5 ) );
+
+    $G_MAIN_MENU = 'processmaker';
+    $G_SUB_MENU = 'users';
+    $G_ID_MENU_SELECTED = 'USERS';
+    $G_ID_SUB_MENU_SELECTED = 'USERS';
+
+    $G_PUBLISH = new Publisher();
+
+    //getting the user and department
+    $oDepInfo = new Department();
+    $oUser = UsersPeer::retrieveByPk( $aFields['USR_REPORTS_TO'] );
+    if ($oUser != '')
+        if (get_class( $oUser ) == 'Users') {
+            $userFields = $oUser->toArray( BasePeer::TYPE_FIELDNAME );
+            $aFields['USR_REPORTS_TO'] = $userFields['USR_FIRSTNAME'] . ' ' . $userFields['USR_LASTNAME'];
+            try {
+                $depFields = $oDepInfo->load( $userFields['DEP_UID'] );
+                $aFields['USR_REPORTS_TO'] .= " (" . $depFields['DEPO_TITLE'] . ")";
+            } catch (Exception $e) {
+            }
+        } else {
+            $aFields['USR_REPORTS_TO'] = ' ';
+        }
+
+    try {
+        $depFields = $oDepInfo->load( $aFields['DEP_UID'] );
+        $aFields['USR_DEPARTMENT'] = $depFields['DEPO_TITLE'];
+    } catch (Exception $e) {
+        $oUser = UsersPeer::retrieveByPk( $_GET['USR_UID'] );
+        $oUser->setDepUid( '' );
+        $oUser->save();
+    }
+
+    //Load Calendar options and falue for this user
+    G::LoadClass( 'calendar' );
+    $calendar = new Calendar();
+    $calendarObj = $calendar->getCalendarList( true, true );
+    global $_DBArray;
+    $_DBArray['availableCalendars'] = $calendarObj['array'];
+    $_SESSION['_DBArray'] = $_DBArray;
+    $calendarInfo = $calendar->getCalendarFor( $_GET['USR_UID'], $_GET['USR_UID'], $_GET['USR_UID'] );
+    //If the function returns a DEFAULT calendar it means that this object doesn't have assigned any calendar
+    $aFields['USR_CALENDAR'] = $calendarInfo['CALENDAR_APPLIED'] != 'DEFAULT' ? $calendarInfo['CALENDAR_UID'] : "";
+    $aFields['RANDOM'] = rand();
+
+    /////////////////////////
+    //SELECT USR_UID, CONCAT(USR_LASTNAME, " ", USR_FIRSTNAME) FROM USERS WHERE USR_STATUS = 1 AND USR_UID!= "@#USR_UID" ORDER BY USR_LASTNAME
+    require_once 'classes/model/Users.php';
+    $oCriteria = new Criteria();
+    $oCriteria->addSelectColumn( UsersPeer::USR_UID );
+    $oCriteria->addSelectColumn( UsersPeer::USR_USERNAME );
+    $oCriteria->addSelectColumn( UsersPeer::USR_FIRSTNAME );
+    $oCriteria->addSelectColumn( UsersPeer::USR_LASTNAME );
+    $oCriteria->addSelectColumn( UsersPeer::USR_EMAIL );
+    $oCriteria->add( UsersPeer::USR_STATUS, 'ACTIVE' );
+    $oCriteria->add( UsersPeer::USR_UID, $_GET['USR_UID'], Criteria::NOT_EQUAL );
+    $oDataset = UsersPeer::doSelectRS( $oCriteria );
+    $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+    ///////////////////////
+    G::loadClass( 'configuration' );
+    $oConf = new Configurations();
+    $oConf->loadConfig( $obj, 'ENVIRONMENT_SETTINGS', '' );
+
+    $defaultOption = isset( $oConf->aConfig['format'] ) ? $oConf->aConfig['format'] : '';
+
+    $aUserInfo = array ();
+    $aUserInfo[] = array ('USR_UID' => 'char','USER_FULLNAME' => 'char'
+    );
+    while ($oDataset->next()) {
+        $aRow1 = $oDataset->getRow();
+
+        $infoUser = G::getFormatUserList( $defaultOption, $aRow1 );
+        $aUserInfo[] = array ('USR_UID' => $aRow1['USR_UID'],'USER_FULLNAME' => $infoUser
+        );
+    }
+
+    //calculating the max upload file size;
+    $POST_MAX_SIZE = ini_get( 'post_max_size' );
+    $mul = substr( $POST_MAX_SIZE, - 1 );
+    $mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
+    $postMaxSize = (int) $POST_MAX_SIZE * $mul;
+
+    $UPLOAD_MAX_SIZE = ini_get( 'upload_max_filesize' );
+    $mul = substr( $UPLOAD_MAX_SIZE, - 1 );
+    $mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
+    $uploadMaxSize = (int) $UPLOAD_MAX_SIZE * $mul;
+
+    if ($postMaxSize < $uploadMaxSize)
+        $uploadMaxSize = $postMaxSize;
+    $aFields['MAX_FILES_SIZE'] = " (" . $UPLOAD_MAX_SIZE . ") ";
+
+    global $_DBArray;
+    $_DBArray['aUserInfo'] = $aUserInfo;
+    $_SESSION['_DBArray'] = $_DBArray;
+    if ($_GET['USR_AUTH_SOURCE'] == 'ProcessMaker (MYSQL)') {
+        //always show this form  users_EditRT.xml.
+        $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'users/users_EditRT.xml', '', $aFields, 'users_Save?USR_UID=' . $_SESSION['CURRENT_USER'] );
+    } else {
+        //for users ldap always show this form users_EditLDAP.xml.
+        $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'users/users_EditLDAP.xml', '', $aFields, 'users_Save?USR_UID=' . $_SESSION['CURRENT_USER'] );
+    }
+
+    G::RenderPage( 'publish', 'blank' );
+} catch (Exception $oException) {
+    die( $oException->getMessage() );
 }
-catch (Exception $oException) {
-	die($oException->getMessage());
-}
-?>
+
diff --git a/workflow/engine/methods/users/users_Groups.php b/workflow/engine/methods/users/users_Groups.php
index 5545c4fc0..438127e8e 100755
--- a/workflow/engine/methods/users/users_Groups.php
+++ b/workflow/engine/methods/users/users_Groups.php
@@ -12,44 +12,42 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
  */
 
- /**
-  * @Description This is a callback for the View of all groups from a determinated user
-  * @author Erik Amaru Ortiz <erik@colosa.com>
-  * @Date 24/04/2008
-  * @LastModification none
-  */
+/**
+ * ription This is a callback for the View of all groups from a determinated user
+ *
+ * @author Erik Amaru Ortiz <erik@colosa.com>
+ * @Date 24/04/2008
+ * @LastModification none
+ */
 try {
     global $RBAC;
-    switch ($RBAC->userCanAccess('PM_FACTORY')) {
+    switch ($RBAC->userCanAccess( 'PM_FACTORY' )) {
         case - 2:
-            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-            G::header('location: ../login/login');
-            die;
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
             break;
         case - 1:
-            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-            G::header('location: ../login/login');
-            die;
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
             break;
     }
 
-    $G_PUBLISH = new Publisher;
-    $G_PUBLISH->AddContent('view', 'users/users_Tree' );
-    G::RenderPage('publish', 'raw');
+    $G_PUBLISH = new Publisher();
+    $G_PUBLISH->AddContent( 'view', 'users/users_Tree' );
+    G::RenderPage( 'publish', 'raw' );
+} catch (exception $oException) {
+    die( $oException->getMessage() );
 }
-catch (exception $oException) {
-    die($oException->getMessage());
-}
-?>
 
diff --git a/workflow/engine/methods/users/users_List.php b/workflow/engine/methods/users/users_List.php
index 9b0d20cd0..3b2ecd488 100755
--- a/workflow/engine/methods/users/users_List.php
+++ b/workflow/engine/methods/users/users_List.php
@@ -1,68 +1,68 @@
-<?php
-/**
- * users_List.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
- */
-if (($RBAC_Response=$RBAC->userCanAccess("PM_LOGIN"))!=1) return $RBAC_Response;
-global $RBAC;
-
-$access = $RBAC->userCanAccess('PM_USERS');
-if( $access != 1 ){
-  switch ($access)
-  {
-  	case -1:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;
-  	case -2:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;
-  	default:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;  	
-  }
-}
-
-$G_MAIN_MENU            = 'processmaker';
-$G_SUB_MENU             = 'users';
-$G_ID_MENU_SELECTED     = 'USERS';
-$G_ID_SUB_MENU_SELECTED = 'USERS';
-
-$G_PUBLISH = new Publisher;
-
-G::LoadClass('configuration');
-$c = new Configurations();
-$configPage = $c->getConfiguration('usersList', 'pageSize','',$_SESSION['USER_LOGGED']);
-$Config['pageSize'] = isset($configPage['pageSize']) ? $configPage['pageSize'] : 20;
-
-$oHeadPublisher =& headPublisher::getSingleton();
-$oHeadPublisher->addExtJsScript('users/usersList', false);    //adding a javascript file .js
-$oHeadPublisher->addContent('users/usersList'); //adding a html file  .html.
-$oHeadPublisher->assign('CONFIG', $Config);
-$oHeadPublisher->assign('FORMATS',$c->getFormats());
-
-G::RenderPage('publish', 'extJs');
\ No newline at end of file
+<?php
+/**
+ * users_List.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
+ * Coral Gables, FL, 33134, USA, or email info@colosa.com.
+ */
+if (($RBAC_Response = $RBAC->userCanAccess( "PM_LOGIN" )) != 1)
+    return $RBAC_Response;
+global $RBAC;
+
+$access = $RBAC->userCanAccess( 'PM_USERS' );
+if ($access != 1) {
+    switch ($access) {
+        case - 1:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+        case - 2:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+        default:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+    }
+}
+
+$G_MAIN_MENU = 'processmaker';
+$G_SUB_MENU = 'users';
+$G_ID_MENU_SELECTED = 'USERS';
+$G_ID_SUB_MENU_SELECTED = 'USERS';
+
+$G_PUBLISH = new Publisher();
+
+G::LoadClass( 'configuration' );
+$c = new Configurations();
+$configPage = $c->getConfiguration( 'usersList', 'pageSize', '', $_SESSION['USER_LOGGED'] );
+$Config['pageSize'] = isset( $configPage['pageSize'] ) ? $configPage['pageSize'] : 20;
+
+$oHeadPublisher = & headPublisher::getSingleton();
+$oHeadPublisher->addExtJsScript( 'users/usersList', false ); //adding a javascript file .js
+$oHeadPublisher->addContent( 'users/usersList' ); //adding a html file  .html.
+$oHeadPublisher->assign( 'CONFIG', $Config );
+$oHeadPublisher->assign( 'FORMATS', $c->getFormats() );
+
+G::RenderPage( 'publish', 'extJs' );
+
diff --git a/workflow/engine/methods/users/users_New.php b/workflow/engine/methods/users/users_New.php
index 670bb8b72..6cec00db9 100755
--- a/workflow/engine/methods/users/users_New.php
+++ b/workflow/engine/methods/users/users_New.php
@@ -12,106 +12,106 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
  */
 try {
-  global $RBAC;
-  $RBAC->requirePermissions('PM_USERS');
-  
-  $aFields['MESSAGE0']   = str_replace("\r\n","<br>",G::LoadTranslation('ID_USER_REGISTERED')) . '!';
-  $aFields['MESSAGE1']   = str_replace("\r\n","<br>",G::LoadTranslation('ID_MSG_ERROR_USR_USERNAME'));
-  $aFields['MESSAGE2']   = str_replace("\r\n","<br>",G::LoadTranslation('ID_MSG_ERROR_DUE_DATE'));
-  $aFields['MESSAGE3']   = str_replace("\r\n","<br>",G::LoadTranslation('ID_NEW_PASS_SAME_OLD_PASS'));
-  $aFields['MESSAGE4']   = str_replace("\r\n","<br>",G::LoadTranslation('ID_MSG_ERROR_USR_FIRSTNAME'));
-  $aFields['MESSAGE5']   = str_replace("\r\n","<br>",G::LoadTranslation('ID_MSG_ERROR_USR_LASTNAME'));
-  $aFields['MESSAGE6']   = str_replace("\r\n","<br>",G::LoadTranslation('ID_ERROR_UPLOADING_IMAGE_TYPE'));
+    global $RBAC;
+    $RBAC->requirePermissions( 'PM_USERS' );
+
+    $aFields['MESSAGE0'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_USER_REGISTERED' ) ) . '!';
+    $aFields['MESSAGE1'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_MSG_ERROR_USR_USERNAME' ) );
+    $aFields['MESSAGE2'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_MSG_ERROR_DUE_DATE' ) );
+    $aFields['MESSAGE3'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_NEW_PASS_SAME_OLD_PASS' ) );
+    $aFields['MESSAGE4'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_MSG_ERROR_USR_FIRSTNAME' ) );
+    $aFields['MESSAGE5'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_MSG_ERROR_USR_LASTNAME' ) );
+    $aFields['MESSAGE6'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_ERROR_UPLOADING_IMAGE_TYPE' ) );
     // the default role variable sets the value that will be showed as the default for the role field.
-  $aFields['DEFAULT_ROLE']   = 'PROCESSMAKER_OPERATOR';
-  $aFields['START_DATE'] = date('Y-m-d');
-  $aFields['END_DATE']   = date('Y-m-d', mktime(0, 0, 0, date('m'), date('d'), date('Y') + 5));
-  $aFields['USR_DUE_DATE']= date('Y-m-d', mktime(0, 0, 0, date('m'), date('d'), date('Y') + 1));
-  
-  //calculating the max upload file size;
-  $POST_MAX_SIZE   = ini_get('post_max_size');
-  $mul = substr($POST_MAX_SIZE, -1);
-  $mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
-  $postMaxSize = (int)$POST_MAX_SIZE * $mul;
+    $aFields['DEFAULT_ROLE'] = 'PROCESSMAKER_OPERATOR';
+    $aFields['START_DATE'] = date( 'Y-m-d' );
+    $aFields['END_DATE'] = date( 'Y-m-d', mktime( 0, 0, 0, date( 'm' ), date( 'd' ), date( 'Y' ) + 5 ) );
+    $aFields['USR_DUE_DATE'] = date( 'Y-m-d', mktime( 0, 0, 0, date( 'm' ), date( 'd' ), date( 'Y' ) + 1 ) );
 
-  $UPLOAD_MAX_SIZE = ini_get('upload_max_filesize');
-  $mul = substr($UPLOAD_MAX_SIZE, -1);
-  $mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
-  $uploadMaxSize = (int)$UPLOAD_MAX_SIZE * $mul;
+    //calculating the max upload file size;
+    $POST_MAX_SIZE = ini_get( 'post_max_size' );
+    $mul = substr( $POST_MAX_SIZE, - 1 );
+    $mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
+    $postMaxSize = (int) $POST_MAX_SIZE * $mul;
 
-  if ( $postMaxSize < $uploadMaxSize ) $uploadMaxSize = $postMaxSize;
-  $aFields['MAX_FILES_SIZE'] = " (" . $UPLOAD_MAX_SIZE . ") ";
+    $UPLOAD_MAX_SIZE = ini_get( 'upload_max_filesize' );
+    $mul = substr( $UPLOAD_MAX_SIZE, - 1 );
+    $mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
+    $uploadMaxSize = (int) $UPLOAD_MAX_SIZE * $mul;
 
-  //Load Calendar options and falue for this user
-  G::LoadClass ( 'calendar' );
-  $calendar = new Calendar ( );
-  $calendarObj = $calendar->getCalendarList ( true, true );
-  global $_DBArray;
-  $_DBArray ['availableCalendars'] = $calendarObj ['array'];
-  $_SESSION ['_DBArray'] = $_DBArray;
+    if ($postMaxSize < $uploadMaxSize)
+        $uploadMaxSize = $postMaxSize;
+    $aFields['MAX_FILES_SIZE'] = " (" . $UPLOAD_MAX_SIZE . ") ";
 
-//  $G_MAIN_MENU           = 'processmaker';
-//  $G_ID_MENU_SELECTED    = 'USERS';
+    //Load Calendar options and falue for this user
+    G::LoadClass( 'calendar' );
+    $calendar = new Calendar();
+    $calendarObj = $calendar->getCalendarList( true, true );
+    global $_DBArray;
+    $_DBArray['availableCalendars'] = $calendarObj['array'];
+    $_SESSION['_DBArray'] = $_DBArray;
 
-  $G_MAIN_MENU            = 'processmaker';
-  $G_SUB_MENU             = 'users';
-  $G_ID_MENU_SELECTED     = 'USERS';
-  $G_ID_SUB_MENU_SELECTED = 'USERS';
+    //  $G_MAIN_MENU           = 'processmaker';
+    //  $G_ID_MENU_SELECTED    = 'USERS';
 
-/////////////////////////////
-//SELECT USR_UID, CONCAT(USR_LASTNAME, " ", USR_FIRSTNAME) FROM USERS WHERE USR_STATUS = 1 ORDER BY USR_LASTNAME
-  require_once 'classes/model/Users.php';
-	$oCriteria=new Criteria();
-  $oCriteria->addSelectColumn(UsersPeer::USR_UID);
-  $oCriteria->addSelectColumn(UsersPeer::USR_USERNAME);
-  $oCriteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
-  $oCriteria->addSelectColumn(UsersPeer::USR_LASTNAME);
-  $oCriteria->addSelectColumn(UsersPeer::USR_EMAIL);
-  $oCriteria->add(UsersPeer::USR_STATUS,'ACTIVE');
-  //$oCriteria->add(UsersPeer::USR_UID,$_GET['USR_UID'], Criteria::NOT_EQUAL);
-  $oDataset=UsersPeer::doSelectRS($oCriteria);
-  $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-  ///////////////////////
-  G::loadClass('configuration');
-  $oConf = new Configurations;
-  $oConf->loadConfig($obj, 'ENVIRONMENT_SETTINGS','');
 
-  $defaultOption = isset($oConf->aConfig['format'])? $oConf->aConfig['format']: '';
-  
-  $aUserInfo = array();
-  $aUserInfo[] = array('USR_UID' => 'char','USER_FULLNAME' => 'char');
-  while( $oDataset->next()){
-  $aRow1 = $oDataset->getRow();
-  
-  $infoUser = G::getFormatUserList($defaultOption,$aRow1);
-  $aUserInfo[]=array(
-          'USR_UID'       => $aRow1['USR_UID'],
-          'USER_FULLNAME' => $infoUser
-         );
-  }
-  //print_r($aUserInfo);
-  global $_DBArray;
-  $_DBArray['aUserInfo']  = $aUserInfo;
-  $_SESSION['_DBArray'] = $_DBArray;
-/////////////////////////////
+    $G_MAIN_MENU = 'processmaker';
+    $G_SUB_MENU = 'users';
+    $G_ID_MENU_SELECTED = 'USERS';
+    $G_ID_SUB_MENU_SELECTED = 'USERS';
 
-   //var_dump($aFields);
-  $G_PUBLISH             = new Publisher;
-  $G_PUBLISH->AddContent('xmlform', 'xmlform', 'users/users_New.xml', '', $aFields, 'users_Save');
-  G::RenderPage('publish','blank');
+    /////////////////////////////
+    //SELECT USR_UID, CONCAT(USR_LASTNAME, " ", USR_FIRSTNAME) FROM USERS WHERE USR_STATUS = 1 ORDER BY USR_LASTNAME
+    require_once 'classes/model/Users.php';
+    $oCriteria = new Criteria();
+    $oCriteria->addSelectColumn( UsersPeer::USR_UID );
+    $oCriteria->addSelectColumn( UsersPeer::USR_USERNAME );
+    $oCriteria->addSelectColumn( UsersPeer::USR_FIRSTNAME );
+    $oCriteria->addSelectColumn( UsersPeer::USR_LASTNAME );
+    $oCriteria->addSelectColumn( UsersPeer::USR_EMAIL );
+    $oCriteria->add( UsersPeer::USR_STATUS, 'ACTIVE' );
+    //$oCriteria->add(UsersPeer::USR_UID,$_GET['USR_UID'], Criteria::NOT_EQUAL);
+    $oDataset = UsersPeer::doSelectRS( $oCriteria );
+    $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+    ///////////////////////
+    G::loadClass( 'configuration' );
+    $oConf = new Configurations();
+    $oConf->loadConfig( $obj, 'ENVIRONMENT_SETTINGS', '' );
+
+    $defaultOption = isset( $oConf->aConfig['format'] ) ? $oConf->aConfig['format'] : '';
+
+    $aUserInfo = array ();
+    $aUserInfo[] = array ('USR_UID' => 'char','USER_FULLNAME' => 'char'
+    );
+    while ($oDataset->next()) {
+        $aRow1 = $oDataset->getRow();
+
+        $infoUser = G::getFormatUserList( $defaultOption, $aRow1 );
+        $aUserInfo[] = array ('USR_UID' => $aRow1['USR_UID'],'USER_FULLNAME' => $infoUser
+        );
+    }
+    //print_r($aUserInfo);
+    global $_DBArray;
+    $_DBArray['aUserInfo'] = $aUserInfo;
+    $_SESSION['_DBArray'] = $_DBArray;
+    /////////////////////////////
+
+
+    //var_dump($aFields);
+    $G_PUBLISH = new Publisher();
+    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'users/users_New.xml', '', $aFields, 'users_Save' );
+    G::RenderPage( 'publish', 'blank' );
+} catch (Exception $oException) {
+    die( $oException->getMessage() );
 }
-catch (Exception $oException) {
-	die($oException->getMessage());
-}
-?>
\ No newline at end of file
+
diff --git a/workflow/engine/methods/users/users_Reassign.php b/workflow/engine/methods/users/users_Reassign.php
index fa6f4f100..2505bfc78 100755
--- a/workflow/engine/methods/users/users_Reassign.php
+++ b/workflow/engine/methods/users/users_Reassign.php
@@ -12,38 +12,36 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
  */
 try {
-  G::LoadClass('case');
-  $oCase = new Cases();
-  foreach($_POST['USER'] as $sProcessUID => $sUserUID) {
-    if ($sUserUID != '') {
-      $oCriteria = new Criteria('workflow');
-      $oCriteria->addSelectColumn(AppDelegationPeer::APP_UID);
-      $oCriteria->addSelectColumn(AppDelegationPeer::DEL_INDEX);
-      $oCriteria->add(AppDelegationPeer::PRO_UID, $sProcessUID);
-      $oCriteria->add(AppDelegationPeer::USR_UID, $_POST['USR_UID']);
-      $oCriteria->add(AppDelegationPeer::DEL_FINISH_DATE, null, Criteria::ISNULL);
-      $oDataset = AppDelegationPeer::doSelectRS($oCriteria);
-      $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-      $oDataset->next();
-      while ($aRow = $oDataset->getRow()) {
-        $oCase->reassignCase($aRow['APP_UID'], $aRow['DEL_INDEX'], $_SESSION['USER_LOGGED'], $sUserUID);
-        $oDataset->next();
-      }
+    G::LoadClass( 'case' );
+    $oCase = new Cases();
+    foreach ($_POST['USER'] as $sProcessUID => $sUserUID) {
+        if ($sUserUID != '') {
+            $oCriteria = new Criteria( 'workflow' );
+            $oCriteria->addSelectColumn( AppDelegationPeer::APP_UID );
+            $oCriteria->addSelectColumn( AppDelegationPeer::DEL_INDEX );
+            $oCriteria->add( AppDelegationPeer::PRO_UID, $sProcessUID );
+            $oCriteria->add( AppDelegationPeer::USR_UID, $_POST['USR_UID'] );
+            $oCriteria->add( AppDelegationPeer::DEL_FINISH_DATE, null, Criteria::ISNULL );
+            $oDataset = AppDelegationPeer::doSelectRS( $oCriteria );
+            $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+            $oDataset->next();
+            while ($aRow = $oDataset->getRow()) {
+                $oCase->reassignCase( $aRow['APP_UID'], $aRow['DEL_INDEX'], $_SESSION['USER_LOGGED'], $sUserUID );
+                $oDataset->next();
+            }
+        }
     }
-  }
+} catch (Exception $oException) {
+    die( $oException->getMessage() );
 }
-catch (Exception $oException) {
-	die($oException->getMessage());
-}
-?>
\ No newline at end of file
+
diff --git a/workflow/engine/methods/users/users_ReassignCases.php b/workflow/engine/methods/users/users_ReassignCases.php
index bd598e5bf..0491387ae 100755
--- a/workflow/engine/methods/users/users_ReassignCases.php
+++ b/workflow/engine/methods/users/users_ReassignCases.php
@@ -12,108 +12,107 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
  */
 try {
-  global $G_PUBLISH;
-  $G_PUBLISH = new Publisher();
-  $_GET['iStep'] = (int)$_GET['iStep'];
-  switch ($_GET['iStep']) {
-    case 1:
-      $G_PUBLISH->AddContent('xmlform', 'xmlform', 'users/users_ReassignSelectType', '', array('USR_UID' => $_GET['USR_UID']), '');
-    break;
-    case 2:
-      switch ($_POST['TYPE']) {
-        case 'ANY_USER':
-          $G_PUBLISH->AddContent('xmlform', 'xmlform', 'users/users_ReassignSelectSubType', '', $_POST, '');
-        break;
-      }
-    break;
-    case 3:
-      switch ($_POST['SUB_TYPE']) {
-        case 'PROCESS':
-          require_once 'classes/model/Users.php';
-          $oCriteria = new Criteria('workflow');
-          $oCriteria->addSelectColumn(UsersPeer::USR_UID);
-          /*
+    global $G_PUBLISH;
+    $G_PUBLISH = new Publisher();
+    $_GET['iStep'] = (int) $_GET['iStep'];
+    switch ($_GET['iStep']) {
+        case 1:
+            $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'users/users_ReassignSelectType', '', array ('USR_UID' => $_GET['USR_UID']
+            ), '' );
+            break;
+        case 2:
+            switch ($_POST['TYPE']) {
+                case 'ANY_USER':
+                    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'users/users_ReassignSelectSubType', '', $_POST, '' );
+                    break;
+            }
+            break;
+        case 3:
+            switch ($_POST['SUB_TYPE']) {
+                case 'PROCESS':
+                    require_once 'classes/model/Users.php';
+                    $oCriteria = new Criteria( 'workflow' );
+                    $oCriteria->addSelectColumn( UsersPeer::USR_UID );
+                    /*
             $usr_completename_col = "CONCAT(USR_LASTNAME, ' ', USR_FIRSTNAME, ' (', USR_USERNAME, ')')";
           */
-          $sDataBase = 'database_' . strtolower(DB_ADAPTER);
-          if(G::LoadSystemExist($sDataBase)){
-            G::LoadSystem($sDataBase);
-            $oDataBase = new database();
-            $usr_completename_col = $oDataBase->concatString("USR_LASTNAME", "' '", "USR_FIRSTNAME", " '('", "USR_USERNAME", "')'");
-          }
-                   
-          $oCriteria->addAsColumn('USR_COMPLETENAME', $usr_completename_col);
-          
-          $oCriteria->add(UsersPeer::USR_UID, $_POST['USR_UID'], Criteria::NOT_EQUAL);
-          $oCriteria->add(UsersPeer::USR_STATUS, array('CLOSED'), Criteria::NOT_IN);
-          $oDataset = UsersPeer::doSelectRS($oCriteria);
-          $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-          $oDataset->next();
-          $sUsers = '<option value=""> - ' . G::LoadTranslation('ID_NO_REASSIGN') . ' - </option>';
-          while ($aRow = $oDataset->getRow()) {
-            $sUsers .= '<option value="' . $aRow['USR_UID'] . '">' . $aRow['USR_COMPLETENAME'] . '</option>';
-            $oDataset->next();
-          }
-          $aProcesses   = array();
-          $aProcesses[] = array('CHECKBOX' => 'char',
-                                'PROCESS'  => 'char',
-                                'CANTITY'  => 'char',
-                                'USERS'    => 'char');
-          $del = DBAdapter::getStringDelimiter();
-          require_once 'classes/model/AppDelegation.php';
-          $oCriteria = new Criteria('workflow');
-          $oCriteria->addSelectColumn(AppDelegationPeer::PRO_UID);
-          $oCriteria->addSelectColumn('COUNT(' . AppDelegationPeer::PRO_UID . ') AS CANTITY');
-          $oCriteria->addAsColumn('PRO_TITLE', ContentPeer::CON_VALUE);
-          $aConditions = array();
-          $aConditions[] = array(AppDelegationPeer::PRO_UID, ContentPeer::CON_ID);
-          $aConditions[] = array(ContentPeer::CON_CATEGORY, $del . 'PRO_TITLE' . $del);
-          $aConditions[] = array(ContentPeer::CON_LANG, $del . SYS_LANG . $del);
-          $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
-          $oCriteria->add(AppDelegationPeer::USR_UID, $_POST['USR_UID']);
-          $oCriteria->add(AppDelegationPeer::DEL_FINISH_DATE, null, Criteria::ISNULL);
-          $oCriteria->addGroupByColumn(AppDelegationPeer::PRO_UID);
+                    $sDataBase = 'database_' . strtolower( DB_ADAPTER );
+                    if (G::LoadSystemExist( $sDataBase )) {
+                        G::LoadSystem( $sDataBase );
+                        $oDataBase = new database();
+                        $usr_completename_col = $oDataBase->concatString( "USR_LASTNAME", "' '", "USR_FIRSTNAME", " '('", "USR_USERNAME", "')'" );
+                    }
 
-          /*
+                    $oCriteria->addAsColumn( 'USR_COMPLETENAME', $usr_completename_col );
+
+                    $oCriteria->add( UsersPeer::USR_UID, $_POST['USR_UID'], Criteria::NOT_EQUAL );
+                    $oCriteria->add( UsersPeer::USR_STATUS, array ('CLOSED'
+                    ), Criteria::NOT_IN );
+                    $oDataset = UsersPeer::doSelectRS( $oCriteria );
+                    $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+                    $oDataset->next();
+                    $sUsers = '<option value=""> - ' . G::LoadTranslation( 'ID_NO_REASSIGN' ) . ' - </option>';
+                    while ($aRow = $oDataset->getRow()) {
+                        $sUsers .= '<option value="' . $aRow['USR_UID'] . '">' . $aRow['USR_COMPLETENAME'] . '</option>';
+                        $oDataset->next();
+                    }
+                    $aProcesses = array ();
+                    $aProcesses[] = array ('CHECKBOX' => 'char','PROCESS' => 'char','CANTITY' => 'char','USERS' => 'char'
+                    );
+                    $del = DBAdapter::getStringDelimiter();
+                    require_once 'classes/model/AppDelegation.php';
+                    $oCriteria = new Criteria( 'workflow' );
+                    $oCriteria->addSelectColumn( AppDelegationPeer::PRO_UID );
+                    $oCriteria->addSelectColumn( 'COUNT(' . AppDelegationPeer::PRO_UID . ') AS CANTITY' );
+                    $oCriteria->addAsColumn( 'PRO_TITLE', ContentPeer::CON_VALUE );
+                    $aConditions = array ();
+                    $aConditions[] = array (AppDelegationPeer::PRO_UID,ContentPeer::CON_ID
+                    );
+                    $aConditions[] = array (ContentPeer::CON_CATEGORY,$del . 'PRO_TITLE' . $del
+                    );
+                    $aConditions[] = array (ContentPeer::CON_LANG,$del . SYS_LANG . $del
+                    );
+                    $oCriteria->addJoinMC( $aConditions, Criteria::LEFT_JOIN );
+                    $oCriteria->add( AppDelegationPeer::USR_UID, $_POST['USR_UID'] );
+                    $oCriteria->add( AppDelegationPeer::DEL_FINISH_DATE, null, Criteria::ISNULL );
+                    $oCriteria->addGroupByColumn( AppDelegationPeer::PRO_UID );
+
+                    /*
            * Adding grouped by standardization.
            */
-          $oCriteria->addGroupByColumn(ContentPeer::CON_VALUE); 
-          
-          $oDataset = AppDelegationPeer::doSelectRS($oCriteria);
-          $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-          $oDataset->next();
-          while ($aRow = $oDataset->getRow()) {
-            $aProcesses[] = array('CHECKBOX' => '<input type="checkbox" name="PROCESS[' . $aRow['PRO_UID'] . ']" id="PROCESS[' . $aRow['PRO_UID'] . ']" />',
-                                  'PROCESS'  => $aRow['PRO_TITLE'],
-                                  'CANTITY'  => $aRow['CANTITY'],
-                                  'USERS'    => '<select name="USER[' . $aRow['PRO_UID'] . ']" id="USER[' . $aRow['PRO_UID'] . ']">' . $sUsers . '</select>');
-            $oDataset->next();
-          }
-          global $_DBArray;
-          $_DBArray['processesToReassign'] = $aProcesses;
-          $_SESSION['_DBArray'] = $_DBArray;
-          G::LoadClass('ArrayPeer');
-          $oCriteria = new Criteria('dbarray');
-          $oCriteria->setDBArrayTable('processesToReassign');
-          $G_PUBLISH->AddContent('propeltable', 'cases/paged-table-reassign', 'users/users_ReassignCases', $oCriteria, $_POST);
-        break;
-      }
-    break;
-  }
-  G::RenderPage('publish', 'raw');
+                    $oCriteria->addGroupByColumn( ContentPeer::CON_VALUE );
+
+                    $oDataset = AppDelegationPeer::doSelectRS( $oCriteria );
+                    $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+                    $oDataset->next();
+                    while ($aRow = $oDataset->getRow()) {
+                        $aProcesses[] = array ('CHECKBOX' => '<input type="checkbox" name="PROCESS[' . $aRow['PRO_UID'] . ']" id="PROCESS[' . $aRow['PRO_UID'] . ']" />','PROCESS' => $aRow['PRO_TITLE'],'CANTITY' => $aRow['CANTITY'],'USERS' => '<select name="USER[' . $aRow['PRO_UID'] . ']" id="USER[' . $aRow['PRO_UID'] . ']">' . $sUsers . '</select>'
+                        );
+                        $oDataset->next();
+                    }
+                    global $_DBArray;
+                    $_DBArray['processesToReassign'] = $aProcesses;
+                    $_SESSION['_DBArray'] = $_DBArray;
+                    G::LoadClass( 'ArrayPeer' );
+                    $oCriteria = new Criteria( 'dbarray' );
+                    $oCriteria->setDBArrayTable( 'processesToReassign' );
+                    $G_PUBLISH->AddContent( 'propeltable', 'cases/paged-table-reassign', 'users/users_ReassignCases', $oCriteria, $_POST );
+                    break;
+            }
+            break;
+    }
+    G::RenderPage( 'publish', 'raw' );
+} catch (Exception $oException) {
+    die( $oException->getMessage() );
 }
-catch (Exception $oException) {
-	die($oException->getMessage());
-}
-?>
\ No newline at end of file
+
diff --git a/workflow/engine/methods/users/users_Save.php b/workflow/engine/methods/users/users_Save.php
index a9e5ae1a1..d53f2177b 100755
--- a/workflow/engine/methods/users/users_Save.php
+++ b/workflow/engine/methods/users/users_Save.php
@@ -1,311 +1,297 @@
-<?php
-/**
- * users_Save.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
- */
-
-
-try {
-  global $RBAC;
-  switch ($RBAC->userCanAccess('PM_FACTORY'))
-  {
-    case -2:
-      G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-      G::header('location: ../login/login');
-      die;
-    break;
-    case -1:
-      G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-      G::header('location: ../login/login');
-      die;
-    break;
-  }
-  if ( empty($_POST) || !isset($_POST['form'])) {
-    if( empty($_FILES) )
-      throw ( new Exception (G::loadTranslation('ID_ERROR_UPLOADING_FILENAME') ) );
-    else
-      throw ( new Exception (G::loadTranslation('ID_POSTED_DATA_EMPTY') ) );
-  }
-
-  $form =  $_POST['form'];
-  
-  if ( isset($_GET['USR_UID'])) {
-    $form['USR_UID'] = $_GET['USR_UID'];
-  }
-  else {
-    $form['USR_UID'] = '';
-  }
-  
-  if ( isset($_FILES['form']['name']['USR_RESUME']) ) {
-    if ($_FILES['form']['tmp_name']['USR_RESUME'] != '') {
-      $form['USR_RESUME'] = $_FILES['form']['name']['USR_RESUME'];
-    }
-    else {
-      $form['USR_RESUME'] = '';
-    }
-  }
-
-  if (!isset($form['USR_NEW_PASS'])) {
-    $form['USR_NEW_PASS'] = '';
-  }
-  if ($form['USR_NEW_PASS'] != '') {
-    $form['USR_PASSWORD'] = md5($form['USR_NEW_PASS']);
-  }
-  if (!isset($form['USR_CITY'])) {
-    $form['USR_CITY'] = '';
-  }
-  if (!isset($form['USR_LOCATION'])) {
-    $form['USR_LOCATION'] = '';
-  }
-  if (!isset($form['USR_AUTH_USER_DN'])) {
-    $form['USR_AUTH_USER_DN'] = '';
-  }
-  if ($form['USR_UID'] == '') {
-    $aData['USR_USERNAME']    = $form['USR_USERNAME'];
-    $aData['USR_PASSWORD']    = $form['USR_PASSWORD'];
-    $aData['USR_FIRSTNAME']   = $form['USR_FIRSTNAME'];
-    $aData['USR_LASTNAME']    = $form['USR_LASTNAME'];
-    $aData['USR_EMAIL']       = $form['USR_EMAIL'];
-    $aData['USR_DUE_DATE']    = $form['USR_DUE_DATE'];
-    $aData['USR_CREATE_DATE'] = date('Y-m-d H:i:s');
-    $aData['USR_UPDATE_DATE'] = date('Y-m-d H:i:s');
-    $aData['USR_BIRTHDAY']    = date('Y-m-d');
-    $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;
-    $sUserUID                 = $RBAC->createUser($aData, $form['USR_ROLE'] );
-    $aData['USR_STATUS']      = $statusWF;
-    $aData['USR_UID']         = $sUserUID;
-    $aData['USR_PASSWORD']    = md5($sUserUID);//fake :p
-    $aData['USR_COUNTRY']     = $form['USR_COUNTRY'];
-    $aData['USR_CITY']        = $form['USR_CITY'];
-    $aData['USR_LOCATION']    = $form['USR_LOCATION'];
-    $aData['USR_ADDRESS']     = $form['USR_ADDRESS'];
-    $aData['USR_PHONE']       = $form['USR_PHONE'];
-    $aData['USR_ZIP_CODE']    = $form['USR_ZIP_CODE'];
-    $aData['USR_POSITION']    = $form['USR_POSITION'];
-//  Commented by removal of resume in the addition and modification of user.
-//  $aData['USR_RESUME']      = $form['USR_RESUME'];
-    $aData['USR_ROLE']        = $form['USR_ROLE'];
-    $aData['USR_REPLACED_BY'] = $form['USR_REPLACED_BY'];
-    
-
-    require_once 'classes/model/Users.php';
-    $oUser = new Users();
-    $oUser->create($aData);
-    if ($_FILES['form']['error']['USR_PHOTO'] != 1) {
-      if ($_FILES['form']['tmp_name']['USR_PHOTO'] != '') {
-        G::uploadFile($_FILES['form']['tmp_name']['USR_PHOTO'], PATH_IMAGES_ENVIRONMENT_USERS, $sUserUID . '.gif');
-      }
-    }
-    else {
-      G::SendTemporalMessage ('ID_FILE_TOO_BIG', 'error');
-    }
-    if ($_FILES['form']['error']['USR_RESUME'] != 1) {
-      if ($_FILES['form']['tmp_name']['USR_RESUME'] != '') {
-        G::uploadFile($_FILES['form']['tmp_name']['USR_RESUME'], PATH_IMAGES_ENVIRONMENT_FILES . $sUserUID . '/', $_FILES['form']['name']['USR_RESUME']);
-      }
-    }
-    else {
-      G::SendTemporalMessage ('ID_FILE_TOO_BIG', 'error');
-    }
-  } 
-  else {
-    $aData['USR_UID']      = $form['USR_UID'];
-    $aData['USR_USERNAME'] = $form['USR_USERNAME'];
-    
-    if (isset($form['USR_PASSWORD'])) {
-      if ($form['USR_PASSWORD'] != '') {
-        $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'])))));
-        
-        $RBAC->loadUserRolePermission( 'PROCESSMAKER', $_SESSION['USER_LOGGED'] );
-         if( $RBAC->aUserInfo[ 'PROCESSMAKER' ]['ROLE']['ROL_CODE']=='PROCESSMAKER_ADMIN'){
-         	$aUserProperty['USR_LAST_UPDATE_DATE'] = date('Y-m-d H:i:s');
-          $aUserProperty['USR_LOGGED_NEXT_TIME'] = 1;
-          $oUserProperty->update($aUserProperty);
-         }
-        
-        $aErrors       = $oUserProperty->validatePassword($form['USR_NEW_PASS'], $aUserProperty['USR_LAST_UPDATE_DATE'], 0);
-        if (count($aErrors) > 0) {
-          $sDescription = G::LoadTranslation('ID_POLICY_ALERT').':<br /><br />';
-          foreach ($aErrors as $sError)  {
-            switch ($sError) {
-              case 'ID_PPP_MINIMUN_LENGTH':
-                $sDescription .= ' - ' . G::LoadTranslation($sError).': ' . PPP_MINIMUN_LENGTH . '<br />';
-              break;
-              case 'ID_PPP_MAXIMUN_LENGTH':
-                $sDescription .= ' - ' . G::LoadTranslation($sError).': ' . PPP_MAXIMUN_LENGTH . '<br />';
-              break;
-              case 'ID_PPP_EXPIRATION_IN':
-                $sDescription .= ' - ' . G::LoadTranslation($sError).' ' . PPP_EXPIRATION_IN . ' ' . G::LoadTranslation('ID_DAYS') . '<br />';
-              break;
-              default:
-                $sDescription .= ' - ' . G::LoadTranslation($sError).'<br />';
-              break;
-            }
-          }
-          $sDescription .= '<br />' . G::LoadTranslation('ID_PLEASE_CHANGE_PASSWORD_POLICY');
-          G::SendMessageText($sDescription, 'warning');
-          G::header('Location: ' . $_SERVER['HTTP_REFERER']);
-          die;
-        }
-        $aHistory      = unserialize($aUserProperty['USR_PASSWORD_HISTORY']);
-        if (!is_array($aHistory)) {
-          $aHistory = array();
-        }
-        if (!defined('PPP_PASSWORD_HISTORY')) {
-          define('PPP_PASSWORD_HISTORY', 0);
-        }    
-        if (PPP_PASSWORD_HISTORY > 0) {
-          //it's looking a password igual into aHistory array that was send for post in md5 way
-          $c=0;$sw=1;
-          while(count($aHistory) >= 1 && count($aHistory)>$c && $sw ){
-           if(strcmp(trim($aHistory[$c]),trim($form['USR_PASSWORD'])) == 0){
-           	$sw=0;
-           }
-           $c++;
-          }
-          if($sw == 0){
-          	$sDescription = G::LoadTranslation('ID_POLICY_ALERT').':<br /><br />';
-           $sDescription .= ' - ' . G::LoadTranslation('PASSWORD_HISTORY').': ' . PPP_PASSWORD_HISTORY . '<br />';
-           $sDescription .= '<br />' . G::LoadTranslation('ID_PLEASE_CHANGE_PASSWORD_POLICY').'';
-           G::SendMessageText($sDescription, 'warning');
-           G::header('Location: ' . $_SERVER['HTTP_REFERER']);
-           die;		
-          }
-          //
-          if (count($aHistory) >= PPP_PASSWORD_HISTORY) {
-            $sLastPassw=array_shift($aHistory);
-          }
-          $aHistory[] = $form['USR_PASSWORD'];
-        }
-        $aUserProperty['USR_LAST_UPDATE_DATE'] = date('Y-m-d H:i:s');
-        $aUserProperty['USR_LOGGED_NEXT_TIME'] = 1;
-        $aUserProperty['USR_PASSWORD_HISTORY'] = serialize($aHistory);
-        $oUserProperty->update($aUserProperty);
-      }
-    }
-    $aData['USR_FIRSTNAME']   = $form['USR_FIRSTNAME'];
-    $aData['USR_LASTNAME']    = $form['USR_LASTNAME'];
-    $aData['USR_EMAIL']       = $form['USR_EMAIL'];
-    $aData['USR_DUE_DATE']    = $form['USR_DUE_DATE'];
-    $aData['USR_UPDATE_DATE'] = date('Y-m-d H:i:s');
-    if (isset($form['USR_STATUS'])) {
-      $aData['USR_STATUS']      = $form['USR_STATUS'];
-      }
-      if (isset($form['USR_ROLE'])) {
-      $RBAC->updateUser($aData, $form['USR_ROLE']);
-    }
-    else {
-      $RBAC->updateUser($aData);
-    }
-    $aData['USR_COUNTRY']     = $form['USR_COUNTRY'];
-    $aData['USR_CITY']        = $form['USR_CITY'];
-    $aData['USR_LOCATION']    = $form['USR_LOCATION'];
-    $aData['USR_ADDRESS']     = $form['USR_ADDRESS'];
-    $aData['USR_PHONE']       = $form['USR_PHONE'];
-    $aData['USR_ZIP_CODE']    = $form['USR_ZIP_CODE'];
-    $aData['USR_POSITION']    = $form['USR_POSITION'];
-  
-    if ($form['USR_RESUME'] != '') {
-      $aData['USR_RESUME'] = $form['USR_RESUME'];
-      }
-      if (isset($form['USR_ROLE'])) {
-      $aData['USR_ROLE'] = $form['USR_ROLE'];
-    }
-    
-    if(isset($form['USR_REPLACED_BY'])){
-      $aData['USR_REPLACED_BY'] = $form['USR_REPLACED_BY'];      
-    }
-    if(isset($form['USR_AUTH_USER_DN'])){
-      $aData['USR_AUTH_USER_DN'] = $form['USR_AUTH_USER_DN'];
-    }
-    
-    require_once 'classes/model/Users.php';
-    $oUser = new Users();
-    $oUser->update($aData);
-    $aExtensions = array ( "AIS",  "BMP", "BW",   "CDR", "CDT", "CGM",  "CMX",  "CPT",  "DCX", "DIB",
-                           "EMF",  "GBR", "GIF",  "GIH", "ICO", "IFF",  "ILBM", "JFIF", "JIF", "JPE",
-                           "JPEG", "JPG", "KDC",  "LBM", "MAC", "PAT",  "PCD",  "PCT",  "PCX", "PIC",
-                           "PICT", "PNG", "PNTG", "PIX", "PSD", "PSP",  "QTI",  "QTIF", "RGB", "RGBA",
-                           "RIF",  "RLE", "SGI",  "TGA", "TIF", "TIFF", "WMF",  "XCF"
-                          );
-
-    $sPhotoFile = $_FILES['form']['name']['USR_PHOTO'];
-    $aPhotoFile = explode('.', $sPhotoFile);
-    $sExtension = strtoupper ($aPhotoFile[sizeof($aPhotoFile)-1]);
-    if ((strlen($sPhotoFile) > 0) && (! in_array($sExtension, $aExtensions)) ) {
-      throw ( new Exception ( G::LoadTranslation( 'ID_ERROR_UPLOADING_IMAGE_TYPE' )) );
-    }
-    if ($_FILES['form']['error']['USR_PHOTO'] != 1) {
-      if ($_FILES['form']['tmp_name']['USR_PHOTO'] != '') {
-        $aAux = explode('.', $_FILES['form']['name']['USR_PHOTO']);
-        G::uploadFile($_FILES['form']['tmp_name']['USR_PHOTO'], PATH_IMAGES_ENVIRONMENT_USERS, $aData['USR_UID'] . '.' . $aAux[1]);
-        G::resizeImage(PATH_IMAGES_ENVIRONMENT_USERS . $aData['USR_UID'] . '.' . $aAux[1], 96, 96, PATH_IMAGES_ENVIRONMENT_USERS . $aData['USR_UID'] . '.gif');
-      }
-    }
-    else {
-      G::SendTemporalMessage ('ID_FILE_TOO_BIG', 'error');
-    }
-    if ($_FILES['form']['error']['USR_RESUME'] != 1) {
-      if ($_FILES['form']['tmp_name']['USR_RESUME'] != '') {
-        G::uploadFile($_FILES['form']['tmp_name']['USR_RESUME'], PATH_IMAGES_ENVIRONMENT_FILES . $aData['USR_UID'] . '/', $_FILES['form']['name']['USR_RESUME']);
-      }
-    }
-    else {
-      G::SendTemporalMessage ('ID_FILE_TOO_BIG', 'error');
-    }
-  }
-  
-  if($_SESSION['USER_LOGGED'] == $form['USR_UID']){
-    /*UPDATING SESSION VARIABLES*/
-    $aUser = $RBAC->userObj->load($_SESSION['USER_LOGGED']);
-    $_SESSION['USR_FULLNAME'] = $aUser['USR_FIRSTNAME'] . ' ' . $aUser['USR_LASTNAME'];
-  }
-  
-  
-  //Save Calendar assigment
-  if((isset($form['USR_CALENDAR']))){
-    //Save Calendar ID for this user
-    G::LoadClass("calendar");
-    $calendarObj=new Calendar();
-    $calendarObj->assignCalendarTo($aData['USR_UID'],$form['USR_CALENDAR'],'USER');    
-  }
-  
-  G::header('location: users_List');
-}
-catch (Exception $e) {
-  $G_MAIN_MENU            = 'processmaker';
-  $G_SUB_MENU             = 'users';
-  $G_ID_MENU_SELECTED     = 'USERS';
-  $G_ID_SUB_MENU_SELECTED = '';
-  
-  $aMessage = array();
-  $aMessage['MESSAGE'] = $e->getMessage();
-  $G_PUBLISH          = new Publisher;
-  $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', $aMessage );
-  G::RenderPage( 'publish', 'blank');
+<?php
+/**
+ * users_Save.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
+ * Coral Gables, FL, 33134, USA, or email info@colosa.com.
+ */
+
+try {
+    global $RBAC;
+    switch ($RBAC->userCanAccess( 'PM_FACTORY' )) {
+        case - 2:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+        case - 1:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+    }
+    if (empty( $_POST ) || ! isset( $_POST['form'] )) {
+        if (empty( $_FILES ))
+            throw (new Exception( G::loadTranslation( 'ID_ERROR_UPLOADING_FILENAME' ) ));
+        else
+            throw (new Exception( G::loadTranslation( 'ID_POSTED_DATA_EMPTY' ) ));
+    }
+
+    $form = $_POST['form'];
+
+    if (isset( $_GET['USR_UID'] )) {
+        $form['USR_UID'] = $_GET['USR_UID'];
+    } else {
+        $form['USR_UID'] = '';
+    }
+
+    if (isset( $_FILES['form']['name']['USR_RESUME'] )) {
+        if ($_FILES['form']['tmp_name']['USR_RESUME'] != '') {
+            $form['USR_RESUME'] = $_FILES['form']['name']['USR_RESUME'];
+        } else {
+            $form['USR_RESUME'] = '';
+        }
+    }
+
+    if (! isset( $form['USR_NEW_PASS'] )) {
+        $form['USR_NEW_PASS'] = '';
+    }
+    if ($form['USR_NEW_PASS'] != '') {
+        $form['USR_PASSWORD'] = md5( $form['USR_NEW_PASS'] );
+    }
+    if (! isset( $form['USR_CITY'] )) {
+        $form['USR_CITY'] = '';
+    }
+    if (! isset( $form['USR_LOCATION'] )) {
+        $form['USR_LOCATION'] = '';
+    }
+    if (! isset( $form['USR_AUTH_USER_DN'] )) {
+        $form['USR_AUTH_USER_DN'] = '';
+    }
+    if ($form['USR_UID'] == '') {
+        $aData['USR_USERNAME'] = $form['USR_USERNAME'];
+        $aData['USR_PASSWORD'] = $form['USR_PASSWORD'];
+        $aData['USR_FIRSTNAME'] = $form['USR_FIRSTNAME'];
+        $aData['USR_LASTNAME'] = $form['USR_LASTNAME'];
+        $aData['USR_EMAIL'] = $form['USR_EMAIL'];
+        $aData['USR_DUE_DATE'] = $form['USR_DUE_DATE'];
+        $aData['USR_CREATE_DATE'] = date( 'Y-m-d H:i:s' );
+        $aData['USR_UPDATE_DATE'] = date( 'Y-m-d H:i:s' );
+        $aData['USR_BIRTHDAY'] = date( 'Y-m-d' );
+        $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;
+        $sUserUID = $RBAC->createUser( $aData, $form['USR_ROLE'] );
+        $aData['USR_STATUS'] = $statusWF;
+        $aData['USR_UID'] = $sUserUID;
+        $aData['USR_PASSWORD'] = md5( $sUserUID ); //fake :p
+        $aData['USR_COUNTRY'] = $form['USR_COUNTRY'];
+        $aData['USR_CITY'] = $form['USR_CITY'];
+        $aData['USR_LOCATION'] = $form['USR_LOCATION'];
+        $aData['USR_ADDRESS'] = $form['USR_ADDRESS'];
+        $aData['USR_PHONE'] = $form['USR_PHONE'];
+        $aData['USR_ZIP_CODE'] = $form['USR_ZIP_CODE'];
+        $aData['USR_POSITION'] = $form['USR_POSITION'];
+        //  Commented by removal of resume in the addition and modification of user.
+        //  $aData['USR_RESUME']      = $form['USR_RESUME'];
+        $aData['USR_ROLE'] = $form['USR_ROLE'];
+        $aData['USR_REPLACED_BY'] = $form['USR_REPLACED_BY'];
+
+        require_once 'classes/model/Users.php';
+        $oUser = new Users();
+        $oUser->create( $aData );
+        if ($_FILES['form']['error']['USR_PHOTO'] != 1) {
+            if ($_FILES['form']['tmp_name']['USR_PHOTO'] != '') {
+                G::uploadFile( $_FILES['form']['tmp_name']['USR_PHOTO'], PATH_IMAGES_ENVIRONMENT_USERS, $sUserUID . '.gif' );
+            }
+        } else {
+            G::SendTemporalMessage( 'ID_FILE_TOO_BIG', 'error' );
+        }
+        if ($_FILES['form']['error']['USR_RESUME'] != 1) {
+            if ($_FILES['form']['tmp_name']['USR_RESUME'] != '') {
+                G::uploadFile( $_FILES['form']['tmp_name']['USR_RESUME'], PATH_IMAGES_ENVIRONMENT_FILES . $sUserUID . '/', $_FILES['form']['name']['USR_RESUME'] );
+            }
+        } else {
+            G::SendTemporalMessage( 'ID_FILE_TOO_BIG', 'error' );
+        }
+    } else {
+        $aData['USR_UID'] = $form['USR_UID'];
+        $aData['USR_USERNAME'] = $form['USR_USERNAME'];
+
+        if (isset( $form['USR_PASSWORD'] )) {
+            if ($form['USR_PASSWORD'] != '') {
+                $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'] )
+                ) )
+                ) );
+
+                $RBAC->loadUserRolePermission( 'PROCESSMAKER', $_SESSION['USER_LOGGED'] );
+                if ($RBAC->aUserInfo['PROCESSMAKER']['ROLE']['ROL_CODE'] == 'PROCESSMAKER_ADMIN') {
+                    $aUserProperty['USR_LAST_UPDATE_DATE'] = date( 'Y-m-d H:i:s' );
+                    $aUserProperty['USR_LOGGED_NEXT_TIME'] = 1;
+                    $oUserProperty->update( $aUserProperty );
+                }
+
+                $aErrors = $oUserProperty->validatePassword( $form['USR_NEW_PASS'], $aUserProperty['USR_LAST_UPDATE_DATE'], 0 );
+                if (count( $aErrors ) > 0) {
+                    $sDescription = G::LoadTranslation( 'ID_POLICY_ALERT' ) . ':<br /><br />';
+                    foreach ($aErrors as $sError) {
+                        switch ($sError) {
+                            case 'ID_PPP_MINIMUN_LENGTH':
+                                $sDescription .= ' - ' . G::LoadTranslation( $sError ) . ': ' . PPP_MINIMUN_LENGTH . '<br />';
+                                break;
+                            case 'ID_PPP_MAXIMUN_LENGTH':
+                                $sDescription .= ' - ' . G::LoadTranslation( $sError ) . ': ' . PPP_MAXIMUN_LENGTH . '<br />';
+                                break;
+                            case 'ID_PPP_EXPIRATION_IN':
+                                $sDescription .= ' - ' . G::LoadTranslation( $sError ) . ' ' . PPP_EXPIRATION_IN . ' ' . G::LoadTranslation( 'ID_DAYS' ) . '<br />';
+                                break;
+                            default:
+                                $sDescription .= ' - ' . G::LoadTranslation( $sError ) . '<br />';
+                                break;
+                        }
+                    }
+                    $sDescription .= '<br />' . G::LoadTranslation( 'ID_PLEASE_CHANGE_PASSWORD_POLICY' );
+                    G::SendMessageText( $sDescription, 'warning' );
+                    G::header( 'Location: ' . $_SERVER['HTTP_REFERER'] );
+                    die();
+                }
+                $aHistory = unserialize( $aUserProperty['USR_PASSWORD_HISTORY'] );
+                if (! is_array( $aHistory )) {
+                    $aHistory = array ();
+                }
+                if (! defined( 'PPP_PASSWORD_HISTORY' )) {
+                    define( 'PPP_PASSWORD_HISTORY', 0 );
+                }
+                if (PPP_PASSWORD_HISTORY > 0) {
+                    //it's looking a password igual into aHistory array that was send for post in md5 way
+                    $c = 0;
+                    $sw = 1;
+                    while (count( $aHistory ) >= 1 && count( $aHistory ) > $c && $sw) {
+                        if (strcmp( trim( $aHistory[$c] ), trim( $form['USR_PASSWORD'] ) ) == 0) {
+                            $sw = 0;
+                        }
+                        $c ++;
+                    }
+                    if ($sw == 0) {
+                        $sDescription = G::LoadTranslation( 'ID_POLICY_ALERT' ) . ':<br /><br />';
+                        $sDescription .= ' - ' . G::LoadTranslation( 'PASSWORD_HISTORY' ) . ': ' . PPP_PASSWORD_HISTORY . '<br />';
+                        $sDescription .= '<br />' . G::LoadTranslation( 'ID_PLEASE_CHANGE_PASSWORD_POLICY' ) . '';
+                        G::SendMessageText( $sDescription, 'warning' );
+                        G::header( 'Location: ' . $_SERVER['HTTP_REFERER'] );
+                        die();
+                    }
+                    //
+                    if (count( $aHistory ) >= PPP_PASSWORD_HISTORY) {
+                        $sLastPassw = array_shift( $aHistory );
+                    }
+                    $aHistory[] = $form['USR_PASSWORD'];
+                }
+                $aUserProperty['USR_LAST_UPDATE_DATE'] = date( 'Y-m-d H:i:s' );
+                $aUserProperty['USR_LOGGED_NEXT_TIME'] = 1;
+                $aUserProperty['USR_PASSWORD_HISTORY'] = serialize( $aHistory );
+                $oUserProperty->update( $aUserProperty );
+            }
+        }
+        $aData['USR_FIRSTNAME'] = $form['USR_FIRSTNAME'];
+        $aData['USR_LASTNAME'] = $form['USR_LASTNAME'];
+        $aData['USR_EMAIL'] = $form['USR_EMAIL'];
+        $aData['USR_DUE_DATE'] = $form['USR_DUE_DATE'];
+        $aData['USR_UPDATE_DATE'] = date( 'Y-m-d H:i:s' );
+        if (isset( $form['USR_STATUS'] )) {
+            $aData['USR_STATUS'] = $form['USR_STATUS'];
+        }
+        if (isset( $form['USR_ROLE'] )) {
+            $RBAC->updateUser( $aData, $form['USR_ROLE'] );
+        } else {
+            $RBAC->updateUser( $aData );
+        }
+        $aData['USR_COUNTRY'] = $form['USR_COUNTRY'];
+        $aData['USR_CITY'] = $form['USR_CITY'];
+        $aData['USR_LOCATION'] = $form['USR_LOCATION'];
+        $aData['USR_ADDRESS'] = $form['USR_ADDRESS'];
+        $aData['USR_PHONE'] = $form['USR_PHONE'];
+        $aData['USR_ZIP_CODE'] = $form['USR_ZIP_CODE'];
+        $aData['USR_POSITION'] = $form['USR_POSITION'];
+
+        if ($form['USR_RESUME'] != '') {
+            $aData['USR_RESUME'] = $form['USR_RESUME'];
+        }
+        if (isset( $form['USR_ROLE'] )) {
+            $aData['USR_ROLE'] = $form['USR_ROLE'];
+        }
+
+        if (isset( $form['USR_REPLACED_BY'] )) {
+            $aData['USR_REPLACED_BY'] = $form['USR_REPLACED_BY'];
+        }
+        if (isset( $form['USR_AUTH_USER_DN'] )) {
+            $aData['USR_AUTH_USER_DN'] = $form['USR_AUTH_USER_DN'];
+        }
+
+        require_once 'classes/model/Users.php';
+        $oUser = new Users();
+        $oUser->update( $aData );
+        $aExtensions = array ("AIS","BMP","BW","CDR","CDT","CGM","CMX","CPT","DCX","DIB","EMF","GBR","GIF","GIH","ICO","IFF","ILBM","JFIF","JIF","JPE","JPEG","JPG","KDC","LBM","MAC","PAT","PCD","PCT","PCX","PIC","PICT","PNG","PNTG","PIX","PSD","PSP","QTI","QTIF","RGB","RGBA","RIF","RLE","SGI","TGA","TIF","TIFF","WMF","XCF"
+        );
+
+        $sPhotoFile = $_FILES['form']['name']['USR_PHOTO'];
+        $aPhotoFile = explode( '.', $sPhotoFile );
+        $sExtension = strtoupper( $aPhotoFile[sizeof( $aPhotoFile ) - 1] );
+        if ((strlen( $sPhotoFile ) > 0) && (! in_array( $sExtension, $aExtensions ))) {
+            throw (new Exception( G::LoadTranslation( 'ID_ERROR_UPLOADING_IMAGE_TYPE' ) ));
+        }
+        if ($_FILES['form']['error']['USR_PHOTO'] != 1) {
+            if ($_FILES['form']['tmp_name']['USR_PHOTO'] != '') {
+                $aAux = explode( '.', $_FILES['form']['name']['USR_PHOTO'] );
+                G::uploadFile( $_FILES['form']['tmp_name']['USR_PHOTO'], PATH_IMAGES_ENVIRONMENT_USERS, $aData['USR_UID'] . '.' . $aAux[1] );
+                G::resizeImage( PATH_IMAGES_ENVIRONMENT_USERS . $aData['USR_UID'] . '.' . $aAux[1], 96, 96, PATH_IMAGES_ENVIRONMENT_USERS . $aData['USR_UID'] . '.gif' );
+            }
+        } else {
+            G::SendTemporalMessage( 'ID_FILE_TOO_BIG', 'error' );
+        }
+        if ($_FILES['form']['error']['USR_RESUME'] != 1) {
+            if ($_FILES['form']['tmp_name']['USR_RESUME'] != '') {
+                G::uploadFile( $_FILES['form']['tmp_name']['USR_RESUME'], PATH_IMAGES_ENVIRONMENT_FILES . $aData['USR_UID'] . '/', $_FILES['form']['name']['USR_RESUME'] );
+            }
+        } else {
+            G::SendTemporalMessage( 'ID_FILE_TOO_BIG', 'error' );
+        }
+    }
+
+    if ($_SESSION['USER_LOGGED'] == $form['USR_UID']) {
+        /*UPDATING SESSION VARIABLES*/
+        $aUser = $RBAC->userObj->load( $_SESSION['USER_LOGGED'] );
+        $_SESSION['USR_FULLNAME'] = $aUser['USR_FIRSTNAME'] . ' ' . $aUser['USR_LASTNAME'];
+    }
+
+    //Save Calendar assigment
+    if ((isset( $form['USR_CALENDAR'] ))) {
+        //Save Calendar ID for this user
+        G::LoadClass( "calendar" );
+        $calendarObj = new Calendar();
+        $calendarObj->assignCalendarTo( $aData['USR_UID'], $form['USR_CALENDAR'], 'USER' );
+    }
+
+    G::header( 'location: users_List' );
+} catch (Exception $e) {
+    $G_MAIN_MENU = 'processmaker';
+    $G_SUB_MENU = 'users';
+    $G_ID_MENU_SELECTED = 'USERS';
+    $G_ID_SUB_MENU_SELECTED = '';
+
+    $aMessage = array ();
+    $aMessage['MESSAGE'] = $e->getMessage();
+    $G_PUBLISH = new Publisher();
+    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', $aMessage );
+    G::RenderPage( 'publish', 'blank' );
 }
+
diff --git a/workflow/engine/methods/users/users_View.php b/workflow/engine/methods/users/users_View.php
index f46128aef..437824845 100755
--- a/workflow/engine/methods/users/users_View.php
+++ b/workflow/engine/methods/users/users_View.php
@@ -12,70 +12,64 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
  */
 try {
-  global $RBAC;
-  switch ($RBAC->userCanAccess('PM_FACTORY'))
-  {
-  	case -2:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;
-  	case -1:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;
-  }
-  // deprecated the class XmlForm_Field_Image is currently part of the class.xmlform.php package
-  // the use of the external xmlfield_Image is highly discouraged
-  if (!class_exists('XmlForm_Field_Image')){
-    G::LoadClass('xmlfield_Image');
-  }
-  require_once 'classes/model/Users.php';
-  $_SESSION['CURRENT_USER'] = $_GET['USR_UID'];
-  $oUser                    = new Users();
-  $aFields                  = $oUser->load($_GET['USR_UID']);
-  $aFields['USR_PASSWORD']  = '********';
-  $aFields['MESSAGE0']   = str_replace("\r\n","<br>",G::LoadTranslation('ID_USER_REGISTERED')) . '!';
-  $aFields['MESSAGE1']   = str_replace("\r\n","<br>",G::LoadTranslation('ID_MSG_ERROR_USR_USERNAME'));
-  $aFields['MESSAGE2']   = str_replace("\r\n","<br>",G::LoadTranslation('ID_MSG_ERROR_DUE_DATE'));
-  $aFields['MESSAGE3']   = str_replace("\r\n","<br>",G::LoadTranslation('ID_NEW_PASS_SAME_OLD_PASS'));
-  $aFields['MESSAGE4']   = str_replace("\r\n","<br>",G::LoadTranslation('ID_MSG_ERROR_USR_FIRSTNAME'));
-  $aFields['MESSAGE5']   = str_replace("\r\n","<br>",G::LoadTranslation('ID_MSG_ERROR_USR_LASTNAME'));
-  $aFields['NO_RESUME']     = G::LoadTranslation('ID_NO_RESUME');
-  $aFields['START_DATE']    = date('Y-m-d');
-  $aFields['END_DATE']      = date('Y-m-d', mktime(0, 0, 0, date('m'), date('d'), date('Y') + 5));
-  $aFields['RANDOM']        = rand();
-  $G_MAIN_MENU              = 'processmaker';
-  $G_ID_MENU_SELECTED       = 'USERS';
-  $G_PUBLISH                = new Publisher;
-  $G_PUBLISH->AddContent('xmlform', 'xmlform', 'users/users_View.xml', '', $aFields); 	  
-krumo($_SESSION);
-  if($_GET['USR_UID']=='00000000000000000000000000000001')
-  {	//$G_PUBLISH->AddContent('xmlform', 'xmlform', 'users/users_ViewAdmin.xml', '', $aFields);
-          // administrator due date must have a longer range
-          $aFields['END_DATE']      = date('Y-m-d', mktime(0, 0, 0, date('m'), date('d'), date('Y') + 10));
-          krumo("asdasd");
-	  $G_PUBLISH->AddContent('xmlform', 'xmlform', 'users/users_EditAdmin.xml', 'display:none', $aFields, 'users_Save?USR_UID=' . $_SESSION['CURRENT_USER']);
-	}
-	else
-	{ 
-	  $G_PUBLISH->AddContent('xmlform', 'xmlform', 'users/users_Edit.xml', 'display:none', $aFields, 'users_Save?USR_UID=' . $_SESSION['CURRENT_USER']);
-	}  
-  G::RenderPage('publish');
+    global $RBAC;
+    switch ($RBAC->userCanAccess( 'PM_FACTORY' )) {
+        case - 2:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+        case - 1:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+    }
+    // deprecated the class XmlForm_Field_Image is currently part of the class.xmlform.php package
+    // the use of the external xmlfield_Image is highly discouraged
+    if (! class_exists( 'XmlForm_Field_Image' )) {
+        G::LoadClass( 'xmlfield_Image' );
+    }
+    require_once 'classes/model/Users.php';
+    $_SESSION['CURRENT_USER'] = $_GET['USR_UID'];
+    $oUser = new Users();
+    $aFields = $oUser->load( $_GET['USR_UID'] );
+    $aFields['USR_PASSWORD'] = '********';
+    $aFields['MESSAGE0'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_USER_REGISTERED' ) ) . '!';
+    $aFields['MESSAGE1'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_MSG_ERROR_USR_USERNAME' ) );
+    $aFields['MESSAGE2'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_MSG_ERROR_DUE_DATE' ) );
+    $aFields['MESSAGE3'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_NEW_PASS_SAME_OLD_PASS' ) );
+    $aFields['MESSAGE4'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_MSG_ERROR_USR_FIRSTNAME' ) );
+    $aFields['MESSAGE5'] = str_replace( "\r\n", "<br>", G::LoadTranslation( 'ID_MSG_ERROR_USR_LASTNAME' ) );
+    $aFields['NO_RESUME'] = G::LoadTranslation( 'ID_NO_RESUME' );
+    $aFields['START_DATE'] = date( 'Y-m-d' );
+    $aFields['END_DATE'] = date( 'Y-m-d', mktime( 0, 0, 0, date( 'm' ), date( 'd' ), date( 'Y' ) + 5 ) );
+    $aFields['RANDOM'] = rand();
+    $G_MAIN_MENU = 'processmaker';
+    $G_ID_MENU_SELECTED = 'USERS';
+    $G_PUBLISH = new Publisher();
+    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'users/users_View.xml', '', $aFields );
+    krumo( $_SESSION );
+    if ($_GET['USR_UID'] == '00000000000000000000000000000001') { //$G_PUBLISH->AddContent('xmlform', 'xmlform', 'users/users_ViewAdmin.xml', '', $aFields);
+        // administrator due date must have a longer range
+        $aFields['END_DATE'] = date( 'Y-m-d', mktime( 0, 0, 0, date( 'm' ), date( 'd' ), date( 'Y' ) + 10 ) );
+        krumo( "asdasd" );
+        $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'users/users_EditAdmin.xml', 'display:none', $aFields, 'users_Save?USR_UID=' . $_SESSION['CURRENT_USER'] );
+    } else {
+        $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'users/users_Edit.xml', 'display:none', $aFields, 'users_Save?USR_UID=' . $_SESSION['CURRENT_USER'] );
+    }
+    G::RenderPage( 'publish' );
+} catch (Exception $oException) {
+    die( $oException->getMessage() );
 }
-catch (Exception $oException) {
-	die($oException->getMessage());
-}
-?>
\ No newline at end of file
+
diff --git a/workflow/engine/methods/users/users_ViewPhoto.php b/workflow/engine/methods/users/users_ViewPhoto.php
index 22fb6957c..b4fc4cc66 100755
--- a/workflow/engine/methods/users/users_ViewPhoto.php
+++ b/workflow/engine/methods/users/users_ViewPhoto.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * users_ViewPhoto.php
- *  
+ *
  * ProcessMaker Open Source Edition
  * Copyright (C) 2004 - 2008 Colosa Inc.23
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
@@ -12,89 +12,87 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd., 
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- * 
  */
-if (($RBAC_Response=$RBAC->userCanAccess("PM_LOGIN"))!=1) return $RBAC_Response;
+if (($RBAC_Response = $RBAC->userCanAccess( "PM_LOGIN" )) != 1)
+    return $RBAC_Response;
 
-	$direction = PATH_IMAGES_ENVIRONMENT_USERS . $uid = (isset($_SESSION['CURRENT_USER']) ? $_SESSION['CURRENT_USER'] : $_SESSION['USER_LOGGED']).".gif";
+$direction = PATH_IMAGES_ENVIRONMENT_USERS . $uid = (isset( $_SESSION['CURRENT_USER'] ) ? $_SESSION['CURRENT_USER'] : $_SESSION['USER_LOGGED']) . ".gif";
 //	header('Pragma: ');
 //	header('Cache-Control: cache');
 
-  if (!file_exists($direction))
-  {
+
+if (! file_exists( $direction )) {
     $direction = PATH_HOME . 'public_html/images/user.gif';
-  }
-  G::sendHeaders( $direction );
-
-DumpHeaders($direction);
+}
+G::sendHeaders( $direction );
 
+DumpHeaders( $direction );
 
 /*
  * This function is verified to work with Netscape and the *very latest*
  * version of IE.  I don't know if it works with Opera, but it should now.
  */
-function DumpHeaders($filename)
+function DumpHeaders ($filename)
 {
 
     global $root_path;
 
-    if (!$filename) return;
+    if (! $filename)
+        return;
 
     $HTTP_USER_AGENT = $_SERVER['HTTP_USER_AGENT'];
 
     $isIE = 0;
 
-
-    if (strstr($HTTP_USER_AGENT, 'compatible; MSIE ') !== false &&
-        strstr($HTTP_USER_AGENT, 'Opera') === false) {
+    if (strstr( $HTTP_USER_AGENT, 'compatible; MSIE ' ) !== false && strstr( $HTTP_USER_AGENT, 'Opera' ) === false) {
         $isIE = 1;
     }
 
-    if (strstr($HTTP_USER_AGENT, 'compatible; MSIE 6') !== false &&
-        strstr($HTTP_USER_AGENT, 'Opera') === false) {
+    if (strstr( $HTTP_USER_AGENT, 'compatible; MSIE 6' ) !== false && strstr( $HTTP_USER_AGENT, 'Opera' ) === false) {
         $isIE6 = 1;
     }
 
-    $aux = preg_replace('[^-a-zA-Z0-9\.]', '_', $filename);
-    $aux = explode ('_', $aux);
-    $downloadName = $aux[ count($aux)-1 ];
-  //  $downloadName = $filename;
+    $aux = preg_replace( '[^-a-zA-Z0-9\.]', '_', $filename );
+    $aux = explode( '_', $aux );
+    $downloadName = $aux[count( $aux ) - 1];
+    //  $downloadName = $filename;
+
 
     //$downloadName = ereg_replace('[^-a-zA-Z0-9\.]', '_', $filename);
 
-    if ($isIE && !isset($isIE6)) {
-      // http://support.microsoft.com/support/kb/articles/Q182/3/15.asp
-      // Do not have quotes around filename, but that applied to
-      // "attachment"... does it apply to inline too?
 
-      // This combination seems to work mostly.  IE 5.5 SP 1 has
-      // known issues (see the Microsoft Knowledge Base)
-      header("Content-Disposition: inline; filename=$downloadName");
+    if ($isIE && ! isset( $isIE6 )) {
+        // http://support.microsoft.com/support/kb/articles/Q182/3/15.asp
+        // Do not have quotes around filename, but that applied to
+        // "attachment"... does it apply to inline too?
 
-      // This works for most types, but doesn't work with Word files
-      header("Content-Type: application/download; name=\"$downloadName\"");
 
-      //header("Content-Type: $type0/$type1; name=\"$downloadName\"");
-      //header("Content-Type: application/x-msdownload; name=\"$downloadName\"");
-      //header("Content-Type: application/octet-stream; name=\"$downloadName\"");
-    }
-    else {
-      header("Content-Disposition: attachment; filename=\"$downloadName\"");
-      header("Content-Type: application/octet-stream; name=\"$downloadName\"");
+        // This combination seems to work mostly.  IE 5.5 SP 1 has
+        // known issues (see the Microsoft Knowledge Base)
+        header( "Content-Disposition: inline; filename=$downloadName" );
+
+        // This works for most types, but doesn't work with Word files
+        header( "Content-Type: application/download; name=\"$downloadName\"" );
+
+        //header("Content-Type: $type0/$type1; name=\"$downloadName\"");
+        //header("Content-Type: application/x-msdownload; name=\"$downloadName\"");
+        //header("Content-Type: application/octet-stream; name=\"$downloadName\"");
+    } else {
+        header( "Content-Disposition: attachment; filename=\"$downloadName\"" );
+        header( "Content-Type: application/octet-stream; name=\"$downloadName\"" );
     }
 
     //$filename = PATH_UPLOAD . "$filename";
-    readfile($filename);
+    readfile( $filename );
 }
 
-
 //G::header2( "location: /files/" .$_SESSION['ENVIRONMENT']. "/" .$appid, $filename);
-?>
\ No newline at end of file
+
diff --git a/workflow/engine/methods/users/users_ViewPhotoGrid.php b/workflow/engine/methods/users/users_ViewPhotoGrid.php
index 573d9c31e..13e7459a5 100755
--- a/workflow/engine/methods/users/users_ViewPhotoGrid.php
+++ b/workflow/engine/methods/users/users_ViewPhotoGrid.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * users_ViewPhoto.php
- *  
+ *
  * ProcessMaker Open Source Edition
  * Copyright (C) 2004 - 2008 Colosa Inc.23
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
@@ -12,87 +12,82 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd., 
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- * 
  */
-if (($RBAC_Response=$RBAC->userCanAccess("PM_LOGIN"))!=1) return $RBAC_Response;
+if (($RBAC_Response = $RBAC->userCanAccess( "PM_LOGIN" )) != 1)
+    return $RBAC_Response;
 
-	$direction = PATH_IMAGES_ENVIRONMENT_USERS . $_REQUEST['pUID'] . ".gif";
+$direction = PATH_IMAGES_ENVIRONMENT_USERS . $_REQUEST['pUID'] . ".gif";
 //	header('Pragma: ');
 //	header('Cache-Control: cache');
 
-  if (!file_exists($direction))
-  {
+
+if (! file_exists( $direction )) {
     $direction = PATH_HOME . 'public_html/images/user.gif';
-  }
-  G::sendHeaders( $direction );
-
-DumpHeaders($direction);
+}
+G::sendHeaders( $direction );
 
+DumpHeaders( $direction );
 
 /*
  * This function is verified to work with Netscape and the *very latest*
  * version of IE.  I don't know if it works with Opera, but it should now.
  */
-function DumpHeaders($filename)
+function DumpHeaders ($filename)
 {
 
     global $root_path;
 
-    if (!$filename) return;
+    if (! $filename)
+        return;
 
     $HTTP_USER_AGENT = $_SERVER['HTTP_USER_AGENT'];
 
     $isIE = 0;
 
-
-    if (strstr($HTTP_USER_AGENT, 'compatible; MSIE ') !== false &&
-        strstr($HTTP_USER_AGENT, 'Opera') === false) {
+    if (strstr( $HTTP_USER_AGENT, 'compatible; MSIE ' ) !== false && strstr( $HTTP_USER_AGENT, 'Opera' ) === false) {
         $isIE = 1;
     }
 
-    if (strstr($HTTP_USER_AGENT, 'compatible; MSIE 6') !== false &&
-        strstr($HTTP_USER_AGENT, 'Opera') === false) {
+    if (strstr( $HTTP_USER_AGENT, 'compatible; MSIE 6' ) !== false && strstr( $HTTP_USER_AGENT, 'Opera' ) === false) {
         $isIE6 = 1;
     }
 
-    $aux = preg_replace('[^-a-zA-Z0-9\.]', '_', $filename);
-    $aux = explode ('_', $aux);
-    $downloadName = $aux[ count($aux)-1 ];
+    $aux = preg_replace( '[^-a-zA-Z0-9\.]', '_', $filename );
+    $aux = explode( '_', $aux );
+    $downloadName = $aux[count( $aux ) - 1];
+
+    if ($isIE && ! isset( $isIE6 )) {
+        // http://support.microsoft.com/support/kb/articles/Q182/3/15.asp
+        // Do not have quotes around filename, but that applied to
+        // "attachment"... does it apply to inline too?
 
 
-    if ($isIE && !isset($isIE6)) {
-      // http://support.microsoft.com/support/kb/articles/Q182/3/15.asp
-      // Do not have quotes around filename, but that applied to
-      // "attachment"... does it apply to inline too?
+        // This combination seems to work mostly.  IE 5.5 SP 1 has
+        // known issues (see the Microsoft Knowledge Base)
+        header( "Content-Disposition: inline; filename=$downloadName" );
 
-      // This combination seems to work mostly.  IE 5.5 SP 1 has
-      // known issues (see the Microsoft Knowledge Base)
-      header("Content-Disposition: inline; filename=$downloadName");
+        // This works for most types, but doesn't work with Word files
+        header( "Content-Type: application/download; name=\"$downloadName\"" );
 
-      // This works for most types, but doesn't work with Word files
-      header("Content-Type: application/download; name=\"$downloadName\"");
-
-      //header("Content-Type: $type0/$type1; name=\"$downloadName\"");
-      //header("Content-Type: application/x-msdownload; name=\"$downloadName\"");
-      //header("Content-Type: application/octet-stream; name=\"$downloadName\"");
-    }
-    else {
-      header("Content-Disposition: attachment; filename=\"$downloadName\"");
-      header("Content-Type: application/octet-stream; name=\"$downloadName\"");
+        //header("Content-Type: $type0/$type1; name=\"$downloadName\"");
+        //header("Content-Type: application/x-msdownload; name=\"$downloadName\"");
+        //header("Content-Type: application/octet-stream; name=\"$downloadName\"");
+    } else {
+        header( "Content-Disposition: attachment; filename=\"$downloadName\"" );
+        header( "Content-Type: application/octet-stream; name=\"$downloadName\"" );
     }
 
     //$filename = PATH_UPLOAD . "$filename";
-    readfile($filename);
+    readfile( $filename );
 }
 
-
 //G::header2( "location: /files/" .$_SESSION['ENVIRONMENT']. "/" .$appid, $filename);
-?>
\ No newline at end of file
+
diff --git a/workflow/engine/methods/users/users_ViewResume.php b/workflow/engine/methods/users/users_ViewResume.php
index 3290450fa..506b69c19 100755
--- a/workflow/engine/methods/users/users_ViewResume.php
+++ b/workflow/engine/methods/users/users_ViewResume.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * users_ViewResume.php
- *  
+ *
  * ProcessMaker Open Source Edition
  * Copyright (C) 2004 - 2008 Colosa Inc.23
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
@@ -12,97 +12,97 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd., 
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- * 
  */
-if (($RBAC_Response=$RBAC->userCanAccess("PM_LOGIN"))!=1) return $RBAC_Response;
+if (($RBAC_Response = $RBAC->userCanAccess( "PM_LOGIN" )) != 1)
+    return $RBAC_Response;
 G::LoadClass( "user" );
 
-$uid = (isset($_SESSION['CURRENT_USER']) ? $_SESSION['CURRENT_USER'] : $_SESSION['USER_LOGGED']);
+$uid = (isset( $_SESSION['CURRENT_USER'] ) ? $_SESSION['CURRENT_USER'] : $_SESSION['USER_LOGGED']);
 require_once 'classes/model/Users.php';
 $oUser = new Users();
-$form  = $oUser->load($uid);
-if (!isset($form['USR_RESUME']) || $form['USR_RESUME']==='') die(G::LoadTranslation('ID_WITHOUT_RESUME'));
-	$direction = PATH_IMAGES_ENVIRONMENT_FILES.$uid."/".$form['USR_RESUME'];
-if (!file_exists($direction)) {
-	die('The file "' . $direction . '"doesn\'t exist in the server!');
+$form = $oUser->load( $uid );
+if (! isset( $form['USR_RESUME'] ) || $form['USR_RESUME'] === '')
+    die( G::LoadTranslation( 'ID_WITHOUT_RESUME' ) );
+$direction = PATH_IMAGES_ENVIRONMENT_FILES . $uid . "/" . $form['USR_RESUME'];
+if (! file_exists( $direction )) {
+    die( 'The file "' . $direction . '"doesn\'t exist in the server!' );
 }
 //	echo $direction ;
-	header('Pragma: ');
-	header('Cache-Control: cache');
+header( 'Pragma: ' );
+header( 'Cache-Control: cache' );
 
-
-G::sendHeaders($direction);
-readfile($direction);
+G::sendHeaders( $direction );
+readfile( $direction );
 //DumpHeaders($direction);
 
+
 /*
  * This function is verified to work with Netscape and the *very latest*
  * version of IE.  I don't know if it works with Opera, but it should now.
  */
-function DumpHeaders($filename)
+function DumpHeaders ($filename)
 {
 
     global $root_path;
 
-    if (!$filename) return;
+    if (! $filename)
+        return;
 
     $HTTP_USER_AGENT = $_SERVER['HTTP_USER_AGENT'];
 
     $isIE = 0;
 
-
-    if (strstr($HTTP_USER_AGENT, 'compatible; MSIE ') !== false &&
-        strstr($HTTP_USER_AGENT, 'Opera') === false) {
+    if (strstr( $HTTP_USER_AGENT, 'compatible; MSIE ' ) !== false && strstr( $HTTP_USER_AGENT, 'Opera' ) === false) {
         $isIE = 1;
     }
 
-    if (strstr($HTTP_USER_AGENT, 'compatible; MSIE 6') !== false &&
-        strstr($HTTP_USER_AGENT, 'Opera') === false) {
+    if (strstr( $HTTP_USER_AGENT, 'compatible; MSIE 6' ) !== false && strstr( $HTTP_USER_AGENT, 'Opera' ) === false) {
         $isIE6 = 1;
     }
 
     // The ereg_replace function has been DEPRECATED as of PHP 5.3.0.
     // $aux = ereg_replace('[^-a-zA-Z0-9\.]', '_', $filename);
-    $aux = preg_replace('/[^-a-zA-Z0-9\.]/', '_', $filename);
-    $aux = explode ('_', $aux);
-    $downloadName = $aux[ count($aux)-1 ];
-  //  $downloadName = $filename;
+    $aux = preg_replace( '/[^-a-zA-Z0-9\.]/', '_', $filename );
+    $aux = explode( '_', $aux );
+    $downloadName = $aux[count( $aux ) - 1];
+    //  $downloadName = $filename;
+
 
     //$downloadName = ereg_replace('[^-a-zA-Z0-9\.]', '_', $filename);
 
-    if ($isIE && !isset($isIE6)) {
-      // http://support.microsoft.com/support/kb/articles/Q182/3/15.asp
-      // Do not have quotes around filename, but that applied to
-      // "attachment"... does it apply to inline too?
 
-      // This combination seems to work mostly.  IE 5.5 SP 1 has
-      // known issues (see the Microsoft Knowledge Base)
-      header("Content-Disposition: inline; filename=$downloadName");
+    if ($isIE && ! isset( $isIE6 )) {
+        // http://support.microsoft.com/support/kb/articles/Q182/3/15.asp
+        // Do not have quotes around filename, but that applied to
+        // "attachment"... does it apply to inline too?
 
-      // This works for most types, but doesn't work with Word files
-      header("Content-Type: application/download; name=\"$downloadName\"");
 
-      //header("Content-Type: $type0/$type1; name=\"$downloadName\"");
-      //header("Content-Type: application/x-msdownload; name=\"$downloadName\"");
-      //header("Content-Type: application/octet-stream; name=\"$downloadName\"");
-    }
-    else {
-      header("Content-Disposition: attachment; filename=\"$downloadName\"");
-      header("Content-Type: application/octet-stream; name=\"$downloadName\"");
+        // This combination seems to work mostly.  IE 5.5 SP 1 has
+        // known issues (see the Microsoft Knowledge Base)
+        header( "Content-Disposition: inline; filename=$downloadName" );
+
+        // This works for most types, but doesn't work with Word files
+        header( "Content-Type: application/download; name=\"$downloadName\"" );
+
+        //header("Content-Type: $type0/$type1; name=\"$downloadName\"");
+        //header("Content-Type: application/x-msdownload; name=\"$downloadName\"");
+        //header("Content-Type: application/octet-stream; name=\"$downloadName\"");
+    } else {
+        header( "Content-Disposition: attachment; filename=\"$downloadName\"" );
+        header( "Content-Type: application/octet-stream; name=\"$downloadName\"" );
     }
 
     //$filename = PATH_UPLOAD . "$filename";
-    readfile($filename);
+    readfile( $filename );
 }
 
-
 //G::header2( "location: /files/" .$_SESSION['ENVIRONMENT']. "/" .$appid, $filename);
-?>
+