adamjakab / SuiteCRM

modules/AOR_Reports/Dashlets/AORReportsDashlet/AORReportsDashlet.php

Indentation +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
     var $onlyCharts;
 
     function AORReportsDashlet($id, $def = array()) {
-		global $current_user, $app_strings;
+        global $current_user, $app_strings;
 
         parent::Dashlet($id);
         $this->isConfigurable = true;
@@ -68,7 +68,7 @@ 
         }
     }
 
-	function process() {
+    function process() {
     }
 
     public function displayOptions() {

modules/AOR_Reports/Dashlets/AORReportsDashlet/AORReportsDashlet.meta.php

Indentation +3 added lines, -3 removed lines

@@ -3,6 +3,6 @@
 global $app_strings;
 
 $dashletMeta['AORReportsDashlet'] = array('module'		=> 'AOR_Reports',
-										  'title'       => translate('LBL_AOR_REPORTS_DASHLET', 'AOR_Reports'),
-                                          'description' => 'Displays Reports',
-                                          'category'    => 'Module Views');
+                                            'title'       => translate('LBL_AOR_REPORTS_DASHLET', 'AOR_Reports'),
+                                            'description' => 'Displays Reports',
+                                            'category'    => 'Module Views');

modules/DynamicFields/DynamicField.php

Indentation +68 added lines, -68 removed lines

@@ -51,7 +51,7 @@ 
         $this->base_path = "custom/Extension/modules/{$this->module}/Ext/Vardefs";
     }
 
-   function getModuleName()
+    function getModuleName()
     {
         return $this->module ;
     }
@@ -69,11 +69,11 @@ 
 
 
     /**
-    * This will add the bean as a reference in this object as well as building the custom field cache if it has not been built
-    * LOADS THE BEAN IF THE BEAN IS NOT BEING PASSED ALONG IN SETUP IT SHOULD BE SET PRIOR TO SETUP
-    *
-    * @param SUGARBEAN $bean
-    */
+     * This will add the bean as a reference in this object as well as building the custom field cache if it has not been built
+     * LOADS THE BEAN IF THE BEAN IS NOT BEING PASSED ALONG IN SETUP IT SHOULD BE SET PRIOR TO SETUP
+     *
+     * @param SUGARBEAN $bean
+     */
     function setup($bean = null) {
         if ($bean) {
             $this->bean = $bean;
@@ -95,12 +95,12 @@ 
     }
 
     /**
-    * Builds the cache for custom fields based on the vardefs
-    *
-    * @param STRING $module
-    * @param boolean saveCache Boolean value indicating whether or not to pass saveCache value to saveToVardef, defaults to true
-    * @return unknown
-    */
+     * Builds the cache for custom fields based on the vardefs
+     *
+     * @param STRING $module
+     * @param boolean saveCache Boolean value indicating whether or not to pass saveCache value to saveToVardef, defaults to true
+     * @return unknown
+     */
     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']))
@@ -161,8 +161,8 @@ 
     }
 
     /**
-    * Returns the widget for a custom field from the fields_meta_data table.
-    */
+     * Returns the widget for a custom field from the fields_meta_data table.
+     */
     function getFieldWidget($module, $fieldName) {
         if (empty($module) || empty($fieldName)){
             sugar_die("Unable to load widget for '$module' : '$fieldName'");
@@ -179,12 +179,12 @@ 
 
 
     /**
-    * Updates the cached vardefs with the custom field information stored in result
-    *
-    * @param string $module
-    * @param array $result
-    * @param boolean saveCache Boolean value indicating whether or not to call VardefManager::saveCache, defaults to true
-    */
+     * Updates the cached vardefs with the custom field information stored in result
+     *
+     * @param string $module
+     * @param array $result
+     * @param boolean saveCache Boolean value indicating whether or not to call VardefManager::saveCache, defaults to true
+     */
     function saveToVardef($module,$result,$saveCache=true) {
 
 
@@ -248,14 +248,14 @@ 
     }
 
     /**
-    * returns either false or an array containing the select and join parameter for a query using custom fields
-    * @param $expandedList boolean	If true, return a list of all fields with source=custom_fields in the select instead of the standard _cstm.*
-    *     This is required for any downstream construction of a SQL statement where we need to manipulate the select list,
-    *     for example, listviews with custom relate fields where the value comes from join rather than from the custom table
-    *
-    * @return array select=>select columns, join=>prebuilt join statement
-    */
-  function getJOIN( $expandedList = false , $includeRelates = false, &$where = false){
+     * returns either false or an array containing the select and join parameter for a query using custom fields
+     * @param $expandedList boolean	If true, return a list of all fields with source=custom_fields in the select instead of the standard _cstm.*
+     *     This is required for any downstream construction of a SQL statement where we need to manipulate the select list,
+     *     for example, listviews with custom relate fields where the value comes from join rather than from the custom table
+     *
+     * @return array select=>select columns, join=>prebuilt join statement
+     */
+    function getJOIN( $expandedList = false , $includeRelates = false, &$where = false){
         if(!$this->bean->hasCustomFields()){
             return array(
                 'select' => '',
@@ -308,7 +308,7 @@ 
 
     }
 
-   function getRelateJoin($field_def, $joinTableAlias, $withIdName = true) {
+    function getRelateJoin($field_def, $joinTableAlias, $withIdName = true) {
         if (empty($field_def['type']) || $field_def['type'] != "relate") {
             return false;
         }
@@ -346,13 +346,13 @@ 
         $ret_array['from'] = " LEFT JOIN $rel_table $joinTableAlias ON $tableName.$relID = $joinTableAlias.id"
                             . " AND $joinTableAlias.deleted=0 ";
         return $ret_array;
-   }
+    }
 
-   /**
-    * Fills in all the custom fields of type relate relationships for an object
-    *
-    */
-   function fill_relationships(){
+    /**
+     * Fills in all the custom fields of type relate relationships for an object
+     *
+     */
+    function fill_relationships(){
         global $beanList, $beanFiles;
         if(!empty($this->bean->relDepth)) {
             if($this->bean->relDepth > 1)return;
@@ -387,7 +387,7 @@ 
      *
      * @param boolean $isUpdate
      */
-     function save($isUpdate){
+        function save($isUpdate){
 
         if($this->bean->hasCustomFields() && isset($this->bean->id)){
 
@@ -422,8 +422,8 @@ 
                     }
 
                     $val = $this->bean->$name;
-					if(($field['type'] == 'date' || $field['type'] == 'datetimecombo') && (empty($this->bean->$name )|| $this->bean->$name == '1900-01-01')){
-                    	$quote = '';
+                    if(($field['type'] == 'date' || $field['type'] == 'datetimecombo') && (empty($this->bean->$name )|| $this->bean->$name == '1900-01-01')){
+                        $quote = '';
                         $val = 'NULL';
                         $this->bean->$name = ''; // do not set it to string 'NULL'
                     }
@@ -571,11 +571,11 @@ 
         if($field){
             if(!$is_update){
                 //Do two SQL calls here in this case
-            	//The first is to create the column in the custom table without the default value
-            	//The second is to modify the column created in the custom table to set the default value
-            	//We do this so that the existing entries in the custom table don't have the default value set
-            	$field->default = '';
-            	$field->default_value = '';
+                //The first is to create the column in the custom table without the default value
+                //The second is to modify the column created in the custom table to set the default value
+                //We do this so that the existing entries in the custom table don't have the default value set
+                $field->default = '';
+                $field->default_value = '';
                 // resetting default and default_value does not work for multienum and causes trouble for mssql
                 // so using a temporary variable here to indicate that we don't want default for this query
                 $field->no_default = 1;
@@ -583,19 +583,19 @@ 
                 // unsetting temporary member variable
                 unset($field->no_default);
                 if(!empty($query)){
-                	$GLOBALS['db']->query($query, true, "Cannot create column");
-	                $field->default = $fmd->default_value;
-	                $field->default_value = $fmd->default_value;
-	                $query = $field->get_db_modify_alter_table($this->bean->table_name . '_cstm');
-	                if(!empty($query)){
-	                	$GLOBALS['db']->query($query, true, "Cannot set default");
-	            	}
+                    $GLOBALS['db']->query($query, true, "Cannot create column");
+                    $field->default = $fmd->default_value;
+                    $field->default_value = $fmd->default_value;
+                    $query = $field->get_db_modify_alter_table($this->bean->table_name . '_cstm');
+                    if(!empty($query)){
+                        $GLOBALS['db']->query($query, true, "Cannot set default");
+                    }
                 }
             }else{
                 $query = $field->get_db_modify_alter_table($this->bean->table_name . '_cstm');
                 if(!empty($query)){
-                	$GLOBALS['db']->query($query, true, "Cannot modify field");
-            	}
+                    $GLOBALS['db']->query($query, true, "Cannot modify field");
+                }
             }
             $fmd->save();
             $this->buildCache($this->module);
@@ -761,12 +761,12 @@ 
                 )
             );
             $ididx = array(
-       			'id'=>array(
-       				'name' =>$this->bean->table_name."_cstm_pk",
-       				'type' =>'primary',
-       				'fields'=>array('id_c')
+                    'id'=>array(
+                        'name' =>$this->bean->table_name."_cstm_pk",
+                        'type' =>'primary',
+                        'fields'=>array('id_c')
                 ),
-           );
+            );
 
             $query = $GLOBALS['db']->createTableSQLParams($this->bean->table_name."_cstm", $iddef, $ididx);
             if(!$GLOBALS['db']->supports("inline_keys")) {
@@ -798,14 +798,14 @@ 
      *
      */
     function add_existing_custom_fields($execute = true){
-    	$out = "";
+        $out = "";
         if($this->bean->hasCustomFields()){
-	        foreach($this->bean->field_defs as $name=>$data){
-	        	if(empty($data['source']) || $data['source'] != 'custom_fields')
+            foreach($this->bean->field_defs as $name=>$data){
+                if(empty($data['source']) || $data['source'] != 'custom_fields')
                     continue;
-	            $out .= $this->add_existing_custom_field($data, $execute);
-	        }
-    	}
+                $out .= $this->add_existing_custom_field($data, $execute);
+            }
+        }
         return $out;
     }
 
@@ -959,7 +959,7 @@ 
 
     }
 
-   function populateXTPL($xtpl, $view) {
+    function populateXTPL($xtpl, $view) {
 
         if($this->bean->hasCustomFields()){
             $results = $this->getAllFieldsView($view, 'xtpl');
@@ -984,12 +984,12 @@ 
     }
 
     function getAllFieldsView($view, $type){
-         require_once ('modules/DynamicFields/FieldCases.php');
-         $results = array();
-         foreach($this->bean->field_defs as $name=>$data){
+            require_once ('modules/DynamicFields/FieldCases.php');
+            $results = array();
+            foreach($this->bean->field_defs as $name=>$data){
             if(empty($data['source']) || $data['source'] != 'custom_fields')
             {
-            	continue;
+                continue;
             }
             $field = get_widget ( $data ['type'] );
             $field->populateFromRow($data);

modules/DynamicFields/UpgradeFields.php

Indentation +74 added lines, -74 removed lines

@@ -40,95 +40,95 @@ 
 
 require_once('modules/DynamicFields/FieldCases.php');
 require_once('modules/DynamicFields/DynamicField.php');
- global $db;
- if(!isset($db)){
- 	$db = DBManagerFactory::getInstance();
- }
- $result = $db->query( 'SELECT * FROM fields_meta_data WHERE deleted = 0 ORDER BY custom_module');
- $modules = array();
- /*
+    global $db;
+    if(!isset($db)){
+        $db = DBManagerFactory::getInstance();
+    }
+    $result = $db->query( 'SELECT * FROM fields_meta_data WHERE deleted = 0 ORDER BY custom_module');
+    $modules = array();
+    /*
   * get the real field_meta_data
   */
- while($row = $db->fetchByAssoc($result)){
- 	$the_modules = $row['custom_module'];
- 	if(!isset($modules[$the_modules])){
- 		$modules[$the_modules] = array();	
- 	}
- 	$modules[$the_modules][$row['name']] = $row['name'];
- }
+    while($row = $db->fetchByAssoc($result)){
+        $the_modules = $row['custom_module'];
+        if(!isset($modules[$the_modules])){
+            $modules[$the_modules] = array();	
+        }
+        $modules[$the_modules][$row['name']] = $row['name'];
+    }
  	
- $simulate = false;
- if(!isset($_REQUEST['run'])){
- 	$simulate = true;
- 	echo "SIMULATION MODE - NO CHANGES WILL BE MADE EXCEPT CLEARING CACHE";
- }	
+    $simulate = false;
+    if(!isset($_REQUEST['run'])){
+        $simulate = true;
+        echo "SIMULATION MODE - NO CHANGES WILL BE MADE EXCEPT CLEARING CACHE";
+    }	
 
- foreach($modules as $the_module=>$fields){
-         if(isset($beanList[$the_module]))
-         {
- 	$class_name = $beanList[$the_module];
- 	echo "<br><br>Scanning $the_module <br>";
+    foreach($modules as $the_module=>$fields){
+            if(isset($beanList[$the_module]))
+            {
+        $class_name = $beanList[$the_module];
+        echo "<br><br>Scanning $the_module <br>";
 		
-		require_once($beanFiles[$class_name]);
-		$mod = new $class_name();
-		if(!$db->tableExists($mod->table_name . "_cstm")){
-			$mod->custom_fields = new DynamicField();
-			$mod->custom_fields->setup($mod);
-		$mod->custom_fields->createCustomTable();
-		}
+        require_once($beanFiles[$class_name]);
+        $mod = new $class_name();
+        if(!$db->tableExists($mod->table_name . "_cstm")){
+            $mod->custom_fields = new DynamicField();
+            $mod->custom_fields->setup($mod);
+        $mod->custom_fields->createCustomTable();
+        }
 
-		$result = $db->query("DESCRIBE $mod->table_name" . "_cstm");
+        $result = $db->query("DESCRIBE $mod->table_name" . "_cstm");
 		
-		while($row = $db->fetchByAssoc($result)){
+        while($row = $db->fetchByAssoc($result)){
 			
 			
-			$col = $row['Field'];
-			$type = $row['Type'];
-			$fieldDef = $mod->getFieldDefinition($col);
-			$the_field = get_widget($fieldDef['type']);
-			$the_field->set($fieldDef);
+            $col = $row['Field'];
+            $type = $row['Type'];
+            $fieldDef = $mod->getFieldDefinition($col);
+            $the_field = get_widget($fieldDef['type']);
+            $the_field->set($fieldDef);
 				
-				if(!isset($fields[$col]) && $col != 'id_c'){
-					if(!$simulate)$db->query("ALTER TABLE $mod->table_name" . "_cstm DROP COLUMN $col");
-					unset($fields[$col]);
-					echo "Dropping Column $col from $mod->table_name" . "_cstm for module $the_module<br>";
-				}	else{
-					if($col != 'id_c'){
-					if(trim($the_field->get_db_type()) != trim($type)){
+                if(!isset($fields[$col]) && $col != 'id_c'){
+                    if(!$simulate)$db->query("ALTER TABLE $mod->table_name" . "_cstm DROP COLUMN $col");
+                    unset($fields[$col]);
+                    echo "Dropping Column $col from $mod->table_name" . "_cstm for module $the_module<br>";
+                }	else{
+                    if($col != 'id_c'){
+                    if(trim($the_field->get_db_type()) != trim($type)){
 						
-					echo "Fixing Column Type for $col changing $type to ". $the_field->get_db_type() . "<br>";
-					if(!$simulate)$db->query($the_field->get_db_modify_alter_table($mod->table_name . '_cstm'));		
-					}
-					}
+                    echo "Fixing Column Type for $col changing $type to ". $the_field->get_db_type() . "<br>";
+                    if(!$simulate)$db->query($the_field->get_db_modify_alter_table($mod->table_name . '_cstm'));		
+                    }
+                    }
 					
-					unset($fields[$col]);
-				}
+                    unset($fields[$col]);
+                }
 			
-		}
+        }
 			
-			echo sizeof($fields) . " field(s) missing from $mod->table_name" . "_cstm<br>";
-			foreach($fields as $field){
-				echo "Adding Column $field to $mod->table_name" . "_cstm<br>";
-				if(!$simulate){
-					$the_field = $mod->getFieldDefinition($field);
-					$field = get_widget($the_field['type']);
-					$field->set($the_field);
-					$query = $field->get_db_add_alter_table($mod->table_name . '_cstm');
-					echo $query;
-            		if(!empty($query)){
-                		$mod->db->query($query);
-            		}
-				}
-			}
-         }
-	}
+            echo sizeof($fields) . " field(s) missing from $mod->table_name" . "_cstm<br>";
+            foreach($fields as $field){
+                echo "Adding Column $field to $mod->table_name" . "_cstm<br>";
+                if(!$simulate){
+                    $the_field = $mod->getFieldDefinition($field);
+                    $field = get_widget($the_field['type']);
+                    $field->set($the_field);
+                    $query = $field->get_db_add_alter_table($mod->table_name . '_cstm');
+                    echo $query;
+                    if(!empty($query)){
+                        $mod->db->query($query);
+                    }
+                }
+            }
+            }
+    }
 	
 	
-	DynamicField::deleteCache();	
-	echo '<br>Done<br>';
-	if($simulate){
-		echo '<a href="index.php?module=Administration&action=UpgradeFields&run=true">Execute non-simulation mode</a>';	
-	}
+    DynamicField::deleteCache();	
+    echo '<br>Done<br>';
+    if($simulate){
+        echo '<a href="index.php?module=Administration&action=UpgradeFields&run=true">Execute non-simulation mode</a>';	
+    }
 		
 		
  
@@ -137,4 +137,4 @@ 
  
  
  
- ?>
\ No newline at end of file
+    ?>
\ No newline at end of file

modules/Relationships/field_arrays.php

Indentation +32 added lines, -32 removed lines

@@ -46,39 +46,39 @@
  * Contributor(s): ______________________________________..
  ********************************************************************************/
 $fields_array['Relationship'] = array ('column_fields' => Array(
-		'id',
-		'relationship_name',
-		'lhs_module',
-		'lhs_table',
-		'lhs_key',
-		'rhs_module',
-		'rhs_table',
-		'rhs_key',
-		'join_table',
-		'join_key_lhs',
-		'join_key_rhs',
-		'relationship_type',
-		'relationship_role_column',
-		'relationship_role_column_value',
-		'reverse',
-	),
+        'id',
+        'relationship_name',
+        'lhs_module',
+        'lhs_table',
+        'lhs_key',
+        'rhs_module',
+        'rhs_table',
+        'rhs_key',
+        'join_table',
+        'join_key_lhs',
+        'join_key_rhs',
+        'relationship_type',
+        'relationship_role_column',
+        'relationship_role_column_value',
+        'reverse',
+    ),
         'list_fields' =>  Array(
-		'id',
-		'relationship_name',
-		'lhs_module',
-		'lhs_table',
-		'lhs_key',
-		'rhs_module',
-		'rhs_table',
-		'rhs_key',
-		'join_table',
-		'join_key_lhs',
-		'join_key_rhs',
-		'relationship_type',
-		'relationship_role_column',
-		'relationship_role_column_value',
-		'reverse',
-	),
+        'id',
+        'relationship_name',
+        'lhs_module',
+        'lhs_table',
+        'lhs_key',
+        'rhs_module',
+        'rhs_table',
+        'rhs_key',
+        'join_table',
+        'join_key_lhs',
+        'join_key_rhs',
+        'relationship_type',
+        'relationship_role_column',
+        'relationship_role_column_value',
+        'reverse',
+    ),
     'required_fields' =>   array("relationship_name"=>1),
 );
 ?>
\ No newline at end of file

modules/jjwg_Maps/jjwg_Maps_Router.php

Indentation +24 added lines, -24 removed lines

@@ -11,21 +11,21 @@ 
 
 if (!empty($_REQUEST['cron'])) {
   
-  require_once('modules/jjwg_Maps/jjwg_Maps.php');
-  require_once('modules/jjwg_Maps/controller.php');
-  /*
+    require_once('modules/jjwg_Maps/jjwg_Maps.php');
+    require_once('modules/jjwg_Maps/controller.php');
+    /*
    * This script can be used as an entry point for a cron
    * job to run the address geocoding on a regular basis.
    * index.php?module=jjwg_Maps&entryPoint=jjwg_Maps&cron=1&limit=2500
    */
-  $controller = new jjwg_MapsController();
-  $controller->action_geocode_addresses();
+    $controller = new jjwg_MapsController();
+    $controller->action_geocode_addresses();
   
-  exit;
+    exit;
 
 } else {
   
-  /*
+    /*
    * This script is also used to pass selected records from 
    * a module list view to the Maps Module (jjwg_Maps).
    *
@@ -45,25 +45,25 @@ 
    * 4.) Parameter Search - Checked Records - Map
    *     Uses 'uid'(s) parameter to define search
    */
-  //echo 'Test:<pre>'."\n";
-  //foreach (array_keys($_REQUEST) as $key) {
-  //  echo 'Name: '.htmlspecialchars($key).'  Value: '.htmlspecialchars($_REQUEST[$key])."\n";
-  //}
+    //echo 'Test:<pre>'."\n";
+    //foreach (array_keys($_REQUEST) as $key) {
+    //  echo 'Name: '.htmlspecialchars($key).'  Value: '.htmlspecialchars($_REQUEST[$key])."\n";
+    //}
   
-  // Redirect parameters to view/action using Javascript form post.
-  echo '<html><head></head><body>';
-  echo '<form name="redirect" action="index.php" method="POST">'."\n";
-  echo '<input type="hidden" name="module" value="jjwg_Maps">'."\n";
-  echo '<input type="hidden" name="action" value="map_display">'."\n";
-  foreach (array_keys($_REQUEST) as $key) {
+    // Redirect parameters to view/action using Javascript form post.
+    echo '<html><head></head><body>';
+    echo '<form name="redirect" action="index.php" method="POST">'."\n";
+    echo '<input type="hidden" name="module" value="jjwg_Maps">'."\n";
+    echo '<input type="hidden" name="action" value="map_display">'."\n";
+    foreach (array_keys($_REQUEST) as $key) {
     if (!in_array($key, array('action','module','entryPoint','display_module', 'quick_address'))) {
-      echo '<input type="hidden" name="'.htmlspecialchars($key).'" value="'.htmlspecialchars($_REQUEST[$key]).'">'."\n";
+        echo '<input type="hidden" name="'.htmlspecialchars($key).'" value="'.htmlspecialchars($_REQUEST[$key]).'">'."\n";
     }
-  }
-  echo '<input type="hidden" name="display_module" value="'.htmlspecialchars($_REQUEST['display_module']).'">'."\n";
-  echo '</form>'."\n";
-  echo '<script language="javascript" type="text/javascript">document.redirect.submit();</script>'."\n"; 
-  echo '</body></html>';
+    }
+    echo '<input type="hidden" name="display_module" value="'.htmlspecialchars($_REQUEST['display_module']).'">'."\n";
+    echo '</form>'."\n";
+    echo '<script language="javascript" type="text/javascript">document.redirect.submit();</script>'."\n"; 
+    echo '</body></html>';
   
-  exit;
+    exit;
 }

modules/SecurityGroups/VersionCheck.php

Indentation +23 added lines, -23 removed lines

@@ -4,30 +4,30 @@ 
 
 class VersionCheck {
 
-	function version_check($event, $arguments)
-	{
-		global $current_user;
+    function version_check($event, $arguments)
+    {
+        global $current_user;
 	
-		require_once('include/utils.php');
-		if(is_admin($current_user) && empty($_REQUEST['to_pdf']) && empty($_REQUEST['sugar_body_only'])) {
-			//require_once('modules/SecurityGroups/SecurityGroup.php');
+        require_once('include/utils.php');
+        if(is_admin($current_user) && empty($_REQUEST['to_pdf']) && empty($_REQUEST['sugar_body_only'])) {
+            //require_once('modules/SecurityGroups/SecurityGroup.php');
 			
-			//check to see if the securitysuite version
-			//matches the sugar version. If not then display an error messag
+            //check to see if the securitysuite version
+            //matches the sugar version. If not then display an error messag
 			
-			global $sugar_config;
-			if(empty($sugar_config['securitysuite_version'])
-				|| $sugar_config['securitysuite_version'] != $sugar_config['sugar_version']
-			) {
-				$securitysuite_warning = "Warning! SecuritySuite no longer matches the version of Sugar that you are running. "
-					. "SecuritySuite will not work correctly until updated to ".$sugar_config['sugar_version'].". "
-					. "Upgrade now to  ";
+            global $sugar_config;
+            if(empty($sugar_config['securitysuite_version'])
+                || $sugar_config['securitysuite_version'] != $sugar_config['sugar_version']
+            ) {
+                $securitysuite_warning = "Warning! SecuritySuite no longer matches the version of Sugar that you are running. "
+                    . "SecuritySuite will not work correctly until updated to ".$sugar_config['sugar_version'].". "
+                    . "Upgrade now to  ";
 					
-				global $sugar_config;
-				$upgrade_url = "http://www.eggsurplus.com/version.php?version=".$sugar_config['sugar_version'];
-				$upgrade_text = "SecuritySuite for ".$sugar_config['sugar_version'];
-				$GLOBALS['log']->fatal($securitysuite_warning."<a href='$upgrade_url'>$upgrade_text</a>");
-				//echo $display_warning;
+                global $sugar_config;
+                $upgrade_url = "http://www.eggsurplus.com/version.php?version=".$sugar_config['sugar_version'];
+                $upgrade_text = "SecuritySuite for ".$sugar_config['sugar_version'];
+                $GLOBALS['log']->fatal($securitysuite_warning."<a href='$upgrade_url'>$upgrade_text</a>");
+                //echo $display_warning;
 
 
 ?>
@@ -50,10 +50,10 @@ 
 </script>
 <?php
 
-			}
+            }
 		
-		} //end if admin
-	} 
+        } //end if admin
+    } 
 
 
 }

modules/SecurityGroups/SecurityGroup.php

Indentation +3 added lines, -3 removed lines

@@ -54,7 +54,7 @@ 
                     and secr.module = '$module'
                 where secg.deleted = 0
             )";
-        */
+         */
 
             //and secr.record_id = $table_name.id //not needed as the in clause takes care of this check
         }
@@ -376,7 +376,7 @@ 
             //if(empty($parent_type) || empty($parent_id)) {
                 foreach($focus->field_name_map as $name=>$def) {
 
-                   if($def['type']=='relate' && isset($def['id_name'])
+                    if($def['type']=='relate' && isset($def['id_name'])
                         && isset($def['module']) && strtolower($def['module']) != "users" ) {
 
                         if(isset($_REQUEST[$def['id_name']])) {
@@ -390,7 +390,7 @@ 
 
                             SecurityGroup::inherit_parentQuery($focus, $relate_parent_type, $relate_parent_id, $focus_id, $focus_module_dir);
                         }
-                   }
+                    }
                 }
             //}
 

modules/SecurityGroups/SecurityGroupUserRelationship.php

Indentation +8 added lines, -8 removed lines

@@ -32,14 +32,14 @@
     
     var $additional_column_fields = Array();
         var $field_defs = array (
-       'id'=>array('name' =>'id', 'type' =>'char', 'len'=>'36', 'default'=>'')
-      , 'securitygroup_id'=>array('name' =>'securitygroup_id', 'type' =>'char', 'len'=>'36', )
-      , 'user_id'=>array('name' =>'user_id', 'type' =>'char', 'len'=>'36',)
-      , 'noninheritable'=>array('name' =>'noninheritable', 'type' =>'bool', 'len'=>'1')
-      , 'primary_group'=>array('name' =>'primary_group', 'type' =>'bool', 'len'=>'1')
-      , 'date_modified'=>array ('name' => 'date_modified','type' => 'datetime')
-      , 'deleted'=>array('name' =>'deleted', 'type' =>'bool', 'len'=>'1', 'default'=>'0', 'required'=>true)
-      );
+        'id'=>array('name' =>'id', 'type' =>'char', 'len'=>'36', 'default'=>'')
+        , 'securitygroup_id'=>array('name' =>'securitygroup_id', 'type' =>'char', 'len'=>'36', )
+        , 'user_id'=>array('name' =>'user_id', 'type' =>'char', 'len'=>'36',)
+        , 'noninheritable'=>array('name' =>'noninheritable', 'type' =>'bool', 'len'=>'1')
+        , 'primary_group'=>array('name' =>'primary_group', 'type' =>'bool', 'len'=>'1')
+        , 'date_modified'=>array ('name' => 'date_modified','type' => 'datetime')
+        , 'deleted'=>array('name' =>'deleted', 'type' =>'bool', 'len'=>'1', 'default'=>'0', 'required'=>true)
+        );
     function SecurityGroupUserRelationship() {
         $this->db = DBManagerFactory::getInstance();
         $this->dbManager = DBManagerFactory::getInstance();