adamjakab / SuiteCRM

modules/ModuleBuilder/views/view.main.php

Spacing +12 added lines, -12 removed lines

@@ -40,7 +40,7 @@ 
 
 class ViewMain extends SugarView
 {
- 	function __construct(){
+ 	function __construct() {
 		$this->options['show_footer'] = true;
  		parent::__construct();
  	}
@@ -48,9 +48,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function ViewMain(){
+    function ViewMain() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -68,7 +68,7 @@ 
 	    global $mod_strings;
 
     	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
+    	   translate('LBL_MODULE_NAME', 'Administration'),
     	   ModuleBuilderController::getModuleTitle(),
     	   );
     }
@@ -78,7 +78,7 @@ 
 		global $app_strings, $current_user, $mod_strings, $theme;
 
  		$smarty = new Sugar_Smarty();
- 		$type = (!empty($_REQUEST['type']))?$_REQUEST['type']:'main';
+ 		$type = (!empty($_REQUEST['type'])) ? $_REQUEST['type'] : 'main';
  		$mbt = false;
  		$admin = false;
  		$mb = strtolower($type);
@@ -86,7 +86,7 @@ 
  		$smarty->assign('app_strings', $app_strings);
  		$smarty->assign('mod', $mod_strings);
  		//Replaced by javascript function "setMode"
- 		switch($type){
+ 		switch ($type) {
  			case 'studio':
  				//$smarty->assign('ONLOAD','ModuleBuilder.getContent("module=ModuleBuilder&action=wizard")');
  				require_once('modules/ModuleBuilder/Module/StudioTree.php');
@@ -110,20 +110,20 @@ 
  		$smarty->assign('TEST_STUDIO', displayStudioForCurrentUser());
  		$smarty->assign('ADMIN', is_admin($current_user));
  		$smarty->display('modules/ModuleBuilder/tpls/includes.tpl');
-		if($mbt)
+		if ($mbt)
 		{
-			$smarty->assign('TREE',$mbt->fetch());
+			$smarty->assign('TREE', $mbt->fetch());
 			$smarty->assign('TREElabel', $mbt->getName());
 		}
 		$userPref = $current_user->getPreference('mb_assist', 'Assistant');
-		if(!$userPref) $userPref="na";
-		$smarty->assign('userPref',$userPref);
+		if (!$userPref) $userPref = "na";
+		$smarty->assign('userPref', $userPref);
 
 		///////////////////////////////////
 	    require_once('include/SugarTinyMCE.php');
 	    $tiny = new SugarTinyMCE();
-	    $tiny->defaultConfig['width']=300;
-	    $tiny->defaultConfig['height']=300;
+	    $tiny->defaultConfig['width'] = 300;
+	    $tiny->defaultConfig['height'] = 300;
 	    $tiny->buttonConfig = "code,separator,bold,italic,underline,strikethrough,separator,justifyleft,justifycenter,justifyright,
 	                         justifyfull,separator,forecolor,backcolor,
 	                         ";

Braces +4 added lines, -3 removed lines

@@ -52,8 +52,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();
@@ -116,7 +115,9 @@ 
 			$smarty->assign('TREElabel', $mbt->getName());
 		}
 		$userPref = $current_user->getPreference('mb_assist', 'Assistant');
-		if(!$userPref) $userPref="na";
+		if(!$userPref) {
+		    $userPref="na";
+		}
 		$smarty->assign('userPref',$userPref);
 
 		///////////////////////////////////

modules/ModuleBuilder/views/view.layoutview.php

Spacing +125 added lines, -125 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
@@ -41,28 +41,28 @@ 
  ********************************************************************************/
 
 
-require_once ('modules/ModuleBuilder/parsers/ParserFactory.php') ;
-require_once ('modules/ModuleBuilder/MB/AjaxCompose.php') ;
-require_once 'modules/ModuleBuilder/parsers/constants.php' ;
+require_once ('modules/ModuleBuilder/parsers/ParserFactory.php');
+require_once ('modules/ModuleBuilder/MB/AjaxCompose.php');
+require_once 'modules/ModuleBuilder/parsers/constants.php';
 
 class ViewLayoutView extends SugarView
 {
     function __construct()
     {
-        $GLOBALS [ 'log' ]->debug ( 'in ViewLayoutView' ) ;
-        $this->editModule = $_REQUEST [ 'view_module' ] ;
-        $this->editLayout = $_REQUEST [ 'view' ] ;
+        $GLOBALS ['log']->debug('in ViewLayoutView');
+        $this->editModule = $_REQUEST ['view_module'];
+        $this->editLayout = $_REQUEST ['view'];
         $this->package = null;
-        $this->fromModuleBuilder = isset ( $_REQUEST [ 'MB' ] ) || !empty($_REQUEST [ 'view_package' ]);
+        $this->fromModuleBuilder = isset ($_REQUEST ['MB']) || !empty($_REQUEST ['view_package']);
         if ($this->fromModuleBuilder)
         {
-            $this->package = $_REQUEST [ 'view_package' ] ;
+            $this->package = $_REQUEST ['view_package'];
             $this->type = $this->editLayout;
         } else
         {
-            global $app_list_strings ;
-            $moduleNames = array_change_key_case ( $app_list_strings [ 'moduleList' ] ) ;
-            $this->translatedEditModule = $moduleNames [ strtolower ( $this->editModule ) ] ;
+            global $app_list_strings;
+            $moduleNames = array_change_key_case($app_list_strings ['moduleList']);
+            $this->translatedEditModule = $moduleNames [strtolower($this->editModule)];
             $this->sm = StudioModuleFactory::getStudioModule($this->editModule);
             $this->type = $this->sm->getViewType($this->editLayout);
         }
@@ -71,9 +71,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function ViewLayoutView(){
+    function ViewLayoutView() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -90,30 +90,30 @@ 
 	    global $mod_strings;
 
     	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
+    	   translate('LBL_MODULE_NAME', 'Administration'),
     	   ModuleBuilderController::getModuleTitle(),
     	   );
     }
 
     // DO NOT REMOVE - overrides parent ViewEdit preDisplay() which attempts to load a bean for a non-existent module
-    function preDisplay ()
+    function preDisplay()
     {
     }
 
-    function display ($preview = false)
+    function display($preview = false)
     {
 
-        global $mod_strings ;
-        $parser = ParserFactory::getParser($this->editLayout,$this->editModule,$this->package);
+        global $mod_strings;
+        $parser = ParserFactory::getParser($this->editLayout, $this->editModule, $this->package);
 
-        if(isset($this->view_object_map['new_parser'])) {
+        if (isset($this->view_object_map['new_parser'])) {
             $parser = $this->view_object_map['new_parser'];
         }
 
-        $history = $parser->getHistory () ;
-        $smarty = new Sugar_Smarty ( ) ;
+        $history = $parser->getHistory();
+        $smarty = new Sugar_Smarty( );
         //Add in the module we are viewing to our current mod strings
-		if (! $this->fromModuleBuilder) {
+		if (!$this->fromModuleBuilder) {
 			global $current_language;
 			$editModStrings = return_module_language($current_language, $this->editModule);
 			$mod_strings = sugarArrayMerge($editModStrings, $mod_strings);
@@ -121,171 +121,171 @@ 
         $smarty->assign('mod', $mod_strings);
 		$smarty->assign('MOD', $mod_strings);
         // assign buttons
-        $images = array ( 'icon_save' => 'studio_save' , 'icon_publish' => 'studio_publish' , 'icon_address' => 'icon_Address' , 'icon_emailaddress' => 'icon_EmailAddress' , 'icon_phone' => 'icon_Phone' ) ;
-        foreach ( $images as $image => $file )
+        $images = array('icon_save' => 'studio_save', 'icon_publish' => 'studio_publish', 'icon_address' => 'icon_Address', 'icon_emailaddress' => 'icon_EmailAddress', 'icon_phone' => 'icon_Phone');
+        foreach ($images as $image => $file)
         {
-            $smarty->assign ( $image, SugarThemeRegistry::current()->getImage($file,'',null,null,'.gif',$file) ) ;
+            $smarty->assign($image, SugarThemeRegistry::current()->getImage($file, '', null, null, '.gif', $file));
         }
 
-        $requiredFields = implode($parser->getRequiredFields () , ',');
+        $requiredFields = implode($parser->getRequiredFields(), ',');
         $slashedRequiredFields = addslashes($requiredFields);
-        $buttons = array ( ) ;
+        $buttons = array( );
         $disableLayout = false;
 
         if ($preview)
         {
-            $smarty->assign ( 'layouttitle', translate ( 'LBL_LAYOUT_PREVIEW', 'ModuleBuilder' ) ) ;
+            $smarty->assign('layouttitle', translate('LBL_LAYOUT_PREVIEW', 'ModuleBuilder'));
         } else
         {
-            $smarty->assign ( 'layouttitle', translate ( 'LBL_CURRENT_LAYOUT', 'ModuleBuilder' ) ) ;
+            $smarty->assign('layouttitle', translate('LBL_CURRENT_LAYOUT', 'ModuleBuilder'));
 
             //Check if we need to synch edit view to other layouts
-            if($this->editLayout == MB_DETAILVIEW || $this->editLayout == MB_QUICKCREATE){
-		        $parser2 = ParserFactory::getParser(MB_EDITVIEW,$this->editModule,$this->package);
-                if($this->editLayout == MB_DETAILVIEW){
+            if ($this->editLayout == MB_DETAILVIEW || $this->editLayout == MB_QUICKCREATE) {
+		        $parser2 = ParserFactory::getParser(MB_EDITVIEW, $this->editModule, $this->package);
+                if ($this->editLayout == MB_DETAILVIEW) {
 		            $disableLayout = $parser2->getSyncDetailEditViews();
                 }
-                if(!empty($_REQUEST['copyFromEditView'])){
-                    $editViewPanels = $parser2->convertFromCanonicalForm ( $parser2->_viewdefs [ 'panels' ] , $parser2->_fielddefs ) ;
-                    $parser->_viewdefs [ 'panels' ] = $editViewPanels;
+                if (!empty($_REQUEST['copyFromEditView'])) {
+                    $editViewPanels = $parser2->convertFromCanonicalForm($parser2->_viewdefs ['panels'], $parser2->_fielddefs);
+                    $parser->_viewdefs ['panels'] = $editViewPanels;
                     $parser->_fielddefs = $parser2->_fielddefs;
                     $parser->setUseTabs($parser2->getUseTabs());
                     $parser->setTabDefs($parser2->getTabDefs());
                 }
 		    }
 
-            if (! $this->fromModuleBuilder)
+            if (!$this->fromModuleBuilder)
             {
-	            $buttons [] = array (
-                    'id' => 'saveBtn' ,
-                    'text' => translate ( 'LBL_BTN_SAVE' ) ,
+	            $buttons [] = array(
+                    'id' => 'saveBtn',
+                    'text' => translate('LBL_BTN_SAVE'),
                     'actionScript' => "onclick='if(Studio2.checkGridLayout(\"{$this->editLayout}\")) Studio2.handleSave();'",
                 	'disabled' => $disableLayout,
-                ) ;
-                $buttons [] = array (
-                    'id' => 'publishBtn' ,
-                    'text' => translate ( 'LBL_BTN_SAVEPUBLISH' ) ,
+                );
+                $buttons [] = array(
+                    'id' => 'publishBtn',
+                    'text' => translate('LBL_BTN_SAVEPUBLISH'),
                     'actionScript' => "onclick='if(Studio2.checkGridLayout(\"{$this->editLayout}\")) Studio2.handlePublish();'",
                 	'disabled' => $disableLayout,
-                ) ;
-                $buttons [] = array ( 'id' => 'spacer' , 'width' => '33px' ) ;
-                $buttons [] = array (
-	                'id' => 'historyBtn' ,
-	                'text' => translate ( 'LBL_HISTORY' ) ,
+                );
+                $buttons [] = array('id' => 'spacer', 'width' => '33px');
+                $buttons [] = array(
+	                'id' => 'historyBtn',
+	                'text' => translate('LBL_HISTORY'),
 	                'actionScript' => "onclick='ModuleBuilder.history.browse(\"{$this->editModule}\", \"{$this->editLayout}\")'",
                     'disabled' => $disableLayout,
-                ) ;
-                $buttons [] = array (
-	                'id' => 'historyDefault' ,
-	                'text' => translate ( 'LBL_RESTORE_DEFAULT' ) ,
+                );
+                $buttons [] = array(
+	                'id' => 'historyDefault',
+	                'text' => translate('LBL_RESTORE_DEFAULT'),
 	                'actionScript' => "onclick='ModuleBuilder.history.revert(\"{$this->editModule}\", \"{$this->editLayout}\", \"{$history->getLast()}\", \"\")'",
                 	'disabled' => $disableLayout,
-                ) ;
+                );
             } else
             {
-                $buttons [] = array (
-                    'id' => 'saveBtn' ,
-                    'text' => $GLOBALS [ 'mod_strings' ] [ 'LBL_BTN_SAVE' ] ,
+                $buttons [] = array(
+                    'id' => 'saveBtn',
+                    'text' => $GLOBALS ['mod_strings'] ['LBL_BTN_SAVE'],
                     'actionScript' => "onclick='if(Studio2.checkGridLayout(\"{$this->editLayout}\")) Studio2.handlePublish();'",
                     'disabled' => $disableLayout,
-                ) ;
-                $buttons [] = array ( 'id' => 'spacer' , 'width' => '33px' ) ;
-                $buttons [] = array (
-                    'id' => 'historyBtn' ,
-                    'text' => translate ( 'LBL_HISTORY' ) ,
+                );
+                $buttons [] = array('id' => 'spacer', 'width' => '33px');
+                $buttons [] = array(
+                    'id' => 'historyBtn',
+                    'text' => translate('LBL_HISTORY'),
                     'actionScript' => "onclick='ModuleBuilder.history.browse(\"{$this->editModule}\", \"{$this->editLayout}\")'",
                     'disabled' => $disableLayout,
-                ) ;
-                $buttons [] = array (
-                    'id' => 'historyDefault' ,
-                    'text' => translate ( 'LBL_RESTORE_DEFAULT' ) ,
+                );
+                $buttons [] = array(
+                    'id' => 'historyDefault',
+                    'text' => translate('LBL_RESTORE_DEFAULT'),
                     'actionScript' => "onclick='ModuleBuilder.history.revert(\"{$this->editModule}\", \"{$this->editLayout}\", \"{$history->getLast()}\", \"\")'",
                     'disabled' => $disableLayout,
-                ) ;
+                );
             }
 
 
-            if($this->editLayout == MB_DETAILVIEW || $this->editLayout == MB_QUICKCREATE){
-                $buttons [] = array (
-                'id' => 'copyFromEditView' ,
-                'text' => translate ( 'LBL_COPY_FROM_EDITVIEW' ) ,
+            if ($this->editLayout == MB_DETAILVIEW || $this->editLayout == MB_QUICKCREATE) {
+                $buttons [] = array(
+                'id' => 'copyFromEditView',
+                'text' => translate('LBL_COPY_FROM_EDITVIEW'),
                 'actionScript' => "onclick='ModuleBuilder.copyFromView(\"{$this->editModule}\", \"{$this->editLayout}\")'",
                 'disabled' => $disableLayout,
-                ) ;
+                );
             }
         }
 
-        $html = "" ;
-        foreach ( $buttons as $button )
+        $html = "";
+        foreach ($buttons as $button)
         {
             if ($button['id'] == "spacer") {
             	$html .= "<td style='width:{$button['width']}'> </td>";
             } else {
         	    $html .= "<td><input id='{$button['id']}' type='button' valign='center' class='button' style='cursor:pointer' "
         	       . "onmousedown='this.className=\"buttonOn\";return false;' onmouseup='this.className=\"button\"' "
-        	       . "onmouseout='this.className=\"button\"' {$button['actionScript']} value = '{$button['text']}'" ;
-        	    if(!empty($button['disabled'])){
+        	       . "onmouseout='this.className=\"button\"' {$button['actionScript']} value = '{$button['text']}'";
+        	    if (!empty($button['disabled'])) {
         	    	 $html .= " disabled";
         	    }
         	    $html .= "></td>";
             }
         }
 
-        $smarty->assign ( 'buttons', $html ) ;
+        $smarty->assign('buttons', $html);
 
         // assign fields and layout
-        $smarty->assign ( 'available_fields', $parser->getAvailableFields () ) ;
-
-        $smarty->assign ( 'disable_layout', $disableLayout) ;
-        $smarty->assign ( 'required_fields', $requiredFields) ;
-        $smarty->assign ( 'layout', $parser->getLayout () ) ;
-        $smarty->assign ( 'field_defs', $parser->getFieldDefs () ) ;
-        $smarty->assign ( 'view_module', $this->editModule ) ;
-        $smarty->assign ( 'view', $this->editLayout ) ;
-        $smarty->assign ( 'maxColumns', $parser->getMaxColumns() ) ;
-        $smarty->assign ( 'nextPanelId', $parser->getFirstNewPanelId() ) ;
-        $smarty->assign ( 'displayAsTabs', $parser->getUseTabs() ) ;
-        $smarty->assign ( 'tabDefs', $parser->getTabDefs() ) ;
-        $smarty->assign ( 'syncDetailEditViews', $parser->getSyncDetailEditViews() ) ;
-        $smarty->assign ( 'fieldwidth', 150 ) ;
-        $smarty->assign ( 'translate', $this->fromModuleBuilder ? false : true ) ;
+        $smarty->assign('available_fields', $parser->getAvailableFields());
+
+        $smarty->assign('disable_layout', $disableLayout);
+        $smarty->assign('required_fields', $requiredFields);
+        $smarty->assign('layout', $parser->getLayout());
+        $smarty->assign('field_defs', $parser->getFieldDefs());
+        $smarty->assign('view_module', $this->editModule);
+        $smarty->assign('view', $this->editLayout);
+        $smarty->assign('maxColumns', $parser->getMaxColumns());
+        $smarty->assign('nextPanelId', $parser->getFirstNewPanelId());
+        $smarty->assign('displayAsTabs', $parser->getUseTabs());
+        $smarty->assign('tabDefs', $parser->getTabDefs());
+        $smarty->assign('syncDetailEditViews', $parser->getSyncDetailEditViews());
+        $smarty->assign('fieldwidth', 150);
+        $smarty->assign('translate', $this->fromModuleBuilder ? false : true);
 
         if ($this->fromModuleBuilder)
         {
-            $smarty->assign ( 'fromModuleBuilder', $this->fromModuleBuilder ) ;
-            $smarty->assign ( 'view_package', $this->package ) ;
+            $smarty->assign('fromModuleBuilder', $this->fromModuleBuilder);
+            $smarty->assign('view_package', $this->package);
         }
 
-        $labels = array (
-        			MB_EDITVIEW => 'LBL_EDITVIEW' ,
-        			MB_DETAILVIEW => 'LBL_DETAILVIEW' ,
+        $labels = array(
+        			MB_EDITVIEW => 'LBL_EDITVIEW',
+        			MB_DETAILVIEW => 'LBL_DETAILVIEW',
         			MB_QUICKCREATE => 'LBL_QUICKCREATE',
-        			) ;
+        			);
 
-        $layoutLabel = 'LBL_LAYOUTS' ;
-        $layoutView = 'layouts' ;
+        $layoutLabel = 'LBL_LAYOUTS';
+        $layoutView = 'layouts';
 
 
-        $ajax = new AjaxCompose ( ) ;
+        $ajax = new AjaxCompose( );
 
-        $translatedViewType = '' ;
-		if ( isset ( $labels [ strtolower ( $this->editLayout ) ] ) )
-			$translatedViewType = translate ( $labels [ strtolower( $this->editLayout ) ] , 'ModuleBuilder' ) ;
+        $translatedViewType = '';
+		if (isset ($labels [strtolower($this->editLayout)]))
+			$translatedViewType = translate($labels [strtolower($this->editLayout)], 'ModuleBuilder');
         else if (isset($this->sm))
         {
-            foreach($this->sm->sources as $file => $def)
+            foreach ($this->sm->sources as $file => $def)
             {
                 if (!empty($def['view']) && $def['view'] == $this->editLayout && !empty($def['name']))
                 {
                     $translatedViewType = $def['name'];
                 }
             }
-            if(empty($translatedViewType))
+            if (empty($translatedViewType))
             {
-                $label = "LBL_" . strtoupper($this->editLayout);
+                $label = "LBL_".strtoupper($this->editLayout);
                 $translated = translate($label, $this->editModule);
                 if ($translated != $label)
-                    $translatedViewType =  $translated;
+                    $translatedViewType = $translated;
             }
         }
 
@@ -294,34 +294,34 @@ 
 
         if ($this->fromModuleBuilder)
         {
-            $ajax->addCrumb ( translate ( 'LBL_MODULEBUILDER', 'ModuleBuilder' ), 'ModuleBuilder.main("mb")' ) ;
-            $ajax->addCrumb ( $this->package, 'ModuleBuilder.getContent("module=ModuleBuilder&action=package&package=' . $this->package . '")' ) ;
-            $ajax->addCrumb ( $this->editModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_package=' . $this->package . '&view_module=' . $this->editModule . '")' ) ;
-            $ajax->addCrumb ( translate ( $layoutLabel, 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view='.$layoutView.'&view_module=' . $this->editModule . '&view_package=' . $this->package . '")' ) ;
-            $ajax->addCrumb ( $translatedViewType, '' ) ;
+            $ajax->addCrumb(translate('LBL_MODULEBUILDER', 'ModuleBuilder'), 'ModuleBuilder.main("mb")');
+            $ajax->addCrumb($this->package, 'ModuleBuilder.getContent("module=ModuleBuilder&action=package&package='.$this->package.'")');
+            $ajax->addCrumb($this->editModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_package='.$this->package.'&view_module='.$this->editModule.'")');
+            $ajax->addCrumb(translate($layoutLabel, 'ModuleBuilder'), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view='.$layoutView.'&view_module='.$this->editModule.'&view_package='.$this->package.'")');
+            $ajax->addCrumb($translatedViewType, '');
         } else
         {
-            $ajax->addCrumb ( translate ( 'LBL_STUDIO', 'ModuleBuilder' ), 'ModuleBuilder.main("studio")' ) ;
-            $ajax->addCrumb ( $this->translatedEditModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view_module=' . $this->editModule . '")' ) ;
-            $ajax->addCrumb ( translate ( $layoutLabel, 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view='.$layoutView.'&view_module=' . $this->editModule . '")' ) ;
-            $ajax->addCrumb ( $translatedViewType, '' ) ;
+            $ajax->addCrumb(translate('LBL_STUDIO', 'ModuleBuilder'), 'ModuleBuilder.main("studio")');
+            $ajax->addCrumb($this->translatedEditModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view_module='.$this->editModule.'")');
+            $ajax->addCrumb(translate($layoutLabel, 'ModuleBuilder'), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view='.$layoutView.'&view_module='.$this->editModule.'")');
+            $ajax->addCrumb($translatedViewType, '');
         }
 
         // set up language files
-		$smarty->assign ( 'language', $parser->getLanguage() ) ; // for sugar_translate in the smarty template
-        $smarty->assign('from_mb',$this->fromModuleBuilder);
+		$smarty->assign('language', $parser->getLanguage()); // for sugar_translate in the smarty template
+        $smarty->assign('from_mb', $this->fromModuleBuilder);
         $smarty->assign('calc_field_list', json_encode($parser->getCalculatedFields()));
 		if ($this->fromModuleBuilder) {
-			$mb = new ModuleBuilder ( ) ;
-            $module = & $mb->getPackageModule ( $this->package, $this->editModule ) ;
+			$mb = new ModuleBuilder( );
+            $module = & $mb->getPackageModule($this->package, $this->editModule);
 		    $smarty->assign('current_mod_strings', $module->getModStrings());
 		}
 
-        $ajax->addSection ( 'center', $translatedViewType, $smarty->fetch ( 'modules/ModuleBuilder/tpls/layoutView.tpl' ) ) ;
+        $ajax->addSection('center', $translatedViewType, $smarty->fetch('modules/ModuleBuilder/tpls/layoutView.tpl'));
         if ($preview) {
-        	echo $smarty->fetch ( 'modules/ModuleBuilder/tpls/Preview/layoutView.tpl' );
+        	echo $smarty->fetch('modules/ModuleBuilder/tpls/Preview/layoutView.tpl');
 		} else {
-			echo $ajax->getJavascript () ;
+			echo $ajax->getJavascript();
     	}
     }
 }

Braces +9 added lines, -8 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
@@ -75,8 +76,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();
@@ -269,9 +269,9 @@ 
         $ajax = new AjaxCompose ( ) ;
 
         $translatedViewType = '' ;
-		if ( isset ( $labels [ strtolower ( $this->editLayout ) ] ) )
-			$translatedViewType = translate ( $labels [ strtolower( $this->editLayout ) ] , 'ModuleBuilder' ) ;
-        else if (isset($this->sm))
+		if ( isset ( $labels [ strtolower ( $this->editLayout ) ] ) ) {
+					$translatedViewType = translate ( $labels [ strtolower( $this->editLayout ) ] , 'ModuleBuilder' ) ;
+		} else if (isset($this->sm))
         {
             foreach($this->sm->sources as $file => $def)
             {
@@ -284,8 +284,9 @@ 
             {
                 $label = "LBL_" . strtoupper($this->editLayout);
                 $translated = translate($label, $this->editModule);
-                if ($translated != $label)
-                    $translatedViewType =  $translated;
+                if ($translated != $label) {
+                                    $translatedViewType =  $translated;
+                }
             }
         }
 

modules/ModuleBuilder/parsers/parser.searchfields.php

Spacing +15 added lines, -15 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.
@@ -39,7 +39,7 @@ 
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 
-require_once ('modules/ModuleBuilder/parsers/ModuleBuilderParser.php') ;
+require_once ('modules/ModuleBuilder/parsers/ModuleBuilderParser.php');
 require_once ('modules/ModuleBuilder/MB/MBPackage.php');
 
 class ParserSearchFields extends ModuleBuilderParser
@@ -48,7 +48,7 @@ 
 	var $searchFields;
 	var $packageKey;
 
-    function __construct ($moduleName, $packageName='')
+    function __construct($moduleName, $packageName = '')
     {
         $this->moduleName = $moduleName;
         if (!empty($packageName))
@@ -64,9 +64,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function ParserSearchFields($moduleName, $packageName=''){
+    function ParserSearchFields($moduleName, $packageName = '') {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -77,21 +77,21 @@ 
 
     function addSearchField($name, $searchField)
     {
-    	if(empty($name) || empty($searchField) || !is_array($searchField))
+    	if (empty($name) || empty($searchField) || !is_array($searchField))
     	{
     		return;
     	}
 
-    	$key = isset($this->packageKey) ? $this->packageKey . '_' . $this->moduleName : $this->moduleName;
+    	$key = isset($this->packageKey) ? $this->packageKey.'_'.$this->moduleName : $this->moduleName;
         $this->searchFields[$key][$name] = $searchField;
     }
 
     function removeSearchField($name)
     {
 
-    	$key = isset($this->packageKey) ? $this->packageKey . '_' . $this->moduleName : $this->moduleName;
+    	$key = isset($this->packageKey) ? $this->packageKey.'_'.$this->moduleName : $this->moduleName;
 
-    	if(isset($this->searchFields[$key][$name]))
+    	if (isset($this->searchFields[$key][$name]))
     	{
     		unset($this->searchFields[$key][$name]);
     	}
@@ -103,28 +103,28 @@ 
         if (!empty($this->packageName) && file_exists("custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata/SearchFields.php")) //we are in Module builder
         {
 			include("custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata/SearchFields.php");
-        } else if(file_exists("custom/modules/{$this->moduleName}/metadata/SearchFields.php")) {
+        } else if (file_exists("custom/modules/{$this->moduleName}/metadata/SearchFields.php")) {
 			include("custom/modules/{$this->moduleName}/metadata/SearchFields.php");
-        } else if(file_exists("modules/{$this->moduleName}/metadata/SearchFields.php")) {
+        } else if (file_exists("modules/{$this->moduleName}/metadata/SearchFields.php")) {
 			include("modules/{$this->moduleName}/metadata/SearchFields.php");
         }
 
         return $searchFields;
     }
 
-    function saveSearchFields ($searchFields)
+    function saveSearchFields($searchFields)
     {
         if (!empty($this->packageName)) //we are in Module builder
         {
 			$header = file_get_contents('modules/ModuleBuilder/MB/header.php');
-            if(!file_exists("custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata/SearchFields.php"))
+            if (!file_exists("custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata/SearchFields.php"))
             {
                mkdir_recursive("custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata");
             }
 			write_array_to_file("searchFields['{$this->packageKey}_{$this->moduleName}']", $searchFields["{$this->packageKey}_{$this->moduleName}"], "custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata/SearchFields.php", 'w', $header);
         } else {
 			$header = file_get_contents('modules/ModuleBuilder/MB/header.php');
-            if(!file_exists("custom/modules/{$this->moduleName}/metadata/SearchFields.php"))
+            if (!file_exists("custom/modules/{$this->moduleName}/metadata/SearchFields.php"))
             {
                mkdir_recursive("custom/modules/{$this->moduleName}/metadata");
             }

Braces +9 added lines, -5 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.
@@ -68,8 +69,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct($moduleName, $packageName);
@@ -100,9 +100,11 @@ 
     function getSearchFields()
     {
     	$searchFields = array();
-        if (!empty($this->packageName) && file_exists("custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata/SearchFields.php")) //we are in Module builder
+        if (!empty($this->packageName) && file_exists("custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata/SearchFields.php")) {
+            //we are in Module builder
         {
 			include("custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata/SearchFields.php");
+        }
         } else if(file_exists("custom/modules/{$this->moduleName}/metadata/SearchFields.php")) {
 			include("custom/modules/{$this->moduleName}/metadata/SearchFields.php");
         } else if(file_exists("modules/{$this->moduleName}/metadata/SearchFields.php")) {
@@ -114,9 +116,11 @@ 
 
     function saveSearchFields ($searchFields)
     {
-        if (!empty($this->packageName)) //we are in Module builder
+        if (!empty($this->packageName)) {
+            //we are in Module builder
         {
 			$header = file_get_contents('modules/ModuleBuilder/MB/header.php');
+        }
             if(!file_exists("custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata/SearchFields.php"))
             {
                mkdir_recursive("custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata");

modules/ModuleBuilder/parsers/parser.label.php

Spacing +86 added lines, -86 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,24 +40,24 @@ 
  ********************************************************************************/
 
 
-require_once ('modules/ModuleBuilder/parsers/ModuleBuilderParser.php') ;
+require_once ('modules/ModuleBuilder/parsers/ModuleBuilderParser.php');
 
 class ParserLabel //extends ModuleBuilderParser
 {
 
-    public function __construct ($moduleName, $packageName = '' )
+    public function __construct($moduleName, $packageName = '')
     {
         $this->moduleName = $moduleName;
         if (!empty($packageName))
-            $this->packageName = $packageName ;
+            $this->packageName = $packageName;
     }
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    public function ParserLabel($moduleName, $packageName = '' ){
+    public function ParserLabel($moduleName, $packageName = '') {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -72,22 +72,22 @@ 
      * @param REQUEST $params       Labels as "label_".System label => Display label pairs
      * @param string $language      Language key, for example 'en_us'
      */
-    function handleSave ($params , $language)
+    function handleSave($params, $language)
     {
-        $labels = array ( ) ;
-        foreach ( $params as $key => $value )
+        $labels = array( );
+        foreach ($params as $key => $value)
         {
-            if (preg_match ( '/^label_/', $key ) && strcmp ( $value, 'no_change' ) != 0)
+            if (preg_match('/^label_/', $key) && strcmp($value, 'no_change') != 0)
             {
-                $labels [ strtoupper(substr ( $key, 6 )) ] = SugarCleaner::cleanHtml(from_html($value),false);
+                $labels [strtoupper(substr($key, 6))] = SugarCleaner::cleanHtml(from_html($value), false);
             }
         }
         if (!empty($this->packageName)) //we are in Module builder
         {
-            return self::addLabels ( $language, $labels, $this->moduleName, "custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/language" ) ;
+            return self::addLabels($language, $labels, $this->moduleName, "custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/language");
         } else
         {
-            return self::addLabels ( $language, $labels, $this->moduleName ) ;
+            return self::addLabels($language, $labels, $this->moduleName);
         }
     }
 
@@ -101,68 +101,68 @@ 
      * @param string $forRelationshipLabel      whether this is a relationship label
      */
     static function removeLabel($language, $label, $labelvalue, $moduleName, $basepath = null, $forRelationshipLabel = false) {
-        $GLOBALS [ 'log' ]->debug ( "ParserLabel->removeLabels($language, \$label, \$labelvalue, $moduleName, $basepath );" ) ;
-        if (is_null ( $basepath ))
+        $GLOBALS ['log']->debug("ParserLabel->removeLabels($language, \$label, \$labelvalue, $moduleName, $basepath );");
+        if (is_null($basepath))
         {
-            $deployedModule = true ;
-            $basepath = "custom/modules/$moduleName/language" ;
-            if($forRelationshipLabel){
-            	$basepath = "custom/modules/$moduleName/Ext/Language" ;
+            $deployedModule = true;
+            $basepath = "custom/modules/$moduleName/language";
+            if ($forRelationshipLabel) {
+            	$basepath = "custom/modules/$moduleName/Ext/Language";
             }
-            if (! is_dir ( $basepath ))
+            if (!is_dir($basepath))
             {
                 $GLOBALS ['log']->debug("$basepath is not a directory.");
                 return false;
             }
         }
 
-        $filename = "$basepath/$language.lang.php" ;
-        if($forRelationshipLabel){
-        	$filename = "$basepath/$language.lang.ext.php" ;
+        $filename = "$basepath/$language.lang.php";
+        if ($forRelationshipLabel) {
+        	$filename = "$basepath/$language.lang.ext.php";
      	}
 
-        $dir_exists = is_dir ( $basepath ) ;
+        $dir_exists = is_dir($basepath);
 
-        $mod_strings = array ( ) ;
+        $mod_strings = array( );
 
         if ($dir_exists)
         {
-            if (file_exists ($filename))
+            if (file_exists($filename))
             {
                 // obtain $mod_strings
-                include ($filename) ;
+                include ($filename);
             } else {
                 $GLOBALS ['log']->debug("file $filename does not exist.");
                 return false;
             }
         } else {
             $GLOBALS ['log']->debug("directory $basepath does not exist.");
-            return false ;
+            return false;
         }
 
-        $changed = false ;
+        $changed = false;
 
-        if (isset($mod_strings[$label]) && $mod_strings[$label]==$labelvalue) {
+        if (isset($mod_strings[$label]) && $mod_strings[$label] == $labelvalue) {
             unset($mod_strings[$label]);
             $changed = true;
         }
 
         if ($changed)
         {
-            if (! write_array_to_file ( "mod_strings", $mod_strings, $filename )) {
-                $GLOBALS [ 'log' ]->fatal ( "Could not write $filename" ) ;
+            if (!write_array_to_file("mod_strings", $mod_strings, $filename)) {
+                $GLOBALS ['log']->fatal("Could not write $filename");
             } else {
                 // if we have a cache to worry about, then clear it now
                 if ($deployedModule) {
-                    $GLOBALS ['log']->debug ( "PaserLabel->addLabels: clearing language cache" ) ;
-                    $cache_key = "module_language." . $language . $moduleName ;
-                    sugar_cache_clear ( $cache_key ) ;
-                    LanguageManager::clearLanguageCache ( $moduleName, $language ) ;
+                    $GLOBALS ['log']->debug("PaserLabel->addLabels: clearing language cache");
+                    $cache_key = "module_language.".$language.$moduleName;
+                    sugar_cache_clear($cache_key);
+                    LanguageManager::clearLanguageCache($moduleName, $language);
                 }
             }
         }
 
-        return true ;
+        return true;
     }
 
     /*
@@ -172,79 +172,79 @@ 
      * @param string $moduleName    Name of the module to which to add these labels
      * @param string $packageName   If module is undeployed, name of the package to which it belongs
      */
-    static function addLabels ($language , $labels , $moduleName , $basepath = null, $forRelationshipLabel = false)
+    static function addLabels($language, $labels, $moduleName, $basepath = null, $forRelationshipLabel = false)
     {
 
-        $GLOBALS [ 'log' ]->debug ( "ParserLabel->addLabels($language, \$labels, $moduleName, $basepath );" ) ;
-        $GLOBALS [ 'log' ]->debug ( "\$labels:" . print_r ( $labels, true ) ) ;
+        $GLOBALS ['log']->debug("ParserLabel->addLabels($language, \$labels, $moduleName, $basepath );");
+        $GLOBALS ['log']->debug("\$labels:".print_r($labels, true));
 
-        $deployedModule = false ;
-        if (is_null ( $basepath ))
+        $deployedModule = false;
+        if (is_null($basepath))
         {
-            $deployedModule = true ;
-            $basepath = "custom/modules/$moduleName/language" ;
-            if($forRelationshipLabel){
-            	$basepath = "custom/modules/$moduleName/Ext/Language" ;
+            $deployedModule = true;
+            $basepath = "custom/modules/$moduleName/language";
+            if ($forRelationshipLabel) {
+            	$basepath = "custom/modules/$moduleName/Ext/Language";
             }
-            if (! is_dir ( $basepath ))
+            if (!is_dir($basepath))
             {
                 mkdir_recursive($basepath);
             }
         }
 
-        $filename = "$basepath/$language.lang.php" ;
-        if($forRelationshipLabel){
-        	$filename = "$basepath/$language.lang.ext.php" ;
+        $filename = "$basepath/$language.lang.php";
+        if ($forRelationshipLabel) {
+        	$filename = "$basepath/$language.lang.ext.php";
      	}
-        $dir_exists = is_dir ( $basepath ) ;
+        $dir_exists = is_dir($basepath);
 
-        $mod_strings = array ( ) ;
+        $mod_strings = array( );
 
         if ($dir_exists)
         {
-            if (file_exists ( $filename ))
+            if (file_exists($filename))
             {
                 // obtain $mod_strings
-                include ($filename) ;
-            }else if($forRelationshipLabel){
-            	$fh = fopen ($filename, 'a');
+                include ($filename);
+            } else if ($forRelationshipLabel) {
+            	$fh = fopen($filename, 'a');
             	fclose($fh);
             }
         } else
         {
-            return false ;
+            return false;
         }
 
-        	$changed = false ;
+        	$changed = false;
 
         //$charset = (isset($app_strings['LBL_CHARSET'])) ? $app_strings['LBL_CHARSET'] : $GLOBALS['sugar_config']['default_charset'] ;
 
-	        foreach ( $labels as $key => $value )
+	        foreach ($labels as $key => $value)
 	        {
-            if (! isset ( $mod_strings [ $key ] ) || strcmp ( $value, $mod_strings [ $key ] ) != 0)
+            if (!isset ($mod_strings [$key]) || strcmp($value, $mod_strings [$key]) != 0)
 	            {
                     $mod_strings [$key] = to_html(strip_tags(from_html($value))); // must match encoding used in view.labels.php
-	                $changed = true ;
+	                $changed = true;
 	            }
 	        }
 
 	        if ($changed)
 	        {
-            $GLOBALS [ 'log' ]->debug ( "ParserLabel->addLabels: writing new mod_strings to $filename" ) ;
-	            $GLOBALS [ 'log' ]->debug ( "ParserLabel->addLabels: mod_strings=".print_r($mod_strings,true) ) ;
-            if (! write_array_to_file ( "mod_strings", $mod_strings, $filename ))
+            $GLOBALS ['log']->debug("ParserLabel->addLabels: writing new mod_strings to $filename");
+	            $GLOBALS ['log']->debug("ParserLabel->addLabels: mod_strings=".print_r($mod_strings, true));
+            if (!write_array_to_file("mod_strings", $mod_strings, $filename))
 	            {
-                $GLOBALS [ 'log' ]->fatal ( "Could not write $filename" ) ;
+                $GLOBALS ['log']->fatal("Could not write $filename");
 	            } else
 	            {
 	                // if we have a cache to worry about, then clear it now
                 if ($deployedModule)
 	                {
                             SugarCache::cleanOpcodes();
-	                    $GLOBALS [ 'log' ]->debug ( "PaserLabel->addLabels: clearing language cache" ) ;
-	                    $cache_key = "module_language." . $language . $moduleName ;
-	                    sugar_cache_clear ( $cache_key ) ;
-	                    LanguageManager::clearLanguageCache ( $moduleName, $language ) ;
+	                    $GLOBALS ['log']->debug("PaserLabel->addLabels: clearing language cache");
+	                    $cache_key = "module_language.".$language.$moduleName;
+	                    sugar_cache_clear($cache_key);
+	                    LanguageManager::clearLanguageCache($moduleName, $language);
 	                }
 	            }
 	        }
@@ -258,16 +258,16 @@ 
         // The changes from custom/Extension/modules/{ModuleName}/Ext/Language
         // will overwrite stuff in custom/modules/{ModuleName}/Ext/Language/en_us.lang.ext.php after
         //  Quick Repair and Rebuild is applied.
-        if($forRelationshipLabel) {
-            if(!empty($_POST[view_module]) && !empty($_POST[relationship_name]) && !empty($_POST[rhs_label]) && !empty($_POST[lhs_module])) {
+        if ($forRelationshipLabel) {
+            if (!empty($_POST[view_module]) && !empty($_POST[relationship_name]) && !empty($_POST[rhs_label]) && !empty($_POST[lhs_module])) {
                 // 1. Overwrite custom/Extension/modules/{ModuleName}/Ext/Language
-                $extension_basepath = "custom/Extension/modules/" . $_POST[view_module] . "/Ext/Language";
+                $extension_basepath = "custom/Extension/modules/".$_POST[view_module]."/Ext/Language";
                 mkdir_recursive($extension_basepath);
 
                 $headerString = "<?php\n//THIS FILE IS AUTO GENERATED, DO NOT MODIFY\n";
                 $out = $headerString;
 
-                $extension_filename = "$extension_basepath/$language.custom" . $_POST[relationship_name] . ".php";
+                $extension_filename = "$extension_basepath/$language.custom".$_POST[relationship_name].".php";
 
                 $mod_strings = array();
                 if (file_exists($extension_filename)) {
@@ -293,9 +293,9 @@ 
                     $file_contents = fopen($extension_filename, 'w');
                     fputs($file_contents, $out, strlen($out));
                     fclose($file_contents);
-                } catch (Exception $e) {
+                }catch (Exception $e) {
                     $GLOBALS ['log']->fatal("Could not write $filename");
-                    $GLOBALS ['log']->fatal("Exception " . $e->getMessage());
+                    $GLOBALS ['log']->fatal("Exception ".$e->getMessage());
                     $failed_to_write = true;
                 }
 
@@ -309,7 +309,7 @@ 
                 $headerString = "<?php\n//THIS FILE IS AUTO GENERATED, DO NOT MODIFY\n";
                 $out = $headerString;
 
-                $relationships_filename = "$relationships_basepath/" . $_POST[lhs_module] . ".php";
+                $relationships_filename = "$relationships_basepath/".$_POST[lhs_module].".php";
 
 
                 $mod_strings = array();
@@ -336,9 +336,9 @@ 
                     $file_contents = fopen($relationships_filename, 'w');
                     fputs($file_contents, $out, strlen($out));
                     fclose($file_contents);
-                } catch (Exception $e) {
+                }catch (Exception $e) {
                     $GLOBALS ['log']->fatal("Could not write $filename");
-                    $GLOBALS ['log']->fatal("Exception " . $e->getMessage());
+                    $GLOBALS ['log']->fatal("Exception ".$e->getMessage());
                     $failed_to_write = true;
                 }
 
@@ -348,7 +348,7 @@ 
                         if ($deployedModule) {
                             SugarCache::cleanOpcodes();
                             $GLOBALS ['log']->debug("PaserLabel->addLabels: clearing language cache");
-                            $cache_key = "module_language." . $language . $moduleName;
+                            $cache_key = "module_language.".$language.$moduleName;
                             sugar_cache_clear($cache_key);
                             LanguageManager::clearLanguageCache($moduleName, $language);
                         }
@@ -357,7 +357,7 @@ 
             }
         }
 
-        return true ;
+        return true;
     }
 
     /**
@@ -366,20 +366,20 @@ 
      * @param $metadata
      * @param string $language      Language key, for example 'en_us'
      */
-    function handleSaveRelationshipLabels ($metadata , $language)
+    function handleSaveRelationshipLabels($metadata, $language)
         {
-        foreach ( $metadata as $definition )
+        foreach ($metadata as $definition)
             {
         	$labels = array();
-        	$labels[$definition [ 'system_label' ]] = $definition [ 'display_label' ];
-        	self::addLabels ( $language, $labels, $definition [ 'module' ],null,true );
+        	$labels[$definition ['system_label']] = $definition ['display_label'];
+        	self::addLabels($language, $labels, $definition ['module'], null, true);
             }
         }
 
     function addLabelsToAllLanguages($labels)
             {
     	$langs = get_languages();
-    	foreach($langs as $lang_key => $lang_display)
+    	foreach ($langs as $lang_key => $lang_display)
         {
     		$this->addLabels($lang_key, $labels, $this->moduleName);
         }

Braces +16 added lines, -11 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.
@@ -48,8 +49,9 @@ 
     public function __construct ($moduleName, $packageName = '' )
     {
         $this->moduleName = $moduleName;
-        if (!empty($packageName))
-            $this->packageName = $packageName ;
+        if (!empty($packageName)) {
+                    $this->packageName = $packageName ;
+        }
     }
 
     /**
@@ -59,8 +61,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct($moduleName, $packageName);
@@ -82,9 +83,11 @@ 
                 $labels [ strtoupper(substr ( $key, 6 )) ] = SugarCleaner::cleanHtml(from_html($value),false);
             }
         }
-        if (!empty($this->packageName)) //we are in Module builder
+        if (!empty($this->packageName)) {
+            //we are in Module builder
         {
             return self::addLabels ( $language, $labels, $this->moduleName, "custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/language" ) ;
+        }
         } else
         {
             return self::addLabels ( $language, $labels, $this->moduleName ) ;
@@ -206,7 +209,7 @@ 
             {
                 // obtain $mod_strings
                 include ($filename) ;
-            }else if($forRelationshipLabel){
+            } else if($forRelationshipLabel){
             	$fh = fopen ($filename, 'a');
             	fclose($fh);
             }
@@ -285,8 +288,9 @@ 
                     }
                 }
 
-                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);
+                }
 
                 $failed_to_write = false;
                 try {
@@ -328,8 +332,9 @@ 
                     }
                 }
 
-                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);
+                }
 
                 $failed_to_write = false;
                 try {

modules/ModuleBuilder/parsers/ModuleBuilderParser.php

Indentation +47 added lines, -47 removed lines

@@ -43,13 +43,13 @@ 
 class ModuleBuilderParser
 {
 
-	var $_defMap; // private - mapping from view to variable name inside the viewdef file
-	var $_variables = array(); // private - set of additional variables (other than the viewdefs) found in the viewdef file that need to be added to the file again when it is saved - used by ModuleBuilder
+    var $_defMap; // private - mapping from view to variable name inside the viewdef file
+    var $_variables = array(); // private - set of additional variables (other than the viewdefs) found in the viewdef file that need to be added to the file again when it is saved - used by ModuleBuilder
 
-	function __construct()
-	{
-		$this->_defMap = array('listview'=>'listViewDefs','searchview'=>'searchdefs','editview'=>'viewdefs','detailview'=>'viewdefs','quickcreate'=>'viewdefs');
-	}
+    function __construct()
+    {
+        $this->_defMap = array('listview'=>'listViewDefs','searchview'=>'searchdefs','editview'=>'viewdefs','detailview'=>'viewdefs','quickcreate'=>'viewdefs');
+    }
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
@@ -65,25 +65,25 @@ 
         self::__construct();
     }
 
-	/*
+    /*
 	 * Initialize this parser
 	 */
-	function init ()
-	{
-	}
+    function init ()
+    {
+    }
 
-	/*
+    /*
 	 * Dummy function used to ease the transition to the new parser structure
 	 */
-	function populateFromPost()
-	{
-	}
+    function populateFromPost()
+    {
+    }
 
-	function _loadFromFile($view,$file,$moduleName)
-	{
+    function _loadFromFile($view,$file,$moduleName)
+    {
 
-		$variables = array();
-	    if (! file_exists($file))
+        $variables = array();
+        if (! file_exists($file))
         {
             $this->_fatalError("ModuleBuilderParser: required viewdef file {$file} does not exist");
         }
@@ -99,7 +99,7 @@ 
         foreach ($moduleVariables as $name)
         {
             if (isset($$name)) {
-            	$variables[$name] = $$name;
+                $variables[$name] = $$name;
             }
         }
         $viewVariable = $this->_defMap[strtolower($view)];
@@ -109,33 +109,33 @@ 
 
         if (isset($variables['module_name']))
         {
-        	$mbName = $variables['module_name'];
-        	if ($mbName != $moduleName)
-        	{
-	        	$GLOBALS['log']->debug('ModuleBuilderParser->_loadFromFile(): tidying module names from '.$mbName.' to '.$moduleName);
-	        	$defs[$moduleName] = $defs[$mbName];
-	        	unset($defs[$mbName]);
-        	}
+            $mbName = $variables['module_name'];
+            if ($mbName != $moduleName)
+            {
+                $GLOBALS['log']->debug('ModuleBuilderParser->_loadFromFile(): tidying module names from '.$mbName.' to '.$moduleName);
+                $defs[$moduleName] = $defs[$mbName];
+                unset($defs[$mbName]);
+            }
         }
 //	    $GLOBALS['log']->debug('ModuleBuilderParser->_loadFromFile(): '.print_r($defs,true));
         return (array('viewdefs' => $defs, 'variables' => $variables));
-	}
+    }
 
-	function handleSave ($file,$view,$moduleName,$defs)
-	{
-	}
+    function handleSave ($file,$view,$moduleName,$defs)
+    {
+    }
 
 
-	/*
+    /*
 	 * Save the new layout
 	 */
-	function _writeToFile ($file,$view,$moduleName,$defs,$variables)
-	{
-	        if(file_exists($file))
-	            unlink($file);
+    function _writeToFile ($file,$view,$moduleName,$defs,$variables)
+    {
+            if(file_exists($file))
+                unlink($file);
 
-	        mkdir_recursive ( dirname ( $file ) ) ;
-	        $GLOBALS['log']->debug("ModuleBuilderParser->_writeFile(): file=".$file);
+            mkdir_recursive ( dirname ( $file ) ) ;
+            $GLOBALS['log']->debug("ModuleBuilderParser->_writeFile(): file=".$file);
             $useVariables = (count($variables)>0);
             if( $fh = @sugar_fopen( $file, 'w' ) )
             {
@@ -145,20 +145,20 @@ 
                     // write out the $<variable>=<modulename> lines
                     foreach($variables as $key=>$value)
                     {
-                    	$out .= "\$$key = '".$value."';\n";
+                        $out .= "\$$key = '".$value."';\n";
                     }
                 }
 
                 // write out the defs array itself
                 switch (strtolower($view))
                 {
-                	case 'editview':
-                	case 'detailview':
-                	case 'quickcreate':
-                		$defs = array($view => $defs);
-                		break;
-                	default:
-                		break;
+                    case 'editview':
+                    case 'detailview':
+                    case 'quickcreate':
+                        $defs = array($view => $defs);
+                        break;
+                    default:
+                        break;
                 }
                 $viewVariable = $this->_defMap[strtolower($view)];
                 $out .= "\$$viewVariable = ";
@@ -167,7 +167,7 @@ 
                 // tidy up the parenthesis
                 if ($useVariables)
                 {
-                	$out .= "\n)";
+                    $out .= "\n)";
                 }
                 $out .= ";\n?>\n";
 
@@ -179,7 +179,7 @@ 
             {
                 $GLOBALS['log']->fatal("ModuleBuilderParser->_writeFile() Could not write new viewdef file ".$file);
             }
-	}
+    }
 
 
     function _fatalError ($msg)

Spacing +19 added lines, -19 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.
@@ -48,15 +48,15 @@ 
 
 	function __construct()
 	{
-		$this->_defMap = array('listview'=>'listViewDefs','searchview'=>'searchdefs','editview'=>'viewdefs','detailview'=>'viewdefs','quickcreate'=>'viewdefs');
+		$this->_defMap = array('listview'=>'listViewDefs', 'searchview'=>'searchdefs', 'editview'=>'viewdefs', 'detailview'=>'viewdefs', 'quickcreate'=>'viewdefs');
 	}
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function ModuleBuilderParser(){
+    function ModuleBuilderParser() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -68,7 +68,7 @@ 
 	/*
 	 * Initialize this parser
 	 */
-	function init ()
+	function init()
 	{
 	}
 
@@ -79,11 +79,11 @@ 
 	{
 	}
 
-	function _loadFromFile($view,$file,$moduleName)
+	function _loadFromFile($view, $file, $moduleName)
 	{
 
 		$variables = array();
-	    if (! file_exists($file))
+	    if (!file_exists($file))
         {
             $this->_fatalError("ModuleBuilderParser: required viewdef file {$file} does not exist");
         }
@@ -95,7 +95,7 @@ 
         // This is a format used by ModuleBuilder templated modules to speed the renaming of modules
         // Traditional Sugar modules don't use this format
         // We must do this in ParserModifyLayout (rather than just in ParserBuildLayout) because we might be editing the layout of a MB created module in Studio after it has been deployed
-        $moduleVariables = array('module_name','_module_name', 'OBJECT_NAME', '_object_name');
+        $moduleVariables = array('module_name', '_module_name', 'OBJECT_NAME', '_object_name');
         foreach ($moduleVariables as $name)
         {
             if (isset($$name)) {
@@ -121,7 +121,7 @@ 
         return (array('viewdefs' => $defs, 'variables' => $variables));
 	}
 
-	function handleSave ($file,$view,$moduleName,$defs)
+	function handleSave($file, $view, $moduleName, $defs)
 	{
 	}
 
@@ -129,21 +129,21 @@ 
 	/*
 	 * Save the new layout
 	 */
-	function _writeToFile ($file,$view,$moduleName,$defs,$variables)
+	function _writeToFile($file, $view, $moduleName, $defs, $variables)
 	{
-	        if(file_exists($file))
+	        if (file_exists($file))
 	            unlink($file);
 
-	        mkdir_recursive ( dirname ( $file ) ) ;
+	        mkdir_recursive(dirname($file));
 	        $GLOBALS['log']->debug("ModuleBuilderParser->_writeFile(): file=".$file);
-            $useVariables = (count($variables)>0);
-            if( $fh = @sugar_fopen( $file, 'w' ) )
+            $useVariables = (count($variables) > 0);
+            if ($fh = @sugar_fopen($file, 'w'))
             {
                 $out = "<?php\n";
                 if ($useVariables)
                 {
                     // write out the $<variable>=<modulename> lines
-                    foreach($variables as $key=>$value)
+                    foreach ($variables as $key=>$value)
                     {
                     	$out .= "\$$key = '".$value."';\n";
                     }
@@ -162,7 +162,7 @@ 
                 }
                 $viewVariable = $this->_defMap[strtolower($view)];
                 $out .= "\$$viewVariable = ";
-                $out .= ($useVariables) ? "array (\n\$module_name =>\n".var_export_helper($defs) : var_export_helper( array($moduleName => $defs) );
+                $out .= ($useVariables) ? "array (\n\$module_name =>\n".var_export_helper($defs) : var_export_helper(array($moduleName => $defs));
 
                 // tidy up the parenthesis
                 if ($useVariables)
@@ -172,8 +172,8 @@ 
                 $out .= ";\n?>\n";
 
 //           $GLOBALS['log']->debug("parser.modifylayout.php->_writeFile(): out=".print_r($out,true));
-            fputs( $fh, $out);
-            fclose( $fh );
+            fputs($fh, $out);
+            fclose($fh);
             }
             else
             {
@@ -182,7 +182,7 @@ 
 	}
 
 
-    function _fatalError ($msg)
+    function _fatalError($msg)
     {
         $GLOBALS ['log']->fatal($msg);
         echo $msg;

Braces +8 added lines, -7 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -58,8 +60,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();
@@ -131,8 +132,9 @@ 
 	 */
 	function _writeToFile ($file,$view,$moduleName,$defs,$variables)
 	{
-	        if(file_exists($file))
-	            unlink($file);
+	        if(file_exists($file)) {
+	        	            unlink($file);
+	        }
 
 	        mkdir_recursive ( dirname ( $file ) ) ;
 	        $GLOBALS['log']->debug("ModuleBuilderParser->_writeFile(): file=".$file);
@@ -174,8 +176,7 @@ 
 //           $GLOBALS['log']->debug("parser.modifylayout.php->_writeFile(): out=".print_r($out,true));
             fputs( $fh, $out);
             fclose( $fh );
-            }
-            else
+            } else
             {
                 $GLOBALS['log']->fatal("ModuleBuilderParser->_writeFile() Could not write new viewdef file ".$file);
             }

modules/Relationships/RelationshipHandler.php

Indentation +224 added lines, -224 removed lines

@@ -48,30 +48,30 @@ 
 
 class RelationshipHandler extends Relationship {
 
-	var $db;							//Database link by reference
+    var $db;							//Database link by reference
 
-	var $base_module;					//name of module
-	var $base_bean;						//actual object
-	var $base_vardef_field;				//base's vardef field name of relationship with rel1
+    var $base_module;					//name of module
+    var $base_bean;						//actual object
+    var $base_vardef_field;				//base's vardef field name of relationship with rel1
 
-	var $rel1_module;					//name of related module
-	var $rel1_bean;						//actual related object
-	var $rel1_relationship_name;		//Relationship name between base and rel1
-	var $rel1_vardef_field;				//rel1's vardef field name of relationship with rel2
-	var $rel1_vardef_field_base;		//rel1's vardef field name of relationship with base
+    var $rel1_module;					//name of related module
+    var $rel1_bean;						//actual related object
+    var $rel1_relationship_name;		//Relationship name between base and rel1
+    var $rel1_vardef_field;				//rel1's vardef field name of relationship with rel2
+    var $rel1_vardef_field_base;		//rel1's vardef field name of relationship with base
 
-	var $rel2_module;					//name of related related module
-	var $rel2_bean;						//actual related related object
-	var $rel2_relationship_name;		//Relationship name between rel1 and rel2
-	var $rel2_vardef_field;				//rel2's vardef field name of relationship with rel1
+    var $rel2_module;					//name of related related module
+    var $rel2_bean;						//actual related related object
+    var $rel2_relationship_name;		//Relationship name between rel1 and rel2
+    var $rel2_vardef_field;				//rel2's vardef field name of relationship with rel1
 
 
-	var $base_array;					//Info array
-	var $rel1_array;					//Info array
-	var $rel2_array;					//Info array
+    var $base_array;					//Info array
+    var $rel1_array;					//Info array
+    var $rel2_array;					//Info array
 
 
-	/*
+    /*
 
 	info arrays contain:
 
@@ -85,13 +85,13 @@ 
 
 ///////////////////////////Setup and populate functions//////////////////////////////
 
-	function __construct(& $db, $base_module=""){
+    function __construct(& $db, $base_module=""){
 
-		$this->db = $db;
-		$this->base_module = $base_module;
+        $this->db = $db;
+        $this->base_module = $base_module;
 
-	//end function RelationshipHandler
-	}
+    //end function RelationshipHandler
+    }
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
@@ -108,25 +108,25 @@ 
     }
 
 
-	function set_rel_vardef_fields($base_vardef_field, $rel1_vardef_field=""){
+    function set_rel_vardef_fields($base_vardef_field, $rel1_vardef_field=""){
 
-		$this->base_vardef_field = $base_vardef_field;
-		$this->rel1_vardef_field = $rel1_vardef_field;
+        $this->base_vardef_field = $base_vardef_field;
+        $this->rel1_vardef_field = $rel1_vardef_field;
 
-	//end function set_rel_vardef_fields
-	}
+    //end function set_rel_vardef_fields
+    }
 
 
-	function set_rel_relationship_names($build_rel2=false){
+    function set_rel_relationship_names($build_rel2=false){
 
-		$this->rel1_relationship_name = $this->base_bean->field_defs[$this->base_vardef_field]['relationship'];
+        $this->rel1_relationship_name = $this->base_bean->field_defs[$this->base_vardef_field]['relationship'];
 
-	if($build_rel2==true){
-		$this->rel2_relationship_name = $this->rel1_bean->field_defs[$this->rel1_vardef_field]['relationship'];
-	}
+    if($build_rel2==true){
+        $this->rel2_relationship_name = $this->rel1_bean->field_defs[$this->rel1_vardef_field]['relationship'];
+    }
 
-	//end function set_rel_relationship_names
-	}
+    //end function set_rel_relationship_names
+    }
 
 
 
@@ -134,131 +134,131 @@ 
 ///////////////////////////////END Setup and populate functions/////////////////////
 
 
-	/*
+    /*
 	set the build_rel2 to true if you want the rel2 info array as well
 	This function will build all the relationship info it can based on values set in the setup functions
 	When you use the info arrays (rel1_array) or (rel2_array), make sure you always check for empty values
 	*/
-	function build_info($build_rel2=false){
-		if($this->base_bean == null){
-			$this->base_bean = get_module_info($this->base_module);
-		}
+    function build_info($build_rel2=false){
+        if($this->base_bean == null){
+            $this->base_bean = get_module_info($this->base_module);
+        }
 
-		if(empty($this->rel1_bean)){
-			$this->build_rel1_info();
-			$this->rel1_module = $this->rel1_bean->module_dir;
-		}
+        if(empty($this->rel1_bean)){
+            $this->build_rel1_info();
+            $this->rel1_module = $this->rel1_bean->module_dir;
+        }
 
-		if($build_rel2==true && $this->rel2_bean==""){
-			$this->build_rel2_info();
-			$this->rel2_module = $this->rel2_bean->module_dir;
-		}
+        if($build_rel2==true && $this->rel2_bean==""){
+            $this->build_rel2_info();
+            $this->rel2_module = $this->rel2_bean->module_dir;
+        }
 
-		//translate the module titles to the proper language
-		$this->build_module_labels($build_rel2);
+        //translate the module titles to the proper language
+        $this->build_module_labels($build_rel2);
 
-	//end function build_info
-	}
+    //end function build_info
+    }
 
-	function build_rel1_info(){
+    function build_rel1_info(){
 
-			$this->rel1_bean = $this->trace_relationship_module($this->base_module, $this->base_vardef_field);
+            $this->rel1_bean = $this->trace_relationship_module($this->base_module, $this->base_vardef_field);
 
-	//end function build_rel1_info
-	}
+    //end function build_rel1_info
+    }
 
-	function build_rel2_info(){
+    function build_rel2_info(){
 
-			$this->rel2_bean = $this->trace_relationship_module($this->base_module, $this->base_vardef_field, $this->rel1_vardef_field);
+            $this->rel2_bean = $this->trace_relationship_module($this->base_module, $this->base_vardef_field, $this->rel1_vardef_field);
 
-	//end function build_rel1_info
-	}
+    //end function build_rel1_info
+    }
 
-	/*
+    /*
 	Translates the module names to their singular and plural label and puts them in
 	the info arrays.  Does it for base, rel1, and rel2 if specified
 	*/
 
-	function build_module_labels($build_rel2=false){
-		global $app_list_strings;
+    function build_module_labels($build_rel2=false){
+        global $app_list_strings;
 
-		///Base Module Labels
-		if(!empty($app_list_strings['moduleList'][$this->base_bean->module_dir])){
-			$this->base_array['plabel'] = $app_list_strings['moduleList'][$this->base_bean->module_dir];
-		} else {
-			$this->base_array['plabel'] = $this->base_bean->module_dir;
-		}
-		if(!empty($app_list_strings['moduleListSingular'][$this->base_bean->module_dir])){
-			$this->base_array['slabel'] = $app_list_strings['moduleListSingular'][$this->base_bean->module_dir];
-		} else {
-			$this->base_array['slabel'] = $this->base_bean->object_name;
-		}
+        ///Base Module Labels
+        if(!empty($app_list_strings['moduleList'][$this->base_bean->module_dir])){
+            $this->base_array['plabel'] = $app_list_strings['moduleList'][$this->base_bean->module_dir];
+        } else {
+            $this->base_array['plabel'] = $this->base_bean->module_dir;
+        }
+        if(!empty($app_list_strings['moduleListSingular'][$this->base_bean->module_dir])){
+            $this->base_array['slabel'] = $app_list_strings['moduleListSingular'][$this->base_bean->module_dir];
+        } else {
+            $this->base_array['slabel'] = $this->base_bean->object_name;
+        }
 
-		///Rel1 Module Labels
-		if(!empty($app_list_strings['moduleList'][$this->rel1_bean->module_dir])){
-			$this->rel1_array['plabel'] = $app_list_strings['moduleList'][$this->rel1_bean->module_dir];
-		} else {
-			$this->rel1_array['plabel'] = $this->rel1_bean->module_dir;
-		}
+        ///Rel1 Module Labels
+        if(!empty($app_list_strings['moduleList'][$this->rel1_bean->module_dir])){
+            $this->rel1_array['plabel'] = $app_list_strings['moduleList'][$this->rel1_bean->module_dir];
+        } else {
+            $this->rel1_array['plabel'] = $this->rel1_bean->module_dir;
+        }
 
-		if(!empty($app_list_strings['moduleListSingular'][$this->rel1_bean->module_dir])){
-			$this->rel1_array['slabel'] = $app_list_strings['moduleListSingular'][$this->rel1_bean->module_dir];
-		} else {
-			$this->rel1_array['slabel'] = $this->rel1_bean->object_name;
-		}
+        if(!empty($app_list_strings['moduleListSingular'][$this->rel1_bean->module_dir])){
+            $this->rel1_array['slabel'] = $app_list_strings['moduleListSingular'][$this->rel1_bean->module_dir];
+        } else {
+            $this->rel1_array['slabel'] = $this->rel1_bean->object_name;
+        }
 
 
-		//Rel2 Module Labels
-		if($build_rel2==true){
+        //Rel2 Module Labels
+        if($build_rel2==true){
 
-			if(!empty($app_list_strings['moduleList'][$this->rel2_bean->module_dir])){
-				$this->rel2_array['plabel'] = $app_list_strings['moduleList'][$this->rel2_bean->module_dir];
-			} else {
-				$this->rel2_array['plabel'] = $this->rel2_bean->module_dir;
-			}
-			if(!empty($app_list_strings['moduleListSingular'][$this->rel2_bean->module_dir])){
-				$this->rel2_array['slabel'] = $app_list_strings['moduleListSingular'][$this->rel2_bean->module_dir];
-			} else {
-				$this->rel2_array['slabel'] = $this->rel2_bean->module_dir;
-			}
-		//end if build_rel2 is true
-		}
+            if(!empty($app_list_strings['moduleList'][$this->rel2_bean->module_dir])){
+                $this->rel2_array['plabel'] = $app_list_strings['moduleList'][$this->rel2_bean->module_dir];
+            } else {
+                $this->rel2_array['plabel'] = $this->rel2_bean->module_dir;
+            }
+            if(!empty($app_list_strings['moduleListSingular'][$this->rel2_bean->module_dir])){
+                $this->rel2_array['slabel'] = $app_list_strings['moduleListSingular'][$this->rel2_bean->module_dir];
+            } else {
+                $this->rel2_array['slabel'] = $this->rel2_bean->module_dir;
+            }
+        //end if build_rel2 is true
+        }
 
-	//end function buld_module_lables
-	}
+    //end function buld_module_lables
+    }
 
 
 
 
 
-	function build_related_list($type="base"){
-		//type can be base, rel1
+    function build_related_list($type="base"){
+        //type can be base, rel1
 
-		$target_list = "";
+        $target_list = "";
 
-		if($type=="base"){
-			$target_list = $this->base_bean->get_linked_beans($this->base_vardef_field, $this->rel1_bean->object_name);
-		//Possibility exists that this is a new relationship, so capture via relationship fields
-			if(empty($target_list)){
-				$target_list = search_filter_rel_info($this->base_bean, $this->rel1_bean->module_dir, $this->base_vardef_field);
-			//end if the target list is empty
-			}
-		}
+        if($type=="base"){
+            $target_list = $this->base_bean->get_linked_beans($this->base_vardef_field, $this->rel1_bean->object_name);
+        //Possibility exists that this is a new relationship, so capture via relationship fields
+            if(empty($target_list)){
+                $target_list = search_filter_rel_info($this->base_bean, $this->rel1_bean->module_dir, $this->base_vardef_field);
+            //end if the target list is empty
+            }
+        }
 
-		if($type=="rel1"){
-			$target_list = $this->rel1_bean->get_linked_beans($this->rel1_vardef_field, $this->rel2_bean->object_name);
+        if($type=="rel1"){
+            $target_list = $this->rel1_bean->get_linked_beans($this->rel1_vardef_field, $this->rel2_bean->object_name);
 
-			//Possibility exists that this is a new relationship, so capture via relationship fields
-			if(empty($target_list)){
-				$target_list = search_filter_rel_info($this->rel1_bean, $this->rel2_bean->module_dir, $this->rel1_vardef_field);
-			//end if the target list is empty
-			}
-		}
+            //Possibility exists that this is a new relationship, so capture via relationship fields
+            if(empty($target_list)){
+                $target_list = search_filter_rel_info($this->rel1_bean, $this->rel2_bean->module_dir, $this->rel1_vardef_field);
+            //end if the target list is empty
+            }
+        }
 
-		return $target_list;
+        return $target_list;
 
-	//end function build_related_list
-	}
+    //end function build_related_list
+    }
 
 
 
@@ -267,100 +267,100 @@ 
 
 function get_relationship_information(& $target_bean, $get_upstream_rel_field_name = false){
 
-	$target_module_name = $target_bean->module_dir;
-	$current_module_name = $this->base_module;
+    $target_module_name = $target_bean->module_dir;
+    $current_module_name = $this->base_module;
 
-	//Look for downstream connection
-	$rel_array = $this->retrieve_by_sides($current_module_name, $target_module_name, $this->db);
+    //Look for downstream connection
+    $rel_array = $this->retrieve_by_sides($current_module_name, $target_module_name, $this->db);
 
 
-	//Does a downstream relationship exist
-	if($rel_array!=null){
-		if($rel_array['relationship_type']=="many-to-many"){
-			$joinKeyLHS = $rel_array['join_key_lhs'];
-			$target_bean->$joinKeyLHS = $this->base_bean->id;
-			if($rel_array['relationship_role_column']!=""){
-				$relRole = $rel_array['relationship_role_column'];
-				$target_bean->$relRole = $rel_array['relationship_role_column_value'];
-			}				
-		//end if many-to-many	
-		}	
+    //Does a downstream relationship exist
+    if($rel_array!=null){
+        if($rel_array['relationship_type']=="many-to-many"){
+            $joinKeyLHS = $rel_array['join_key_lhs'];
+            $target_bean->$joinKeyLHS = $this->base_bean->id;
+            if($rel_array['relationship_role_column']!=""){
+                $relRole = $rel_array['relationship_role_column'];
+                $target_bean->$relRole = $rel_array['relationship_role_column_value'];
+            }				
+        //end if many-to-many	
+        }	
 		
-		if($rel_array['relationship_type']=="one-to-many"){
-			$RHSKey = $rel_array['rhs_key'];
-			$target_bean->$RHSKey = $this->base_bean->id;
-			if($rel_array['relationship_role_column']!=""){
-				$relRole = $rel_array['relationship_role_column'];
-				$target_bean->$relRole = $rel_array['relationship_role_column_value'];
-			}
-		//end if one-to-many
-		}
-
-		return;
-	//end if downstream relationship exists
-	}
-
-
-
-	//Look for upstream connection
-	$rel_array = $this->retrieve_by_sides($target_module_name, $current_module_name, $this->db);
-
-	//Does an upstream relationship exist
-	if($rel_array!=null){
-		if($rel_array['relationship_type']=="many-to-many"){
-			$joinKeyRHS = $rel_array['join_key_rhs'];
-			$target_bean->$joinKeyRHS = $this->base_bean->id;
-			if($rel_array['relationship_role_column']!=""){
-				$relRole = $rel_array['relationship_role_column'];
-				$target_bean->$relRole = $rel_array['relationship_role_column_value'];
-			}				
-		//end if many-to-many	
-		}	
+        if($rel_array['relationship_type']=="one-to-many"){
+            $RHSKey = $rel_array['rhs_key'];
+            $target_bean->$RHSKey = $this->base_bean->id;
+            if($rel_array['relationship_role_column']!=""){
+                $relRole = $rel_array['relationship_role_column'];
+                $target_bean->$relRole = $rel_array['relationship_role_column_value'];
+            }
+        //end if one-to-many
+        }
+
+        return;
+    //end if downstream relationship exists
+    }
+
+
+
+    //Look for upstream connection
+    $rel_array = $this->retrieve_by_sides($target_module_name, $current_module_name, $this->db);
+
+    //Does an upstream relationship exist
+    if($rel_array!=null){
+        if($rel_array['relationship_type']=="many-to-many"){
+            $joinKeyRHS = $rel_array['join_key_rhs'];
+            $target_bean->$joinKeyRHS = $this->base_bean->id;
+            if($rel_array['relationship_role_column']!=""){
+                $relRole = $rel_array['relationship_role_column'];
+                $target_bean->$relRole = $rel_array['relationship_role_column_value'];
+            }				
+        //end if many-to-many	
+        }	
 		
-		if($rel_array['relationship_type']=="one-to-many"){
-			$RHSKey = $rel_array['rhs_key'];
-			$target_bean->$RHSKey = $this->base_bean->id;
-			if($rel_array['relationship_role_column']!=""){
-				$relRole = $rel_array['relationship_role_column'];
-				$target_bean->$relRole = $rel_array['relationship_role_column_value'];
-			}
-		//end if one-to-many
-		}
-
-
-		///Fill additional id field if necessary
-		if(($id_name = $this->traverse_rel_meta($current_module_name, $target_bean, $rel_array['relationship_name'])) != null){
-			$target_bean->$id_name = $this->base_bean->id;
+        if($rel_array['relationship_type']=="one-to-many"){
+            $RHSKey = $rel_array['rhs_key'];
+            $target_bean->$RHSKey = $this->base_bean->id;
+            if($rel_array['relationship_role_column']!=""){
+                $relRole = $rel_array['relationship_role_column'];
+                $target_bean->$relRole = $rel_array['relationship_role_column_value'];
+            }
+        //end if one-to-many
+        }
+
+
+        ///Fill additional id field if necessary
+        if(($id_name = $this->traverse_rel_meta($current_module_name, $target_bean, $rel_array['relationship_name'])) != null){
+            $target_bean->$id_name = $this->base_bean->id;
             if($get_upstream_rel_field_name) {
                 $target_bean->new_rel_relname = $id_name;
                 $target_bean->new_rel_id = $this->base_bean->id;
             }
-		}
+        }
 
-	//end if an upstream relationship exists
-	}
+    //end if an upstream relationship exists
+    }
 
 //end function get_relationship_information
 }
 
 function traverse_rel_meta($base_module, & $target_bean, $target_rel_name){
-	$id_name = null;
+    $id_name = null;
 
-	//returns name of variable to store id in
-	//if none exists, then returns null
-	foreach($target_bean->field_defs as $field_array){
+    //returns name of variable to store id in
+    //if none exists, then returns null
+    foreach($target_bean->field_defs as $field_array){
 
-		if(!empty($field_array['relationship']) && $field_array['relationship']==$target_rel_name){
+        if(!empty($field_array['relationship']) && $field_array['relationship']==$target_rel_name){
 
-			$id_name = $this->get_id_name($target_bean, $field_array['name']);
-			return $id_name;
-		//end if rel name match
-		}
+            $id_name = $this->get_id_name($target_bean, $field_array['name']);
+            return $id_name;
+        //end if rel name match
+        }
 
-	//end foreach field def
-	}
+    //end foreach field def
+    }
 
-	return null;
+    return null;
 
 //end function traverse_rel_meta
 }
@@ -368,17 +368,17 @@ 
 
 function get_id_name(& $target_bean, $field_name){
 
-	foreach($target_bean->relationship_fields as $target_id => $rel_name){
+    foreach($target_bean->relationship_fields as $target_id => $rel_name){
 
-		if($rel_name == $field_name){
-			//relationship id found
-			return $target_id;
-		//end if match
-		}
-	//end foreach
-	}
+        if($rel_name == $field_name){
+            //relationship id found
+            return $target_id;
+        //end if match
+        }
+    //end foreach
+    }
 
-	return null;
+    return null;
 //end function get_id_name
 }
 
@@ -387,27 +387,27 @@ 
 
 function process_by_rel_bean($rel1_module){
 
-	$this->rel1_relationship_name = $this::retrieve_by_modules($this->base_module, $rel1_module, $this->db);
-	$this->rel1_module = $rel1_module;
-	$this->rel1_bean = get_module_info($this->rel1_module);
+    $this->rel1_relationship_name = $this::retrieve_by_modules($this->base_module, $rel1_module, $this->db);
+    $this->rel1_module = $rel1_module;
+    $this->rel1_bean = get_module_info($this->rel1_module);
 
 //end function process_by_rel_bean
 }
 
 
 function get_rel1_vardef_field_base($field_defs){
-	foreach($field_defs as $field_array){
+    foreach($field_defs as $field_array){
 
-		if(!empty($field_array['relationship']) && $field_array['relationship']==$this->rel1_relationship_name){
+        if(!empty($field_array['relationship']) && $field_array['relationship']==$this->rel1_relationship_name){
 
-			$this->rel1_vardef_field_base = $field_array['name'];
-		//end if rel name match
-		}
+            $this->rel1_vardef_field_base = $field_array['name'];
+        //end if rel name match
+        }
 
-	//end foreach field def
-	}
+    //end foreach field def
+    }
 
-	return null;
+    return null;
 
 
 //end get_rel1_vardef_field_base
@@ -416,15 +416,15 @@ 
 
 function get_farthest_reach(){
 
-	if($this->rel1_vardef_field!=""){
-		//the farthest reach is rel2
-		$this->build_info(true);
-		return $this->rel2_bean;
-	}
+    if($this->rel1_vardef_field!=""){
+        //the farthest reach is rel2
+        $this->build_info(true);
+        return $this->rel2_bean;
+    }
 
-	//the farthest reach is rel1
-	$this->build_info(false);
-	return $this->rel1_bean;
+    //the farthest reach is rel1
+    $this->build_info(false);
+    return $this->rel1_bean;
 
 //end function get_farthest_reach
 }

Spacing +68 added lines, -68 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.
@@ -48,27 +48,27 @@ 
 
 class RelationshipHandler extends Relationship {
 
-	var $db;							//Database link by reference
+	var $db; //Database link by reference
 
-	var $base_module;					//name of module
-	var $base_bean;						//actual object
-	var $base_vardef_field;				//base's vardef field name of relationship with rel1
+	var $base_module; //name of module
+	var $base_bean; //actual object
+	var $base_vardef_field; //base's vardef field name of relationship with rel1
 
-	var $rel1_module;					//name of related module
-	var $rel1_bean;						//actual related object
-	var $rel1_relationship_name;		//Relationship name between base and rel1
-	var $rel1_vardef_field;				//rel1's vardef field name of relationship with rel2
-	var $rel1_vardef_field_base;		//rel1's vardef field name of relationship with base
+	var $rel1_module; //name of related module
+	var $rel1_bean; //actual related object
+	var $rel1_relationship_name; //Relationship name between base and rel1
+	var $rel1_vardef_field; //rel1's vardef field name of relationship with rel2
+	var $rel1_vardef_field_base; //rel1's vardef field name of relationship with base
 
-	var $rel2_module;					//name of related related module
-	var $rel2_bean;						//actual related related object
-	var $rel2_relationship_name;		//Relationship name between rel1 and rel2
-	var $rel2_vardef_field;				//rel2's vardef field name of relationship with rel1
+	var $rel2_module; //name of related related module
+	var $rel2_bean; //actual related related object
+	var $rel2_relationship_name; //Relationship name between rel1 and rel2
+	var $rel2_vardef_field; //rel2's vardef field name of relationship with rel1
 
 
-	var $base_array;					//Info array
-	var $rel1_array;					//Info array
-	var $rel2_array;					//Info array
+	var $base_array; //Info array
+	var $rel1_array; //Info array
+	var $rel2_array; //Info array
 
 
 	/*
@@ -85,7 +85,7 @@ 
 
 ///////////////////////////Setup and populate functions//////////////////////////////
 
-	function __construct(& $db, $base_module=""){
+	function __construct(& $db, $base_module = "") {
 
 		$this->db = $db;
 		$this->base_module = $base_module;
@@ -96,19 +96,19 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function RelationshipHandler(& $db, $base_module=""){
+    function RelationshipHandler(& $db, $base_module = "") {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
-        self::__construct( $db, $base_module);
+        self::__construct($db, $base_module);
     }
 
 
-	function set_rel_vardef_fields($base_vardef_field, $rel1_vardef_field=""){
+	function set_rel_vardef_fields($base_vardef_field, $rel1_vardef_field = "") {
 
 		$this->base_vardef_field = $base_vardef_field;
 		$this->rel1_vardef_field = $rel1_vardef_field;
@@ -117,11 +117,11 @@ 
 	}
 
 
-	function set_rel_relationship_names($build_rel2=false){
+	function set_rel_relationship_names($build_rel2 = false) {
 
 		$this->rel1_relationship_name = $this->base_bean->field_defs[$this->base_vardef_field]['relationship'];
 
-	if($build_rel2==true){
+	if ($build_rel2 == true) {
 		$this->rel2_relationship_name = $this->rel1_bean->field_defs[$this->rel1_vardef_field]['relationship'];
 	}
 
@@ -139,17 +139,17 @@ 
 	This function will build all the relationship info it can based on values set in the setup functions
 	When you use the info arrays (rel1_array) or (rel2_array), make sure you always check for empty values
 	*/
-	function build_info($build_rel2=false){
-		if($this->base_bean == null){
+	function build_info($build_rel2 = false) {
+		if ($this->base_bean == null) {
 			$this->base_bean = get_module_info($this->base_module);
 		}
 
-		if(empty($this->rel1_bean)){
+		if (empty($this->rel1_bean)) {
 			$this->build_rel1_info();
 			$this->rel1_module = $this->rel1_bean->module_dir;
 		}
 
-		if($build_rel2==true && $this->rel2_bean==""){
+		if ($build_rel2 == true && $this->rel2_bean == "") {
 			$this->build_rel2_info();
 			$this->rel2_module = $this->rel2_bean->module_dir;
 		}
@@ -160,14 +160,14 @@ 
 	//end function build_info
 	}
 
-	function build_rel1_info(){
+	function build_rel1_info() {
 
 			$this->rel1_bean = $this->trace_relationship_module($this->base_module, $this->base_vardef_field);
 
 	//end function build_rel1_info
 	}
 
-	function build_rel2_info(){
+	function build_rel2_info() {
 
 			$this->rel2_bean = $this->trace_relationship_module($this->base_module, $this->base_vardef_field, $this->rel1_vardef_field);
 
@@ -179,29 +179,29 @@ 
 	the info arrays.  Does it for base, rel1, and rel2 if specified
 	*/
 
-	function build_module_labels($build_rel2=false){
+	function build_module_labels($build_rel2 = false) {
 		global $app_list_strings;
 
 		///Base Module Labels
-		if(!empty($app_list_strings['moduleList'][$this->base_bean->module_dir])){
+		if (!empty($app_list_strings['moduleList'][$this->base_bean->module_dir])) {
 			$this->base_array['plabel'] = $app_list_strings['moduleList'][$this->base_bean->module_dir];
 		} else {
 			$this->base_array['plabel'] = $this->base_bean->module_dir;
 		}
-		if(!empty($app_list_strings['moduleListSingular'][$this->base_bean->module_dir])){
+		if (!empty($app_list_strings['moduleListSingular'][$this->base_bean->module_dir])) {
 			$this->base_array['slabel'] = $app_list_strings['moduleListSingular'][$this->base_bean->module_dir];
 		} else {
 			$this->base_array['slabel'] = $this->base_bean->object_name;
 		}
 
 		///Rel1 Module Labels
-		if(!empty($app_list_strings['moduleList'][$this->rel1_bean->module_dir])){
+		if (!empty($app_list_strings['moduleList'][$this->rel1_bean->module_dir])) {
 			$this->rel1_array['plabel'] = $app_list_strings['moduleList'][$this->rel1_bean->module_dir];
 		} else {
 			$this->rel1_array['plabel'] = $this->rel1_bean->module_dir;
 		}
 
-		if(!empty($app_list_strings['moduleListSingular'][$this->rel1_bean->module_dir])){
+		if (!empty($app_list_strings['moduleListSingular'][$this->rel1_bean->module_dir])) {
 			$this->rel1_array['slabel'] = $app_list_strings['moduleListSingular'][$this->rel1_bean->module_dir];
 		} else {
 			$this->rel1_array['slabel'] = $this->rel1_bean->object_name;
@@ -209,14 +209,14 @@ 
 
 
 		//Rel2 Module Labels
-		if($build_rel2==true){
+		if ($build_rel2 == true) {
 
-			if(!empty($app_list_strings['moduleList'][$this->rel2_bean->module_dir])){
+			if (!empty($app_list_strings['moduleList'][$this->rel2_bean->module_dir])) {
 				$this->rel2_array['plabel'] = $app_list_strings['moduleList'][$this->rel2_bean->module_dir];
 			} else {
 				$this->rel2_array['plabel'] = $this->rel2_bean->module_dir;
 			}
-			if(!empty($app_list_strings['moduleListSingular'][$this->rel2_bean->module_dir])){
+			if (!empty($app_list_strings['moduleListSingular'][$this->rel2_bean->module_dir])) {
 				$this->rel2_array['slabel'] = $app_list_strings['moduleListSingular'][$this->rel2_bean->module_dir];
 			} else {
 				$this->rel2_array['slabel'] = $this->rel2_bean->module_dir;
@@ -231,25 +231,25 @@ 
 
 
 
-	function build_related_list($type="base"){
+	function build_related_list($type = "base") {
 		//type can be base, rel1
 
 		$target_list = "";
 
-		if($type=="base"){
+		if ($type == "base") {
 			$target_list = $this->base_bean->get_linked_beans($this->base_vardef_field, $this->rel1_bean->object_name);
 		//Possibility exists that this is a new relationship, so capture via relationship fields
-			if(empty($target_list)){
+			if (empty($target_list)) {
 				$target_list = search_filter_rel_info($this->base_bean, $this->rel1_bean->module_dir, $this->base_vardef_field);
 			//end if the target list is empty
 			}
 		}
 
-		if($type=="rel1"){
+		if ($type == "rel1") {
 			$target_list = $this->rel1_bean->get_linked_beans($this->rel1_vardef_field, $this->rel2_bean->object_name);
 
 			//Possibility exists that this is a new relationship, so capture via relationship fields
-			if(empty($target_list)){
+			if (empty($target_list)) {
 				$target_list = search_filter_rel_info($this->rel1_bean, $this->rel2_bean->module_dir, $this->rel1_vardef_field);
 			//end if the target list is empty
 			}
@@ -265,7 +265,7 @@ 
 
 ///////BEGIN Functions to find relationships/////////////////////////////////
 
-function get_relationship_information(& $target_bean, $get_upstream_rel_field_name = false){
+function get_relationship_information(& $target_bean, $get_upstream_rel_field_name = false) {
 
 	$target_module_name = $target_bean->module_dir;
 	$current_module_name = $this->base_module;
@@ -275,21 +275,21 @@ 
 
 
 	//Does a downstream relationship exist
-	if($rel_array!=null){
-		if($rel_array['relationship_type']=="many-to-many"){
+	if ($rel_array != null) {
+		if ($rel_array['relationship_type'] == "many-to-many") {
 			$joinKeyLHS = $rel_array['join_key_lhs'];
 			$target_bean->$joinKeyLHS = $this->base_bean->id;
-			if($rel_array['relationship_role_column']!=""){
+			if ($rel_array['relationship_role_column'] != "") {
 				$relRole = $rel_array['relationship_role_column'];
 				$target_bean->$relRole = $rel_array['relationship_role_column_value'];
 			}				
 		//end if many-to-many	
 		}	
 		
-		if($rel_array['relationship_type']=="one-to-many"){
+		if ($rel_array['relationship_type'] == "one-to-many") {
 			$RHSKey = $rel_array['rhs_key'];
 			$target_bean->$RHSKey = $this->base_bean->id;
-			if($rel_array['relationship_role_column']!=""){
+			if ($rel_array['relationship_role_column'] != "") {
 				$relRole = $rel_array['relationship_role_column'];
 				$target_bean->$relRole = $rel_array['relationship_role_column_value'];
 			}
@@ -306,21 +306,21 @@ 
 	$rel_array = $this->retrieve_by_sides($target_module_name, $current_module_name, $this->db);
 
 	//Does an upstream relationship exist
-	if($rel_array!=null){
-		if($rel_array['relationship_type']=="many-to-many"){
+	if ($rel_array != null) {
+		if ($rel_array['relationship_type'] == "many-to-many") {
 			$joinKeyRHS = $rel_array['join_key_rhs'];
 			$target_bean->$joinKeyRHS = $this->base_bean->id;
-			if($rel_array['relationship_role_column']!=""){
+			if ($rel_array['relationship_role_column'] != "") {
 				$relRole = $rel_array['relationship_role_column'];
 				$target_bean->$relRole = $rel_array['relationship_role_column_value'];
 			}				
 		//end if many-to-many	
 		}	
 		
-		if($rel_array['relationship_type']=="one-to-many"){
+		if ($rel_array['relationship_type'] == "one-to-many") {
 			$RHSKey = $rel_array['rhs_key'];
 			$target_bean->$RHSKey = $this->base_bean->id;
-			if($rel_array['relationship_role_column']!=""){
+			if ($rel_array['relationship_role_column'] != "") {
 				$relRole = $rel_array['relationship_role_column'];
 				$target_bean->$relRole = $rel_array['relationship_role_column_value'];
 			}
@@ -329,9 +329,9 @@ 
 
 
 		///Fill additional id field if necessary
-		if(($id_name = $this->traverse_rel_meta($current_module_name, $target_bean, $rel_array['relationship_name'])) != null){
+		if (($id_name = $this->traverse_rel_meta($current_module_name, $target_bean, $rel_array['relationship_name'])) != null) {
 			$target_bean->$id_name = $this->base_bean->id;
-            if($get_upstream_rel_field_name) {
+            if ($get_upstream_rel_field_name) {
                 $target_bean->new_rel_relname = $id_name;
                 $target_bean->new_rel_id = $this->base_bean->id;
             }
@@ -343,14 +343,14 @@ 
 //end function get_relationship_information
 }
 
-function traverse_rel_meta($base_module, & $target_bean, $target_rel_name){
+function traverse_rel_meta($base_module, & $target_bean, $target_rel_name) {
 	$id_name = null;
 
 	//returns name of variable to store id in
 	//if none exists, then returns null
-	foreach($target_bean->field_defs as $field_array){
+	foreach ($target_bean->field_defs as $field_array) {
 
-		if(!empty($field_array['relationship']) && $field_array['relationship']==$target_rel_name){
+		if (!empty($field_array['relationship']) && $field_array['relationship'] == $target_rel_name) {
 
 			$id_name = $this->get_id_name($target_bean, $field_array['name']);
 			return $id_name;
@@ -366,11 +366,11 @@ 
 }
 
 
-function get_id_name(& $target_bean, $field_name){
+function get_id_name(& $target_bean, $field_name) {
 
-	foreach($target_bean->relationship_fields as $target_id => $rel_name){
+	foreach ($target_bean->relationship_fields as $target_id => $rel_name) {
 
-		if($rel_name == $field_name){
+		if ($rel_name == $field_name) {
 			//relationship id found
 			return $target_id;
 		//end if match
@@ -385,7 +385,7 @@ 
 ///////////////////////////END functions to find relationships //////////////////////
 
 
-function process_by_rel_bean($rel1_module){
+function process_by_rel_bean($rel1_module) {
 
 	$this->rel1_relationship_name = $this::retrieve_by_modules($this->base_module, $rel1_module, $this->db);
 	$this->rel1_module = $rel1_module;
@@ -395,10 +395,10 @@ 
 }
 
 
-function get_rel1_vardef_field_base($field_defs){
-	foreach($field_defs as $field_array){
+function get_rel1_vardef_field_base($field_defs) {
+	foreach ($field_defs as $field_array) {
 
-		if(!empty($field_array['relationship']) && $field_array['relationship']==$this->rel1_relationship_name){
+		if (!empty($field_array['relationship']) && $field_array['relationship'] == $this->rel1_relationship_name) {
 
 			$this->rel1_vardef_field_base = $field_array['name'];
 		//end if rel name match
@@ -414,9 +414,9 @@ 
 }
 
 
-function get_farthest_reach(){
+function get_farthest_reach() {
 
-	if($this->rel1_vardef_field!=""){
+	if ($this->rel1_vardef_field != "") {
 		//the farthest reach is rel2
 		$this->build_info(true);
 		return $this->rel2_bean;

Braces +4 added lines, -3 removed lines

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

modules/Relationships/Relationship.php

Indentation +162 added lines, -162 removed lines

@@ -49,32 +49,32 @@ 
 
 class Relationship extends SugarBean {
 
-	var $object_name='Relationship';
-	var $module_dir = 'Relationships';
-	var $new_schema = true;
-	var $table_name = 'relationships';
-
-	var $id;
-	var $relationship_name;
-	var $lhs_module;
-	var $lhs_table;
-	var $lhs_key;
-	var $rhs_module;
-	var $rhs_table;
-	var $rhs_key;
-	var $join_table;
-	var $join_key_lhs;
-	var $join_key_rhs;
-	var $relationship_type;
-	var $relationship_role_column;
-	var $relationship_role_column_value;
-	var $reverse;
-
-	var $_self_referencing;
+    var $object_name='Relationship';
+    var $module_dir = 'Relationships';
+    var $new_schema = true;
+    var $table_name = 'relationships';
+
+    var $id;
+    var $relationship_name;
+    var $lhs_module;
+    var $lhs_table;
+    var $lhs_key;
+    var $rhs_module;
+    var $rhs_table;
+    var $rhs_key;
+    var $join_table;
+    var $join_key_lhs;
+    var $join_key_rhs;
+    var $relationship_type;
+    var $relationship_role_column;
+    var $relationship_role_column_value;
+    var $reverse;
+
+    var $_self_referencing;
 
     public function __construct() {
-		parent::__construct();
-	}
+        parent::__construct();
+    }
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
@@ -91,88 +91,88 @@ 
     }
 
 
-	/*returns true if the relationship is self referencing. equality check is performed for both table and
+    /*returns true if the relationship is self referencing. equality check is performed for both table and
 	 * key names.
 	 */
-	function is_self_referencing() {
-		if (empty($this->_self_referencing)) {
-			$this->_self_referencing=false;
-
-			//is it self referencing, both table and key name from lhs and rhs should  be equal.
-			if ($this->lhs_table == $this->rhs_table && $this->lhs_key == $this->rhs_key) {
-				$this->_self_referencing=true;
-			}
-		}
-		return $this->_self_referencing;
-	}
+    function is_self_referencing() {
+        if (empty($this->_self_referencing)) {
+            $this->_self_referencing=false;
+
+            //is it self referencing, both table and key name from lhs and rhs should  be equal.
+            if ($this->lhs_table == $this->rhs_table && $this->lhs_key == $this->rhs_key) {
+                $this->_self_referencing=true;
+            }
+        }
+        return $this->_self_referencing;
+    }
 
-	/*returns true if a relationship with provided name exists*/
-	static function exists($relationship_name,&$db) {
-		$query = "SELECT relationship_name FROM relationships WHERE deleted=0 AND relationship_name = '".$relationship_name."'";
-		$result = $db->query($query,true," Error searching relationships table..");
-		$row  =  $db->fetchByAssoc($result);
-		if ($row != null) {
-			return true;
-		}
+    /*returns true if a relationship with provided name exists*/
+    static function exists($relationship_name,&$db) {
+        $query = "SELECT relationship_name FROM relationships WHERE deleted=0 AND relationship_name = '".$relationship_name."'";
+        $result = $db->query($query,true," Error searching relationships table..");
+        $row  =  $db->fetchByAssoc($result);
+        if ($row != null) {
+            return true;
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	static function delete($relationship_name,&$db) {
+    static function delete($relationship_name,&$db) {
 
-		$query = "UPDATE relationships SET deleted=1 WHERE deleted=0 AND relationship_name = '".$relationship_name."'";
-		$result = $db->query($query,true," Error updating relationships table for ".$relationship_name);
+        $query = "UPDATE relationships SET deleted=1 WHERE deleted=0 AND relationship_name = '".$relationship_name."'";
+        $result = $db->query($query,true," Error updating relationships table for ".$relationship_name);
 
-	}
+    }
 
 
-	function get_other_module($relationship_name, $base_module, &$db){
-	//give it the relationship_name and base module
-	//it will return the module name on the other side of the relationship
+    function get_other_module($relationship_name, $base_module, &$db){
+    //give it the relationship_name and base module
+    //it will return the module name on the other side of the relationship
 
-		$query = "SELECT relationship_name, rhs_module, lhs_module FROM relationships WHERE deleted=0 AND relationship_name = '".$relationship_name."'";
-		$result = $db->query($query,true," Error searching relationships table..");
-		$row  =  $db->fetchByAssoc($result);
-		if ($row != null) {
+        $query = "SELECT relationship_name, rhs_module, lhs_module FROM relationships WHERE deleted=0 AND relationship_name = '".$relationship_name."'";
+        $result = $db->query($query,true," Error searching relationships table..");
+        $row  =  $db->fetchByAssoc($result);
+        if ($row != null) {
 
-			if($row['rhs_module']==$base_module){
-				return $row['lhs_module'];
-			}
-			if($row['lhs_module']==$base_module){
-				return $row['rhs_module'];
-			}
-		}
+            if($row['rhs_module']==$base_module){
+                return $row['lhs_module'];
+            }
+            if($row['lhs_module']==$base_module){
+                return $row['rhs_module'];
+            }
+        }
 
-		return false;
+        return false;
 
 
-	//end function get_other_module
-	}
+    //end function get_other_module
+    }
 
-	function retrieve_by_sides($lhs_module, $rhs_module, &$db){
-	//give it the relationship_name and base module
-	//it will return the module name on the other side of the relationship
+    function retrieve_by_sides($lhs_module, $rhs_module, &$db){
+    //give it the relationship_name and base module
+    //it will return the module name on the other side of the relationship
 
-		$query = "SELECT * FROM relationships WHERE deleted=0 AND lhs_module = '".$lhs_module."' AND rhs_module = '".$rhs_module."'";
-		$result = $db->query($query,true," Error searching relationships table..");
-		$row  =  $db->fetchByAssoc($result);
-		if ($row != null) {
+        $query = "SELECT * FROM relationships WHERE deleted=0 AND lhs_module = '".$lhs_module."' AND rhs_module = '".$rhs_module."'";
+        $result = $db->query($query,true," Error searching relationships table..");
+        $row  =  $db->fetchByAssoc($result);
+        if ($row != null) {
 
-			return $row;
+            return $row;
 
-		}
+        }
 
-		return null;
+        return null;
 
 
-	//end function retrieve_by_sides
-	}
+    //end function retrieve_by_sides
+    }
 
-	static function retrieve_by_modules($lhs_module, $rhs_module, &$db, $type =''){
-	//give it the relationship_name and base module
-	//it will return the module name on the other side of the relationship
+    static function retrieve_by_modules($lhs_module, $rhs_module, &$db, $type =''){
+    //give it the relationship_name and base module
+    //it will return the module name on the other side of the relationship
 
-		$query = "	SELECT * FROM relationships
+        $query = "	SELECT * FROM relationships
 					WHERE deleted=0
 					AND (
 					(lhs_module = '".$lhs_module."' AND rhs_module = '".$rhs_module."')
@@ -180,113 +180,113 @@ 
 					(lhs_module = '".$rhs_module."' AND rhs_module = '".$lhs_module."')
 					)
 					";
-		if(!empty($type)){
-			$query .= " AND relationship_type='$type'";
-		}
-		$result = $db->query($query,true," Error searching relationships table..");
-		$row  =  $db->fetchByAssoc($result);
-		if ($row != null) {
+        if(!empty($type)){
+            $query .= " AND relationship_type='$type'";
+        }
+        $result = $db->query($query,true," Error searching relationships table..");
+        $row  =  $db->fetchByAssoc($result);
+        if ($row != null) {
 
-			return $row['relationship_name'];
+            return $row['relationship_name'];
 
-		}
+        }
 
-		return null;
+        return null;
 
 
-	//end function retrieve_by_sides
-	}
+    //end function retrieve_by_sides
+    }
 
 
-	function retrieve_by_name($relationship_name) {
+    function retrieve_by_name($relationship_name) {
 
-		if (empty($GLOBALS['relationships'])) {
-			$this->load_relationship_meta();
-		}
+        if (empty($GLOBALS['relationships'])) {
+            $this->load_relationship_meta();
+        }
 
 //		_ppd($GLOBALS['relationships']);
 
-		if (array_key_exists($relationship_name, $GLOBALS['relationships'])) {
-
-			foreach($GLOBALS['relationships'][$relationship_name] as $field=>$value)
-			{
-					$this->$field = $value;
-			}
-		}
-		else {
-			$GLOBALS['log']->fatal('Error fetching relationship from cache '.$relationship_name);
-			return false;
-		}
-	}
-
-	function load_relationship_meta() {
-		if (!file_exists(Relationship::cache_file_dir().'/'.Relationship::cache_file_name_only())) {
-			$this->build_relationship_cache();
-		}
-		include(Relationship::cache_file_dir().'/'.Relationship::cache_file_name_only());
-		$GLOBALS['relationships']=$relationships;
-	}
-
-	function build_relationship_cache() {
-		$query="SELECT * from relationships where deleted=0";
-		$result=$this->db->query($query);
-
-		while (($row=$this->db->fetchByAssoc($result))!=null) {
-			$relationships[$row['relationship_name']] = $row;
-		}
-
-		sugar_mkdir($this->cache_file_dir(), null, true);
+        if (array_key_exists($relationship_name, $GLOBALS['relationships'])) {
+
+            foreach($GLOBALS['relationships'][$relationship_name] as $field=>$value)
+            {
+                    $this->$field = $value;
+            }
+        }
+        else {
+            $GLOBALS['log']->fatal('Error fetching relationship from cache '.$relationship_name);
+            return false;
+        }
+    }
+
+    function load_relationship_meta() {
+        if (!file_exists(Relationship::cache_file_dir().'/'.Relationship::cache_file_name_only())) {
+            $this->build_relationship_cache();
+        }
+        include(Relationship::cache_file_dir().'/'.Relationship::cache_file_name_only());
+        $GLOBALS['relationships']=$relationships;
+    }
+
+    function build_relationship_cache() {
+        $query="SELECT * from relationships where deleted=0";
+        $result=$this->db->query($query);
+
+        while (($row=$this->db->fetchByAssoc($result))!=null) {
+            $relationships[$row['relationship_name']] = $row;
+        }
+
+        sugar_mkdir($this->cache_file_dir(), null, true);
         $out = "<?php \n \$relationships = " . var_export($relationships, true) . ";";
         sugar_file_put_contents_atomic(Relationship::cache_file_dir() . '/' . Relationship::cache_file_name_only(), $out);
 
         require_once("data/Relationships/RelationshipFactory.php");
         SugarRelationshipFactory::deleteCache();
-	}
+    }
 
 
-	public static function cache_file_dir() {
-		return sugar_cached("modules/Relationships");
-	}
-	public static function cache_file_name_only() {
-		return 'relationships.cache.php';
-	}
+    public static function cache_file_dir() {
+        return sugar_cached("modules/Relationships");
+    }
+    public static function cache_file_name_only() {
+        return 'relationships.cache.php';
+    }
 
-	public static function delete_cache() {
-		$filename=Relationship::cache_file_dir().'/'.Relationship::cache_file_name_only();
-		if (file_exists($filename)) {
-			unlink($filename);
-		}
+    public static function delete_cache() {
+        $filename=Relationship::cache_file_dir().'/'.Relationship::cache_file_name_only();
+        if (file_exists($filename)) {
+            unlink($filename);
+        }
         require_once("data/Relationships/RelationshipFactory.php");
         SugarRelationshipFactory::deleteCache();
-	}
+    }
 
 
-	function trace_relationship_module($base_module, $rel_module1_name, $rel_module2_name=""){
-		global $beanList;
-		global $dictionary;
+    function trace_relationship_module($base_module, $rel_module1_name, $rel_module2_name=""){
+        global $beanList;
+        global $dictionary;
 
-		$temp_module = get_module_info($base_module);
+        $temp_module = get_module_info($base_module);
 
-		$rel_attribute1_name = $temp_module->field_defs[strtolower($rel_module1_name)]['relationship'];
-		$rel_module1 = $this->get_other_module($rel_attribute1_name, $base_module, $temp_module->db);
-		$rel_module1_bean = get_module_info($rel_module1);
+        $rel_attribute1_name = $temp_module->field_defs[strtolower($rel_module1_name)]['relationship'];
+        $rel_module1 = $this->get_other_module($rel_attribute1_name, $base_module, $temp_module->db);
+        $rel_module1_bean = get_module_info($rel_module1);
 
-		if($rel_module2_name!=""){
-			if($rel_module2_name == 'ProjectTask'){
-				$rel_module2_name = strtolower($rel_module2_name);
-			}
-			$rel_attribute2_name = $rel_module1_bean->field_defs[strtolower($rel_module2_name)]['relationship'];
-			$rel_module2 = $this->get_other_module($rel_attribute2_name, $rel_module1_bean->module_dir, $rel_module1_bean->db);
-			$rel_module2_bean = get_module_info($rel_module2);
-			return $rel_module2_bean;
+        if($rel_module2_name!=""){
+            if($rel_module2_name == 'ProjectTask'){
+                $rel_module2_name = strtolower($rel_module2_name);
+            }
+            $rel_attribute2_name = $rel_module1_bean->field_defs[strtolower($rel_module2_name)]['relationship'];
+            $rel_module2 = $this->get_other_module($rel_attribute2_name, $rel_module1_bean->module_dir, $rel_module1_bean->db);
+            $rel_module2_bean = get_module_info($rel_module2);
+            return $rel_module2_bean;
 
-		} else {
-			//no rel_module2, so return rel_module2 bean
-			return $rel_module1_bean;
-		}
+        } else {
+            //no rel_module2, so return rel_module2 bean
+            return $rel_module1_bean;
+        }
 
-	//end function trace_relationship_module
-	}
+    //end function trace_relationship_module
+    }
 
 
 

Spacing +34 added lines, -34 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.
@@ -49,7 +49,7 @@ 
 
 class Relationship extends SugarBean {
 
-	var $object_name='Relationship';
+	var $object_name = 'Relationship';
 	var $module_dir = 'Relationships';
 	var $new_schema = true;
 	var $table_name = 'relationships';
@@ -79,9 +79,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    public function Relationship(){
+    public function Relationship() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -96,21 +96,21 @@ 
 	 */
 	function is_self_referencing() {
 		if (empty($this->_self_referencing)) {
-			$this->_self_referencing=false;
+			$this->_self_referencing = false;
 
 			//is it self referencing, both table and key name from lhs and rhs should  be equal.
 			if ($this->lhs_table == $this->rhs_table && $this->lhs_key == $this->rhs_key) {
-				$this->_self_referencing=true;
+				$this->_self_referencing = true;
 			}
 		}
 		return $this->_self_referencing;
 	}
 
 	/*returns true if a relationship with provided name exists*/
-	static function exists($relationship_name,&$db) {
+	static function exists($relationship_name, &$db) {
 		$query = "SELECT relationship_name FROM relationships WHERE deleted=0 AND relationship_name = '".$relationship_name."'";
-		$result = $db->query($query,true," Error searching relationships table..");
-		$row  =  $db->fetchByAssoc($result);
+		$result = $db->query($query, true, " Error searching relationships table..");
+		$row = $db->fetchByAssoc($result);
 		if ($row != null) {
 			return true;
 		}
@@ -118,27 +118,27 @@ 
 		return false;
 	}
 
-	static function delete($relationship_name,&$db) {
+	static function delete($relationship_name, &$db) {
 
 		$query = "UPDATE relationships SET deleted=1 WHERE deleted=0 AND relationship_name = '".$relationship_name."'";
-		$result = $db->query($query,true," Error updating relationships table for ".$relationship_name);
+		$result = $db->query($query, true, " Error updating relationships table for ".$relationship_name);
 
 	}
 
 
-	function get_other_module($relationship_name, $base_module, &$db){
+	function get_other_module($relationship_name, $base_module, &$db) {
 	//give it the relationship_name and base module
 	//it will return the module name on the other side of the relationship
 
 		$query = "SELECT relationship_name, rhs_module, lhs_module FROM relationships WHERE deleted=0 AND relationship_name = '".$relationship_name."'";
-		$result = $db->query($query,true," Error searching relationships table..");
-		$row  =  $db->fetchByAssoc($result);
+		$result = $db->query($query, true, " Error searching relationships table..");
+		$row = $db->fetchByAssoc($result);
 		if ($row != null) {
 
-			if($row['rhs_module']==$base_module){
+			if ($row['rhs_module'] == $base_module) {
 				return $row['lhs_module'];
 			}
-			if($row['lhs_module']==$base_module){
+			if ($row['lhs_module'] == $base_module) {
 				return $row['rhs_module'];
 			}
 		}
@@ -149,13 +149,13 @@ 
 	//end function get_other_module
 	}
 
-	function retrieve_by_sides($lhs_module, $rhs_module, &$db){
+	function retrieve_by_sides($lhs_module, $rhs_module, &$db) {
 	//give it the relationship_name and base module
 	//it will return the module name on the other side of the relationship
 
 		$query = "SELECT * FROM relationships WHERE deleted=0 AND lhs_module = '".$lhs_module."' AND rhs_module = '".$rhs_module."'";
-		$result = $db->query($query,true," Error searching relationships table..");
-		$row  =  $db->fetchByAssoc($result);
+		$result = $db->query($query, true, " Error searching relationships table..");
+		$row = $db->fetchByAssoc($result);
 		if ($row != null) {
 
 			return $row;
@@ -168,7 +168,7 @@ 
 	//end function retrieve_by_sides
 	}
 
-	static function retrieve_by_modules($lhs_module, $rhs_module, &$db, $type =''){
+	static function retrieve_by_modules($lhs_module, $rhs_module, &$db, $type = '') {
 	//give it the relationship_name and base module
 	//it will return the module name on the other side of the relationship
 
@@ -180,11 +180,11 @@ 
 					(lhs_module = '".$rhs_module."' AND rhs_module = '".$lhs_module."')
 					)
 					";
-		if(!empty($type)){
+		if (!empty($type)) {
 			$query .= " AND relationship_type='$type'";
 		}
-		$result = $db->query($query,true," Error searching relationships table..");
-		$row  =  $db->fetchByAssoc($result);
+		$result = $db->query($query, true, " Error searching relationships table..");
+		$row = $db->fetchByAssoc($result);
 		if ($row != null) {
 
 			return $row['relationship_name'];
@@ -208,7 +208,7 @@ 
 
 		if (array_key_exists($relationship_name, $GLOBALS['relationships'])) {
 
-			foreach($GLOBALS['relationships'][$relationship_name] as $field=>$value)
+			foreach ($GLOBALS['relationships'][$relationship_name] as $field=>$value)
 			{
 					$this->$field = $value;
 			}
@@ -224,20 +224,20 @@ 
 			$this->build_relationship_cache();
 		}
 		include(Relationship::cache_file_dir().'/'.Relationship::cache_file_name_only());
-		$GLOBALS['relationships']=$relationships;
+		$GLOBALS['relationships'] = $relationships;
 	}
 
 	function build_relationship_cache() {
-		$query="SELECT * from relationships where deleted=0";
-		$result=$this->db->query($query);
+		$query = "SELECT * from relationships where deleted=0";
+		$result = $this->db->query($query);
 
-		while (($row=$this->db->fetchByAssoc($result))!=null) {
+		while (($row = $this->db->fetchByAssoc($result)) != null) {
 			$relationships[$row['relationship_name']] = $row;
 		}
 
 		sugar_mkdir($this->cache_file_dir(), null, true);
-        $out = "<?php \n \$relationships = " . var_export($relationships, true) . ";";
-        sugar_file_put_contents_atomic(Relationship::cache_file_dir() . '/' . Relationship::cache_file_name_only(), $out);
+        $out = "<?php \n \$relationships = ".var_export($relationships, true).";";
+        sugar_file_put_contents_atomic(Relationship::cache_file_dir().'/'.Relationship::cache_file_name_only(), $out);
 
         require_once("data/Relationships/RelationshipFactory.php");
         SugarRelationshipFactory::deleteCache();
@@ -252,7 +252,7 @@ 
 	}
 
 	public static function delete_cache() {
-		$filename=Relationship::cache_file_dir().'/'.Relationship::cache_file_name_only();
+		$filename = Relationship::cache_file_dir().'/'.Relationship::cache_file_name_only();
 		if (file_exists($filename)) {
 			unlink($filename);
 		}
@@ -261,7 +261,7 @@ 
 	}
 
 
-	function trace_relationship_module($base_module, $rel_module1_name, $rel_module2_name=""){
+	function trace_relationship_module($base_module, $rel_module1_name, $rel_module2_name = "") {
 		global $beanList;
 		global $dictionary;
 
@@ -271,8 +271,8 @@ 
 		$rel_module1 = $this->get_other_module($rel_attribute1_name, $base_module, $temp_module->db);
 		$rel_module1_bean = get_module_info($rel_module1);
 
-		if($rel_module2_name!=""){
-			if($rel_module2_name == 'ProjectTask'){
+		if ($rel_module2_name != "") {
+			if ($rel_module2_name == 'ProjectTask') {
 				$rel_module2_name = strtolower($rel_module2_name);
 			}
 			$rel_attribute2_name = $rel_module1_bean->field_defs[strtolower($rel_module2_name)]['relationship'];

Braces +5 added lines, -5 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.
@@ -57,8 +59,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct($layout_manager);
@@ -71,8 +72,7 @@ 
 		if($this->getAssignedUser()) {
 			$begin = $timedate->handle_offset($layout_def['input_name0'], $timedate->get_db_date_time_format(), false, $this->assigned_user);
 			$end = $timedate->handle_offset($layout_def['input_name2'], $timedate->get_db_date_time_format(), false, $this->assigned_user);
-		}
-		else {
+		} else {
 			$begin = $layout_def['input_name0'];
 			$end = $layout_def['input_name1'];
 		}

modules/ProspectLists/ProspectList.php

Indentation +202 added lines, -202 removed lines

@@ -50,51 +50,51 @@ 
 
 
 class ProspectList extends SugarBean {
-	var $field_name_map;
-
-	// Stored fields
-	var $id;
-	var $date_entered;
-	var $date_modified;
-	var $modified_user_id;
-	var $assigned_user_id;
-	var $created_by;
-	var $created_by_name;
-	var $modified_by_name;
-	var $list_type;
-	var $domain_name;
-
-	var $name;
-	var $description;
-
-	// These are related
-	var $assigned_user_name;
-	var $prospect_id;
-	var $contact_id;
-	var $lead_id;
-
-	// module name definitions and table relations
-	var $table_name = "prospect_lists";
-	var $module_dir = 'ProspectLists';
-	var $rel_prospects_table = "prospect_lists_prospects";
-	var $object_name = "ProspectList";
-
-	// This is used to retrieve related fields from form posts.
-	var $additional_column_fields = array(
-		'assigned_user_name', 'assigned_user_id', 'campaign_id',
-	);
-	var $relationship_fields = array(
-		'campaign_id'=>'campaigns',
-		'prospect_list_prospects' => 'prospects',
-	);
+    var $field_name_map;
+
+    // Stored fields
+    var $id;
+    var $date_entered;
+    var $date_modified;
+    var $modified_user_id;
+    var $assigned_user_id;
+    var $created_by;
+    var $created_by_name;
+    var $modified_by_name;
+    var $list_type;
+    var $domain_name;
+
+    var $name;
+    var $description;
+
+    // These are related
+    var $assigned_user_name;
+    var $prospect_id;
+    var $contact_id;
+    var $lead_id;
+
+    // module name definitions and table relations
+    var $table_name = "prospect_lists";
+    var $module_dir = 'ProspectLists';
+    var $rel_prospects_table = "prospect_lists_prospects";
+    var $object_name = "ProspectList";
+
+    // This is used to retrieve related fields from form posts.
+    var $additional_column_fields = array(
+        'assigned_user_name', 'assigned_user_id', 'campaign_id',
+    );
+    var $relationship_fields = array(
+        'campaign_id'=>'campaigns',
+        'prospect_list_prospects' => 'prospects',
+    );
 
     var $entry_count;
 
     public function __construct() {
-		global $sugar_config;
-		parent::__construct();
+        global $sugar_config;
+        parent::__construct();
 
-	}
+    }
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
@@ -111,61 +111,61 @@ 
     }
 
 
-	var $new_schema = true;
+    var $new_schema = true;
 
-	function get_summary_text()
-	{
-		return "$this->name";
-	}
+    function get_summary_text()
+    {
+        return "$this->name";
+    }
 
-	function create_list_query($order_by, $where, $show_deleted = 0)
-	{
+    function create_list_query($order_by, $where, $show_deleted = 0)
+    {
         $custom_join = $this->getCustomJoin();
 
-		$query = "SELECT ";
-		$query .= "users.user_name as assigned_user_name, ";
-		$query .= "prospect_lists.*";
+        $query = "SELECT ";
+        $query .= "users.user_name as assigned_user_name, ";
+        $query .= "prospect_lists.*";
 
         $query .= $custom_join['select'];
-		$query .= " FROM prospect_lists ";
+        $query .= " FROM prospect_lists ";
 
-		$query .= "LEFT JOIN users
+        $query .= "LEFT JOIN users
 					ON prospect_lists.assigned_user_id=users.id ";
 
         $query .= $custom_join['join'];
 
-			$where_auto = '1=1';
-				if($show_deleted == 0){
-                	$where_auto = "$this->table_name.deleted=0";
-				}else if($show_deleted == 1){
-                	$where_auto = "$this->table_name.deleted=1";
-				}
+            $where_auto = '1=1';
+                if($show_deleted == 0){
+                    $where_auto = "$this->table_name.deleted=0";
+                }else if($show_deleted == 1){
+                    $where_auto = "$this->table_name.deleted=1";
+                }
 
-		if($where != "")
-			$query .= "where $where AND ".$where_auto;
-		else
-			$query .= "where ".$where_auto;
+        if($where != "")
+            $query .= "where $where AND ".$where_auto;
+        else
+            $query .= "where ".$where_auto;
 
-		if($order_by != "")
-			$query .= " ORDER BY $order_by";
-		else
-			$query .= " ORDER BY prospect_lists.name";
+        if($order_by != "")
+            $query .= " ORDER BY $order_by";
+        else
+            $query .= " ORDER BY prospect_lists.name";
 
-		return $query;
-	}
+        return $query;
+    }
 
 
-	function create_export_query($order_by, $where)
-	{
+    function create_export_query($order_by, $where)
+    {
 
                                 $query = "SELECT
                                 prospect_lists.*,
                                 users.user_name as assigned_user_name ";
-	                            $query .= "FROM prospect_lists ";
-		$query .= 				"LEFT JOIN users
+                                $query .= "FROM prospect_lists ";
+        $query .= 				"LEFT JOIN users
                                 ON prospect_lists.assigned_user_id=users.id ";
 
-		$where_auto = " prospect_lists.deleted=0";
+        $where_auto = " prospect_lists.deleted=0";
 
         if($where != "")
                 $query .= " WHERE $where AND ".$where_auto;
@@ -179,47 +179,47 @@ 
         return $query;
     }
 
-	function create_export_members_query($record_id)
-	{
-		$members = array(	'Accounts' 	=> array('has_custom_fields' => false, 'fields' => array()),
-					'Contacts' 	=> array('has_custom_fields' => false, 'fields' => array()),
-					'Users' 	=> array('has_custom_fields' => false, 'fields' => array()),
-					'Prospects' 	=> array('has_custom_fields' => false, 'fields' => array()),
-					'Leads' 	=> array('has_custom_fields' => false, 'fields' => array())
-				);
-
-		// query all custom fields in the fields_meta_data table for the modules which are being exported
-		$db = DBManagerFactory::getInstance();
-		$result = $db->query("select name, custom_module from fields_meta_data where custom_module in ('" .
-					implode("', '", array_keys($members)) . "')",
-					true,
-					"ProspectList::create_export_members_query() : error querying custom fields");
-
-		// cycle through the custom fields and put them in the members array according to
-		// what module the field belongs
-		// take into account that the same custom field may exist in more modules
-		while($val = $db->fetchByAssoc($result, false))
-		{
-			$fieldname = $val['name'];
-
-			foreach($members as $membername => &$memberarr)
-			{
-				// if the field belongs to this module, then query it in the cstm table
-				if ($membername == $val['custom_module'])
-				{
-					$memberarr['has_custom_fields'] = true;
-					$memberarr['fields'][$fieldname] =
-						strtolower($membername) . '_cstm.'.$fieldname . ' AS ' . $fieldname;
-				}
-				// else, only if for this module no entry exists for this field, query an empty string
-				else if (!isset($memberarr['fields'][$val['name']]))
-				{
-					$memberarr['fields'][$fieldname] = "'' AS " . $fieldname;
-				}
-			}
-		}
-
-		$leads_query = "SELECT l.id AS id, 'Leads' AS related_type, '' AS \"name\", l.first_name AS first_name, l.last_name AS last_name, l.title AS title, l.salutation AS salutation,
+    function create_export_members_query($record_id)
+    {
+        $members = array(	'Accounts' 	=> array('has_custom_fields' => false, 'fields' => array()),
+                    'Contacts' 	=> array('has_custom_fields' => false, 'fields' => array()),
+                    'Users' 	=> array('has_custom_fields' => false, 'fields' => array()),
+                    'Prospects' 	=> array('has_custom_fields' => false, 'fields' => array()),
+                    'Leads' 	=> array('has_custom_fields' => false, 'fields' => array())
+                );
+
+        // query all custom fields in the fields_meta_data table for the modules which are being exported
+        $db = DBManagerFactory::getInstance();
+        $result = $db->query("select name, custom_module from fields_meta_data where custom_module in ('" .
+                    implode("', '", array_keys($members)) . "')",
+                    true,
+                    "ProspectList::create_export_members_query() : error querying custom fields");
+
+        // cycle through the custom fields and put them in the members array according to
+        // what module the field belongs
+        // take into account that the same custom field may exist in more modules
+        while($val = $db->fetchByAssoc($result, false))
+        {
+            $fieldname = $val['name'];
+
+            foreach($members as $membername => &$memberarr)
+            {
+                // if the field belongs to this module, then query it in the cstm table
+                if ($membername == $val['custom_module'])
+                {
+                    $memberarr['has_custom_fields'] = true;
+                    $memberarr['fields'][$fieldname] =
+                        strtolower($membername) . '_cstm.'.$fieldname . ' AS ' . $fieldname;
+                }
+                // else, only if for this module no entry exists for this field, query an empty string
+                else if (!isset($memberarr['fields'][$val['name']]))
+                {
+                    $memberarr['fields'][$fieldname] = "'' AS " . $fieldname;
+                }
+            }
+        }
+
+        $leads_query = "SELECT l.id AS id, 'Leads' AS related_type, '' AS \"name\", l.first_name AS first_name, l.last_name AS last_name, l.title AS title, l.salutation AS salutation,
 				l.primary_address_street AS primary_address_street,l.primary_address_city AS primary_address_city, l.primary_address_state AS primary_address_state, l.primary_address_postalcode AS primary_address_postalcode, l.primary_address_country AS primary_address_country,
 				l.account_name AS account_name,
 				ea.email_address AS primary_email_address, ea.invalid_email AS invalid_email, ea.opt_out AS opt_out, ea.deleted AS ea_deleted, ear.deleted AS ear_deleted, ear.primary_address AS primary_address,
@@ -234,7 +234,7 @@ 
 				AND l.deleted=0
 				AND (ear.deleted=0 OR ear.deleted IS NULL)";
 
-		$users_query = "SELECT u.id AS id, 'Users' AS related_type, '' AS \"name\", u.first_name AS first_name, u.last_name AS last_name,u.title AS title, '' AS salutation,
+        $users_query = "SELECT u.id AS id, 'Users' AS related_type, '' AS \"name\", u.first_name AS first_name, u.last_name AS last_name,u.title AS title, '' AS salutation,
 				u.address_street AS primary_address_street,u.address_city AS primary_address_city, u.address_state AS primary_address_state,  u.address_postalcode AS primary_address_postalcode, u.address_country AS primary_address_country,
 				'' AS account_name,
 				ea.email_address AS email_address, ea.invalid_email AS invalid_email, ea.opt_out AS opt_out, ea.deleted AS ea_deleted, ear.deleted AS ear_deleted, ear.primary_address AS primary_address,
@@ -249,7 +249,7 @@ 
 				AND u.deleted=0
 				AND (ear.deleted=0 OR ear.deleted IS NULL)";
 
-		$contacts_query = "SELECT c.id AS id, 'Contacts' AS related_type, '' AS \"name\", c.first_name AS first_name, c.last_name AS last_name,c.title AS title, c.salutation AS salutation,
+        $contacts_query = "SELECT c.id AS id, 'Contacts' AS related_type, '' AS \"name\", c.first_name AS first_name, c.last_name AS last_name,c.title AS title, c.salutation AS salutation,
 				c.primary_address_street AS primary_address_street,c.primary_address_city AS primary_address_city, c.primary_address_state AS primary_address_state,  c.primary_address_postalcode AS primary_address_postalcode, c.primary_address_country AS primary_address_country,
 				a.name AS account_name,
 				ea.email_address AS email_address, ea.invalid_email AS invalid_email, ea.opt_out AS opt_out, ea.deleted AS ea_deleted, ear.deleted AS ear_deleted, ear.primary_address AS primary_address,
@@ -265,7 +265,7 @@ 
 				AND c.deleted=0
                 AND (ear.deleted=0 OR ear.deleted IS NULL)";
 
-		$prospects_query = "SELECT p.id AS id, 'Prospects' AS related_type, '' AS \"name\", p.first_name AS first_name, p.last_name AS last_name,p.title AS title, p.salutation AS salutation,
+        $prospects_query = "SELECT p.id AS id, 'Prospects' AS related_type, '' AS \"name\", p.first_name AS first_name, p.last_name AS last_name,p.title AS title, p.salutation AS salutation,
 				p.primary_address_street AS primary_address_street,p.primary_address_city AS primary_address_city, p.primary_address_state AS primary_address_state,  p.primary_address_postalcode AS primary_address_postalcode, p.primary_address_country AS primary_address_country,
 				p.account_name AS account_name,
 				ea.email_address AS email_address, ea.invalid_email AS invalid_email, ea.opt_out AS opt_out, ea.deleted AS ea_deleted, ear.deleted AS ear_deleted, ear.primary_address AS primary_address,
@@ -280,7 +280,7 @@ 
 				AND p.deleted=0
 				AND (ear.deleted=0 OR ear.deleted IS NULL)";
 
-		$accounts_query = "SELECT a.id AS id, 'Accounts' AS related_type, a.name AS \"name\", '' AS first_name, '' AS last_name,'' AS title, '' AS salutation,
+        $accounts_query = "SELECT a.id AS id, 'Accounts' AS related_type, a.name AS \"name\", '' AS first_name, '' AS last_name,'' AS title, '' AS salutation,
 				a.billing_address_street AS primary_address_street,a.billing_address_city AS primary_address_city, a.billing_address_state AS primary_address_state, a.billing_address_postalcode AS primary_address_postalcode, a.billing_address_country AS primary_address_country,
 				'' AS account_name,
 				ea.email_address AS email_address, ea.invalid_email AS invalid_email, ea.opt_out AS opt_out, ea.deleted AS ea_deleted, ear.deleted AS ear_deleted, ear.primary_address AS primary_address,
@@ -294,115 +294,115 @@ 
 				WHERE plp.prospect_list_id = $record_id  AND plp.deleted=0
 				AND a.deleted=0
 				AND (ear.deleted=0 OR ear.deleted IS NULL)";
-		$order_by = "ORDER BY related_type, id, primary_address DESC";
-		$query = "$leads_query UNION ALL $users_query UNION ALL $contacts_query UNION ALL $prospects_query UNION ALL $accounts_query $order_by";
-		return $query;
-	}
+        $order_by = "ORDER BY related_type, id, primary_address DESC";
+        $query = "$leads_query UNION ALL $users_query UNION ALL $contacts_query UNION ALL $prospects_query UNION ALL $accounts_query $order_by";
+        return $query;
+    }
 
-	function save_relationship_changes($is_update, $exclude = array())
+    function save_relationship_changes($is_update, $exclude = array())
     {
-    	parent::save_relationship_changes($is_update, $exclude);
-		if($this->lead_id != "")
-	   		$this->set_prospect_relationship($this->id, $this->lead_id, "lead");
-    	if($this->contact_id != "")
-    		$this->set_prospect_relationship($this->id, $this->contact_id, "contact");
-    	if($this->prospect_id != "")
-    		$this->set_prospect_relationship($this->id, $this->contact_id, "prospect");
+        parent::save_relationship_changes($is_update, $exclude);
+        if($this->lead_id != "")
+                $this->set_prospect_relationship($this->id, $this->lead_id, "lead");
+        if($this->contact_id != "")
+            $this->set_prospect_relationship($this->id, $this->contact_id, "contact");
+        if($this->prospect_id != "")
+            $this->set_prospect_relationship($this->id, $this->contact_id, "prospect");
     }
 
-	function set_prospect_relationship($prospect_list_id, &$link_ids, $link_name)
-	{
-		$link_field = sprintf("%s_id", $link_name);
+    function set_prospect_relationship($prospect_list_id, &$link_ids, $link_name)
+    {
+        $link_field = sprintf("%s_id", $link_name);
 
-		foreach($link_ids as $link_id)
-		{
-			$this->set_relationship('prospect_lists_prospects', array( $link_field=>$link_id, 'prospect_list_id'=>$prospect_list_id ));
-		}
-	}
+        foreach($link_ids as $link_id)
+        {
+            $this->set_relationship('prospect_lists_prospects', array( $link_field=>$link_id, 'prospect_list_id'=>$prospect_list_id ));
+        }
+    }
 
-	function set_prospect_relationship_single($prospect_list_id, $link_id, $link_name)
-	{
-		$link_field = sprintf("%s_id", $link_name);
+    function set_prospect_relationship_single($prospect_list_id, $link_id, $link_name)
+    {
+        $link_field = sprintf("%s_id", $link_name);
 
-		$this->set_relationship('prospect_lists_prospects', array( $link_field=>$link_id, 'prospect_list_id'=>$prospect_list_id ));
-	}
+        $this->set_relationship('prospect_lists_prospects', array( $link_field=>$link_id, 'prospect_list_id'=>$prospect_list_id ));
+    }
 
 
-	function clear_prospect_relationship($prospect_list_id, $link_id, $link_name)
-	{
-		$link_field = sprintf("%s_id", $link_name);
-		$where_clause = " AND $link_field = '$link_id' ";
+    function clear_prospect_relationship($prospect_list_id, $link_id, $link_name)
+    {
+        $link_field = sprintf("%s_id", $link_name);
+        $where_clause = " AND $link_field = '$link_id' ";
 
-		$query = sprintf("DELETE FROM prospect_lists_prospects WHERE prospect_list_id='%s' AND deleted = '0' %s", $prospect_list_id, $where_clause);
+        $query = sprintf("DELETE FROM prospect_lists_prospects WHERE prospect_list_id='%s' AND deleted = '0' %s", $prospect_list_id, $where_clause);
 
-		$this->db->query($query, true, "Error clearing prospect/prospect_list relationship: ");
-	}
+        $this->db->query($query, true, "Error clearing prospect/prospect_list relationship: ");
+    }
 
 
-	function mark_relationships_deleted($id)
-	{
-	}
+    function mark_relationships_deleted($id)
+    {
+    }
 
-	function fill_in_additional_list_fields()
-	{
-	}
+    function fill_in_additional_list_fields()
+    {
+    }
 
-	function fill_in_additional_detail_fields()
-	{
-		parent::fill_in_additional_detail_fields();
+    function fill_in_additional_detail_fields()
+    {
+        parent::fill_in_additional_detail_fields();
         $this->entry_count = $this->get_entry_count();
-	}
+    }
 
 
-	function update_currency_id($fromid, $toid){
-	}
+    function update_currency_id($fromid, $toid){
+    }
 
 
-	function get_entry_count()
-	{
-		$query = "SELECT count(*) AS num FROM prospect_lists_prospects WHERE prospect_list_id='$this->id' AND deleted = '0'";
-		$result = $this->db->query($query, true, "Grabbing prospect_list entry count");
+    function get_entry_count()
+    {
+        $query = "SELECT count(*) AS num FROM prospect_lists_prospects WHERE prospect_list_id='$this->id' AND deleted = '0'";
+        $result = $this->db->query($query, true, "Grabbing prospect_list entry count");
 
-		$row = $this->db->fetchByAssoc($result);
+        $row = $this->db->fetchByAssoc($result);
 
-		if($row)
-			return $row['num'];
-		else
-			return 0;
-	}
+        if($row)
+            return $row['num'];
+        else
+            return 0;
+    }
 
 
-	function get_list_view_data(){
-		$temp_array = $this->get_list_view_array();
-		$temp_array["ENTRY_COUNT"] = $this->get_entry_count();
-		return $temp_array;
-	}
-	/**
+    function get_list_view_data(){
+        $temp_array = $this->get_list_view_array();
+        $temp_array["ENTRY_COUNT"] = $this->get_entry_count();
+        return $temp_array;
+    }
+    /**
 		builds a generic search based on the query string using or
 		do not include any $this-> because this is called on without having the class instantiated
-	*/
-	function build_generic_where_clause ($the_query_string)
-	{
-		$where_clauses = Array();
-		$the_query_string = $GLOBALS['db']->quote($the_query_string);
-		array_push($where_clauses, "prospect_lists.name like '$the_query_string%'");
-
-		$the_where = "";
-		foreach($where_clauses as $clause)
-		{
-			if($the_where != "") $the_where .= " or ";
-			$the_where .= $clause;
-		}
+     */
+    function build_generic_where_clause ($the_query_string)
+    {
+        $where_clauses = Array();
+        $the_query_string = $GLOBALS['db']->quote($the_query_string);
+        array_push($where_clauses, "prospect_lists.name like '$the_query_string%'");
+
+        $the_where = "";
+        foreach($where_clauses as $clause)
+        {
+            if($the_where != "") $the_where .= " or ";
+            $the_where .= $clause;
+        }
 
 
-		return $the_where;
-	}
+        return $the_where;
+    }
 
-	function save($check_notify = FALSE) {
+    function save($check_notify = FALSE) {
 
-		return parent::save($check_notify);
+        return parent::save($check_notify);
 
-	}
+    }
 
     function mark_deleted($id){
         $query = "UPDATE prospect_lists_prospects SET deleted = 1 WHERE prospect_list_id = '{$id}' ";
@@ -410,12 +410,12 @@ 
         return parent::mark_deleted($id);
     }
 
-	 function bean_implements($interface){
-		switch($interface){
-			case 'ACL':return true;
-		}
-		return false;
-	}
+        function bean_implements($interface){
+        switch($interface){
+            case 'ACL':return true;
+        }
+        return false;
+    }
 
 }
 

Spacing +37 added lines, -37 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -99,9 +99,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    public function ProspectList(){
+    public function ProspectList() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -135,18 +135,18 @@ 
         $query .= $custom_join['join'];
 
 			$where_auto = '1=1';
-				if($show_deleted == 0){
+				if ($show_deleted == 0) {
                 	$where_auto = "$this->table_name.deleted=0";
-				}else if($show_deleted == 1){
+				} else if ($show_deleted == 1) {
                 	$where_auto = "$this->table_name.deleted=1";
 				}
 
-		if($where != "")
+		if ($where != "")
 			$query .= "where $where AND ".$where_auto;
 		else
 			$query .= "where ".$where_auto;
 
-		if($order_by != "")
+		if ($order_by != "")
 			$query .= " ORDER BY $order_by";
 		else
 			$query .= " ORDER BY prospect_lists.name";
@@ -162,17 +162,17 @@ 
                                 prospect_lists.*,
                                 users.user_name as assigned_user_name ";
 	                            $query .= "FROM prospect_lists ";
-		$query .= 				"LEFT JOIN users
+		$query .= "LEFT JOIN users
                                 ON prospect_lists.assigned_user_id=users.id ";
 
 		$where_auto = " prospect_lists.deleted=0";
 
-        if($where != "")
+        if ($where != "")
                 $query .= " WHERE $where AND ".$where_auto;
         else
                 $query .= " WHERE ".$where_auto;
 
-        if($order_by != "")
+        if ($order_by != "")
                 $query .= " ORDER BY $order_by";
         else
                 $query .= " ORDER BY prospect_lists.name";
@@ -181,7 +181,7 @@ 
 
 	function create_export_members_query($record_id)
 	{
-		$members = array(	'Accounts' 	=> array('has_custom_fields' => false, 'fields' => array()),
+		$members = array('Accounts' 	=> array('has_custom_fields' => false, 'fields' => array()),
 					'Contacts' 	=> array('has_custom_fields' => false, 'fields' => array()),
 					'Users' 	=> array('has_custom_fields' => false, 'fields' => array()),
 					'Prospects' 	=> array('has_custom_fields' => false, 'fields' => array()),
@@ -190,31 +190,31 @@ 
 
 		// query all custom fields in the fields_meta_data table for the modules which are being exported
 		$db = DBManagerFactory::getInstance();
-		$result = $db->query("select name, custom_module from fields_meta_data where custom_module in ('" .
-					implode("', '", array_keys($members)) . "')",
+		$result = $db->query("select name, custom_module from fields_meta_data where custom_module in ('".
+					implode("', '", array_keys($members))."')",
 					true,
 					"ProspectList::create_export_members_query() : error querying custom fields");
 
 		// cycle through the custom fields and put them in the members array according to
 		// what module the field belongs
 		// take into account that the same custom field may exist in more modules
-		while($val = $db->fetchByAssoc($result, false))
+		while ($val = $db->fetchByAssoc($result, false))
 		{
 			$fieldname = $val['name'];
 
-			foreach($members as $membername => &$memberarr)
+			foreach ($members as $membername => &$memberarr)
 			{
 				// if the field belongs to this module, then query it in the cstm table
 				if ($membername == $val['custom_module'])
 				{
 					$memberarr['has_custom_fields'] = true;
 					$memberarr['fields'][$fieldname] =
-						strtolower($membername) . '_cstm.'.$fieldname . ' AS ' . $fieldname;
+						strtolower($membername).'_cstm.'.$fieldname.' AS '.$fieldname;
 				}
 				// else, only if for this module no entry exists for this field, query an empty string
 				else if (!isset($memberarr['fields'][$val['name']]))
 				{
-					$memberarr['fields'][$fieldname] = "'' AS " . $fieldname;
+					$memberarr['fields'][$fieldname] = "'' AS ".$fieldname;
 				}
 			}
 		}
@@ -224,7 +224,7 @@ 
 				l.account_name AS account_name,
 				ea.email_address AS primary_email_address, ea.invalid_email AS invalid_email, ea.opt_out AS opt_out, ea.deleted AS ea_deleted, ear.deleted AS ear_deleted, ear.primary_address AS primary_address,
 				l.do_not_call AS do_not_call, l.phone_fax AS phone_fax, l.phone_other AS phone_other, l.phone_home AS phone_home, l.phone_mobile AS phone_mobile, l.phone_work AS phone_work
-				".(count($members['Leads']['fields']) ? ', ' : '') . implode(', ', $members['Leads']['fields'])."
+				".(count($members['Leads']['fields']) ? ', ' : '').implode(', ', $members['Leads']['fields'])."
 				FROM prospect_lists_prospects plp
 				INNER JOIN leads l ON plp.related_id=l.id
 				".($members['Leads']['has_custom_fields'] ? 'LEFT join leads_cstm ON l.id = leads_cstm.id_c' : '')."
@@ -239,7 +239,7 @@ 
 				'' AS account_name,
 				ea.email_address AS email_address, ea.invalid_email AS invalid_email, ea.opt_out AS opt_out, ea.deleted AS ea_deleted, ear.deleted AS ear_deleted, ear.primary_address AS primary_address,
 				0 AS do_not_call, u.phone_fax AS phone_fax, u.phone_other AS phone_other, u.phone_home AS phone_home, u.phone_mobile AS phone_mobile, u.phone_work AS phone_work
-				".(count($members['Users']['fields']) ? ', ' : '') . implode(', ', $members['Users']['fields'])."
+				".(count($members['Users']['fields']) ? ', ' : '').implode(', ', $members['Users']['fields'])."
 				FROM prospect_lists_prospects plp
 				INNER JOIN users u ON plp.related_id=u.id
 				".($members['Users']['has_custom_fields'] ? 'LEFT join users_cstm ON u.id = users_cstm.id_c' : '')."
@@ -254,7 +254,7 @@ 
 				a.name AS account_name,
 				ea.email_address AS email_address, ea.invalid_email AS invalid_email, ea.opt_out AS opt_out, ea.deleted AS ea_deleted, ear.deleted AS ear_deleted, ear.primary_address AS primary_address,
 				c.do_not_call AS do_not_call, c.phone_fax AS phone_fax, c.phone_other AS phone_other, c.phone_home AS phone_home, c.phone_mobile AS phone_mobile, c.phone_work AS phone_work
-				".(count($members['Contacts']['fields']) ? ', ' : '') . implode(', ', $members['Contacts']['fields'])."
+				".(count($members['Contacts']['fields']) ? ', ' : '').implode(', ', $members['Contacts']['fields'])."
 FROM prospect_lists_prospects plp
 				INNER JOIN contacts c ON plp.related_id=c.id LEFT JOIN accounts_contacts ac ON ac.contact_id=c.id
 				LEFT JOIN accounts a ON ac.account_id=a.id AND ac.deleted=0
@@ -270,7 +270,7 @@ 
 				p.account_name AS account_name,
 				ea.email_address AS email_address, ea.invalid_email AS invalid_email, ea.opt_out AS opt_out, ea.deleted AS ea_deleted, ear.deleted AS ear_deleted, ear.primary_address AS primary_address,
 				p.do_not_call AS do_not_call, p.phone_fax AS phone_fax, p.phone_other AS phone_other, p.phone_home AS phone_home, p.phone_mobile AS phone_mobile, p.phone_work AS phone_work
-				".(count($members['Prospects']['fields']) ? ', ' : '') . implode(', ', $members['Prospects']['fields'])."
+				".(count($members['Prospects']['fields']) ? ', ' : '').implode(', ', $members['Prospects']['fields'])."
 				FROM prospect_lists_prospects plp
 				INNER JOIN prospects p ON plp.related_id=p.id
 				".($members['Prospects']['has_custom_fields'] ? 'LEFT join prospects_cstm ON p.id = prospects_cstm.id_c' : '')."
@@ -285,7 +285,7 @@ 
 				'' AS account_name,
 				ea.email_address AS email_address, ea.invalid_email AS invalid_email, ea.opt_out AS opt_out, ea.deleted AS ea_deleted, ear.deleted AS ear_deleted, ear.primary_address AS primary_address,
 				0 AS do_not_call, a.phone_fax as phone_fax, a.phone_alternate AS phone_other, '' AS phone_home, '' AS phone_mobile, a.phone_office AS phone_office
-				".(count($members['Accounts']['fields']) ? ', ' : '') . implode(', ', $members['Accounts']['fields'])."
+				".(count($members['Accounts']['fields']) ? ', ' : '').implode(', ', $members['Accounts']['fields'])."
 				FROM prospect_lists_prospects plp
 				INNER JOIN accounts a ON plp.related_id=a.id
 				".($members['Accounts']['has_custom_fields'] ? 'LEFT join accounts_cstm ON a.id = accounts_cstm.id_c' : '')."
@@ -302,11 +302,11 @@ 
 	function save_relationship_changes($is_update, $exclude = array())
     {
     	parent::save_relationship_changes($is_update, $exclude);
-		if($this->lead_id != "")
+		if ($this->lead_id != "")
 	   		$this->set_prospect_relationship($this->id, $this->lead_id, "lead");
-    	if($this->contact_id != "")
+    	if ($this->contact_id != "")
     		$this->set_prospect_relationship($this->id, $this->contact_id, "contact");
-    	if($this->prospect_id != "")
+    	if ($this->prospect_id != "")
     		$this->set_prospect_relationship($this->id, $this->contact_id, "prospect");
     }
 
@@ -314,9 +314,9 @@ 
 	{
 		$link_field = sprintf("%s_id", $link_name);
 
-		foreach($link_ids as $link_id)
+		foreach ($link_ids as $link_id)
 		{
-			$this->set_relationship('prospect_lists_prospects', array( $link_field=>$link_id, 'prospect_list_id'=>$prospect_list_id ));
+			$this->set_relationship('prospect_lists_prospects', array($link_field=>$link_id, 'prospect_list_id'=>$prospect_list_id));
 		}
 	}
 
@@ -324,7 +324,7 @@ 
 	{
 		$link_field = sprintf("%s_id", $link_name);
 
-		$this->set_relationship('prospect_lists_prospects', array( $link_field=>$link_id, 'prospect_list_id'=>$prospect_list_id ));
+		$this->set_relationship('prospect_lists_prospects', array($link_field=>$link_id, 'prospect_list_id'=>$prospect_list_id));
 	}
 
 
@@ -354,7 +354,7 @@ 
 	}
 
 
-	function update_currency_id($fromid, $toid){
+	function update_currency_id($fromid, $toid) {
 	}
 
 
@@ -365,14 +365,14 @@ 
 
 		$row = $this->db->fetchByAssoc($result);
 
-		if($row)
+		if ($row)
 			return $row['num'];
 		else
 			return 0;
 	}
 
 
-	function get_list_view_data(){
+	function get_list_view_data() {
 		$temp_array = $this->get_list_view_array();
 		$temp_array["ENTRY_COUNT"] = $this->get_entry_count();
 		return $temp_array;
@@ -381,16 +381,16 @@ 
 		builds a generic search based on the query string using or
 		do not include any $this-> because this is called on without having the class instantiated
 	*/
-	function build_generic_where_clause ($the_query_string)
+	function build_generic_where_clause($the_query_string)
 	{
 		$where_clauses = Array();
 		$the_query_string = $GLOBALS['db']->quote($the_query_string);
 		array_push($where_clauses, "prospect_lists.name like '$the_query_string%'");
 
 		$the_where = "";
-		foreach($where_clauses as $clause)
+		foreach ($where_clauses as $clause)
 		{
-			if($the_where != "") $the_where .= " or ";
+			if ($the_where != "") $the_where .= " or ";
 			$the_where .= $clause;
 		}
 
@@ -404,14 +404,14 @@ 
 
 	}
 
-    function mark_deleted($id){
+    function mark_deleted($id) {
         $query = "UPDATE prospect_lists_prospects SET deleted = 1 WHERE prospect_list_id = '{$id}' ";
         $this->db->query($query);
         return parent::mark_deleted($id);
     }
 
-	 function bean_implements($interface){
-		switch($interface){
+	 function bean_implements($interface) {
+		switch ($interface) {
 			case 'ACL':return true;
 		}
 		return false;

Braces +42 added lines, -31 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -103,8 +105,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();
@@ -137,19 +138,21 @@ 
 			$where_auto = '1=1';
 				if($show_deleted == 0){
                 	$where_auto = "$this->table_name.deleted=0";
-				}else if($show_deleted == 1){
+				} else if($show_deleted == 1){
                 	$where_auto = "$this->table_name.deleted=1";
 				}
 
-		if($where != "")
-			$query .= "where $where AND ".$where_auto;
-		else
-			$query .= "where ".$where_auto;
+		if($where != "") {
+					$query .= "where $where AND ".$where_auto;
+		} else {
+					$query .= "where ".$where_auto;
+		}
 
-		if($order_by != "")
-			$query .= " ORDER BY $order_by";
-		else
-			$query .= " ORDER BY prospect_lists.name";
+		if($order_by != "") {
+					$query .= " ORDER BY $order_by";
+		} else {
+					$query .= " ORDER BY prospect_lists.name";
+		}
 
 		return $query;
 	}
@@ -167,15 +170,17 @@ 
 
 		$where_auto = " prospect_lists.deleted=0";
 
-        if($where != "")
-                $query .= " WHERE $where AND ".$where_auto;
-        else
-                $query .= " WHERE ".$where_auto;
+        if($where != "") {
+                        $query .= " WHERE $where AND ".$where_auto;
+        } else {
+                        $query .= " WHERE ".$where_auto;
+        }
 
-        if($order_by != "")
-                $query .= " ORDER BY $order_by";
-        else
-                $query .= " ORDER BY prospect_lists.name";
+        if($order_by != "") {
+                        $query .= " ORDER BY $order_by";
+        } else {
+                        $query .= " ORDER BY prospect_lists.name";
+        }
         return $query;
     }
 
@@ -302,12 +307,15 @@ 
 	function save_relationship_changes($is_update, $exclude = array())
     {
     	parent::save_relationship_changes($is_update, $exclude);
-		if($this->lead_id != "")
-	   		$this->set_prospect_relationship($this->id, $this->lead_id, "lead");
-    	if($this->contact_id != "")
-    		$this->set_prospect_relationship($this->id, $this->contact_id, "contact");
-    	if($this->prospect_id != "")
-    		$this->set_prospect_relationship($this->id, $this->contact_id, "prospect");
+		if($this->lead_id != "") {
+			   		$this->set_prospect_relationship($this->id, $this->lead_id, "lead");
+		}
+    	if($this->contact_id != "") {
+    	    		$this->set_prospect_relationship($this->id, $this->contact_id, "contact");
+    	}
+    	if($this->prospect_id != "") {
+    	    		$this->set_prospect_relationship($this->id, $this->contact_id, "prospect");
+    	}
     }
 
 	function set_prospect_relationship($prospect_list_id, &$link_ids, $link_name)
@@ -365,10 +373,11 @@ 
 
 		$row = $this->db->fetchByAssoc($result);
 
-		if($row)
-			return $row['num'];
-		else
-			return 0;
+		if($row) {
+					return $row['num'];
+		} else {
+					return 0;
+		}
 	}
 
 
@@ -390,7 +399,9 @@ 
 		$the_where = "";
 		foreach($where_clauses as $clause)
 		{
-			if($the_where != "") $the_where .= " or ";
+			if($the_where != "") {
+			    $the_where .= " or ";
+			}
 			$the_where .= $clause;
 		}
 

modules/Leads/LeadsJjwg_MapsLogicHook.php

Spacing +2 added lines, -2 removed lines

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

Braces +3 added lines, -3 removed lines

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