adamjakab / SuiteCRM

modules/ModuleBuilder/views/view.modulefield.php

Indentation +65 added lines, -65 removed lines

@@ -43,20 +43,20 @@ 
 class ViewModulefield extends SugarView
 {
     /**
-	 * @see SugarView::_getModuleTitleParams()
-	 */
-	protected function _getModuleTitleParams($browserTitle = false)
-	{
-	    global $mod_strings;
+     * @see SugarView::_getModuleTitleParams()
+     */
+    protected function _getModuleTitleParams($browserTitle = false)
+    {
+        global $mod_strings;
 	    
-    	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
-    	   ModuleBuilderController::getModuleTitle(),
-    	   );
+        return array(
+            translate('LBL_MODULE_NAME','Administration'),
+            ModuleBuilderController::getModuleTitle(),
+            );
     }
 
-	function display()
-	{
+    function display()
+    {
         $ac = $this->fetch();
         echo $ac->getJavascript();
     }
@@ -76,21 +76,21 @@ 
             $field_name = '';
 
         $action = 'saveField'; // tyoung bug 17606: default action is to save as a dynamic field; but for standard OOB
-                               // fields we override this so don't create a new dynamic field instead of updating the existing field
+                                // fields we override this so don't create a new dynamic field instead of updating the existing field
 
         $isClone = false;
         if(!empty($this->view_object_map['is_clone']) && $this->view_object_map['is_clone']
             && (strcmp($field_name, "name") != 0)   // bug #35767, do not allow cloning of name field
             )
             $isClone = true;
-		/*
+        /*
 		$field_types =  array('varchar'=>'YourField', 'int'=>'Integer', 'float'=>'Decimal','bool'=>'Checkbox','enum'=>'DropDown',
 				'date'=>'Date', 'phone' => 'Phone', 'currency' => 'Currency', 'html' => 'HTML', 'radioenum' => 'Radio',
 				'relate' => 'Relate', 'address' => 'Address', 'text' => 'TextArea', 'url' => 'Link');
 		*/
-		$field_types = $GLOBALS['mod_strings']['fieldTypes'];
-		if (isset($field_types['encrypt']))
-		  unset($field_types['encrypt']);
+        $field_types = $GLOBALS['mod_strings']['fieldTypes'];
+        if (isset($field_types['encrypt']))
+            unset($field_types['encrypt']);
         $field_name_exceptions = array(
             //bug 22264: Field name must not be an SQL keyword.
             //Taken from SQL Server's list of reserved keywords; http://msdn.microsoft.com/en-us/library/aa238507(SQL.80).aspx
@@ -110,26 +110,26 @@ 
             'DROP','OPENROWSET','VIEW','DUMMY','OPENXML','WAITFOR','DUMP','OPTION','WHEN','ELSE','OR','WHERE',
             'END','ORDER','WHILE','ERRLVL','OUTER','WITH','ESCAPE','OVER','WRITETEXT',
             //Mysql Keywords from http://dev.mysql.com/doc/refman/5.0/en/reserved-words.html (those not in MSSQL's list)
-			'ANALYZE', 'ASENSITIVE', 'BEFORE', 'BIGINT', 'BINARY', 'BOTH', 'CALL', 'CHANGE', 'CHARACTER',
-			'CONDITION', 'DATABASES', 'DAY_HOUR', 'DAY_MICROSECOND', 'DAY_MINUTE', 'DAY_SECOND', 'DEC', 'DECIMAL', 'DELAYED',
-			'DESCRIBE', 'DETERMINISTIC', 'DISTINCTROW', 'DIV', 'DUAL', 'EACH', 'ELSEIF', 'ENCLOSED', 'ESCAPED', 'EXPLAIN',
-			'FALSE', 'FLOAT', 'FLOAT4', 'FLOAT8', 'FORCE', 'FULLTEXT', 'HIGH_PRIORITY', 'HOUR_MICROSECOND', 'HOUR_MINUTE',
-			'HOUR_SECOND', 'IGNORE', 'INFILE', 'INOUT', 'INSENSITIVE', 'INT', 'INT1', 'INT2', 'INT3', 'INT4', 'INT8',
-			'INTEGER', 'ITERATE', 'KEYS', 'LEADING', 'LEAVE', 'LIMIT', 'LINES', 'LOCALTIME', 'LOCALTIMESTAMP', 'LOCK',
-			'LONGBLOB', 'LONGTEXT', 'LOOP', 'LOW_PRIORITY', 'MATCH', 'MEDIUMBLOB', 'MEDIUMINT', 'MEDIUMTEXT', 'MIDDLEINT',
-			'MINUTE_MICROSECOND', 'MINUTE_SECOND', 'MOD', 'MODIFIES', 'NATURAL', 'NO_WRITE_TO_BINLOG', 'NUMERIC', 'OPTIMIZE',
-			'OPTIONALLY', 'OUT', 'OUTFILE', 'PURGE', 'READS', 'REAL', 'REGEXP', 'RELEASE', 'RENAME', 'REPEAT', 'REPLACE',
-			'REQUIRE', 'RLIKE', 'SCHEMAS', 'SECOND_MICROSECOND', 'SENSITIVE', 'SEPARATOR', 'SHOW', 'SMALLINT', 'SONAME',
-			'SPATIAL', 'SPECIFIC', 'SQL', 'SQLEXCEPTION', 'SQLSTATE', 'SQLWARNING', 'SQL_BIG_RESULT', 'SQL_CALC_FOUND_ROWS',
-			'SQL_SMALL_RESULT', 'SSL', 'STARTING', 'STRAIGHT_JOIN', 'TERMINATED', 'TINYBLOB', 'TINYINT', 'TINYTEXT',
-			'TRAILING', 'TRUE', 'UNDO', 'UNLOCK', 'UNSIGNED', 'USAGE', 'USING', 'UTC_DATE', 'UTC_TIME', 'UTC_TIMESTAMP',
-			'VARBINARY', 'VARCHARACTER', 'WRITE', 'XOR', 'YEAR_MONTH', 'ZEROFILL', 'CONNECTION', 'LABEL', 'UPGRADE',
-			//Oracle datatypes
+            'ANALYZE', 'ASENSITIVE', 'BEFORE', 'BIGINT', 'BINARY', 'BOTH', 'CALL', 'CHANGE', 'CHARACTER',
+            'CONDITION', 'DATABASES', 'DAY_HOUR', 'DAY_MICROSECOND', 'DAY_MINUTE', 'DAY_SECOND', 'DEC', 'DECIMAL', 'DELAYED',
+            'DESCRIBE', 'DETERMINISTIC', 'DISTINCTROW', 'DIV', 'DUAL', 'EACH', 'ELSEIF', 'ENCLOSED', 'ESCAPED', 'EXPLAIN',
+            'FALSE', 'FLOAT', 'FLOAT4', 'FLOAT8', 'FORCE', 'FULLTEXT', 'HIGH_PRIORITY', 'HOUR_MICROSECOND', 'HOUR_MINUTE',
+            'HOUR_SECOND', 'IGNORE', 'INFILE', 'INOUT', 'INSENSITIVE', 'INT', 'INT1', 'INT2', 'INT3', 'INT4', 'INT8',
+            'INTEGER', 'ITERATE', 'KEYS', 'LEADING', 'LEAVE', 'LIMIT', 'LINES', 'LOCALTIME', 'LOCALTIMESTAMP', 'LOCK',
+            'LONGBLOB', 'LONGTEXT', 'LOOP', 'LOW_PRIORITY', 'MATCH', 'MEDIUMBLOB', 'MEDIUMINT', 'MEDIUMTEXT', 'MIDDLEINT',
+            'MINUTE_MICROSECOND', 'MINUTE_SECOND', 'MOD', 'MODIFIES', 'NATURAL', 'NO_WRITE_TO_BINLOG', 'NUMERIC', 'OPTIMIZE',
+            'OPTIONALLY', 'OUT', 'OUTFILE', 'PURGE', 'READS', 'REAL', 'REGEXP', 'RELEASE', 'RENAME', 'REPEAT', 'REPLACE',
+            'REQUIRE', 'RLIKE', 'SCHEMAS', 'SECOND_MICROSECOND', 'SENSITIVE', 'SEPARATOR', 'SHOW', 'SMALLINT', 'SONAME',
+            'SPATIAL', 'SPECIFIC', 'SQL', 'SQLEXCEPTION', 'SQLSTATE', 'SQLWARNING', 'SQL_BIG_RESULT', 'SQL_CALC_FOUND_ROWS',
+            'SQL_SMALL_RESULT', 'SSL', 'STARTING', 'STRAIGHT_JOIN', 'TERMINATED', 'TINYBLOB', 'TINYINT', 'TINYTEXT',
+            'TRAILING', 'TRUE', 'UNDO', 'UNLOCK', 'UNSIGNED', 'USAGE', 'USING', 'UTC_DATE', 'UTC_TIME', 'UTC_TIMESTAMP',
+            'VARBINARY', 'VARCHARACTER', 'WRITE', 'XOR', 'YEAR_MONTH', 'ZEROFILL', 'CONNECTION', 'LABEL', 'UPGRADE',
+            //Oracle datatypes
             'DATE','VARCHAR','VARCHAR2','NVARCHAR2','CHAR','NCHAR','NUMBER','PLS_INTEGER','BINARY_INTEGER','LONG','TIMESTAMP',
-			'INTERVAL','RAW','ROWID','UROWID','MLSLABEL','CLOB','NCLOB','BLOB','BFILE','XMLTYPE',
-			//SugarCRM reserved
-        	'ID', 'ID_C', 'PARENT_NAME', 'PARENT_ID',
-			);
+            'INTERVAL','RAW','ROWID','UROWID','MLSLABEL','CLOB','NCLOB','BLOB','BFILE','XMLTYPE',
+            //SugarCRM reserved
+            'ID', 'ID_C', 'PARENT_NAME', 'PARENT_ID',
+            );
 
 
         //C.L. - Add support to mark related module id columns as reserved keywords
@@ -173,14 +173,14 @@ 
                 $fv->ss->assign('hideLevel', 3);
             }
             if($isClone && isset($vardef['type']) && $vardef['type'] == 'datetime'){
-            	$vardef['type'] = 'datetimecombo';
+                $vardef['type'] = 'datetimecombo';
             }
             
-			require_once ('modules/DynamicFields/FieldCases.php') ;
+            require_once ('modules/DynamicFields/FieldCases.php') ;
             $tf = get_widget ( empty($vardef [ 'type' ]) ?  "" : $vardef [ 'type' ]) ;
             $tf->module = $module;
             $tf->populateFromRow($vardef);
-			$vardef = array_merge($vardef, $tf->get_field_def());
+            $vardef = array_merge($vardef, $tf->get_field_def());
 
             //          $GLOBALS['log']->debug('vardefs after loading = '.print_r($vardef,true));
            
@@ -190,10 +190,10 @@ 
             $enumFields = array();
             foreach($module->field_defs as $field => $def)
             {
-            	if (!empty($def['type']) && $def['type'] == "int" && !empty($def['auto_increment'])) {
-            	   $allowAutoInc = false;
-            	   continue;
-            	}
+                if (!empty($def['type']) && $def['type'] == "int" && !empty($def['auto_increment'])) {
+                    $allowAutoInc = false;
+                    continue;
+                }
                 if (!empty($def['type']) && $def['type'] == "enum" && $field != $vardef['name'])
                 {
                     if(!empty($def['studio']) && $def['studio'] == "false") continue; //bug51866 
@@ -210,7 +210,7 @@ 
             }
             $fv->ss->assign('module', $module);
             if(empty($module->mbvardefs->vardefs['fields']['parent_name']) || (isset($vardef['type']) && $vardef['type'] == 'parent'))
-				$field_types['parent'] = $GLOBALS['mod_strings']['parent'];
+                $field_types['parent'] = $GLOBALS['mod_strings']['parent'];
 
             $edit_or_add = 'editField' ;
 
@@ -244,7 +244,7 @@ 
                 }
             }
 
-			require_once ('modules/DynamicFields/FieldCases.php') ;
+            require_once ('modules/DynamicFields/FieldCases.php') ;
             $tf = get_widget ( empty($vardef [ 'type' ]) ?  "" : $vardef [ 'type' ]) ;
             $tf->module = $module;
             $tf->populateFromRow($vardef);
@@ -258,8 +258,8 @@ 
 
             if(isset($vardef['vname']))
                 $fv->ss->assign('lbl_value', htmlentities($module->getLabel('en_us',$vardef['vname']), ENT_QUOTES, 'UTF-8'));
-			if(empty($module->mbvardefs->vardefs['fields']['parent_name']) || (isset($vardef['type']) && $vardef['type'] == 'parent'))
-				$field_types['parent'] = $GLOBALS['mod_strings']['parent'];
+            if(empty($module->mbvardefs->vardefs['fields']['parent_name']) || (isset($vardef['type']) && $vardef['type'] == 'parent'))
+                $field_types['parent'] = $GLOBALS['mod_strings']['parent'];
 
             $enumFields = array();
             if (!empty($module->mbvardefs->vardefs['fields']))
@@ -280,7 +280,7 @@ 
         }
 
         if($_REQUEST['action'] == 'RefreshField'){
-        	require_once('modules/DynamicFields/FieldCases.php');
+            require_once('modules/DynamicFields/FieldCases.php');
             $field = get_widget($_POST['type']);
             $field->populateFromPost();
             $vardef = $field->get_field_def();
@@ -289,16 +289,16 @@ 
         }
 
         foreach(array("formula", "default", "comments", "help", "visiblityGrid") as $toEscape)
-		{
-			if (!empty($vardef[$toEscape]) && is_string($vardef[$toEscape])) {
-	        	$vardef[$toEscape] = htmlentities($vardef[$toEscape], ENT_QUOTES, 'UTF-8');
-	        }
-		}
+        {
+            if (!empty($vardef[$toEscape]) && is_string($vardef[$toEscape])) {
+                $vardef[$toEscape] = htmlentities($vardef[$toEscape], ENT_QUOTES, 'UTF-8');
+            }
+        }
 		
         if((!empty($vardef['studio']) && is_array($vardef['studio']) && !empty($vardef['studio']['no_duplicate']) && $vardef['studio']['no_duplicate'] == true)
            || (strcmp($field_name, "name") == 0) || (isset($vardef['type']) && $vardef['type'] == 'name')) // bug #35767, do not allow cloning of name field
             {
-               $fv->ss->assign('no_duplicate', true);
+                $fv->ss->assign('no_duplicate', true);
             }
 
         $fv->ss->assign('action',$action);
@@ -318,25 +318,25 @@ 
         $existing_field_names = array () ;
         foreach ( $module->mbvardefs->vardefs['fields'] as $field )
         {
-        	if ($field [ 'type' ] == 'enum' || $field [ 'type'] == 'multienum' )
-        	{
-        		$triggers [] = $field [ 'name' ] ;
-        	}
+            if ($field [ 'type' ] == 'enum' || $field [ 'type'] == 'multienum' )
+            {
+                $triggers [] = $field [ 'name' ] ;
+            }
         	
-        	if (!isset($field['source']) || $field['source'] != 'non-db') {
-        		if(preg_match('/^(.*?)(_c)?$/', $field['name'], $matches))
-        		{
-        			$existing_field_names [] = strtoupper($matches[1]);	
-        		}
-        	}
+            if (!isset($field['source']) || $field['source'] != 'non-db') {
+                if(preg_match('/^(.*?)(_c)?$/', $field['name'], $matches))
+                {
+                    $existing_field_names [] = strtoupper($matches[1]);	
+                }
+            }
         }
         
         $fv->ss->assign('triggers',$triggers);
         $fv->ss->assign('existing_field_names', $json->encode($existing_field_names));
         $fv->ss->assign('mod_strings',$GLOBALS['mod_strings']);
 
-		// jchi #24880
-		// end
+        // jchi #24880
+        // end
 
 
         $layout = $fv->getLayout($vardef);

Braces +49 added lines, -31 removed lines

@@ -66,14 +66,17 @@ 
         )
     {
         $fv = new FieldViewer();
-        if(empty($_REQUEST['field'])&& !empty($_REQUEST['name']))$_REQUEST['field'] = $_REQUEST['name'];
+        if(empty($_REQUEST['field'])&& !empty($_REQUEST['name'])) {
+            $_REQUEST['field'] = $_REQUEST['name'];
+        }
         $field_name = '';
-        if(!empty($this->view_object_map['field_name']))
-            $field_name = $this->view_object_map['field_name'];
-        elseif(!empty($_REQUEST['field']))
-            $field_name = $_REQUEST['field'];
-        else
-            $field_name = '';
+        if(!empty($this->view_object_map['field_name'])) {
+                    $field_name = $this->view_object_map['field_name'];
+        } elseif(!empty($_REQUEST['field'])) {
+                    $field_name = $_REQUEST['field'];
+        } else {
+                    $field_name = '';
+        }
 
         $action = 'saveField'; // tyoung bug 17606: default action is to save as a dynamic field; but for standard OOB
                                // fields we override this so don't create a new dynamic field instead of updating the existing field
@@ -81,16 +84,18 @@ 
         $isClone = false;
         if(!empty($this->view_object_map['is_clone']) && $this->view_object_map['is_clone']
             && (strcmp($field_name, "name") != 0)   // bug #35767, do not allow cloning of name field
-            )
-            $isClone = true;
+            ) {
+                    $isClone = true;
+        }
 		/*
 		$field_types =  array('varchar'=>'YourField', 'int'=>'Integer', 'float'=>'Decimal','bool'=>'Checkbox','enum'=>'DropDown',
 				'date'=>'Date', 'phone' => 'Phone', 'currency' => 'Currency', 'html' => 'HTML', 'radioenum' => 'Radio',
 				'relate' => 'Relate', 'address' => 'Address', 'text' => 'TextArea', 'url' => 'Link');
 		*/
 		$field_types = $GLOBALS['mod_strings']['fieldTypes'];
-		if (isset($field_types['encrypt']))
-		  unset($field_types['encrypt']);
+		if (isset($field_types['encrypt'])) {
+				  unset($field_types['encrypt']);
+		}
         $field_name_exceptions = array(
             //bug 22264: Field name must not be an SQL keyword.
             //Taken from SQL Server's list of reserved keywords; http://msdn.microsoft.com/en-us/library/aa238507(SQL.80).aspx
@@ -163,12 +168,13 @@ 
             }
           
             if(empty($vardef['name'])){
-                if(!empty($_REQUEST['type']))
-                    $vardef['type'] = $_REQUEST['type'];
+                if(!empty($_REQUEST['type'])) {
+                                    $vardef['type'] = $_REQUEST['type'];
+                }
                     $fv->ss->assign('hideLevel', 0);
-            }elseif(isset($vardef['custom_module'])){
+            } elseif(isset($vardef['custom_module'])){
                 $fv->ss->assign('hideLevel', 2);
-            }else{
+            } else{
                 $action = 'saveSugarField'; // tyoung - for OOB fields we currently only support modifying the label
                 $fv->ss->assign('hideLevel', 3);
             }
@@ -196,10 +202,14 @@ 
             	}
                 if (!empty($def['type']) && $def['type'] == "enum" && $field != $vardef['name'])
                 {
-                    if(!empty($def['studio']) && $def['studio'] == "false") continue; //bug51866 
+                    if(!empty($def['studio']) && $def['studio'] == "false") {
+                        continue;
+                    }
+                    //bug51866 
                     $enumFields[$field] = translate($def['vname'], $moduleName);
-                    if (substr($enumFields[$field], -1) == ":")
-                        $enumFields[$field] = substr($enumFields[$field], 0, strlen($enumFields[$field]) - 1);
+                    if (substr($enumFields[$field], -1) == ":") {
+                                            $enumFields[$field] = substr($enumFields[$field], 0, strlen($enumFields[$field]) - 1);
+                    }
                 }
             }
             $fv->ss->assign( 'allowAutoInc', $allowAutoInc);   
@@ -209,8 +219,9 @@ 
                 $fv->ss->assign('lbl_value', htmlentities(translate($vardef['vname'], $moduleName), ENT_QUOTES, 'UTF-8'));
             }
             $fv->ss->assign('module', $module);
-            if(empty($module->mbvardefs->vardefs['fields']['parent_name']) || (isset($vardef['type']) && $vardef['type'] == 'parent'))
-				$field_types['parent'] = $GLOBALS['mod_strings']['parent'];
+            if(empty($module->mbvardefs->vardefs['fields']['parent_name']) || (isset($vardef['type']) && $vardef['type'] == 'parent')) {
+            				$field_types['parent'] = $GLOBALS['mod_strings']['parent'];
+            }
 
             $edit_or_add = 'editField' ;
 
@@ -232,14 +243,16 @@ 
             }
 
             if(empty($vardef['name'])){
-                if(!empty($_REQUEST['type']))$vardef['type'] = $_REQUEST['type'];
+                if(!empty($_REQUEST['type'])) {
+                    $vardef['type'] = $_REQUEST['type'];
+                }
                     $fv->ss->assign('hideLevel', 0);
-            }else{
+            } else{
                 if(!empty($module->mbvardefs->vardef['fields'][$vardef['name']])){
                     $fv->ss->assign('hideLevel', 1);
-                }elseif(isset($vardef['custom_module'])){
+                } elseif(isset($vardef['custom_module'])){
                     $fv->ss->assign('hideLevel', 2);
-                }else{
+                } else{
                     $fv->ss->assign('hideLevel', 3); // tyoung bug 17350 - effectively mark template derived fields as readonly
                 }
             }
@@ -256,10 +269,12 @@ 
             $fv->ss->assign('package', $package);
             $fv->ss->assign('MB','1');
 
-            if(isset($vardef['vname']))
-                $fv->ss->assign('lbl_value', htmlentities($module->getLabel('en_us',$vardef['vname']), ENT_QUOTES, 'UTF-8'));
-			if(empty($module->mbvardefs->vardefs['fields']['parent_name']) || (isset($vardef['type']) && $vardef['type'] == 'parent'))
-				$field_types['parent'] = $GLOBALS['mod_strings']['parent'];
+            if(isset($vardef['vname'])) {
+                            $fv->ss->assign('lbl_value', htmlentities($module->getLabel('en_us',$vardef['vname']), ENT_QUOTES, 'UTF-8'));
+            }
+			if(empty($module->mbvardefs->vardefs['fields']['parent_name']) || (isset($vardef['type']) && $vardef['type'] == 'parent')) {
+							$field_types['parent'] = $GLOBALS['mod_strings']['parent'];
+			}
 
             $enumFields = array();
             if (!empty($module->mbvardefs->vardefs['fields']))
@@ -270,8 +285,9 @@ 
                     {
                         $enumFields[$field] = isset($module->mblanguage->strings[$current_language][$def['vname']]) ?
                             $this->mbModule->mblanguage->strings[$current_language][$def['vname']] : translate($field);
-                        if (substr($enumFields[$field], -1) == ":")
-                            $enumFields[$field] = substr($enumFields[$field], 0, strlen($enumFields[$field]) -1);
+                        if (substr($enumFields[$field], -1) == ":") {
+                                                    $enumFields[$field] = substr($enumFields[$field], 0, strlen($enumFields[$field]) -1);
+                        }
                     }
                 }
             }
@@ -296,9 +312,11 @@ 
 		}
 		
         if((!empty($vardef['studio']) && is_array($vardef['studio']) && !empty($vardef['studio']['no_duplicate']) && $vardef['studio']['no_duplicate'] == true)
-           || (strcmp($field_name, "name") == 0) || (isset($vardef['type']) && $vardef['type'] == 'name')) // bug #35767, do not allow cloning of name field
+           || (strcmp($field_name, "name") == 0) || (isset($vardef['type']) && $vardef['type'] == 'name')) {
+            // bug #35767, do not allow cloning of name field
             {
                $fv->ss->assign('no_duplicate', true);
+        }
             }
 
         $fv->ss->assign('action',$action);

Spacing +83 added lines, -83 removed lines

@@ -50,7 +50,7 @@ 
 	    global $mod_strings;
 	    
     	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
+    	   translate('LBL_MODULE_NAME', 'Administration'),
     	   ModuleBuilderController::getModuleTitle(),
     	   );
     }
@@ -66,11 +66,11 @@ 
         )
     {
         $fv = new FieldViewer();
-        if(empty($_REQUEST['field'])&& !empty($_REQUEST['name']))$_REQUEST['field'] = $_REQUEST['name'];
+        if (empty($_REQUEST['field']) && !empty($_REQUEST['name']))$_REQUEST['field'] = $_REQUEST['name'];
         $field_name = '';
-        if(!empty($this->view_object_map['field_name']))
+        if (!empty($this->view_object_map['field_name']))
             $field_name = $this->view_object_map['field_name'];
-        elseif(!empty($_REQUEST['field']))
+        elseif (!empty($_REQUEST['field']))
             $field_name = $_REQUEST['field'];
         else
             $field_name = '';
@@ -79,7 +79,7 @@ 
                                // fields we override this so don't create a new dynamic field instead of updating the existing field
 
         $isClone = false;
-        if(!empty($this->view_object_map['is_clone']) && $this->view_object_map['is_clone']
+        if (!empty($this->view_object_map['is_clone']) && $this->view_object_map['is_clone']
             && (strcmp($field_name, "name") != 0)   // bug #35767, do not allow cloning of name field
             )
             $isClone = true;
@@ -94,21 +94,21 @@ 
         $field_name_exceptions = array(
             //bug 22264: Field name must not be an SQL keyword.
             //Taken from SQL Server's list of reserved keywords; http://msdn.microsoft.com/en-us/library/aa238507(SQL.80).aspx
-            'ADD','EXCEPT','PERCENT','ALL','EXEC','PLAN','ALTER','EXECUTE','PRECISION','AND','EXISTS','PRIMARY',
-            'ANY','EXIT','PRINT','AS','FETCH','PROC','ASC','FILE','PROCEDURE','AUTHORIZATION','FILLFACTOR','PUBLIC',
-            'BACKUP','FOR','RAISERROR','BEGIN','FOREIGN','READ','BETWEEN','FREETEXT','READTEXT','BREAK','FREETEXTTABLE',
-            'RECONFIGURE','BROWSE','FROM','REFERENCES','BULK','FULL','REPLICATION','BY','FUNCTION','RESTORE',
-            'CASCADE','GOTO','RESTRICT','CASE','GRANT','RETURN','CHECK','GROUP','REVOKE','CHECKPOINT','HAVING','RIGHT','CLOSE',
-            'HOLDLOCK','ROLLBACK','CLUSTERED','IDENTITY','ROWCOUNT','COALESCE','IDENTITY_INSERT','ROWGUIDCOL','COLLATE','IDENTITYCOL',
-            'RULE','COLUMN','IF','SAVE','COMMIT','IN','SCHEMA','COMPUTE','INDEX','SELECT','CONSTRAINT','INNER','SESSION_USER',
-            'CONTAINS','INSERT','SET','CONTAINSTABLE','INTERSECT','SETUSER','CONTINUE','INTO','SHUTDOWN','CONVERT','IS','SOME',
-            'CREATE','JOIN','STATISTICS','CROSS','KEY','SYSTEM_USER','CURRENT','KILL','TABLE','CURRENT_DATE','LEFT','TEXTSIZE',
-            'CURRENT_TIME','LIKE','THEN','CURRENT_TIMESTAMP','LINENO','TO','CURRENT_USER','LOAD','TOP','CURSOR','NATIONAL','TRAN',
-            'DATABASE','NOCHECK','TRANSACTION','DBCC','NONCLUSTERED','TRIGGER','DEALLOCATE','NOT','TRUNCATE','DECLARE','NULL','TSEQUAL',
-            'DEFAULT','NULLIF','UNION','DELETE','OF','UNIQUE','DENY','OFF','UPDATE','DESC','OFFSETS','UPDATETEXT',
-            'DISK','ON','USE','DISTINCT','OPEN','USER','DISTRIBUTED','OPENCONNECTOR','VALUES','DOUBLE','OPENQUERY','VARYING',
-            'DROP','OPENROWSET','VIEW','DUMMY','OPENXML','WAITFOR','DUMP','OPTION','WHEN','ELSE','OR','WHERE',
-            'END','ORDER','WHILE','ERRLVL','OUTER','WITH','ESCAPE','OVER','WRITETEXT',
+            'ADD', 'EXCEPT', 'PERCENT', 'ALL', 'EXEC', 'PLAN', 'ALTER', 'EXECUTE', 'PRECISION', 'AND', 'EXISTS', 'PRIMARY',
+            'ANY', 'EXIT', 'PRINT', 'AS', 'FETCH', 'PROC', 'ASC', 'FILE', 'PROCEDURE', 'AUTHORIZATION', 'FILLFACTOR', 'PUBLIC',
+            'BACKUP', 'FOR', 'RAISERROR', 'BEGIN', 'FOREIGN', 'READ', 'BETWEEN', 'FREETEXT', 'READTEXT', 'BREAK', 'FREETEXTTABLE',
+            'RECONFIGURE', 'BROWSE', 'FROM', 'REFERENCES', 'BULK', 'FULL', 'REPLICATION', 'BY', 'FUNCTION', 'RESTORE',
+            'CASCADE', 'GOTO', 'RESTRICT', 'CASE', 'GRANT', 'RETURN', 'CHECK', 'GROUP', 'REVOKE', 'CHECKPOINT', 'HAVING', 'RIGHT', 'CLOSE',
+            'HOLDLOCK', 'ROLLBACK', 'CLUSTERED', 'IDENTITY', 'ROWCOUNT', 'COALESCE', 'IDENTITY_INSERT', 'ROWGUIDCOL', 'COLLATE', 'IDENTITYCOL',
+            'RULE', 'COLUMN', 'IF', 'SAVE', 'COMMIT', 'IN', 'SCHEMA', 'COMPUTE', 'INDEX', 'SELECT', 'CONSTRAINT', 'INNER', 'SESSION_USER',
+            'CONTAINS', 'INSERT', 'SET', 'CONTAINSTABLE', 'INTERSECT', 'SETUSER', 'CONTINUE', 'INTO', 'SHUTDOWN', 'CONVERT', 'IS', 'SOME',
+            'CREATE', 'JOIN', 'STATISTICS', 'CROSS', 'KEY', 'SYSTEM_USER', 'CURRENT', 'KILL', 'TABLE', 'CURRENT_DATE', 'LEFT', 'TEXTSIZE',
+            'CURRENT_TIME', 'LIKE', 'THEN', 'CURRENT_TIMESTAMP', 'LINENO', 'TO', 'CURRENT_USER', 'LOAD', 'TOP', 'CURSOR', 'NATIONAL', 'TRAN',
+            'DATABASE', 'NOCHECK', 'TRANSACTION', 'DBCC', 'NONCLUSTERED', 'TRIGGER', 'DEALLOCATE', 'NOT', 'TRUNCATE', 'DECLARE', 'NULL', 'TSEQUAL',
+            'DEFAULT', 'NULLIF', 'UNION', 'DELETE', 'OF', 'UNIQUE', 'DENY', 'OFF', 'UPDATE', 'DESC', 'OFFSETS', 'UPDATETEXT',
+            'DISK', 'ON', 'USE', 'DISTINCT', 'OPEN', 'USER', 'DISTRIBUTED', 'OPENCONNECTOR', 'VALUES', 'DOUBLE', 'OPENQUERY', 'VARYING',
+            'DROP', 'OPENROWSET', 'VIEW', 'DUMMY', 'OPENXML', 'WAITFOR', 'DUMP', 'OPTION', 'WHEN', 'ELSE', 'OR', 'WHERE',
+            'END', 'ORDER', 'WHILE', 'ERRLVL', 'OUTER', 'WITH', 'ESCAPE', 'OVER', 'WRITETEXT',
             //Mysql Keywords from http://dev.mysql.com/doc/refman/5.0/en/reserved-words.html (those not in MSSQL's list)
 			'ANALYZE', 'ASENSITIVE', 'BEFORE', 'BIGINT', 'BINARY', 'BOTH', 'CALL', 'CHANGE', 'CHARACTER',
 			'CONDITION', 'DATABASES', 'DAY_HOUR', 'DAY_MICROSECOND', 'DAY_MINUTE', 'DAY_SECOND', 'DEC', 'DECIMAL', 'DELAYED',
@@ -125,8 +125,8 @@ 
 			'TRAILING', 'TRUE', 'UNDO', 'UNLOCK', 'UNSIGNED', 'USAGE', 'USING', 'UTC_DATE', 'UTC_TIME', 'UTC_TIMESTAMP',
 			'VARBINARY', 'VARCHARACTER', 'WRITE', 'XOR', 'YEAR_MONTH', 'ZEROFILL', 'CONNECTION', 'LABEL', 'UPGRADE',
 			//Oracle datatypes
-            'DATE','VARCHAR','VARCHAR2','NVARCHAR2','CHAR','NCHAR','NUMBER','PLS_INTEGER','BINARY_INTEGER','LONG','TIMESTAMP',
-			'INTERVAL','RAW','ROWID','UROWID','MLSLABEL','CLOB','NCLOB','BLOB','BFILE','XMLTYPE',
+            'DATE', 'VARCHAR', 'VARCHAR2', 'NVARCHAR2', 'CHAR', 'NCHAR', 'NUMBER', 'PLS_INTEGER', 'BINARY_INTEGER', 'LONG', 'TIMESTAMP',
+			'INTERVAL', 'RAW', 'ROWID', 'UROWID', 'MLSLABEL', 'CLOB', 'NCLOB', 'BLOB', 'BFILE', 'XMLTYPE',
 			//SugarCRM reserved
         	'ID', 'ID_C', 'PARENT_NAME', 'PARENT_ID',
 			);
@@ -134,56 +134,56 @@ 
 
         //C.L. - Add support to mark related module id columns as reserved keywords
         require_once 'modules/ModuleBuilder/parsers/relationships/DeployedRelationships.php';
-        $relatedModules = array_keys(DeployedRelationships::findRelatableModules()) ;
+        $relatedModules = array_keys(DeployedRelationships::findRelatableModules());
         global $beanList, $current_language;
-        foreach($relatedModules as $relModule)
+        foreach ($relatedModules as $relModule)
         {
-            if(isset($beanList[$relModule]))
+            if (isset($beanList[$relModule]))
             {
-                $field_name_exceptions[] = strtoupper($beanList[$relModule]) . '_ID';
+                $field_name_exceptions[] = strtoupper($beanList[$relModule]).'_ID';
             }
         }
 
-        if(empty($_REQUEST['view_package']) || $_REQUEST['view_package'] == 'studio') {
+        if (empty($_REQUEST['view_package']) || $_REQUEST['view_package'] == 'studio') {
             $moduleName = $_REQUEST['view_module'];
             $objectName = BeanFactory::getObjectName($moduleName);
             $module = BeanFactory::getBean($moduleName);
 
-            VardefManager::loadVardef($moduleName, $objectName,true);
+            VardefManager::loadVardef($moduleName, $objectName, true);
             global $dictionary;
 
             // Fix for issue #1177 - when trying to add or edit fields in a module an error message is shown:
             // "Warning: Creating default object from empty value"
-            if(!isset($module->mbvardefs) || is_null($module->mbvardefs)) {
+            if (!isset($module->mbvardefs) || is_null($module->mbvardefs)) {
                 $module->mbvardefs = new stdClass();
             }
-            $module->mbvardefs->vardefs =  $dictionary[$objectName];
+            $module->mbvardefs->vardefs = $dictionary[$objectName];
 			
             $module->name = $moduleName;
-            if(!$ac){
+            if (!$ac) {
                 $ac = new AjaxCompose();
             }
-            $vardef = (!empty($module->mbvardefs->vardefs['fields'][$field_name]))? $module->mbvardefs->vardefs['fields'][$field_name]: array();
-            if($isClone){
+            $vardef = (!empty($module->mbvardefs->vardefs['fields'][$field_name])) ? $module->mbvardefs->vardefs['fields'][$field_name] : array();
+            if ($isClone) {
                 unset($vardef['name']);
             }
           
-            if(empty($vardef['name'])){
-                if(!empty($_REQUEST['type']))
+            if (empty($vardef['name'])) {
+                if (!empty($_REQUEST['type']))
                     $vardef['type'] = $_REQUEST['type'];
                     $fv->ss->assign('hideLevel', 0);
-            }elseif(isset($vardef['custom_module'])){
+            }elseif (isset($vardef['custom_module'])) {
                 $fv->ss->assign('hideLevel', 2);
-            }else{
+            } else {
                 $action = 'saveSugarField'; // tyoung - for OOB fields we currently only support modifying the label
                 $fv->ss->assign('hideLevel', 3);
             }
-            if($isClone && isset($vardef['type']) && $vardef['type'] == 'datetime'){
+            if ($isClone && isset($vardef['type']) && $vardef['type'] == 'datetime') {
             	$vardef['type'] = 'datetimecombo';
             }
             
-			require_once ('modules/DynamicFields/FieldCases.php') ;
-            $tf = get_widget ( empty($vardef [ 'type' ]) ?  "" : $vardef [ 'type' ]) ;
+			require_once ('modules/DynamicFields/FieldCases.php');
+            $tf = get_widget(empty($vardef ['type']) ? "" : $vardef ['type']);
             $tf->module = $module;
             $tf->populateFromRow($vardef);
 			$vardef = array_merge($vardef, $tf->get_field_def());
@@ -194,7 +194,7 @@ 
             //Check if autoincrement fields are allowed
             $allowAutoInc = true;
             $enumFields = array();
-            foreach($module->field_defs as $field => $def)
+            foreach ($module->field_defs as $field => $def)
             {
             	if (!empty($def['type']) && $def['type'] == "int" && !empty($def['auto_increment'])) {
             	   $allowAutoInc = false;
@@ -202,56 +202,56 @@ 
             	}
                 if (!empty($def['type']) && $def['type'] == "enum" && $field != $vardef['name'])
                 {
-                    if(!empty($def['studio']) && $def['studio'] == "false") continue; //bug51866 
+                    if (!empty($def['studio']) && $def['studio'] == "false") continue; //bug51866 
                     $enumFields[$field] = translate($def['vname'], $moduleName);
                     if (substr($enumFields[$field], -1) == ":")
                         $enumFields[$field] = substr($enumFields[$field], 0, strlen($enumFields[$field]) - 1);
                 }
             }
-            $fv->ss->assign( 'allowAutoInc', $allowAutoInc);   
+            $fv->ss->assign('allowAutoInc', $allowAutoInc);   
 
-            $GLOBALS['log']->warn('view.modulefield: hidelevel '.$fv->ss->get_template_vars('hideLevel')." ".print_r($vardef,true));
-            if(!empty($vardef['vname'])){
+            $GLOBALS['log']->warn('view.modulefield: hidelevel '.$fv->ss->get_template_vars('hideLevel')." ".print_r($vardef, true));
+            if (!empty($vardef['vname'])) {
                 $fv->ss->assign('lbl_value', htmlentities(translate($vardef['vname'], $moduleName), ENT_QUOTES, 'UTF-8'));
             }
             $fv->ss->assign('module', $module);
-            if(empty($module->mbvardefs->vardefs['fields']['parent_name']) || (isset($vardef['type']) && $vardef['type'] == 'parent'))
+            if (empty($module->mbvardefs->vardefs['fields']['parent_name']) || (isset($vardef['type']) && $vardef['type'] == 'parent'))
 				$field_types['parent'] = $GLOBALS['mod_strings']['parent'];
 
-            $edit_or_add = 'editField' ;
+            $edit_or_add = 'editField';
 
         } else
         {
             require_once('modules/ModuleBuilder/MB/ModuleBuilder.php');
             $mb = new ModuleBuilder();
             $moduleName = $_REQUEST['view_module'];
-            $module =& $mb->getPackageModule($_REQUEST['view_package'], $moduleName);
-            $package =& $mb->packages[$_REQUEST['view_package']];
+            $module = & $mb->getPackageModule($_REQUEST['view_package'], $moduleName);
+            $package = & $mb->packages[$_REQUEST['view_package']];
             $module->getVardefs();
-            if(!$ac){
+            if (!$ac) {
                 $ac = new AjaxCompose();
             }
-            $vardef = (!empty($module->mbvardefs->vardefs['fields'][$field_name]))? $module->mbvardefs->vardefs['fields'][$field_name]: array();
+            $vardef = (!empty($module->mbvardefs->vardefs['fields'][$field_name])) ? $module->mbvardefs->vardefs['fields'][$field_name] : array();
 
-            if($isClone){
+            if ($isClone) {
                 unset($vardef['name']);
             }
 
-            if(empty($vardef['name'])){
-                if(!empty($_REQUEST['type']))$vardef['type'] = $_REQUEST['type'];
+            if (empty($vardef['name'])) {
+                if (!empty($_REQUEST['type']))$vardef['type'] = $_REQUEST['type'];
                     $fv->ss->assign('hideLevel', 0);
-            }else{
-                if(!empty($module->mbvardefs->vardef['fields'][$vardef['name']])){
+            } else {
+                if (!empty($module->mbvardefs->vardef['fields'][$vardef['name']])) {
                     $fv->ss->assign('hideLevel', 1);
-                }elseif(isset($vardef['custom_module'])){
+                }elseif (isset($vardef['custom_module'])) {
                     $fv->ss->assign('hideLevel', 2);
-                }else{
+                } else {
                     $fv->ss->assign('hideLevel', 3); // tyoung bug 17350 - effectively mark template derived fields as readonly
                 }
             }
 
-			require_once ('modules/DynamicFields/FieldCases.php') ;
-            $tf = get_widget ( empty($vardef [ 'type' ]) ?  "" : $vardef [ 'type' ]) ;
+			require_once ('modules/DynamicFields/FieldCases.php');
+            $tf = get_widget(empty($vardef ['type']) ? "" : $vardef ['type']);
             $tf->module = $module;
             $tf->populateFromRow($vardef);
             $vardef = array_merge($vardef, $tf->get_field_def());
@@ -260,24 +260,24 @@ 
 
             $fv->ss->assign('module', $module);
             $fv->ss->assign('package', $package);
-            $fv->ss->assign('MB','1');
+            $fv->ss->assign('MB', '1');
 
-            if(isset($vardef['vname']))
-                $fv->ss->assign('lbl_value', htmlentities($module->getLabel('en_us',$vardef['vname']), ENT_QUOTES, 'UTF-8'));
-			if(empty($module->mbvardefs->vardefs['fields']['parent_name']) || (isset($vardef['type']) && $vardef['type'] == 'parent'))
+            if (isset($vardef['vname']))
+                $fv->ss->assign('lbl_value', htmlentities($module->getLabel('en_us', $vardef['vname']), ENT_QUOTES, 'UTF-8'));
+			if (empty($module->mbvardefs->vardefs['fields']['parent_name']) || (isset($vardef['type']) && $vardef['type'] == 'parent'))
 				$field_types['parent'] = $GLOBALS['mod_strings']['parent'];
 
             $enumFields = array();
             if (!empty($module->mbvardefs->vardefs['fields']))
             {
-                foreach($module->mbvardefs->vardefs['fields'] as $field => $def)
+                foreach ($module->mbvardefs->vardefs['fields'] as $field => $def)
                 {
                     if (!empty($def['type']) && $def['type'] == "enum" && $field != $vardef['name'])
                     {
                         $enumFields[$field] = isset($module->mblanguage->strings[$current_language][$def['vname']]) ?
                             $this->mbModule->mblanguage->strings[$current_language][$def['vname']] : translate($field);
                         if (substr($enumFields[$field], -1) == ":")
-                            $enumFields[$field] = substr($enumFields[$field], 0, strlen($enumFields[$field]) -1);
+                            $enumFields[$field] = substr($enumFields[$field], 0, strlen($enumFields[$field]) - 1);
                     }
                 }
             }
@@ -285,7 +285,7 @@ 
             $edit_or_add = 'mbeditField';
         }
 
-        if($_REQUEST['action'] == 'RefreshField'){
+        if ($_REQUEST['action'] == 'RefreshField') {
         	require_once('modules/DynamicFields/FieldCases.php');
             $field = get_widget($_POST['type']);
             $field->populateFromPost();
@@ -294,52 +294,52 @@ 
             $fv->ss->assign('lbl_value', htmlentities($_REQUEST['labelValue'], ENT_QUOTES, 'UTF-8'));
         }
 
-        foreach(array("formula", "default", "comments", "help", "visiblityGrid") as $toEscape)
+        foreach (array("formula", "default", "comments", "help", "visiblityGrid") as $toEscape)
 		{
 			if (!empty($vardef[$toEscape]) && is_string($vardef[$toEscape])) {
 	        	$vardef[$toEscape] = htmlentities($vardef[$toEscape], ENT_QUOTES, 'UTF-8');
 	        }
 		}
 		
-        if((!empty($vardef['studio']) && is_array($vardef['studio']) && !empty($vardef['studio']['no_duplicate']) && $vardef['studio']['no_duplicate'] == true)
+        if ((!empty($vardef['studio']) && is_array($vardef['studio']) && !empty($vardef['studio']['no_duplicate']) && $vardef['studio']['no_duplicate'] == true)
            || (strcmp($field_name, "name") == 0) || (isset($vardef['type']) && $vardef['type'] == 'name')) // bug #35767, do not allow cloning of name field
             {
                $fv->ss->assign('no_duplicate', true);
             }
 
-        $fv->ss->assign('action',$action);
+        $fv->ss->assign('action', $action);
         $fv->ss->assign('isClone', ($isClone ? 1 : 0));
         $fv->ss->assign("module_dd_fields", $enumFields);
         $json = getJSONobj();
 
         $fv->ss->assign('field_name_exceptions', $json->encode($field_name_exceptions));
         ksort($field_types);
-        $fv->ss->assign('field_types',$field_types);
+        $fv->ss->assign('field_types', $field_types);
 
 
         $fv->ss->assign('importable_options', $GLOBALS['app_list_strings']['custom_fields_importable_dom']);
         $fv->ss->assign('duplicate_merge_options', $GLOBALS['app_list_strings']['custom_fields_merge_dup_dom']);
 
-        $triggers = array () ;
-        $existing_field_names = array () ;
-        foreach ( $module->mbvardefs->vardefs['fields'] as $field )
+        $triggers = array();
+        $existing_field_names = array();
+        foreach ($module->mbvardefs->vardefs['fields'] as $field)
         {
-        	if ($field [ 'type' ] == 'enum' || $field [ 'type'] == 'multienum' )
+        	if ($field ['type'] == 'enum' || $field ['type'] == 'multienum')
         	{
-        		$triggers [] = $field [ 'name' ] ;
+        		$triggers [] = $field ['name'];
         	}
         	
         	if (!isset($field['source']) || $field['source'] != 'non-db') {
-        		if(preg_match('/^(.*?)(_c)?$/', $field['name'], $matches))
+        		if (preg_match('/^(.*?)(_c)?$/', $field['name'], $matches))
         		{
         			$existing_field_names [] = strtoupper($matches[1]);	
         		}
         	}
         }
         
-        $fv->ss->assign('triggers',$triggers);
+        $fv->ss->assign('triggers', $triggers);
         $fv->ss->assign('existing_field_names', $json->encode($existing_field_names));
-        $fv->ss->assign('mod_strings',$GLOBALS['mod_strings']);
+        $fv->ss->assign('mod_strings', $GLOBALS['mod_strings']);
 
 		// jchi #24880
 		// end
@@ -348,21 +348,21 @@ 
         $layout = $fv->getLayout($vardef);
 
         $fv->ss->assign('fieldLayout', $layout);
-        if(empty($vardef['type']))
+        if (empty($vardef['type']))
         {
             $vardef['type'] = 'varchar';
         }
 
         $fv->ss->assign('vardef', $vardef);
 
-        if(empty($_REQUEST['field'])){
+        if (empty($_REQUEST['field'])) {
             $edit_or_add = 'addField';
         }
 
         $fv->ss->assign('help_group', $edit_or_add);
 
         // Fix for case 2183 - the form in the field.tpl needs to know whether it is an update
-        if($field_name == '') {
+        if ($field_name == '') {
             $is_update = false;
         } else {
             $is_update = true;
@@ -370,7 +370,7 @@ 
         $fv->ss->assign('is_update', $is_update);
 
         $body = $this->fetchTemplate($fv, 'modules/ModuleBuilder/tpls/MBModule/field.tpl');
-        $ac->addSection('east', translate('LBL_SECTION_FIELDEDITOR','ModuleBuilder'), $body );
+        $ac->addSection('east', translate('LBL_SECTION_FIELDEDITOR', 'ModuleBuilder'), $body);
         return $ac;
     }
 

modules/ModuleBuilder/views/view.deletepackage.php

Indentation +12 added lines, -12 removed lines

@@ -42,20 +42,20 @@ 
 
 class Viewdeletepackage extends SugarView
 {
- 	/**
-	 * @see SugarView::_getModuleTitleParams()
-	 */
-	protected function _getModuleTitleParams($browserTitle = false)
-	{
-	    global $mod_strings;
+        /**
+         * @see SugarView::_getModuleTitleParams()
+         */
+    protected function _getModuleTitleParams($browserTitle = false)
+    {
+        global $mod_strings;
 	    
-    	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
-    	   ModuleBuilderController::getModuleTitle(),
-    	   );
+        return array(
+            translate('LBL_MODULE_NAME','Administration'),
+            ModuleBuilderController::getModuleTitle(),
+            );
     }
 
-	function display()
+    function display()
     {
         global $mod_strings;
         
@@ -63,5 +63,5 @@ 
         $ajax->addSection('center', $mod_strings['LBL_PACKAGE_DELETED'], 
             str_replace('[[package]]',$_REQUEST['package'],$mod_strings['LBL_PACKAGE_WAS_DELETED']));
         echo $ajax->getJavascript();
- 	}
+        }
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
 	    global $mod_strings;
 	    
     	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
+    	   translate('LBL_MODULE_NAME', 'Administration'),
     	   ModuleBuilderController::getModuleTitle(),
     	   );
     }
@@ -61,7 +61,7 @@ 
         
         $ajax = new AjaxCompose();
         $ajax->addSection('center', $mod_strings['LBL_PACKAGE_DELETED'], 
-            str_replace('[[package]]',$_REQUEST['package'],$mod_strings['LBL_PACKAGE_WAS_DELETED']));
+            str_replace('[[package]]', $_REQUEST['package'], $mod_strings['LBL_PACKAGE_WAS_DELETED']));
         echo $ajax->getJavascript();
  	}
 }
\ No newline at end of file

modules/ModuleBuilder/views/view.home.php

Indentation +38 added lines, -38 removed lines

@@ -40,51 +40,51 @@
 require_once('modules/ModuleBuilder/MB/AjaxCompose.php');
 class ViewHome extends SugarView
 {
-	/**
-	 * @see SugarView::_getModuleTitleParams()
-	 */
-	protected function _getModuleTitleParams($browserTitle = false)
-	{
-	    global $mod_strings;
+    /**
+     * @see SugarView::_getModuleTitleParams()
+     */
+    protected function _getModuleTitleParams($browserTitle = false)
+    {
+        global $mod_strings;
 	    
-    	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
-    	   ModuleBuilderController::getModuleTitle(),
-    	   );
+        return array(
+            translate('LBL_MODULE_NAME','Administration'),
+            ModuleBuilderController::getModuleTitle(),
+            );
     }
 
-	function display()
-	{
-		global $current_user;
-		global $mod_strings;
-		$smarty = new Sugar_Smarty();
-		$smarty->assign('title' , $mod_strings['LBL_DEVELOPER_TOOLS']);
-		$smarty->assign('question', $mod_strings['LBL_QUESTION_EDITOR']);
-		$smarty->assign('defaultHelp', 'mainHelp');
-		$this->generateHomeButtons();
-		$smarty->assign('buttons', $this->buttons);
-		$assistant=array('group'=>'main', 'key'=>'welcome');
-		$smarty->assign('assistant',$assistant);
-		//initialize Assistant's display property.
-		$userPref = $current_user->getPreference('mb_assist', 'Assistant');
-		if(!$userPref) $userPref="na";
-		$smarty->assign('userPref',$userPref);
-		$ajax = new AjaxCompose();
-		$ajax->addSection('center', $mod_strings['LBL_HOME'],$smarty->fetch('modules/ModuleBuilder/tpls/wizard.tpl'));
-		echo $ajax->getJavascript();
-	}
+    function display()
+    {
+        global $current_user;
+        global $mod_strings;
+        $smarty = new Sugar_Smarty();
+        $smarty->assign('title' , $mod_strings['LBL_DEVELOPER_TOOLS']);
+        $smarty->assign('question', $mod_strings['LBL_QUESTION_EDITOR']);
+        $smarty->assign('defaultHelp', 'mainHelp');
+        $this->generateHomeButtons();
+        $smarty->assign('buttons', $this->buttons);
+        $assistant=array('group'=>'main', 'key'=>'welcome');
+        $smarty->assign('assistant',$assistant);
+        //initialize Assistant's display property.
+        $userPref = $current_user->getPreference('mb_assist', 'Assistant');
+        if(!$userPref) $userPref="na";
+        $smarty->assign('userPref',$userPref);
+        $ajax = new AjaxCompose();
+        $ajax->addSection('center', $mod_strings['LBL_HOME'],$smarty->fetch('modules/ModuleBuilder/tpls/wizard.tpl'));
+        echo $ajax->getJavascript();
+    }
 
 
-	function generateHomeButtons() 
-	{
-	    global $current_user;
+    function generateHomeButtons() 
+    {
+        global $current_user;
         if(displayStudioForCurrentUser() == true) {
-		//$this->buttons['Application'] = array ('action' => '', 'imageTitle' => 'Application', 'size' => '128', 'help'=>'appBtn');
-		$this->buttons[$GLOBALS['mod_strings']['LBL_STUDIO']] = array ('action' => 'javascript:ModuleBuilder.main("studio")', 'imageTitle' => 'Studio', 'size' => '128', 'help'=>'studioBtn');
+        //$this->buttons['Application'] = array ('action' => '', 'imageTitle' => 'Application', 'size' => '128', 'help'=>'appBtn');
+        $this->buttons[$GLOBALS['mod_strings']['LBL_STUDIO']] = array ('action' => 'javascript:ModuleBuilder.main("studio")', 'imageTitle' => 'Studio', 'size' => '128', 'help'=>'studioBtn');
         }
         if(is_admin($current_user)) {
-		$this->buttons[$GLOBALS['mod_strings']['LBL_MODULEBUILDER']] = array ('action' => 'javascript:ModuleBuilder.main("mb")', 'imageTitle' => 'ModuleBuilder', 'size' => '128', 'help'=>'mbBtn');
+        $this->buttons[$GLOBALS['mod_strings']['LBL_MODULEBUILDER']] = array ('action' => 'javascript:ModuleBuilder.main("mb")', 'imageTitle' => 'ModuleBuilder', 'size' => '128', 'help'=>'mbBtn');
         }
-		$this->buttons[$GLOBALS['mod_strings']['LBL_DROPDOWNEDITOR']] = array ('action' => 'javascript:ModuleBuilder.main("dropdowns")', 'imageTitle' => $GLOBALS['mod_strings']['LBL_HOME_EDIT_DROPDOWNS'], 'imageName' => 'DropDownEditor', 'size' => '128', 'help'=>'dropDownEditorBtn');
-	}
+        $this->buttons[$GLOBALS['mod_strings']['LBL_DROPDOWNEDITOR']] = array ('action' => 'javascript:ModuleBuilder.main("dropdowns")', 'imageTitle' => $GLOBALS['mod_strings']['LBL_HOME_EDIT_DROPDOWNS'], 'imageName' => 'DropDownEditor', 'size' => '128', 'help'=>'dropDownEditorBtn');
+    }
 }
\ No newline at end of file

Spacing +12 added lines, -12 removed lines

@@ -48,7 +48,7 @@ 
 	    global $mod_strings;
 	    
     	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
+    	   translate('LBL_MODULE_NAME', 'Administration'),
     	   ModuleBuilderController::getModuleTitle(),
     	   );
     }
@@ -58,19 +58,19 @@ 
 		global $current_user;
 		global $mod_strings;
 		$smarty = new Sugar_Smarty();
-		$smarty->assign('title' , $mod_strings['LBL_DEVELOPER_TOOLS']);
+		$smarty->assign('title', $mod_strings['LBL_DEVELOPER_TOOLS']);
 		$smarty->assign('question', $mod_strings['LBL_QUESTION_EDITOR']);
 		$smarty->assign('defaultHelp', 'mainHelp');
 		$this->generateHomeButtons();
 		$smarty->assign('buttons', $this->buttons);
-		$assistant=array('group'=>'main', 'key'=>'welcome');
-		$smarty->assign('assistant',$assistant);
+		$assistant = array('group'=>'main', 'key'=>'welcome');
+		$smarty->assign('assistant', $assistant);
 		//initialize Assistant's display property.
 		$userPref = $current_user->getPreference('mb_assist', 'Assistant');
-		if(!$userPref) $userPref="na";
-		$smarty->assign('userPref',$userPref);
+		if (!$userPref) $userPref = "na";
+		$smarty->assign('userPref', $userPref);
 		$ajax = new AjaxCompose();
-		$ajax->addSection('center', $mod_strings['LBL_HOME'],$smarty->fetch('modules/ModuleBuilder/tpls/wizard.tpl'));
+		$ajax->addSection('center', $mod_strings['LBL_HOME'], $smarty->fetch('modules/ModuleBuilder/tpls/wizard.tpl'));
 		echo $ajax->getJavascript();
 	}
 
@@ -78,13 +78,13 @@ 
 	function generateHomeButtons() 
 	{
 	    global $current_user;
-        if(displayStudioForCurrentUser() == true) {
+        if (displayStudioForCurrentUser() == true) {
 		//$this->buttons['Application'] = array ('action' => '', 'imageTitle' => 'Application', 'size' => '128', 'help'=>'appBtn');
-		$this->buttons[$GLOBALS['mod_strings']['LBL_STUDIO']] = array ('action' => 'javascript:ModuleBuilder.main("studio")', 'imageTitle' => 'Studio', 'size' => '128', 'help'=>'studioBtn');
+		$this->buttons[$GLOBALS['mod_strings']['LBL_STUDIO']] = array('action' => 'javascript:ModuleBuilder.main("studio")', 'imageTitle' => 'Studio', 'size' => '128', 'help'=>'studioBtn');
         }
-        if(is_admin($current_user)) {
-		$this->buttons[$GLOBALS['mod_strings']['LBL_MODULEBUILDER']] = array ('action' => 'javascript:ModuleBuilder.main("mb")', 'imageTitle' => 'ModuleBuilder', 'size' => '128', 'help'=>'mbBtn');
+        if (is_admin($current_user)) {
+		$this->buttons[$GLOBALS['mod_strings']['LBL_MODULEBUILDER']] = array('action' => 'javascript:ModuleBuilder.main("mb")', 'imageTitle' => 'ModuleBuilder', 'size' => '128', 'help'=>'mbBtn');
         }
-		$this->buttons[$GLOBALS['mod_strings']['LBL_DROPDOWNEDITOR']] = array ('action' => 'javascript:ModuleBuilder.main("dropdowns")', 'imageTitle' => $GLOBALS['mod_strings']['LBL_HOME_EDIT_DROPDOWNS'], 'imageName' => 'DropDownEditor', 'size' => '128', 'help'=>'dropDownEditorBtn');
+		$this->buttons[$GLOBALS['mod_strings']['LBL_DROPDOWNEDITOR']] = array('action' => 'javascript:ModuleBuilder.main("dropdowns")', 'imageTitle' => $GLOBALS['mod_strings']['LBL_HOME_EDIT_DROPDOWNS'], 'imageName' => 'DropDownEditor', 'size' => '128', 'help'=>'dropDownEditorBtn');
 	}
 }
\ No newline at end of file

Braces +3 added lines, -1 removed lines

@@ -67,7 +67,9 @@
 		$smarty->assign('assistant',$assistant);
 		//initialize Assistant's display property.
 		$userPref = $current_user->getPreference('mb_assist', 'Assistant');
-		if(!$userPref) $userPref="na";
+		if(!$userPref) {
+		    $userPref="na";
+		}
 		$smarty->assign('userPref',$userPref);
 		$ajax = new AjaxCompose();
 		$ajax->addSection('center', $mod_strings['LBL_HOME'],$smarty->fetch('modules/ModuleBuilder/tpls/wizard.tpl'));

modules/ModuleBuilder/parsers/StandardField.php

Braces +32 added lines, -23 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (! defined ( 'sugarEntry' ) || ! sugarEntry)
+if (! defined ( 'sugarEntry' ) || ! sugarEntry) {
     die ( 'Not A Valid Entry Point' ) ;
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -60,8 +61,9 @@ 
             $bean_name = get_valid_bean_name($this->module);
             $dictionary = array($bean_name => array("fields" => array($field => array())));
             include("$this->base_path/sugarfield_$field.php");
-            if (!empty($dictionary[$bean_name]) && isset($dictionary[$bean_name]["fields"][$field]))
-                $this->custom_def = $dictionary[$bean_name]["fields"][$field];
+            if (!empty($dictionary[$bean_name]) && isset($dictionary[$bean_name]["fields"][$field])) {
+                            $this->custom_def = $dictionary[$bean_name]["fields"][$field];
+            }
     	}
     }
 
@@ -71,8 +73,9 @@ 
         {
             $dictionary = array();
             include("modules/{$this->module}/vardefs.php");
-            if (!empty($dictionary[$beanList[$this->module]]) && isset($dictionary[$beanList[$this->module]]["fields"][$field]))
-                $this->base_def = $dictionary[$beanList[$this->module]]["fields"][$field];
+            if (!empty($dictionary[$beanList[$this->module]]) && isset($dictionary[$beanList[$this->module]]["fields"][$field])) {
+                            $this->base_def = $dictionary[$beanList[$this->module]]["fields"][$field];
+            }
         }
     }
     
@@ -86,13 +89,15 @@ 
         global $dictionary, $beanList;
         
         
-        if (empty($beanList[$this->module]))
-            return false;
+        if (empty($beanList[$this->module])) {
+                    return false;
+        }
 
         $bean_name = get_valid_bean_name($this->module);
 
-        if (empty($dictionary[$bean_name]) || empty($dictionary[$bean_name]["fields"][$field->name]))
-            return false;
+        if (empty($dictionary[$bean_name]) || empty($dictionary[$bean_name]["fields"][$field->name])) {
+                    return false;
+        }
 
         $currdef = $dictionary[$bean_name]["fields"][$field->name];
 
@@ -120,8 +125,9 @@ 
            
         	if ($property == "action" || $property == "label_value" || $property == "label"
             	|| ((substr($property, 0,3) == 'ext' && strlen($property) == 4))
-            ) 
-            	continue;
+            ) {
+        	            	continue;
+        	}
        	 		
             // Bug 37043 - Avoid writing out vardef defintions that are the default value.
             if (isset($newDef[$property]) &&
@@ -134,26 +140,29 @@ 
             }
             
             //Remove any orphaned entries
-            if (isset($this->custom_def[$property]) && !isset($newDef[$property]))
-            	unset($this->custom_def[$property]);
+            if (isset($this->custom_def[$property]) && !isset($newDef[$property])) {
+                        	unset($this->custom_def[$property]);
+            }
 
             //Handle overrides of out of the box definitions with empty
             if (!empty($this->base_def[$property]) && !isset($newDef[$property]))
             {
                 //Switch on type of the property to find what the correct 'empty' is.
-                if(is_string($this->base_def[$property]))
-                    $this->custom_def[$property] = "";
-                else if(is_array($this->base_def[$property]))
-                    $this->custom_def[$property] = array();
-                else if(is_bool($this->base_def[$property]))
-                    $this->custom_def[$property] = false;
-                else
-                    $this->custom_def[$property] = null;
+                if(is_string($this->base_def[$property])) {
+                                    $this->custom_def[$property] = "";
+                } else if(is_array($this->base_def[$property])) {
+                                    $this->custom_def[$property] = array();
+                } else if(is_bool($this->base_def[$property])) {
+                                    $this->custom_def[$property] = false;
+                } else {
+                                    $this->custom_def[$property] = null;
+                }
             }
         }
         
-        if (isset($this->custom_def["duplicate_merge_dom_value"]) && !isset($this->custom_def["duplicate_merge"]))
-        	unset($this->custom_def["duplicate_merge_dom_value"]);
+        if (isset($this->custom_def["duplicate_merge_dom_value"]) && !isset($this->custom_def["duplicate_merge"])) {
+                	unset($this->custom_def["duplicate_merge_dom_value"]);
+        }
         
         $this->writeVardefExtension($bean_name, $field, $this->custom_def);
     }

Indentation +16 added lines, -16 removed lines

@@ -44,20 +44,20 @@ 
 
 class StandardField extends DynamicField
 {
-	var $custom_def = array();
-	var $base_def = array();
-	var $baseField;
+    var $custom_def = array();
+    var $base_def = array();
+    var $baseField;
     
     protected function loadCustomDef($field){
-    	global $beanList;
-    	if (!empty($beanList[$this->module]) && is_file("custom/Extension/modules/{$this->module}/Ext/Vardefs/sugarfield_$field.php"))
-    	{
+        global $beanList;
+        if (!empty($beanList[$this->module]) && is_file("custom/Extension/modules/{$this->module}/Ext/Vardefs/sugarfield_$field.php"))
+        {
             $bean_name = get_valid_bean_name($this->module);
             $dictionary = array($bean_name => array("fields" => array($field => array())));
             include("$this->base_path/sugarfield_$field.php");
             if (!empty($dictionary[$bean_name]) && isset($dictionary[$bean_name]["fields"][$field]))
                 $this->custom_def = $dictionary[$bean_name]["fields"][$field];
-    	}
+        }
     }
 
     protected function loadBaseDef($field){
@@ -113,24 +113,24 @@ 
         $this->baseField = get_widget ( $field->type) ;
         foreach ($field->vardef_map as $property => $fmd_col){
            
-        	if ($property == "action" || $property == "label_value" || $property == "label"
-            	|| ((substr($property, 0,3) == 'ext' && strlen($property) == 4))
+            if ($property == "action" || $property == "label_value" || $property == "label"
+                || ((substr($property, 0,3) == 'ext' && strlen($property) == 4))
             ) 
-            	continue;
+                continue;
        	 		
             // Bug 37043 - Avoid writing out vardef defintions that are the default value.
             if (isset($newDef[$property]) &&
-            	((!isset($currdef[$property]) && !$this->isDefaultValue($property,$newDef[$property], $this->baseField))
-            		|| (isset($currdef[$property]) && $currdef[$property] != $newDef[$property])
-            	)
+                ((!isset($currdef[$property]) && !$this->isDefaultValue($property,$newDef[$property], $this->baseField))
+                    || (isset($currdef[$property]) && $currdef[$property] != $newDef[$property])
+                )
             ){
-            	$this->custom_def[$property] =
+                $this->custom_def[$property] =
                     is_string($newDef[$property]) ? htmlspecialchars_decode($newDef[$property], ENT_QUOTES) : $newDef[$property];
             }
             
             //Remove any orphaned entries
             if (isset($this->custom_def[$property]) && !isset($newDef[$property]))
-            	unset($this->custom_def[$property]);
+                unset($this->custom_def[$property]);
 
             //Handle overrides of out of the box definitions with empty
             if (!empty($this->base_def[$property]) && !isset($newDef[$property]))
@@ -148,7 +148,7 @@ 
         }
         
         if (isset($this->custom_def["duplicate_merge_dom_value"]) && !isset($this->custom_def["duplicate_merge"]))
-        	unset($this->custom_def["duplicate_merge_dom_value"]);
+            unset($this->custom_def["duplicate_merge_dom_value"]);
         
         $this->writeVardefExtension($bean_name, $field, $this->custom_def);
     }

Spacing +17 added lines, -17 removed lines

@@ -1,6 +1,6 @@ 
 <?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.
@@ -40,7 +40,7 @@ 
  ********************************************************************************/
 
 
-require_once ('modules/DynamicFields/DynamicField.php') ;
+require_once ('modules/DynamicFields/DynamicField.php');
 
 class StandardField extends DynamicField
 {
@@ -48,7 +48,7 @@ 
 	var $base_def = array();
 	var $baseField;
     
-    protected function loadCustomDef($field){
+    protected function loadCustomDef($field) {
     	global $beanList;
     	if (!empty($beanList[$this->module]) && is_file("custom/Extension/modules/{$this->module}/Ext/Vardefs/sugarfield_$field.php"))
     	{
@@ -60,7 +60,7 @@ 
     	}
     }
 
-    protected function loadBaseDef($field){
+    protected function loadBaseDef($field) {
         global $beanList;
         if (!empty($beanList[$this->module]) && is_file("modules/{$this->module}/vardefs.php"))
         {
@@ -77,7 +77,7 @@ 
      * @param Field Object $field
      * @return boolean
      */
-    function addFieldObject(&$field){
+    function addFieldObject(&$field) {
         global $dictionary, $beanList;
         
         
@@ -93,9 +93,9 @@ 
 
         // set $field->unified_search=true if field supports unified search
         // regarding #51427
-        if($field->supports_unified_search)
+        if ($field->supports_unified_search)
         {
-            if(isset($dictionary[$bean_name]['unified_search_default_enabled']) && isset($dictionary[$bean_name]['unified_search'])
+            if (isset($dictionary[$bean_name]['unified_search_default_enabled']) && isset($dictionary[$bean_name]['unified_search'])
             && $dictionary[$bean_name]['unified_search_default_enabled'] && $dictionary[$bean_name]['unified_search'])
             {
                 $currdef['unified_search'] = $field->unified_search = isset($currdef['unified_search'])
@@ -109,21 +109,21 @@ 
         $this->loadBaseDef($field->name);
         $newDef = $field->get_field_def();
         
-        require_once ('modules/DynamicFields/FieldCases.php') ;
-        $this->baseField = get_widget ( $field->type) ;
-        foreach ($field->vardef_map as $property => $fmd_col){
+        require_once ('modules/DynamicFields/FieldCases.php');
+        $this->baseField = get_widget($field->type);
+        foreach ($field->vardef_map as $property => $fmd_col) {
            
         	if ($property == "action" || $property == "label_value" || $property == "label"
-            	|| ((substr($property, 0,3) == 'ext' && strlen($property) == 4))
+            	|| ((substr($property, 0, 3) == 'ext' && strlen($property) == 4))
             ) 
             	continue;
        	 		
             // Bug 37043 - Avoid writing out vardef defintions that are the default value.
             if (isset($newDef[$property]) &&
-            	((!isset($currdef[$property]) && !$this->isDefaultValue($property,$newDef[$property], $this->baseField))
+            	((!isset($currdef[$property]) && !$this->isDefaultValue($property, $newDef[$property], $this->baseField))
             		|| (isset($currdef[$property]) && $currdef[$property] != $newDef[$property])
             	)
-            ){
+            ) {
             	$this->custom_def[$property] =
                     is_string($newDef[$property]) ? htmlspecialchars_decode($newDef[$property], ENT_QUOTES) : $newDef[$property];
             }
@@ -136,11 +136,11 @@ 
             if (!empty($this->base_def[$property]) && !isset($newDef[$property]))
             {
                 //Switch on type of the property to find what the correct 'empty' is.
-                if(is_string($this->base_def[$property]))
+                if (is_string($this->base_def[$property]))
                     $this->custom_def[$property] = "";
-                else if(is_array($this->base_def[$property]))
+                else if (is_array($this->base_def[$property]))
                     $this->custom_def[$property] = array();
-                else if(is_bool($this->base_def[$property]))
+                else if (is_bool($this->base_def[$property]))
                     $this->custom_def[$property] = false;
                 else
                     $this->custom_def[$property] = null;

modules/ModuleBuilder/parsers/relationships/OneToOneRelationship.php

Spacing +30 added lines, -30 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.
@@ -39,7 +39,7 @@ 
  ********************************************************************************/
 
 
-require_once 'modules/ModuleBuilder/parsers/relationships/AbstractRelationship.php' ;
+require_once 'modules/ModuleBuilder/parsers/relationships/AbstractRelationship.php';
 
 /*
  * Class to manage the metadata for a One-To-One Relationship
@@ -71,9 +71,9 @@ 
      * Constructor
      * @param array $definition Parameters passed in as array with keys defined in parent::keys
      */
-    function __construct ($definition)
+    function __construct($definition)
     {
-        parent::__construct ( $definition ) ;
+        parent::__construct($definition);
     }
     
     /*
@@ -83,55 +83,55 @@ 
     /*
      * @return array    An array of relationship metadata definitions
      */
-    function buildRelationshipMetaData ()
+    function buildRelationshipMetaData()
     {
-        return array( $this->lhs_module => $this->getRelationshipMetaData ( MB_ONETOONE ) ) ;
+        return array($this->lhs_module => $this->getRelationshipMetaData(MB_ONETOONE));
     }
 
     /* Build a set of Link Field definitions for this relationship
      * @return array    An array of field definitions, ready for the vardefs, keyed by module
      */
-    function buildVardefs ( )
+    function buildVardefs( )
     {
-        $vardefs = array ( ) ;
-        $vardefs [ $this->rhs_module ] [] = $this->getLinkFieldDefinition ( $this->lhs_module, $this->relationship_name , false, 
-            'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $this->getLeftModuleSystemLabel() ) . '_TITLE' ,
-            $this->relationship_only ? false : $this->getIDName( $this->lhs_module )
-        ) ;
-        $vardefs [ $this->lhs_module ] [] = $this->getLinkFieldDefinition ( $this->rhs_module, $this->relationship_name, false, 
-            'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $this->getRightModuleSystemLabel()   ) . '_TITLE'  ,
-            $this->relationship_only ? false : $this->getIDName( $this->rhs_module )
-        ) ;
+        $vardefs = array( );
+        $vardefs [$this->rhs_module] [] = $this->getLinkFieldDefinition($this->lhs_module, $this->relationship_name, false, 
+            'LBL_'.strtoupper($this->relationship_name.'_FROM_'.$this->getLeftModuleSystemLabel()).'_TITLE',
+            $this->relationship_only ? false : $this->getIDName($this->lhs_module)
+        );
+        $vardefs [$this->lhs_module] [] = $this->getLinkFieldDefinition($this->rhs_module, $this->relationship_name, false, 
+            'LBL_'.strtoupper($this->relationship_name.'_FROM_'.$this->getRightModuleSystemLabel()).'_TITLE',
+            $this->relationship_only ? false : $this->getIDName($this->rhs_module)
+        );
         
         if (!$this->relationship_only)
         {
-            $vardefs [ $this->lhs_module ] [] = $this->getRelateFieldDefinition ( $this->rhs_module, $this->relationship_name, $this->getRightModuleSystemLabel() ) ;
-            $vardefs [ $this->rhs_module ] [] = $this->getRelateFieldDefinition ( $this->lhs_module, $this->relationship_name, $this->getLeftModuleSystemLabel() ) ;
-            $vardefs [ $this->lhs_module ] [] = $this->getLink2FieldDefinition ( $this->rhs_module, $this->relationship_name , false, 
-            'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $this->getRightModuleSystemLabel()   ) . '_TITLE' ) ;
-            $vardefs [ $this->rhs_module ] [] = $this->getLink2FieldDefinition ( $this->lhs_module, $this->relationship_name , false, 
-            'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $this->getLeftModuleSystemLabel() ) . '_TITLE' ) ;
+            $vardefs [$this->lhs_module] [] = $this->getRelateFieldDefinition($this->rhs_module, $this->relationship_name, $this->getRightModuleSystemLabel());
+            $vardefs [$this->rhs_module] [] = $this->getRelateFieldDefinition($this->lhs_module, $this->relationship_name, $this->getLeftModuleSystemLabel());
+            $vardefs [$this->lhs_module] [] = $this->getLink2FieldDefinition($this->rhs_module, $this->relationship_name, false, 
+            'LBL_'.strtoupper($this->relationship_name.'_FROM_'.$this->getRightModuleSystemLabel()).'_TITLE');
+            $vardefs [$this->rhs_module] [] = $this->getLink2FieldDefinition($this->lhs_module, $this->relationship_name, false, 
+            'LBL_'.strtoupper($this->relationship_name.'_FROM_'.$this->getLeftModuleSystemLabel()).'_TITLE');
         }
         
-        return $vardefs ;
+        return $vardefs;
     }
 
     /*
      * Define what fields to add to which modules layouts
      * @return array    An array of module => fieldname
      */
-    function buildFieldsToLayouts ()
+    function buildFieldsToLayouts()
     {
         if ($this->relationship_only)
-            return array () ;
+            return array();
  
         if ($this->lhs_module == $this->rhs_module) // don't add in two fields on recursive relationships
-            return array ( $this->lhs_module => $this->getValidDBName($this->relationship_name . "_name") );
+            return array($this->lhs_module => $this->getValidDBName($this->relationship_name."_name"));
         else
-            return array (
-                $this->lhs_module => $this->getValidDBName($this->relationship_name . "_name") ,
-                $this->rhs_module => $this->getValidDBName($this->relationship_name . "_name")
-            ) ;
+            return array(
+                $this->lhs_module => $this->getValidDBName($this->relationship_name."_name"),
+                $this->rhs_module => $this->getValidDBName($this->relationship_name."_name")
+            );
     }
 
 }

Braces +11 added lines, -6 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.
@@ -122,16 +124,19 @@ 
      */
     function buildFieldsToLayouts ()
     {
-        if ($this->relationship_only)
-            return array () ;
+        if ($this->relationship_only) {
+                    return array () ;
+        }
  
-        if ($this->lhs_module == $this->rhs_module) // don't add in two fields on recursive relationships
+        if ($this->lhs_module == $this->rhs_module) {
+            // don't add in two fields on recursive relationships
             return array ( $this->lhs_module => $this->getValidDBName($this->relationship_name . "_name") );
-        else
-            return array (
+        } else {
+                    return array (
                 $this->lhs_module => $this->getValidDBName($this->relationship_name . "_name") ,
                 $this->rhs_module => $this->getValidDBName($this->relationship_name . "_name")
             ) ;
+        }
     }
 
 }

modules/ModuleBuilder/parsers/relationships/AbstractRelationship.php

Indentation +84 added lines, -84 removed lines

@@ -59,7 +59,7 @@ 
     public static $definitionKeys = array ( 
         // atttributes of this relationship - here in the definition so they are preserved across saves and loads
         'for_activities',
-    	'is_custom',
+        'is_custom',
         'from_studio',
         'readonly' , // a readonly relationship cannot be Built by subclasses of AbstractRelationships
         'deleted' , // a deleted relationship will not be built, and if it had been built previously the built relationship will be removed
@@ -221,48 +221,48 @@ 
         $labelDefinitions = array ( ) ;
         if (!$this->relationship_only)
         {
-        	if(!$this->is_custom && $update && file_exists("modules/{$this->rhs_module}/metadata/subpaneldefs.php")){
-        		include("modules/{$this->rhs_module}/metadata/subpaneldefs.php");
-        		if(isset($layout_defs[$this->rhs_module]['subpanel_setup'][strtolower($this->lhs_module)]['title_key'])){
-        			$rightSysLabel = $layout_defs[$this->rhs_module]['subpanel_setup'][strtolower($this->lhs_module)]['title_key'];
-        		}
-        		$layout_defs = array();
-        	}
-        	if(!$this->is_custom && $update && file_exists("modules/{$this->lhs_module}/metadata/subpaneldefs.php")){
-        		include("modules/{$this->lhs_module}/metadata/subpaneldefs.php");
-        		if(isset($layout_defs[$this->lhs_module]['subpanel_setup'][strtolower($this->rhs_module)]['title_key'])){
-        			$leftSysLabel = $layout_defs[$this->lhs_module]['subpanel_setup'][strtolower($this->rhs_module)]['title_key'];
-        		}
-        		$layout_defs = array();
-        	}
-        	$labelDefinitions [] = array (
-        		'module' => $this->rhs_module ,
-        		'system_label' => isset($rightSysLabel)?$rightSysLabel : 'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $this->getLeftModuleSystemLabel() ) . '_TITLE' ,
-        		'display_label' => ($update && !empty($_REQUEST [ 'lhs_label' ] ))?$_REQUEST [ 'lhs_label' ] :(empty($this->lhs_label) ? translate ( $this->lhs_module ) : $this->lhs_label),
-        	) ;
+            if(!$this->is_custom && $update && file_exists("modules/{$this->rhs_module}/metadata/subpaneldefs.php")){
+                include("modules/{$this->rhs_module}/metadata/subpaneldefs.php");
+                if(isset($layout_defs[$this->rhs_module]['subpanel_setup'][strtolower($this->lhs_module)]['title_key'])){
+                    $rightSysLabel = $layout_defs[$this->rhs_module]['subpanel_setup'][strtolower($this->lhs_module)]['title_key'];
+                }
+                $layout_defs = array();
+            }
+            if(!$this->is_custom && $update && file_exists("modules/{$this->lhs_module}/metadata/subpaneldefs.php")){
+                include("modules/{$this->lhs_module}/metadata/subpaneldefs.php");
+                if(isset($layout_defs[$this->lhs_module]['subpanel_setup'][strtolower($this->rhs_module)]['title_key'])){
+                    $leftSysLabel = $layout_defs[$this->lhs_module]['subpanel_setup'][strtolower($this->rhs_module)]['title_key'];
+                }
+                $layout_defs = array();
+            }
+            $labelDefinitions [] = array (
+                'module' => $this->rhs_module ,
+                'system_label' => isset($rightSysLabel)?$rightSysLabel : 'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $this->getLeftModuleSystemLabel() ) . '_TITLE' ,
+                'display_label' => ($update && !empty($_REQUEST [ 'lhs_label' ] ))?$_REQUEST [ 'lhs_label' ] :(empty($this->lhs_label) ? translate ( $this->lhs_module ) : $this->lhs_label),
+            ) ;
             $labelDefinitions [] = array (
-            	'module' => $this->lhs_module ,
-            	'system_label' =>  isset($leftSysLabel)?$leftSysLabel :'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $this->getRightModuleSystemLabel() ) . '_TITLE' ,
-            	'display_label' => ($update && !empty($_REQUEST [ 'rhs_label' ] ))?$_REQUEST [ 'rhs_label' ] :(empty($this->rhs_label) ? translate ( $this->rhs_module ) : $this->rhs_label),
+                'module' => $this->lhs_module ,
+                'system_label' =>  isset($leftSysLabel)?$leftSysLabel :'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $this->getRightModuleSystemLabel() ) . '_TITLE' ,
+                'display_label' => ($update && !empty($_REQUEST [ 'rhs_label' ] ))?$_REQUEST [ 'rhs_label' ] :(empty($this->rhs_label) ? translate ( $this->rhs_module ) : $this->rhs_label),
             ) ;
         }
         return $labelDefinitions ;
     }
 
-	function getLeftModuleSystemLabel()
+    function getLeftModuleSystemLabel()
     {
-		if($this->lhs_module == $this->rhs_module){
-			return $this->lhs_module.'_L';
-		}
-		return $this->lhs_module;
+        if($this->lhs_module == $this->rhs_module){
+            return $this->lhs_module.'_L';
+        }
+        return $this->lhs_module;
     }
 
     function getRightModuleSystemLabel()
     {
-		if($this->lhs_module == $this->rhs_module){
-			return $this->rhs_module.'_R';
-		}
-		return $this->rhs_module;
+        if($this->lhs_module == $this->rhs_module){
+            return $this->rhs_module.'_R';
+        }
+        return $this->rhs_module;
     }
 
     /**
@@ -298,24 +298,24 @@ 
     protected function getSubpanelDefinition ($relationshipName , $sourceModule , $subpanelName, $titleKeyName = '', $source = "")
     {
         if (empty($source)) 
-        	$source = $this->getValidDBName($relationshipName);
-    	$subpanelDefinition = array ( ) ;
+            $source = $this->getValidDBName($relationshipName);
+        $subpanelDefinition = array ( ) ;
         $subpanelDefinition [ 'order' ] = 100 ;
         $subpanelDefinition [ 'module' ] = $sourceModule ;
         $subpanelDefinition [ 'subpanel_name' ] = $subpanelName ;
         // following two lines are required for the subpanel pagination code in ListView.php->processUnionBeans() to correctly determine the relevant field for sorting
         $subpanelDefinition [ 'sort_order' ] = 'asc' ;
         $subpanelDefinition [ 'sort_by' ] = 'id' ;
-		if(!empty($titleKeyName)){
-			$subpanelDefinition [ 'title_key' ] = 'LBL_' . strtoupper ( $relationshipName . '_FROM_' . $titleKeyName ) . '_TITLE' ;
-		}else{
-			$subpanelDefinition [ 'title_key' ] = 'LBL_' . strtoupper ( $relationshipName . '_FROM_' . $sourceModule ) . '_TITLE' ;
-		}
+        if(!empty($titleKeyName)){
+            $subpanelDefinition [ 'title_key' ] = 'LBL_' . strtoupper ( $relationshipName . '_FROM_' . $titleKeyName ) . '_TITLE' ;
+        }else{
+            $subpanelDefinition [ 'title_key' ] = 'LBL_' . strtoupper ( $relationshipName . '_FROM_' . $sourceModule ) . '_TITLE' ;
+        }
         $subpanelDefinition [ 'get_subpanel_data' ] = $source ;
         $subpanelDefinition [ 'top_buttons' ] = array(
-		    array('widget_class' => "SubPanelTopButtonQuickCreate"),
-		    array('widget_class' => 'SubPanelTopSelectButton', 'mode'=>'MultiSelect')
-		);
+            array('widget_class' => "SubPanelTopButtonQuickCreate"),
+            array('widget_class' => 'SubPanelTopSelectButton', 'mode'=>'MultiSelect')
+        );
         
         return array ( $subpanelDefinition );
     }
@@ -339,7 +339,7 @@ 
         $vardef [ 'module' ] = $sourceModule ;
         $vardef [ 'bean_name' ] = BeanFactory::getObjectName($sourceModule) ;
         if ($right_side)
-        	$vardef [ 'side' ] = 'right' ;
+            $vardef [ 'side' ] = 'right' ;
         if (!empty($vname))
             $vardef [ 'vname' ] = $vname;
         if (!empty($id_name))
@@ -364,11 +364,11 @@ 
         $vardef [ 'type' ] = 'link' ;
         $vardef [ 'relationship' ] = $relationshipName ;
         $vardef [ 'source' ] = 'non-db' ;
-		$vardef ['reportable'] = false;
+        $vardef ['reportable'] = false;
         if ($right_side)
-        	$vardef [ 'side' ] = 'right' ;
+            $vardef [ 'side' ] = 'right' ;
         else
-        	$vardef [ 'side' ] = 'left' ;
+            $vardef [ 'side' ] = 'left' ;
         if (!empty($vname))
             $vardef [ 'vname' ] = $vname;
 
@@ -389,11 +389,11 @@ 
         $vardef [ 'type' ] = 'relate' ;
 
         $vardef [ 'source' ] = 'non-db' ;
-		if(!empty($vnameLabel)){
-			$vardef [ 'vname' ] = 'LBL_' . strtoupper ( $relationshipName . '_FROM_' . $vnameLabel ) . '_TITLE' ;
-		}else{
-			$vardef [ 'vname' ] = 'LBL_' . strtoupper ( $relationshipName . '_FROM_' . $sourceModule ) . '_TITLE' ;
-		}
+        if(!empty($vnameLabel)){
+            $vardef [ 'vname' ] = 'LBL_' . strtoupper ( $relationshipName . '_FROM_' . $vnameLabel ) . '_TITLE' ;
+        }else{
+            $vardef [ 'vname' ] = 'LBL_' . strtoupper ( $relationshipName . '_FROM_' . $sourceModule ) . '_TITLE' ;
+        }
         
         $vardef [ 'save' ] = true; // the magic value to tell SugarBean to save this relate field even though it is not listed in the $relationship_fields array
        
@@ -421,7 +421,7 @@ 
             if (in_array( 'file' , array_keys ( $module->config [ 'templates' ] ) ) ){
                 $vardef [ 'rname' ] = 'document_name' ;
             }elseif(in_array ( 'person' , array_keys ( $module->config [ 'templates' ] ) ) ){
-            	$vardef [ 'db_concat_fields' ] = array( 0 =>'first_name', 1 =>'last_name') ;
+                $vardef [ 'db_concat_fields' ] = array( 0 =>'first_name', 1 =>'last_name') ;
             }
         }
         else
@@ -450,11 +450,11 @@ 
                     require_once ( $GLOBALS ['beanFiles'] [ $object ] );
                     $bean = new $object();
                     if ( isset ( $GLOBALS [ 'dictionary' ] [ $object ] [ 'templates'] )){
-                    	if(in_array ( 'file' , $GLOBALS [ 'dictionary' ] [ $object ] [ 'templates'] )){
-                    		$vardef [ 'rname' ] = 'document_name' ;
-                    	}elseif(in_array ( 'person' , $GLOBALS [ 'dictionary' ] [ $object ] [ 'templates'] )){
-                    		 $vardef [ 'db_concat_fields' ] = array( 0 =>'first_name', 1 =>'last_name') ;
-                    	}
+                        if(in_array ( 'file' , $GLOBALS [ 'dictionary' ] [ $object ] [ 'templates'] )){
+                            $vardef [ 'rname' ] = 'document_name' ;
+                        }elseif(in_array ( 'person' , $GLOBALS [ 'dictionary' ] [ $object ] [ 'templates'] )){
+                                $vardef [ 'db_concat_fields' ] = array( 0 =>'first_name', 1 =>'last_name') ;
+                        }
                     }
                         
             }
@@ -634,7 +634,7 @@ 
     function getJoinKeyLHS()
     {
         if (!isset($this->joinKeyLHS))
-        	$this->joinKeyLHS = $this->getValidDBName ( $this->relationship_name . $this->lhs_module . "_ida"  , true) ;
+            $this->joinKeyLHS = $this->getValidDBName ( $this->relationship_name . $this->lhs_module . "_ida"  , true) ;
         
         return $this->joinKeyLHS;
     }
@@ -642,7 +642,7 @@ 
     function getJoinKeyRHS()
     {
         if (!isset($this->joinKeyRHS))
-        	$this->joinKeyRHS = $this->getValidDBName ( $this->relationship_name . $this->rhs_module . "_idb"  , true) ;
+            $this->joinKeyRHS = $this->getValidDBName ( $this->relationship_name . $this->rhs_module . "_idb"  , true) ;
     	
         return $this->joinKeyRHS;
     }
@@ -674,32 +674,32 @@ 
     }
 
     public function getTitleKey($left=false){
-		if(!$this->is_custom && !$left && file_exists("modules/{$this->rhs_module}/metadata/subpaneldefs.php")){
-    		include("modules/{$this->rhs_module}/metadata/subpaneldefs.php");
-    		if(isset($layout_defs[$this->rhs_module]['subpanel_setup'][strtolower($this->lhs_module)]['title_key'])){
-    			return $layout_defs[$this->rhs_module]['subpanel_setup'][strtolower($this->lhs_module)]['title_key'];
-    		}
-    	}else if(!$this->is_custom &&  file_exists("modules/{$this->lhs_module}/metadata/subpaneldefs.php")){
-    		include("modules/{$this->lhs_module}/metadata/subpaneldefs.php");
-    		if(isset($layout_defs[$this->lhs_module]['subpanel_setup'][strtolower($this->rhs_module)]['title_key'])){
-    			return $layout_defs[$this->lhs_module]['subpanel_setup'][strtolower($this->rhs_module)]['title_key'];
-    		}
-    	}
+        if(!$this->is_custom && !$left && file_exists("modules/{$this->rhs_module}/metadata/subpaneldefs.php")){
+            include("modules/{$this->rhs_module}/metadata/subpaneldefs.php");
+            if(isset($layout_defs[$this->rhs_module]['subpanel_setup'][strtolower($this->lhs_module)]['title_key'])){
+                return $layout_defs[$this->rhs_module]['subpanel_setup'][strtolower($this->lhs_module)]['title_key'];
+            }
+        }else if(!$this->is_custom &&  file_exists("modules/{$this->lhs_module}/metadata/subpaneldefs.php")){
+            include("modules/{$this->lhs_module}/metadata/subpaneldefs.php");
+            if(isset($layout_defs[$this->lhs_module]['subpanel_setup'][strtolower($this->rhs_module)]['title_key'])){
+                return $layout_defs[$this->lhs_module]['subpanel_setup'][strtolower($this->rhs_module)]['title_key'];
+            }
+        }
     	
-    	if($left){
-    		$titleKeyName = $this->getRightModuleSystemLabel();
-    		$sourceModule = $this->rhs_module;
-    	}else{
-    		$titleKeyName = $this->getLeftModuleSystemLabel();
-    		$sourceModule = $this->lhs_module;
-    	}
+        if($left){
+            $titleKeyName = $this->getRightModuleSystemLabel();
+            $sourceModule = $this->rhs_module;
+        }else{
+            $titleKeyName = $this->getLeftModuleSystemLabel();
+            $sourceModule = $this->lhs_module;
+        }
     	
-		if(!empty($titleKeyName)){
-			$title_key = 'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $titleKeyName ) . '_TITLE' ;
-		}else{
-			$title_key = 'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $sourceModule ) . '_TITLE' ;
-		}
+        if(!empty($titleKeyName)){
+            $title_key = 'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $titleKeyName ) . '_TITLE' ;
+        }else{
+            $title_key = 'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $sourceModule ) . '_TITLE' ;
+        }
 		
-		return $title_key;
-	}
+        return $title_key;
+    }
 }
\ No newline at end of file

Braces +53 added lines, -38 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.
@@ -107,9 +109,10 @@ 
     function __construct ($definition)
     {
         // set any undefined attributes to the default value
-        foreach ( array ( 'readonly' , 'deleted' , 'relationship_only', 'for_activities', 'is_custom', 'from_studio' ) as $key )
-            if (! isset ( $definition [ $key ] ))
+        foreach ( array ( 'readonly' , 'deleted' , 'relationship_only', 'for_activities', 'is_custom', 'from_studio' ) as $key ) {
+                    if (! isset ( $definition [ $key ] ))
                 $definition [ $key ] = false ;
+        }
         
         foreach ( self::$definitionKeys as $key )
         {
@@ -297,8 +300,9 @@ 
      */
     protected function getSubpanelDefinition ($relationshipName , $sourceModule , $subpanelName, $titleKeyName = '', $source = "")
     {
-        if (empty($source)) 
-        	$source = $this->getValidDBName($relationshipName);
+        if (empty($source)) {
+                	$source = $this->getValidDBName($relationshipName);
+        }
     	$subpanelDefinition = array ( ) ;
         $subpanelDefinition [ 'order' ] = 100 ;
         $subpanelDefinition [ 'module' ] = $sourceModule ;
@@ -308,7 +312,7 @@ 
         $subpanelDefinition [ 'sort_by' ] = 'id' ;
 		if(!empty($titleKeyName)){
 			$subpanelDefinition [ 'title_key' ] = 'LBL_' . strtoupper ( $relationshipName . '_FROM_' . $titleKeyName ) . '_TITLE' ;
-		}else{
+		} else{
 			$subpanelDefinition [ 'title_key' ] = 'LBL_' . strtoupper ( $relationshipName . '_FROM_' . $sourceModule ) . '_TITLE' ;
 		}
         $subpanelDefinition [ 'get_subpanel_data' ] = $source ;
@@ -338,12 +342,15 @@ 
         $vardef [ 'source' ] = 'non-db' ;
         $vardef [ 'module' ] = $sourceModule ;
         $vardef [ 'bean_name' ] = BeanFactory::getObjectName($sourceModule) ;
-        if ($right_side)
-        	$vardef [ 'side' ] = 'right' ;
-        if (!empty($vname))
-            $vardef [ 'vname' ] = $vname;
-        if (!empty($id_name))
-            $vardef['id_name'] = $id_name;
+        if ($right_side) {
+                	$vardef [ 'side' ] = 'right' ;
+        }
+        if (!empty($vname)) {
+                    $vardef [ 'vname' ] = $vname;
+        }
+        if (!empty($id_name)) {
+                    $vardef['id_name'] = $id_name;
+        }
 
         return $vardef ;
     }
@@ -365,12 +372,14 @@ 
         $vardef [ 'relationship' ] = $relationshipName ;
         $vardef [ 'source' ] = 'non-db' ;
 		$vardef ['reportable'] = false;
-        if ($right_side)
-        	$vardef [ 'side' ] = 'right' ;
-        else
-        	$vardef [ 'side' ] = 'left' ;
-        if (!empty($vname))
-            $vardef [ 'vname' ] = $vname;
+        if ($right_side) {
+                	$vardef [ 'side' ] = 'right' ;
+        } else {
+                	$vardef [ 'side' ] = 'left' ;
+        }
+        if (!empty($vname)) {
+                    $vardef [ 'vname' ] = $vname;
+        }
 
         return $vardef ;
     }
@@ -391,7 +400,7 @@ 
         $vardef [ 'source' ] = 'non-db' ;
 		if(!empty($vnameLabel)){
 			$vardef [ 'vname' ] = 'LBL_' . strtoupper ( $relationshipName . '_FROM_' . $vnameLabel ) . '_TITLE' ;
-		}else{
+		} else{
 			$vardef [ 'vname' ] = 'LBL_' . strtoupper ( $relationshipName . '_FROM_' . $sourceModule ) . '_TITLE' ;
 		}
         
@@ -420,11 +429,10 @@ 
             $module = $mb->getPackageModule ( $parsedModuleName['packageName'] , $parsedModuleName['moduleName'] ) ;
             if (in_array( 'file' , array_keys ( $module->config [ 'templates' ] ) ) ){
                 $vardef [ 'rname' ] = 'document_name' ;
-            }elseif(in_array ( 'person' , array_keys ( $module->config [ 'templates' ] ) ) ){
+            } elseif(in_array ( 'person' , array_keys ( $module->config [ 'templates' ] ) ) ){
             	$vardef [ 'db_concat_fields' ] = array( 0 =>'first_name', 1 =>'last_name') ;
             }
-        }
-        else
+        } else
         {
             switch ( strtolower( $sourceModule ) )
             {
@@ -452,7 +460,7 @@ 
                     if ( isset ( $GLOBALS [ 'dictionary' ] [ $object ] [ 'templates'] )){
                     	if(in_array ( 'file' , $GLOBALS [ 'dictionary' ] [ $object ] [ 'templates'] )){
                     		$vardef [ 'rname' ] = 'document_name' ;
-                    	}elseif(in_array ( 'person' , $GLOBALS [ 'dictionary' ] [ $object ] [ 'templates'] )){
+                    	} elseif(in_array ( 'person' , $GLOBALS [ 'dictionary' ] [ $object ] [ 'templates'] )){
                     		 $vardef [ 'db_concat_fields' ] = array( 0 =>'first_name', 1 =>'last_name') ;
                     	}
                     }
@@ -513,8 +521,9 @@ 
             // but as we need to display the true cardinality in Studio and ModuleBuilder we also record the actual relationship type
             // this property is only used by Studio/MB
             $properties [ 'true_relationship_type' ] = $relationshipType ;
-            if ($this->from_studio)
-                $properties [ 'from_studio' ] = true;
+            if ($this->from_studio) {
+                            $properties [ 'from_studio' ] = true;
+            }
 
             $rel_properties [ 'join_table' ] = $this->getValidDBName ( $relationshipName."_c" ) ;
             // a and b are in case the module relates to itself
@@ -525,8 +534,9 @@ 
         // set the extended properties if they exist = for now, many-to-many definitions do not have to contain a role_column even if role_column_value is set; we'll just create a likely name if missing
         if (isset ( $this->definition [ 'relationship_role_column_value' ] ))
         {
-            if (! isset ( $this->definition [ 'relationship_role_column' ] ))
-                $this->definition [ 'relationship_role_column' ] = 'relationship_role_column' ;
+            if (! isset ( $this->definition [ 'relationship_role_column' ] )) {
+                            $this->definition [ 'relationship_role_column' ] = 'relationship_role_column' ;
+            }
             $rel_properties [ 'relationship_role_column' ] = $this->definition [ 'relationship_role_column' ] ;
             $rel_properties [ 'relationship_role_column_value' ] = $this->definition [ 'relationship_role_column_value' ] ;
         }
@@ -575,8 +585,10 @@ 
                 $alternateKeys = array ( $rel_properties [ 'join_key_lhs' ] , $rel_properties [ 'join_key_rhs' ] ) ;
         }
         
-        if (count($alternateKeys)>0)
-            $properties [ 'indices' ] [] = array ( 'name' => $indexBase . '_alt' , 'type' => 'alternate_key' , 'fields' => $alternateKeys ) ; // type must be set to alternate_key for Link.php to correctly update an existing record rather than inserting a copy - it uses the fields in this array as the keys to check if a duplicate record already exists
+        if (count($alternateKeys)>0) {
+                    $properties [ 'indices' ] [] = array ( 'name' => $indexBase . '_alt' , 'type' => 'alternate_key' , 'fields' => $alternateKeys ) ;
+        }
+        // type must be set to alternate_key for Link.php to correctly update an existing record rather than inserting a copy - it uses the fields in this array as the keys to check if a duplicate record already exists
         
         return $properties ;
     }
@@ -623,8 +635,9 @@ 
         $canonicalTypes = array ( ) ;
         foreach ( array ( MB_ONETOONE , MB_ONETOMANY , MB_MANYTOMANY , MB_MANYTOONE) as $canonicalType )
         {
-            if ($type == preg_replace ( '/[^\w]+/i', '', strtolower ( $canonicalType ) ))
-                return $canonicalType ;
+            if ($type == preg_replace ( '/[^\w]+/i', '', strtolower ( $canonicalType ) )) {
+                            return $canonicalType ;
+            }
         }
         // ok, we give up...
         return MB_MANYTOMANY ;
@@ -633,16 +646,18 @@ 
     
     function getJoinKeyLHS()
     {
-        if (!isset($this->joinKeyLHS))
-        	$this->joinKeyLHS = $this->getValidDBName ( $this->relationship_name . $this->lhs_module . "_ida"  , true) ;
+        if (!isset($this->joinKeyLHS)) {
+                	$this->joinKeyLHS = $this->getValidDBName ( $this->relationship_name . $this->lhs_module . "_ida"  , true) ;
+        }
         
         return $this->joinKeyLHS;
     }
     
     function getJoinKeyRHS()
     {
-        if (!isset($this->joinKeyRHS))
-        	$this->joinKeyRHS = $this->getValidDBName ( $this->relationship_name . $this->rhs_module . "_idb"  , true) ;
+        if (!isset($this->joinKeyRHS)) {
+                	$this->joinKeyRHS = $this->getValidDBName ( $this->relationship_name . $this->rhs_module . "_idb"  , true) ;
+        }
     	
         return $this->joinKeyRHS;
     }
@@ -679,7 +694,7 @@ 
     		if(isset($layout_defs[$this->rhs_module]['subpanel_setup'][strtolower($this->lhs_module)]['title_key'])){
     			return $layout_defs[$this->rhs_module]['subpanel_setup'][strtolower($this->lhs_module)]['title_key'];
     		}
-    	}else if(!$this->is_custom &&  file_exists("modules/{$this->lhs_module}/metadata/subpaneldefs.php")){
+    	} else if(!$this->is_custom &&  file_exists("modules/{$this->lhs_module}/metadata/subpaneldefs.php")){
     		include("modules/{$this->lhs_module}/metadata/subpaneldefs.php");
     		if(isset($layout_defs[$this->lhs_module]['subpanel_setup'][strtolower($this->rhs_module)]['title_key'])){
     			return $layout_defs[$this->lhs_module]['subpanel_setup'][strtolower($this->rhs_module)]['title_key'];
@@ -689,14 +704,14 @@ 
     	if($left){
     		$titleKeyName = $this->getRightModuleSystemLabel();
     		$sourceModule = $this->rhs_module;
-    	}else{
+    	} else{
     		$titleKeyName = $this->getLeftModuleSystemLabel();
     		$sourceModule = $this->lhs_module;
     	}
     	
 		if(!empty($titleKeyName)){
 			$title_key = 'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $titleKeyName ) . '_TITLE' ;
-		}else{
+		} else{
 			$title_key = 'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $sourceModule ) . '_TITLE' ;
 		}
 		

Spacing +234 added lines, -234 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -47,7 +47,7 @@ 
 class AbstractRelationship
 {
     
-    protected $definition ; // enough information to rebuild this relationship
+    protected $definition; // enough information to rebuild this relationship
     
 
     /*
@@ -56,35 +56,35 @@ 
      * The base set of keys are those used in the Relationships table 
      * Defined as Public as MBRelationship uses these to read the _POST data
      */
-    public static $definitionKeys = array ( 
+    public static $definitionKeys = array( 
         // atttributes of this relationship - here in the definition so they are preserved across saves and loads
         'for_activities',
     	'is_custom',
         'from_studio',
-        'readonly' , // a readonly relationship cannot be Built by subclasses of AbstractRelationships
-        'deleted' , // a deleted relationship will not be built, and if it had been built previously the built relationship will be removed
-        'relationship_only' , // means that we won't build any UI components for this relationship - required while the Subpanel code is restricted to one subpanel only from any module, and probably useful afterwards also for developers to build relationships for new code - it's a feature!
+        'readonly', // a readonly relationship cannot be Built by subclasses of AbstractRelationships
+        'deleted', // a deleted relationship will not be built, and if it had been built previously the built relationship will be removed
+        'relationship_only', // means that we won't build any UI components for this relationship - required while the Subpanel code is restricted to one subpanel only from any module, and probably useful afterwards also for developers to build relationships for new code - it's a feature!
         // keys not found in Relationships table
-        'label' , // optional
+        'label', // optional
         'rhs_label', // optional
         'lhs_label', // optional
-        'lhs_subpanel' , // subpanel FROM the lhs_module to display on the rhs_module detail view
-        'rhs_subpanel' , // subpanel FROM the rhs_module to display on the lhs_module detail view
+        'lhs_subpanel', // subpanel FROM the lhs_module to display on the rhs_module detail view
+        'rhs_subpanel', // subpanel FROM the rhs_module to display on the lhs_module detail view
         // keys from Relationships table
-        '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' ) ;
+        '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' );
 
     /*
      * Relationship_role_column and relationship_role_column_value:
@@ -104,65 +104,65 @@ 
      * Constructor
      * @param string $definition    Definition array for this relationship. Parameters are given in self::keys
      */
-    function __construct ($definition)
+    function __construct($definition)
     {
         // set any undefined attributes to the default value
-        foreach ( array ( 'readonly' , 'deleted' , 'relationship_only', 'for_activities', 'is_custom', 'from_studio' ) as $key )
-            if (! isset ( $definition [ $key ] ))
-                $definition [ $key ] = false ;
+        foreach (array('readonly', 'deleted', 'relationship_only', 'for_activities', 'is_custom', 'from_studio') as $key)
+            if (!isset ($definition [$key]))
+                $definition [$key] = false;
         
-        foreach ( self::$definitionKeys as $key )
+        foreach (self::$definitionKeys as $key)
         {
-            $this->$key = isset ( $definition [ $key ] ) ? $definition [ $key ] : '' ;
+            $this->$key = isset ($definition [$key]) ? $definition [$key] : '';
         }
-        $this->definition = $definition ;
+        $this->definition = $definition;
     }
 
     /*
      * Get the unique name of this relationship
      * @return string   The unique name (actually just that given to the constructor)
      */
-    public function getName ()
+    public function getName()
     {
-        return isset ( $this->definition [ 'relationship_name' ] ) ? $this->definition [ 'relationship_name' ] : null ;
+        return isset ($this->definition ['relationship_name']) ? $this->definition ['relationship_name'] : null;
     }
 
-    public function setName ($relationshipName)
+    public function setName($relationshipName)
     {
-        $this->relationship_name = $this->definition [ 'relationship_name' ] = $relationshipName ;
+        $this->relationship_name = $this->definition ['relationship_name'] = $relationshipName;
     }
 
     /*
      * Is this relationship readonly or not?
      * @return boolean True if cannot be changed; false otherwise
      */
-    public function readonly ()
+    public function readonly()
     {
-        return $this->definition [ 'readonly' ] ;
+        return $this->definition ['readonly'];
     }
 
-    public function setReadonly ($set = true)
+    public function setReadonly($set = true)
     {
-        $this->readonly = $this->definition [ 'readonly' ] = $set ;
+        $this->readonly = $this->definition ['readonly'] = $set;
     }
 
-    public function setFromStudio ()
+    public function setFromStudio()
     {
-        $this->from_studio = $this->definition [ 'from_studio' ] = true ;
+        $this->from_studio = $this->definition ['from_studio'] = true;
     }
 
     /*
      * Has this relationship been deleted? A deleted relationship does not get built, and is no longer visible in the list of relationships
      * @return boolean True if it has been deleted; false otherwise
      */
-    public function deleted ()
+    public function deleted()
     {
-        return $this->definition [ 'deleted' ] ;
+        return $this->definition ['deleted'];
     }
 
-    public function delete ()
+    public function delete()
     {
-        $this->deleted = $this->definition [ 'deleted' ] = true ;
+        $this->deleted = $this->definition ['deleted'] = true;
     }
     
     public function getFromStudio()
@@ -180,19 +180,19 @@ 
         return $this->rhs_module;
     }
 
-    public function getType ()
+    public function getType()
     {
-        return $this->relationship_type ;
+        return $this->relationship_type;
     }
     
-    public function relationship_only ()
+    public function relationship_only()
     {
-        return $this->definition [ 'relationship_only' ] ;   
+        return $this->definition ['relationship_only'];   
     }
     
-    public function setRelationship_only ()
+    public function setRelationship_only()
     {
-        $this->relationship_only = $this->definition [ 'relationship_only' ] = true ;
+        $this->relationship_only = $this->definition ['relationship_only'] = true;
     }
 
     /*
@@ -203,9 +203,9 @@ 
      * `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`,
      * @return array    Set of parameters to pass to an AbstractRelationship constructor - must contain at least ['relationship_type']='OneToOne' or 'OneToMany' or 'ManyToMany'
      */
-    function getDefinition ()
+    function getDefinition()
     {
-        return $this->definition ;
+        return $this->definition;
     }
 
     /*
@@ -216,42 +216,42 @@ 
      * Define the labels to be added to the module for the new relationships
      * @return array    An array of system value => display value
      */
-    function buildLabels ($update=false)
+    function buildLabels($update = false)
     {
-        $labelDefinitions = array ( ) ;
+        $labelDefinitions = array( );
         if (!$this->relationship_only)
         {
-        	if(!$this->is_custom && $update && file_exists("modules/{$this->rhs_module}/metadata/subpaneldefs.php")){
+        	if (!$this->is_custom && $update && file_exists("modules/{$this->rhs_module}/metadata/subpaneldefs.php")) {
         		include("modules/{$this->rhs_module}/metadata/subpaneldefs.php");
-        		if(isset($layout_defs[$this->rhs_module]['subpanel_setup'][strtolower($this->lhs_module)]['title_key'])){
+        		if (isset($layout_defs[$this->rhs_module]['subpanel_setup'][strtolower($this->lhs_module)]['title_key'])) {
         			$rightSysLabel = $layout_defs[$this->rhs_module]['subpanel_setup'][strtolower($this->lhs_module)]['title_key'];
         		}
         		$layout_defs = array();
         	}
-        	if(!$this->is_custom && $update && file_exists("modules/{$this->lhs_module}/metadata/subpaneldefs.php")){
+        	if (!$this->is_custom && $update && file_exists("modules/{$this->lhs_module}/metadata/subpaneldefs.php")) {
         		include("modules/{$this->lhs_module}/metadata/subpaneldefs.php");
-        		if(isset($layout_defs[$this->lhs_module]['subpanel_setup'][strtolower($this->rhs_module)]['title_key'])){
+        		if (isset($layout_defs[$this->lhs_module]['subpanel_setup'][strtolower($this->rhs_module)]['title_key'])) {
         			$leftSysLabel = $layout_defs[$this->lhs_module]['subpanel_setup'][strtolower($this->rhs_module)]['title_key'];
         		}
         		$layout_defs = array();
         	}
-        	$labelDefinitions [] = array (
-        		'module' => $this->rhs_module ,
-        		'system_label' => isset($rightSysLabel)?$rightSysLabel : 'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $this->getLeftModuleSystemLabel() ) . '_TITLE' ,
-        		'display_label' => ($update && !empty($_REQUEST [ 'lhs_label' ] ))?$_REQUEST [ 'lhs_label' ] :(empty($this->lhs_label) ? translate ( $this->lhs_module ) : $this->lhs_label),
-        	) ;
-            $labelDefinitions [] = array (
-            	'module' => $this->lhs_module ,
-            	'system_label' =>  isset($leftSysLabel)?$leftSysLabel :'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $this->getRightModuleSystemLabel() ) . '_TITLE' ,
-            	'display_label' => ($update && !empty($_REQUEST [ 'rhs_label' ] ))?$_REQUEST [ 'rhs_label' ] :(empty($this->rhs_label) ? translate ( $this->rhs_module ) : $this->rhs_label),
-            ) ;
+        	$labelDefinitions [] = array(
+        		'module' => $this->rhs_module,
+        		'system_label' => isset($rightSysLabel) ? $rightSysLabel : 'LBL_'.strtoupper($this->relationship_name.'_FROM_'.$this->getLeftModuleSystemLabel()).'_TITLE',
+        		'display_label' => ($update && !empty($_REQUEST ['lhs_label'])) ? $_REQUEST ['lhs_label'] : (empty($this->lhs_label) ? translate ($this->lhs_module) : $this->lhs_label),
+        	);
+            $labelDefinitions [] = array(
+            	'module' => $this->lhs_module,
+            	'system_label' =>  isset($leftSysLabel) ? $leftSysLabel : 'LBL_'.strtoupper($this->relationship_name.'_FROM_'.$this->getRightModuleSystemLabel()).'_TITLE',
+            	'display_label' => ($update && !empty($_REQUEST ['rhs_label'])) ? $_REQUEST ['rhs_label'] : (empty($this->rhs_label) ? translate ($this->rhs_module) : $this->rhs_label),
+            );
         }
-        return $labelDefinitions ;
+        return $labelDefinitions;
     }
 
 	function getLeftModuleSystemLabel()
     {
-		if($this->lhs_module == $this->rhs_module){
+		if ($this->lhs_module == $this->rhs_module) {
 			return $this->lhs_module.'_L';
 		}
 		return $this->lhs_module;
@@ -259,7 +259,7 @@ 
 
     function getRightModuleSystemLabel()
     {
-		if($this->lhs_module == $this->rhs_module){
+		if ($this->lhs_module == $this->rhs_module) {
 			return $this->rhs_module.'_R';
 		}
 		return $this->rhs_module;
@@ -272,7 +272,7 @@ 
     public function getLabels() {
         $labels = array();
         $labelDefinitions = $this->buildLabels();
-        foreach($labelDefinitions as $def){
+        foreach ($labelDefinitions as $def) {
             $labels[$def['module']][$def['system_label']] = $def['display_label'];
         }
 
@@ -295,29 +295,29 @@ 
      * @param string $subpanelName      Name of the subpanel provided by the sourceModule
      * @param string $titleKeyName      Name of the subpanel title , if none, we will use the module name as the subpanel title.
      */
-    protected function getSubpanelDefinition ($relationshipName , $sourceModule , $subpanelName, $titleKeyName = '', $source = "")
+    protected function getSubpanelDefinition($relationshipName, $sourceModule, $subpanelName, $titleKeyName = '', $source = "")
     {
         if (empty($source)) 
         	$source = $this->getValidDBName($relationshipName);
-    	$subpanelDefinition = array ( ) ;
-        $subpanelDefinition [ 'order' ] = 100 ;
-        $subpanelDefinition [ 'module' ] = $sourceModule ;
-        $subpanelDefinition [ 'subpanel_name' ] = $subpanelName ;
+    	$subpanelDefinition = array( );
+        $subpanelDefinition ['order'] = 100;
+        $subpanelDefinition ['module'] = $sourceModule;
+        $subpanelDefinition ['subpanel_name'] = $subpanelName;
         // following two lines are required for the subpanel pagination code in ListView.php->processUnionBeans() to correctly determine the relevant field for sorting
-        $subpanelDefinition [ 'sort_order' ] = 'asc' ;
-        $subpanelDefinition [ 'sort_by' ] = 'id' ;
-		if(!empty($titleKeyName)){
-			$subpanelDefinition [ 'title_key' ] = 'LBL_' . strtoupper ( $relationshipName . '_FROM_' . $titleKeyName ) . '_TITLE' ;
-		}else{
-			$subpanelDefinition [ 'title_key' ] = 'LBL_' . strtoupper ( $relationshipName . '_FROM_' . $sourceModule ) . '_TITLE' ;
+        $subpanelDefinition ['sort_order'] = 'asc';
+        $subpanelDefinition ['sort_by'] = 'id';
+		if (!empty($titleKeyName)) {
+			$subpanelDefinition ['title_key'] = 'LBL_'.strtoupper($relationshipName.'_FROM_'.$titleKeyName).'_TITLE';
+		} else {
+			$subpanelDefinition ['title_key'] = 'LBL_'.strtoupper($relationshipName.'_FROM_'.$sourceModule).'_TITLE';
 		}
-        $subpanelDefinition [ 'get_subpanel_data' ] = $source ;
-        $subpanelDefinition [ 'top_buttons' ] = array(
+        $subpanelDefinition ['get_subpanel_data'] = $source;
+        $subpanelDefinition ['top_buttons'] = array(
 		    array('widget_class' => "SubPanelTopButtonQuickCreate"),
 		    array('widget_class' => 'SubPanelTopSelectButton', 'mode'=>'MultiSelect')
 		);
         
-        return array ( $subpanelDefinition );
+        return array($subpanelDefinition);
     }
 
     
@@ -328,24 +328,24 @@ 
      * @param string $sourceModule      Name of the source module for this field
      * @param string $relationshipName  Name of the relationship
      */
-    protected function getLinkFieldDefinition ($sourceModule , $relationshipName, $right_side = false, $vname = "", $id_name = false)
+    protected function getLinkFieldDefinition($sourceModule, $relationshipName, $right_side = false, $vname = "", $id_name = false)
     {
-        $vardef = array ( ) ;
-
-        $vardef [ 'name' ] = $this->getValidDBName($relationshipName) ;
-        $vardef [ 'type' ] = 'link' ;
-        $vardef [ 'relationship' ] = $relationshipName ;
-        $vardef [ 'source' ] = 'non-db' ;
-        $vardef [ 'module' ] = $sourceModule ;
-        $vardef [ 'bean_name' ] = BeanFactory::getObjectName($sourceModule) ;
+        $vardef = array( );
+
+        $vardef ['name'] = $this->getValidDBName($relationshipName);
+        $vardef ['type'] = 'link';
+        $vardef ['relationship'] = $relationshipName;
+        $vardef ['source'] = 'non-db';
+        $vardef ['module'] = $sourceModule;
+        $vardef ['bean_name'] = BeanFactory::getObjectName($sourceModule);
         if ($right_side)
-        	$vardef [ 'side' ] = 'right' ;
+        	$vardef ['side'] = 'right';
         if (!empty($vname))
-            $vardef [ 'vname' ] = $vname;
+            $vardef ['vname'] = $vname;
         if (!empty($id_name))
             $vardef['id_name'] = $id_name;
 
-        return $vardef ;
+        return $vardef;
     }
 
     /*
@@ -356,23 +356,23 @@ 
      * @param string $sourceModule      Name of the source module for this field
      * @param string $relationshipName  Name of the relationship
      */
-    protected function getLink2FieldDefinition ($sourceModule , $relationshipName, $right_side = false,  $vname = "")
+    protected function getLink2FieldDefinition($sourceModule, $relationshipName, $right_side = false, $vname = "")
     {
-        $vardef = array ( ) ;
+        $vardef = array( );
 
-        $vardef [ 'name' ] = $this->getIDName( $sourceModule ) ; // must match the id_name field value in the relate field definition
-        $vardef [ 'type' ] = 'link' ;
-        $vardef [ 'relationship' ] = $relationshipName ;
-        $vardef [ 'source' ] = 'non-db' ;
+        $vardef ['name'] = $this->getIDName($sourceModule); // must match the id_name field value in the relate field definition
+        $vardef ['type'] = 'link';
+        $vardef ['relationship'] = $relationshipName;
+        $vardef ['source'] = 'non-db';
 		$vardef ['reportable'] = false;
         if ($right_side)
-        	$vardef [ 'side' ] = 'right' ;
+        	$vardef ['side'] = 'right';
         else
-        	$vardef [ 'side' ] = 'left' ;
+        	$vardef ['side'] = 'left';
         if (!empty($vname))
-            $vardef [ 'vname' ] = $vname;
+            $vardef ['vname'] = $vname;
 
-        return $vardef ;
+        return $vardef;
     }
 
     /*
@@ -382,78 +382,78 @@ 
      * @param string $relationshipName  Name of the relationship
      * @param string $moduleType        Optional - "Types" of the module - array of SugarObject types such as "file" or "basic"
      */
-    protected function getRelateFieldDefinition ($sourceModule , $relationshipName , $vnameLabel='')
+    protected function getRelateFieldDefinition($sourceModule, $relationshipName, $vnameLabel = '')
     {
-        $vardef = array ( ) ;
-        $vardef [ 'name' ] = $this->getValidDBName($relationshipName . "_name") ; // must end in _name for the QuickSearch code in TemplateHandler->createQuickSearchCode
-        $vardef [ 'type' ] = 'relate' ;
-
-        $vardef [ 'source' ] = 'non-db' ;
-		if(!empty($vnameLabel)){
-			$vardef [ 'vname' ] = 'LBL_' . strtoupper ( $relationshipName . '_FROM_' . $vnameLabel ) . '_TITLE' ;
-		}else{
-			$vardef [ 'vname' ] = 'LBL_' . strtoupper ( $relationshipName . '_FROM_' . $sourceModule ) . '_TITLE' ;
+        $vardef = array( );
+        $vardef ['name'] = $this->getValidDBName($relationshipName."_name"); // must end in _name for the QuickSearch code in TemplateHandler->createQuickSearchCode
+        $vardef ['type'] = 'relate';
+
+        $vardef ['source'] = 'non-db';
+		if (!empty($vnameLabel)) {
+			$vardef ['vname'] = 'LBL_'.strtoupper($relationshipName.'_FROM_'.$vnameLabel).'_TITLE';
+		} else {
+			$vardef ['vname'] = 'LBL_'.strtoupper($relationshipName.'_FROM_'.$sourceModule).'_TITLE';
 		}
         
-        $vardef [ 'save' ] = true; // the magic value to tell SugarBean to save this relate field even though it is not listed in the $relationship_fields array
+        $vardef ['save'] = true; // the magic value to tell SugarBean to save this relate field even though it is not listed in the $relationship_fields array
        
         // id_name matches the join_key_ column in the relationship table for the sourceModule - that is, the column in the relationship table containing the id of the corresponding field in the source module's table (vardef['table'])
-        $vardef [ 'id_name' ] = $this->getIDName( $sourceModule ) ;
+        $vardef ['id_name'] = $this->getIDName($sourceModule);
         
         // link cannot match id_name otherwise the $bean->$id_name value set from the POST is overwritten by the Link object created by this 'link' entry
-        $vardef [ 'link' ] = $this->getValidDBName($relationshipName) ; // the name of the link field that points to the relationship - required for the save to function
-        $vardef [ 'table' ] = $this->getTablename( $sourceModule ) ;
-        $vardef [ 'module' ] = $sourceModule ;
+        $vardef ['link'] = $this->getValidDBName($relationshipName); // the name of the link field that points to the relationship - required for the save to function
+        $vardef ['table'] = $this->getTablename($sourceModule);
+        $vardef ['module'] = $sourceModule;
         
-        require_once 'modules/ModuleBuilder/parsers/relationships/AbstractRelationships.php' ;
-        $parsedModuleName = AbstractRelationships::parseDeployedModuleName( $sourceModule ) ;
+        require_once 'modules/ModuleBuilder/parsers/relationships/AbstractRelationships.php';
+        $parsedModuleName = AbstractRelationships::parseDeployedModuleName($sourceModule);
 
         // now determine the appropriate 'rname' field for this relate
         // the 'rname' points to the field in source module that contains the displayable name for the record
         // usually this is 'name' but sometimes it is not...
         
-        $vardef [ 'rname' ] = 'name' ;
-        if ( isset( $parsedModuleName['packageName'] ) )
+        $vardef ['rname'] = 'name';
+        if (isset($parsedModuleName['packageName']))
         {
-            require_once 'modules/ModuleBuilder/MB/ModuleBuilder.php' ;
-            $mb = new ModuleBuilder ( ) ;
-            $module = $mb->getPackageModule ( $parsedModuleName['packageName'] , $parsedModuleName['moduleName'] ) ;
-            if (in_array( 'file' , array_keys ( $module->config [ 'templates' ] ) ) ){
-                $vardef [ 'rname' ] = 'document_name' ;
-            }elseif(in_array ( 'person' , array_keys ( $module->config [ 'templates' ] ) ) ){
-            	$vardef [ 'db_concat_fields' ] = array( 0 =>'first_name', 1 =>'last_name') ;
+            require_once 'modules/ModuleBuilder/MB/ModuleBuilder.php';
+            $mb = new ModuleBuilder( );
+            $module = $mb->getPackageModule($parsedModuleName['packageName'], $parsedModuleName['moduleName']);
+            if (in_array('file', array_keys($module->config ['templates']))) {
+                $vardef ['rname'] = 'document_name';
+            }elseif (in_array('person', array_keys($module->config ['templates']))) {
+            	$vardef ['db_concat_fields'] = array(0 =>'first_name', 1 =>'last_name');
             }
         }
         else
         {
-            switch ( strtolower( $sourceModule ) )
+            switch (strtolower($sourceModule))
             {
                 case 'prospects' :
-                    $vardef [ 'rname' ] = 'account_name' ;
-                    break ;
+                    $vardef ['rname'] = 'account_name';
+                    break;
                 case 'documents' :
-                    $vardef [ 'rname' ] = 'document_name' ;
-                    break ;
+                    $vardef ['rname'] = 'document_name';
+                    break;
                 case 'kbdocuments' :
-                    $vardef [ 'rname' ] = 'kbdocument_name' ;
-                    break ;
+                    $vardef ['rname'] = 'kbdocument_name';
+                    break;
                 case 'leads' :
                 case 'contacts' : 
                     // special handling as these modules lack a name column in the database; instead 'name' refers to a non-db field that concatenates first_name and last_name
                     // luckily, the relate field mechanism can handle this with an equivalent additional db_concat_fields entry
-                    $vardef [ 'rname' ] = 'name' ;
-                    $vardef [ 'db_concat_fields' ] = array( 0 =>'first_name', 1 =>'last_name') ;
-                    break ;
+                    $vardef ['rname'] = 'name';
+                    $vardef ['db_concat_fields'] = array(0 =>'first_name', 1 =>'last_name');
+                    break;
                 default :
                     // now see if we have any module inheriting from the 'file' template - records in file-type modules are named by the document_name field, not the usual 'name' field
-                    $object = $GLOBALS ['beanList'] [ $sourceModule ];
-                    require_once ( $GLOBALS ['beanFiles'] [ $object ] );
+                    $object = $GLOBALS ['beanList'] [$sourceModule];
+                    require_once ($GLOBALS ['beanFiles'] [$object]);
                     $bean = new $object();
-                    if ( isset ( $GLOBALS [ 'dictionary' ] [ $object ] [ 'templates'] )){
-                    	if(in_array ( 'file' , $GLOBALS [ 'dictionary' ] [ $object ] [ 'templates'] )){
-                    		$vardef [ 'rname' ] = 'document_name' ;
-                    	}elseif(in_array ( 'person' , $GLOBALS [ 'dictionary' ] [ $object ] [ 'templates'] )){
-                    		 $vardef [ 'db_concat_fields' ] = array( 0 =>'first_name', 1 =>'last_name') ;
+                    if (isset ($GLOBALS ['dictionary'] [$object] ['templates'])) {
+                    	if (in_array('file', $GLOBALS ['dictionary'] [$object] ['templates'])) {
+                    		$vardef ['rname'] = 'document_name';
+                    	}elseif (in_array('person', $GLOBALS ['dictionary'] [$object] ['templates'])) {
+                    		 $vardef ['db_concat_fields'] = array(0 =>'first_name', 1 =>'last_name');
                     	}
                     }
                         
@@ -461,7 +461,7 @@ 
             
         }
             
-        return $vardef ;
+        return $vardef;
     }
 
     /*
@@ -474,111 +474,111 @@ 
      * @param string $relationshipType  Cardinality of the relationship, for example, MB_ONETOONE or MB_ONETOMANY or MB_MANYTOMANY
      * @param bool $checkExisting check if a realtionship with the given name is already depolyed in this instance. If so, we will clones its table and column names to preserve existing data.
      */
-    function getRelationshipMetaData ($relationshipType, $checkExisting = true)
+    function getRelationshipMetaData($relationshipType, $checkExisting = true)
     {
         global $dictionary;
-        $relationshipName = $this->definition [ 'relationship_name' ] ;
-        $lhs_module = $this->lhs_module ;
-        $rhs_module = $this->rhs_module ;
+        $relationshipName = $this->definition ['relationship_name'];
+        $lhs_module = $this->lhs_module;
+        $rhs_module = $this->rhs_module;
         
-        $lhs_table = $this->getTablename ( $lhs_module ) ;
-        $rhs_table = $this->getTablename ( $rhs_module ) ;
+        $lhs_table = $this->getTablename($lhs_module);
+        $rhs_table = $this->getTablename($rhs_module);
         
-        $properties = array ( ) ;
+        $properties = array( );
 
         //bug 47903
         if ($checkExisting && !empty($dictionary[$relationshipName])
-            && !empty($dictionary[$relationshipName][ 'true_relationship_type' ])
-            && $dictionary[$relationshipName][ 'true_relationship_type' ]  == $relationshipType
+            && !empty($dictionary[$relationshipName]['true_relationship_type'])
+            && $dictionary[$relationshipName]['true_relationship_type'] == $relationshipType
             && !empty($dictionary[$relationshipName]['relationships'][$relationshipName]))
         {
             //bug 51336
-            $properties [ 'true_relationship_type' ] = $relationshipType ;
+            $properties ['true_relationship_type'] = $relationshipType;
             $rel_properties = $dictionary[$relationshipName]['relationships'][$relationshipName];
         } else
         {
             // first define section 1, the relationship element of the metadata entry
 
-            $rel_properties = array ( ) ;
-            $rel_properties [ 'lhs_module' ] = $lhs_module ;
-            $rel_properties [ 'lhs_table' ] = $lhs_table ;
-            $rel_properties [ 'lhs_key' ] = 'id' ;
-            $rel_properties [ 'rhs_module' ] = $rhs_module ;
-            $rel_properties [ 'rhs_table' ] = $rhs_table ;
-            $rel_properties [ 'rhs_key' ] = 'id' ;
+            $rel_properties = array( );
+            $rel_properties ['lhs_module'] = $lhs_module;
+            $rel_properties ['lhs_table'] = $lhs_table;
+            $rel_properties ['lhs_key'] = 'id';
+            $rel_properties ['rhs_module'] = $rhs_module;
+            $rel_properties ['rhs_table'] = $rhs_table;
+            $rel_properties ['rhs_key'] = 'id';
 
             // because the implementation of one-to-many relationships within SugarBean does not use a join table and so requires schema changes to add a foreign key for each new relationship,
             // we currently implement all new relationships as many-to-many regardless of the real type and enforce cardinality through the relate fields and subpanels
-            $rel_properties [ 'relationship_type' ] = MB_MANYTOMANY ;
+            $rel_properties ['relationship_type'] = MB_MANYTOMANY;
             // but as we need to display the true cardinality in Studio and ModuleBuilder we also record the actual relationship type
             // this property is only used by Studio/MB
-            $properties [ 'true_relationship_type' ] = $relationshipType ;
+            $properties ['true_relationship_type'] = $relationshipType;
             if ($this->from_studio)
-                $properties [ 'from_studio' ] = true;
+                $properties ['from_studio'] = true;
 
-            $rel_properties [ 'join_table' ] = $this->getValidDBName ( $relationshipName."_c" ) ;
+            $rel_properties ['join_table'] = $this->getValidDBName($relationshipName."_c");
             // a and b are in case the module relates to itself
-            $rel_properties [ 'join_key_lhs' ] = $this->getJoinKeyLHS() ;
-            $rel_properties [ 'join_key_rhs' ] = $this->getJoinKeyRHS() ;
+            $rel_properties ['join_key_lhs'] = $this->getJoinKeyLHS();
+            $rel_properties ['join_key_rhs'] = $this->getJoinKeyRHS();
         }
         
         // set the extended properties if they exist = for now, many-to-many definitions do not have to contain a role_column even if role_column_value is set; we'll just create a likely name if missing
-        if (isset ( $this->definition [ 'relationship_role_column_value' ] ))
+        if (isset ($this->definition ['relationship_role_column_value']))
         {
-            if (! isset ( $this->definition [ 'relationship_role_column' ] ))
-                $this->definition [ 'relationship_role_column' ] = 'relationship_role_column' ;
-            $rel_properties [ 'relationship_role_column' ] = $this->definition [ 'relationship_role_column' ] ;
-            $rel_properties [ 'relationship_role_column_value' ] = $this->definition [ 'relationship_role_column_value' ] ;
+            if (!isset ($this->definition ['relationship_role_column']))
+                $this->definition ['relationship_role_column'] = 'relationship_role_column';
+            $rel_properties ['relationship_role_column'] = $this->definition ['relationship_role_column'];
+            $rel_properties ['relationship_role_column_value'] = $this->definition ['relationship_role_column_value'];
         }
         
-        $properties [ 'relationships' ] [ $relationshipName ] = $rel_properties ;
+        $properties ['relationships'] [$relationshipName] = $rel_properties;
         
         // construct section 2, the name of the join table
         
-        $properties [ 'table' ] = $rel_properties [ 'join_table' ] ;
+        $properties ['table'] = $rel_properties ['join_table'];
         
         // now construct section 3, the fields in the join table
         
-        $properties [ 'fields' ] [] = array ( 'name' => 'id' , 'type' => 'varchar' , 'len' => 36 ) ;
-        $properties [ 'fields' ] [] = array ( 'name' => 'date_modified' , 'type' => 'datetime' ) ;
-        $properties [ 'fields' ] [] = array ( 'name' => 'deleted' , 'type' => 'bool' , 'len' => '1' , 'default' => '0' , 'required' => true ) ;
-        $properties [ 'fields' ] [] = array ( 'name' => $rel_properties [ 'join_key_lhs' ] , 'type' => 'varchar' , 'len' => 36 ) ;
-        $properties [ 'fields' ] [] = array ( 'name' => $rel_properties [ 'join_key_rhs' ] , 'type' => 'varchar' , 'len' => 36 ) ;
-        if (strtolower ( $lhs_module ) == 'documents' || strtolower ( $rhs_module ) == 'documents' )
+        $properties ['fields'] [] = array('name' => 'id', 'type' => 'varchar', 'len' => 36);
+        $properties ['fields'] [] = array('name' => 'date_modified', 'type' => 'datetime');
+        $properties ['fields'] [] = array('name' => 'deleted', 'type' => 'bool', 'len' => '1', 'default' => '0', 'required' => true);
+        $properties ['fields'] [] = array('name' => $rel_properties ['join_key_lhs'], 'type' => 'varchar', 'len' => 36);
+        $properties ['fields'] [] = array('name' => $rel_properties ['join_key_rhs'], 'type' => 'varchar', 'len' => 36);
+        if (strtolower($lhs_module) == 'documents' || strtolower($rhs_module) == 'documents')
         {
-            $properties [ 'fields' ] [] = array ( 'name' => 'document_revision_id' , 'type' => 'varchar' , 'len' => '36' ) ;
+            $properties ['fields'] [] = array('name' => 'document_revision_id', 'type' => 'varchar', 'len' => '36');
         }
         // if we have an extended relationship condition, then add in the corresponding relationship_role_column to the relationship (join) table
         // for now this is restricted to extended relationships that can be specified by a varchar
-        if (isset ( $this->definition [ 'relationship_role_column_value' ] ))
+        if (isset ($this->definition ['relationship_role_column_value']))
         {
-            $properties [ 'fields' ] [] = array ( 'name' => $this->definition [ 'relationship_role_column' ] , 'type' => 'varchar' ) ;
+            $properties ['fields'] [] = array('name' => $this->definition ['relationship_role_column'], 'type' => 'varchar');
         }
         
         // finally, wrap up with section 4, the indices on the join table
         
-        $indexBase = $this->getValidDBName ( $relationshipName ) ;
-        $properties [ 'indices' ] [] = array ( 'name' => $indexBase . 'spk' , 'type' => 'primary' , 'fields' => array ( 'id' ) ) ;
+        $indexBase = $this->getValidDBName($relationshipName);
+        $properties ['indices'] [] = array('name' => $indexBase.'spk', 'type' => 'primary', 'fields' => array('id'));
 
         switch ($relationshipType)
         {
             case MB_ONETOONE:
-                $alternateKeys = array () ;
-                $properties [ 'indices' ] [] = array ( 'name' => $indexBase . '_ida1' , 'type' => 'index' , 'fields' => array ( $rel_properties [ 'join_key_lhs' ] ) ) ;
-                $properties [ 'indices' ] [] = array ( 'name' => $indexBase . '_idb2' , 'type' => 'index' , 'fields' => array ( $rel_properties [ 'join_key_rhs' ] ) ) ;
+                $alternateKeys = array();
+                $properties ['indices'] [] = array('name' => $indexBase.'_ida1', 'type' => 'index', 'fields' => array($rel_properties ['join_key_lhs']));
+                $properties ['indices'] [] = array('name' => $indexBase.'_idb2', 'type' => 'index', 'fields' => array($rel_properties ['join_key_rhs']));
                 break;
             case MB_ONETOMANY :
-                $alternateKeys = array ( $rel_properties [ 'join_key_rhs' ] ) ;
-                $properties [ 'indices' ] [] = array ( 'name' => $indexBase . '_ida1' , 'type' => 'index' , 'fields' => array ( $rel_properties [ 'join_key_lhs' ] ) ) ;
+                $alternateKeys = array($rel_properties ['join_key_rhs']);
+                $properties ['indices'] [] = array('name' => $indexBase.'_ida1', 'type' => 'index', 'fields' => array($rel_properties ['join_key_lhs']));
                 break;
             default:
-                $alternateKeys = array ( $rel_properties [ 'join_key_lhs' ] , $rel_properties [ 'join_key_rhs' ] ) ;
+                $alternateKeys = array($rel_properties ['join_key_lhs'], $rel_properties ['join_key_rhs']);
         }
         
-        if (count($alternateKeys)>0)
-            $properties [ 'indices' ] [] = array ( 'name' => $indexBase . '_alt' , 'type' => 'alternate_key' , 'fields' => $alternateKeys ) ; // type must be set to alternate_key for Link.php to correctly update an existing record rather than inserting a copy - it uses the fields in this array as the keys to check if a duplicate record already exists
+        if (count($alternateKeys) > 0)
+            $properties ['indices'] [] = array('name' => $indexBase.'_alt', 'type' => 'alternate_key', 'fields' => $alternateKeys); // type must be set to alternate_key for Link.php to correctly update an existing record rather than inserting a copy - it uses the fields in this array as the keys to check if a duplicate record already exists
         
-        return $properties ;
+        return $properties;
     }
     
     
@@ -591,9 +591,9 @@ 
      * Used primarily in UndeployedRelationships to ensure that the subpanels we construct for Activities get their data from the correct relationships
      * @param string $activitiesSubModuleName Name of the activities submodule, such as Tasks
      */
-    function getActivitiesSubModuleRelationshipName ( $activitiesSubModuleName )
+    function getActivitiesSubModuleRelationshipName($activitiesSubModuleName)
     {
-        return $this->lhs_module . "_" . strtolower ( $activitiesSubModuleName ) ;
+        return $this->lhs_module."_".strtolower($activitiesSubModuleName);
     }
 
     /*
@@ -604,10 +604,10 @@ 
      * @param string $ensureUnique 
      * @return string Valid column name trimmed to right length and with invalid characters removed
      */
-    static function getValidDBName ($name, $ensureUnique = true)
+    static function getValidDBName($name, $ensureUnique = true)
     {
 
-        require_once 'modules/ModuleBuilder/parsers/constants.php' ;
+        require_once 'modules/ModuleBuilder/parsers/constants.php';
         return getValidDBName($name, $ensureUnique, MB_MAXDBIDENTIFIERLENGTH);
     }
 
@@ -616,25 +616,25 @@ 
      * @param string $type Relationship type
      * @return string Canonical type
      */
-    static function parseRelationshipType ($type)
+    static function parseRelationshipType($type)
     {
-        $type = strtolower ( $type ) ;
-        $type = preg_replace ( '/[^\w]+/i', '', strtolower ( $type ) ) ;
-        $canonicalTypes = array ( ) ;
-        foreach ( array ( MB_ONETOONE , MB_ONETOMANY , MB_MANYTOMANY , MB_MANYTOONE) as $canonicalType )
+        $type = strtolower($type);
+        $type = preg_replace('/[^\w]+/i', '', strtolower($type));
+        $canonicalTypes = array( );
+        foreach (array(MB_ONETOONE, MB_ONETOMANY, MB_MANYTOMANY, MB_MANYTOONE) as $canonicalType)
         {
-            if ($type == preg_replace ( '/[^\w]+/i', '', strtolower ( $canonicalType ) ))
-                return $canonicalType ;
+            if ($type == preg_replace('/[^\w]+/i', '', strtolower($canonicalType)))
+                return $canonicalType;
         }
         // ok, we give up...
-        return MB_MANYTOMANY ;
+        return MB_MANYTOMANY;
     }
 
     
     function getJoinKeyLHS()
     {
         if (!isset($this->joinKeyLHS))
-        	$this->joinKeyLHS = $this->getValidDBName ( $this->relationship_name . $this->lhs_module . "_ida"  , true) ;
+        	$this->joinKeyLHS = $this->getValidDBName($this->relationship_name.$this->lhs_module."_ida", true);
         
         return $this->joinKeyLHS;
     }
@@ -642,7 +642,7 @@ 
     function getJoinKeyRHS()
     {
         if (!isset($this->joinKeyRHS))
-        	$this->joinKeyRHS = $this->getValidDBName ( $this->relationship_name . $this->rhs_module . "_idb"  , true) ;
+        	$this->joinKeyRHS = $this->getValidDBName($this->relationship_name.$this->rhs_module."_idb", true);
     	
         return $this->joinKeyRHS;
     }
@@ -652,9 +652,9 @@ 
      * @param string $sourceModule  The name of the primary module in the relationship
      * @return string Name of the id field
      */
-    function getIDName( $sourceModule )
+    function getIDName($sourceModule)
     {
-        return ($sourceModule == $this->lhs_module ) ? $this->getJoinKeyLHS() : $this->getJoinKeyRHS() ;
+        return ($sourceModule == $this->lhs_module) ? $this->getJoinKeyLHS() : $this->getJoinKeyRHS();
     }
     
     /*
@@ -662,42 +662,42 @@ 
      * @param string $moduleName    Name of the module for which we are to find the table
      * @return string Tablename
      */
-    protected function getTablename ($moduleName)
+    protected function getTablename($moduleName)
     {
         // Check the moduleName exists in the beanList before calling get_module_info - Activities is the main culprit here
-        if (isset ( $GLOBALS [ 'beanList' ] [ $moduleName ] ))
+        if (isset ($GLOBALS ['beanList'] [$moduleName]))
         {
-            $module = get_module_info ( $moduleName ) ;
-            return $module->table_name ;
+            $module = get_module_info($moduleName);
+            return $module->table_name;
         }
-        return strtolower ( $moduleName ) ;
+        return strtolower($moduleName);
     }
 
-    public function getTitleKey($left=false){
-		if(!$this->is_custom && !$left && file_exists("modules/{$this->rhs_module}/metadata/subpaneldefs.php")){
+    public function getTitleKey($left = false) {
+		if (!$this->is_custom && !$left && file_exists("modules/{$this->rhs_module}/metadata/subpaneldefs.php")) {
     		include("modules/{$this->rhs_module}/metadata/subpaneldefs.php");
-    		if(isset($layout_defs[$this->rhs_module]['subpanel_setup'][strtolower($this->lhs_module)]['title_key'])){
+    		if (isset($layout_defs[$this->rhs_module]['subpanel_setup'][strtolower($this->lhs_module)]['title_key'])) {
     			return $layout_defs[$this->rhs_module]['subpanel_setup'][strtolower($this->lhs_module)]['title_key'];
     		}
-    	}else if(!$this->is_custom &&  file_exists("modules/{$this->lhs_module}/metadata/subpaneldefs.php")){
+    	} else if (!$this->is_custom && file_exists("modules/{$this->lhs_module}/metadata/subpaneldefs.php")) {
     		include("modules/{$this->lhs_module}/metadata/subpaneldefs.php");
-    		if(isset($layout_defs[$this->lhs_module]['subpanel_setup'][strtolower($this->rhs_module)]['title_key'])){
+    		if (isset($layout_defs[$this->lhs_module]['subpanel_setup'][strtolower($this->rhs_module)]['title_key'])) {
     			return $layout_defs[$this->lhs_module]['subpanel_setup'][strtolower($this->rhs_module)]['title_key'];
     		}
     	}
     	
-    	if($left){
+    	if ($left) {
     		$titleKeyName = $this->getRightModuleSystemLabel();
     		$sourceModule = $this->rhs_module;
-    	}else{
+    	} else {
     		$titleKeyName = $this->getLeftModuleSystemLabel();
     		$sourceModule = $this->lhs_module;
     	}
     	
-		if(!empty($titleKeyName)){
-			$title_key = 'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $titleKeyName ) . '_TITLE' ;
-		}else{
-			$title_key = 'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $sourceModule ) . '_TITLE' ;
+		if (!empty($titleKeyName)) {
+			$title_key = 'LBL_'.strtoupper($this->relationship_name.'_FROM_'.$titleKeyName).'_TITLE';
+		} else {
+			$title_key = 'LBL_'.strtoupper($this->relationship_name.'_FROM_'.$sourceModule).'_TITLE';
 		}
 		
 		return $title_key;

modules/ModuleBuilder/parsers/relationships/ManyToManyRelationship.php

Spacing +18 added lines, -18 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.
@@ -39,7 +39,7 @@ 
  ********************************************************************************/
 
 
-require_once 'modules/ModuleBuilder/parsers/relationships/AbstractRelationship.php' ;
+require_once 'modules/ModuleBuilder/parsers/relationships/AbstractRelationship.php';
 
 /*
  * Class to manage the metadata for a Many-To-Many Relationship
@@ -57,9 +57,9 @@ 
      * Constructor
      * @param array $definition Parameters passed in as array with keys defined in parent::keys
      */
-    function __construct ($definition)
+    function __construct($definition)
     {
-        parent::__construct ( $definition ) ;
+        parent::__construct($definition);
     }
   
     /*
@@ -71,37 +71,37 @@ 
      * The format is that of TO_MODULE => relationship, FROM_MODULE, FROM_MODULES_SUBPANEL, mimicking the format in the layoutdefs.php
      * @return array    An array of subpanel definitions, keyed by module
      */
-    function buildSubpanelDefinitions ()
+    function buildSubpanelDefinitions()
     {        
-        $subpanelDefinitions = array ( ) ;
+        $subpanelDefinitions = array( );
         if (!$this->relationship_only)
         {
-            $subpanelDefinitions [ $this->rhs_module ] = $this->getSubpanelDefinition ( $this->relationship_name, $this->lhs_module, $this->lhs_subpanel, $this->getLeftModuleSystemLabel() ) ;
-            $subpanelDefinitions [ $this->lhs_module ] = $this->getSubpanelDefinition ( $this->relationship_name, $this->rhs_module, $this->rhs_subpanel, $this->getRightModuleSystemLabel() ) ;
+            $subpanelDefinitions [$this->rhs_module] = $this->getSubpanelDefinition($this->relationship_name, $this->lhs_module, $this->lhs_subpanel, $this->getLeftModuleSystemLabel());
+            $subpanelDefinitions [$this->lhs_module] = $this->getSubpanelDefinition($this->relationship_name, $this->rhs_module, $this->rhs_subpanel, $this->getRightModuleSystemLabel());
         }
-        return $subpanelDefinitions ;
+        return $subpanelDefinitions;
     }
 
 
     /*
      * @return array    An array of field definitions, ready for the vardefs, keyed by module
      */
-    function buildVardefs ( )
+    function buildVardefs( )
     {
-        $vardefs = array ( ) ;
-        $vardefs [ $this->rhs_module ] [] = $this->getLinkFieldDefinition ( $this->lhs_module, $this->relationship_name, false, 
-            'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $this->getLeftModuleSystemLabel() ) . '_TITLE' ) ;
-        $vardefs [ $this->lhs_module ] [] = $this->getLinkFieldDefinition ( $this->rhs_module, $this->relationship_name, false, 
-            'LBL_' . strtoupper ( $this->relationship_name . '_FROM_' . $this->getRightModuleSystemLabel()  ) . '_TITLE' ) ;
-        return $vardefs ;
+        $vardefs = array( );
+        $vardefs [$this->rhs_module] [] = $this->getLinkFieldDefinition($this->lhs_module, $this->relationship_name, false, 
+            'LBL_'.strtoupper($this->relationship_name.'_FROM_'.$this->getLeftModuleSystemLabel()).'_TITLE');
+        $vardefs [$this->lhs_module] [] = $this->getLinkFieldDefinition($this->rhs_module, $this->relationship_name, false, 
+            'LBL_'.strtoupper($this->relationship_name.'_FROM_'.$this->getRightModuleSystemLabel()).'_TITLE');
+        return $vardefs;
     }
     
     /*
      * @return array    An array of relationship metadata definitions
      */
-    function buildRelationshipMetaData ()
+    function buildRelationshipMetaData()
     {
-        return array( $this->lhs_module => $this->getRelationshipMetaData ( MB_MANYTOMANY ) ) ;
+        return array($this->lhs_module => $this->getRelationshipMetaData(MB_MANYTOMANY));
     }
     
 

Braces +3 added lines, -1 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.

modules/ModuleBuilder/parsers/relationships/AbstractRelationships.php

Indentation +40 added lines, -40 removed lines

@@ -66,15 +66,15 @@ 
     // have different actual relationship names other than <relationshipName>
     // e.g $dictionary[ 'quotes_accounts' ] has two relationships: quotes_billto_accounts, quotes_shipto_accounts
     protected $specialCaseBaseNames = array( 'quotes_accounts',
-                                             'quotes_contacts',
-                                             'emails_beans',
-                                             'linked_documents',
-                                             'project_relation',
-                                             'prospect_lists_prospects',
-                                             'queues_beans',
-                                             'queues_queue',
-                                             'tracker_sessions'
-                                          );
+                                                'quotes_contacts',
+                                                'emails_beans',
+                                                'linked_documents',
+                                                'project_relation',
+                                                'prospect_lists_prospects',
+                                                'queues_beans',
+                                                'queues_queue',
+                                                'tracker_sessions'
+                                            );
     /*
      * Find all deployed modules that can participate in a relationship
      * Return a list of modules with associated subpanels
@@ -333,7 +333,7 @@ 
     protected function build ($basepath , $installDefPrefix , $relationships )
     {
         global $sugar_config;
-    	// keep the relationships data separate from any other build data by ading /relationships to the basepath
+        // keep the relationships data separate from any other build data by ading /relationships to the basepath
         $basepath .= '/relationships' ;
 
         $installDefs = array ( ) ;
@@ -393,34 +393,34 @@ 
     {
         global $sugar_config;
         
-       	mkdir_recursive ( "$basepath/language" ) ;
+            mkdir_recursive ( "$basepath/language" ) ;
     	
-       	$headerString = "<?php\n//THIS FILE IS AUTO GENERATED, DO NOT MODIFY\n" ;
+            $headerString = "<?php\n//THIS FILE IS AUTO GENERATED, DO NOT MODIFY\n" ;
         $installDefs = array ( ) ;
         foreach ( $labelDefinitions as $definition )
         {
-        	$mod_strings = array();
-        	$app_list_strings = array();
+            $mod_strings = array();
+            $app_list_strings = array();
         	
-        	$out = $headerString;
+            $out = $headerString;
         	
-        	$filename = "{$basepath}/language/{$definition['module']}.php" ;
+            $filename = "{$basepath}/language/{$definition['module']}.php" ;
     	
-	    	if (file_exists ( $filename ))
-	    		include ($filename);
+            if (file_exists ( $filename ))
+                include ($filename);
 	    		
             
             //Check for app strings
             $GLOBALS [ 'log' ]->debug ( get_class ( $this ) . "->saveLabels(): saving the following to {$filename}" 
-                                      . print_r ( $definition, true ) ) ;
+                                        . print_r ( $definition, true ) ) ;
             if ($definition['module'] == 'application') {
-            	$app_list_strings[$definition [ 'system_label' ]] = $definition [ 'display_label' ];
-            	foreach ($app_list_strings as $key => $val)
-            		$out .= override_value_to_string_recursive2('app_list_strings', $key, $val);
+                $app_list_strings[$definition [ 'system_label' ]] = $definition [ 'display_label' ];
+                foreach ($app_list_strings as $key => $val)
+                    $out .= override_value_to_string_recursive2('app_list_strings', $key, $val);
             } else {
-            	$mod_strings[ $definition [ 'system_label' ]] = $definition [ 'display_label' ];
-            	foreach ($mod_strings as $key => $val)
-            		$out .= override_value_to_string_recursive2('mod_strings', $key, $val);
+                $mod_strings[ $definition [ 'system_label' ]] = $definition [ 'display_label' ];
+                foreach ($mod_strings as $key => $val)
+                    $out .= override_value_to_string_recursive2('mod_strings', $key, $val);
             }
             
             $fh = fopen ( $filename, 'w' ) ;
@@ -430,17 +430,17 @@ 
         	
             foreach($sugar_config['languages'] as $lk => $lv)
             {
-            	$installDefs [ $definition [ 'module' ] . "_$lk" ] = array ( 
-            		'from' => "{$installDefPrefix}/relationships/language/{$definition [ 'module' ]}.php" , 
-            		'to_module' => $definition [ 'module' ] , 
-            		'language' => $lk 
-            	) ;                                 		
+                $installDefs [ $definition [ 'module' ] . "_$lk" ] = array ( 
+                    'from' => "{$installDefPrefix}/relationships/language/{$definition [ 'module' ]}.php" , 
+                    'to_module' => $definition [ 'module' ] , 
+                    'language' => $lk 
+                ) ;                                 		
             }
             
             /* do not use the following write_array_to_file method to write the label file - 
              * module installer appends each of the label files together (as it does for all files) 
 			 * into a combined label file and so the last $mod_strings is the only one received by the application */
-        	// write_array_to_file ( 'mod_strings', array ( $definition [ 'system_label' ] => $definition [ 'display_label' ] ), $filename, "a" ) ;
+            // write_array_to_file ( 'mod_strings', array ( $definition [ 'system_label' ] => $definition [ 'display_label' ] ), $filename, "a" ) ;
         }
         
         return $installDefs ;
@@ -534,11 +534,11 @@ 
             $relName = $moduleName;
             foreach ( $definitions as $definition )
             {
-            	if (!empty($definition['relationship']))
-            	{
-            		$relName = $definition['relationship'];
-            		break;
-            	}
+                if (!empty($definition['relationship']))
+                {
+                    $relName = $definition['relationship'];
+                    break;
+                }
             }
             
             $filename = "$basepath/vardefs/{$relName}_{$moduleName}.php" ;
@@ -547,14 +547,14 @@ 
             foreach ( $definitions as $definition )
             {
                 $GLOBALS [ 'log' ]->debug ( get_class ( $this ) . "->saveVardefs(): saving the following to {$filename}" . print_r ( $definition, true ) ) ;
-               	$out .= '$dictionary["' . $object . '"]["fields"]["' . $definition [ 'name' ] . '"] = '
-               		  . var_export_helper($definition) . ";\n";
+                    $out .= '$dictionary["' . $object . '"]["fields"]["' . $definition [ 'name' ] . '"] = '
+                            . var_export_helper($definition) . ";\n";
             }
             file_put_contents($filename, $out);
             
             $installDefs [ $moduleName ] = array ( 
-            	'from' => "{$installDefPrefix}/relationships/vardefs/{$relName}_{$moduleName}.php" , 
-            	'to_module' => $moduleName 
+                'from' => "{$installDefPrefix}/relationships/vardefs/{$relName}_{$moduleName}.php" , 
+                'to_module' => $moduleName 
             ) ;
         }
         

Spacing +199 added lines, -199 removed lines

@@ -1,6 +1,6 @@ 
 <?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
@@ -50,22 +50,22 @@ 
 class AbstractRelationships
 {
     
-    static $methods = array (
-        'Labels' => 'language' ,
-        'RelationshipMetaData' => 'relationships' ,
-        'SubpanelDefinitions' => 'layoutdefs' ,
-        'Vardefs' => 'vardefs' ,
+    static $methods = array(
+        'Labels' => 'language',
+        'RelationshipMetaData' => 'relationships',
+        'SubpanelDefinitions' => 'layoutdefs',
+        'Vardefs' => 'vardefs',
         'FieldsToLayouts' => 'layoutfields',
-    ) ;
-    static $activities = array ( 'calls' => 'Calls' , 'meetings' => 'Meetings' , 'notes' => 'Notes' , 'tasks' => 'Tasks' , 'emails' => 'Emails' ) ;
+    );
+    static $activities = array('calls' => 'Calls', 'meetings' => 'Meetings', 'notes' => 'Notes', 'tasks' => 'Tasks', 'emails' => 'Emails');
     
-    protected $relationships = array ( ) ; // array containing all the AbstractRelationship objects that are in this set of relationships
-    protected $moduleName ;
+    protected $relationships = array( ); // array containing all the AbstractRelationship objects that are in this set of relationships
+    protected $moduleName;
 
     // bug33522 - the following relationship names that you would find in $dictionary[ <relationshipName> ]
     // have different actual relationship names other than <relationshipName>
     // e.g $dictionary[ 'quotes_accounts' ] has two relationships: quotes_billto_accounts, quotes_shipto_accounts
-    protected $specialCaseBaseNames = array( 'quotes_accounts',
+    protected $specialCaseBaseNames = array('quotes_accounts',
                                              'quotes_contacts',
                                              'emails_beans',
                                              'linked_documents',
@@ -81,56 +81,56 @@ 
      * @param boolean $includeActivitiesSubmodules True if the list should include Calls, Meetings etc; false if they should be replaced by the parent, Activities
      * @return array    Array of [$module][$subpanel]
      */
-    static function findRelatableModules ($includeActivitiesSubmodules = true)
+    static function findRelatableModules($includeActivitiesSubmodules = true)
     {
-        $relatableModules = array ( ) ;
+        $relatableModules = array( );
         
         // add in activities automatically if required
-        $relatableModules [ 'Activities' ] [ 'default' ] = translate( 'LBL_DEFAULT' ) ;
+        $relatableModules ['Activities'] ['default'] = translate('LBL_DEFAULT');
             
         // find all deployed modules
-        require_once 'modules/ModuleBuilder/Module/StudioBrowser.php' ;
-        $browser = new StudioBrowser() ;
+        require_once 'modules/ModuleBuilder/Module/StudioBrowser.php';
+        $browser = new StudioBrowser();
         $browser->loadRelatableModules();
-        reset($browser->modules) ;
+        reset($browser->modules);
 
-        while ( list( $moduleName , $module ) = each($browser->modules) )
+        while (list($moduleName, $module) = each($browser->modules))
         {
             // do not include the submodules of Activities as already have the parent...
-            if (! $includeActivitiesSubmodules && in_array ( $module->module, self::$activities ))
-                continue ;
+            if (!$includeActivitiesSubmodules && in_array($module->module, self::$activities))
+                continue;
             $providedSubpanels = $module->getProvidedSubpanels();
-            if ( $providedSubpanels !== false ) {
-                $relatableModules [ $module->module ] = $providedSubpanels;
+            if ($providedSubpanels !== false) {
+                $relatableModules [$module->module] = $providedSubpanels;
             }
         }
         
-        return $relatableModules ;
+        return $relatableModules;
     
     }
 
-    static function validSubpanel ($filename)
+    static function validSubpanel($filename)
     {
-        if (! file_exists ( $filename ))
-            return false ;
+        if (!file_exists($filename))
+            return false;
         
-        include $filename ;
-        return (isset ( $subpanel_layout ) && (isset ( $subpanel_layout [ 'top_buttons' ] ) && isset ( $subpanel_layout [ 'list_fields' ] ))) ;
+        include $filename;
+        return (isset ($subpanel_layout) && (isset ($subpanel_layout ['top_buttons']) && isset ($subpanel_layout ['list_fields'])));
     }
 
     /*
      * Get a list of all relationships (which have not been deleted)
      * @return array    Array of relationship names, ready for use in get()
      */
-    function getRelationshipList ()
+    function getRelationshipList()
     {
-        $list = array ( ) ;
-        foreach ( $this->relationships as $name => $relationship )
+        $list = array( );
+        foreach ($this->relationships as $name => $relationship)
         {
-            if (! $relationship->deleted ())
-                $list [ $name ] = $name ;
+            if (!$relationship->deleted())
+                $list [$name] = $name;
         }
-        return $list ;
+        return $list;
     }
 
     /*
@@ -138,13 +138,13 @@ 
      * @param string $relationshipName  The unique name for this relationship, as returned by $relationship->getName()
      * @return AbstractRelationship or false if $relationshipName is not in this set of relationships
      */
-    function get ($relationshipName)
+    function get($relationshipName)
     {
-        if (isset ( $this->relationships [ $relationshipName ] ))
+        if (isset ($this->relationships [$relationshipName]))
         {
-            return $this->relationships [ $relationshipName ] ;
+            return $this->relationships [$relationshipName];
         }
-        return false ;
+        return false;
     }
 
     /*
@@ -153,45 +153,45 @@ 
      * Otherwise, create and add a new relationship with the information in the $_REQUEST
      * @return AbstractRelationship
      */
-    function addFromPost ()
+    function addFromPost()
     {
-        $definition = array ( ) ;
+        $definition = array( );
         
-        require_once 'modules/ModuleBuilder/parsers/relationships/AbstractRelationship.php' ;
-        foreach ( AbstractRelationship::$definitionKeys as $key )
+        require_once 'modules/ModuleBuilder/parsers/relationships/AbstractRelationship.php';
+        foreach (AbstractRelationship::$definitionKeys as $key)
         {
-            if (! empty ( $_REQUEST [ $key ] ))
+            if (!empty ($_REQUEST [$key]))
             {
-                $definition [ $key ] = ($key == 'relationship_type') ? AbstractRelationship::parseRelationshipType ( $_REQUEST [ $key ] ) : $_REQUEST [ $key ] ;
+                $definition [$key] = ($key == 'relationship_type') ? AbstractRelationship::parseRelationshipType($_REQUEST [$key]) : $_REQUEST [$key];
             }
         }
         
         // if this is a change to an existing relationship, and it is not readonly, then delete the old one
-        if (! empty ( $_REQUEST [ 'relationship_name' ] ))
+        if (!empty ($_REQUEST ['relationship_name']))
         {
-            if ($relationship = $this->get ( $_REQUEST [ 'relationship_name' ] ))
+            if ($relationship = $this->get($_REQUEST ['relationship_name']))
             {
-                unset( $definition[ 'relationship_name' ] ) ; // in case the related modules have changed; this name is probably no longer appropriate
-                if (! $relationship->readonly ())
-                    $this->delete ( $_REQUEST [ 'relationship_name' ] ) ;
+                unset($definition['relationship_name']); // in case the related modules have changed; this name is probably no longer appropriate
+                if (!$relationship->readonly())
+                    $this->delete($_REQUEST ['relationship_name']);
         }
         }
         
-        $newRelationship = RelationshipFactory::newRelationship ( $definition ) ;
+        $newRelationship = RelationshipFactory::newRelationship($definition);
         // TODO: error handling in case we get a badly formed definition and hence relationship
-        $this->add ( $newRelationship ) ;
-        return $newRelationship ;
+        $this->add($newRelationship);
+        return $newRelationship;
     }
 
     /*
      * Add a relationship to the set
      * @param AbstractRelationship $relationship    The relationship to add
      */
-    function add ($relationship)
+    function add($relationship)
     {
-        $name = $this->getUniqueName ( $relationship ) ;
-        $relationship->setName ( $name ) ;
-        $this->relationships [ $name ] = $relationship ;
+        $name = $this->getUniqueName($relationship);
+        $relationship->setName($name);
+        $this->relationships [$name] = $relationship;
     }
 
     /*
@@ -200,52 +200,52 @@ 
      * @param string $basepath  Base directory in which to store the relationships information
      * @return Array of AbstractRelationship objects
      */
-    protected function _load ($basepath)
+    protected function _load($basepath)
     {
-        $GLOBALS [ 'log' ]->info ( get_class ( $this ) . ": loading relationships from " . $basepath . '/relationships.php' ) ;
-        $objects = array ( ) ;
-        if (file_exists ( $basepath . '/relationships.php' ))
+        $GLOBALS ['log']->info(get_class($this).": loading relationships from ".$basepath.'/relationships.php');
+        $objects = array( );
+        if (file_exists($basepath.'/relationships.php'))
         {
-            include ($basepath . '/relationships.php') ;
-            foreach ( $relationships as $name => $definition )
+            include ($basepath.'/relationships.php');
+            foreach ($relationships as $name => $definition)
             {
                 // update any pre-5.1 relationships to the new definitions
                 // we do this here, rather than when upgrading from 5.0 to 5.1, as modules exported from MB in 5.0 may be loaded into 5.1 at any time
                 // note also that since these definitions are only found in the relationships.php working file they only occur for deployed or exported modules, not published then loaded modules
-                $definition = $this->_updateRelationshipDefinition( $definition ) ;
-                $relationship = RelationshipFactory::newRelationship ( $definition ) ;
+                $definition = $this->_updateRelationshipDefinition($definition);
+                $relationship = RelationshipFactory::newRelationship($definition);
                 // make sure it has a unique name
-                if (! isset( $definition [ 'relationship_name' ] ) )
+                if (!isset($definition ['relationship_name']))
                 {
-                    $name = $this->getUniqueName ( $relationship ) ;
-                    $relationship->setName ( $name ) ;
+                    $name = $this->getUniqueName($relationship);
+                    $relationship->setName($name);
                 }
-                $objects [ $name ] = $relationship ;
+                $objects [$name] = $relationship;
             }
         }
-        return $objects ;
+        return $objects;
     }
 
     /*
      * Save the set of relationships to a file
      * @param string $basepath  Base directory in which to store the relationships information
      */
-    protected function _save ($relationships , $basepath)
+    protected function _save($relationships, $basepath)
     {
-        $GLOBALS [ 'log' ]->info ( get_class ( $this ) . ": saving relationships to " . $basepath . '/relationships.php' ) ;
-        $header = file_get_contents ( 'modules/ModuleBuilder/MB/header.php' ) ;
+        $GLOBALS ['log']->info(get_class($this).": saving relationships to ".$basepath.'/relationships.php');
+        $header = file_get_contents('modules/ModuleBuilder/MB/header.php');
         
-        $definitions = array ( ) ;
+        $definitions = array( );
         
-        foreach ( $relationships as $relationship )
+        foreach ($relationships as $relationship)
         {
             // if (! $relationship->readonly ())
-            $definitions [ $relationship->getName () ] = $relationship->getDefinition () ;
+            $definitions [$relationship->getName()] = $relationship->getDefinition();
         }
         
-        mkdir_recursive ( $basepath ) ;
+        mkdir_recursive($basepath);
         // replace any existing relationships.php
-        write_array_to_file ( 'relationships', $definitions, $basepath . '/relationships.php', 'w', $header ) ;
+        write_array_to_file('relationships', $definitions, $basepath.'/relationships.php', 'w', $header);
     }
 
     /*
@@ -258,20 +258,20 @@ 
      * relationship (products-products) uses it (and there it makes no difference from our POV) and we don't use it when creating new ones
      * @return array Array of $relationshipName => $relationshipDefinition as an array
      */
-    protected function getDeployedRelationships ()
+    protected function getDeployedRelationships()
     {
         
-        $db = DBManagerFactory::getInstance () ;
-        $query = "SELECT * FROM relationships WHERE deleted = 0" ;
-        $result = $db->query ( $query ) ;
-        while ( $row = $db->fetchByAssoc ( $result ) )
+        $db = DBManagerFactory::getInstance();
+        $query = "SELECT * FROM relationships WHERE deleted = 0";
+        $result = $db->query($query);
+        while ($row = $db->fetchByAssoc($result))
         {
             // set this relationship to readonly
-            $row [ 'readonly' ] = true ;
-            $relationships [ $row [ 'relationship_name' ] ] = $row ;
+            $row ['readonly'] = true;
+            $relationships [$row ['relationship_name']] = $row;
         }
         
-        return $relationships ;
+        return $relationships;
     }
 
     /*
@@ -280,48 +280,48 @@ 
      * @param AbstractRelationship The relationship object
      * @return string A globally unique relationship name
      */
-    protected function getUniqueName ($relationship)
+    protected function getUniqueName($relationship)
     {
-        $allRelationships = $this->getRelationshipList () ;
-        $basename = $relationship->getName () ;
+        $allRelationships = $this->getRelationshipList();
+        $basename = $relationship->getName();
         
-        if (empty ( $basename ))
+        if (empty ($basename))
         {
             // start off with the proposed name being simply lhs_module_rhs_module
-            $definition = $relationship->getDefinition () ;
-            $basename = strtolower ( $definition [ 'lhs_module' ] . '_' . $definition [ 'rhs_module' ] ) ;
+            $definition = $relationship->getDefinition();
+            $basename = strtolower($definition ['lhs_module'].'_'.$definition ['rhs_module']);
         }
         
         // Bug #49024 : Relationships Created in Earlier Versions Cause Conflicts and AJAX Errors After Upgrade
         // ...all custom relationships created via Studio should always have a numeric identifier attached.
-        if ( $this instanceof DeployedRelationships )
+        if ($this instanceof DeployedRelationships)
         {
-            $name = $basename . '_1' ;
-            $suffix = 2 ;
+            $name = $basename.'_1';
+            $suffix = 2;
         }
         else
         {
-            $name = $basename ;
-            $suffix = 1 ;
+            $name = $basename;
+            $suffix = 1;
         }
         
-        while ( isset ( $allRelationships [ $name ] ) )
+        while (isset ($allRelationships [$name]))
         {
-            $name = $basename . "_" . ( string ) ($suffix ++) ;
+            $name = $basename."_".(string)($suffix++);
         }
 
         // bug33522 - if our relationship basename is in the special cases
-        if( in_array( $name , $this->specialCaseBaseNames ) )  {
+        if (in_array($name, $this->specialCaseBaseNames)) {
             //add a _1 (or _suffix#) and check to see if it already exists
-            $name = $name . "_" . ( string ) ($suffix ++);
-            while ( isset ( $allRelationships [ $name ] ) )
+            $name = $name."_".(string)($suffix++);
+            while (isset ($allRelationships [$name]))
             {
                 // if it does exist, strip off the _1 previously added and try again
-                $name = substr( $name , 0 , -2 ) . "_" . ( string ) ($suffix ++);
+                $name = substr($name, 0, -2)."_".(string)($suffix++);
             }
         }
 
-        return $name ;
+        return $name;
     }
     
     /*
@@ -330,40 +330,40 @@ 
      * @param string $installDefPrefix  Pathname prefix for the installdefs, for example for ModuleBuilder use "<basepath>/SugarModules"
      * @param array $relationships      Relationships to implement
      */
-    protected function build ($basepath , $installDefPrefix , $relationships )
+    protected function build($basepath, $installDefPrefix, $relationships)
     {
         global $sugar_config;
     	// keep the relationships data separate from any other build data by ading /relationships to the basepath
-        $basepath .= '/relationships' ;
+        $basepath .= '/relationships';
 
-        $installDefs = array ( ) ;
-        $compositeAdded = false ;
-        foreach ( self::$methods as $method => $key )
+        $installDefs = array( );
+        $compositeAdded = false;
+        foreach (self::$methods as $method => $key)
         {
-            $buildMethod = 'build' . $method ;
-            $saveMethod = 'save' . $method ;
+            $buildMethod = 'build'.$method;
+            $saveMethod = 'save'.$method;
             
-            foreach ( $relationships as $name => $relationship )
+            foreach ($relationships as $name => $relationship)
             {
-                if (! ($relationship->readonly () || $relationship->deleted ()))
+                if (!($relationship->readonly() || $relationship->deleted()))
                 {
-                    if (method_exists ( $relationship, $buildMethod ) && method_exists ( $this, $saveMethod ))
+                    if (method_exists($relationship, $buildMethod) && method_exists($this, $saveMethod))
                     {
-                        $metadata = $relationship->$buildMethod () ;
+                        $metadata = $relationship->$buildMethod();
                         
-                        if (count ( $metadata ) > 0) // don't clutter up the filesystem with empty files...
+                        if (count($metadata) > 0) // don't clutter up the filesystem with empty files...
                         {
-                            $GLOBALS [ 'log' ]->debug ( get_class ( $this ) . ": BUILD is running METHOD $saveMethod" ) ;
-                            $installDef = $this->$saveMethod ( $basepath, $installDefPrefix, $name, $metadata ) ;
+                            $GLOBALS ['log']->debug(get_class($this).": BUILD is running METHOD $saveMethod");
+                            $installDef = $this->$saveMethod($basepath, $installDefPrefix, $name, $metadata);
                             
                             // some save methods (e.g., saveRelateFieldDefinition) handle the installDefs internally and so return null
 
                         
-                            if (! is_null ( $installDef ))
+                            if (!is_null($installDef))
                             {
-                                foreach ( $installDef as $moduleName => $def )
+                                foreach ($installDef as $moduleName => $def)
                                 {
-                                    $installDefs [ $key ] [ ] = $def ;                                    	                                   
+                                    $installDefs [$key] [] = $def;                                    	                                   
                                 }
                             }
                         }
@@ -373,7 +373,7 @@ 
             }
         }
         
-        return $installDefs ;
+        return $installDefs;
     }
 
     /*
@@ -389,52 +389,52 @@ 
      * @param array $labelDefinitions       Array of System label => Display label pairs
      * @return null Nothing to be added to the installdefs for an undeployed module
      */
-    protected function saveLabels ($basepath , $installDefPrefix , $relationshipName , $labelDefinitions)
+    protected function saveLabels($basepath, $installDefPrefix, $relationshipName, $labelDefinitions)
     {
         global $sugar_config;
         
-       	mkdir_recursive ( "$basepath/language" ) ;
+       	mkdir_recursive("$basepath/language");
     	
-       	$headerString = "<?php\n//THIS FILE IS AUTO GENERATED, DO NOT MODIFY\n" ;
-        $installDefs = array ( ) ;
-        foreach ( $labelDefinitions as $definition )
+       	$headerString = "<?php\n//THIS FILE IS AUTO GENERATED, DO NOT MODIFY\n";
+        $installDefs = array( );
+        foreach ($labelDefinitions as $definition)
         {
         	$mod_strings = array();
         	$app_list_strings = array();
         	
         	$out = $headerString;
         	
-        	$filename = "{$basepath}/language/{$definition['module']}.php" ;
+        	$filename = "{$basepath}/language/{$definition['module']}.php";
     	
-	    	if (file_exists ( $filename ))
+	    	if (file_exists($filename))
 	    		include ($filename);
 	    		
             
             //Check for app strings
-            $GLOBALS [ 'log' ]->debug ( get_class ( $this ) . "->saveLabels(): saving the following to {$filename}" 
-                                      . print_r ( $definition, true ) ) ;
+            $GLOBALS ['log']->debug(get_class($this)."->saveLabels(): saving the following to {$filename}" 
+                                      . print_r($definition, true));
             if ($definition['module'] == 'application') {
-            	$app_list_strings[$definition [ 'system_label' ]] = $definition [ 'display_label' ];
+            	$app_list_strings[$definition ['system_label']] = $definition ['display_label'];
             	foreach ($app_list_strings as $key => $val)
             		$out .= override_value_to_string_recursive2('app_list_strings', $key, $val);
             } else {
-            	$mod_strings[ $definition [ 'system_label' ]] = $definition [ 'display_label' ];
+            	$mod_strings[$definition ['system_label']] = $definition ['display_label'];
             	foreach ($mod_strings as $key => $val)
             		$out .= override_value_to_string_recursive2('mod_strings', $key, $val);
             }
             
-            $fh = fopen ( $filename, 'w' ) ;
-            fputs ( $fh, $out, strlen ( $out ) ) ;
-            fclose ( $fh ) ;
+            $fh = fopen($filename, 'w');
+            fputs($fh, $out, strlen($out));
+            fclose($fh);
             
         	
-            foreach($sugar_config['languages'] as $lk => $lv)
+            foreach ($sugar_config['languages'] as $lk => $lv)
             {
-            	$installDefs [ $definition [ 'module' ] . "_$lk" ] = array ( 
-            		'from' => "{$installDefPrefix}/relationships/language/{$definition [ 'module' ]}.php" , 
-            		'to_module' => $definition [ 'module' ] , 
+            	$installDefs [$definition ['module']."_$lk"] = array( 
+            		'from' => "{$installDefPrefix}/relationships/language/{$definition ['module']}.php", 
+            		'to_module' => $definition ['module'], 
             		'language' => $lk 
-            	) ;                                 		
+            	);                                 		
             }
             
             /* do not use the following write_array_to_file method to write the label file - 
@@ -443,7 +443,7 @@ 
         	// write_array_to_file ( 'mod_strings', array ( $definition [ 'system_label' ] => $definition [ 'display_label' ] ), $filename, "a" ) ;
         }
         
-        return $installDefs ;
+        return $installDefs;
     }
 
     /*
@@ -454,18 +454,18 @@ 
      * @param array $relationshipMetaData   Set of metadata definitions in the form $relationshipMetaData[$relationshipName]
      * @return array $installDefs           Set of new installDefs
      */
-    protected function saveRelationshipMetaData ($basepath , $installDefPrefix , $relationshipName , $relationshipMetaData)
+    protected function saveRelationshipMetaData($basepath, $installDefPrefix, $relationshipName, $relationshipMetaData)
     {
-        mkdir_recursive ( "$basepath/relationships" ) ;
+        mkdir_recursive("$basepath/relationships");
         
-        $installDefs = array ( ) ;
-        list ( $rhs_module, $properties ) = each ( $relationshipMetaData ) ;
-        $filename = "$basepath/relationships/{$relationshipName}MetaData.php" ;
-        $GLOBALS [ 'log' ]->debug ( get_class ( $this ) . "->saveRelationshipMetaData(): saving the following to {$filename}" . print_r ( $properties, true ) ) ;
-        write_array_to_file ( 'dictionary["' . $relationshipName . '"]', $properties, "{$filename}", 'w' ) ;
-        $installDefs [ $relationshipName ] = array ( /*'module' => $rhs_module , 'module_vardefs' => "<basepath>/Vardefs/{$relationshipName}.php" ,*/ 'meta_data' => "{$installDefPrefix}/relationships/relationships/{$relationshipName}MetaData.php" ) ;
+        $installDefs = array( );
+        list ($rhs_module, $properties) = each($relationshipMetaData);
+        $filename = "$basepath/relationships/{$relationshipName}MetaData.php";
+        $GLOBALS ['log']->debug(get_class($this)."->saveRelationshipMetaData(): saving the following to {$filename}".print_r($properties, true));
+        write_array_to_file('dictionary["'.$relationshipName.'"]', $properties, "{$filename}", 'w');
+        $installDefs [$relationshipName] = array( /*'module' => $rhs_module , 'module_vardefs' => "<basepath>/Vardefs/{$relationshipName}.php" ,*/ 'meta_data' => "{$installDefPrefix}/relationships/relationships/{$relationshipName}MetaData.php" );
         
-        return $installDefs ;
+        return $installDefs;
     }
 
     /*
@@ -475,31 +475,31 @@ 
      * @param array $subpanelDefinitions    Set of subpanel definitions in the form $subpanelDefinitions[$for_module][]
      * @return array $installDefs           Set of new installDefs
      */
-    protected function saveSubpanelDefinitions ($basepath , $installDefPrefix , $relationshipName , $subpanelDefinitions)
+    protected function saveSubpanelDefinitions($basepath, $installDefPrefix, $relationshipName, $subpanelDefinitions)
     {
-        mkdir_recursive ( "$basepath/layoutdefs/" ) ;
+        mkdir_recursive("$basepath/layoutdefs/");
         
-        foreach ( $subpanelDefinitions as $moduleName => $definitions )
+        foreach ($subpanelDefinitions as $moduleName => $definitions)
         {
-            $filename = "$basepath/layoutdefs/{$relationshipName}_{$moduleName}.php" ;
-            $subpanelVarname = 'layout_defs["' . $moduleName . '"]["subpanel_setup"]';
+            $filename = "$basepath/layoutdefs/{$relationshipName}_{$moduleName}.php";
+            $subpanelVarname = 'layout_defs["'.$moduleName.'"]["subpanel_setup"]';
             $out = "";
-            foreach ( $definitions as $definition )
+            foreach ($definitions as $definition)
             {
-                $GLOBALS [ 'log' ]->debug ( get_class ( $this ) . "->saveSubpanelDefinitions(): saving the following to {$filename}" . print_r ( $definition, true ) ) ;
+                $GLOBALS ['log']->debug(get_class($this)."->saveSubpanelDefinitions(): saving the following to {$filename}".print_r($definition, true));
                 if (empty($definition ['get_subpanel_data']) || $definition ['subpanel_name'] == 'history' || $definition ['subpanel_name'] == 'activities') {
                     $definition ['get_subpanel_data'] = $definition ['subpanel_name'];
                 }
-                $out .= override_value_to_string($subpanelVarname, strtolower ( $definition [ 'get_subpanel_data' ] ), $definition) . "\n";
+                $out .= override_value_to_string($subpanelVarname, strtolower($definition ['get_subpanel_data']), $definition)."\n";
             }
             if (!empty($out)) {
-                $out = "<?php\n // created: " . date('Y-m-d H:i:s') . "\n" . $out;
+                $out = "<?php\n // created: ".date('Y-m-d H:i:s')."\n".$out;
                 sugar_file_put_contents($filename, $out);
             }
 
-            $installDefs [ $moduleName ] = array ( 'from' => "{$installDefPrefix}/relationships/layoutdefs/{$relationshipName}_{$moduleName}.php" , 'to_module' => $moduleName ) ;
+            $installDefs [$moduleName] = array('from' => "{$installDefPrefix}/relationships/layoutdefs/{$relationshipName}_{$moduleName}.php", 'to_module' => $moduleName);
         }
-        return $installDefs ;
+        return $installDefs;
     }
 
 
@@ -514,25 +514,25 @@ 
      * @param array $linkFieldDefinitions   Set of link field definitions in the form $linkFieldDefinitions[$for_module]
      * @return array $installDefs           Set of new installDefs
      */
-    protected function saveVardefs ($basepath , $installDefPrefix , $relationshipName , $vardefs)
+    protected function saveVardefs($basepath, $installDefPrefix, $relationshipName, $vardefs)
     {
-        mkdir_recursive ( "$basepath/vardefs/" ) ;
-        $GLOBALS [ 'log' ]->debug ( get_class ( $this ) . "->saveVardefs(): vardefs =" . print_r ( $vardefs, true ) ) ;
+        mkdir_recursive("$basepath/vardefs/");
+        $GLOBALS ['log']->debug(get_class($this)."->saveVardefs(): vardefs =".print_r($vardefs, true));
         
-        foreach ( $vardefs as $moduleName => $definitions )
+        foreach ($vardefs as $moduleName => $definitions)
         {
             // find this module's Object name - the object name, not the module name, is used as the key in the vardefs...
-            if (isset ( $GLOBALS [ 'beanList' ] [ $moduleName ] ))
+            if (isset ($GLOBALS ['beanList'] [$moduleName]))
             {
-                $module = get_module_info ( $moduleName ) ;
-                $object = $module->object_name ;
+                $module = get_module_info($moduleName);
+                $object = $module->object_name;
             } else
             {
-                $object = $moduleName ;
+                $object = $moduleName;
             }
             
             $relName = $moduleName;
-            foreach ( $definitions as $definition )
+            foreach ($definitions as $definition)
             {
             	if (!empty($definition['relationship']))
             	{
@@ -541,26 +541,26 @@ 
             	}
             }
             
-            $filename = "$basepath/vardefs/{$relName}_{$moduleName}.php" ;
+            $filename = "$basepath/vardefs/{$relName}_{$moduleName}.php";
             
-            $out =  "<?php\n// created: " . date('Y-m-d H:i:s') . "\n";
-            foreach ( $definitions as $definition )
+            $out = "<?php\n// created: ".date('Y-m-d H:i:s')."\n";
+            foreach ($definitions as $definition)
             {
-                $GLOBALS [ 'log' ]->debug ( get_class ( $this ) . "->saveVardefs(): saving the following to {$filename}" . print_r ( $definition, true ) ) ;
-               	$out .= '$dictionary["' . $object . '"]["fields"]["' . $definition [ 'name' ] . '"] = '
-               		  . var_export_helper($definition) . ";\n";
+                $GLOBALS ['log']->debug(get_class($this)."->saveVardefs(): saving the following to {$filename}".print_r($definition, true));
+               	$out .= '$dictionary["'.$object.'"]["fields"]["'.$definition ['name'].'"] = '
+               		  . var_export_helper($definition).";\n";
             }
             file_put_contents($filename, $out);
             
-            $installDefs [ $moduleName ] = array ( 
-            	'from' => "{$installDefPrefix}/relationships/vardefs/{$relName}_{$moduleName}.php" , 
+            $installDefs [$moduleName] = array( 
+            	'from' => "{$installDefPrefix}/relationships/vardefs/{$relName}_{$moduleName}.php", 
             	'to_module' => $moduleName 
-            ) ;
+            );
         }
         
-        $GLOBALS [ 'log' ]->debug ( get_class ( $this ) . "->saveVardefs(): installDefs =" . print_r ( $installDefs, true ) ) ;
+        $GLOBALS ['log']->debug(get_class($this)."->saveVardefs(): installDefs =".print_r($installDefs, true));
         
-        return $installDefs ;
+        return $installDefs;
     
     }
 
@@ -571,37 +571,37 @@ 
      * @param $deployedName Name of the module in the deployed form - that is, keyname_modulename or modulename
      * @return array ('moduleName'=>name, 'packageName'=>package) if undeployed, ('moduleName'=>name) if deployed
      */
-    static function parseDeployedModuleName ($deployedName)
+    static function parseDeployedModuleName($deployedName)
     {
-        require_once 'modules/ModuleBuilder/MB/ModuleBuilder.php' ;
-        $mb = new ModuleBuilder ( ) ;
+        require_once 'modules/ModuleBuilder/MB/ModuleBuilder.php';
+        $mb = new ModuleBuilder( );
         
-        $packageName = '' ;
-        $moduleName = $deployedName ;
+        $packageName = '';
+        $moduleName = $deployedName;
         
-        foreach ( $mb->getPackageList () as $name )
+        foreach ($mb->getPackageList() as $name)
         {
             // convert the keyName into a packageName, needed for checking to see if this is really an undeployed module, or just a module with a _ in the name...
-            $package = $mb->getPackage ( $name ) ; // seem to need to call getPackage twice to get the key correctly... TODO: figure out why...
-            $key = $mb->getPackage ( $name )->key ;
-            if (strlen ( $key ) < strlen ( $deployedName ))
+            $package = $mb->getPackage($name); // seem to need to call getPackage twice to get the key correctly... TODO: figure out why...
+            $key = $mb->getPackage($name)->key;
+            if (strlen($key) < strlen($deployedName))
             {
-                $position = stripos ( $deployedName, $key ) ;
-                $moduleName = trim( substr( $deployedName , strlen($key) ) , '_' ); //use trim rather than just assuming that _ is between packageName and moduleName in the deployedName
-                if ( $position !== false && $position == 0 && (isset ( $mb->packages [ $name ]->modules [ $moduleName ] )))
+                $position = stripos($deployedName, $key);
+                $moduleName = trim(substr($deployedName, strlen($key)), '_'); //use trim rather than just assuming that _ is between packageName and moduleName in the deployedName
+                if ($position !== false && $position == 0 && (isset ($mb->packages [$name]->modules [$moduleName])))
                 {
-                    $packageName = $name ;
-                    break ;
+                    $packageName = $name;
+                    break;
                 }
             }
         }
         
-        if (! empty ( $packageName ))
+        if (!empty ($packageName))
         {
-            return array ( 'moduleName' => $moduleName , 'packageName' => $packageName ) ;
+            return array('moduleName' => $moduleName, 'packageName' => $packageName);
         } else
         {
-            return array ( 'moduleName' => $deployedName ) ;
+            return array('moduleName' => $deployedName);
         }
     }
 

Braces +27 added lines, -18 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
@@ -97,8 +98,9 @@ 
         while ( list( $moduleName , $module ) = each($browser->modules) )
         {
             // do not include the submodules of Activities as already have the parent...
-            if (! $includeActivitiesSubmodules && in_array ( $module->module, self::$activities ))
-                continue ;
+            if (! $includeActivitiesSubmodules && in_array ( $module->module, self::$activities )) {
+                            continue ;
+            }
             $providedSubpanels = $module->getProvidedSubpanels();
             if ( $providedSubpanels !== false ) {
                 $relatableModules [ $module->module ] = $providedSubpanels;
@@ -111,8 +113,9 @@ 
 
     static function validSubpanel ($filename)
     {
-        if (! file_exists ( $filename ))
-            return false ;
+        if (! file_exists ( $filename )) {
+                    return false ;
+        }
         
         include $filename ;
         return (isset ( $subpanel_layout ) && (isset ( $subpanel_layout [ 'top_buttons' ] ) && isset ( $subpanel_layout [ 'list_fields' ] ))) ;
@@ -127,8 +130,9 @@ 
         $list = array ( ) ;
         foreach ( $this->relationships as $name => $relationship )
         {
-            if (! $relationship->deleted ())
-                $list [ $name ] = $name ;
+            if (! $relationship->deleted ()) {
+                            $list [ $name ] = $name ;
+            }
         }
         return $list ;
     }
@@ -172,8 +176,9 @@ 
             if ($relationship = $this->get ( $_REQUEST [ 'relationship_name' ] ))
             {
                 unset( $definition[ 'relationship_name' ] ) ; // in case the related modules have changed; this name is probably no longer appropriate
-                if (! $relationship->readonly ())
-                    $this->delete ( $_REQUEST [ 'relationship_name' ] ) ;
+                if (! $relationship->readonly ()) {
+                                    $this->delete ( $_REQUEST [ 'relationship_name' ] ) ;
+                }
         }
         }
         
@@ -298,8 +303,7 @@ 
         {
             $name = $basename . '_1' ;
             $suffix = 2 ;
-        }
-        else
+        } else
         {
             $name = $basename ;
             $suffix = 1 ;
@@ -351,9 +355,11 @@ 
                     {
                         $metadata = $relationship->$buildMethod () ;
                         
-                        if (count ( $metadata ) > 0) // don't clutter up the filesystem with empty files...
+                        if (count ( $metadata ) > 0) {
+                            // don't clutter up the filesystem with empty files...
                         {
                             $GLOBALS [ 'log' ]->debug ( get_class ( $this ) . ": BUILD is running METHOD $saveMethod" ) ;
+                        }
                             $installDef = $this->$saveMethod ( $basepath, $installDefPrefix, $name, $metadata ) ;
                             
                             // some save methods (e.g., saveRelateFieldDefinition) handle the installDefs internally and so return null
@@ -406,8 +412,9 @@ 
         	
         	$filename = "{$basepath}/language/{$definition['module']}.php" ;
     	
-	    	if (file_exists ( $filename ))
-	    		include ($filename);
+	    	if (file_exists ( $filename )) {
+	    		    		include ($filename);
+	    	}
 	    		
             
             //Check for app strings
@@ -415,12 +422,14 @@ 
                                       . print_r ( $definition, true ) ) ;
             if ($definition['module'] == 'application') {
             	$app_list_strings[$definition [ 'system_label' ]] = $definition [ 'display_label' ];
-            	foreach ($app_list_strings as $key => $val)
-            		$out .= override_value_to_string_recursive2('app_list_strings', $key, $val);
+            	foreach ($app_list_strings as $key => $val) {
+            	            		$out .= override_value_to_string_recursive2('app_list_strings', $key, $val);
+            	}
             } else {
             	$mod_strings[ $definition [ 'system_label' ]] = $definition [ 'display_label' ];
-            	foreach ($mod_strings as $key => $val)
-            		$out .= override_value_to_string_recursive2('mod_strings', $key, $val);
+            	foreach ($mod_strings as $key => $val) {
+            	            		$out .= override_value_to_string_recursive2('mod_strings', $key, $val);
+            	}
             }
             
             $fh = fopen ( $filename, 'w' ) ;

modules/ModuleBuilder/parsers/relationships/UndeployedRelationships.php

Indentation +3 added lines, -3 removed lines

@@ -284,8 +284,8 @@ 
             }
             $module->setAppListStrings ( 'en_us', $appStrings ) ;
             $module->save () ;
-			//Bug42170================================
-		}
+            //Bug42170================================
+        }
         
         // use an installDefPrefix of <basepath>/SugarModules for compatibility with the rest of ModuleBuilder
         $this->installDefs = parent::build ( $basepath, "<basepath>/SugarModules", $relationships ) ;
@@ -418,7 +418,7 @@ 
                         $fieldsToAdd [$deployedModuleName] = $fieldName;
                     }
                 }
-        	}
+            }
         }
         return array(array('additional_fields' => $fieldsToAdd));
     }

Braces +10 added lines, -9 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (! defined ( 'sugarEntry' ) || ! sugarEntry)
+if (! defined ( 'sugarEntry' ) || ! sugarEntry) {
     die ( 'Not A Valid Entry Point' ) ;
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -270,8 +271,7 @@ 
             $module->setAppListStrings ( 'en_us', $appStrings ) ;
             $module->save () ;
 
-        }
-        else
+        } else
         {
             //Bug42170================================
             $appStrings = $module->getAppListStrings () ;
@@ -333,8 +333,9 @@ 
             $appStrings = $module->getAppListStrings () ;
             foreach(getTypeDisplayList() as $key)
             {
-                if (isset($appStrings[$key][ $module->key_name ]))
-                    unset($appStrings[$key][ $module->key_name ]);
+                if (isset($appStrings[$key][ $module->key_name ])) {
+                                    unset($appStrings[$key][ $module->key_name ]);
+                }
             }
             $module->setAppListStrings ( 'en_us', $appStrings ) ;
             $module->save () ;
@@ -351,8 +352,9 @@ 
     {
         
         // many-to-many relationships don't have fields so if we have a many-to-many we can just skip this...
-        if ($relationship->getType () == MB_MANYTOMANY)
-            return false ;
+        if ($relationship->getType () == MB_MANYTOMANY) {
+                    return false ;
+        }
         
         $successful = true ;
         $layoutAdditions = $relationship->buildFieldsToLayouts () ;
@@ -371,8 +373,7 @@ 
                     if (($actionAdd) ? $parser->addField ( array ( 'name' => $fieldName ) ) : $parser->removeField ( $fieldName ))
                     {
                         $parser->handleSave ( false ) ;
-                    } 
-                    else
+                    } else
                     {
                         $GLOBALS [ 'log' ]->debug ( get_class ( $this ) . ": couldn't " . (($actionAdd) ? "add" : "remove") . " $fieldName on $view layout for undeployed module $deployedModuleName" ) ;
                         $successful = false ;

Spacing +138 added lines, -138 removed lines

@@ -1,6 +1,6 @@ 
 <?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.
@@ -40,16 +40,16 @@ 
  ********************************************************************************/
 
 
-require_once 'modules/ModuleBuilder/parsers/relationships/AbstractRelationships.php' ;
-require_once 'modules/ModuleBuilder/parsers/relationships/RelationshipsInterface.php' ;
-require_once 'modules/ModuleBuilder/parsers/relationships/RelationshipFactory.php' ;
+require_once 'modules/ModuleBuilder/parsers/relationships/AbstractRelationships.php';
+require_once 'modules/ModuleBuilder/parsers/relationships/RelationshipsInterface.php';
+require_once 'modules/ModuleBuilder/parsers/relationships/RelationshipFactory.php';
 
 class UndeployedRelationships extends AbstractRelationships implements RelationshipsInterface
 {
     
-    protected $basepath ; // Base directory for the lhs_module
-    protected $packageName ;
-    private $activitiesToAdd ; // if we need to add in the composite Activities and History subpanels to the module during the build
+    protected $basepath; // Base directory for the lhs_module
+    protected $packageName;
+    private $activitiesToAdd; // if we need to add in the composite Activities and History subpanels to the module during the build
 
     
     /*
@@ -57,17 +57,17 @@ 
      * Automatically loads in any saved relationships
      * @param string $path  The pathname of the base module directory
      */
-    function __construct ($path)
+    function __construct($path)
     {
-        $this->basepath = $path ;
+        $this->basepath = $path;
         // pull the module and package names out of the path
-        $this->moduleName = basename ( $path, "/" ) ; // just in case there are any trailing /
-        $this->packageName = basename ( dirname ( dirname ( $path ) ) ) ; // simpler than explode :)
-        require_once 'modules/ModuleBuilder/MB/ModuleBuilder.php' ;
-        $mb = new ModuleBuilder ( ) ;
-        $this->packageKey = $mb->getPackageKey ( $this->packageName ) ;
+        $this->moduleName = basename($path, "/"); // just in case there are any trailing /
+        $this->packageName = basename(dirname(dirname($path))); // simpler than explode :)
+        require_once 'modules/ModuleBuilder/MB/ModuleBuilder.php';
+        $mb = new ModuleBuilder( );
+        $this->packageKey = $mb->getPackageKey($this->packageName);
         
-        $this->load () ;
+        $this->load();
     
     }
 
@@ -75,27 +75,27 @@ 
      * Find all modules, deployed and undeployed, that can participate in a relationship
      * @return array    Array of [$module][$subpanel]
      */
-    static function findRelatableModules ($includeActivitiesSubmodules = true)
+    static function findRelatableModules($includeActivitiesSubmodules = true)
     {
         // first find all deployed modules that we might participate in a relationship
-        $relatableModules = parent::findRelatableModules ($includeActivitiesSubmodules ) ;
+        $relatableModules = parent::findRelatableModules($includeActivitiesSubmodules);
         
         // now add in the undeployed modules - those in custom/modulebuilder
         // note that if a module exists in both deployed and undeployed forms, the subpanels from the undeployed form are used...  
 
-        require_once 'modules/ModuleBuilder/MB/ModuleBuilder.php' ;
-        $mb = new ModuleBuilder ( ) ;
-        $mb->getPackages () ;
-        foreach ( $mb->getPackageList () as $packageName )
+        require_once 'modules/ModuleBuilder/MB/ModuleBuilder.php';
+        $mb = new ModuleBuilder( );
+        $mb->getPackages();
+        foreach ($mb->getPackageList() as $packageName)
         {
-            $package = $mb->packages [ $packageName ] ;
-            foreach ( $package->modules as $module )
+            $package = $mb->packages [$packageName];
+            foreach ($package->modules as $module)
             {
-                $relatableModules [ $package->key . "_" . $module->name ] = $module->getProvidedSubpanels () ;
+                $relatableModules [$package->key."_".$module->name] = $module->getProvidedSubpanels();
             }
         }
         
-        return $relatableModules ;
+        return $relatableModules;
     
     }
 
@@ -105,10 +105,10 @@ 
      * that the admin may move them around or otherwise edit them before the module is deployed
      * @param AbstractRelationship $relationship    The relationship to add
      */
-    function add ($relationship)
+    function add($relationship)
     {
-        parent::add ( $relationship ) ;
-        $this->addFieldsToUndeployedLayouts ( $relationship ) ; // must come after parent::add as we need the relationship_name in the relationships getFieldsToLayouts() which is called by addFieldsToUndeployedLayouts() 
+        parent::add($relationship);
+        $this->addFieldsToUndeployedLayouts($relationship); // must come after parent::add as we need the relationship_name in the relationships getFieldsToLayouts() which is called by addFieldsToUndeployedLayouts() 
     }
 
     /*
@@ -116,29 +116,29 @@ 
      * In future, if we need to actually track deleted relationships then just call $relationship->delete() instead
      * @param string $relationshipName  The unique name for this relationship, as returned by $relationship->getName()
      */
-    function delete ($relationshipName)
+    function delete($relationshipName)
     {
-        if ($relationship = $this->get ( $relationshipName ))
+        if ($relationship = $this->get($relationshipName))
         {
-            $this->removeFieldsFromUndeployedLayouts ( $relationship ) ;
-            unset ( $this->relationships [ $relationshipName ] ) ;
+            $this->removeFieldsFromUndeployedLayouts($relationship);
+            unset ($this->relationships [$relationshipName]);
         }
     }
 
     /*
      * Load the saved relationship definitions for this module
      */
-    function load ()
+    function load()
     {
-        $this->relationships = parent::_load ( $this->basepath ) ;
+        $this->relationships = parent::_load($this->basepath);
     }
 
     /*
      * Save this modules relationship definitions out to a working file
      */
-    function save ()
+    function save()
     {
-        parent::_save ( $this->relationships, $this->basepath ) ;
+        parent::_save($this->relationships, $this->basepath);
     }
 
     /*
@@ -146,24 +146,24 @@ 
      * @param array definition  The 5.0 relationship definition
      * @return array            The definition updated to 5.1 format
      */
-    protected function _updateRelationshipDefinition ($definition)
+    protected function _updateRelationshipDefinition($definition)
     {
-        if (isset ( $definition [ 'relate' ] ))
+        if (isset ($definition ['relate']))
         {
-            $newDefinition = array ( ) ;
-            foreach ( array ( 'relate' => 'rhs_module' , 'rsub' => 'rhs_subpanel' , 'msub' => 'lhs_subpanel' , 'label' => 'label' ) as $oldParameter => $newParameter )
+            $newDefinition = array( );
+            foreach (array('relate' => 'rhs_module', 'rsub' => 'rhs_subpanel', 'msub' => 'lhs_subpanel', 'label' => 'label') as $oldParameter => $newParameter)
             {
-                if (isset ( $definition [ $oldParameter ] ))
+                if (isset ($definition [$oldParameter]))
                 {
-                    $definition [ $newParameter ] = $definition [ $oldParameter ] ;
-                    unset ( $definition [ $oldParameter ] ) ;
+                    $definition [$newParameter] = $definition [$oldParameter];
+                    unset ($definition [$oldParameter]);
                 }
             }
-            $definition [ 'lhs_module' ] = "{$this->packageKey}_{$this->moduleName}" ;
+            $definition ['lhs_module'] = "{$this->packageKey}_{$this->moduleName}";
             // finally update the relationship name
-            unset ( $definition [ 'name' ] ) ; // clear the oldstyle name
+            unset ($definition ['name']); // clear the oldstyle name
         }
-        return $definition ;
+        return $definition;
     }
 
     /*
@@ -171,30 +171,30 @@ 
      * The set of all relevant relationships for undeployed modules is the superset of that for deployed modules and all of the relationships known to ModuleBuilder
      * @return array Set of all relevant relationships
      */
-    protected function getAllRelationships ()
+    protected function getAllRelationships()
     {
         // start with the set of relationships known to this module plus those already deployed
-        $allRelationships = array_merge ( $this->relationships, parent::getDeployedRelationships () ) ;
+        $allRelationships = array_merge($this->relationships, parent::getDeployedRelationships());
         
         // add in the relationships known to ModuleBuilder
-        require_once 'modules/ModuleBuilder/MB/ModuleBuilder.php' ;
-        $mb = new ModuleBuilder ( ) ;
-        $mb->getPackages () ;
-        foreach ( $mb->getPackageList () as $packageName )
+        require_once 'modules/ModuleBuilder/MB/ModuleBuilder.php';
+        $mb = new ModuleBuilder( );
+        $mb->getPackages();
+        foreach ($mb->getPackageList() as $packageName)
         {
-            $package = $mb->packages [ $packageName ] ;
-            foreach ( $package->modules as $module )
+            $package = $mb->packages [$packageName];
+            foreach ($package->modules as $module)
             {
                 
-                foreach ( $module->relationships->getRelationshipList () as $relationshipName )
+                foreach ($module->relationships->getRelationshipList() as $relationshipName)
                 {
-                    $relationship = $module->relationships->get ( $relationshipName ) ;
-                    $allRelationships [ $relationship->getName () ] = $relationship->getDefinition () ;
+                    $relationship = $module->relationships->get($relationshipName);
+                    $allRelationships [$relationship->getName()] = $relationship->getDefinition();
                 }
             }
         }
         
-        return $allRelationships ;
+        return $allRelationships;
     
     }
 
@@ -204,15 +204,15 @@ 
      * This function is called from the view when constructing a new relationship
      * @param AbstractRelationship $relationship The relationship to be enforced
      */
-    public function enforceRelationshipOnly ($relationship)
+    public function enforceRelationshipOnly($relationship)
     {
         // if we already have a relationship between this lhs_module and this rhs_module then set RelationshipOnly flag
-        foreach ( $this->relationships as $rel )
+        foreach ($this->relationships as $rel)
         {
             if ($rel->lhs_module == $relationship->lhs_module && $rel->rhs_module == $relationship->rhs_module)
             {
-                $rel->setRelationship_only () ;
-                break ;
+                $rel->setRelationship_only();
+                break;
             }
         }
     }
@@ -225,7 +225,7 @@ 
      * Translate the set of relationship objects into files that the Module Loader can work with
      * @param $basepath string Pathname of the directory to contain the build
      */
-    function build ($basepath = null, $installDefPrefix = null, $relationships = null)
+    function build($basepath = null, $installDefPrefix = null, $relationships = null)
     {
         
         // first expand out any reference to Activities to its submodules
@@ -233,62 +233,62 @@ 
         // as the relationship name, that must be unique
         // the only special case is the subpanel for Activities, which is a composite, and is applied only once for all the submodules - this is handled in saveSubpanelDefinitions() for Undeployed modules
         
-        $relationships = array ( ) ;
-        $this->activitiesToAdd = false ;
-        foreach ( $this->relationships as $relationshipName => $relationship )
+        $relationships = array( );
+        $this->activitiesToAdd = false;
+        foreach ($this->relationships as $relationshipName => $relationship)
         {
-            $definition = $relationship->getDefinition () ;
+            $definition = $relationship->getDefinition();
             // activities will always appear on the rhs only - lhs will be always be this module in MB
-            if (strtolower ( $definition [ 'rhs_module' ] ) == 'activities')
+            if (strtolower($definition ['rhs_module']) == 'activities')
             {
-                $this->activitiesToAdd = true ;
-                $relationshipName = $definition [ 'relationship_name' ] ;
-                foreach ( self::$activities as $activitiesSubModuleLower => $activitiesSubModuleName )
+                $this->activitiesToAdd = true;
+                $relationshipName = $definition ['relationship_name'];
+                foreach (self::$activities as $activitiesSubModuleLower => $activitiesSubModuleName)
                 {
-                    $definition [ 'rhs_module' ] = $activitiesSubModuleName ;
-                    $definition [ 'for_activities' ] = true ;
-                    $definition [ 'relationship_name' ] = $relationshipName . '_' . $activitiesSubModuleLower ;
-                    $relationships [ $definition [ 'relationship_name' ] ] = RelationshipFactory::newRelationship ( $definition ) ;
+                    $definition ['rhs_module'] = $activitiesSubModuleName;
+                    $definition ['for_activities'] = true;
+                    $definition ['relationship_name'] = $relationshipName.'_'.$activitiesSubModuleLower;
+                    $relationships [$definition ['relationship_name']] = RelationshipFactory::newRelationship($definition);
                 }
             
             } else
             {
-                $relationships [ $definition [ 'relationship_name' ] ] = $relationship ;
+                $relationships [$definition ['relationship_name']] = $relationship;
             }
         }
         
-        require_once 'modules/ModuleBuilder/MB/ModuleBuilder.php' ;
-        $mb = new ModuleBuilder ( ) ;
-        $module = $mb->getPackageModule ( $this->packageName, $this->moduleName ) ;
+        require_once 'modules/ModuleBuilder/MB/ModuleBuilder.php';
+        $mb = new ModuleBuilder( );
+        $module = $mb->getPackageModule($this->packageName, $this->moduleName);
         if ($this->activitiesToAdd)
         {
-            $appStrings = $module->getAppListStrings () ;
-            foreach(getTypeDisplayList() as $typeDisplay)
+            $appStrings = $module->getAppListStrings();
+            foreach (getTypeDisplayList() as $typeDisplay)
             {
-                $appStrings[$typeDisplay][$module->key_name] = $module->getlabel ( 'en_us', 'LBL_MODULE_TITLE' ) ;
+                $appStrings[$typeDisplay][$module->key_name] = $module->getlabel('en_us', 'LBL_MODULE_TITLE');
             }
-            $module->setAppListStrings ( 'en_us', $appStrings ) ;
-            $module->save () ;
+            $module->setAppListStrings('en_us', $appStrings);
+            $module->save();
 
         }
         else
         {
             //Bug42170================================
-            $appStrings = $module->getAppListStrings () ;
-            foreach(getTypeDisplayList() as $typeDisplay)
+            $appStrings = $module->getAppListStrings();
+            foreach (getTypeDisplayList() as $typeDisplay)
             {
-                if(isset($appStrings[$typeDisplay][$module->key_name]))
+                if (isset($appStrings[$typeDisplay][$module->key_name]))
                 {
                     unset($appStrings[$typeDisplay][$module->key_name]);
                 }
             }
-            $module->setAppListStrings ( 'en_us', $appStrings ) ;
-            $module->save () ;
+            $module->setAppListStrings('en_us', $appStrings);
+            $module->save();
 			//Bug42170================================
 		}
         
         // use an installDefPrefix of <basepath>/SugarModules for compatibility with the rest of ModuleBuilder
-        $this->installDefs = parent::build ( $basepath, "<basepath>/SugarModules", $relationships ) ;
+        $this->installDefs = parent::build($basepath, "<basepath>/SugarModules", $relationships);
     }
 
     /*
@@ -296,28 +296,28 @@ 
      * Required by MBModule
      * @param reference installDef  Reference to the set of installDefs to which this relationship's installDefs should be added
      */
-    function addInstallDefs (&$installDef)
+    function addInstallDefs(&$installDef)
     {
-        foreach ( $this->installDefs as $name => $def )
+        foreach ($this->installDefs as $name => $def)
         {
-            if (! empty ( $def ))
+            if (!empty ($def))
             {
-                foreach ( $def as $val )
+                foreach ($def as $val)
                 {
-                    $installDef [ $name ] [] = $val ;
+                    $installDef [$name] [] = $val;
                 }
             }
         }
     }
 
-    private function addFieldsToUndeployedLayouts ($relationship)
+    private function addFieldsToUndeployedLayouts($relationship)
     {
-        return $this->updateUndeployedLayout ( $relationship, true ) ;
+        return $this->updateUndeployedLayout($relationship, true);
     }
 
-    private function removeFieldsFromUndeployedLayouts ($relationship)
+    private function removeFieldsFromUndeployedLayouts($relationship)
     {
-        return $this->updateUndeployedLayout ( $relationship, false ) ;
+        return $this->updateUndeployedLayout($relationship, false);
     }
 
     /**
@@ -326,18 +326,18 @@ 
      */
     private function removeAppLangStrings($relationship) {
         $def = $relationship->getDefinition();
-        if (strtolower ( $def [ 'rhs_module' ] ) == 'activities' && !empty($_REQUEST [ 'view_package' ]) && !empty($_REQUEST [ 'view_module' ] ))
+        if (strtolower($def ['rhs_module']) == 'activities' && !empty($_REQUEST ['view_package']) && !empty($_REQUEST ['view_module']))
         {
-            $mb = new ModuleBuilder ( ) ;
-            $module = $mb->getPackageModule ( $_REQUEST [ 'view_package' ], $_REQUEST [ 'view_module' ] ) ;
-            $appStrings = $module->getAppListStrings () ;
-            foreach(getTypeDisplayList() as $key)
+            $mb = new ModuleBuilder( );
+            $module = $mb->getPackageModule($_REQUEST ['view_package'], $_REQUEST ['view_module']);
+            $appStrings = $module->getAppListStrings();
+            foreach (getTypeDisplayList() as $key)
             {
-                if (isset($appStrings[$key][ $module->key_name ]))
-                    unset($appStrings[$key][ $module->key_name ]);
+                if (isset($appStrings[$key][$module->key_name]))
+                    unset($appStrings[$key][$module->key_name]);
             }
-            $module->setAppListStrings ( 'en_us', $appStrings ) ;
-            $module->save () ;
+            $module->setAppListStrings('en_us', $appStrings);
+            $module->save();
         }
     }
 
@@ -347,41 +347,41 @@ 
      * @param boolean $actionAdd True if we are to add; false if to remove
      * return null
      */
-    private function updateUndeployedLayout ($relationship , $actionAdd = true)
+    private function updateUndeployedLayout($relationship, $actionAdd = true)
     {
         
         // many-to-many relationships don't have fields so if we have a many-to-many we can just skip this...
-        if ($relationship->getType () == MB_MANYTOMANY)
-            return false ;
+        if ($relationship->getType() == MB_MANYTOMANY)
+            return false;
         
-        $successful = true ;
-        $layoutAdditions = $relationship->buildFieldsToLayouts () ;
+        $successful = true;
+        $layoutAdditions = $relationship->buildFieldsToLayouts();
         
-        require_once 'modules/ModuleBuilder/parsers/views/GridLayoutMetaDataParser.php' ;
-        foreach ( $layoutAdditions as $deployedModuleName => $fieldName )
+        require_once 'modules/ModuleBuilder/parsers/views/GridLayoutMetaDataParser.php';
+        foreach ($layoutAdditions as $deployedModuleName => $fieldName)
         {
-            foreach ( array ( MB_EDITVIEW , MB_DETAILVIEW ) as $view )
+            foreach (array(MB_EDITVIEW, MB_DETAILVIEW) as $view)
             {
-                $parsedName = AbstractRelationships::parseDeployedModuleName ( $deployedModuleName ) ;
-                if (isset ( $parsedName [ 'packageName' ] ))
+                $parsedName = AbstractRelationships::parseDeployedModuleName($deployedModuleName);
+                if (isset ($parsedName ['packageName']))
                 {
-                    $GLOBALS [ 'log' ]->debug ( get_class ( $this ) . ": " . (($actionAdd) ? "adding" : "removing") . " $fieldName on $view layout for undeployed module {$parsedName [ 'moduleName' ]} in package {$parsedName [ 'packageName' ]}" ) ;
-                    $parser = new GridLayoutMetaDataParser ( $view, $parsedName [ 'moduleName' ], $parsedName [ 'packageName' ] ) ;
+                    $GLOBALS ['log']->debug(get_class($this).": ".(($actionAdd) ? "adding" : "removing")." $fieldName on $view layout for undeployed module {$parsedName ['moduleName']} in package {$parsedName ['packageName']}");
+                    $parser = new GridLayoutMetaDataParser($view, $parsedName ['moduleName'], $parsedName ['packageName']);
                     
-                    if (($actionAdd) ? $parser->addField ( array ( 'name' => $fieldName ) ) : $parser->removeField ( $fieldName ))
+                    if (($actionAdd) ? $parser->addField(array('name' => $fieldName)) : $parser->removeField($fieldName))
                     {
-                        $parser->handleSave ( false ) ;
+                        $parser->handleSave(false);
                     } 
                     else
                     {
-                        $GLOBALS [ 'log' ]->debug ( get_class ( $this ) . ": couldn't " . (($actionAdd) ? "add" : "remove") . " $fieldName on $view layout for undeployed module $deployedModuleName" ) ;
-                        $successful = false ;
+                        $GLOBALS ['log']->debug(get_class($this).": couldn't ".(($actionAdd) ? "add" : "remove")." $fieldName on $view layout for undeployed module $deployedModuleName");
+                        $successful = false;
                     }
                 }
             }
         }
         
-        return $successful ;
+        return $successful;
     }
 
     /*
@@ -392,29 +392,29 @@ 
      * @param array $layoutAdditions  An array of module => fieldname
      * return null
      */
-    protected function saveFieldsToLayouts ($basepath , $dummy , $relationshipName , $layoutAdditions)
+    protected function saveFieldsToLayouts($basepath, $dummy, $relationshipName, $layoutAdditions)
     {
-        require_once 'modules/ModuleBuilder/parsers/views/GridLayoutMetaDataParser.php' ;
+        require_once 'modules/ModuleBuilder/parsers/views/GridLayoutMetaDataParser.php';
         
         // these modules either lack editviews/detailviews or use custom mechanisms for the editview/detailview. In either case, we don't want to attempt to add a relate field to them
         // would be better if GridLayoutMetaDataParser could handle this gracefully, so we don't have to maintain this list here
-        $invalidModules = array ( 'emails' , 'kbdocuments' ) ;
+        $invalidModules = array('emails', 'kbdocuments');
         
         $fieldsToAdd = array();
-        foreach ( $layoutAdditions as $deployedModuleName => $fieldName )
+        foreach ($layoutAdditions as $deployedModuleName => $fieldName)
         {
-            if ( ! in_array( strtolower ( $deployedModuleName ) , $invalidModules ) ) {
-                foreach ( array ( MB_EDITVIEW , MB_DETAILVIEW ) as $view )
+            if (!in_array(strtolower($deployedModuleName), $invalidModules)) {
+                foreach (array(MB_EDITVIEW, MB_DETAILVIEW) as $view)
                 {
-                    $GLOBALS [ 'log' ]->debug ( get_class ( $this ) . ": adding $fieldName to $view layout for module $deployedModuleName" ) ;
-                    $parsedName = self::parseDeployedModuleName ( $deployedModuleName ) ;
-                    if (! isset ( $parsedName [ 'packageName' ] ))
+                    $GLOBALS ['log']->debug(get_class($this).": adding $fieldName to $view layout for module $deployedModuleName");
+                    $parsedName = self::parseDeployedModuleName($deployedModuleName);
+                    if (!isset ($parsedName ['packageName']))
                     {
-                        $fieldsToAdd [$parsedName [ 'moduleName' ]] = $fieldName;
+                        $fieldsToAdd [$parsedName ['moduleName']] = $fieldName;
                     } 
                     //Bug 22348: We should add in the field for custom modules not in this package, if they have been deployed.
-                    else if ($parsedName [ 'packageName' ] != $this->packageName 
-                            && isset ( $GLOBALS [ 'beanList' ] [ $deployedModuleName ])){
+                    else if ($parsedName ['packageName'] != $this->packageName 
+                            && isset ($GLOBALS ['beanList'] [$deployedModuleName])) {
                         $fieldsToAdd [$deployedModuleName] = $fieldName;
                     }
                 }