adamjakab / SuiteCRM

modules/SchedulersJobs/SchedulersJob.php

Spacing +51 added lines, -51 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -70,7 +70,7 @@ 
     public $requeue; // Requeue on failure?
     public $retry_count;
     public $failure_count;
-    public $job_delay=0; // Frequency to run it
+    public $job_delay = 0; // Frequency to run it
     public $assigned_user_id; // User under which the task is running
     public $client; // Client ID that owns this job
     public $execute_time_db;
@@ -78,13 +78,13 @@ 
 
 	// standard SugarBean child attrs
 	var $table_name		= "job_queue";
-	var $object_name		= "SchedulersJob";
+	var $object_name = "SchedulersJob";
 	var $module_dir		= "SchedulersJobs";
 	var $new_schema		= true;
 	var $process_save_dates = true;
 	// related fields
-	var $job_name;	// the Scheduler's 'name' field
-	var $job;		// the Scheduler's 'job' field
+	var $job_name; // the Scheduler's 'name' field
+	var $job; // the Scheduler's 'job' field
 	// object specific attributes
 	public $user; // User object
 	var $scheduler; // Scheduler parent
@@ -98,7 +98,7 @@ 
 	function __construct()
 	{
         parent::__construct();
-        if(!empty($GLOBALS['sugar_config']['jobs']['min_retry_interval'])) {
+        if (!empty($GLOBALS['sugar_config']['jobs']['min_retry_interval'])) {
             $this->min_interval = $GLOBALS['sugar_config']['jobs']['min_retry_interval'];
         }
 	}
@@ -106,9 +106,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function SchedulersJob(){
+    function SchedulersJob() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -135,10 +135,10 @@ 
      *
 	 * @return string Formatted datetime value
 	 */
-	function handleDateFormat($date='now', $user=null, $user_format=false) {
+	function handleDateFormat($date = 'now', $user = null, $user_format = false) {
 		global $timedate;
 
-		if(!isset($timedate) || empty($timedate))
+		if (!isset($timedate) || empty($timedate))
         {
 			$timedate = new TimeDate();
 		}
@@ -146,7 +146,7 @@ 
 		// get user for calculation
 		$user = (empty($user)) ? $this->user : $user;
 
-        if($date == 'now')
+        if ($date == 'now')
         {
             $dbTime = $timedate->asUser($timedate->getNow(), $user);
         } else {
@@ -166,7 +166,7 @@ 
 	 * @param	$job		String in URI-clean format
 	 * @param	$timeout	Int value in secs for cURL to timeout. 30 default.
 	 */
-	public function fireUrl($job, $timeout=30)
+	public function fireUrl($job, $timeout = 30)
 	{
 	// TODO: figure out what error is thrown when no more apache instances can be spun off
 	    // cURL inits
@@ -175,16 +175,16 @@ 
 		curl_setopt($ch, CURLOPT_FAILONERROR, true); // silent failure (code >300);
 		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); // do not follow location(); inits - we always use the current
 		curl_setopt($ch, CURLOPT_FORBID_REUSE, 1);
-		curl_setopt($ch, CURLOPT_DNS_USE_GLOBAL_CACHE, false);  // not thread-safe
+		curl_setopt($ch, CURLOPT_DNS_USE_GLOBAL_CACHE, false); // not thread-safe
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); // return into a variable to continue program execution
 		curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); // never times out - bad idea?
 		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5); // 5 secs for connect timeout
-		curl_setopt($ch, CURLOPT_FRESH_CONNECT, true);  // open brand new conn
+		curl_setopt($ch, CURLOPT_FRESH_CONNECT, true); // open brand new conn
 		curl_setopt($ch, CURLOPT_HEADER, true); // do not return header info with result
 		curl_setopt($ch, CURLOPT_NOPROGRESS, true); // do not have progress bar
 		$urlparts = parse_url($job);
-		if(empty($urlparts['port'])) {
-		    if($urlparts['scheme'] == 'https'){
+		if (empty($urlparts['port'])) {
+		    if ($urlparts['scheme'] == 'https') {
 				$urlparts['port'] = 443;
 			} else {
 				$urlparts['port'] = 80;
@@ -197,17 +197,17 @@ 
 
 		curl_setopt($ch, CURLOPT_NOSIGNAL, true); // ignore any cURL signals to PHP (for multi-threading)
 		$result = curl_exec($ch);
-		$cInfo = curl_getinfo($ch);	//url,content_type,header_size,request_size,filetime,http_code
+		$cInfo = curl_getinfo($ch); //url,content_type,header_size,request_size,filetime,http_code
 									//ssl_verify_result,total_time,namelookup_time,connect_time
 									//pretransfer_time,size_upload,size_download,speed_download,
 									//speed_upload,download_content_length,upload_content_length
 									//starttransfer_time,redirect_time
-		if(curl_errno($ch)) {
+		if (curl_errno($ch)) {
 		    $this->errors .= curl_errno($ch)."\n";
 		}
 		curl_close($ch);
 
-		if($result !== FALSE && $cInfo['http_code'] < 400) {
+		if ($result !== FALSE && $cInfo['http_code'] < 400) {
 			$GLOBALS['log']->debug("----->Firing was successful: $job");
 			$GLOBALS['log']->debug('----->WTIH RESULT: '.strip_tags($result).' AND '.strip_tags(print_r($cInfo, true)));
 			return true;
@@ -231,7 +231,7 @@ 
 
 		$temp_array = $this->get_list_view_array();
 		$temp_array['JOB_NAME'] = $this->job_name;
-		$temp_array['JOB']		= $this->job;
+		$temp_array['JOB'] = $this->job;
 
     	return $temp_array;
 	}
@@ -290,12 +290,12 @@ 
     public function resolveJob($resolution, $message = null)
     {
         $GLOBALS['log']->info("Resolving job {$this->id} as $resolution: $message");
-        if($resolution == self::JOB_FAILURE) {
+        if ($resolution == self::JOB_FAILURE) {
             $this->failure_count++;
-            if($this->requeue && $this->retry_count > 0) {
+            if ($this->requeue && $this->retry_count > 0) {
                 // retry failed job
                 $this->status = self::JOB_STATUS_QUEUED;
-                if($this->job_delay < $this->min_interval) {
+                if ($this->job_delay < $this->min_interval) {
                     $this->job_delay = $this->min_interval;
                 }
                 $this->execute_time = $GLOBALS['timedate']->getNow()->modify("+{$this->job_delay} seconds")->asDb();
@@ -313,7 +313,7 @@ 
         $this->addMessages($message);
         $this->resolution = $resolution;
         $this->save();
-        if($this->status == self::JOB_STATUS_DONE && $this->resolution == self::JOB_SUCCESS) {
+        if ($this->status == self::JOB_STATUS_DONE && $this->resolution == self::JOB_SUCCESS) {
             $this->updateSchedulerSuccess();
         }
         return true;
@@ -324,7 +324,7 @@ 
      */
     protected function updateSchedulerSuccess()
     {
-        if(empty($this->scheduler_id)) {
+        if (empty($this->scheduler_id)) {
             return;
         }
         $this->db->query("UPDATE schedulers SET last_run={$this->db->now()} WHERE id=".$this->db->quoted($this->scheduler_id));
@@ -337,11 +337,11 @@ 
      */
     protected function addMessages($message)
     {
-        if(!empty($this->errors)) {
+        if (!empty($this->errors)) {
             $this->message .= $this->errors;
             $this->errors = '';
         }
-        if(!empty($message)) {
+        if (!empty($message)) {
             $this->message .= "$message\n";
         }
     }
@@ -357,7 +357,7 @@ 
         $this->status = self::JOB_STATUS_QUEUED;
         $this->addMessages($message);
         $this->resolution = self::JOB_PARTIAL;
-        if(empty($delay)) {
+        if (empty($delay)) {
             $delay = intval($this->job_delay);
         }
         $this->execute_time = $GLOBALS['timedate']->getNow()->modify("+$delay seconds")->asDb();
@@ -381,7 +381,7 @@ 
      */
     public function unexpectedExit()
     {
-        if(!$this->job_done) {
+        if (!$this->job_done) {
             // Job wasn't properly finished, fail it
             $this->resolveJob(self::JOB_FAILURE, translate('ERR_FAILED', 'SchedulersJobs'));
         }
@@ -397,15 +397,15 @@ 
     {
         $job = new self();
         $job->retrieve($id);
-        if(empty($job->id)) {
+        if (empty($job->id)) {
             $GLOBALS['log']->fatal("Job $id not found.");
             return "Job $id not found.";
         }
-        if($job->status != self::JOB_STATUS_RUNNING) {
+        if ($job->status != self::JOB_STATUS_RUNNING) {
             $GLOBALS['log']->fatal("Job $id is not marked as running.");
             return "Job $id is not marked as running.";
         }
-        if($job->client != $client) {
+        if ($job->client != $client) {
             $GLOBALS['log']->fatal("Job $id belongs to client {$job->client}, can not run as $client.");
             return "Job $id belongs to another client, can not run as $client.";
         }
@@ -425,7 +425,7 @@ 
      */
     public function errorHandler($errno, $errstr, $errfile, $errline)
     {
-        switch($errno)
+        switch ($errno)
         {
     		case E_USER_WARNING:
     		case E_COMPILE_WARNING:
@@ -461,14 +461,14 @@ 
     {
         $GLOBALS['current_user'] = $user;
         // Reset the session
-        if(session_id()) {
+        if (session_id()) {
             session_destroy();
         }
-        if(!headers_sent()) {
+        if (!headers_sent()) {
     		session_start();
             session_regenerate_id();
         }
-        $_SESSION['is_valid_session']= true;
+        $_SESSION['is_valid_session'] = true;
     	$_SESSION['user_id'] = $user->id;
     	$_SESSION['type'] = 'user';
     	$_SESSION['authenticated_user_id'] = $user->id;
@@ -481,11 +481,11 @@ 
     protected function setJobUser()
     {
         // set up the current user and drop session
-        if(!empty($this->assigned_user_id)) {
+        if (!empty($this->assigned_user_id)) {
             $this->old_user = $GLOBALS['current_user'];
-            if(empty($this->user->id) || $this->assigned_user_id != $this->user->id) {
+            if (empty($this->user->id) || $this->assigned_user_id != $this->user->id) {
                 $this->user = BeanFactory::getBean('Users', $this->assigned_user_id);
-                if(empty($this->user->id)) {
+                if (empty($this->user->id)) {
                     $this->resolveJob(self::JOB_FAILURE, sprintf(translate('ERR_NOSUCHUSER', 'SchedulersJobs'), $this->assigned_user_id));
                     return false;
                 }
@@ -503,7 +503,7 @@ 
      */
     protected function restoreJobUser()
     {
-        if(!empty($this->old_user->id) && $this->old_user->id != $this->user->id) {
+        if (!empty($this->old_user->id) && $this->old_user->id != $this->user->id) {
             $this->sudo($this->old_user);
         }
     }
@@ -518,27 +518,27 @@ 
 
         $this->errors = "";
         $exJob = explode('::', $this->target, 2);
-        if($exJob[0] == 'function') {
+        if ($exJob[0] == 'function') {
             // set up the current user and drop session
-            if(!$this->setJobUser()) {
+            if (!$this->setJobUser()) {
                 return false;
             }
     		$func = $exJob[1];
 			$GLOBALS['log']->debug("----->SchedulersJob calling function: $func");
             set_error_handler(array($this, "errorHandler"), E_ALL & ~E_NOTICE & ~E_STRICT);
-			if(!is_callable($func)) {
+			if (!is_callable($func)) {
 			    $this->resolveJob(self::JOB_FAILURE, sprintf(translate('ERR_CALL', 'SchedulersJobs'), $func));
 			}
 			$data = array($this);
-			if(!empty($this->data)) {
+			if (!empty($this->data)) {
 			    $data[] = $this->data;
 			}
             $res = call_user_func_array($func, $data);
             restore_error_handler();
             $this->restoreJobUser();
-			if($this->status == self::JOB_STATUS_RUNNING) {
+			if ($this->status == self::JOB_STATUS_RUNNING) {
 			    // nobody updated the status yet - job function could do that
-    			if($res) {
+    			if ($res) {
     			    $this->resolveJob(self::JOB_SUCCESS);
     				return true;
     			} else {
@@ -548,11 +548,11 @@ 
 			} else {
 			    return $this->resolution != self::JOB_FAILURE;
 			}
-		} elseif($exJob[0] == 'url') {
-			if(function_exists('curl_init')) {
+		} elseif ($exJob[0] == 'url') {
+			if (function_exists('curl_init')) {
 				$GLOBALS['log']->debug('----->SchedulersJob firing URL job: '.$exJob[1]);
                 set_error_handler(array($this, "errorHandler"), E_ALL & ~E_NOTICE & ~E_STRICT);
-				if($this->fireUrl($exJob[1])) {
+				if ($this->fireUrl($exJob[1])) {
                     restore_error_handler();
                     $this->resolveJob(self::JOB_SUCCESS);
 					return true;
@@ -566,10 +566,10 @@ 
 			}
 		} elseif ($exJob[0] == 'class') {
             $tmpJob = new $exJob[1]();
-            if($tmpJob instanceof RunnableSchedulerJob)
+            if ($tmpJob instanceof RunnableSchedulerJob)
             {
                 // set up the current user and drop session
-                if(!$this->setJobUser()) {
+                if (!$this->setJobUser()) {
                     return false;
                 }
                 $tmpJob->setJob($this);

Braces +6 added lines, -7 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -110,8 +112,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();
@@ -587,12 +588,10 @@ 
                 } else {
                     return $this->resolution != self::JOB_FAILURE;
                 }
-            }
-            else {
+            } else {
                 $this->resolveJob(self::JOB_FAILURE, sprintf(translate('ERR_JOBTYPE', 'SchedulersJobs'), strip_tags($this->target)));
             }
-        }
-        else {
+        } else {
 		    $this->resolveJob(self::JOB_FAILURE, sprintf(translate('ERR_JOBTYPE', 'SchedulersJobs'), strip_tags($this->target)));
 		}
 		return false;

modules/Connectors/ConnectorRecord.php

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
@@ -41,7 +41,7 @@ 
 
 
 
- class ConnectorRecord extends MergeRecord{
+ class ConnectorRecord extends MergeRecord {
 	var $object_name = 'ConnectorRecord';
     var $module_dir = 'Connector';
 
@@ -53,9 +53,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function ConnectorRecord($merge_module = '', $merge_id = ''){
+    function ConnectorRecord($merge_module = '', $merge_id = '') {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {

Braces +4 added lines, -3 removed lines

@@ -43,7 +43,9 @@ 
  * Date: 06/03/15
  * Comments
  */
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 
 class CasesController extends SugarController {
 
@@ -90,8 +92,7 @@ 
                 $count++;
             }
             echo '</table>';
-        }
-        else {
+        } else {
             echo $mod_strings['LBL_NO_SUGGESTIONS'];
         }
         die();

modules/ACLActions/ACLAction.php

Spacing +98 added lines, -98 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -38,29 +38,29 @@ 
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 /* BEGIN - SECURITY GROUPS */
-if(file_exists("modules/ACLActions/actiondefs.override.php")){
+if (file_exists("modules/ACLActions/actiondefs.override.php")) {
 	require_once("modules/ACLActions/actiondefs.override.php");
 } else {
 require_once('modules/ACLActions/actiondefs.php');
 }
 /* END - SECURITY GROUPS */
-class ACLAction  extends SugarBean{
+class ACLAction  extends SugarBean {
     var $module_dir = 'ACLActions';
     var $object_name = 'ACLAction';
     var $table_name = 'acl_actions';
     var $new_schema = true;
     var $disable_custom_fields = true;
 
-    public function __construct(){
+    public function __construct() {
         parent::__construct();
     }
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    public function ACLAction(){
+    public function ACLAction() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -77,17 +77,17 @@ 
     * @param STRING $category - the category (e.g module name - Accounts, Contacts)
     * @param STRING $type - the type (e.g. 'module', 'field')
     */
-    static function addActions($category, $type='module'){
+    static function addActions($category, $type = 'module') {
         global $ACLActions;
         $db = DBManagerFactory::getInstance();
-        if(isset($ACLActions[$type])){
-            foreach($ACLActions[$type]['actions'] as $action_name =>$action_def){
+        if (isset($ACLActions[$type])) {
+            foreach ($ACLActions[$type]['actions'] as $action_name =>$action_def) {
 
                 $action = new ACLAction();
-                $query = "SELECT * FROM " . $action->table_name . " WHERE name='$action_name' AND category = '$category' AND acltype='$type' AND deleted=0 ";
+                $query = "SELECT * FROM ".$action->table_name." WHERE name='$action_name' AND category = '$category' AND acltype='$type' AND deleted=0 ";
                 $result = $db->query($query);
                 //only add if an action with that name and category don't exist
-                $row=$db->fetchByAssoc($result);
+                $row = $db->fetchByAssoc($result);
                 if ($row == null) {
                     $action->name = $action_name;
                     $action->category = $category;
@@ -100,7 +100,7 @@ 
                 }
             }
 
-        }else{
+        } else {
             sugar_die("FAILED TO ADD: $category - TYPE $type NOT DEFINED IN modules/ACLActions/actiondefs.php");
         }
 
@@ -113,22 +113,22 @@ 
     * @param STRING $category - the category (e.g module name - Accounts, Contacts)
     * @param STRING $type - the type (e.g. 'module', 'field')
     */
-    public static function removeActions($category, $type='module'){
+    public static function removeActions($category, $type = 'module') {
         global $ACLActions;
         $db = DBManagerFactory::getInstance();
-        if(isset($ACLActions[$type])){
-            foreach($ACLActions[$type]['actions'] as $action_name =>$action_def){
+        if (isset($ACLActions[$type])) {
+            foreach ($ACLActions[$type]['actions'] as $action_name =>$action_def) {
 
                 $action = new ACLAction();
-                $query = "SELECT * FROM " . $action->table_name . " WHERE name='$action_name' AND category = '$category' AND acltype='$type' and deleted=0";
+                $query = "SELECT * FROM ".$action->table_name." WHERE name='$action_name' AND category = '$category' AND acltype='$type' and deleted=0";
                 $result = $db->query($query);
                 //only add if an action with that name and category don't exist
-                $row=$db->fetchByAssoc($result);
+                $row = $db->fetchByAssoc($result);
                 if ($row != null) {
                     $action->mark_deleted($row['id']);
                 }
             }
-        }else{
+        } else {
             sugar_die("FAILED TO REMOVE: $category : $name - TYPE $type NOT DEFINED IN modules/ACLActions/actiondefs.php");
         }
     }
@@ -141,9 +141,9 @@ 
     * @param INT $access - the access level you want the color for
     * @return the color either name or hex representation or false if the level does not exist
     */
-    protected static function AccessColor($access){
+    protected static function AccessColor($access) {
         global $ACLActionAccessLevels;
-        if(isset($ACLActionAccessLevels[$access])){
+        if (isset($ACLActionAccessLevels[$access])) {
 
             return $ACLActionAccessLevels[$access]['color'];
         }
@@ -159,9 +159,9 @@ 
     * @param INT $access - the access level you want the color for
     * @return the translated access level name or false if the level does not exist
     */
-    static function AccessName($access){
+    static function AccessName($access) {
         global $ACLActionAccessLevels;
-        if(isset($ACLActionAccessLevels[$access])){
+        if (isset($ACLActionAccessLevels[$access])) {
             return translate($ACLActionAccessLevels[$access]['label'], 'ACLActions');
         }
         return false;
@@ -176,10 +176,10 @@ 
      * @param INT $access - the access level you want the color for
      * @return the access level label or false if the level does not exist
      */
-    protected static function AccessLabel($access){
+    protected static function AccessLabel($access) {
         global $ACLActionAccessLevels;
-        if(isset($ACLActionAccessLevels[$access])){
-            $label=preg_replace('/(LBL_ACCESS_)(.*)/', '$2', $ACLActionAccessLevels[$access]['label']);
+        if (isset($ACLActionAccessLevels[$access])) {
+            $label = preg_replace('/(LBL_ACCESS_)(.*)/', '$2', $ACLActionAccessLevels[$access]['label']);
             return strtolower($label);
 
         }
@@ -192,12 +192,12 @@ 
     * this is used for building select boxes
     * @return array containg access levels (ints) as keys and access names as values
     */
-    protected static function getAccessOptions( $action, $type='module'){
+    protected static function getAccessOptions($action, $type = 'module') {
         global $ACLActions;
         $options = array();
 
-        if(empty($ACLActions[$type]['actions'][$action]['aclaccess']))return $options;
-        foreach($ACLActions[$type]['actions'][$action]['aclaccess'] as $action){
+        if (empty($ACLActions[$type]['actions'][$action]['aclaccess']))return $options;
+        foreach ($ACLActions[$type]['actions'][$action]['aclaccess'] as $action) {
             $options[$action] = ACLAction::AccessName($action);
         }
         return $options;
@@ -210,12 +210,12 @@ 
     *
     *
     */
-    public static function getDefaultActions($type='module', $action=''){
+    public static function getDefaultActions($type = 'module', $action = '') {
         $query = "SELECT * FROM acl_actions WHERE deleted=0 ";
-        if(!empty($type)){
+        if (!empty($type)) {
             $query .= " AND acltype='$type'";
         }
-        if(!empty($action)){
+        if (!empty($action)) {
             $query .= "AND name='$action'";
         }
         $query .= " ORDER BY category";
@@ -223,7 +223,7 @@ 
         $db = DBManagerFactory::getInstance();
         $result = $db->query($query);
         $default_actions = array();
-        while($row = $db->fetchByAssoc($result) ){
+        while ($row = $db->fetchByAssoc($result)) {
             $acl = new ACLAction();
             $acl->populateFromRow($row);
             $default_actions[] = $acl;
@@ -242,19 +242,19 @@ 
     * @return ARRAY of ACLActionsArray
     */
 
-    static function getUserActions($user_id,$refresh=false, $category='',$type='', $action=''){
+    static function getUserActions($user_id, $refresh = false, $category = '', $type = '', $action = '') {
         //check in the session if we already have it loaded
-        if(!$refresh && !empty($_SESSION['ACL'][$user_id])){
-            if(empty($category) && empty($action)){
+        if (!$refresh && !empty($_SESSION['ACL'][$user_id])) {
+            if (empty($category) && empty($action)) {
                 return $_SESSION['ACL'][$user_id];
-            }else{
-                if(!empty($category) && isset($_SESSION['ACL'][$user_id][$category])){
-                    if(empty($action)){
-                        if(empty($type)){
+            } else {
+                if (!empty($category) && isset($_SESSION['ACL'][$user_id][$category])) {
+                    if (empty($action)) {
+                        if (empty($type)) {
                             return $_SESSION['ACL'][$user_id][$category];
                         }
                         return $_SESSION['ACL'][$user_id][$category][$type];
-                    }else if(!empty($type) && isset($_SESSION['ACL'][$user_id][$category][$type][$action])){
+                    } else if (!empty($type) && isset($_SESSION['ACL'][$user_id][$category][$type][$action])) {
                         return $_SESSION['ACL'][$user_id][$category][$type][$action];
                     }
                 }
@@ -263,13 +263,13 @@ 
         //if we don't have it loaded then lets check against the db
         $additional_where = '';
         $db = DBManagerFactory::getInstance();
-        if(!empty($category)){
+        if (!empty($category)) {
             $additional_where .= " AND acl_actions.category = '$category' ";
         }
-        if(!empty($action)){
+        if (!empty($action)) {
             $additional_where .= " AND acl_actions.name = '$action' ";
         }
-        if(!empty($type)){
+        if (!empty($type)) {
             $additional_where .= " AND acl_actions.acltype = '$type' ";
         }
 		/* BEGIN - SECURITY GROUPS */
@@ -310,38 +310,38 @@ 
 		$has_user_role = false; //used for user_role_precedence
 		$has_role = false; //used to determine if default actions can be ignored. If a user has a defined role don't use the defaults
 		/* END - SECURITY GROUPS */
-        while($row = $db->fetchByAssoc($result, FALSE) ){
+        while ($row = $db->fetchByAssoc($result, FALSE)) {
 			/* BEGIN - SECURITY GROUPS */
-			if($has_user_role == false && $row['user_role'] == 1) {
+			if ($has_user_role == false && $row['user_role'] == 1) {
 				$has_user_role = true;
 			}
-			if($has_role == false && ($row['user_role'] == 1 || $row['user_role'] ==0)) {
+			if ($has_role == false && ($row['user_role'] == 1 || $row['user_role'] == 0)) {
 				$has_role = true;
 			}
 			//if user roles should take precedence over group roles and we have a user role
 			//break when we get to processing the group roles
-			if($has_user_role == true && $row['user_role'] == 0
+			if ($has_user_role == true && $row['user_role'] == 0
 					&& isset($sugar_config['securitysuite_user_role_precedence'])
-					&& $sugar_config['securitysuite_user_role_precedence'] == true )
+					&& $sugar_config['securitysuite_user_role_precedence'] == true)
 			{
 				break;
 			}
-			if($row['user_role'] == -1 && $has_role == true) {
+			if ($row['user_role'] == -1 && $has_role == true) {
 				break; //no need for default actions when a role is assigned to the user or user's group already
 			}
 			/* END - SECURITY GROUPS */
             $acl = new ACLAction();
-            $isOverride  = false;
+            $isOverride = false;
             $acl->populateFromRow($row);
-            if(!empty($row['access_override'])){
+            if (!empty($row['access_override'])) {
                 $acl->aclaccess = $row['access_override'];
                 $isOverride = true;
             }
-            if(!isset($selected_actions[$acl->category])){
+            if (!isset($selected_actions[$acl->category])) {
                 $selected_actions[$acl->category] = array();
 
             }
-            if(!isset($selected_actions[$acl->category][$acl->acltype][$acl->name])
+            if (!isset($selected_actions[$acl->category][$acl->acltype][$acl->name])
 				|| (
 					/* BEGIN - SECURITY GROUPS - additive security*/
 					(
@@ -369,18 +369,18 @@ 
         }
 
         //only set the session variable if it was a full list;
-        if(empty($category) && empty($action)){
-            if(!isset($_SESSION['ACL'])){
+        if (empty($category) && empty($action)) {
+            if (!isset($_SESSION['ACL'])) {
                 $_SESSION['ACL'] = array();
             }
             $_SESSION['ACL'][$user_id] = $selected_actions;
-        }else{
-            if(empty($action) && !empty($category)){
-                if(!empty($type)){
-                    $_SESSION['ACL'][$user_id][$category][$type] = $selected_actions[$category][$type];}
+        } else {
+            if (empty($action) && !empty($category)) {
+                if (!empty($type)) {
+                    $_SESSION['ACL'][$user_id][$category][$type] = $selected_actions[$category][$type]; }
                 $_SESSION['ACL'][$user_id][$category] = $selected_actions[$category];
-            }else{
-                if(!empty($action) && !empty($category) && !empty($type)){
+            } else {
+                if (!empty($action) && !empty($category) && !empty($type)) {
                 $_SESSION['ACL'][$user_id][$category][$type][$action] = $selected_actions[$category][$action];
 
             }
@@ -416,7 +416,7 @@ 
 	/**
     static function hasAccess($is_owner=false, $access = 0){
 	*/
-	static function hasAccess($is_owner=false, $in_group=false, $access = 0, ACLAction $action = null){
+	static function hasAccess($is_owner = false, $in_group = false, $access = 0, ACLAction $action = null) {
 		/**
         if($access != 0 && $access == ACL_ALLOW_ALL || ($is_owner && $access == ACL_ALLOW_OWNER))return true;
        //if this exists, then this function is not static, so check the aclaccess parameter
@@ -425,14 +425,14 @@ 
             return true;
         }
 		*/
-		if($access != 0 && ($access == ACL_ALLOW_ALL
-			|| ($is_owner && ($access == ACL_ALLOW_OWNER || $access == ACL_ALLOW_GROUP) )  //if owner that's better than in group so count it...better way to clean this up?
+		if ($access != 0 && ($access == ACL_ALLOW_ALL
+			|| ($is_owner && ($access == ACL_ALLOW_OWNER || $access == ACL_ALLOW_GROUP))  //if owner that's better than in group so count it...better way to clean this up?
 			|| ($in_group && $access == ACL_ALLOW_GROUP) //need to pass if in group with access somehow
 		)) {
 			return true;
 		}
-        if(!is_null($action) && isset($action->aclaccess)){
-			if($action->aclaccess == ACL_ALLOW_ALL
+        if (!is_null($action) && isset($action->aclaccess)) {
+			if ($action->aclaccess == ACL_ALLOW_ALL
 				|| ($is_owner && $action->aclaccess == ($access == ACL_ALLOW_OWNER || $access == ACL_ALLOW_GROUP))
 				|| ($in_group && $access == ACL_ALLOW_GROUP) //need to pass if in group with access somehow
 			) {
@@ -454,15 +454,15 @@ 
 	 * @param STRING $type
 	 * @return boolean
 	 */
-	static function userNeedsSecurityGroup($user_id, $category, $action,$type='module'){
+	static function userNeedsSecurityGroup($user_id, $category, $action, $type = 'module') {
 		//check if we don't have it set in the cache if not lets reload the cache
 
-		if(empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
+		if (empty($_SESSION['ACL'][$user_id][$category][$type][$action])) {
 			ACLAction::getUserActions($user_id, false);
 
 		}
 
-		if(!empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
+		if (!empty($_SESSION['ACL'][$user_id][$category][$type][$action])) {
 			return $_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess'] == ACL_ALLOW_GROUP;
 		}
         return false;
@@ -488,19 +488,19 @@ 
 	/**
     public static function userHasAccess($user_id, $category, $action,$type='module', $is_owner = false){
 	*/
-	public static function userHasAccess($user_id, $category, $action,$type='module', $is_owner = false, $in_group = false){
+	public static function userHasAccess($user_id, $category, $action, $type = 'module', $is_owner = false, $in_group = false) {
        global $current_user;
-       if($current_user->isAdminForModule($category)&& !isset($_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess'])){
+       if ($current_user->isAdminForModule($category) && !isset($_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess'])) {
         return true;
         }
         //check if we don't have it set in the cache if not lets reload the cache
-        if(ACLAction::getUserAccessLevel($user_id, $category, 'access', $type) < ACL_ALLOW_ENABLED) return false;
-        if(empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
+        if (ACLAction::getUserAccessLevel($user_id, $category, 'access', $type) < ACL_ALLOW_ENABLED) return false;
+        if (empty($_SESSION['ACL'][$user_id][$category][$type][$action])) {
             ACLAction::getUserActions($user_id, false);
 
         }
 
-        if(!empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
+        if (!empty($_SESSION['ACL'][$user_id][$category][$type][$action])) {
 /**
             return ACLAction::hasAccess($is_owner, $_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess']);
 */
@@ -520,12 +520,12 @@ 
     * @param STRING $type
     * @return INT (ACCESS LEVEL)
     */
-    public static function getUserAccessLevel($user_id, $category, $action,$type='module'){
-        if(empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
+    public static function getUserAccessLevel($user_id, $category, $action, $type = 'module') {
+        if (empty($_SESSION['ACL'][$user_id][$category][$type][$action])) {
             ACLAction::getUserActions($user_id, false);
 
         }
-        if(!empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
+        if (!empty($_SESSION['ACL'][$user_id][$category][$type][$action])) {
             if (!empty($_SESSION['ACL'][$user_id][$category][$type]['admin']) && $_SESSION['ACL'][$user_id][$category][$type]['admin']['aclaccess'] >= ACL_ALLOW_ADMIN)
             {
                 // If you have admin access for a module, all ACL's are allowed
@@ -545,16 +545,16 @@ 
     * @param STRING $type
     * @return boolean
     */
-    public static function userNeedsOwnership($user_id, $category, $action,$type='module'){
+    public static function userNeedsOwnership($user_id, $category, $action, $type = 'module') {
         //check if we don't have it set in the cache if not lets reload the cache
 
-        if(empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
+        if (empty($_SESSION['ACL'][$user_id][$category][$type][$action])) {
             ACLAction::getUserActions($user_id, false);
 
         }
 
 
-        if(!empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
+        if (!empty($_SESSION['ACL'][$user_id][$category][$type][$action])) {
             return $_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess'] == ACL_ALLOW_OWNER;
         }
         return false;
@@ -567,18 +567,18 @@ 
     *
     * @param unknown_type $categories
     */
-    public static function setupCategoriesMatrix(&$categories){
+    public static function setupCategoriesMatrix(&$categories) {
         global $ACLActions, $current_user;
         $names = array();
         $disabled = array();
-        foreach($categories as $cat_name=>$category){
-            foreach($category as $type_name=>$type){
-                foreach($type as $act_name=>$action){
+        foreach ($categories as $cat_name=>$category) {
+            foreach ($category as $type_name=>$type) {
+                foreach ($type as $act_name=>$action) {
                     $names[$act_name] = translate($ACLActions[$type_name]['actions'][$act_name]['label'], 'ACLActions');
                     $categories[$cat_name][$type_name][$act_name]['accessColor'] = ACLAction::AccessColor($action['aclaccess']);
-                    if($type_name== 'module'){
+                    if ($type_name == 'module') {
 
-                        if($act_name != 'aclaccess' && $categories[$cat_name]['module']['access']['aclaccess'] == ACL_ALLOW_DISABLED){
+                        if ($act_name != 'aclaccess' && $categories[$cat_name]['module']['access']['aclaccess'] == ACL_ALLOW_DISABLED) {
                             $categories[$cat_name][$type_name][$act_name]['accessColor'] = 'darkgray';
                             $disabled[] = $cat_name;
                         }
@@ -587,19 +587,19 @@ 
                     $categories[$cat_name][$type_name][$act_name]['accessName'] = ACLAction::AccessName($action['aclaccess']);
                     $categories[$cat_name][$type_name][$act_name]['accessLabel'] = ACLAction::AccessLabel($action['aclaccess']);
 
-                    if($cat_name=='Users'&& $act_name=='admin'){
-                        $categories[$cat_name][$type_name][$act_name]['accessOptions'][ACL_ALLOW_DEFAULT]=ACLAction::AccessName(ACL_ALLOW_DEFAULT);;
-                        $categories[$cat_name][$type_name][$act_name]['accessOptions'][ACL_ALLOW_DEV]=ACLAction::AccessName(ACL_ALLOW_DEV);;
+                    if ($cat_name == 'Users' && $act_name == 'admin') {
+                        $categories[$cat_name][$type_name][$act_name]['accessOptions'][ACL_ALLOW_DEFAULT] = ACLAction::AccessName(ACL_ALLOW_DEFAULT); ;
+                        $categories[$cat_name][$type_name][$act_name]['accessOptions'][ACL_ALLOW_DEV] = ACLAction::AccessName(ACL_ALLOW_DEV); ;
                     }
-                    else{
-                    $categories[$cat_name][$type_name][$act_name]['accessOptions'] =  ACLAction::getAccessOptions($act_name, $type_name);
+                    else {
+                    $categories[$cat_name][$type_name][$act_name]['accessOptions'] = ACLAction::getAccessOptions($act_name, $type_name);
                     }
                 }
             }
         }
 
-        if(!is_admin($current_user)){
-            foreach($disabled as $cat_name){
+        if (!is_admin($current_user)) {
+            foreach ($disabled as $cat_name) {
                 unset($categories[$cat_name]);
             }
         }
@@ -614,10 +614,10 @@ 
     *
     * @return array of fields with id, name, access and category
     */
-    function toArray($dbOnly = false, $stringOnly = false, $upperKeys = false){
+    function toArray($dbOnly = false, $stringOnly = false, $upperKeys = false) {
         $array_fields = array('id', 'aclaccess');
         $arr = array();
-        foreach($array_fields as $field){
+        foreach ($array_fields as $field) {
             $arr[$field] = $this->$field;
         }
         return $arr;
@@ -629,8 +629,8 @@ 
     *
     * @param Array $arr
     */
-    function fromArray($arr){
-        foreach($arr as $name=>$value){
+    function fromArray($arr) {
+        foreach ($arr as $name=>$value) {
             $this->$name = $value;
         }
     }
@@ -640,7 +640,7 @@ 
     * clears the session variable storing the cache information for acls
     *
     */
-    function clearSessionCache(){
+    function clearSessionCache() {
         unset($_SESSION['ACL']);
     }
 

Braces +20 added lines, -15 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -62,8 +64,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();
@@ -100,7 +101,7 @@ 
                 }
             }
 
-        }else{
+        } else{
             sugar_die("FAILED TO ADD: $category - TYPE $type NOT DEFINED IN modules/ACLActions/actiondefs.php");
         }
 
@@ -128,7 +129,7 @@ 
                     $action->mark_deleted($row['id']);
                 }
             }
-        }else{
+        } else{
             sugar_die("FAILED TO REMOVE: $category : $name - TYPE $type NOT DEFINED IN modules/ACLActions/actiondefs.php");
         }
     }
@@ -196,7 +197,9 @@ 
         global $ACLActions;
         $options = array();
 
-        if(empty($ACLActions[$type]['actions'][$action]['aclaccess']))return $options;
+        if(empty($ACLActions[$type]['actions'][$action]['aclaccess'])) {
+            return $options;
+        }
         foreach($ACLActions[$type]['actions'][$action]['aclaccess'] as $action){
             $options[$action] = ACLAction::AccessName($action);
         }
@@ -247,14 +250,14 @@ 
         if(!$refresh && !empty($_SESSION['ACL'][$user_id])){
             if(empty($category) && empty($action)){
                 return $_SESSION['ACL'][$user_id];
-            }else{
+            } else{
                 if(!empty($category) && isset($_SESSION['ACL'][$user_id][$category])){
                     if(empty($action)){
                         if(empty($type)){
                             return $_SESSION['ACL'][$user_id][$category];
                         }
                         return $_SESSION['ACL'][$user_id][$category][$type];
-                    }else if(!empty($type) && isset($_SESSION['ACL'][$user_id][$category][$type][$action])){
+                    } else if(!empty($type) && isset($_SESSION['ACL'][$user_id][$category][$type][$action])){
                         return $_SESSION['ACL'][$user_id][$category][$type][$action];
                     }
                 }
@@ -374,12 +377,12 @@ 
                 $_SESSION['ACL'] = array();
             }
             $_SESSION['ACL'][$user_id] = $selected_actions;
-        }else{
+        } else{
             if(empty($action) && !empty($category)){
                 if(!empty($type)){
                     $_SESSION['ACL'][$user_id][$category][$type] = $selected_actions[$category][$type];}
                 $_SESSION['ACL'][$user_id][$category] = $selected_actions[$category];
-            }else{
+            } else{
                 if(!empty($action) && !empty($category) && !empty($type)){
                 $_SESSION['ACL'][$user_id][$category][$type][$action] = $selected_actions[$category][$action];
 
@@ -398,8 +401,9 @@ 
         // Fallback to array key if translation is empty
         $a = empty($app_list_strings['moduleList'][$a]) ? $a : $app_list_strings['moduleList'][$a];
         $b = empty($app_list_strings['moduleList'][$b]) ? $b : $app_list_strings['moduleList'][$b];
-        if ($a == $b)
-            return 0;
+        if ($a == $b) {
+                    return 0;
+        }
         return ($a < $b) ? -1 : 1;
     }
 
@@ -494,7 +498,9 @@ 
         return true;
         }
         //check if we don't have it set in the cache if not lets reload the cache
-        if(ACLAction::getUserAccessLevel($user_id, $category, 'access', $type) < ACL_ALLOW_ENABLED) return false;
+        if(ACLAction::getUserAccessLevel($user_id, $category, 'access', $type) < ACL_ALLOW_ENABLED) {
+            return false;
+        }
         if(empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
             ACLAction::getUserActions($user_id, false);
 
@@ -590,8 +596,7 @@ 
                     if($cat_name=='Users'&& $act_name=='admin'){
                         $categories[$cat_name][$type_name][$act_name]['accessOptions'][ACL_ALLOW_DEFAULT]=ACLAction::AccessName(ACL_ALLOW_DEFAULT);;
                         $categories[$cat_name][$type_name][$act_name]['accessOptions'][ACL_ALLOW_DEV]=ACLAction::AccessName(ACL_ALLOW_DEV);;
-                    }
-                    else{
+                    } else{
                     $categories[$cat_name][$type_name][$act_name]['accessOptions'] =  ACLAction::getAccessOptions($act_name, $type_name);
                     }
                 }

modules/Users/authentication/SugarAuthenticate/SugarAuthenticate.php

Indentation +275 added lines, -275 removed lines

@@ -48,18 +48,18 @@ 
  *
  */
 class SugarAuthenticate{
-	var $userAuthenticateClass = 'SugarAuthenticateUser';
-	var $authenticationDir = 'SugarAuthenticate';
-	/**
-	 * Constructs SugarAuthenticate
-	 * This will load the user authentication class
-	 *
-	 * @return SugarAuthenticate
-	 */
-	public function __construct()
-	{
-	    // check in custom dir first, in case someone want's to override an auth controller
-		if (file_exists('custom/modules/Users/authentication/'.$this->authenticationDir.'/' . $this->userAuthenticateClass . '.php')) {
+    var $userAuthenticateClass = 'SugarAuthenticateUser';
+    var $authenticationDir = 'SugarAuthenticate';
+    /**
+     * Constructs SugarAuthenticate
+     * This will load the user authentication class
+     *
+     * @return SugarAuthenticate
+     */
+    public function __construct()
+    {
+        // check in custom dir first, in case someone want's to override an auth controller
+        if (file_exists('custom/modules/Users/authentication/'.$this->authenticationDir.'/' . $this->userAuthenticateClass . '.php')) {
             require_once('custom/modules/Users/authentication/'.$this->authenticationDir.'/' . $this->userAuthenticateClass . '.php');
         }
         elseif (file_exists('modules/Users/authentication/'.$this->authenticationDir.'/' . $this->userAuthenticateClass . '.php')) {
@@ -67,282 +67,282 @@ 
         }
 
         $this->userAuthenticate = new $this->userAuthenticateClass();
-	}
-
-	/**
-	 * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
-	 */
-	public function SugarAuthenticate(){
-		$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-		if(isset($GLOBALS['log'])) {
-			$GLOBALS['log']->deprecated($deprecatedMessage);
-		}
-		else {
-			trigger_error($deprecatedMessage, E_USER_DEPRECATED);
-		}
-		self::__construct();
-	}
-
-	/**
-	 * Authenticates a user based on the username and password
-	 * returns true if the user was authenticated false otherwise
-	 * it also will load the user into current user if he was authenticated
-	 *
-	 * @param string $username
-	 * @param string $password
-	 * @return boolean
-	 */
-	function loginAuthenticate($username, $password, $fallback=false, $PARAMS = array ()){
-		global $mod_strings;
-		unset($_SESSION['login_error']);
-		$usr= new user();
-		$usr_id=$usr->retrieve_user_id($username);
-		$usr->retrieve($usr_id);
-		$_SESSION['login_error']='';
-		$_SESSION['waiting_error']='';
-		$_SESSION['hasExpiredPassword']='0';
-		if ($this->userAuthenticate->loadUserOnLogin($username, $password, $fallback, $PARAMS)) {
-			require_once('modules/Users/password_utils.php');
-			if(hasPasswordExpired($username)) {
-				$_SESSION['hasExpiredPassword'] = '1';
-			}
-			// now that user is authenticated, reset loginfailed
-			if ($usr->getPreference('loginfailed') != '' && $usr->getPreference('loginfailed') != 0) {
-				$usr->setPreference('loginfailed','0');
-				$usr->savePreferencesToDB();
-			}
-			return $this->postLoginAuthenticate();
-
-		}
-		else
-		{
-			//if(!empty($usr_id) && $res['lockoutexpiration'] > 0){
+    }
+
+    /**
+     * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
+     */
+    public function SugarAuthenticate(){
+        $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
+        if(isset($GLOBALS['log'])) {
+            $GLOBALS['log']->deprecated($deprecatedMessage);
+        }
+        else {
+            trigger_error($deprecatedMessage, E_USER_DEPRECATED);
+        }
+        self::__construct();
+    }
+
+    /**
+     * Authenticates a user based on the username and password
+     * returns true if the user was authenticated false otherwise
+     * it also will load the user into current user if he was authenticated
+     *
+     * @param string $username
+     * @param string $password
+     * @return boolean
+     */
+    function loginAuthenticate($username, $password, $fallback=false, $PARAMS = array ()){
+        global $mod_strings;
+        unset($_SESSION['login_error']);
+        $usr= new user();
+        $usr_id=$usr->retrieve_user_id($username);
+        $usr->retrieve($usr_id);
+        $_SESSION['login_error']='';
+        $_SESSION['waiting_error']='';
+        $_SESSION['hasExpiredPassword']='0';
+        if ($this->userAuthenticate->loadUserOnLogin($username, $password, $fallback, $PARAMS)) {
+            require_once('modules/Users/password_utils.php');
+            if(hasPasswordExpired($username)) {
+                $_SESSION['hasExpiredPassword'] = '1';
+            }
+            // now that user is authenticated, reset loginfailed
+            if ($usr->getPreference('loginfailed') != '' && $usr->getPreference('loginfailed') != 0) {
+                $usr->setPreference('loginfailed','0');
+                $usr->savePreferencesToDB();
+            }
+            return $this->postLoginAuthenticate();
+
+        }
+        else
+        {
+            //if(!empty($usr_id) && $res['lockoutexpiration'] > 0){
             if(!empty($usr_id)){
-				if (($logout=$usr->getPreference('loginfailed'))=='')
-	        		$usr->setPreference('loginfailed','1');
-	    		else
-	        		$usr->setPreference('loginfailed',$logout+1);
-	    		$usr->savePreferencesToDB();
-    		}
-		}
-		if(strtolower(get_class($this)) != 'sugarauthenticate'){
-			$sa = new SugarAuthenticate();
-			$error = (!empty($_SESSION['login_error']))?$_SESSION['login_error']:'';
-			if($sa->loginAuthenticate($username, $password, true, $PARAMS)){
-				return true;
-			}
-			$_SESSION['login_error'] = $error;
-		}
-
-
-		$_SESSION['login_user_name'] = $username;
-		$_SESSION['login_password'] = $password;
-		if(empty($_SESSION['login_error'])){
-			$_SESSION['login_error'] = translate('ERR_INVALID_PASSWORD', 'Users');
-		}
-
-		return false;
-
-	}
-
-	/**
-	 * Once a user is authenticated on login this function will be called. Populate the session with what is needed and log anything that needs to be logged
-	 *
-	 */
-	function postLoginAuthenticate(){
-
-		global $reset_language_on_default_user, $sugar_config;
-		
-		//just do a little house cleaning here
-		unset($_SESSION['login_password']);
-		unset($_SESSION['login_error']);
-		unset($_SESSION['login_user_name']);
-		unset($_SESSION['ACL']);
+                if (($logout=$usr->getPreference('loginfailed'))=='')
+                    $usr->setPreference('loginfailed','1');
+                else
+                    $usr->setPreference('loginfailed',$logout+1);
+                $usr->savePreferencesToDB();
+            }
+        }
+        if(strtolower(get_class($this)) != 'sugarauthenticate'){
+            $sa = new SugarAuthenticate();
+            $error = (!empty($_SESSION['login_error']))?$_SESSION['login_error']:'';
+            if($sa->loginAuthenticate($username, $password, true, $PARAMS)){
+                return true;
+            }
+            $_SESSION['login_error'] = $error;
+        }
 
-		//set the server unique key
-		if (isset ($sugar_config['unique_key']))$_SESSION['unique_key'] = $sugar_config['unique_key'];
 
-		//set user language
-		if (isset ($reset_language_on_default_user) && $reset_language_on_default_user && $GLOBALS['current_user']->user_name == $sugar_config['default_user_name']) {
-			$authenticated_user_language = $sugar_config['default_language'];
-		} else {
-			$authenticated_user_language = isset($_REQUEST['login_language']) ? $_REQUEST['login_language'] : (isset ($_REQUEST['ck_login_language_20']) ? $_REQUEST['ck_login_language_20'] : $sugar_config['default_language']);
-		}
+        $_SESSION['login_user_name'] = $username;
+        $_SESSION['login_password'] = $password;
+        if(empty($_SESSION['login_error'])){
+            $_SESSION['login_error'] = translate('ERR_INVALID_PASSWORD', 'Users');
+        }
 
-		$_SESSION['authenticated_user_language'] = $authenticated_user_language;
+        return false;
 
-		$GLOBALS['log']->debug("authenticated_user_language is $authenticated_user_language");
+    }
 
-		// Clear all uploaded import files for this user if it exists
+    /**
+     * Once a user is authenticated on login this function will be called. Populate the session with what is needed and log anything that needs to be logged
+     *
+     */
+    function postLoginAuthenticate(){
+
+        global $reset_language_on_default_user, $sugar_config;
+		
+        //just do a little house cleaning here
+        unset($_SESSION['login_password']);
+        unset($_SESSION['login_error']);
+        unset($_SESSION['login_user_name']);
+        unset($_SESSION['ACL']);
+
+        //set the server unique key
+        if (isset ($sugar_config['unique_key']))$_SESSION['unique_key'] = $sugar_config['unique_key'];
+
+        //set user language
+        if (isset ($reset_language_on_default_user) && $reset_language_on_default_user && $GLOBALS['current_user']->user_name == $sugar_config['default_user_name']) {
+            $authenticated_user_language = $sugar_config['default_language'];
+        } else {
+            $authenticated_user_language = isset($_REQUEST['login_language']) ? $_REQUEST['login_language'] : (isset ($_REQUEST['ck_login_language_20']) ? $_REQUEST['ck_login_language_20'] : $sugar_config['default_language']);
+        }
+
+        $_SESSION['authenticated_user_language'] = $authenticated_user_language;
+
+        $GLOBALS['log']->debug("authenticated_user_language is $authenticated_user_language");
+
+        // Clear all uploaded import files for this user if it exists
         require_once('modules/Import/ImportCacheFiles.php');
         $tmp_file_name = ImportCacheFiles::getImportDir()."/IMPORT_" . $GLOBALS['current_user']->id;
 
-		if (file_exists($tmp_file_name)) {
-			unlink($tmp_file_name);
-		}
-
-		return true;
-	}
-
-	/**
-	 * On every page hit this will be called to ensure a user is authenticated
-	 * @return boolean
-	 */
-	function sessionAuthenticate(){
-
-		global $module, $action, $allowed_actions;
-		$authenticated = false;
-		$allowed_actions = array ("Authenticate", "Login"); // these are actions where the user/server keys aren't compared
-		if (isset ($_SESSION['authenticated_user_id'])) {
-
-			$GLOBALS['log']->debug("We have an authenticated user id: ".$_SESSION["authenticated_user_id"]);
-
-			$authenticated = $this->postSessionAuthenticate();
-
-		} else
-		if (isset ($action) && isset ($module) && $action == "Authenticate" && $module == "Users") {
-			$GLOBALS['log']->debug("We are authenticating user now");
-		} else {
-			$GLOBALS['log']->debug("The current user does not have a session.  Going to the login page");
-			$action = "Login";
-			$module = "Users";
-			$_REQUEST['action'] = $action;
-			$_REQUEST['module'] = $module;
-		}
-		if (empty ($GLOBALS['current_user']->id) && !in_array($action, $allowed_actions)) {
-
-			$GLOBALS['log']->debug("The current user is not logged in going to login page");
-			$action = "Login";
-			$module = "Users";
-			$_REQUEST['action'] = $action;
-			$_REQUEST['module'] = $module;
-
-		}
-
-		if($authenticated && ((empty($_REQUEST['module']) || empty($_REQUEST['action'])) || ($_REQUEST['module'] != 'Users' || $_REQUEST['action'] != 'Logout'))){
-			$this->validateIP();
-		}
-		return $authenticated;
-	}
-
-
-
-
-	/**
-	 * Called after a session is authenticated - if this returns false the sessionAuthenticate will return false and destroy the session
-	 * and it will load the  current user
-	 * @return boolean
-	 */
-
-	function postSessionAuthenticate(){
-
-		global $action, $allowed_actions, $sugar_config;
-		$_SESSION['userTime']['last'] = time();
-		$user_unique_key = (isset ($_SESSION['unique_key'])) ? $_SESSION['unique_key'] : '';
-		$server_unique_key = (isset ($sugar_config['unique_key'])) ? $sugar_config['unique_key'] : '';
-
-		//CHECK IF USER IS CROSSING SITES
-		if (($user_unique_key != $server_unique_key) && (!in_array($action, $allowed_actions)) && (!isset ($_SESSION['login_error']))) {
-
-			$GLOBALS['log']->debug('Destroying Session User has crossed Sites');
-		    session_destroy();
-			header("Location: index.php?action=Login&module=Users".$GLOBALS['app']->getLoginRedirect());
-			sugar_cleanup(true);
-		}
-		if (!$this->userAuthenticate->loadUserOnSession($_SESSION['authenticated_user_id'])) {
-			session_destroy();
-			header("Location: index.php?action=Login&module=Users&loginErrorMessage=LBL_SESSION_EXPIRED");
-			$GLOBALS['log']->debug('Current user session does not exist redirecting to login');
-			sugar_cleanup(true);
-		}
-		$GLOBALS['log']->debug('Current user is: '.$GLOBALS['current_user']->user_name);
-		return true;
-	}
-
-	/**
-	 * Make sure a user isn't stealing sessions so check the ip to ensure that the ip address hasn't dramatically changed
-	 *
-	 */
-	function validateIP() {
-		global $sugar_config;
-		// grab client ip address
-		$clientIP = query_client_ip();
-		$classCheck = 0;
-		// check to see if config entry is present, if not, verify client ip
-		if (!isset ($sugar_config['verify_client_ip']) || $sugar_config['verify_client_ip'] == true) {
-			// check to see if we've got a current ip address in $_SESSION
-			// and check to see if the session has been hijacked by a foreign ip
-			if (isset ($_SESSION["ipaddress"])) {
-				$session_parts = explode(".", $_SESSION["ipaddress"]);
-				$client_parts = explode(".", $clientIP);
+        if (file_exists($tmp_file_name)) {
+            unlink($tmp_file_name);
+        }
+
+        return true;
+    }
+
+    /**
+     * On every page hit this will be called to ensure a user is authenticated
+     * @return boolean
+     */
+    function sessionAuthenticate(){
+
+        global $module, $action, $allowed_actions;
+        $authenticated = false;
+        $allowed_actions = array ("Authenticate", "Login"); // these are actions where the user/server keys aren't compared
+        if (isset ($_SESSION['authenticated_user_id'])) {
+
+            $GLOBALS['log']->debug("We have an authenticated user id: ".$_SESSION["authenticated_user_id"]);
+
+            $authenticated = $this->postSessionAuthenticate();
+
+        } else
+        if (isset ($action) && isset ($module) && $action == "Authenticate" && $module == "Users") {
+            $GLOBALS['log']->debug("We are authenticating user now");
+        } else {
+            $GLOBALS['log']->debug("The current user does not have a session.  Going to the login page");
+            $action = "Login";
+            $module = "Users";
+            $_REQUEST['action'] = $action;
+            $_REQUEST['module'] = $module;
+        }
+        if (empty ($GLOBALS['current_user']->id) && !in_array($action, $allowed_actions)) {
+
+            $GLOBALS['log']->debug("The current user is not logged in going to login page");
+            $action = "Login";
+            $module = "Users";
+            $_REQUEST['action'] = $action;
+            $_REQUEST['module'] = $module;
+
+        }
+
+        if($authenticated && ((empty($_REQUEST['module']) || empty($_REQUEST['action'])) || ($_REQUEST['module'] != 'Users' || $_REQUEST['action'] != 'Logout'))){
+            $this->validateIP();
+        }
+        return $authenticated;
+    }
+
+
+
+
+    /**
+     * Called after a session is authenticated - if this returns false the sessionAuthenticate will return false and destroy the session
+     * and it will load the  current user
+     * @return boolean
+     */
+
+    function postSessionAuthenticate(){
+
+        global $action, $allowed_actions, $sugar_config;
+        $_SESSION['userTime']['last'] = time();
+        $user_unique_key = (isset ($_SESSION['unique_key'])) ? $_SESSION['unique_key'] : '';
+        $server_unique_key = (isset ($sugar_config['unique_key'])) ? $sugar_config['unique_key'] : '';
+
+        //CHECK IF USER IS CROSSING SITES
+        if (($user_unique_key != $server_unique_key) && (!in_array($action, $allowed_actions)) && (!isset ($_SESSION['login_error']))) {
+
+            $GLOBALS['log']->debug('Destroying Session User has crossed Sites');
+            session_destroy();
+            header("Location: index.php?action=Login&module=Users".$GLOBALS['app']->getLoginRedirect());
+            sugar_cleanup(true);
+        }
+        if (!$this->userAuthenticate->loadUserOnSession($_SESSION['authenticated_user_id'])) {
+            session_destroy();
+            header("Location: index.php?action=Login&module=Users&loginErrorMessage=LBL_SESSION_EXPIRED");
+            $GLOBALS['log']->debug('Current user session does not exist redirecting to login');
+            sugar_cleanup(true);
+        }
+        $GLOBALS['log']->debug('Current user is: '.$GLOBALS['current_user']->user_name);
+        return true;
+    }
+
+    /**
+     * Make sure a user isn't stealing sessions so check the ip to ensure that the ip address hasn't dramatically changed
+     *
+     */
+    function validateIP() {
+        global $sugar_config;
+        // grab client ip address
+        $clientIP = query_client_ip();
+        $classCheck = 0;
+        // check to see if config entry is present, if not, verify client ip
+        if (!isset ($sugar_config['verify_client_ip']) || $sugar_config['verify_client_ip'] == true) {
+            // check to see if we've got a current ip address in $_SESSION
+            // and check to see if the session has been hijacked by a foreign ip
+            if (isset ($_SESSION["ipaddress"])) {
+                $session_parts = explode(".", $_SESSION["ipaddress"]);
+                $client_parts = explode(".", $clientIP);
                 if(count($session_parts) < 4) {
                     $classCheck = 0;
                 }
                 else {
-    				// match class C IP addresses
-    				for ($i = 0; $i < 3; $i ++) {
-    					if ($session_parts[$i] == $client_parts[$i]) {
-    						$classCheck = 1;
-    						continue;
-    					} else {
-    						$classCheck = 0;
-    						break;
-    					}
-    				}
+                    // match class C IP addresses
+                    for ($i = 0; $i < 3; $i ++) {
+                        if ($session_parts[$i] == $client_parts[$i]) {
+                            $classCheck = 1;
+                            continue;
+                        } else {
+                            $classCheck = 0;
+                            break;
+                        }
+                    }
+                }
+                // we have a different IP address
+                if ($_SESSION["ipaddress"] != $clientIP && empty ($classCheck)) {
+                    $GLOBALS['log']->fatal("IP Address mismatch: SESSION IP: {$_SESSION['ipaddress']} CLIENT IP: {$clientIP}");
+                    session_destroy();
+                    die("Your session was terminated due to a significant change in your IP address.  <a href=\"{$sugar_config['site_url']}\">Return to Home</a>");
                 }
-				// we have a different IP address
-				if ($_SESSION["ipaddress"] != $clientIP && empty ($classCheck)) {
-					$GLOBALS['log']->fatal("IP Address mismatch: SESSION IP: {$_SESSION['ipaddress']} CLIENT IP: {$clientIP}");
-					session_destroy();
-					die("Your session was terminated due to a significant change in your IP address.  <a href=\"{$sugar_config['site_url']}\">Return to Home</a>");
-				}
-			} else {
-				$_SESSION["ipaddress"] = $clientIP;
-			}
-		}
-
-	}
-
-
-
-
-	/**
-	 * Called when a user requests to logout
-	 *
-	 */
-	function logout(){
-			session_start();
-			session_destroy();
-			ob_clean();
-			header('Location: index.php?module=Users&action=Login');
-			sugar_cleanup(true);
-	}
-
-
-	/**
-	 * Encodes a users password. This is a static function and can be called at any time.
-	 *
-	 * @param STRING $password
-	 * @return STRING $encoded_password
-	 */
-	static function encodePassword($password){
-		return strtolower(md5($password));
-	}
-
-	/**
-	 * If a user may change there password through the Sugar UI
-	 *
-	 */
-	function canChangePassword(){
-		return true;
-	}
-	/**
-	 * If a user may change there user name through the Sugar UI
-	 *
-	 */
-	function canChangeUserName(){
-		return true;
-	}
+            } else {
+                $_SESSION["ipaddress"] = $clientIP;
+            }
+        }
+
+    }
+
+
+
+
+    /**
+     * Called when a user requests to logout
+     *
+     */
+    function logout(){
+            session_start();
+            session_destroy();
+            ob_clean();
+            header('Location: index.php?module=Users&action=Login');
+            sugar_cleanup(true);
+    }
+
+
+    /**
+     * Encodes a users password. This is a static function and can be called at any time.
+     *
+     * @param STRING $password
+     * @return STRING $encoded_password
+     */
+    static function encodePassword($password){
+        return strtolower(md5($password));
+    }
+
+    /**
+     * If a user may change there password through the Sugar UI
+     *
+     */
+    function canChangePassword(){
+        return true;
+    }
+    /**
+     * If a user may change there user name through the Sugar UI
+     *
+     */
+    function canChangeUserName(){
+        return true;
+    }
 
 
     /**
@@ -370,6 +370,6 @@ 
     public function redirectToLogin(SugarApplication $app)
     {
         $loginVars = $app->createLoginVars();
-		SugarApplication::redirect('index.php?action=Login&module=Users' . $loginVars);
+        SugarApplication::redirect('index.php?action=Login&module=Users' . $loginVars);
     }
 }

Spacing +37 added lines, -37 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -47,7 +47,7 @@ 
  * based on the users validation
  *
  */
-class SugarAuthenticate{
+class SugarAuthenticate {
 	var $userAuthenticateClass = 'SugarAuthenticateUser';
 	var $authenticationDir = 'SugarAuthenticate';
 	/**
@@ -59,11 +59,11 @@ 
 	public function __construct()
 	{
 	    // check in custom dir first, in case someone want's to override an auth controller
-		if (file_exists('custom/modules/Users/authentication/'.$this->authenticationDir.'/' . $this->userAuthenticateClass . '.php')) {
-            require_once('custom/modules/Users/authentication/'.$this->authenticationDir.'/' . $this->userAuthenticateClass . '.php');
+		if (file_exists('custom/modules/Users/authentication/'.$this->authenticationDir.'/'.$this->userAuthenticateClass.'.php')) {
+            require_once('custom/modules/Users/authentication/'.$this->authenticationDir.'/'.$this->userAuthenticateClass.'.php');
         }
-        elseif (file_exists('modules/Users/authentication/'.$this->authenticationDir.'/' . $this->userAuthenticateClass . '.php')) {
-            require_once('modules/Users/authentication/'.$this->authenticationDir.'/' . $this->userAuthenticateClass . '.php');
+        elseif (file_exists('modules/Users/authentication/'.$this->authenticationDir.'/'.$this->userAuthenticateClass.'.php')) {
+            require_once('modules/Users/authentication/'.$this->authenticationDir.'/'.$this->userAuthenticateClass.'.php');
         }
 
         $this->userAuthenticate = new $this->userAuthenticateClass();
@@ -72,9 +72,9 @@ 
 	/**
 	 * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
 	 */
-	public function SugarAuthenticate(){
+	public function SugarAuthenticate() {
 		$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-		if(isset($GLOBALS['log'])) {
+		if (isset($GLOBALS['log'])) {
 			$GLOBALS['log']->deprecated($deprecatedMessage);
 		}
 		else {
@@ -92,23 +92,23 @@ 
 	 * @param string $password
 	 * @return boolean
 	 */
-	function loginAuthenticate($username, $password, $fallback=false, $PARAMS = array ()){
+	function loginAuthenticate($username, $password, $fallback = false, $PARAMS = array()) {
 		global $mod_strings;
 		unset($_SESSION['login_error']);
-		$usr= new user();
-		$usr_id=$usr->retrieve_user_id($username);
+		$usr = new user();
+		$usr_id = $usr->retrieve_user_id($username);
 		$usr->retrieve($usr_id);
-		$_SESSION['login_error']='';
-		$_SESSION['waiting_error']='';
-		$_SESSION['hasExpiredPassword']='0';
+		$_SESSION['login_error'] = '';
+		$_SESSION['waiting_error'] = '';
+		$_SESSION['hasExpiredPassword'] = '0';
 		if ($this->userAuthenticate->loadUserOnLogin($username, $password, $fallback, $PARAMS)) {
 			require_once('modules/Users/password_utils.php');
-			if(hasPasswordExpired($username)) {
+			if (hasPasswordExpired($username)) {
 				$_SESSION['hasExpiredPassword'] = '1';
 			}
 			// now that user is authenticated, reset loginfailed
 			if ($usr->getPreference('loginfailed') != '' && $usr->getPreference('loginfailed') != 0) {
-				$usr->setPreference('loginfailed','0');
+				$usr->setPreference('loginfailed', '0');
 				$usr->savePreferencesToDB();
 			}
 			return $this->postLoginAuthenticate();
@@ -117,18 +117,18 @@ 
 		else
 		{
 			//if(!empty($usr_id) && $res['lockoutexpiration'] > 0){
-            if(!empty($usr_id)){
-				if (($logout=$usr->getPreference('loginfailed'))=='')
-	        		$usr->setPreference('loginfailed','1');
+            if (!empty($usr_id)) {
+				if (($logout = $usr->getPreference('loginfailed')) == '')
+	        		$usr->setPreference('loginfailed', '1');
 	    		else
-	        		$usr->setPreference('loginfailed',$logout+1);
+	        		$usr->setPreference('loginfailed', $logout + 1);
 	    		$usr->savePreferencesToDB();
     		}
 		}
-		if(strtolower(get_class($this)) != 'sugarauthenticate'){
+		if (strtolower(get_class($this)) != 'sugarauthenticate') {
 			$sa = new SugarAuthenticate();
-			$error = (!empty($_SESSION['login_error']))?$_SESSION['login_error']:'';
-			if($sa->loginAuthenticate($username, $password, true, $PARAMS)){
+			$error = (!empty($_SESSION['login_error'])) ? $_SESSION['login_error'] : '';
+			if ($sa->loginAuthenticate($username, $password, true, $PARAMS)) {
 				return true;
 			}
 			$_SESSION['login_error'] = $error;
@@ -137,7 +137,7 @@ 
 
 		$_SESSION['login_user_name'] = $username;
 		$_SESSION['login_password'] = $password;
-		if(empty($_SESSION['login_error'])){
+		if (empty($_SESSION['login_error'])) {
 			$_SESSION['login_error'] = translate('ERR_INVALID_PASSWORD', 'Users');
 		}
 
@@ -149,7 +149,7 @@ 
 	 * Once a user is authenticated on login this function will be called. Populate the session with what is needed and log anything that needs to be logged
 	 *
 	 */
-	function postLoginAuthenticate(){
+	function postLoginAuthenticate() {
 
 		global $reset_language_on_default_user, $sugar_config;
 		
@@ -175,7 +175,7 @@ 
 
 		// Clear all uploaded import files for this user if it exists
         require_once('modules/Import/ImportCacheFiles.php');
-        $tmp_file_name = ImportCacheFiles::getImportDir()."/IMPORT_" . $GLOBALS['current_user']->id;
+        $tmp_file_name = ImportCacheFiles::getImportDir()."/IMPORT_".$GLOBALS['current_user']->id;
 
 		if (file_exists($tmp_file_name)) {
 			unlink($tmp_file_name);
@@ -188,11 +188,11 @@ 
 	 * On every page hit this will be called to ensure a user is authenticated
 	 * @return boolean
 	 */
-	function sessionAuthenticate(){
+	function sessionAuthenticate() {
 
 		global $module, $action, $allowed_actions;
 		$authenticated = false;
-		$allowed_actions = array ("Authenticate", "Login"); // these are actions where the user/server keys aren't compared
+		$allowed_actions = array("Authenticate", "Login"); // these are actions where the user/server keys aren't compared
 		if (isset ($_SESSION['authenticated_user_id'])) {
 
 			$GLOBALS['log']->debug("We have an authenticated user id: ".$_SESSION["authenticated_user_id"]);
@@ -219,7 +219,7 @@ 
 
 		}
 
-		if($authenticated && ((empty($_REQUEST['module']) || empty($_REQUEST['action'])) || ($_REQUEST['module'] != 'Users' || $_REQUEST['action'] != 'Logout'))){
+		if ($authenticated && ((empty($_REQUEST['module']) || empty($_REQUEST['action'])) || ($_REQUEST['module'] != 'Users' || $_REQUEST['action'] != 'Logout'))) {
 			$this->validateIP();
 		}
 		return $authenticated;
@@ -234,7 +234,7 @@ 
 	 * @return boolean
 	 */
 
-	function postSessionAuthenticate(){
+	function postSessionAuthenticate() {
 
 		global $action, $allowed_actions, $sugar_config;
 		$_SESSION['userTime']['last'] = time();
@@ -275,12 +275,12 @@ 
 			if (isset ($_SESSION["ipaddress"])) {
 				$session_parts = explode(".", $_SESSION["ipaddress"]);
 				$client_parts = explode(".", $clientIP);
-                if(count($session_parts) < 4) {
+                if (count($session_parts) < 4) {
                     $classCheck = 0;
                 }
                 else {
     				// match class C IP addresses
-    				for ($i = 0; $i < 3; $i ++) {
+    				for ($i = 0; $i < 3; $i++) {
     					if ($session_parts[$i] == $client_parts[$i]) {
     						$classCheck = 1;
     						continue;
@@ -310,7 +310,7 @@ 
 	 * Called when a user requests to logout
 	 *
 	 */
-	function logout(){
+	function logout() {
 			session_start();
 			session_destroy();
 			ob_clean();
@@ -325,7 +325,7 @@ 
 	 * @param STRING $password
 	 * @return STRING $encoded_password
 	 */
-	static function encodePassword($password){
+	static function encodePassword($password) {
 		return strtolower(md5($password));
 	}
 
@@ -333,14 +333,14 @@ 
 	 * If a user may change there password through the Sugar UI
 	 *
 	 */
-	function canChangePassword(){
+	function canChangePassword() {
 		return true;
 	}
 	/**
 	 * If a user may change there user name through the Sugar UI
 	 *
 	 */
-	function canChangeUserName(){
+	function canChangeUserName() {
 		return true;
 	}
 
@@ -370,6 +370,6 @@ 
     public function redirectToLogin(SugarApplication $app)
     {
         $loginVars = $app->createLoginVars();
-		SugarApplication::redirect('index.php?action=Login&module=Users' . $loginVars);
+		SugarApplication::redirect('index.php?action=Login&module=Users'.$loginVars);
     }
 }

Braces +15 added lines, -14 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -61,8 +63,7 @@ 
 	    // check in custom dir first, in case someone want's to override an auth controller
 		if (file_exists('custom/modules/Users/authentication/'.$this->authenticationDir.'/' . $this->userAuthenticateClass . '.php')) {
             require_once('custom/modules/Users/authentication/'.$this->authenticationDir.'/' . $this->userAuthenticateClass . '.php');
-        }
-        elseif (file_exists('modules/Users/authentication/'.$this->authenticationDir.'/' . $this->userAuthenticateClass . '.php')) {
+        } elseif (file_exists('modules/Users/authentication/'.$this->authenticationDir.'/' . $this->userAuthenticateClass . '.php')) {
             require_once('modules/Users/authentication/'.$this->authenticationDir.'/' . $this->userAuthenticateClass . '.php');
         }
 
@@ -76,8 +77,7 @@ 
 		$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
 		if(isset($GLOBALS['log'])) {
 			$GLOBALS['log']->deprecated($deprecatedMessage);
-		}
-		else {
+		} else {
 			trigger_error($deprecatedMessage, E_USER_DEPRECATED);
 		}
 		self::__construct();
@@ -113,15 +113,15 @@ 
 			}
 			return $this->postLoginAuthenticate();
 
-		}
-		else
+		} else
 		{
 			//if(!empty($usr_id) && $res['lockoutexpiration'] > 0){
             if(!empty($usr_id)){
-				if (($logout=$usr->getPreference('loginfailed'))=='')
-	        		$usr->setPreference('loginfailed','1');
-	    		else
-	        		$usr->setPreference('loginfailed',$logout+1);
+				if (($logout=$usr->getPreference('loginfailed'))=='') {
+					        		$usr->setPreference('loginfailed','1');
+				} else {
+	    			        		$usr->setPreference('loginfailed',$logout+1);
+	    		}
 	    		$usr->savePreferencesToDB();
     		}
 		}
@@ -160,7 +160,9 @@ 
 		unset($_SESSION['ACL']);
 
 		//set the server unique key
-		if (isset ($sugar_config['unique_key']))$_SESSION['unique_key'] = $sugar_config['unique_key'];
+		if (isset ($sugar_config['unique_key'])) {
+		    $_SESSION['unique_key'] = $sugar_config['unique_key'];
+		}
 
 		//set user language
 		if (isset ($reset_language_on_default_user) && $reset_language_on_default_user && $GLOBALS['current_user']->user_name == $sugar_config['default_user_name']) {
@@ -277,8 +279,7 @@ 
 				$client_parts = explode(".", $clientIP);
                 if(count($session_parts) < 4) {
                     $classCheck = 0;
-                }
-                else {
+                } else {
     				// match class C IP addresses
     				for ($i = 0; $i < 3; $i ++) {
     					if ($session_parts[$i] == $client_parts[$i]) {

modules/Documents/Document.php

Indentation +175 added lines, -175 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if(!defined('sugarEntry') || !sugarEntry)
-	die('Not A Valid Entry Point');
+    die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -45,63 +45,63 @@ 
 // User is used to store Forecast information.
 class Document extends File {
 
-	var $id;
-	var $document_name;
-	var $description;
-	var $category_id;
-	var $subcategory_id;
-	var $status_id;
-	var $status;
-	var $created_by;
-	var $date_entered;
-	var $date_modified;
-	var $modified_user_id;
+    var $id;
+    var $document_name;
+    var $description;
+    var $category_id;
+    var $subcategory_id;
+    var $status_id;
+    var $status;
+    var $created_by;
+    var $date_entered;
+    var $date_modified;
+    var $modified_user_id;
     var $assigned_user_id;
-	var $active_date;
-	var $exp_date;
-	var $document_revision_id;
-	var $filename;
-	var $doc_type;
-
-	var $img_name;
-	var $img_name_bare;
-	var $related_doc_id;
-	var $related_doc_name;
-	var $related_doc_rev_id;
-	var $related_doc_rev_number;
-	var $is_template;
-	var $template_type;
-
-	//additional fields.
-	var $revision;
-	var $last_rev_create_date;
-	var $last_rev_created_by;
-	var $last_rev_created_name;
-	var $file_url;
-	var $file_url_noimage;
-
-	var $table_name = "documents";
-	var $object_name = "Document";
-	var $user_preferences;
-
-	var $encodeFields = Array ();
-
-	// This is used to retrieve related fields from form posts.
-	var $additional_column_fields = Array ('revision');
-
-	var $new_schema = true;
-	var $module_dir = 'Documents';
-
-	var $relationship_fields = Array(
-		'contract_id'=>'contracts',
-	 );
-
-
-	function __construct() {
-		parent::__construct();
-		$this->setupCustomFields('Documents'); //parameter is module name
-		$this->disable_row_level_security = false;
-	}
+    var $active_date;
+    var $exp_date;
+    var $document_revision_id;
+    var $filename;
+    var $doc_type;
+
+    var $img_name;
+    var $img_name_bare;
+    var $related_doc_id;
+    var $related_doc_name;
+    var $related_doc_rev_id;
+    var $related_doc_rev_number;
+    var $is_template;
+    var $template_type;
+
+    //additional fields.
+    var $revision;
+    var $last_rev_create_date;
+    var $last_rev_created_by;
+    var $last_rev_created_name;
+    var $file_url;
+    var $file_url_noimage;
+
+    var $table_name = "documents";
+    var $object_name = "Document";
+    var $user_preferences;
+
+    var $encodeFields = Array ();
+
+    // This is used to retrieve related fields from form posts.
+    var $additional_column_fields = Array ('revision');
+
+    var $new_schema = true;
+    var $module_dir = 'Documents';
+
+    var $relationship_fields = Array(
+        'contract_id'=>'contracts',
+        );
+
+
+    function __construct() {
+        parent::__construct();
+        $this->setupCustomFields('Documents'); //parameter is module name
+        $this->disable_row_level_security = false;
+    }
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
@@ -118,13 +118,13 @@ 
     }
 
 
-	function save($check_notify = false) {
+    function save($check_notify = false) {
 
         if (empty($this->doc_type)) {
-			$this->doc_type = 'Sugar';
-		}
+            $this->doc_type = 'Sugar';
+        }
         if (empty($this->id) || $this->new_with_id)
-		{
+        {
             if (empty($this->id)) {
                 $this->id = create_guid();
                 $this->new_with_id = true;
@@ -150,12 +150,12 @@ 
 
             if(isset($this->file_ext))
             {
-            	$Revision->file_ext = $this->file_ext;
+                $Revision->file_ext = $this->file_ext;
             }
 
             if(isset($this->file_mime_type))
             {
-            	$Revision->file_mime_type = $this->file_mime_type;
+                $Revision->file_mime_type = $this->file_mime_type;
             }
 
             $Revision->doc_type = $this->doc_type;
@@ -211,29 +211,29 @@ 
             }
         }
 
-		return parent :: save($check_notify);
-	}
-	function get_summary_text() {
-		return "$this->document_name";
-	}
+        return parent :: save($check_notify);
+    }
+    function get_summary_text() {
+        return "$this->document_name";
+    }
 
-	function is_authenticated() {
-		return $this->authenticated;
-	}
+    function is_authenticated() {
+        return $this->authenticated;
+    }
 
-	function fill_in_additional_list_fields() {
-		$this->fill_in_additional_detail_fields();
-	}
+    function fill_in_additional_list_fields() {
+        $this->fill_in_additional_detail_fields();
+    }
 
-	function fill_in_additional_detail_fields() {
-		global $theme;
-		global $current_language;
-		global $timedate;
-		global $locale;
+    function fill_in_additional_detail_fields() {
+        global $theme;
+        global $current_language;
+        global $timedate;
+        global $locale;
 
-		parent::fill_in_additional_detail_fields();
+        parent::fill_in_additional_detail_fields();
 
-		$mod_strings = return_module_language($current_language, 'Documents');
+        $mod_strings = return_module_language($current_language, 'Documents');
 
         if (!empty($this->document_revision_id)) {
 
@@ -249,7 +249,7 @@ 
             //populate name
             if(isset($this->document_name))
             {
-            	$this->name = $this->document_name;
+                $this->name = $this->document_name;
             }
 
             if(isset($row['filename']))$this->filename = $row['filename'];
@@ -266,93 +266,93 @@ 
             }
         }
 
-		//set default file name.
-		if (!empty ($img_name) && file_exists($img_name)) {
-			$img_name = $img_name_bare;
-		} else {
-			$img_name = "def_image_inline"; //todo change the default image.
-		}
-		if($this->ACLAccess('DetailView')) {
-			if(!empty($this->doc_type) && $this->doc_type != 'Sugar' && !empty($this->doc_url)) {
+        //set default file name.
+        if (!empty ($img_name) && file_exists($img_name)) {
+            $img_name = $img_name_bare;
+        } else {
+            $img_name = "def_image_inline"; //todo change the default image.
+        }
+        if($this->ACLAccess('DetailView')) {
+            if(!empty($this->doc_type) && $this->doc_type != 'Sugar' && !empty($this->doc_url)) {
                 $file_url= "<a href='".$this->doc_url."' target='_blank'>".SugarThemeRegistry::current()->getImage($this->doc_type.'_image_inline', 'border="0"',null,null,'.png',$mod_strings['LBL_LIST_VIEW_DOCUMENT'])."</a>";
-			} else {
-			    $file_url = "<a href='index.php?entryPoint=download&id={$this->document_revision_id}&type=Documents' target='_blank'>".SugarThemeRegistry::current()->getImage($img_name, 'border="0"', null,null,'.gif',$mod_strings['LBL_LIST_VIEW_DOCUMENT'])."</a>";
-			}
+            } else {
+                $file_url = "<a href='index.php?entryPoint=download&id={$this->document_revision_id}&type=Documents' target='_blank'>".SugarThemeRegistry::current()->getImage($img_name, 'border="0"', null,null,'.gif',$mod_strings['LBL_LIST_VIEW_DOCUMENT'])."</a>";
+            }
 
-    		$this->file_url = $file_url;
-    		$this->file_url_noimage = "index.php?entryPoint=download&type=Documents&id={$this->document_revision_id}";
-		}else{
+            $this->file_url = $file_url;
+            $this->file_url_noimage = "index.php?entryPoint=download&type=Documents&id={$this->document_revision_id}";
+        }else{
             $this->file_url = "";
             $this->file_url_noimage = "";
-		}
+        }
 
-		//get last_rev_by user name.
-		if (!empty ($row)) {
-			$this->last_rev_created_name = $locale->getLocaleFormattedName($row['first_name'], $row['last_name']);
+        //get last_rev_by user name.
+        if (!empty ($row)) {
+            $this->last_rev_created_name = $locale->getLocaleFormattedName($row['first_name'], $row['last_name']);
 
-			$this->last_rev_create_date = $timedate->to_display_date_time($this->db->fromConvert($row['rev_date'], 'datetime'));
-			$this->last_rev_mime_type = $row['file_mime_type'];
-		}
+            $this->last_rev_create_date = $timedate->to_display_date_time($this->db->fromConvert($row['rev_date'], 'datetime'));
+            $this->last_rev_mime_type = $row['file_mime_type'];
+        }
 
-		global $app_list_strings;
-	    if(!empty($this->status_id)) {
-	       //_pp($this->status_id);
-	       $this->status = $app_list_strings['document_status_dom'][$this->status_id];
-	    }
+        global $app_list_strings;
+        if(!empty($this->status_id)) {
+            //_pp($this->status_id);
+            $this->status = $app_list_strings['document_status_dom'][$this->status_id];
+        }
         if (!empty($this->related_doc_id)) {
             $this->related_doc_name = Document::get_document_name($this->related_doc_id);
             $this->related_doc_rev_number = DocumentRevision::get_document_revision_name($this->related_doc_rev_id);
         }
-	}
+    }
 
-	function list_view_parse_additional_sections(&$list_form/*, $xTemplateSection*/) {
-		return $list_form;
-	}
+    function list_view_parse_additional_sections(&$list_form/*, $xTemplateSection*/) {
+        return $list_form;
+    }
 
     function create_export_query($order_by, $where, $relate_link_join='')
     {
         $custom_join = $this->getCustomJoin(true, true, $where);
         $custom_join['join'] .= $relate_link_join;
-		$query = "SELECT
+        $query = "SELECT
 						documents.*";
         $query .=  $custom_join['select'];
-		$query .= " FROM documents ";
+        $query .= " FROM documents ";
         $query .=  $custom_join['join'];
 
-		$where_auto = " documents.deleted = 0";
+        $where_auto = " documents.deleted = 0";
 
-		if ($where != "")
-			$query .= " WHERE $where AND ".$where_auto;
-		else
-			$query .= " WHERE ".$where_auto;
+        if ($where != "")
+            $query .= " WHERE $where AND ".$where_auto;
+        else
+            $query .= " WHERE ".$where_auto;
 
-		if ($order_by != "")
-			$query .= " ORDER BY $order_by";
-		else
-			$query .= " ORDER BY documents.document_name";
+        if ($order_by != "")
+            $query .= " ORDER BY $order_by";
+        else
+            $query .= " ORDER BY documents.document_name";
 
-		return $query;
-	}
+        return $query;
+    }
 
-	function get_list_view_data() {
-		global $current_language;
-		$app_list_strings = return_app_list_strings_language($current_language);
+    function get_list_view_data() {
+        global $current_language;
+        $app_list_strings = return_app_list_strings_language($current_language);
 
-		$document_fields = $this->get_list_view_array();
+        $document_fields = $this->get_list_view_array();
 
         $this->fill_in_additional_list_fields();
 
 
-		$document_fields['FILENAME'] = $this->filename;
-		$document_fields['FILE_URL'] = $this->file_url;
-		$document_fields['FILE_URL_NOIMAGE'] = $this->file_url_noimage;
-		$document_fields['LAST_REV_CREATED_BY'] = $this->last_rev_created_name;
-		$document_fields['CATEGORY_ID'] = empty ($this->category_id) ? "" : $app_list_strings['document_category_dom'][$this->category_id];
-		$document_fields['SUBCATEGORY_ID'] = empty ($this->subcategory_id) ? "" : $app_list_strings['document_subcategory_dom'][$this->subcategory_id];
+        $document_fields['FILENAME'] = $this->filename;
+        $document_fields['FILE_URL'] = $this->file_url;
+        $document_fields['FILE_URL_NOIMAGE'] = $this->file_url_noimage;
+        $document_fields['LAST_REV_CREATED_BY'] = $this->last_rev_created_name;
+        $document_fields['CATEGORY_ID'] = empty ($this->category_id) ? "" : $app_list_strings['document_category_dom'][$this->category_id];
+        $document_fields['SUBCATEGORY_ID'] = empty ($this->subcategory_id) ? "" : $app_list_strings['document_subcategory_dom'][$this->subcategory_id];
         $document_fields['NAME'] = $this->document_name;
-		$document_fields['DOCUMENT_NAME_JAVASCRIPT'] = $GLOBALS['db']->quote($document_fields['DOCUMENT_NAME']);
-		return $document_fields;
-	}
+        $document_fields['DOCUMENT_NAME_JAVASCRIPT'] = $GLOBALS['db']->quote($document_fields['DOCUMENT_NAME']);
+        return $document_fields;
+    }
 
 
     /**
@@ -363,45 +363,45 @@ 
      *
      * @param $id String The record id of the Document instance
      */
-	function mark_relationships_deleted($id)
+    function mark_relationships_deleted($id)
     {
         $this->load_relationships('revisions');
-       	$revisions= $this->get_linked_beans('revisions','DocumentRevision');
-
-       	if (!empty($revisions) && is_array($revisions)) {
-       		foreach($revisions as $key=>$version) {
-       			UploadFile::unlink_file($version->id,$version->filename);
-       			//mark the version deleted.
-       			$version->mark_deleted($version->id);
-       		}
-       	}
-
-	}
-
-
-	function bean_implements($interface) {
-		switch ($interface) {
-			case 'ACL' :
-				return true;
-		}
-		return false;
-	}
-
-	//static function.
-	function get_document_name($doc_id){
-		if (empty($doc_id)) return null;
-
-		$db = DBManagerFactory::getInstance();
-		$query="select document_name from documents where id='$doc_id'  and deleted=0";
-		$result=$db->query($query);
-		if (!empty($result)) {
-			$row=$db->fetchByAssoc($result);
-			if (!empty($row)) {
-				return $row['document_name'];
-			}
-		}
-		return null;
-	}
+            $revisions= $this->get_linked_beans('revisions','DocumentRevision');
+
+            if (!empty($revisions) && is_array($revisions)) {
+                foreach($revisions as $key=>$version) {
+                    UploadFile::unlink_file($version->id,$version->filename);
+                    //mark the version deleted.
+                    $version->mark_deleted($version->id);
+                }
+            }
+
+    }
+
+
+    function bean_implements($interface) {
+        switch ($interface) {
+            case 'ACL' :
+                return true;
+        }
+        return false;
+    }
+
+    //static function.
+    function get_document_name($doc_id){
+        if (empty($doc_id)) return null;
+
+        $db = DBManagerFactory::getInstance();
+        $query="select document_name from documents where id='$doc_id'  and deleted=0";
+        $result=$db->query($query);
+        if (!empty($result)) {
+            $row=$db->fetchByAssoc($result);
+            if (!empty($row)) {
+                return $row['document_name'];
+            }
+        }
+        return null;
+    }
 }
 
 require_once('modules/Documents/DocumentExternalApiDropDown.php');

Spacing +37 added lines, -37 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry)
+if (!defined('sugarEntry') || !sugarEntry)
 	die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
@@ -84,10 +84,10 @@ 
 	var $object_name = "Document";
 	var $user_preferences;
 
-	var $encodeFields = Array ();
+	var $encodeFields = Array();
 
 	// This is used to retrieve related fields from form posts.
-	var $additional_column_fields = Array ('revision');
+	var $additional_column_fields = Array('revision');
 
 	var $new_schema = true;
 	var $module_dir = 'Documents';
@@ -106,9 +106,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function Document(){
+    function Document() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -130,7 +130,7 @@ 
                 $this->new_with_id = true;
             }
 
-            if ( isset($_REQUEST) && isset($_REQUEST['duplicateSave']) && $_REQUEST['duplicateSave'] == true && isset($_REQUEST['filename_old_doctype']) ) {
+            if (isset($_REQUEST) && isset($_REQUEST['duplicateSave']) && $_REQUEST['duplicateSave'] == true && isset($_REQUEST['filename_old_doctype'])) {
                 $this->doc_type = $_REQUEST['filename_old_doctype'];
                 $isDuplicate = true;
             } else {
@@ -143,26 +143,26 @@ 
             $Revision->not_use_rel_in_req = true;
             $Revision->new_rel_id = $this->id;
             $Revision->new_rel_relname = 'Documents';
-            $Revision->change_log = translate('DEF_CREATE_LOG','Documents');
+            $Revision->change_log = translate('DEF_CREATE_LOG', 'Documents');
             $Revision->revision = $this->revision;
             $Revision->document_id = $this->id;
             $Revision->filename = $this->filename;
 
-            if(isset($this->file_ext))
+            if (isset($this->file_ext))
             {
             	$Revision->file_ext = $this->file_ext;
             }
 
-            if(isset($this->file_mime_type))
+            if (isset($this->file_mime_type))
             {
             	$Revision->file_mime_type = $this->file_mime_type;
             }
 
             $Revision->doc_type = $this->doc_type;
-            if ( isset($this->doc_id) ) {
+            if (isset($this->doc_id)) {
                 $Revision->doc_id = $this->doc_id;
             }
-            if ( isset($this->doc_url) ) {
+            if (isset($this->doc_url)) {
                 $Revision->doc_url = $this->doc_url;
             }
 
@@ -174,7 +174,7 @@ 
             if (!empty($_FILES['filename_file'])) {
                 rename("upload://{$this->id}", "upload://{$Revision->id}");
                 $createRevision = true;
-            } else if ( $isDuplicate && ( empty($this->doc_type) || $this->doc_type == 'Sugar' ) ) {
+            } else if ($isDuplicate && (empty($this->doc_type) || $this->doc_type == 'Sugar')) {
                 // Looks like we need to duplicate a file, this is tricky
                 $oldDocument = new Document();
                 $oldDocument->retrieve($_REQUEST['duplicateId']);
@@ -186,27 +186,27 @@ 
             }
 
             // For external documents, we just need to make sure we have a doc_id
-            if ( !empty($this->doc_id) && $this->doc_type != 'Sugar' ) {
+            if (!empty($this->doc_id) && $this->doc_type != 'Sugar') {
                 $createRevision = true;
             }
 
-            if ( $createRevision ) {
+            if ($createRevision) {
                 $Revision->save();
                 //update document with latest revision id
-                $this->process_save_dates=false; //make sure that conversion does not happen again.
+                $this->process_save_dates = false; //make sure that conversion does not happen again.
                 $this->document_revision_id = $Revision->id;
             }
 
 
             //set relationship field values if contract_id is passed (via subpanel create)
             if (!empty($_POST['contract_id'])) {
-                $save_revision['document_revision_id']=$this->document_revision_id;
+                $save_revision['document_revision_id'] = $this->document_revision_id;
                 $this->load_relationship('contracts');
-                $this->contracts->add($_POST['contract_id'],$save_revision);
+                $this->contracts->add($_POST['contract_id'], $save_revision);
             }
 
             if ((isset($_POST['load_signed_id']) and !empty($_POST['load_signed_id']))) {
-                $query="update linked_documents set deleted=1 where id='".$_POST['load_signed_id']."'";
+                $query = "update linked_documents set deleted=1 where id='".$_POST['load_signed_id']."'";
                 $this->db->query($query);
             }
         }
@@ -247,14 +247,14 @@ 
             $row = $this->db->fetchByAssoc($result);
 
             //populate name
-            if(isset($this->document_name))
+            if (isset($this->document_name))
             {
             	$this->name = $this->document_name;
             }
 
-            if(isset($row['filename']))$this->filename = $row['filename'];
+            if (isset($row['filename']))$this->filename = $row['filename'];
             //$this->latest_revision = $row['revision'];
-            if(isset($row['revision']))$this->revision = $row['revision'];
+            if (isset($row['revision']))$this->revision = $row['revision'];
 
             //image is selected based on the extension name <ext>_icon_inline, extension is stored in document_revisions.
             //if file is not found then default image file will be used.
@@ -272,16 +272,16 @@ 
 		} else {
 			$img_name = "def_image_inline"; //todo change the default image.
 		}
-		if($this->ACLAccess('DetailView')) {
-			if(!empty($this->doc_type) && $this->doc_type != 'Sugar' && !empty($this->doc_url)) {
-                $file_url= "<a href='".$this->doc_url."' target='_blank'>".SugarThemeRegistry::current()->getImage($this->doc_type.'_image_inline', 'border="0"',null,null,'.png',$mod_strings['LBL_LIST_VIEW_DOCUMENT'])."</a>";
+		if ($this->ACLAccess('DetailView')) {
+			if (!empty($this->doc_type) && $this->doc_type != 'Sugar' && !empty($this->doc_url)) {
+                $file_url = "<a href='".$this->doc_url."' target='_blank'>".SugarThemeRegistry::current()->getImage($this->doc_type.'_image_inline', 'border="0"', null, null, '.png', $mod_strings['LBL_LIST_VIEW_DOCUMENT'])."</a>";
 			} else {
-			    $file_url = "<a href='index.php?entryPoint=download&id={$this->document_revision_id}&type=Documents' target='_blank'>".SugarThemeRegistry::current()->getImage($img_name, 'border="0"', null,null,'.gif',$mod_strings['LBL_LIST_VIEW_DOCUMENT'])."</a>";
+			    $file_url = "<a href='index.php?entryPoint=download&id={$this->document_revision_id}&type=Documents' target='_blank'>".SugarThemeRegistry::current()->getImage($img_name, 'border="0"', null, null, '.gif', $mod_strings['LBL_LIST_VIEW_DOCUMENT'])."</a>";
 			}
 
     		$this->file_url = $file_url;
     		$this->file_url_noimage = "index.php?entryPoint=download&type=Documents&id={$this->document_revision_id}";
-		}else{
+		} else {
             $this->file_url = "";
             $this->file_url_noimage = "";
 		}
@@ -295,7 +295,7 @@ 
 		}
 
 		global $app_list_strings;
-	    if(!empty($this->status_id)) {
+	    if (!empty($this->status_id)) {
 	       //_pp($this->status_id);
 	       $this->status = $app_list_strings['document_status_dom'][$this->status_id];
 	    }
@@ -309,15 +309,15 @@ 
 		return $list_form;
 	}
 
-    function create_export_query($order_by, $where, $relate_link_join='')
+    function create_export_query($order_by, $where, $relate_link_join = '')
     {
         $custom_join = $this->getCustomJoin(true, true, $where);
         $custom_join['join'] .= $relate_link_join;
 		$query = "SELECT
 						documents.*";
-        $query .=  $custom_join['select'];
+        $query .= $custom_join['select'];
 		$query .= " FROM documents ";
-        $query .=  $custom_join['join'];
+        $query .= $custom_join['join'];
 
 		$where_auto = " documents.deleted = 0";
 
@@ -366,11 +366,11 @@ 
 	function mark_relationships_deleted($id)
     {
         $this->load_relationships('revisions');
-       	$revisions= $this->get_linked_beans('revisions','DocumentRevision');
+       	$revisions = $this->get_linked_beans('revisions', 'DocumentRevision');
 
        	if (!empty($revisions) && is_array($revisions)) {
-       		foreach($revisions as $key=>$version) {
-       			UploadFile::unlink_file($version->id,$version->filename);
+       		foreach ($revisions as $key=>$version) {
+       			UploadFile::unlink_file($version->id, $version->filename);
        			//mark the version deleted.
        			$version->mark_deleted($version->id);
        		}
@@ -388,14 +388,14 @@ 
 	}
 
 	//static function.
-	function get_document_name($doc_id){
+	function get_document_name($doc_id) {
 		if (empty($doc_id)) return null;
 
 		$db = DBManagerFactory::getInstance();
-		$query="select document_name from documents where id='$doc_id'  and deleted=0";
-		$result=$db->query($query);
+		$query = "select document_name from documents where id='$doc_id'  and deleted=0";
+		$result = $db->query($query);
 		if (!empty($result)) {
-			$row=$db->fetchByAssoc($result);
+			$row = $db->fetchByAssoc($result);
 			if (!empty($row)) {
 				return $row['document_name'];
 			}

Braces +23 added lines, -15 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry)
+if(!defined('sugarEntry') || !sugarEntry) {
 	die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -110,8 +111,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();
@@ -252,9 +252,13 @@ 
             	$this->name = $this->document_name;
             }
 
-            if(isset($row['filename']))$this->filename = $row['filename'];
+            if(isset($row['filename'])) {
+                $this->filename = $row['filename'];
+            }
             //$this->latest_revision = $row['revision'];
-            if(isset($row['revision']))$this->revision = $row['revision'];
+            if(isset($row['revision'])) {
+                $this->revision = $row['revision'];
+            }
 
             //image is selected based on the extension name <ext>_icon_inline, extension is stored in document_revisions.
             //if file is not found then default image file will be used.
@@ -281,7 +285,7 @@ 
 
     		$this->file_url = $file_url;
     		$this->file_url_noimage = "index.php?entryPoint=download&type=Documents&id={$this->document_revision_id}";
-		}else{
+		} else{
             $this->file_url = "";
             $this->file_url_noimage = "";
 		}
@@ -321,15 +325,17 @@ 
 
 		$where_auto = " documents.deleted = 0";
 
-		if ($where != "")
-			$query .= " WHERE $where AND ".$where_auto;
-		else
-			$query .= " WHERE ".$where_auto;
+		if ($where != "") {
+					$query .= " WHERE $where AND ".$where_auto;
+		} else {
+					$query .= " WHERE ".$where_auto;
+		}
 
-		if ($order_by != "")
-			$query .= " ORDER BY $order_by";
-		else
-			$query .= " ORDER BY documents.document_name";
+		if ($order_by != "") {
+					$query .= " ORDER BY $order_by";
+		} else {
+					$query .= " ORDER BY documents.document_name";
+		}
 
 		return $query;
 	}
@@ -389,7 +395,9 @@ 
 
 	//static function.
 	function get_document_name($doc_id){
-		if (empty($doc_id)) return null;
+		if (empty($doc_id)) {
+		    return null;
+		}
 
 		$db = DBManagerFactory::getInstance();
 		$query="select document_name from documents where id='$doc_id'  and deleted=0";

modules/AM_TaskTemplates/AM_TaskTemplates_sugar.php

Spacing +6 added lines, -6 removed lines

@@ -47,7 +47,7 @@ 
 	var $object_name = 'AM_TaskTemplates';
 	var $table_name = 'am_tasktemplates';
 	var $importable = false;
-	var $disable_row_level_security = true ; // to ensure that modules created and deployed under CE will continue to function under team security if the instance is upgraded to PRO
+	var $disable_row_level_security = true; // to ensure that modules created and deployed under CE will continue to function under team security if the instance is upgraded to PRO
 		var $id;
 		var $name;
 		var $date_entered;
@@ -75,16 +75,16 @@ 
 		var $utilization;
 		var $duration;
 
-    function __construct(){
+    function __construct() {
         parent::__construct();
     }
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function AM_TaskTemplates_sugar(){
+    function AM_TaskTemplates_sugar() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -94,8 +94,8 @@ 
     }
 
 
-	function bean_implements($interface){
-		switch($interface){
+	function bean_implements($interface) {
+		switch ($interface) {
 			case 'ACL': return true;
 		}
 		return false;

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,7 @@
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct($seed, $module, $subPanel, $options);

modules/AM_TaskTemplates/AM_TaskTemplates.php

Indentation +3 added lines, -3 removed lines

@@ -40,9 +40,9 @@
 require_once('modules/AM_TaskTemplates/AM_TaskTemplates_sugar.php');
 class AM_TaskTemplates extends AM_TaskTemplates_sugar {
 
-	public function __construct(){
-		parent::__construct();
-	}
+    public function __construct(){
+        parent::__construct();
+    }
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead

Spacing +3 added lines, -3 removed lines

@@ -40,16 +40,16 @@
 require_once('modules/AM_TaskTemplates/AM_TaskTemplates_sugar.php');
 class AM_TaskTemplates extends AM_TaskTemplates_sugar {
 
-	public function __construct(){
+	public function __construct() {
 		parent::__construct();
 	}
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    public function AM_TaskTemplates(){
+    public function AM_TaskTemplates() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,7 @@
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct($seed, $module, $subPanel, $options);

modules/UpgradeWizard/upgradeMetaHelper.php

Indentation +318 added lines, -318 removed lines

@@ -41,185 +41,185 @@ 
 
 class UpgradeMetaHelper{
 
-	var $upgrade_dir;
-	var $debug_mode;
-	var $upgrade_modules;
-	var $customized_modules;
-	var $source_dir;
-	var $dest_dir ;
-	var $evparser;
-	var $dvparser;
-	var $path_to_master_copy;
-	/**
-	 * UpgradeMetaHelper
-	 * This is the constructor for the UpgradeMetaHelper class
-	 * @param $dir The root upgrade directory (where to copy working files)
-	 * @param $masterCopyDirectory The root master directory (where SugarCRM 5.x files reside)
-	 * @param $debugMode Debug mode, default is false
-	 *
-	 */
-	function __construct($dir='upgrade', $masterCopyDirecotry='modules_50', $debugMode = false) {
-		$this->upgrade_dir = $dir;
-		$this->debug_mode = $debugMode;
-		$this->upgrade_modules = $this->getModifiedModules();
-
-		if(count($this->upgrade_modules) > 0) {
-			$_SESSION['Upgraded_Modules'] = $this->upgrade_modules;
-			$this->create_upgrade_directory();
-			$this->path_to_master_copy = $masterCopyDirecotry;
-		    $this->runParser();
-		}
-
-		$this->customized_modules = $this->getAllCustomizedModulesBeyondStudio();
-		if(count($this->customized_modules) > 0) {
-			$_SESSION['Customized_Modules'] = $this->customized_modules;
-		}
-	}
-
-	/**
-	 * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
-	 */
-	function UpgradeMetaHelper($dir='upgrade', $masterCopyDirecotry='modules_50', $debugMode = false){
-		$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-		if(isset($GLOBALS['log'])) {
-			$GLOBALS['log']->deprecated($deprecatedMessage);
-		}
-		else {
-			trigger_error($deprecatedMessage, E_USER_DEPRECATED);
-		}
-		self::__construct($dir, $masterCopyDirecotry, $debugMode);
-	}
-
-	/**
-	 * getModifiedModules
-	 * This method returns a two-dimensional Array of Studio enabled
-	 * modules that have been modified.  The second Array index is an
-	 * Array of files that do not match the md5 checksum for the module
-	 * @return $return_array Two-dimensional Array of [module][modified file(s) Array]
-	 */
-		function getModifiedModules() {
-
-		$md5_string = array();
-		if(file_exists(clean_path(getcwd().'/files.md5'))){
-			require(clean_path(getcwd().'/files.md5'));
-		}
-
-	    $return_array = array();
-	    $modules = $this->loadStudioModules();
-	    foreach($modules as $mod) {
-
-	    	   $editView = "modules/$mod/EditView.html";
-	    	   $detailView = "modules/$mod/DetailView.html";
-	    	   $searchForm = "modules/$mod/SearchForm.html";
-               if(file_exists($editView) && isset($md5_string['./' . $editView])) {
-               	  $fileContents = file_get_contents($editView);
-               	  if(md5($fileContents) != $md5_string['./' . $editView]) {
-               	  	 $return_array[$mod][] = $editView;
-               	  }
-               }
-
-               if(file_exists($detailView) && isset($md5_string['./' . $detailView])) {
-               	  $fileContents = file_get_contents($detailView);
-               	  if(md5($fileContents) != $md5_string['./' . $detailView]) {
-               	  	 $return_array[$mod][] = $detailView;
-               	  }
-               }
-
-               if(file_exists($searchForm) && isset($md5_string['./' . $searchForm])) {
-               	  $fileContents = file_get_contents($searchForm);
-               	  if(md5($fileContents) != $md5_string['./' . $searchForm]) {
-               	  	 $return_array[$mod][] = $searchForm;
-               	  }
-               }
-
-	    } //foreach
-
-		return $return_array;
-	}
+    var $upgrade_dir;
+    var $debug_mode;
+    var $upgrade_modules;
+    var $customized_modules;
+    var $source_dir;
+    var $dest_dir ;
+    var $evparser;
+    var $dvparser;
+    var $path_to_master_copy;
+    /**
+     * UpgradeMetaHelper
+     * This is the constructor for the UpgradeMetaHelper class
+     * @param $dir The root upgrade directory (where to copy working files)
+     * @param $masterCopyDirectory The root master directory (where SugarCRM 5.x files reside)
+     * @param $debugMode Debug mode, default is false
+     *
+     */
+    function __construct($dir='upgrade', $masterCopyDirecotry='modules_50', $debugMode = false) {
+        $this->upgrade_dir = $dir;
+        $this->debug_mode = $debugMode;
+        $this->upgrade_modules = $this->getModifiedModules();
+
+        if(count($this->upgrade_modules) > 0) {
+            $_SESSION['Upgraded_Modules'] = $this->upgrade_modules;
+            $this->create_upgrade_directory();
+            $this->path_to_master_copy = $masterCopyDirecotry;
+            $this->runParser();
+        }
+
+        $this->customized_modules = $this->getAllCustomizedModulesBeyondStudio();
+        if(count($this->customized_modules) > 0) {
+            $_SESSION['Customized_Modules'] = $this->customized_modules;
+        }
+    }
+
+    /**
+     * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
+     */
+    function UpgradeMetaHelper($dir='upgrade', $masterCopyDirecotry='modules_50', $debugMode = false){
+        $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
+        if(isset($GLOBALS['log'])) {
+            $GLOBALS['log']->deprecated($deprecatedMessage);
+        }
+        else {
+            trigger_error($deprecatedMessage, E_USER_DEPRECATED);
+        }
+        self::__construct($dir, $masterCopyDirecotry, $debugMode);
+    }
+
+    /**
+     * getModifiedModules
+     * This method returns a two-dimensional Array of Studio enabled
+     * modules that have been modified.  The second Array index is an
+     * Array of files that do not match the md5 checksum for the module
+     * @return $return_array Two-dimensional Array of [module][modified file(s) Array]
+     */
+        function getModifiedModules() {
+
+        $md5_string = array();
+        if(file_exists(clean_path(getcwd().'/files.md5'))){
+            require(clean_path(getcwd().'/files.md5'));
+        }
+
+        $return_array = array();
+        $modules = $this->loadStudioModules();
+        foreach($modules as $mod) {
+
+                $editView = "modules/$mod/EditView.html";
+                $detailView = "modules/$mod/DetailView.html";
+                $searchForm = "modules/$mod/SearchForm.html";
+                if(file_exists($editView) && isset($md5_string['./' . $editView])) {
+                        $fileContents = file_get_contents($editView);
+                        if(md5($fileContents) != $md5_string['./' . $editView]) {
+                            $return_array[$mod][] = $editView;
+                        }
+                }
+
+                if(file_exists($detailView) && isset($md5_string['./' . $detailView])) {
+                        $fileContents = file_get_contents($detailView);
+                        if(md5($fileContents) != $md5_string['./' . $detailView]) {
+                            $return_array[$mod][] = $detailView;
+                        }
+                }
+
+                if(file_exists($searchForm) && isset($md5_string['./' . $searchForm])) {
+                        $fileContents = file_get_contents($searchForm);
+                        if(md5($fileContents) != $md5_string['./' . $searchForm]) {
+                            $return_array[$mod][] = $searchForm;
+                        }
+                }
+
+        } //foreach
+
+        return $return_array;
+    }
 
 function saveMatchingFilesQueries($currStep,$value){
-	$upgrade_progress_dir = sugar_cached('upgrades/temp');
-	if(!is_dir($upgrade_progress_dir)){
-		mkdir($upgrade_progress_dir);
-	}
-	$file_queries_file = $upgrade_progress_dir.'/files_queries.php';
-	if(file_exists($file_queries_file)){
-		include($file_queries_file);
-	}
-	else{
-		if(function_exists('sugar_fopen')){
-			sugar_fopen($file_queries_file, 'w+');
-		}
-		else{
-			fopen($file_queries_file, 'w+');
-		}
-	}
-	if(!isset($files_queries) || $files_queries == NULL){
-		$files_queries = array();
-	}
-	$files_queries[$currStep]=$value;
-	if(is_writable($file_queries_file) && write_array_to_file( "file_queries", $file_queries,
-		$file_queries_file)) {
-	       //writing to the file
-	}
+    $upgrade_progress_dir = sugar_cached('upgrades/temp');
+    if(!is_dir($upgrade_progress_dir)){
+        mkdir($upgrade_progress_dir);
+    }
+    $file_queries_file = $upgrade_progress_dir.'/files_queries.php';
+    if(file_exists($file_queries_file)){
+        include($file_queries_file);
+    }
+    else{
+        if(function_exists('sugar_fopen')){
+            sugar_fopen($file_queries_file, 'w+');
+        }
+        else{
+            fopen($file_queries_file, 'w+');
+        }
+    }
+    if(!isset($files_queries) || $files_queries == NULL){
+        $files_queries = array();
+    }
+    $files_queries[$currStep]=$value;
+    if(is_writable($file_queries_file) && write_array_to_file( "file_queries", $file_queries,
+        $file_queries_file)) {
+            //writing to the file
+    }
 }
 
 function getAllCustomizedModulesBeyondStudio() {
 
-	require_once('modules/UpgradeWizard/uw_utils.php');
-	$md5_string = array();
-	if(file_exists(clean_path(getcwd().'/files.md5'))){
-		require(clean_path(getcwd().'/files.md5'));
-	}
+    require_once('modules/UpgradeWizard/uw_utils.php');
+    $md5_string = array();
+    if(file_exists(clean_path(getcwd().'/files.md5'))){
+        require(clean_path(getcwd().'/files.md5'));
+    }
     $return_array = array();
     $modules = $this->loadStudioModules();
     $modulesAll = getAllModules(); //keep all modules as well
     $allOtherModules = array_diff($modulesAll,$modules);
     foreach($modules as $mod) {
-	  if(!is_dir('modules/'.$mod)) continue;
-	  $editView = "modules/$mod/EditView.html";
-	  $detailView ="modules/$mod/DetailView.html";
-	  $exclude_files[]=$editView;
-	  $exclude_files[]=$detailView;
-	  $allModFiles = array();
-	  $allModFiles = findAllFiles('modules/'.$mod,$allModFiles);
-	   foreach($allModFiles as $file){
-	       //$file_md5_ref = str_replace(clean_path(getcwd()),'',$file);
-		  if(file_exists($file) && !in_array($file,$exclude_files)){
-			if(isset($md5_string['./'.$file])) {
-		       	  $fileContents = file_get_contents($file);
-		       	  if(md5($fileContents) != $md5_string['./'.$file]) {
-		       	  	$return_array[$mod][] = $file;
-		       	  }
-		       	  else{
-		       	  	//keep in the array to be deleted later
-		       	  	$_SESSION['removeMd5MatchingFiles'][] = $file;
-		               	  }
-		           }
-		      }
-		  }
+        if(!is_dir('modules/'.$mod)) continue;
+        $editView = "modules/$mod/EditView.html";
+        $detailView ="modules/$mod/DetailView.html";
+        $exclude_files[]=$editView;
+        $exclude_files[]=$detailView;
+        $allModFiles = array();
+        $allModFiles = findAllFiles('modules/'.$mod,$allModFiles);
+        foreach($allModFiles as $file){
+            //$file_md5_ref = str_replace(clean_path(getcwd()),'',$file);
+            if(file_exists($file) && !in_array($file,$exclude_files)){
+            if(isset($md5_string['./'.$file])) {
+                        $fileContents = file_get_contents($file);
+                        if(md5($fileContents) != $md5_string['./'.$file]) {
+                            $return_array[$mod][] = $file;
+                        }
+                        else{
+                            //keep in the array to be deleted later
+                            $_SESSION['removeMd5MatchingFiles'][] = $file;
+                                }
+                    }
+                }
+            }
     } //foreach
     //also check out other non-studio modules by taking the difference between
     //allMOdules and
-  foreach($allOtherModules as $mod) {
-	  if(!is_dir('modules/'.$mod)) continue;
-	  $allModFiles = array();
-      $allModFiles = findAllFiles('modules/'.$mod,$allModFiles);
-      foreach($allModFiles as $file){
-           	//$file_md5_ref = str_replace(clean_path(getcwd()),'',$file);
-           	if(file_exists($file)){
-           		if(isset($md5_string['./'.$file])) {
-	               	  $fileContents = file_get_contents($file);
-	               	  if(md5($fileContents) == $md5_string['./'.$file]) {
-	               	  	$_SESSION['removeMd5MatchingFiles'][] = $file;
-	               	  }
-               }
-          }
-      }
-  }
-   //Also store in a file
-   //saveMatchingFilesQueries('removeMd5MatchingFiles',$_SESSION['removeMd5MatchingFiles']);
-	return $return_array;
+    foreach($allOtherModules as $mod) {
+        if(!is_dir('modules/'.$mod)) continue;
+        $allModFiles = array();
+        $allModFiles = findAllFiles('modules/'.$mod,$allModFiles);
+        foreach($allModFiles as $file){
+                //$file_md5_ref = str_replace(clean_path(getcwd()),'',$file);
+                if(file_exists($file)){
+                    if(isset($md5_string['./'.$file])) {
+                            $fileContents = file_get_contents($file);
+                            if(md5($fileContents) == $md5_string['./'.$file]) {
+                                $_SESSION['removeMd5MatchingFiles'][] = $file;
+                            }
+                }
+            }
+        }
+    }
+    //Also store in a file
+    //saveMatchingFilesQueries('removeMd5MatchingFiles',$_SESSION['removeMd5MatchingFiles']);
+    return $return_array;
 }
 
 
@@ -231,39 +231,39 @@ 
  */
 function getAllCustomizedModules() {
 
-		require_once('files.md5');
-
-	    $return_array = array();
-	    $modules = getAllModules();
-	    foreach($modules as $mod) {
-	    	   //find all files in each module if the files have been modified
-	    	   //as compared to the base version then add the module to the
-	    	   //customized modules array
-	    	   $modFiles = findAllFiles(clean_path(getcwd())."/modules/$mod", array());
-               foreach($modFiles as $file){
-             	  $fileContents = file_get_contents($file);
-             	   $file = str_replace(clean_path(getcwd()),'',$file);
-               	  if($md5_string['./' . $file]){
-	               	  if(md5($fileContents) != $md5_string['./' . $file]) {
-	               	     //A file has been customized in the module. Put the module into the
-	               	     // customized modules array.
-	               	     echo 'Changed File'.$file;
-	               	  	  $return_array[$mod];
-	               	  	  break;
-	               	  }
-               	  }
-               	  else{
-               	  	// This is a new file in user's version and indicates that module has been
-               	  	//customized. Put the module in the customized array.
-                       echo 'New File'.$file;
-                       $return_array[$mod];
-                       break;
-               	  }
-               }
-	    } //foreach
-
-		return $return_array;
-	}
+        require_once('files.md5');
+
+        $return_array = array();
+        $modules = getAllModules();
+        foreach($modules as $mod) {
+                //find all files in each module if the files have been modified
+                //as compared to the base version then add the module to the
+                //customized modules array
+                $modFiles = findAllFiles(clean_path(getcwd())."/modules/$mod", array());
+                foreach($modFiles as $file){
+                    $fileContents = file_get_contents($file);
+                    $file = str_replace(clean_path(getcwd()),'',$file);
+                        if($md5_string['./' . $file]){
+                            if(md5($fileContents) != $md5_string['./' . $file]) {
+                            //A file has been customized in the module. Put the module into the
+                            // customized modules array.
+                            echo 'Changed File'.$file;
+                                $return_array[$mod];
+                                break;
+                            }
+                        }
+                        else{
+                            // This is a new file in user's version and indicates that module has been
+                            //customized. Put the module in the customized array.
+                        echo 'New File'.$file;
+                        $return_array[$mod];
+                        break;
+                        }
+                }
+        } //foreach
+
+        return $return_array;
+    }
 
     /**
      * loadStudioModules
@@ -271,139 +271,139 @@ 
      * present in the metadata directory of the module
      * @return $modules Array of modules that are studio enabled
      */
-	function loadStudioModules() {
-		$modules = array();
-		$d = dir('modules');
-		while($e = $d->read()){
-			if(substr($e, 0, 1) == '.' || !is_dir('modules/' . $e))continue;
-			if(file_exists('modules/' . $e . '/metadata/studio.php')){
-			   $modules[] = $e;
-			}
-		}
-		return $modules;
-	}
-
-
-	/**
-	 * runParser
-	 * This method creates the EditView and DetailView parser intances
-	 * and runs the parsing for the modules to upgrade
-	 *
-	 */
-	function runParser() {
-		require_once('include/SugarFields/Parsers/EditViewMetaParser.php');
-		require_once('include/SugarFields/Parsers/DetailViewMetaParser.php');
-		require_once('include/SugarFields/Parsers/SearchFormMetaParser.php');
-
-		$this->evparser = new EditViewMetaParser();
-		$this->dvparser = new DetailViewMetaParser();
-		$this->svparser = new SearchFormMetaParser();
-
-		foreach($this->upgrade_modules as $module_name=>$files) {
-			$this->parseFile($module_name, $files);
-		} //foreach
-	}
-
-
-	/**
-	 * parseFile
-	 * Hanldes parsing the files for given module where Studio or manual
-	 * changes have been detected.
-	 * @param $module_name The module to parse
-	 * @param $files Array of files found to parse
-	 *
-	 */
-	function parseFile($module_name, $files) {
-		global $beanList, $dictionary;
-		foreach($files as $file) {
+    function loadStudioModules() {
+        $modules = array();
+        $d = dir('modules');
+        while($e = $d->read()){
+            if(substr($e, 0, 1) == '.' || !is_dir('modules/' . $e))continue;
+            if(file_exists('modules/' . $e . '/metadata/studio.php')){
+                $modules[] = $e;
+            }
+        }
+        return $modules;
+    }
+
+
+    /**
+     * runParser
+     * This method creates the EditView and DetailView parser intances
+     * and runs the parsing for the modules to upgrade
+     *
+     */
+    function runParser() {
+        require_once('include/SugarFields/Parsers/EditViewMetaParser.php');
+        require_once('include/SugarFields/Parsers/DetailViewMetaParser.php');
+        require_once('include/SugarFields/Parsers/SearchFormMetaParser.php');
+
+        $this->evparser = new EditViewMetaParser();
+        $this->dvparser = new DetailViewMetaParser();
+        $this->svparser = new SearchFormMetaParser();
+
+        foreach($this->upgrade_modules as $module_name=>$files) {
+            $this->parseFile($module_name, $files);
+        } //foreach
+    }
+
+
+    /**
+     * parseFile
+     * Hanldes parsing the files for given module where Studio or manual
+     * changes have been detected.
+     * @param $module_name The module to parse
+     * @param $files Array of files found to parse
+     *
+     */
+    function parseFile($module_name, $files) {
+        global $beanList, $dictionary;
+        foreach($files as $file) {
                 if(preg_match('/(EditView|DetailView|SearchForm|QuickCreate)(\.html|\.tpl)$/s', $file, $matches)) {
                     $view = $matches[1];
 
                     switch($view) {
-                       case 'EditView' : $parser = $this->evparser; break;
-                       case 'DetailView' : $parser = $this->dvparser; break;
-                       case 'SearchForm' : $parser = $this->svparser; break;
+                        case 'EditView' : $parser = $this->evparser; break;
+                        case 'DetailView' : $parser = $this->dvparser; break;
+                        case 'SearchForm' : $parser = $this->svparser; break;
                     }
 
                     $lowerCaseView = $view == 'SearchForm' ? 'search' : strtolower($view);
 
-					include('modules/'.$module_name.'/vardefs.php');
-					$bean_name = $beanList[$module_name];
-					$newFile = $this->upgrade_dir.'/modules/'.$module_name.'/metadata/'.$lowerCaseView.'defs.php';
-					$evfp = fopen($newFile,'w');
-
-					$bean_name = $bean_name == 'aCase' ? 'Case' : $bean_name;
-					fwrite($evfp, $parser->parse($file,
-											$dictionary[$bean_name]['fields'],
-											$module_name,
-											true,
-											$this->path_to_master_copy.'/modules/'.$module_name.'/metadata/'.$lowerCaseView.'defs.php'));
-					fclose($evfp);
+                    include('modules/'.$module_name.'/vardefs.php');
+                    $bean_name = $beanList[$module_name];
+                    $newFile = $this->upgrade_dir.'/modules/'.$module_name.'/metadata/'.$lowerCaseView.'defs.php';
+                    $evfp = fopen($newFile,'w');
+
+                    $bean_name = $bean_name == 'aCase' ? 'Case' : $bean_name;
+                    fwrite($evfp, $parser->parse($file,
+                                            $dictionary[$bean_name]['fields'],
+                                            $module_name,
+                                            true,
+                                            $this->path_to_master_copy.'/modules/'.$module_name.'/metadata/'.$lowerCaseView.'defs.php'));
+                    fclose($evfp);
+                } //if
+        } //foreach
+    }
+
+
+    /**
+     * create_upgrade_directory
+     * Creates a directory called upgrade to house all the modules that are studio enabled.
+     * Also creates subdirectories for all studio enabled modules.
+     *
+     */
+    function create_upgrade_directory() {
+
+        $dir = $this->upgrade_dir.'/modules';
+        if(!file_exists($this->upgrade_dir)) {
+            mkdir($this->upgrade_dir, 0755);
+        }
+        if(!file_exists($dir)) {
+            mkdir($dir, 0755);
+        }
+
+        foreach($this->upgrade_modules as $module=>$files){
+            if(!file_exists($dir.'/'.$module)) {
+                mkdir($dir.'/'.$module, 0755);
+            }
+            if(!file_exists($dir.'/'.$module.'/metadata')) {
+                mkdir($dir.'/'.$module.'/metadata', 0755);
+            }
+
+            foreach($files as $file) {
+                if(file_exists($file) && is_file($file)) {
+                    copy($file, $this->upgrade_dir.'/'.$file);
                 } //if
-		} //foreach
-	}
-
-
-	/**
-	 * create_upgrade_directory
-	 * Creates a directory called upgrade to house all the modules that are studio enabled.
-	 * Also creates subdirectories for all studio enabled modules.
-	 *
-	 */
-	function create_upgrade_directory() {
-
-		$dir = $this->upgrade_dir.'/modules';
-		if(!file_exists($this->upgrade_dir)) {
-			mkdir($this->upgrade_dir, 0755);
-		}
-		if(!file_exists($dir)) {
-			mkdir($dir, 0755);
-		}
-
-		foreach($this->upgrade_modules as $module=>$files){
-			if(!file_exists($dir.'/'.$module)) {
-				mkdir($dir.'/'.$module, 0755);
-			}
-			if(!file_exists($dir.'/'.$module.'/metadata')) {
-				mkdir($dir.'/'.$module.'/metadata', 0755);
-			}
-
-			foreach($files as $file) {
-				if(file_exists($file) && is_file($file)) {
-				   copy($file, $this->upgrade_dir.'/'.$file);
-				} //if
-			} //foreach
-		}
-	}
-
-
-	/**
-	 * verifyMetaData
-	 * This function does some quick checks to make sure the metadataFile at
-	 * least has an Array panel
-	 *
-	 * @param $metadataFile The path to the metadata file to verify
-	 * @param $module The module to verify
-	 * @param $view The view (EditView or DetailView)
-	 * @return boolean true if verification check is okay; false otherwise
-	 */
-	function verifyMetaData($metadataFile, $module, $view) {
-	    if(!file_exists($metadataFile) || !is_file($metadataFile)) {
-	       return false;
-	    }
-
-	    include($metadataFile);
-
-	    if(isset($viewdefs) && isset($viewdefs[$module][$view]['panels']) && is_array($viewdefs[$module][$view]['panels'])) {
-	       return true;
-	    }
+            } //foreach
+        }
+    }
+
+
+    /**
+     * verifyMetaData
+     * This function does some quick checks to make sure the metadataFile at
+     * least has an Array panel
+     *
+     * @param $metadataFile The path to the metadata file to verify
+     * @param $module The module to verify
+     * @param $view The view (EditView or DetailView)
+     * @return boolean true if verification check is okay; false otherwise
+     */
+    function verifyMetaData($metadataFile, $module, $view) {
+        if(!file_exists($metadataFile) || !is_file($metadataFile)) {
+            return false;
+        }
+
+        include($metadataFile);
+
+        if(isset($viewdefs) && isset($viewdefs[$module][$view]['panels']) && is_array($viewdefs[$module][$view]['panels'])) {
+            return true;
+        }
 
         if(isset($searchdefs) && isset($searchdefs[$module]) &&  is_array($searchdefs[$module])) {
-           return true;
+            return true;
         }
 
-	    return false;
-	}
+        return false;
+    }
 }
 
 ?>
\ No newline at end of file

Spacing +68 added lines, -68 removed lines

@@ -39,14 +39,14 @@ 
 
 
 
-class UpgradeMetaHelper{
+class UpgradeMetaHelper {
 
 	var $upgrade_dir;
 	var $debug_mode;
 	var $upgrade_modules;
 	var $customized_modules;
 	var $source_dir;
-	var $dest_dir ;
+	var $dest_dir;
 	var $evparser;
 	var $dvparser;
 	var $path_to_master_copy;
@@ -58,12 +58,12 @@ 
 	 * @param $debugMode Debug mode, default is false
 	 *
 	 */
-	function __construct($dir='upgrade', $masterCopyDirecotry='modules_50', $debugMode = false) {
+	function __construct($dir = 'upgrade', $masterCopyDirecotry = 'modules_50', $debugMode = false) {
 		$this->upgrade_dir = $dir;
 		$this->debug_mode = $debugMode;
 		$this->upgrade_modules = $this->getModifiedModules();
 
-		if(count($this->upgrade_modules) > 0) {
+		if (count($this->upgrade_modules) > 0) {
 			$_SESSION['Upgraded_Modules'] = $this->upgrade_modules;
 			$this->create_upgrade_directory();
 			$this->path_to_master_copy = $masterCopyDirecotry;
@@ -71,7 +71,7 @@ 
 		}
 
 		$this->customized_modules = $this->getAllCustomizedModulesBeyondStudio();
-		if(count($this->customized_modules) > 0) {
+		if (count($this->customized_modules) > 0) {
 			$_SESSION['Customized_Modules'] = $this->customized_modules;
 		}
 	}
@@ -79,9 +79,9 @@ 
 	/**
 	 * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
 	 */
-	function UpgradeMetaHelper($dir='upgrade', $masterCopyDirecotry='modules_50', $debugMode = false){
+	function UpgradeMetaHelper($dir = 'upgrade', $masterCopyDirecotry = 'modules_50', $debugMode = false) {
 		$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-		if(isset($GLOBALS['log'])) {
+		if (isset($GLOBALS['log'])) {
 			$GLOBALS['log']->deprecated($deprecatedMessage);
 		}
 		else {
@@ -100,34 +100,34 @@ 
 		function getModifiedModules() {
 
 		$md5_string = array();
-		if(file_exists(clean_path(getcwd().'/files.md5'))){
+		if (file_exists(clean_path(getcwd().'/files.md5'))) {
 			require(clean_path(getcwd().'/files.md5'));
 		}
 
 	    $return_array = array();
 	    $modules = $this->loadStudioModules();
-	    foreach($modules as $mod) {
+	    foreach ($modules as $mod) {
 
 	    	   $editView = "modules/$mod/EditView.html";
 	    	   $detailView = "modules/$mod/DetailView.html";
 	    	   $searchForm = "modules/$mod/SearchForm.html";
-               if(file_exists($editView) && isset($md5_string['./' . $editView])) {
+               if (file_exists($editView) && isset($md5_string['./'.$editView])) {
                	  $fileContents = file_get_contents($editView);
-               	  if(md5($fileContents) != $md5_string['./' . $editView]) {
+               	  if (md5($fileContents) != $md5_string['./'.$editView]) {
                	  	 $return_array[$mod][] = $editView;
                	  }
                }
 
-               if(file_exists($detailView) && isset($md5_string['./' . $detailView])) {
+               if (file_exists($detailView) && isset($md5_string['./'.$detailView])) {
                	  $fileContents = file_get_contents($detailView);
-               	  if(md5($fileContents) != $md5_string['./' . $detailView]) {
+               	  if (md5($fileContents) != $md5_string['./'.$detailView]) {
                	  	 $return_array[$mod][] = $detailView;
                	  }
                }
 
-               if(file_exists($searchForm) && isset($md5_string['./' . $searchForm])) {
+               if (file_exists($searchForm) && isset($md5_string['./'.$searchForm])) {
                	  $fileContents = file_get_contents($searchForm);
-               	  if(md5($fileContents) != $md5_string['./' . $searchForm]) {
+               	  if (md5($fileContents) != $md5_string['./'.$searchForm]) {
                	  	 $return_array[$mod][] = $searchForm;
                	  }
                }
@@ -137,28 +137,28 @@ 
 		return $return_array;
 	}
 
-function saveMatchingFilesQueries($currStep,$value){
+function saveMatchingFilesQueries($currStep, $value) {
 	$upgrade_progress_dir = sugar_cached('upgrades/temp');
-	if(!is_dir($upgrade_progress_dir)){
+	if (!is_dir($upgrade_progress_dir)) {
 		mkdir($upgrade_progress_dir);
 	}
 	$file_queries_file = $upgrade_progress_dir.'/files_queries.php';
-	if(file_exists($file_queries_file)){
+	if (file_exists($file_queries_file)) {
 		include($file_queries_file);
 	}
-	else{
-		if(function_exists('sugar_fopen')){
+	else {
+		if (function_exists('sugar_fopen')) {
 			sugar_fopen($file_queries_file, 'w+');
 		}
-		else{
+		else {
 			fopen($file_queries_file, 'w+');
 		}
 	}
-	if(!isset($files_queries) || $files_queries == NULL){
+	if (!isset($files_queries) || $files_queries == NULL) {
 		$files_queries = array();
 	}
-	$files_queries[$currStep]=$value;
-	if(is_writable($file_queries_file) && write_array_to_file( "file_queries", $file_queries,
+	$files_queries[$currStep] = $value;
+	if (is_writable($file_queries_file) && write_array_to_file("file_queries", $file_queries,
 		$file_queries_file)) {
 	       //writing to the file
 	}
@@ -168,30 +168,30 @@ 
 
 	require_once('modules/UpgradeWizard/uw_utils.php');
 	$md5_string = array();
-	if(file_exists(clean_path(getcwd().'/files.md5'))){
+	if (file_exists(clean_path(getcwd().'/files.md5'))) {
 		require(clean_path(getcwd().'/files.md5'));
 	}
     $return_array = array();
     $modules = $this->loadStudioModules();
     $modulesAll = getAllModules(); //keep all modules as well
-    $allOtherModules = array_diff($modulesAll,$modules);
-    foreach($modules as $mod) {
-	  if(!is_dir('modules/'.$mod)) continue;
+    $allOtherModules = array_diff($modulesAll, $modules);
+    foreach ($modules as $mod) {
+	  if (!is_dir('modules/'.$mod)) continue;
 	  $editView = "modules/$mod/EditView.html";
-	  $detailView ="modules/$mod/DetailView.html";
-	  $exclude_files[]=$editView;
-	  $exclude_files[]=$detailView;
+	  $detailView = "modules/$mod/DetailView.html";
+	  $exclude_files[] = $editView;
+	  $exclude_files[] = $detailView;
 	  $allModFiles = array();
-	  $allModFiles = findAllFiles('modules/'.$mod,$allModFiles);
-	   foreach($allModFiles as $file){
+	  $allModFiles = findAllFiles('modules/'.$mod, $allModFiles);
+	   foreach ($allModFiles as $file) {
 	       //$file_md5_ref = str_replace(clean_path(getcwd()),'',$file);
-		  if(file_exists($file) && !in_array($file,$exclude_files)){
-			if(isset($md5_string['./'.$file])) {
+		  if (file_exists($file) && !in_array($file, $exclude_files)) {
+			if (isset($md5_string['./'.$file])) {
 		       	  $fileContents = file_get_contents($file);
-		       	  if(md5($fileContents) != $md5_string['./'.$file]) {
+		       	  if (md5($fileContents) != $md5_string['./'.$file]) {
 		       	  	$return_array[$mod][] = $file;
 		       	  }
-		       	  else{
+		       	  else {
 		       	  	//keep in the array to be deleted later
 		       	  	$_SESSION['removeMd5MatchingFiles'][] = $file;
 		               	  }
@@ -201,16 +201,16 @@ 
     } //foreach
     //also check out other non-studio modules by taking the difference between
     //allMOdules and
-  foreach($allOtherModules as $mod) {
-	  if(!is_dir('modules/'.$mod)) continue;
+  foreach ($allOtherModules as $mod) {
+	  if (!is_dir('modules/'.$mod)) continue;
 	  $allModFiles = array();
-      $allModFiles = findAllFiles('modules/'.$mod,$allModFiles);
-      foreach($allModFiles as $file){
+      $allModFiles = findAllFiles('modules/'.$mod, $allModFiles);
+      foreach ($allModFiles as $file) {
            	//$file_md5_ref = str_replace(clean_path(getcwd()),'',$file);
-           	if(file_exists($file)){
-           		if(isset($md5_string['./'.$file])) {
+           	if (file_exists($file)) {
+           		if (isset($md5_string['./'.$file])) {
 	               	  $fileContents = file_get_contents($file);
-	               	  if(md5($fileContents) == $md5_string['./'.$file]) {
+	               	  if (md5($fileContents) == $md5_string['./'.$file]) {
 	               	  	$_SESSION['removeMd5MatchingFiles'][] = $file;
 	               	  }
                }
@@ -235,16 +235,16 @@ 
 
 	    $return_array = array();
 	    $modules = getAllModules();
-	    foreach($modules as $mod) {
+	    foreach ($modules as $mod) {
 	    	   //find all files in each module if the files have been modified
 	    	   //as compared to the base version then add the module to the
 	    	   //customized modules array
 	    	   $modFiles = findAllFiles(clean_path(getcwd())."/modules/$mod", array());
-               foreach($modFiles as $file){
+               foreach ($modFiles as $file) {
              	  $fileContents = file_get_contents($file);
-             	   $file = str_replace(clean_path(getcwd()),'',$file);
-               	  if($md5_string['./' . $file]){
-	               	  if(md5($fileContents) != $md5_string['./' . $file]) {
+             	   $file = str_replace(clean_path(getcwd()), '', $file);
+               	  if ($md5_string['./'.$file]) {
+	               	  if (md5($fileContents) != $md5_string['./'.$file]) {
 	               	     //A file has been customized in the module. Put the module into the
 	               	     // customized modules array.
 	               	     echo 'Changed File'.$file;
@@ -252,7 +252,7 @@ 
 	               	  	  break;
 	               	  }
                	  }
-               	  else{
+               	  else {
                	  	// This is a new file in user's version and indicates that module has been
                	  	//customized. Put the module in the customized array.
                        echo 'New File'.$file;
@@ -274,9 +274,9 @@ 
 	function loadStudioModules() {
 		$modules = array();
 		$d = dir('modules');
-		while($e = $d->read()){
-			if(substr($e, 0, 1) == '.' || !is_dir('modules/' . $e))continue;
-			if(file_exists('modules/' . $e . '/metadata/studio.php')){
+		while ($e = $d->read()) {
+			if (substr($e, 0, 1) == '.' || !is_dir('modules/'.$e))continue;
+			if (file_exists('modules/'.$e.'/metadata/studio.php')) {
 			   $modules[] = $e;
 			}
 		}
@@ -299,7 +299,7 @@ 
 		$this->dvparser = new DetailViewMetaParser();
 		$this->svparser = new SearchFormMetaParser();
 
-		foreach($this->upgrade_modules as $module_name=>$files) {
+		foreach ($this->upgrade_modules as $module_name=>$files) {
 			$this->parseFile($module_name, $files);
 		} //foreach
 	}
@@ -315,11 +315,11 @@ 
 	 */
 	function parseFile($module_name, $files) {
 		global $beanList, $dictionary;
-		foreach($files as $file) {
-                if(preg_match('/(EditView|DetailView|SearchForm|QuickCreate)(\.html|\.tpl)$/s', $file, $matches)) {
+		foreach ($files as $file) {
+                if (preg_match('/(EditView|DetailView|SearchForm|QuickCreate)(\.html|\.tpl)$/s', $file, $matches)) {
                     $view = $matches[1];
 
-                    switch($view) {
+                    switch ($view) {
                        case 'EditView' : $parser = $this->evparser; break;
                        case 'DetailView' : $parser = $this->dvparser; break;
                        case 'SearchForm' : $parser = $this->svparser; break;
@@ -330,7 +330,7 @@ 
 					include('modules/'.$module_name.'/vardefs.php');
 					$bean_name = $beanList[$module_name];
 					$newFile = $this->upgrade_dir.'/modules/'.$module_name.'/metadata/'.$lowerCaseView.'defs.php';
-					$evfp = fopen($newFile,'w');
+					$evfp = fopen($newFile, 'w');
 
 					$bean_name = $bean_name == 'aCase' ? 'Case' : $bean_name;
 					fwrite($evfp, $parser->parse($file,
@@ -353,23 +353,23 @@ 
 	function create_upgrade_directory() {
 
 		$dir = $this->upgrade_dir.'/modules';
-		if(!file_exists($this->upgrade_dir)) {
+		if (!file_exists($this->upgrade_dir)) {
 			mkdir($this->upgrade_dir, 0755);
 		}
-		if(!file_exists($dir)) {
+		if (!file_exists($dir)) {
 			mkdir($dir, 0755);
 		}
 
-		foreach($this->upgrade_modules as $module=>$files){
-			if(!file_exists($dir.'/'.$module)) {
+		foreach ($this->upgrade_modules as $module=>$files) {
+			if (!file_exists($dir.'/'.$module)) {
 				mkdir($dir.'/'.$module, 0755);
 			}
-			if(!file_exists($dir.'/'.$module.'/metadata')) {
+			if (!file_exists($dir.'/'.$module.'/metadata')) {
 				mkdir($dir.'/'.$module.'/metadata', 0755);
 			}
 
-			foreach($files as $file) {
-				if(file_exists($file) && is_file($file)) {
+			foreach ($files as $file) {
+				if (file_exists($file) && is_file($file)) {
 				   copy($file, $this->upgrade_dir.'/'.$file);
 				} //if
 			} //foreach
@@ -388,17 +388,17 @@ 
 	 * @return boolean true if verification check is okay; false otherwise
 	 */
 	function verifyMetaData($metadataFile, $module, $view) {
-	    if(!file_exists($metadataFile) || !is_file($metadataFile)) {
+	    if (!file_exists($metadataFile) || !is_file($metadataFile)) {
 	       return false;
 	    }
 
 	    include($metadataFile);
 
-	    if(isset($viewdefs) && isset($viewdefs[$module][$view]['panels']) && is_array($viewdefs[$module][$view]['panels'])) {
+	    if (isset($viewdefs) && isset($viewdefs[$module][$view]['panels']) && is_array($viewdefs[$module][$view]['panels'])) {
 	       return true;
 	    }
 
-        if(isset($searchdefs) && isset($searchdefs[$module]) &&  is_array($searchdefs[$module])) {
+        if (isset($searchdefs) && isset($searchdefs[$module]) && is_array($searchdefs[$module])) {
            return true;
         }
 

Braces +14 added lines, -13 removed lines

@@ -83,8 +83,7 @@ 
 		$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
 		if(isset($GLOBALS['log'])) {
 			$GLOBALS['log']->deprecated($deprecatedMessage);
-		}
-		else {
+		} else {
 			trigger_error($deprecatedMessage, E_USER_DEPRECATED);
 		}
 		self::__construct($dir, $masterCopyDirecotry, $debugMode);
@@ -145,12 +144,10 @@ 
 	$file_queries_file = $upgrade_progress_dir.'/files_queries.php';
 	if(file_exists($file_queries_file)){
 		include($file_queries_file);
-	}
-	else{
+	} else{
 		if(function_exists('sugar_fopen')){
 			sugar_fopen($file_queries_file, 'w+');
-		}
-		else{
+		} else{
 			fopen($file_queries_file, 'w+');
 		}
 	}
@@ -176,7 +173,9 @@ 
     $modulesAll = getAllModules(); //keep all modules as well
     $allOtherModules = array_diff($modulesAll,$modules);
     foreach($modules as $mod) {
-	  if(!is_dir('modules/'.$mod)) continue;
+	  if(!is_dir('modules/'.$mod)) {
+	      continue;
+	  }
 	  $editView = "modules/$mod/EditView.html";
 	  $detailView ="modules/$mod/DetailView.html";
 	  $exclude_files[]=$editView;
@@ -190,8 +189,7 @@ 
 		       	  $fileContents = file_get_contents($file);
 		       	  if(md5($fileContents) != $md5_string['./'.$file]) {
 		       	  	$return_array[$mod][] = $file;
-		       	  }
-		       	  else{
+		       	  } else{
 		       	  	//keep in the array to be deleted later
 		       	  	$_SESSION['removeMd5MatchingFiles'][] = $file;
 		               	  }
@@ -202,7 +200,9 @@ 
     //also check out other non-studio modules by taking the difference between
     //allMOdules and
   foreach($allOtherModules as $mod) {
-	  if(!is_dir('modules/'.$mod)) continue;
+	  if(!is_dir('modules/'.$mod)) {
+	      continue;
+	  }
 	  $allModFiles = array();
       $allModFiles = findAllFiles('modules/'.$mod,$allModFiles);
       foreach($allModFiles as $file){
@@ -251,8 +251,7 @@ 
 	               	  	  $return_array[$mod];
 	               	  	  break;
 	               	  }
-               	  }
-               	  else{
+               	  } else{
                	  	// This is a new file in user's version and indicates that module has been
                	  	//customized. Put the module in the customized array.
                        echo 'New File'.$file;
@@ -275,7 +274,9 @@ 
 		$modules = array();
 		$d = dir('modules');
 		while($e = $d->read()){
-			if(substr($e, 0, 1) == '.' || !is_dir('modules/' . $e))continue;
+			if(substr($e, 0, 1) == '.' || !is_dir('modules/' . $e)) {
+			    continue;
+			}
 			if(file_exists('modules/' . $e . '/metadata/studio.php')){
 			   $modules[] = $e;
 			}

modules/Opportunities/OpportunitiesJjwg_MapsLogicHook.php

Spacing +2 added lines, -2 removed lines

@@ -13,9 +13,9 @@
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function OpportunitiesJjwg_MapsLogicHook(){
+    function OpportunitiesJjwg_MapsLogicHook() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {

Braces +3 added lines, -3 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('sugarEntry') || !sugarEntry)
+if (!defined('sugarEntry') || !sugarEntry) {
     die('Not A Valid Entry Point');
+}
 
 class OpportunitiesJjwg_MapsLogicHook {
 
@@ -17,8 +18,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();