adamjakab / SuiteCRM

modules/AOR_Reports/views/view.edit.php

Spacing +26 added lines, -26 removed lines

@@ -38,17 +38,17 @@ 
         //readfile('modules/AOR_Reports/css/edit.css');
         readfile('modules/AOR_Reports/js/jqtree/jqtree.css');
         echo "</style>";
-        if (!is_file('cache/jsLanguage/AOR_Fields/' . $GLOBALS['current_language'] . '.js')) {
+        if (!is_file('cache/jsLanguage/AOR_Fields/'.$GLOBALS['current_language'].'.js')) {
             require_once ('include/language/jsLanguage.php');
             jsLanguage::createModuleStringsCache('AOR_Fields', $GLOBALS['current_language']);
         }
-        echo '<script src="cache/jsLanguage/AOR_Fields/'. $GLOBALS['current_language'] . '.js"></script>';
+        echo '<script src="cache/jsLanguage/AOR_Fields/'.$GLOBALS['current_language'].'.js"></script>';
 
-        if (!is_file('cache/jsLanguage/AOR_Conditions/' . $GLOBALS['current_language'] . '.js')) {
+        if (!is_file('cache/jsLanguage/AOR_Conditions/'.$GLOBALS['current_language'].'.js')) {
             require_once ('include/language/jsLanguage.php');
             jsLanguage::createModuleStringsCache('AOR_Conditions', $GLOBALS['current_language']);
         }
-        echo '<script src="cache/jsLanguage/AOR_Conditions/'. $GLOBALS['current_language'] . '.js"></script>';
+        echo '<script src="cache/jsLanguage/AOR_Conditions/'.$GLOBALS['current_language'].'.js"></script>';
         echo '<script src="include/javascript/yui3/build/yui/yui-min.js"></script>';
 
         echo "<script>";
@@ -69,8 +69,8 @@ 
         parent::preDisplay();
     }
 
-    private function getConditionLines(){
-        if(!$this->bean->id){
+    private function getConditionLines() {
+        if (!$this->bean->id) {
             return array();
         }
         $sql = "SELECT id FROM aor_conditions WHERE aor_report_id = '".$this->bean->id."' AND deleted = 0 ORDER BY condition_order ASC";
@@ -79,20 +79,20 @@ 
         while ($row = $this->bean->db->fetchByAssoc($result)) {
             $condition_name = new AOR_Condition();
             $condition_name->retrieve($row['id']);
-            if(!$condition_name->parenthesis) {
+            if (!$condition_name->parenthesis) {
                 $condition_name->module_path = implode(":", unserialize(base64_decode($condition_name->module_path)));
             }
-            if($condition_name->value_type == 'Date'){
+            if ($condition_name->value_type == 'Date') {
                 $condition_name->value = unserialize(base64_decode($condition_name->value));
             }
             $condition_item = $condition_name->toArray();
 
-            if(!$condition_name->parenthesis) {
+            if (!$condition_name->parenthesis) {
                 $display = getDisplayForField($condition_name->module_path, $condition_name->field, $this->bean->report_module);
                 $condition_item['module_path_display'] = $display['module'];
                 $condition_item['field_label'] = $display['field'];
             }
-            if(isset($conditions[$condition_item['condition_order']])) {
+            if (isset($conditions[$condition_item['condition_order']])) {
                 $conditions[] = $condition_item;
             }
             else {
@@ -102,8 +102,8 @@ 
         return $conditions;
     }
 
-    private function getFieldLines(){
-        if(!$this->bean->id){
+    private function getFieldLines() {
+        if (!$this->bean->id) {
             return array();
         }
         $sql = "SELECT id FROM aor_fields WHERE aor_report_id = '".$this->bean->id."' AND deleted = 0 ORDER BY field_order ASC";
@@ -113,10 +113,10 @@ 
         while ($row = $this->bean->db->fetchByAssoc($result)) {
             $field_name = new AOR_Field();
             $field_name->retrieve($row['id']);
-            $field_name->module_path = implode(":",unserialize(base64_decode($field_name->module_path)));
+            $field_name->module_path = implode(":", unserialize(base64_decode($field_name->module_path)));
             $arr = $field_name->toArray();
 
-            $arr['field_type'] = $this->getDisplayForField($field_name->module_path, $field_name->field  , $this->bean->report_module);
+            $arr['field_type'] = $this->getDisplayForField($field_name->module_path, $field_name->field, $this->bean->report_module);
 
             $display = getDisplayForField($field_name->module_path, $field_name->field, $this->bean->report_module);
 
@@ -127,42 +127,42 @@ 
         return $fields;
     }
 
-    private function getChartLines(){
+    private function getChartLines() {
         $charts = array();
-        if(!$this->bean->id){
+        if (!$this->bean->id) {
             return array();
         }
-        foreach($this->bean->get_linked_beans('aor_charts','AOR_Charts') as $chart){
+        foreach ($this->bean->get_linked_beans('aor_charts', 'AOR_Charts') as $chart) {
             $charts[] = $chart->toArray();
         }
         return $charts;
     }
 
-    public function getDisplayForField($modulePath, $field, $reportModule){
+    public function getDisplayForField($modulePath, $field, $reportModule) {
         $modulePathDisplay = array();
         $currentBean = BeanFactory::getBean($reportModule);
         $modulePathDisplay[] = $currentBean->module_name;
-        if(is_array($modulePath)) {
+        if (is_array($modulePath)) {
             $split = $modulePath;
-        }else{
+        } else {
             $split = explode(':', $modulePath);
         }
         if ($split && $split[0] == $currentBean->module_dir) {
             array_shift($split);
         }
-        foreach($split as $relName){
-            if(empty($relName)){
+        foreach ($split as $relName) {
+            if (empty($relName)) {
                 continue;
             }
-            if(!empty($currentBean->field_name_map[$relName]['vname'])){
-                $moduleLabel = trim(translate($currentBean->field_name_map[$relName]['vname'],$currentBean->module_dir),':');
+            if (!empty($currentBean->field_name_map[$relName]['vname'])) {
+                $moduleLabel = trim(translate($currentBean->field_name_map[$relName]['vname'], $currentBean->module_dir), ':');
             }
             $thisModule = getRelatedModule($currentBean->module_dir, $relName);
             $currentBean = BeanFactory::getBean($thisModule);
 
-            if(!empty($moduleLabel)){
+            if (!empty($moduleLabel)) {
                 $modulePathDisplay[] = $moduleLabel;
-            }else {
+            } else {
                 $modulePathDisplay[] = $currentBean->module_name;
             }
         }

modules/AOR_Reports/views/view.detail.php

Spacing +13 added lines, -13 removed lines

@@ -29,31 +29,31 @@ 
     public function __construct() {
         parent::ViewDetail();
     }
-    private function getReportParameters(){
-        if(!$this->bean->id){
+    private function getReportParameters() {
+        if (!$this->bean->id) {
             return array();
         }
-        $conditions = $this->bean->get_linked_beans('aor_conditions','AOR_Conditions', 'condition_order');
+        $conditions = $this->bean->get_linked_beans('aor_conditions', 'AOR_Conditions', 'condition_order');
         $parameters = array();
-        foreach($conditions as $condition){
-            if(!$condition->parameter){
+        foreach ($conditions as $condition) {
+            if (!$condition->parameter) {
                 continue;
             }
-            $condition->module_path = implode(":",unserialize(base64_decode($condition->module_path)));
-            if($condition->value_type == 'Date'){
+            $condition->module_path = implode(":", unserialize(base64_decode($condition->module_path)));
+            if ($condition->value_type == 'Date') {
                 $condition->value = unserialize(base64_decode($condition->value));
             }
             $condition_item = $condition->toArray();
             $display = getDisplayForField($condition->module_path, $condition->field, $this->bean->report_module);
             $condition_item['module_path_display'] = $display['module'];
             $condition_item['field_label'] = $display['field'];
-            if(!empty($this->bean->user_parameters[$condition->id])){
+            if (!empty($this->bean->user_parameters[$condition->id])) {
                 $param = $this->bean->user_parameters[$condition->id];
                 $condition_item['operator'] = $param['operator'];
                 $condition_item['value_type'] = $param['type'];
                 $condition_item['value'] = $param['value'];
             }
-            if(isset($parameters[$condition_item['condition_order']])) {
+            if (isset($parameters[$condition_item['condition_order']])) {
                 $parameters[] = $condition_item;
             }
             else {
@@ -66,14 +66,14 @@ 
     public function preDisplay() {
         global $app_list_strings;
         parent::preDisplay();
-        $this->ss->assign('report_module',$this->bean->report_module);
+        $this->ss->assign('report_module', $this->bean->report_module);
 
 
 
         $this->bean->user_parameters = requestToUserParameters();
 
         //$reportHTML = $this->bean->build_group_report(0,true);
-        $reportHTML = $this->bean->buildMultiGroupReport(0,true);
+        $reportHTML = $this->bean->buildMultiGroupReport(0, true);
 
         $chartsHTML = $this->bean->build_report_chart(null, AOR_Report::CHART_TYPE_RGRAPH);
 
@@ -84,11 +84,11 @@ 
         $this->ss->assign('report_content', $reportHTML);
 
         echo "<input type='hidden' name='report_module' id='report_module' value='{$this->bean->report_module}'>";
-        if (!is_file('cache/jsLanguage/AOR_Conditions/' . $GLOBALS['current_language'] . '.js')) {
+        if (!is_file('cache/jsLanguage/AOR_Conditions/'.$GLOBALS['current_language'].'.js')) {
             require_once ('include/language/jsLanguage.php');
             jsLanguage::createModuleStringsCache('AOR_Conditions', $GLOBALS['current_language']);
         }
-        echo '<script src="cache/jsLanguage/AOR_Conditions/'. $GLOBALS['current_language'] . '.js"></script>';
+        echo '<script src="cache/jsLanguage/AOR_Conditions/'.$GLOBALS['current_language'].'.js"></script>';
 
         $params = $this->getReportParameters();
         echo "<script>var reportParameters = ".json_encode($params).";</script>";

modules/DynamicFields/UpgradeFields.php

Spacing +26 added lines, -26 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.
@@ -41,45 +41,45 @@ 
 require_once('modules/DynamicFields/FieldCases.php');
 require_once('modules/DynamicFields/DynamicField.php');
  global $db;
- if(!isset($db)){
+ if (!isset($db)) {
  	$db = DBManagerFactory::getInstance();
  }
- $result = $db->query( 'SELECT * FROM fields_meta_data WHERE deleted = 0 ORDER BY custom_module');
+ $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)){
+ while ($row = $db->fetchByAssoc($result)) {
  	$the_modules = $row['custom_module'];
- 	if(!isset($modules[$the_modules])){
+ 	if (!isset($modules[$the_modules])) {
  		$modules[$the_modules] = array();	
  	}
  	$modules[$the_modules][$row['name']] = $row['name'];
  }
  	
  $simulate = false;
- if(!isset($_REQUEST['run'])){
+ 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]))
+ 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")){
+		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'];
@@ -88,16 +88,16 @@ 
 			$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");
+				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 "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'));		
 					}
 					}
 					
@@ -106,16 +106,16 @@ 
 			
 		}
 			
-			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){
+			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');
+					$query = $field->get_db_add_alter_table($mod->table_name.'_cstm');
 					echo $query;
-            		if(!empty($query)){
+            		if (!empty($query)) {
                 		$mod->db->query($query);
             		}
 				}
@@ -126,7 +126,7 @@ 
 	
 	DynamicField::deleteCache();	
 	echo '<br>Done<br>';
-	if($simulate){
+	if ($simulate) {
 		echo '<a href="index.php?module=Administration&action=UpgradeFields&run=true">Execute non-simulation mode</a>';	
 	}
 		

modules/Relationships/field_arrays.php

Spacing +2 added lines, -2 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.
@@ -45,7 +45,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
  ********************************************************************************/
-$fields_array['Relationship'] = array ('column_fields' => Array(
+$fields_array['Relationship'] = array('column_fields' => Array(
 		'id',
 		'relationship_name',
 		'lhs_module',

modules/jjwg_Maps/jjwg_Maps_Router.php

Spacing +2 added lines, -2 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');
 
 require_once('include/utils.php');
 require_once('include/export_utils.php');
@@ -56,7 +56,7 @@ 
   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'))) {
+    if (!in_array($key, array('action', 'module', 'entryPoint', 'display_module', 'quick_address'))) {
       echo '<input type="hidden" name="'.htmlspecialchars($key).'" value="'.htmlspecialchars($_REQUEST[$key]).'">'."\n";
     }
   }

modules/SecurityGroups/VersionCheck.php

Spacing +3 added lines, -3 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');
 
 
 class VersionCheck {
@@ -9,14 +9,14 @@ 
 		global $current_user;
 	
 		require_once('include/utils.php');
-		if(is_admin($current_user) && empty($_REQUEST['to_pdf']) && empty($_REQUEST['sugar_body_only'])) {
+		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
 			
 			global $sugar_config;
-			if(empty($sugar_config['securitysuite_version'])
+			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. "

modules/SecurityGroups/SaveSecurityGroupUserRelationship.php

Spacing +6 added lines, -6 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');
 
 require_once('modules/SecurityGroups/SecurityGroupUserRelationship.php');
 
@@ -10,29 +10,29 @@ 
 
 $focus->retrieve($_REQUEST['record']);
 
-foreach($focus->column_fields as $field)
+foreach ($focus->column_fields as $field)
 {
     safe_map($field, $focus, true);
 }
 
-foreach($focus->additional_column_fields as $field)
+foreach ($focus->additional_column_fields as $field)
 {
     safe_map($field, $focus, true);
 }
 
 // send them to the edit screen.
-if(isset($_REQUEST['record']) && $_REQUEST['record'] != "")
+if (isset($_REQUEST['record']) && $_REQUEST['record'] != "")
 {
     $recordID = $_REQUEST['record'];
 }
 
-    if( isset($_POST['noninheritable']) && $_POST['noninheritable'] == '1') {
+    if (isset($_POST['noninheritable']) && $_POST['noninheritable'] == '1') {
         $focus->noninheritable = 1;
     } else {
         $focus->noninheritable = 0;
     }
 
-    if( isset($_POST['primary_group']) && $_POST['primary_group'] == '1') {
+    if (isset($_POST['primary_group']) && $_POST['primary_group'] == '1') {
         $focus->primary_group = 1;
         //unset all other primary groups for this user
         global $db;

modules/SecurityGroups/SecurityGroupUserRelationshipEdit.php

Spacing +14 added lines, -14 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');
 
 require_once('XTemplate/xtpl.php');
 require_once('modules/SecurityGroups/SecurityGroupUserRelationship.php');
@@ -13,11 +13,11 @@ 
 
 $focus = new SecurityGroupUserRelationship();
 
-if(isset($_REQUEST['record'])) {
+if (isset($_REQUEST['record'])) {
     $focus->retrieve($_REQUEST['record']);
 }
 
-if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
+if (isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
     $focus->id = "";
 }
 
@@ -30,8 +30,8 @@ 
 safe_map('primary_group', $focus);
 
 
-$theme_path="themes/".$theme."/";
-$image_path=$theme_path."images/";
+$theme_path = "themes/".$theme."/";
+$image_path = $theme_path."images/";
 require_once($theme_path.'layout_utils.php');
 
 $GLOBALS['log']->info("SecurityGroup User relationship");
@@ -42,10 +42,10 @@ 
 $sqs_objects = array('user_name' => $qsd->getQSParent());
 $sqs_objects['user_name']['populate_list'] = array('user_name', 'user_id');
 $quicksearch_js = $qsd->getQSScripts();
-$quicksearch_js .= '<script type="text/javascript" language="javascript">sqs_objects = ' . $json->encode($sqs_objects) . '</script>';
+$quicksearch_js .= '<script type="text/javascript" language="javascript">sqs_objects = '.$json->encode($sqs_objects).'</script>';
 echo $quicksearch_js;
 
-$xtpl=new XTemplate ('modules/SecurityGroups/SecurityGroupUserRelationshipEdit.html');
+$xtpl = new XTemplate('modules/SecurityGroups/SecurityGroupUserRelationshipEdit.html');
 $xtpl->assign("MOD", $mod_strings);
 $xtpl->assign("APP", $app_strings);
 
@@ -54,25 +54,25 @@ 
 $xtpl->assign("RETURN_ACTION", $_REQUEST['return_action']);
 $xtpl->assign("RETURN_ID", $_REQUEST['return_id']);
 $xtpl->assign("THEME", $theme);
-$xtpl->assign("IMAGE_PATH", $image_path);$xtpl->assign("PRINT_URL", "index.php?".$GLOBALS['request_string']);
+$xtpl->assign("IMAGE_PATH", $image_path); $xtpl->assign("PRINT_URL", "index.php?".$GLOBALS['request_string']);
 $xtpl->assign("ID", $focus->id);
-$xtpl->assign("SECURITYGROUP",$securityGroup = Array("NAME" => $focus->securitygroup_name, "ID" => $focus->securitygroup_id));
-$xtpl->assign("USER",$user = Array("NAME" => $focus->user_name, "ID" => $focus->user_id));
+$xtpl->assign("SECURITYGROUP", $securityGroup = Array("NAME" => $focus->securitygroup_name, "ID" => $focus->securitygroup_id));
+$xtpl->assign("USER", $user = Array("NAME" => $focus->user_name, "ID" => $focus->user_id));
 
 echo "\n<p>\n";
-echo get_module_title($mod_strings['LBL_MODULE_NAME'], $mod_strings['LBL_SECURITYGROUP_USER_FORM_TITLE'].": ".$securityGroup['NAME'] . " - ". $user['NAME'], true);
+echo get_module_title($mod_strings['LBL_MODULE_NAME'], $mod_strings['LBL_SECURITYGROUP_USER_FORM_TITLE'].": ".$securityGroup['NAME']." - ".$user['NAME'], true);
 echo "\n</p>\n";
 
 // noninheritable
 $noninheritable = '';
-if(isset($focus->noninheritable) && $focus->noninheritable == true) {
+if (isset($focus->noninheritable) && $focus->noninheritable == true) {
     $noninheritable = 'CHECKED';
 } 
 $xtpl->assign('noninheritable', $noninheritable);
 
 // primary_group
 $primary_group = '';
-if(isset($focus->primary_group) && $focus->primary_group == true) {
+if (isset($focus->primary_group) && $focus->primary_group == true) {
     $primary_group = 'CHECKED';
 } 
 $xtpl->assign('primary_group', $primary_group);
@@ -85,7 +85,7 @@ 
 $javascript = new javascript();
 $javascript->setFormName('EditView');
 $javascript->setSugarBean($focus);
-$javascript->addToValidateBinaryDependency('user_name', 'alpha', $app_strings['ERR_SQS_NO_MATCH_FIELD'] . $mod_strings['LBL_USER_NAME'], 'false', '', 'user_id');
+$javascript->addToValidateBinaryDependency('user_name', 'alpha', $app_strings['ERR_SQS_NO_MATCH_FIELD'].$mod_strings['LBL_USER_NAME'], 'false', '', 'user_id');
 echo $javascript->getScript();
 
 

modules/SecurityGroups/AssignGroups.php

Spacing +26 added lines, -26 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');
 
 
 class AssignGroups {
@@ -9,28 +9,28 @@ 
 	global $sugar_config;
 
 	//only process if action is Save (meaning a user has triggered this event and not the portal or automated process)
-	if(isset($_REQUEST['action']) && $_REQUEST['action'] == 'Save' 
+	if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'Save' 
 		&& isset($sugar_config['securitysuite_popup_select']) && $sugar_config['securitysuite_popup_select'] == true
 		&& empty($bean->fetched_row['id']) && $bean->module_dir != "Users" && $bean->module_dir != "SugarFeed") {		
 		//Upload an attachment to an Email Template and save. If user with multi groups - popup select option
 		//it will redirect to notes instead of EmailTemplate and relationship will fail...check below to avoid
-		if(!empty($_REQUEST['module']) && $_REQUEST['module'] != $bean->module_dir) return;
+		if (!empty($_REQUEST['module']) && $_REQUEST['module'] != $bean->module_dir) return;
 
-		if(!empty($_REQUEST['securitygroup_list'])) {
+		if (!empty($_REQUEST['securitygroup_list'])) {
 			require_once('modules/SecurityGroups/SecurityGroup.php');
 			$groupFocus = new SecurityGroup();
 			$security_modules = $groupFocus->getSecurityModules();
 			//sanity check
-			if(in_array($bean->module_dir,array_keys($security_modules))) {
+			if (in_array($bean->module_dir, array_keys($security_modules))) {
 				//add each group in securitygroup_list to new record
-				$rel_name = $groupFocus->getLinkName($bean->module_dir,"SecurityGroups");
+				$rel_name = $groupFocus->getLinkName($bean->module_dir, "SecurityGroups");
 
 				$bean->load_relationship($rel_name);
-				foreach($_REQUEST['securitygroup_list'] as $group_id) {
+				foreach ($_REQUEST['securitygroup_list'] as $group_id) {
 					$bean->$rel_name->add($group_id);
 				}
 			}
-		} else if(!empty($_REQUEST['dup_checked'])) {
+		} else if (!empty($_REQUEST['dup_checked'])) {
 			//well...ShowDuplicates doesn't pass through request vars unless they are defined in the module vardefs
 			//so we are screwed here...
 			global $current_language;
@@ -40,9 +40,9 @@ 
 		}
 	}
 
-	else if(isset($sugar_config['securitysuite_user_popup']) && $sugar_config['securitysuite_user_popup'] == true
+	else if (isset($sugar_config['securitysuite_user_popup']) && $sugar_config['securitysuite_user_popup'] == true
 		&& empty($bean->fetched_row['id']) && $bean->module_dir == "Users"
-		&& isset($_REQUEST['action']) && $_REQUEST['action'] != 'SaveSignature' ) { //Bug: 589
+		&& isset($_REQUEST['action']) && $_REQUEST['action'] != 'SaveSignature') { //Bug: 589
 
 		//$_REQUEST['return_module'] = $bean->module_dir;
 		//$_REQUEST['return_action'] = "DetailView";
@@ -50,7 +50,7 @@ 
 		
 		//$_SESSION['securitygroups_popup_'.$bean->module_dir] = $bean->id;
 		
-		if(!isset($_SESSION['securitygroups_popup'])) {
+		if (!isset($_SESSION['securitygroups_popup'])) {
 			$_SESSION['securitygroups_popup'] = array();
 		}
 		$_SESSION['securitygroups_popup'][] = array(
@@ -63,7 +63,7 @@ 
 
 function popup_onload($event, $arguments)
 {
-	if(!empty($_REQUEST['to_pdf']) || !empty($_REQUEST['sugar_body_only'])) return;
+	if (!empty($_REQUEST['to_pdf']) || !empty($_REQUEST['sugar_body_only'])) return;
 
 /** //test user popup
 	//always have this loaded
@@ -74,9 +74,9 @@ 
 	$module = $_REQUEST['module'];
 	$action = $_REQUEST['action'];
 
-	if(isset($action) && ($action == "Save" || $action == "SetTimezone")) return;  
+	if (isset($action) && ($action == "Save" || $action == "SetTimezone")) return;  
 
-	if( (
+	if ((
 			//(isset($sugar_config['securitysuite_popup_select']) && $sugar_config['securitysuite_popup_select'] == true)
 			//|| 
 			($module == "Users" && isset($sugar_config['securitysuite_user_popup']) && $sugar_config['securitysuite_user_popup'] == true)
@@ -86,17 +86,17 @@ 
 		&& !empty($_SESSION['securitygroups_popup'])
 	) {	
 
-		foreach($_SESSION['securitygroups_popup'] as $popup_index => $popup) {
+		foreach ($_SESSION['securitygroups_popup'] as $popup_index => $popup) {
 			$record_id = $popup['id'];
 			$module = $popup['module'];
 			unset($_SESSION['securitygroups_popup'][$popup_index]);
 			
 			require_once('modules/SecurityGroups/SecurityGroup.php');
 			$groupFocus = new SecurityGroup();
-			if($module == 'Users') {
+			if ($module == 'Users') {
 				$rel_name = "SecurityGroups";
 			} else {
-				$rel_name = $groupFocus->getLinkName($module,"SecurityGroups");
+				$rel_name = $groupFocus->getLinkName($module, "SecurityGroups");
 			}
 
 				//this only works if on the detail view of the record actually saved...
@@ -121,21 +121,21 @@ 
     $action = $_REQUEST['action'];
     $module = $_REQUEST['module'];
   
-  	$no_mass_assign_list = array("Emails"=>"Emails","ACLRoles"=>"ACLRoles"); //,"Users"=>"Users");
+  	$no_mass_assign_list = array("Emails"=>"Emails", "ACLRoles"=>"ACLRoles"); //,"Users"=>"Users");
     //check if security suite enabled
     $action = strtolower($action);
-    if(isset($module) && ($action == "list" || $action == "index" || $action == "listview") 
+    if (isset($module) && ($action == "list" || $action == "index" || $action == "listview") 
     	&& (!isset($_REQUEST['search_form_only']) || $_REQUEST['search_form_only'] != true)
-    	&& !array_key_exists($module,$no_mass_assign_list)
+    	&& !array_key_exists($module, $no_mass_assign_list)
     	) {
    		global $current_user;
-   		if(is_admin($current_user) || ACLAction::getUserAccessLevel($current_user->id,"SecurityGroups", 'access') == ACL_ALLOW_ENABLED) {
+   		if (is_admin($current_user) || ACLAction::getUserAccessLevel($current_user->id, "SecurityGroups", 'access') == ACL_ALLOW_ENABLED) {
 
 			require_once('modules/SecurityGroups/SecurityGroup.php');
 			$groupFocus = new SecurityGroup();
 			$security_modules = $groupFocus->getSecurityModules();
 			//if(in_array($module,$security_modules)) {
-			if(in_array($module,array_keys($security_modules))) {
+			if (in_array($module, array_keys($security_modules))) {
 
 				global $app_strings;
 
@@ -144,12 +144,12 @@ 
 
 				$form_header = get_form_header($current_module_strings['LBL_MASS_ASSIGN'], '', false);
 
-				$groups = $groupFocus->get_list("name","",0,-99,-99);
+				$groups = $groupFocus->get_list("name", "", 0, -99, -99);
 				$options = array(""=>"");
-				foreach($groups['list'] as $group) {
+				foreach ($groups['list'] as $group) {
 					$options[$group->id] = $group->name;
 				}
-				$group_options =  get_select_options_with_id($options, "");
+				$group_options = get_select_options_with_id($options, "");
 
 				$mass_assign = <<<EOQ
 
@@ -270,7 +270,7 @@ 
     }
 
 	//if after a save...
-	if(!empty($_SESSION['securitysuite_error'])) {
+	if (!empty($_SESSION['securitysuite_error'])) {
 		$lbl_securitysuite_error = $_SESSION['securitysuite_error'];
 		unset($_SESSION['securitysuite_error']);
 		echo <<<EOQ