HOR-3670-RG-2 Files review:

workflow/engine/classes/LdapAdvanced.php
workflow/engine/classes/License_Application.php
workflow/engine/classes/MultipleFilesBackup.php
workflow/engine/classes/NET.php
workflow/engine/classes/ObjectCellection.php

gulliver/bin/tasks/pakeGulliver.php

@@ -1500,7 +1500,7 @@ function get_infoOnPM($workspace) {
 
   if( defined("DB_HOST") ) {
 
-    $dbNetView = new NET(DB_HOST);
+    $dbNetView = new Net(DB_HOST);
     $dbNetView->loginDbServer(DB_USER, DB_PASS);
 
     $dbConns = new DbConnections('');

workflow/engine/bin/tasks/cliWorkspaces.php

@@ -1,29 +1,4 @@
 <?php
-/**
- * cliWorkspaces.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2011 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.
- *
- * @author Alexandre Rosenfeld <alexandre@colosa.com>
- * @package workflow-engine-bin-tasks
- */
 
 CLI::taskName('info');
 CLI::taskDescription(<<<EOT
@@ -72,8 +47,7 @@ CLI::taskOpt("overwrite", "If a workspace already exists, overwrite it.", "o", "
 CLI::taskOpt("info", "Show information about backup file, but do not restore any workspaces.", "i");
 CLI::taskOpt("multiple", "Restore from multiple compressed backup files which are numbered.", "m");
 CLI::taskOpt("workspace", "Specify which workspace to restore if multiple workspaces are present in the backup file.
-        Ex: -wworkflow.",
+        Ex: -wworkflow.", "w:", "workspace=");
-             "w:", "workspace=");
 CLI::taskOpt("lang", "Specify the language which will be used to rebuild the case cache list. If this option isn't included, then 'en' (English) will be used by default.", "l:", "lang=");
 CLI::taskOpt("port", "Specify the port number used by MySQL. If not specified, then the port 3306 will be used by default.", "p:");
 CLI::taskRun("run_workspace_restore");
@@ -174,8 +148,7 @@ CLI::taskDescription(<<<EOT
 EOT
 );
 //CLI::taskArg('workspace', true);
-CLI::taskOpt("workspace", "Select the workspace whose case folders will be migrated, if multiple workspaces are present in the server.\n        Ex: -wworkflow.        Ex: --workspace=workflow",
+CLI::taskOpt("workspace", "Select the workspace whose case folders will be migrated, if multiple workspaces are present in the server.\n        Ex: -wworkflow.        Ex: --workspace=workflow", "w:", "workspace=");
-             "w:", "workspace=");
 CLI::taskRun("runStructureDirectories");
 
 CLI::taskName("database-generate-self-service-by-value");
@@ -362,7 +335,8 @@ CLI::taskRun("regenerate_pmtable_classes");
  * Function run_info
  * access public
  */
-function run_info($args, $opts) {
+function run_info($args, $opts)
+{
     $workspaces = get_workspaces_from_args($args);
     WorkspaceTools::printSysInfo();
     foreach ($workspaces as $workspace) {
@@ -371,8 +345,8 @@ function run_info($args, $opts) {
     }
 }
 
-function run_workspace_upgrade($args, $opts) {
+function run_workspace_upgrade($args, $opts)
-
+{
     $filter = new InputFilter();
     $opts = $filter->xssFilterHard($opts);
     $args = $filter->xssFilterHard($args);
@@ -410,7 +384,8 @@ function run_workspace_upgrade($args, $opts) {
  *
  * @return void
  */
-function run_translation_upgrade($args, $opts) {
+function run_translation_upgrade($args, $opts)
+{
     $noXml = array_key_exists('noxml', $opts) ? '--no-xml' : '';
     $noMafe = array_key_exists('nomafe', $opts) ? '--no-mafe' : '';
     if (!empty($noXml)) {
@@ -459,8 +434,8 @@ function translation_upgrade($args, $opts)
     }
 }
 
-function run_cacheview_upgrade($args, $opts) {
+function run_cacheview_upgrade($args, $opts)
-
+{
     $filter = new InputFilter();
     $opts = $filter->xssFilterHard($opts);
     $args = $filter->xssFilterHard($args);
@@ -475,7 +450,9 @@ function run_cacheview_upgrade($args, $opts) {
         }
     }
 }
-function run_plugins_database_upgrade($args, $opts) {
+
+function run_plugins_database_upgrade($args, $opts)
+{
     $workspaces = get_workspaces_from_args($args);
     foreach ($workspaces as $workspace) {
         try {
@@ -487,14 +464,17 @@ function run_plugins_database_upgrade($args, $opts) {
     }
 }
 
-function run_database_export($args, $opts) {
+function run_database_export($args, $opts)
-  if (count($args) < 2)
+{
+    if (count($args) < 2) {
         throw new Exception("Please provide a workspace name and a directory for export");
+    }
     $workspace = new WorkspaceTools($args[0]);
     $workspace->exportDatabase($args[1]);
 }
 
-function run_database_import($args, $opts) {
+function run_database_import($args, $opts)
+{
     throw new Exception("Not implemented");
 }
 
@@ -506,7 +486,8 @@ function run_database_import($args, $opts) {
  *
  * @return void
  */
-function run_database_upgrade($args, $opts) {
+function run_database_upgrade($args, $opts)
+{
     //Check if the command is executed by a specific workspace
     if (count($args) === 1) {
         database_upgrade('upgrade', $args);
@@ -518,19 +499,23 @@ function run_database_upgrade($args, $opts) {
     }
 }
 
-function run_database_check($args, $opts) {
+function run_database_check($args, $opts)
+{
     database_upgrade("check", $args);
 }
 
-function run_migrate_new_cases_lists($args, $opts) {
+function run_migrate_new_cases_lists($args, $opts)
+{
     migrate_new_cases_lists("migrate", $args, $opts);
 }
 
-function run_migrate_counters($args, $opts) {
+function run_migrate_counters($args, $opts)
+{
     migrate_counters("migrate", $args);
 }
 
-function run_migrate_list_unassigned($args, $opts) {
+function run_migrate_list_unassigned($args, $opts)
+{
     migrate_list_unassigned("migrate", $args, $opts);
 }
 
@@ -541,8 +526,8 @@ function run_migrate_list_unassigned($args, $opts) {
  *
  * @return void
  */
-function database_upgrade($command, $args) {
+function database_upgrade($command, $args)
-
+{
     $filter = new InputFilter();
     $command = $filter->xssFilterHard($command);
     $args = $filter->xssFilterHard($args);
@@ -580,17 +565,20 @@ function database_upgrade($command, $args) {
     }
 }
 
-function delete_app_from_table($con, $tableName, $appUid, $col="APP_UID") {
+function delete_app_from_table($con, $tableName, $appUid, $col = "APP_UID")
+{
     $stmt = $con->createStatement();
     $sql = "DELETE FROM " . $tableName . " WHERE " . $col . "='" . $appUid . "'";
     $rs = $stmt->executeQuery($sql, ResultSet::FETCHMODE_NUM);
 }
 
-function run_drafts_clean($args, $opts) {
+function run_drafts_clean($args, $opts)
+{
     echo "Cleaning drafts\n";
 
-  if (count($args) < 1)
+    if (count($args) < 1) {
         throw new Exception("Please specify a workspace name");
+    }
     $workspace = $args[0];
 
     if (!file_exists(PATH_DB . $workspace . '/db.php')) {
@@ -615,10 +603,11 @@ function run_drafts_clean($args, $opts) {
         throw new Exception("Days value is not valid: " . $days);
     }
 
-  if ($allDrafts)
+    if ($allDrafts) {
         echo "Removing all drafts\n";
-  else
+    } else {
         echo "Removing drafts older than " . $days . " days\n";
+    }
 
     /* Load the configuration from the workspace */
     require_once(PATH_DB . $workspace . '/db.php');
@@ -629,10 +618,11 @@ function run_drafts_clean($args, $opts) {
 
     $stmt = $con->createStatement();
 
-  if (!$allDrafts)
+    if (!$allDrafts) {
         $dateSql = "AND DATE_SUB(CURDATE(),INTERVAL " . $days . " DAY) >= APP_CREATE_DATE";
-  else
+    } else {
         $dateSql = "";
+    }
     /* Search for all the draft cases */
     $sql = "SELECT APP_UID FROM APPLICATION WHERE APP_STATUS='DRAFT'" . $dateSql;
     $appRows = $stmt->executeQuery($sql, ResultSet::FETCHMODE_ASSOC);
@@ -665,7 +655,8 @@ function run_drafts_clean($args, $opts) {
     echo "\n";
 }
 
-function run_workspace_backup($args, $opts) {
+function run_workspace_backup($args, $opts)
+{
     $workspaces = array();
     if (sizeof($args) > 2) {
         $filename = array_pop($args);
@@ -704,7 +695,7 @@ function run_workspace_backup($args, $opts) {
             CLI::error("This is not a Linux enviroment, cannot use this filesize [-s] feature.\n");
             return;
         }
-        $multipleBackup = new multipleFilesBackup ($filename,$filesize);//if filesize is 0 the default size will be took
+        $multipleBackup = new MultipleFilesBackup($filename, $filesize); //if filesize is 0 the default size will be took
         //using new method
         foreach ($workspaces as $workspace) {
             $multipleBackup->addToBackup($workspace);
@@ -726,9 +717,9 @@ function run_workspace_backup($args, $opts) {
     }
 }
 
-function run_workspace_restore($args, $opts) {
+function run_workspace_restore($args, $opts)
+{
     if (sizeof($args) > 0) {
-
         $filename = $args[0];
 
         G::verifyPath(PATH_DATA . 'upgrade', true);
@@ -740,9 +731,10 @@ function run_workspace_restore($args, $opts) {
 
         if (strpos($filename, "/") === false && strpos($filename, '\\') === false) {
             $filename = PATH_DATA . "backups/$filename";
-      if (!file_exists($filename) && substr_compare($filename, ".tar", -4, 4, true) != 0)
+            if (!file_exists($filename) && substr_compare($filename, ".tar", -4, 4, true) != 0) {
                 $filename .= ".tar";
             }
+        }
         $info = array_key_exists("info", $opts);
         $lang = array_key_exists("lang", $opts) ? $opts['lang'] : 'en';
         $port = array_key_exists("port", $opts) ? $opts['port'] : '';
@@ -750,7 +742,7 @@ function run_workspace_restore($args, $opts) {
             WorkspaceTools::getBackupInfo($filename);
         } else {
             CLI::logging("Restoring from $filename\n");
-      $workspace = array_key_exists("workspace", $opts) ? $opts['workspace'] : NULL;
+            $workspace = array_key_exists("workspace", $opts) ? $opts['workspace'] : null;
             $overwrite = array_key_exists("overwrite", $opts);
             $multiple = array_key_exists("multiple", $opts);
             $dstWorkspace = isset($args[1]) ? $args[1] : null;
@@ -759,13 +751,11 @@ function run_workspace_restore($args, $opts) {
                     CLI::error("This is not a Linux enviroment, cannot use this multiple [-m] feature.\n");
                     return;
                 }
-          multipleFilesBackup::letsRestore ($filename,$workspace,$dstWorkspace,$overwrite);
+                MultipleFilesBackup::letsRestore($filename, $workspace, $dstWorkspace, $overwrite);
-      }
+            } else {
-      else{
                 $anotherExtention = ".*"; //if there are files with and extra extention: e.g. <file>.tar.number
                 $multiplefiles = glob($filename . $anotherExtention); // example: //shared/workflow_data/backups/myWorkspace.tar.*
-          if(count($multiplefiles) > 0)
+                if (count($multiplefiles) > 0) {
-          {
                     CLI::error("Processmaker found these files: .\n");
                     foreach ($multiplefiles as $index => $value) {
                         CLI::logging($value . "\n");
@@ -781,7 +771,8 @@ function run_workspace_restore($args, $opts) {
     }
 }
 
-function runStructureDirectories($command, $args) {
+function runStructureDirectories($command, $args)
+{
     $workspaces = get_workspaces_from_args($command);
     $count = count($workspaces);
     $errors = false;
@@ -801,7 +792,6 @@ function runStructureDirectories($command, $args) {
 
 function run_database_generate_self_service_by_value($args, $opts)
 {
-
     $filter = new InputFilter();
     $opts = $filter->xssFilterHard($opts);
     $args = $filter->xssFilterHard($args);
@@ -882,8 +872,8 @@ function verifyMigratedDataConsistency($args)
     return $inconsistentRecords;
 }
 
-function run_migrate_itee_to_dummytask($args, $opts){
+function run_migrate_itee_to_dummytask($args, $opts)
-
+{
     $filter = new InputFilter();
     $opts = $filter->xssFilterHard($opts);
     $args = $filter->xssFilterHard($args);
@@ -897,8 +887,8 @@ function run_migrate_itee_to_dummytask($args, $opts){
         }
     }
 }
-
 /* ----------------------------------********--------------------------------- */
+
 /**
  * Check if we need to execute an external program for each workspace
  * If we apply the command for all workspaces we will need to execute one by one by redefining the constants
@@ -907,7 +897,8 @@ function run_migrate_itee_to_dummytask($args, $opts){
  *
  * @return void
  */
-function run_check_workspace_disabled_code($args, $opts) {
+function run_check_workspace_disabled_code($args, $opts)
+{
     //Check if the command is executed by a specific workspace
     if (count($args) === 1) {
         check_workspace_disabled_code($args, $opts);
@@ -918,6 +909,7 @@ function run_check_workspace_disabled_code($args, $opts) {
         }
     }
 }
+
 /**
  * This function is executed only by one workspace
  * Code Security Scanner related to the custom blacklist
@@ -980,7 +972,8 @@ function check_workspace_disabled_code($args, $opts)
     }
 }
 
-function migrate_new_cases_lists($command, $args, $opts) {
+function migrate_new_cases_lists($command, $args, $opts)
+{
     $filter = new InputFilter();
     $opts = $filter->xssFilterHard($opts);
     $args = $filter->xssFilterHard($args);
@@ -997,7 +990,8 @@ function migrate_new_cases_lists($command, $args, $opts) {
     }
 }
 
-function migrate_counters($command, $args) {
+function migrate_counters($command, $args)
+{
     $workspaces = get_workspaces_from_args($args);
 
     foreach ($workspaces as $workspace) {
@@ -1013,8 +1007,8 @@ function migrate_counters($command, $args) {
     }
 }
 
-function migrate_list_unassigned($command, $args, $opts) {
+function migrate_list_unassigned($command, $args, $opts)
-
+{
     $filter = new InputFilter();
     $opts = $filter->xssFilterHard($opts);
     $args = $filter->xssFilterHard($args);
@@ -1040,7 +1034,8 @@ function migrate_list_unassigned($command, $args, $opts) {
  *
  * @return void
  */
-function run_migrate_content($args, $opts) {
+function run_migrate_content($args, $opts)
+{
     //Check the additional parameters
     $lang = array_key_exists("lang", $opts) ? '--lang=' . $opts['lang'] : '--lang=' . SYS_LANG;
     //Check if the command is executed by a specific workspace
@@ -1053,6 +1048,7 @@ function run_migrate_content($args, $opts) {
         }
     }
 }
+
 /**
  * This function is executed only by one workspace
  * @param array $args, workspaceName for to apply the migrate-content
@@ -1081,8 +1077,8 @@ function migrate_content($args, $opts)
     CLI::logging("<*>   Optimizing content data Process took " . ($stop - $start) . " seconds.\n");
 }
 
-function run_migrate_self_service_value($args, $opts) {
+function run_migrate_self_service_value($args, $opts)
-
+{
     $filter = new InputFilter();
     $args = $filter->xssFilterHard($args);
     $workspaces = get_workspaces_from_args($args);
@@ -1097,7 +1093,8 @@ function run_migrate_self_service_value($args, $opts) {
     CLI::logging("<*>   Migrating Self-Service records Process took " . ($stop - $start) . " seconds.\n");
 }
 
-function run_migrate_indexing_acv($args, $opts) {
+function run_migrate_indexing_acv($args, $opts)
+{
     $filter = new InputFilter();
     $args = $filter->xssFilterHard($args);
     $workspaces = get_workspaces_from_args($args);
@@ -1111,7 +1108,8 @@ function run_migrate_indexing_acv($args, $opts) {
     CLI::logging("<*>   Migrating and populating indexing for avoiding the use of table APP_CACHE_VIEW process took " . ($stop - $start) . " seconds.\n");
 }
 
-function run_migrate_plugin($args, $opts) {
+function run_migrate_plugin($args, $opts)
+{
     $workspaces = get_workspaces_from_args($args);
     //Check if the command is executed by a specific workspace
     /** @var WorkspaceTools $workspace */
@@ -1130,6 +1128,7 @@ function run_migrate_plugin($args, $opts) {
         CLI::logging("<*>   Migrating and populating data Singleton took " . ($stop - $start) . " seconds.\n");
     }
 }
+
 /**
  * This method recursively finds all PHP files that reference the path PATH_DATA
  * incorrectly, which is caused by importing processes where the data directory

workflow/engine/classes/LdapAdvanced.php

@@ -1,8 +1,10 @@
 <?php
+
 /**
  * class.ldapAdvanced.php
  * LDAP plugin for the RBAC class. This
-class ldapAdvanced
+ */
+class LdapAdvanced
 {
     /**
      * The authsource id
@@ -38,7 +40,7 @@ class ldapAdvanced
      * Object where an rbac instance is set
      * @var Object
      */
-    static private $instance = null;
+    private static $instance = null;
 
     private $arrayObjectClassFilter = array(
         "user"       => "|(objectclass=inetorgperson)(objectclass=organizationalperson)(objectclass=person)(objectclass=user)",

workflow/engine/classes/License_Application.php

@@ -1,57 +1,6 @@
 <?php
-/**
- * Project:		Distrubution License Class
- * File:			class.license.app.php
- *
- * Copyright (C) 2005 Oliver Lillie
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by  the Free
- * Software Foundation; either version 2 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 General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * @link http://www.buggedcom.co.uk/
- * @link http://www.phpclasses.org/browse/package/2298.html
- * @author Oliver Lillie, buggedcom <publicmail at buggedcom dot co dot uk>
- * @history---------------------------------------------
- * see CHANGELOG
- */
 
-/**
+class license_application extends padl
- * Project:		Distrubution License Class
- * File:			class.license.app.php
- *
- * Copyright (C) 2005 Oliver Lillie
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by  the Free
- * Software Foundation; either version 2 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 General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * @link http://www.buggedcom.co.uk/
- * @link http://www.phpclasses.org/browse/package/2298.html
- * @author Oliver Lillie, buggedcom <publicmail at buggedcom dot co dot uk>
- * @history---------------------------------------------
- * see CHANGELOG
- */class license_application extends padl
 {
     /**
      * The number of allowed differences between the $_SERVER vars and the vars

workflow/engine/classes/MultipleFilesBackup.php

@@ -6,13 +6,7 @@
  *
  * Exports the database and copies the files to an tar archive o several if the max filesize is reached.
  */
-
+class MultipleFilesBackup
-/**
- * Class MultipleFilesBackup
- * create a backup of this workspace
- *
- * Exports the database and copies the files to an tar archive o several if the max filesize is reached.
- */class multipleFilesBackup
 {
     private $dir_to_compress = "";
     private $filename = "backUpProcessMaker.tar";
@@ -26,7 +20,7 @@
      *  @filename contains the path and filename of the comppress file(s).
      *  @size     got the Max size of the compressed files, by default if the $size less to zero will mantains 1000 Mb as Max size.
      */
-    public function multipleFilesBackup ($filename, $size)
+    public function MultipleFilesBackup($filename, $size)
     {
         if (!empty($filename)) {
             $this->filename = $filename;
@@ -103,7 +97,7 @@
      *  @ dstWorkspace contains the workspace to be overwriting.
      *  @ overwrite    got the option true if the workspace will be overwrite.
      */
-    static public function letsRestore ($filename, $srcWorkspace, $dstWorkspace = null, $overwrite = true)
+    public static function letsRestore($filename, $srcWorkspace, $dstWorkspace = null, $overwrite = true)
     {
         // Needed info:
         // TEMPDIR  /shared/workflow_data/upgrade/
@@ -227,7 +221,6 @@
             }
             $workspace->upgradeCacheView(false);
             mysql_close($link);
-
         }
         CLI::logging("Removing temporary files\n");
         G::rm_dir($tempDirectory);

workflow/engine/classes/Net.php

@@ -1,19 +1,6 @@
 <?php
 
-/**
+class Net
- * LastModification 30/05/2008
- */
-
-/**
- *
- * @package workflow.engine.classes
- */
-
-
-/**
- *
- * @package workflow.engine.classes
- */class NET
 {
     public $hostname;
     public $ip;
@@ -212,7 +199,6 @@
      */
     public function tryConnectServer($pDbDriver, array $arrayServerData = array(), $dbsEncode = "")
     {
-
         $filter = new InputFilter();
         $this->ip = $filter->validateInput($this->ip);
         $this->db_port = $filter->validateInput($this->db_port, 'int');
@@ -335,7 +321,6 @@
      */
     public function tryOpenDataBase($pDbDriver, array $arrayServerData = array(), $dbsEncode = "")
     {
-
         $filter = new InputFilter();
         $this->ip = $filter->validateInput($this->ip);
         $this->db_port = $filter->validateInput($this->db_port, 'int');
@@ -493,7 +478,6 @@
                 $value = 'none';
                 $sDataBase = 'database_' . strtolower(DB_ADAPTER);
                 if (G::LoadSystemExist($sDataBase)) {
-
                     $oDataBase = new database();
                     $value = $oDataBase->getServerVersion($driver, $this->ip, $this->db_port, $this->db_user, $this->db_passwd, $this->db_sourcename);
                 }

workflow/engine/classes/ObjectCollection.php

@@ -1,35 +1,11 @@
 <?php
-/**
- * class.processes.php
- *
- * @package workflow.engine.ProcessMaker
- *
- * 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.
- */
-
 
 /**
  * ObjectDocument Collection
  *
  * @package workflow.engine.ProcessMaker
- */class ObjectCellection
+ */
+class ObjectCollection
 {
     public $num;
     public $swapc;
@@ -40,7 +16,7 @@
      */
     public function __construct()
     {
-        $this->objects = Array();
+        $this->objects = array();
         $this->num = 0;
         $this->swapc = $this->num;
         array_push($this->objects, 'void');

workflow/engine/classes/ServerConf.php

@@ -347,7 +347,7 @@
     {
         $sMySQLVersion = '?????';
         if (defined("DB_HOST")) {
-            $dbNetView = new NET(DB_HOST);
+            $dbNetView = new Net(DB_HOST);
             $dbNetView->loginDbServer(DB_USER, DB_PASS);
 
             $dbConns = new DbConnections('');

workflow/engine/classes/WorkspaceTools.php

@@ -1145,7 +1145,7 @@ class WorkspaceTools
         $Fields['WORKSPACE_NAME'] = $this->name;
 
         if (isset($this->dbHost)) {
-            $dbNetView = new NET($this->dbHost);
+            $dbNetView = new Net($this->dbHost);
             $dbNetView->loginDbServer($this->dbUser, $this->dbPass);
             try {
                 if (!defined('DB_ADAPTER')) {

workflow/engine/controllers/admin.php

@@ -230,7 +230,7 @@ class Admin extends Controller
 
         $redhat .= " (" . PHP_OS . ")";
         if (defined( "DB_HOST" )) {
-            $dbNetView = new NET( DB_HOST );
+            $dbNetView = new Net( DB_HOST );
             $dbNetView->loginDbServer( DB_USER, DB_PASS );
 
             $dbConns = new DbConnections( '' );

workflow/engine/controllers/adminProxy.php

@@ -433,7 +433,7 @@ class adminProxy extends HttpProxyController
         $Mailto = $_POST['eMailto'];
         $SMTPSecure  = $_POST['UseSecureCon'];
 
-        $Server = new NET($server);
+        $Server = new Net($server);
         $smtp = new SMTP;
 
         $timeout = 10;

workflow/engine/controllers/main.php

@@ -695,7 +695,7 @@ class Main extends Controller
 
         $redhat .= " (" . PHP_OS . ")";
         if (defined( "DB_HOST" )) {
-            $dbNetView = new NET( DB_HOST );
+            $dbNetView = new Net( DB_HOST );
             $dbNetView->loginDbServer( DB_USER, DB_PASS );
 
             $dbConns = new DbConnections( '' );

workflow/engine/controllers/pmTablesProxy.php

@@ -918,7 +918,7 @@ class pmTablesProxy extends HttpProxyController
 
         try {
             $result = new stdClass();
-            $net = new NET( G::getIpAddress() );
+            $net = new Net( G::getIpAddress() );
 
             $META = " \n-----== ProcessMaker Open Source Private Tables ==-----\n" . " @Ver: 1.0 Oct-2009\n" . " @Processmaker version: " . PmSystem::getVersion() . "\n" . " -------------------------------------------------------\n" . " @Export Date: " . date( "l jS \of F Y h:i:s A" ) . "\n" . " @Server address: " . getenv( 'SERVER_NAME' ) . " (" . getenv( 'SERVER_ADDR' ) . ")\n" . " @Client address: " . $net->hostname . "\n" . " @Workspace: " . SYS_SYS . "\n" . " @Export trace back:\n\n";
 

workflow/engine/methods/authSources/authSourcesSynchronizeAjax.php

@@ -235,7 +235,7 @@ try {
 function getLDAPAdvanceInstance($authUid)
 {
     $RBAC = &RBAC::getSingleton();
-    $ldapAdvanced = new ldapAdvanced();
+    $ldapAdvanced = new LdapAdvanced();
     $ldapAdvanced->sAuthSource = $authUid;
     $ldapAdvanced->sSystem = $RBAC->sSystem;
 

workflow/engine/methods/authSources/ldapAdvancedProxy.php

@@ -152,7 +152,7 @@ switch ($function) {
         $aFields['AUTH_SOURCE_DATA'] = $aData;
 
         //LDAP_PAGE_SIZE_LIMIT
-        $ldapAdvanced = new ldapAdvanced();
+        $ldapAdvanced = new LdapAdvanced();
 
         try {
             $arrayAuthenticationSourceData = $aFields;
@@ -205,7 +205,7 @@ switch ($function) {
             //Get data
             $arrayData = array();
 
-            $ldapAdvanced = new ldapAdvanced();
+            $ldapAdvanced = new LdapAdvanced();
             $ldapAdvanced->sAuthSource = $authenticationSourceUid;
 
             $result = $ldapAdvanced->searchUsers($keyword, $start, $limit);
@@ -345,7 +345,7 @@ switch ($function) {
             $arrayAuthenticationSourceData['AUTH_SOURCE_VERSION'] = 3;
 
             //Test connection
-            $ldapAdvanced = new ldapAdvanced();
+            $ldapAdvanced = new LdapAdvanced();
 
             $ldapcnn = $ldapAdvanced->ldapConnection($arrayAuthenticationSourceData);
 

workflow/engine/methods/dbConnections/dbConnectionsAjax.php

@@ -240,7 +240,7 @@ switch ($action) {
                 }
             }
 
-            $Server = new NET($server);
+            $Server = new Net($server);
 
             switch ($step) {
                 case 1:
@@ -305,7 +305,7 @@ switch ($action) {
             $connectionType = $_POST["connectionType"];
             $tns = $_POST["tns"];
 
-            $net = new NET();
+            $net = new Net();
 
             switch ($step) {
                 case 1:

workflow/engine/methods/services/ldapadvanced.php

@@ -48,7 +48,7 @@ class ldapadvancedClassCron
             $rbac->authSourcesObj = new AuthenticationSource();
         }
 
-        $plugin = new ldapAdvanced();
+        $plugin = new LdapAdvanced();
         $plugin->sSystem = $rbac->sSystem;
 
         $plugin->setFrontEnd(true);

workflow/engine/methods/setup/appCacheViewAjax.php

@@ -26,7 +26,7 @@ function testConnection($type, $server, $user, $passwd, $port = 'none', $dbName
         }
     }
 
-    $Server = new NET($server);
+    $Server = new Net($server);
     $filter = new InputFilter();
 
     if ($Server->getErrno() == 0) {

workflow/engine/methods/setup/emails_Ajax.php

@@ -92,7 +92,7 @@ switch ($request) {
         $SMTPSecure = $_POST['SMTPSecure'];
         $timeout = 10;
 
-        $Server = new NET( $srv );
+        $Server = new Net( $srv );
         $smtp = new SMTP();
 
         switch ($step) {

workflow/engine/src/ProcessMaker/BusinessModel/DataBaseConnection.php

@@ -271,7 +271,7 @@ class DataBaseConnection
         $flagTns = ($dataCon["DBS_TYPE"] == "oracle" && $dataCon["DBS_CONNECTION_TYPE"] == "TNS")? 1 : 0;
 
         if ($flagTns == 0) {
-            $Server = new \NET($dataCon['DBS_SERVER']);
+            $Server = new \Net($dataCon['DBS_SERVER']);
 
             // STEP 1 : Resolving Host Name
             $respTest['0'] = array();
@@ -356,7 +356,7 @@ class DataBaseConnection
                 }
             }
         } else {
-            $net = new \NET();
+            $net = new \Net();
 
             //STEP 0: Trying to open database type TNS
             $respTest["0"] = array();

workflow/engine/src/ProcessMaker/BusinessModel/EmailServer.php

@@ -316,7 +316,7 @@ class EmailServer
             $mailTo = $arrayData["MAIL_TO"];
             $smtpSecure = $arrayData["SMTPSECURE"];
 
-            $serverNet = new \NET($server);
+            $serverNet = new \Net($server);
             $smtp = new \SMTP();
 
             $timeout = 10;

workflow/engine/templates/dbConnections/dbConnections.php

@@ -47,7 +47,7 @@ $html = '
 $flagTns = ($_POST["type"] == "oracle" && $_POST["connectionType"] == "TNS")? 1 : 0;
 
 if ($flagTns == 0) {
-    $host = new NET($_POST["server"]);
+    $host = new Net($_POST["server"]);
 
     $port = $_POST["port"];
 

workflow/engine/templates/setup/mailConnectiontest.php

@@ -31,7 +31,7 @@
  * @Updated Nov 6th, 2009 bye Eriknyk
  */
 
-    $host = new net($_POST['srv']);
+    $host = new Net($_POST['srv']);
     $host = $filter->xssFilterHard($host);
     $width_content = '550px';
     $filter = new InputFilter();