adamjakab / SuiteCRM

ModuleInstall/PackageManager/PackageController.php

Braces +13 added lines, -11 removed lines

@@ -57,8 +57,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();
@@ -124,8 +123,9 @@ 
           	$type_str = '';
           	foreach($types as $type){
           		$type_str .= "'".$type."'";
-          		if($index < $count)
-          			$type_str .= ",";
+          		if($index < $count) {
+          		          			$type_str .= ",";
+          		}
           		$index++;
           	}
 
@@ -310,18 +310,20 @@ 
             }
             if(isset($_REQUEST['terms_checked'])) {
                 $terms_checked = $_REQUEST['terms_checked'];
-                if($terms_checked == 'on')
-                	$terms_checked = true;
+                if($terms_checked == 'on') {
+                                	$terms_checked = true;
+                }
             }
 
             if(!empty($username) && !empty($password)){
                 $password = md5($password);
                 $result = PackageManager::authenticate($username, $password, $servername, $terms_checked);
-                if(!is_array($result) && $result == true)
-                    $status  = 'success';
-                else
-                    $status  = $result['faultstring'];
-            }else{
+                if(!is_array($result) && $result == true) {
+                                    $status  = 'success';
+                } else {
+                                    $status  = $result['faultstring'];
+                }
+            } else{
                 $status  = 'failed';
             }
 

ModuleInstall/PackageManager/PackageManager.php

Braces +48 added lines, -36 removed lines

@@ -67,8 +67,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();
@@ -88,7 +87,7 @@ 
         if(!empty($name_value_list)){
             $name_value_list = PackageManager::fromNameValueList($name_value_list);
             return $name_value_list['description'];
-        }else {
+        } else {
            return '';
         }
     }
@@ -134,8 +133,9 @@ 
 		                 //check to see if we already this one installed
 		                 $result = $uh->determineIfUpgrade($myrelease['id_name'], $myrelease['version']);
 		                 $enable = false;
-		                 if($result == true || is_array($result))
-		                	 $enable = true;
+		                 if($result == true || is_array($result)) {
+		                 		                	 $enable = true;
+		                 }
 		                 $nodes[$mypack['category_id']]['packages'][$mypack['id']]['releases'][$myrelease['id']] = array('id' => $myrelease['id'], 'version' => $myrelease['version'], 'label' => $myrelease['description'], 'category_id' => $mypack['category_id'], 'package_id' => $mypack['id'], 'type' => 'release', 'enable' => $enable);
 		           	}
 	            }
@@ -213,7 +213,7 @@ 
 	           	$filepath = PackageManagerComm::performDownload($filename);
 	           	return $filepath;
             }
-        }else{
+        } else{
             return null;
         }
     }
@@ -231,10 +231,11 @@ 
         PackageManager::setCredentials($username, $password, $systemname);
         PackageManagerComm::clearSession();
         $result = PackageManagerComm::login($terms_checked);
-        if(is_array($result))
-        	return $result;
-       	else
-        	return true;
+        if(is_array($result)) {
+                	return $result;
+        } else {
+       	        	return true;
+       	}
     }
 
     function setCredentials($username, $password, $systemname){
@@ -285,7 +286,7 @@ 
     	 if(!empty($release_id) || !empty($package_id)){
             $documents = PackageManagerComm::getDocumentation($package_id, $release_id);
             return $documents;
-        }else{
+        } else{
             return null;
         }
     }
@@ -480,8 +481,9 @@ 
         $base_tmp_upgrade_dir   = "$base_upgrade_dir/temp";
         $manifest_file = $this->extractManifest( $base_filename,$base_tmp_upgrade_dir);
          $GLOBALS['log']->debug("Manifest: ".$manifest_file);
-        if($view == 'module')
-            $license_file = $this->extractFile($base_filename, 'LICENSE.txt', $base_tmp_upgrade_dir);
+        if($view == 'module') {
+                    $license_file = $this->extractFile($base_filename, 'LICENSE.txt', $base_tmp_upgrade_dir);
+        }
         if(is_file($manifest_file)){
             $GLOBALS['log']->debug("VALIDATING MANIFEST". $manifest_file);
             require_once( $manifest_file );
@@ -492,14 +494,16 @@ 
             if( $view == "module" ){
                 if ($upgrade_zip_type != "module" && $upgrade_zip_type != "theme" && $upgrade_zip_type != "langpack"){
                     $this->unlinkTempFiles();
-                    if($display_messages)
-                        die($mod_strings['ERR_UW_NOT_ACCEPTIBLE_TYPE']);
+                    if($display_messages) {
+                                            die($mod_strings['ERR_UW_NOT_ACCEPTIBLE_TYPE']);
+                    }
                 }
-            }elseif( $view == "default" ){
+            } elseif( $view == "default" ){
                 if($upgrade_zip_type != "patch" ){
                     $this->unlinkTempFiles();
-                    if($display_messages)
-                        die($mod_strings['ERR_UW_ONLY_PATCHES']);
+                    if($display_messages) {
+                                            die($mod_strings['ERR_UW_ONLY_PATCHES']);
+                    }
                 }
             }
 
@@ -517,20 +521,24 @@ 
 
             if( copy( $tempFile , $target_path ) ){
                 copy( $manifest_file, $target_manifest );
-                if($display_messages)
-                    $messages = '<script>ajaxStatus.flashStatus("' .$base_filename.$mod_strings['LBL_UW_UPLOAD_SUCCESS'] . ', 5000");</script>';
-            }else{
-                if($display_messages)
-                	$messages = '<script>ajaxStatus.flashStatus("' .$mod_strings['ERR_UW_UPLOAD_ERROR'] . ', 5000");</script>';
+                if($display_messages) {
+                                    $messages = '<script>ajaxStatus.flashStatus("' .$base_filename.$mod_strings['LBL_UW_UPLOAD_SUCCESS'] . ', 5000");</script>';
+                }
+            } else{
+                if($display_messages) {
+                                	$messages = '<script>ajaxStatus.flashStatus("' .$mod_strings['ERR_UW_UPLOAD_ERROR'] . ', 5000");</script>';
+                }
             }
         }//fi
         else{
             $this->unlinkTempFiles();
-            if($display_messages)
-                die($mod_strings['ERR_UW_NO_MANIFEST']);
+            if($display_messages) {
+                            die($mod_strings['ERR_UW_NO_MANIFEST']);
+            }
+        }
+        if(isset($messages)) {
+                    return $messages;
         }
-        if(isset($messages))
-            return $messages;
     }
 
     function unlinkTempFiles() {
@@ -568,14 +576,15 @@ 
 			$version = $manifest['version'];
 			$uh = new UpgradeHistory();
 			$previous_install = array();
-    		if(!empty($id_name) & !empty($version))
-    			$previous_install = $uh->determineIfUpgrade($id_name, $version);
+    		if(!empty($id_name) & !empty($version)) {
+    		    			$previous_install = $uh->determineIfUpgrade($id_name, $version);
+    		}
     		$previous_version = (empty($previous_install['version'])) ? '' : $previous_install['version'];
     		$previous_id = (empty($previous_install['id'])) ? '' : $previous_install['id'];
 
             if(!empty($previous_version)){
             	$mi->install($unzip_dir, true, $previous_version);
-            }else{
+            } else{
             	$mi->install($unzip_dir);
             }
             $GLOBALS['log']->debug("INSTALLED: ".$file);
@@ -612,7 +621,9 @@ 
 	        $base_upgrade_dir       = $this->upload_dir.'/upgrades';
 	        $base_tmp_upgrade_dir   = "$base_upgrade_dir/temp";
             if(is_file($found->filename)){
-                if(!isset($GLOBALS['mi_remove_tables']))$GLOBALS['mi_remove_tables'] = true;
+                if(!isset($GLOBALS['mi_remove_tables'])) {
+                    $GLOBALS['mi_remove_tables'] = true;
+                }
                 $unzip_dir = mk_temp_dir( $base_tmp_upgrade_dir );
                 unzip($found->filename, $unzip_dir );
                 $mi = new ModuleInstaller();
@@ -621,7 +632,7 @@ 
                 $found->delete();
                 unlink(remove_file_extension( $found->filename ) . '-manifest.php');
                 unlink($found->filename);
-            }else{
+            } else{
                 //file(s_ have been deleted or are not found in the directory, allow database delete to happen but no need to change filesystem
                 $found->delete();
             }
@@ -767,7 +778,7 @@ 
         if(is_file($license_file)){
             $contents = file_get_contents($license_file);
             return $contents;
-        }else{
+        } else{
             return null;
         }
     }
@@ -849,7 +860,7 @@ 
 						$serial_manifest['upgrade_manifest'] = (isset($upgrade_manifest) ? $upgrade_manifest : '');
 						$installed->manifest = base64_encode(serialize($serial_manifest));
 						$installed->save();
-					}else{
+					} else{
 						$serial_manifest = unserialize(base64_decode($installed->manifest));
 						$manifest = $serial_manifest['manifest'];
 					}
@@ -859,8 +870,9 @@ 
 						$uninstallable = true;
 					}
 					$enabled = $installed->enabled;
-					if(!$enabled)
-						$enabled_string = 'DISABLED';
+					if(!$enabled) {
+											$enabled_string = 'DISABLED';
+					}
 					$file_uninstall = $filename;
 					if(!$uninstallable){
 						$file_uninstall = 'UNINSTALLABLE';

modules/DynamicFields/DynamicField.php

Braces +85 added lines, -61 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
@@ -58,8 +59,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($module);
@@ -117,9 +117,12 @@ 
     */
     function buildCache($module = false, $saveCache=true) {
         //We can't build the cache while installing as the required database tables may not exist.
-        if (!empty($GLOBALS['installing']) && $GLOBALS['installing'] == true|| empty($GLOBALS['db']))
+        if (!empty($GLOBALS['installing']) && $GLOBALS['installing'] == true|| empty($GLOBALS['db'])) {
+                    return false;
+        }
+        if($module == '../data') {
             return false;
-        if($module == '../data')return false;
+        }
 
         static $results = array ( ) ;
 
@@ -127,8 +130,7 @@ 
         if (! empty ( $module )) {
             $where .= " custom_module='$module' AND ";
             unset( $results[ $module ] ) ; // clear out any old results for the module as $results is declared static
-        }
-        else
+        } else
         {
             $results = array ( ) ; // clear out results - if we remove a module we don't want to have its old vardefs hanging around
         }
@@ -152,10 +154,12 @@ 
             $vardef = $field->get_field_def ();
             $vardef ['id'] = $row ['id'];
             $vardef ['custom_module'] = $row ['custom_module'];
-            if (empty ( $vardef ['source'] ))
-                $vardef ['source'] = 'custom_fields';
-            if (empty ( $results [$row ['custom_module']] ))
-                $results [$row ['custom_module']] = array ( );
+            if (empty ( $vardef ['source'] )) {
+                            $vardef ['source'] = 'custom_fields';
+            }
+            if (empty ( $results [$row ['custom_module']] )) {
+                            $results [$row ['custom_module']] = array ( );
+            }
             $results [$row ['custom_module']] [$row ['name']] = $vardef;
         }
         if (empty ( $module )) {
@@ -165,7 +169,7 @@ 
         } else {
             if (! empty ( $results [$module] )) {
                 $this->saveToVardef ( $module, $results [$module], $saveCache);
-            }else{
+            } else{
                 $this->saveToVardef ( $module, false, $saveCache);
             }
         }
@@ -210,7 +214,9 @@ 
                 //if the vardef isn't loaded let's try loading it.
                 VardefManager::refreshVardefs($module,$object, null, false);
                 //if it's still not loaded we really don't have anything useful to cache
-                if(empty($GLOBALS['dictionary'][$object]['fields']))return;
+                if(empty($GLOBALS['dictionary'][$object]['fields'])) {
+                    return;
+                }
             }
             if (!isset($GLOBALS['dictionary'][$object]['custom_fields'])) {
                 $GLOBALS['dictionary'][$object]['custom_fields'] = false;
@@ -280,8 +286,7 @@ 
         if (empty($expandedList) )
         {
             $select = ",{$this->bean->table_name}_cstm.*" ;
-        }
-        else
+        } else
         {
             $select = '';
             $isList = is_array($expandedList);
@@ -290,8 +295,9 @@ 
                 if (!empty($field['source']) && $field['source'] == 'custom_fields' && (!$isList || !empty($expandedList[$name]))){
                     // assumption: that the column name in _cstm is the same as the field name. Currently true.
                     // however, two types of dynamic fields do not have columns in the custom table - html fields (they're readonly) and flex relates (parent_name doesn't exist)
-                    if ( $field['type'] != 'html' && $name != 'parent_name')
-                        $select .= ",{$this->bean->table_name}_cstm.{$name}" ;
+                    if ( $field['type'] != 'html' && $name != 'parent_name') {
+                                            $select .= ",{$this->bean->table_name}_cstm.{$name}" ;
+                    }
                 }
             }
         }
@@ -346,8 +352,7 @@ 
             else if(!empty($rel_mod->field_defs['name']['source']) && $rel_mod->field_defs['name']['source'] == "non-db" && !empty($field_def['rname']))
             {
                 $name_field = "$joinTableAlias." . $field_def['rname'];
-            }
-            else
+            } else
             {
                 $name_field = "$joinTableAlias.name";
             }
@@ -369,12 +374,16 @@ 
    function fill_relationships(){
         global $beanList, $beanFiles;
         if(!empty($this->bean->relDepth)) {
-            if($this->bean->relDepth > 1)return;
-        }else{
+            if($this->bean->relDepth > 1) {
+                return;
+            }
+        } else{
             $this->bean->relDepth = 0;
         }
         foreach($this->bean->field_defs as $field){
-            if(empty($field['source']) || $field['source'] != 'custom_fields')continue;
+            if(empty($field['source']) || $field['source'] != 'custom_fields') {
+                continue;
+            }
             if($field['type'] == 'relate'){
                 $related_module =$field['ext2'];
                 $name = $field['name'];
@@ -413,8 +422,12 @@ 
             $first = true;
             foreach($this->bean->field_defs as $name=>$field){
 
-                if(empty($field['source']) || $field['source'] != 'custom_fields')continue;
-                if($field['type'] == 'html' || $field['type'] == 'parent')continue;
+                if(empty($field['source']) || $field['source'] != 'custom_fields') {
+                    continue;
+                }
+                if($field['type'] == 'html' || $field['type'] == 'parent') {
+                    continue;
+                }
                 if(isset($this->bean->$name)){
                     $quote = "'";
 
@@ -423,16 +436,17 @@ 
                         if(!isset($this->bean->$name) || !is_numeric($this->bean->$name) ){
                             if($field['required']){
                                 $this->bean->$name = 0;
-                            }else{
+                            } else{
                                 $this->bean->$name = 'NULL';
                             }
                         }
                     }
                     if ( $field['type'] == 'bool' ) {
-                        if ( $this->bean->$name === FALSE )
-                            $this->bean->$name = '0';
-                        elseif ( $this->bean->$name === TRUE )
-                            $this->bean->$name = '1';
+                        if ( $this->bean->$name === FALSE ) {
+                                                    $this->bean->$name = '0';
+                        } elseif ( $this->bean->$name === TRUE ) {
+                                                    $this->bean->$name = '1';
+                        }
                     }
 
                     $val = $this->bean->$name;
@@ -445,7 +459,7 @@ 
                         if($first){
                             $query .= " $name=$quote".$GLOBALS['db']->quote($val)."$quote";
 
-                        }else{
+                        } else{
                             $query .= " ,$name=$quote".$GLOBALS['db']->quote($val)."$quote";
                         }
                     }
@@ -464,7 +478,7 @@ 
             if(!$first){
                 if(!$isUpdate){
                     $GLOBALS['db']->query($queryInsert);
-                }else{
+                } else{
                     $checkquery = "SELECT id_c FROM {$this->bean->table_name}_cstm WHERE id_c = '{$this->bean->id}'";
                     if ( $GLOBALS['db']->getOne($checkquery) ) {
                         $result = $GLOBALS['db']->query($query);
@@ -499,8 +513,9 @@ 
 
         $GLOBALS['db']->query("DELETE FROM fields_meta_data WHERE id='" . $this->module . $widget->name . "'");
         $sql = $widget->get_db_delete_alter_table( $this->bean->table_name . "_cstm" ) ;
-        if (! empty( $sql ) )
-            $GLOBALS['db']->query( $sql );
+        if (! empty( $sql ) ) {
+                    $GLOBALS['db']->query( $sql );
+        }
 
         $this->removeVardefExtension($widget);
         VardefManager::clearVardef();
@@ -518,19 +533,21 @@ 
         $name = $this->getDBName($name);
         $vardefs = $GLOBALS['dictionary'][$this->bean->object_name]['fields'];
         if(!empty($vardefs)){
-            if(empty($type) && empty($name))
-                return false;
-            else if(empty($type))
-                return !empty($vardefs[$name]);
-            else if(empty($name)){
+            if(empty($type) && empty($name)) {
+                            return false;
+            } else if(empty($type)) {
+                            return !empty($vardefs[$name]);
+            } else if(empty($name)){
                 foreach($vardefs as $def){
-                    if(!empty($def['type']) && $def['type'] == $type)
-                        return true;
+                    if(!empty($def['type']) && $def['type'] == $type) {
+                                            return true;
+                    }
                 }
                 return false;
-            }else
-                return (!empty($vardefs[$name]) && ($vardefs[$name]['type'] == $type));
-        }else{
+            } else {
+                            return (!empty($vardefs[$name]) && ($vardefs[$name]['type'] == $type));
+            }
+        } else{
             return false;
         }
     }
@@ -553,7 +570,7 @@ 
         $label = strtoupper( $field->label );
         if(!empty($id)){
             $is_update = true;
-        }else{
+        } else{
             $db_name = $this->getDBName($field->name);
             $field->name = $db_name;
         }
@@ -564,8 +581,10 @@ 
         $fmd->vname = $label;
         $fmd->type = $field->type;
         $fmd->help = $field->help;
-        if (!empty($field->len))
-            $fmd->len = $field->len; // tyoung bug 15407 - was being set to $field->size so changes weren't being saved
+        if (!empty($field->len)) {
+                    $fmd->len = $field->len;
+        }
+        // tyoung bug 15407 - was being set to $field->size so changes weren't being saved
         $fmd->required = ($field->required ? 1 : 0);
         $fmd->default_value = $field->default;
         $fmd->ext1 = $field->ext1;
@@ -605,7 +624,7 @@ 
 	                	$GLOBALS['db']->query($query, true, "Cannot set default");
 	            	}
                 }
-            }else{
+            } else{
                 $query = $field->get_db_modify_alter_table($this->bean->table_name . '_cstm');
                 if(!empty($query)){
                 	$GLOBALS['db']->query($query, true, "Cannot modify field");
@@ -685,16 +704,16 @@ 
 
         $out .= "\n ?>";
 
-        if (!file_exists($this->base_path))
-            mkdir_recursive($this->base_path);
+        if (!file_exists($this->base_path)) {
+                    mkdir_recursive($this->base_path);
+        }
 
         if( $fh = @sugar_fopen( $file_loc, 'w' ) )
         {
             fputs( $fh, $out);
             fclose( $fh );
             return true ;
-        }
-        else
+        } else
         {
             return false ;
         }
@@ -815,8 +834,9 @@ 
     	$out = "";
         if($this->bean->hasCustomFields()){
 	        foreach($this->bean->field_defs as $name=>$data){
-	        	if(empty($data['source']) || $data['source'] != 'custom_fields')
-                    continue;
+	        	if(empty($data['source']) || $data['source'] != 'custom_fields') {
+	        	                    continue;
+	        	}
 	            $out .= $this->add_existing_custom_field($data, $execute);
 	        }
     	}
@@ -831,8 +851,9 @@ 
         $query = "/*MISSING IN DATABASE - {$data['name']} -  ROW*/\n"
                 . $field->get_db_add_alter_table($this->bean->table_name . '_cstm');
         $out = $query . "\n";
-        if ($execute)
-            $GLOBALS['db']->query($query);
+        if ($execute) {
+                    $GLOBALS['db']->query($query);
+        }
 
         return $out;
     }
@@ -841,16 +862,18 @@ 
     {
         $out = $this->createCustomTable($execute);
         //If the table didn't exist, createCustomTable will have returned all the SQL to create and populate it
-        if (!empty($out))
-            return "/*Checking Custom Fields for module : {$this->module} */\n$out";
+        if (!empty($out)) {
+                    return "/*Checking Custom Fields for module : {$this->module} */\n$out";
+        }
         //Otherwise make sure all the custom fields defined in the vardefs exist in the custom table.
         //We aren't checking for data types, just that the column exists.
         $db = $GLOBALS['db'];
         $tablename = $this->bean->table_name."_cstm";
         $compareFieldDefs = $db->get_columns($tablename);
         foreach($this->bean->field_defs as $name=>$data){
-            if(empty($data['source']) || $data['source'] != 'custom_fields')
-                continue;
+            if(empty($data['source']) || $data['source'] != 'custom_fields') {
+                            continue;
+            }
             /**
              * @bug 43471
              * @issue 43471
@@ -864,8 +887,9 @@ 
             }
             $out .= $this->add_existing_custom_field($data, $execute);
         }
-        if (!empty($out))
-            $out = "/*Checking Custom Fields for module : {$this->module} */\n$out";
+        if (!empty($out)) {
+                    $out = "/*Checking Custom Fields for module : {$this->module} */\n$out";
+        }
 
         return $out;
     }

modules/DynamicFields/FieldsMetaData.php

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/Administration/Administration.php

Braces +16 added lines, -13 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.
@@ -83,8 +85,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();
@@ -121,10 +122,11 @@ 
         }
 
         while($row = $this->db->fetchByAssoc($result)) {
-            if($row['category']."_".$row['name'] == 'ldap_admin_password' || $row['category']."_".$row['name'] == 'proxy_password')
-                $this->settings[$row['category']."_".$row['name']] = $this->decrypt_after_retrieve($row['value']);
-            else
-                $this->settings[$row['category']."_".$row['name']] = $row['value'];
+            if($row['category']."_".$row['name'] == 'ldap_admin_password' || $row['category']."_".$row['name'] == 'proxy_password') {
+                            $this->settings[$row['category']."_".$row['name']] = $this->decrypt_after_retrieve($row['value']);
+            } else {
+                            $this->settings[$row['category']."_".$row['name']] = $row['value'];
+            }
             $this->settings[$row['category']] = true;
         }
         $this->settings[$category] = true;
@@ -135,8 +137,9 @@ 
             $oe->getSystemMailerSettings();
 
             foreach ($oe->field_defs as $def) {
-                if (strpos($def, "mail_") !== false)
-                    $this->settings[$def] = $oe->$def;
+                if (strpos($def, "mail_") !== false) {
+                                    $this->settings[$def] = $oe->$def;
+                }
             }
         }
 
@@ -180,13 +183,13 @@ 
         $row = $this->db->fetchByAssoc($result);
         $row_count = $row['the_count'];
 
-        if($category."_".$key == 'ldap_admin_password' || $category."_".$key == 'proxy_password')
-            $value = $this->encrpyt_before_save($value);
+        if($category."_".$key == 'ldap_admin_password' || $category."_".$key == 'proxy_password') {
+                    $value = $this->encrpyt_before_save($value);
+        }
 
         if( $row_count == 0){
             $result = $this->db->query("INSERT INTO config (value, category, name) VALUES ('$value','$category', '$key')");
-        }
-        else{
+        } else{
             $result = $this->db->query("UPDATE config SET value = '{$value}' WHERE category = '{$category}' AND name = '{$key}'");
         }
         sugar_cache_clear('admin_settings_cache');

modules/Administration/UpgradeHistory.php

Braces +33 added lines, -31 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.
@@ -85,8 +87,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();
@@ -109,13 +110,13 @@ 
 
             if(empty($patch_to_check->id_name)){
                 $where = " WHERE name = '$patch_to_check->name' ";
-            }else{
+            } else{
                 $where = " WHERE id_name = '$patch_to_check->id_name' ";
             }
 
             if(!empty($patch_to_check->id)){
                 $where .= "  AND id != '$patch_to_check->id'  ";
-            }else{
+            } else{
                 $where .= "  AND id is not null  ";
             }
 
@@ -144,7 +145,7 @@ 
         $result = $this->db->query($query);
          if(empty($result)){
             return null;
-         }else{
+         } else{
             $temp_version = 0;
             $id = '';
             while($row = $this->db->fetchByAssoc($result))
@@ -154,10 +155,11 @@ 
                     $id = $row['id'];
                 }
             }//end while
-            if($this->is_right_version_greater(explode('.', $temp_version), explode('.', $version), false))
-                return array('id' => $id, 'version' => $temp_version);
-            else
-                return null;
+            if($this->is_right_version_greater(explode('.', $temp_version), explode('.', $version), false)) {
+                            return array('id' => $id, 'version' => $temp_version);
+            } else {
+                            return null;
+            }
          }
     }
 
@@ -186,7 +188,7 @@ 
                 //we have found a match
                 //if the patch_to_check version is greater than the found version
                 return ($this->is_right_version_greater(explode('.', $history_object->version), explode('.', $patch_to_check->version)));
-            }else{
+            } else{
                 return true;
             }
         }
@@ -194,8 +196,9 @@ 
         //with a matching unique_key in the database
         foreach($patch_list as $more_recent_patch)
         {
-            if($more_recent_patch->id == $patch_to_check->id)
-                break;
+            if($more_recent_patch->id == $patch_to_check->id) {
+                            break;
+            }
 
             //we will only resort to checking the files if we cannot find the unique_keys
             //or the unique_keys do not match
@@ -219,25 +222,27 @@ 
     {
         if(is_file($check_path))
         {
-            if(file_exists($recent_path))
-                return true;
-            else
-                return false;
-        }
-        elseif(is_dir($check_path))
+            if(file_exists($recent_path)) {
+                            return true;
+            } else {
+                            return false;
+            }
+        } elseif(is_dir($check_path))
         {
             $status = false;
 
             $d = dir( $check_path );
             while( $f = $d->read() )
             {
-                if( $f == "." || $f == ".." )
-                    continue;
+                if( $f == "." || $f == ".." ) {
+                                    continue;
+                }
 
                 $status = $this->foundConflict("$check_path/$f", "$recent_path/$f");
 
-                if($status)
-                    break;
+                if($status) {
+                                    break;
+                }
             }
 
             $d->close();
@@ -259,20 +264,17 @@ 
     function is_right_version_greater($left, $right, $equals_is_greater = true){
         if(count($left) == 0 && count($right) == 0){
             return $equals_is_greater;
-        }
-        else if(count($left) == 0 || count($right) == 0){
+        } else if(count($left) == 0 || count($right) == 0){
             return true;
-        }
-        else if($left[0] == $right[0]){
+        } else if($left[0] == $right[0]){
             array_shift($left);
             array_shift($right);
             return $this->is_right_version_greater($left, $right, $equals_is_greater);
-        }
-        else if($left[0] < $right[0]){
+        } else if($left[0] < $right[0]){
            return true;
+        } else {
+                    return false;
         }
-        else
-            return false;
     }
 
     /**

modules/Meetings/Meeting.php

Braces +49 added lines, -41 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.
@@ -133,8 +135,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();
@@ -221,8 +222,9 @@ 
 		}*/
 
 		// prevent a mass mailing for recurring meetings created in Calendar module
-		if(empty($this->id) && !empty($_REQUEST['module']) && $_REQUEST['module'] == "Calendar" && !empty($_REQUEST['repeat_type']) && !empty($this->repeat_parent_id))
-			$check_notify = false;
+		if(empty($this->id) && !empty($_REQUEST['module']) && $_REQUEST['module'] == "Calendar" && !empty($_REQUEST['repeat_type']) && !empty($this->repeat_parent_id)) {
+					$check_notify = false;
+		}
 
         if (empty($this->status) ) {
             $this->status = $this->getDefaultStatus();
@@ -326,10 +328,11 @@ 
 
         $query .= $custom_join['join'];
 
-		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;
+		}
 
         $order_by = $this->process_order_by($order_by);
         if (!empty($order_by)) {
@@ -419,15 +422,18 @@ 
 		}
 
         //setting default date and time
-		if (is_null($this->date_start))
-			$this->date_start = $timedate->now();
-		if (is_null($this->time_start))
-			$this->time_start = $timedate->to_display_time(TimeDate::getInstance()->nowDb(), true);
+		if (is_null($this->date_start)) {
+					$this->date_start = $timedate->now();
+		}
+		if (is_null($this->time_start)) {
+					$this->time_start = $timedate->to_display_time(TimeDate::getInstance()->nowDb(), true);
+		}
 		if (is_null($this->duration_hours)) {
 			$this->duration_hours = "0";
 		}
-		if (is_null($this->duration_minutes))
-			$this->duration_minutes = "1";
+		if (is_null($this->duration_minutes)) {
+					$this->duration_minutes = "1";
+		}
 
 		if(empty($this->id) && !empty($_REQUEST['date_start'])){
 			$this->date_start = $_REQUEST['date_start'];
@@ -446,8 +452,7 @@ 
                     $td = $td->modify("+{$this->duration_minutes} mins");
                 }
                 $this->date_end = $td->format($GLOBALS['timedate']->get_date_time_format());
-            }
-            else
+            } else
             {
                 $GLOBALS['log']->fatal("Meeting::save: Bad date {$this->date_start} for format ".$GLOBALS['timedate']->get_date_time_format());
             }
@@ -469,8 +474,9 @@ 
 
 		if ( empty($this->id) ) {
 		    $reminder_t = $GLOBALS['current_user']->getPreference('reminder_time');
-		    if ( isset($reminder_t) )
-		        $this->reminder_time = $reminder_t;
+		    if ( isset($reminder_t) ) {
+		    		        $this->reminder_time = $reminder_t;
+		    }
 		}
 		$this->reminder_checked = $this->reminder_time == -1 ? false : true;
 
@@ -479,8 +485,9 @@ 
 		}
 		if(empty($this->id)){
 			$reminder_t = $GLOBALS['current_user']->getPreference('email_reminder_time');
-			if(isset($reminder_t))
-		    		$this->email_reminder_time = $reminder_t;
+			if(isset($reminder_t)) {
+					    		$this->email_reminder_time = $reminder_t;
+			}
 		}
 		$this->email_reminder_checked = $this->email_reminder_time == -1 ? false : true;
 
@@ -496,12 +503,14 @@ 
 		$meeting_fields = $this->get_list_view_array();
 
 		global $app_list_strings, $focus, $action, $currentModule;
-		if(isset($this->parent_type))
-			$meeting_fields['PARENT_MODULE'] = $this->parent_type;
+		if(isset($this->parent_type)) {
+					$meeting_fields['PARENT_MODULE'] = $this->parent_type;
+		}
 		if($this->status == "Planned") {
 			//cn: added this if() to deal with sequential Closes in Meetings.	this is a hack to a hack(formbase.php->handleRedirect)
-			if(empty($action))
-			     $action = "index";
+			if(empty($action)) {
+						     $action = "index";
+			}
             $setCompleteUrl = "<a id='{$this->id}' onclick='SUGAR.util.closeActivityPanel.show(\"{$this->module_dir}\",\"{$this->id}\",\"Held\",\"listview\",\"1\");'>";
 			if ($this->ACLAccess('edit')) {
                 $meeting_fields['SET_COMPLETE'] = $setCompleteUrl . SugarThemeRegistry::current()->getImage("close_inline"," border='0'",null,null,'.gif',translate('LBL_CLOSEINLINE'))."</a>";
@@ -516,7 +525,7 @@ 
 		$date_db = $timedate->to_db($mergeTime);
 		if($date_db	< $today	) {
 			$meeting_fields['DATE_START']= "<font class='overdueTask'>".$meeting_fields['DATE_START']."</font>";
-		}else if($date_db	< $nextday) {
+		} else if($date_db	< $nextday) {
 			$meeting_fields['DATE_START'] = "<font class='todaysTask'>".$meeting_fields['DATE_START']."</font>";
 		} else {
 			$meeting_fields['DATE_START'] = "<font class='futureTask'>".$meeting_fields['DATE_START']."</font>";
@@ -683,14 +692,12 @@ 
 			{
 				vCal::cache_sugar_vcal($user);
 			}
-		}
-		else if($user->object_name == 'Contact')
+		} else if($user->object_name == 'Contact')
 		{
 			$relate_values = array('contact_id'=>$user->id,'meeting_id'=>$this->id);
 			$data_values = array('accept_status'=>$status);
 			$this->set_relationship($this->rel_contacts_table, $relate_values, true, true,$data_values);
-		}
-        else if($user->object_name == 'Lead')
+		} else if($user->object_name == 'Lead')
 		{
 			$relate_values = array('lead_id'=>$user->id,'meeting_id'=>$this->id);
 			$data_values = array('accept_status'=>$status);
@@ -744,8 +751,9 @@ 
 		global $sugar_config;
 		if(isset($sugar_config['disable_notify_current_user']) && $sugar_config['disable_notify_current_user']) {
 			global $current_user;
-			if(isset($list[$current_user->id]))
-				unset($list[$current_user->id]);
+			if(isset($list[$current_user->id])) {
+							unset($list[$current_user->id]);
+			}
 		}
 		return $list;
 	}
@@ -836,11 +844,10 @@ 
            //add assigned_user_id to exclude list and let the logic from MeetingFormBase determine whether assigned user id gets added to the relationship
            	if(!empty($GLOBALS['soap_server_object'])){
            		$exclude = array('contact_id', 'user_id');
-           	}else{
+           	} else{
 	    		$exclude = array('contact_id', 'user_id','assigned_user_id');
            	}
-           }
-           else{
+           } else{
            	$exclude = array('user_id');
            }
         }
@@ -855,13 +862,14 @@ 
 	{
 	    if ( $this->parent_type == 'Contacts' ) {
 	        $this->load_relationship('contacts');
-	        if ( !$this->contacts->relationship_exists('contacts',array('id'=>$this->parent_id)) )
-	            $this->contacts->add($this->parent_id);
-	    }
-	    elseif ( $this->parent_type == 'Leads' ) {
+	        if ( !$this->contacts->relationship_exists('contacts',array('id'=>$this->parent_id)) ) {
+	        	            $this->contacts->add($this->parent_id);
+	        }
+	    } elseif ( $this->parent_type == 'Leads' ) {
 	        $this->load_relationship('leads');
-	        if ( !$this->leads->relationship_exists('leads',array('id'=>$this->parent_id)) )
-	            $this->leads->add($this->parent_id);
+	        if ( !$this->leads->relationship_exists('leads',array('id'=>$this->parent_id)) ) {
+	        	            $this->leads->add($this->parent_id);
+	        }
 	    }
 
 	    parent::afterImportSave();

modules/Meetings/MeetingsJjwg_MapsLogicHook.php

Braces +4 added lines, -3 removed lines

@@ -1,6 +1,8 @@ 
 <?php
 
-if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 
 class MeetingsJjwg_MapsLogicHook
 {
@@ -19,8 +21,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();

modules/Meetings/views/view.listbytype.php

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();