adamjakab / SuiteCRM

include/SugarFields/Fields/Base/SugarFieldBase.php

Doc Comments +9 added lines

@@ -114,11 +114,17 @@ 
     }
 
 
+    /**
+     * @return string
+     */
     public function unformatField($formattedField, $vardef){
         // The base field doesn't do any formatting, so override it in subclasses for more specific actions
         return $formattedField;
     }
 
+    /**
+     * @param string $view
+     */
     function getSmartyView($parentFieldArray, $vardef, $displayParams, $tabindex = -1, $view){
     	$this->setup($parentFieldArray, $vardef, $displayParams, $tabindex);
 
@@ -376,6 +382,9 @@ 
 
     }
 
+    /**
+     * @param string $fieldType
+     */
     protected function getAccessKey($vardef, $fieldType = null, $module = null) {
         global $app_strings;
 

Spacing +84 added lines, -84 removed lines

@@ -54,9 +54,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 SugarFieldBase($type){
+    function SugarFieldBase($type) {
         $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 {
@@ -65,55 +65,55 @@ 
         self::__construct($type);
     }
 
-    function fetch($path){
+    function fetch($path) {
     	$additional = '';
-    	if(!$this->hasButton && !empty($this->button)){
-    		$additional .= '<input type="button" class="button" ' . $this->button . '>';
+    	if (!$this->hasButton && !empty($this->button)) {
+    		$additional .= '<input type="button" class="button" '.$this->button.'>';
     	}
-        if(!empty($this->buttons)){
-            foreach($this->buttons as $v){
-                $additional .= ' <input type="button" class="button" ' . $v . '>';
+        if (!empty($this->buttons)) {
+            foreach ($this->buttons as $v) {
+                $additional .= ' <input type="button" class="button" '.$v.'>';
             }
 
         }
-        if(!empty($this->image)){
-            $additional .= ' <img ' . $this->image . '>';
+        if (!empty($this->image)) {
+            $additional .= ' <img '.$this->image.'>';
         }
-    	return $this->ss->fetch($path) . $additional;
+    	return $this->ss->fetch($path).$additional;
     }
 
-    function findTemplate($view){
+    function findTemplate($view) {
         static $tplCache = array();
 
-        if ( isset($tplCache[$this->type][$view]) ) {
+        if (isset($tplCache[$this->type][$view])) {
             return $tplCache[$this->type][$view];
         }
 
         $lastClass = get_class($this);
-        $classList = array($this->type,str_replace('SugarField','',$lastClass));
-        while ( $lastClass = get_parent_class($lastClass) ) {
-            $classList[] = str_replace('SugarField','',$lastClass);
+        $classList = array($this->type, str_replace('SugarField', '', $lastClass));
+        while ($lastClass = get_parent_class($lastClass)) {
+            $classList[] = str_replace('SugarField', '', $lastClass);
         }
 
         $tplName = '';
-        foreach ( $classList as $className ) {
+        foreach ($classList as $className) {
             global $current_language;
-            if(isset($current_language)) {
-                $tplName = 'include/SugarFields/Fields/'. $className .'/'. $current_language . '.' . $view .'.tpl';
-                if ( file_exists('custom/'.$tplName) ) {
+            if (isset($current_language)) {
+                $tplName = 'include/SugarFields/Fields/'.$className.'/'.$current_language.'.'.$view.'.tpl';
+                if (file_exists('custom/'.$tplName)) {
                     $tplName = 'custom/'.$tplName;
                     break;
                 }
-                if ( file_exists($tplName) ) {
+                if (file_exists($tplName)) {
                     break;
                 }
             }
-            $tplName = 'include/SugarFields/Fields/'. $className .'/'. $view .'.tpl';
-            if ( file_exists('custom/'.$tplName) ) {
+            $tplName = 'include/SugarFields/Fields/'.$className.'/'.$view.'.tpl';
+            if (file_exists('custom/'.$tplName)) {
                 $tplName = 'custom/'.$tplName;
                 break;
             }
-            if ( file_exists($tplName) ) {
+            if (file_exists($tplName)) {
                 break;
             }
         }
@@ -123,18 +123,18 @@ 
         return $tplName;
     }
 
-    public function formatField($rawField, $vardef){
+    public function formatField($rawField, $vardef) {
         // The base field doesn't do any formatting, so override it in subclasses for more specific actions
         return $rawField;
     }
 
 
-    public function unformatField($formattedField, $vardef){
+    public function unformatField($formattedField, $vardef) {
         // The base field doesn't do any formatting, so override it in subclasses for more specific actions
         return $formattedField;
     }
 
-    function getSmartyView($parentFieldArray, $vardef, $displayParams, $tabindex = -1, $view){
+    function getSmartyView($parentFieldArray, $vardef, $displayParams, $tabindex = -1, $view) {
     	$this->setup($parentFieldArray, $vardef, $displayParams, $tabindex);
 
 
@@ -158,7 +158,7 @@ 
 
         $this->ss->left_delimiter = '{';
         $this->ss->right_delimiter = '}';
-        $this->ss->assign('col',$vardef['name']);
+        $this->ss->assign('col', $vardef['name']);
 
         return $this->fetch($this->findTemplate('ListView'));
     }
@@ -179,15 +179,15 @@ 
 
  	// 99% of all fields will just format like a listview, but just in case, it's here to override
     function getChangeLogSmarty($parentFieldArray, $vardef, $displayParams, $tabindex) {
-        return $this->formatField($parentFieldArray[$vardef['name']],$vardef);
+        return $this->formatField($parentFieldArray[$vardef['name']], $vardef);
     }
 
 
     function getEditViewSmarty($parentFieldArray, $vardef, $displayParams, $tabindex) {
-    	if(!empty($vardef['function']['returns']) && $vardef['function']['returns'] == 'html'){
+    	if (!empty($vardef['function']['returns']) && $vardef['function']['returns'] == 'html') {
     		$type = $this->type;
     		$this->type = 'Base';
-    		$result= $this->getDetailViewSmarty($parentFieldArray, $vardef, $displayParams, $tabindex);
+    		$result = $this->getDetailViewSmarty($parentFieldArray, $vardef, $displayParams, $tabindex);
     		$this->type = $type;
     		return $result;
     	}
@@ -208,11 +208,11 @@ 
 
 
     function getSearchViewSmarty($parentFieldArray, $vardef, $displayParams, $tabindex) {
-		if(!empty($vardef['auto_increment']))$vardef['len']=255;
+		if (!empty($vardef['auto_increment']))$vardef['len'] = 255;
     	return $this->getSmartyView($parentFieldArray, $vardef, $displayParams, $tabindex, 'EditView');
     }
 
-    function getPopupViewSmarty($parentFieldArray, $vardef, $displayParams, $tabindex){
+    function getPopupViewSmarty($parentFieldArray, $vardef, $displayParams, $tabindex) {
     	 if (is_array($displayParams) && !isset($displayParams['formName']))
 		     $displayParams['formName'] = 'popup_query_form';
 	     else if (empty($displayParams))
@@ -220,14 +220,14 @@ 
 		 return $this->getSearchViewSmarty($parentFieldArray, $vardef, $displayParams, $tabindex);
     }
 
-    public function getEmailTemplateValue($inputField, $vardef, $context = null){
+    public function getEmailTemplateValue($inputField, $vardef, $context = null) {
         // This does not return a smarty section, instead it returns a direct value
-        return $this->formatField($inputField,$vardef);
+        return $this->formatField($inputField, $vardef);
     }
 
-    function displayFromFunc( $displayType, $parentFieldArray, $vardef, $displayParams, $tabindex = 0 ) {
+    function displayFromFunc($displayType, $parentFieldArray, $vardef, $displayParams, $tabindex = 0) {
 
-        if ( ! is_array($vardef['function']) ) {
+        if (!is_array($vardef['function'])) {
             $funcName = $vardef['function'];
             $includeFile = '';
             $onListView = false;
@@ -235,28 +235,28 @@ 
         } else {
             $funcName = $vardef['function']['name'];
             $includeFile = '';
-            if ( isset($vardef['function']['include']) ) {
+            if (isset($vardef['function']['include'])) {
                 $includeFile = $vardef['function']['include'];
             }
-            if ( isset($vardef['function']['onListView']) && $vardef['function']['onListView'] == true ) {
+            if (isset($vardef['function']['onListView']) && $vardef['function']['onListView'] == true) {
                 $onListView = true;
             } else {
                 $onListView = false;
             }
-            if ( isset($vardef['function']['returns']) && $vardef['function']['returns'] == 'html' ) {
+            if (isset($vardef['function']['returns']) && $vardef['function']['returns'] == 'html') {
                 $returnsHtml = true;
             } else {
                 $returnsHtml = false;
             }
         }
 
-        if ( $displayType == 'ListView'
+        if ($displayType == 'ListView'
                 || $displayType == 'popupView'
                 || $displayType == 'searchView'
                 ) {
             // Traditionally, before 6.0, additional functions were never called, so this code doesn't get called unless the vardef forces it
-            if ( $onListView ) {
-                if ( !empty($includeFile) ) {
+            if ($onListView) {
+                if (!empty($includeFile)) {
                     require_once($includeFile);
                 }
 
@@ -266,19 +266,19 @@ 
                 return $this->$displayTypeFunc($parentFieldArray, $vardef, $displayParams, $tabindex);
             }
         } else {
-            if ( !empty($displayParams['idName']) ) {
+            if (!empty($displayParams['idName'])) {
                 $fieldName = $displayParams['idName'];
             } else {
                 $fieldName = $vardef['name'];
             }
-            if ( $returnsHtml ) {
+            if ($returnsHtml) {
                 $this->setup($parentFieldArray, $vardef, $displayParams, $tabindex);
                 $tpl = $this->findTemplate($displayType.'Function');
-                if ( $tpl == '' ) {
+                if ($tpl == '') {
                     // Can't find a function template, just use the base
                     $tpl = $this->findTemplate('DetailViewFunction');
                 }
-                return "<span id='{$vardef['name']}_span'>" . $this->fetch($tpl) . '</span>';
+                return "<span id='{$vardef['name']}_span'>".$this->fetch($tpl).'</span>';
             } else {
                 return '{sugar_run_helper include="'.$includeFile.'" func="'.$funcName.'" bean=$bean field="'.$fieldName.'" value=$fields.'.$fieldName.'.value displayType="'.$displayType.'"}';
             }
@@ -311,10 +311,10 @@ 
      * @param $args Mixed value containing haystack to search for value in
      * @return $value Mixed value that the SugarField should return
      */
-    function getSearchInput($key='', $args=array())
+    function getSearchInput($key = '', $args = array())
     {
     	//Nothing specified return empty string
-    	if(empty($key) || empty($args))
+    	if (empty($key) || empty($args))
     	{
     		return '';
     	}
@@ -332,7 +332,7 @@ 
     /**
      * Setup function to assign values to the smarty template, should be called before every display function
      */
-    function setup($parentFieldArray, $vardef, $displayParams, $tabindex, $twopass=true) {
+    function setup($parentFieldArray, $vardef, $displayParams, $tabindex, $twopass = true) {
     	$this->button = '';
     	$this->buttons = '';
     	$this->image = '';
@@ -352,36 +352,36 @@ 
 
         //for adding attributes to the field
 
-        if(!empty($displayParams['field'])){
+        if (!empty($displayParams['field'])) {
         	$plusField = '';
-        	foreach($displayParams['field'] as $key=>$value){
-        		$plusField .= ' ' . $key . '="' . $value . '"';//bug 27381
+        	foreach ($displayParams['field'] as $key=>$value) {
+        		$plusField .= ' '.$key.'="'.$value.'"'; //bug 27381
         	}
         	$displayParams['field'] = $plusField;
         }
         //for adding attributes to the button
-    	if(!empty($displayParams['button'])){
+    	if (!empty($displayParams['button'])) {
         	$plusField = '';
-        	foreach($displayParams['button'] as $key=>$value){
-        		$plusField .= ' ' . $key . '="' . $value . '"';
+        	foreach ($displayParams['button'] as $key=>$value) {
+        		$plusField .= ' '.$key.'="'.$value.'"';
         	}
         	$displayParams['button'] = $plusField;
         	$this->button = $displayParams['button'];
         }
-        if(!empty($displayParams['buttons'])){
+        if (!empty($displayParams['buttons'])) {
             $plusField = '';
-            foreach($displayParams['buttons'] as $keys=>$values){
-                foreach($values as $key=>$value){
-                    $plusField[$keys] .= ' ' . $key . '="' . $value . '"';
+            foreach ($displayParams['buttons'] as $keys=>$values) {
+                foreach ($values as $key=>$value) {
+                    $plusField[$keys] .= ' '.$key.'="'.$value.'"';
                 }
             }
             $displayParams['buttons'] = $plusField;
             $this->buttons = $displayParams['buttons'];
         }
-        if(!empty($displayParams['image'])){
+        if (!empty($displayParams['image'])) {
             $plusField = '';
-            foreach($displayParams['image'] as $key=>$value){
-                $plusField .= ' ' . $key . '="' . $value . '"';
+            foreach ($displayParams['image'] as $key=>$value) {
+                $plusField .= ' '.$key.'="'.$value.'"';
             }
             $displayParams['image'] = $plusField;
             $this->image = $displayParams['image'];
@@ -401,38 +401,38 @@ 
         );
 
         // Labels are always in uppercase
-        if ( isset($fieldType) ) {
+        if (isset($fieldType)) {
             $fieldType = strtoupper($fieldType);
         }
 
-        if ( isset($module) ) {
+        if (isset($module)) {
             $module = strtoupper($module);
         }
 
         // The vardef is the most specific, then the module + fieldType, then the module, then the fieldType
-        if ( isset($vardef['accessKey']) ) {
+        if (isset($vardef['accessKey'])) {
             $labelList['accessKey'][] = $vardef['accessKey'];
         }
-        if ( isset($vardef['accessKeySelect']) ) {
+        if (isset($vardef['accessKeySelect'])) {
             $labelList['accessKeySelect'][] = $vardef['accessKeySelect'];
         }
-        if ( isset($vardef['accessKeyClear']) ) {
+        if (isset($vardef['accessKeyClear'])) {
             $labelList['accessKeyClear'][] = $vardef['accessKeyClear'];
         }
 
-        if ( isset($fieldType) && isset($module) ) {
+        if (isset($fieldType) && isset($module)) {
             $labelList['accessKey'][] = 'LBL_ACCESSKEY_'.$fieldType.'_'.$module;
             $labelList['accessKeySelect'][] = 'LBL_ACCESSKEY_SELECT_'.$fieldType.'_'.$module;
             $labelList['accessKeyClear'][] = 'LBL_ACCESSKEY_CLEAR_'.$fieldType.'_'.$module;
         }
 
-        if ( isset($module) ) {
+        if (isset($module)) {
             $labelList['accessKey'][] = 'LBL_ACCESSKEY_'.$module;
             $labelList['accessKeySelect'][] = 'LBL_ACCESSKEY_SELECT_'.$module;
             $labelList['accessKeyClear'][] = 'LBL_ACCESSKEY_CLEAR_'.$module;
         }
 
-        if ( isset($fieldType) ) {
+        if (isset($fieldType)) {
             $labelList['accessKey'][] = 'LBL_ACCESSKEY_'.$fieldType;
             $labelList['accessKeySelect'][] = 'LBL_ACCESSKEY_SELECT_'.$fieldType;
             $labelList['accessKeyClear'][] = 'LBL_ACCESSKEY_CLEAR_'.$fieldType;
@@ -445,7 +445,7 @@ 
 
         // Figure out the label and the key for the button.
         // Later on we may attempt to make sure there are no two buttons with the same keys, but for now we will just use whatever is specified.
-        $keyTypes = array('accessKey','accessKeySelect','accessKeyClear');
+        $keyTypes = array('accessKey', 'accessKeySelect', 'accessKeyClear');
         $accessKeyList = array(
             'accessKey' => '',
             'accessKeyLabel' => '',
@@ -457,9 +457,9 @@ 
             'accessKeyClearLabel' => '',
             'accessKeyClearTitle' => '',
         );
-        foreach( $keyTypes as $type ) {
-            foreach ( $labelList[$type] as $tryThis ) {
-                if ( isset($app_strings[$tryThis.'_KEY']) && isset($app_strings[$tryThis.'_TITLE']) && isset($app_strings[$tryThis.'_LABEL']) ) {
+        foreach ($keyTypes as $type) {
+            foreach ($labelList[$type] as $tryThis) {
+                if (isset($app_strings[$tryThis.'_KEY']) && isset($app_strings[$tryThis.'_TITLE']) && isset($app_strings[$tryThis.'_LABEL'])) {
                     $accessKeyList[$type] = $tryThis.'_KEY';
                     $accessKeyList[$type.'Title'] = $tryThis.'_TITLE';
                     $accessKeyList[$type.'Label'] = $tryThis.'_LABEL';
@@ -477,8 +477,8 @@ 
      * @param array params - an array of paramester relevant to the save, most likely will be $_REQUEST
      */
     public function save(&$bean, $params, $field, $properties, $prefix = '') {
-         if ( isset($params[$prefix.$field]) ) {
-             if(isset($properties['len']) && isset($properties['type']) && $this->isTrimmable($properties['type'])){
+         if (isset($params[$prefix.$field])) {
+             if (isset($properties['len']) && isset($properties['type']) && $this->isTrimmable($properties['type'])) {
                  $bean->$field = trim($this->unformatField($params[$prefix.$field], $properties));
              }
              else {
@@ -513,7 +513,7 @@ 
         ImportFieldSanitize $settings
         )
     {
-        if( isset($vardef['len']) ) {
+        if (isset($vardef['len'])) {
             // check for field length
             $value = sugar_substr($value, $vardef['len']);
         }
@@ -529,7 +529,7 @@ 
      */
     protected function isRangeSearchView($vardef)
     {
-     	return !empty($vardef['enable_range_search']) && !empty($_REQUEST['action']) && $_REQUEST['action']!='Popup';
+     	return !empty($vardef['enable_range_search']) && !empty($_REQUEST['action']) && $_REQUEST['action'] != 'Popup';
     }
 
     /**
@@ -545,19 +545,19 @@ 
     protected function setupFieldArray($parentFieldArray, $vardef)
     {
         $fieldName = $vardef['name'];
-        if ( is_array($parentFieldArray) )
+        if (is_array($parentFieldArray))
         {
             $fieldNameUpper = strtoupper($fieldName);
-            if ( isset($parentFieldArray[$fieldNameUpper]))
+            if (isset($parentFieldArray[$fieldNameUpper]))
             {
-                $parentFieldArray[$fieldName] = $this->formatField($parentFieldArray[$fieldNameUpper],$vardef);
+                $parentFieldArray[$fieldName] = $this->formatField($parentFieldArray[$fieldNameUpper], $vardef);
             } else {
                 $parentFieldArray[$fieldName] = '';
             }
         } elseif (is_object($parentFieldArray)) {
-            if ( isset($parentFieldArray->$fieldName) )
+            if (isset($parentFieldArray->$fieldName))
             {
-                $parentFieldArray->$fieldName = $this->formatField($parentFieldArray->$fieldName,$vardef);
+                $parentFieldArray->$fieldName = $this->formatField($parentFieldArray->$fieldName, $vardef);
             } else {
                 $parentFieldArray->$fieldName = '';
             }

Braces +12 added lines, -13 removed lines

@@ -58,8 +58,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($type);
@@ -148,8 +147,7 @@ 
         if ($this->type != 'Enum' && $this->type != 'Radioenum')
         {
             $parentFieldArray = $this->setupFieldArray($parentFieldArray, $vardef);
-        }
-		else
+        } else
         {
         	$vardef['name'] = strtoupper($vardef['name']);
         }
@@ -208,15 +206,18 @@ 
 
 
     function getSearchViewSmarty($parentFieldArray, $vardef, $displayParams, $tabindex) {
-		if(!empty($vardef['auto_increment']))$vardef['len']=255;
+		if(!empty($vardef['auto_increment'])) {
+		    $vardef['len']=255;
+		}
     	return $this->getSmartyView($parentFieldArray, $vardef, $displayParams, $tabindex, 'EditView');
     }
 
     function getPopupViewSmarty($parentFieldArray, $vardef, $displayParams, $tabindex){
-    	 if (is_array($displayParams) && !isset($displayParams['formName']))
-		     $displayParams['formName'] = 'popup_query_form';
-	     else if (empty($displayParams))
-		     $displayParams = array('formName' => 'popup_query_form');
+    	 if (is_array($displayParams) && !isset($displayParams['formName'])) {
+    	 		     $displayParams['formName'] = 'popup_query_form';
+    	 } else if (empty($displayParams)) {
+	     		     $displayParams = array('formName' => 'popup_query_form');
+	     }
 		 return $this->getSearchViewSmarty($parentFieldArray, $vardef, $displayParams, $tabindex);
     }
 
@@ -340,8 +341,7 @@ 
         {
             $this->ss->left_delimiter = '{{';
             $this->ss->right_delimiter = '}}';
-        }
-        else
+        } else
         {
             $this->ss->left_delimiter = '{';
             $this->ss->right_delimiter = '}';
@@ -480,8 +480,7 @@ 
          if ( isset($params[$prefix.$field]) ) {
              if(isset($properties['len']) && isset($properties['type']) && $this->isTrimmable($properties['type'])){
                  $bean->$field = trim($this->unformatField($params[$prefix.$field], $properties));
-             }
-             else {
+             } else {
                  $bean->$field = $this->unformatField($params[$prefix.$field], $properties);
          	 }
          }

data/SugarBean.php

Spacing +209 added lines, -209 removed lines

@@ -311,17 +311,17 @@ 
                     $this->optimistic_lock = true;
                 }
             }
-            $loaded_defs[$this->object_name]['column_fields'] =& $this->column_fields;
-            $loaded_defs[$this->object_name]['list_fields'] =& $this->list_fields;
-            $loaded_defs[$this->object_name]['required_fields'] =& $this->required_fields;
-            $loaded_defs[$this->object_name]['field_name_map'] =& $this->field_name_map;
-            $loaded_defs[$this->object_name]['field_defs'] =& $this->field_defs;
+            $loaded_defs[$this->object_name]['column_fields'] = & $this->column_fields;
+            $loaded_defs[$this->object_name]['list_fields'] = & $this->list_fields;
+            $loaded_defs[$this->object_name]['required_fields'] = & $this->required_fields;
+            $loaded_defs[$this->object_name]['field_name_map'] = & $this->field_name_map;
+            $loaded_defs[$this->object_name]['field_defs'] = & $this->field_defs;
         } else {
-            $this->column_fields =& $loaded_defs[$this->object_name]['column_fields'];
-            $this->list_fields =& $loaded_defs[$this->object_name]['list_fields'];
-            $this->required_fields =& $loaded_defs[$this->object_name]['required_fields'];
-            $this->field_name_map =& $loaded_defs[$this->object_name]['field_name_map'];
-            $this->field_defs =& $loaded_defs[$this->object_name]['field_defs'];
+            $this->column_fields = & $loaded_defs[$this->object_name]['column_fields'];
+            $this->list_fields = & $loaded_defs[$this->object_name]['list_fields'];
+            $this->required_fields = & $loaded_defs[$this->object_name]['required_fields'];
+            $this->field_name_map = & $loaded_defs[$this->object_name]['field_name_map'];
+            $this->field_defs = & $loaded_defs[$this->object_name]['field_defs'];
             $this->added_custom_field_defs = true;
 
             if (!isset($this->custom_fields) &&
@@ -343,9 +343,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 SugarBean(){
+    public function SugarBean() {
         $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 {
@@ -457,14 +457,14 @@ 
     {
         //load the module dictionary if not supplied.
         if ((!isset($dictionary) or empty($dictionary)) && !empty($module_dir)) {
-            $filename = 'modules/' . $module_dir . '/vardefs.php';
+            $filename = 'modules/'.$module_dir.'/vardefs.php';
             if (file_exists($filename)) {
                 include($filename);
             }
         }
         if (!is_array($dictionary) or !array_key_exists($key, $dictionary)) {
-            $GLOBALS['log']->fatal("removeRelationshipMeta: Metadata for table " . $tablename . " does not exist");
-            display_notice("meta data absent for table " . $tablename . " keyed to $key ");
+            $GLOBALS['log']->fatal("removeRelationshipMeta: Metadata for table ".$tablename." does not exist");
+            display_notice("meta data absent for table ".$tablename." keyed to $key ");
         } else {
             if (isset($dictionary[$key]['relationships'])) {
                 $RelationshipDefs = $dictionary[$key]['relationships'];
@@ -495,7 +495,7 @@ 
         //load the module dictionary if not supplied.
         if (empty($dictionary) && !empty($module_dir)) {
             if ($is_custom) {
-                $filename = 'custom/modules/' . $module_dir . '/Ext/Vardefs/vardefs.ext.php';
+                $filename = 'custom/modules/'.$module_dir.'/Ext/Vardefs/vardefs.ext.php';
             } else {
                 if ($key == 'User') {
                     // a very special case for the Employees module
@@ -503,7 +503,7 @@ 
                     // Users/vardefs.php
                     $filename = 'modules/Users/vardefs.php';
                 } else {
-                    $filename = 'modules/' . $module_dir . '/vardefs.php';
+                    $filename = 'modules/'.$module_dir.'/vardefs.php';
                 }
             }
 
@@ -514,14 +514,14 @@ 
                     $dictionary = $GLOBALS['dictionary'];
                 }
             } else {
-                $GLOBALS['log']->debug("createRelationshipMeta: no metadata file found" . $filename);
+                $GLOBALS['log']->debug("createRelationshipMeta: no metadata file found".$filename);
                 return;
             }
         }
 
         if (!is_array($dictionary) or !array_key_exists($key, $dictionary)) {
-            $GLOBALS['log']->fatal("createRelationshipMeta: Metadata for table " . $tablename . " does not exist");
-            display_notice("meta data absent for table " . $tablename . " keyed to $key ");
+            $GLOBALS['log']->fatal("createRelationshipMeta: Metadata for table ".$tablename." does not exist");
+            display_notice("meta data absent for table ".$tablename." keyed to $key ");
         } else {
             if (isset($dictionary[$key]['relationships'])) {
                 $RelationshipDefs = $dictionary[$key]['relationships'];
@@ -530,18 +530,18 @@ 
                 $beanList_ucase = array_change_key_case($beanList, CASE_UPPER);
                 foreach ($RelationshipDefs as $rel_name => $rel_def) {
                     if (isset($rel_def['lhs_module']) and !isset($beanList_ucase[strtoupper($rel_def['lhs_module'])])) {
-                        $GLOBALS['log']->debug('skipping orphaned relationship record ' . $rel_name . ' lhs module is missing ' . $rel_def['lhs_module']);
+                        $GLOBALS['log']->debug('skipping orphaned relationship record '.$rel_name.' lhs module is missing '.$rel_def['lhs_module']);
                         continue;
                     }
                     if (isset($rel_def['rhs_module']) and !isset($beanList_ucase[strtoupper($rel_def['rhs_module'])])) {
-                        $GLOBALS['log']->debug('skipping orphaned relationship record ' . $rel_name . ' rhs module is missing ' . $rel_def['rhs_module']);
+                        $GLOBALS['log']->debug('skipping orphaned relationship record '.$rel_name.' rhs module is missing '.$rel_def['rhs_module']);
                         continue;
                     }
 
 
                     //check whether relationship exists or not first.
                     if (Relationship::exists($rel_name, $db)) {
-                        $GLOBALS['log']->debug('Skipping, relationship already exists ' . $rel_name);
+                        $GLOBALS['log']->debug('Skipping, relationship already exists '.$rel_name);
                     } else {
                         $seed = BeanFactory::getBean("Relationships");
                         $keys = array_keys($seed->field_defs);
@@ -559,10 +559,10 @@ 
 
 
                         $column_list = implode(",", array_keys($toInsert));
-                        $value_list = "'" . implode("','", array_values($toInsert)) . "'";
+                        $value_list = "'".implode("','", array_values($toInsert))."'";
 
                         //create the record. todo add error check.
-                        $insert_string = "INSERT into relationships (" . $column_list . ") values (" . $value_list . ")";
+                        $insert_string = "INSERT into relationships (".$column_list.") values (".$value_list.")";
                         $db->query($insert_string, true);
                     }
                 }
@@ -638,11 +638,11 @@ 
                     $tmp_final_query = $parentbean->$shortcut_function_name();
                 }
                 if (!$first) {
-                    $final_query_rows .= ' UNION ALL ( ' . $parentbean->create_list_count_query($tmp_final_query, $parameters) . ' )';
-                    $final_query .= ' UNION ALL ( ' . $tmp_final_query . ' )';
+                    $final_query_rows .= ' UNION ALL ( '.$parentbean->create_list_count_query($tmp_final_query, $parameters).' )';
+                    $final_query .= ' UNION ALL ( '.$tmp_final_query.' )';
                 } else {
-                    $final_query_rows = '(' . $parentbean->create_list_count_query($tmp_final_query, $parameters) . ')';
-                    $final_query = '(' . $tmp_final_query . ')';
+                    $final_query_rows = '('.$parentbean->create_list_count_query($tmp_final_query, $parameters).')';
+                    $final_query = '('.$tmp_final_query.')';
                     $first = false;
                 }
             }
@@ -673,32 +673,32 @@ 
                 }
                 $subquery['select'] = substr($subquery['select'], 0, strlen($subquery['select']) - 1);
                 //Put the query into the final_query
-                $query = $subquery['select'] . " " . $subquery['from'] . " " . $subquery['where'];
+                $query = $subquery['select']." ".$subquery['from']." ".$subquery['where'];
                 if (!$first) {
-                    $query = ' UNION ALL ( ' . $query . ' )';
+                    $query = ' UNION ALL ( '.$query.' )';
                     $final_query_rows .= " UNION ALL ";
                 } else {
-                    $query = '(' . $query . ')';
+                    $query = '('.$query.')';
                     $first = false;
                 }
                 $query_array = $subquery['query_array'];
                 $select_position = strpos($query_array['select'], "SELECT");
                 $distinct_position = strpos($query_array['select'], "DISTINCT");
                 if (!empty($subquery['params']['distinct']) && !empty($subpanel_def->table_name)) {
-                    $query_rows = "( SELECT count(DISTINCT " . $subpanel_def->table_name . ".id)" . $subquery['from_min'] . $query_array['join'] . $subquery['where'] . ' )';
+                    $query_rows = "( SELECT count(DISTINCT ".$subpanel_def->table_name.".id)".$subquery['from_min'].$query_array['join'].$subquery['where'].' )';
                 } elseif ($select_position !== false && $distinct_position != false) {
-                    $query_rows = "( " . substr_replace($query_array['select'], "SELECT count(", $select_position, 6) . ")" . $subquery['from_min'] . $query_array['join'] . $subquery['where'] . ' )';
+                    $query_rows = "( ".substr_replace($query_array['select'], "SELECT count(", $select_position, 6).")".$subquery['from_min'].$query_array['join'].$subquery['where'].' )';
                 } else {
                     //resort to default behavior.
-                    $query_rows = "( SELECT count(*)" . $subquery['from_min'] . $query_array['join'] . $subquery['where'] . ' )';
+                    $query_rows = "( SELECT count(*)".$subquery['from_min'].$query_array['join'].$subquery['where'].' )';
                 }
                 if (!empty($subquery['secondary_select'])) {
-                    $subquerystring = $subquery['secondary_select'] . $subquery['secondary_from'] . $query_array['join'] . $subquery['where'];
+                    $subquerystring = $subquery['secondary_select'].$subquery['secondary_from'].$query_array['join'].$subquery['where'];
                     if (!empty($subquery['secondary_where'])) {
                         if (empty($subquery['where'])) {
-                            $subquerystring .= " WHERE " . $subquery['secondary_where'];
+                            $subquerystring .= " WHERE ".$subquery['secondary_where'];
                         } else {
-                            $subquerystring .= " AND " . $subquery['secondary_where'];
+                            $subquerystring .= " AND ".$subquery['secondary_where'];
                         }
                     }
                     $secondary_queries[] = $subquerystring;
@@ -721,12 +721,12 @@ 
             }
 
             if (!empty($sort_order)) {
-                $order_by .= ' ' . $sort_order;
+                $order_by .= ' '.$sort_order;
             }
 
             $order_by = $parentbean->process_order_by($order_by, $submodule, $suppress_table_name);
             if (!empty($order_by)) {
-                $final_query .= ' ORDER BY ' . $order_by;
+                $final_query .= ' ORDER BY '.$order_by;
             }
         }
 
@@ -794,7 +794,7 @@ 
                     if (empty($where_definition)) {
                         $where_definition = $table_where;
                     } else {
-                        $where_definition .= ' AND ' . $table_where;
+                        $where_definition .= ' AND '.$table_where;
                     }
                 }
 
@@ -815,7 +815,7 @@ 
 
 
                 if (!$subpanel_def->isCollection() && isset($list_fields[$order_by]) && isset($submodule->field_defs[$order_by]) && (!isset($submodule->field_defs[$order_by]['source']) || $submodule->field_defs[$order_by]['source'] == 'db')) {
-                    $order_by = $submodule->table_name . '.' . $order_by;
+                    $order_by = $submodule->table_name.'.'.$order_by;
                 }
                 $table_name = $this_subpanel->table_name;
                 $panel_name = $this_subpanel->name;
@@ -831,8 +831,8 @@ 
 
                 $subquery = $submodule->create_new_list_query('', $subwhere, $list_fields, $params, 0, '', true, $parentbean, $singleSelect);
 
-                $subquery['select'] = $subquery['select'] . " , '$panel_name' panel_name ";
-                $subquery['from'] = $subquery['from'] . $query_array['join'];
+                $subquery['select'] = $subquery['select']." , '$panel_name' panel_name ";
+                $subquery['from'] = $subquery['from'].$query_array['join'];
                 $subquery['query_array'] = $query_array;
                 $subquery['params'] = $params;
 
@@ -870,7 +870,7 @@ 
         $use_count_query = false;
         $processing_collection = $subpanel_def->isCollection();
 
-        $GLOBALS['log']->debug("process_union_list_query: " . $query);
+        $GLOBALS['log']->debug("process_union_list_query: ".$query);
         if ($max_per_page == -1) {
             $max_per_page = $sugar_config['list_max_entries_per_subpanel'];
         }
@@ -947,9 +947,9 @@ 
                         if (isset($row[$field])) {
                             $current_bean->$field = $this->convertField($row[$field], $value);
                             unset($row[$field]);
-                        } elseif (isset($row[$this->table_name . '.' . $field])) {
-                            $current_bean->$field = $this->convertField($row[$this->table_name . '.' . $field], $value);
-                            unset($row[$this->table_name . '.' . $field]);
+                        } elseif (isset($row[$this->table_name.'.'.$field])) {
+                            $current_bean->$field = $this->convertField($row[$this->table_name.'.'.$field], $value);
+                            unset($row[$this->table_name.'.'.$field]);
                         } else {
                             $current_bean->$field = "";
                             unset($row[$field]);
@@ -1116,7 +1116,7 @@ 
                         $class = $beanList[$child_info['parent_type']];
                         // Added to avoid error below; just silently fail and write message to log
                         if (empty($beanFiles[$class])) {
-                            $GLOBALS['log']->error($this->object_name . '::retrieve_parent_fields() - cannot load class "' . $class . '", skip loading.');
+                            $GLOBALS['log']->error($this->object_name.'::retrieve_parent_fields() - cannot load class "'.$class.'", skip loading.');
                             continue;
                         }
                         require_once($beanFiles[$class]);
@@ -1127,7 +1127,7 @@ 
                         $queries[$child_info['parent_type']] = "SELECT id ";
                         $field_def = $templates[$child_info['parent_type']]->field_defs['name'];
                         if (isset($field_def['db_concat_fields'])) {
-                            $queries[$child_info['parent_type']] .= ' , ' . $this->db->concat($templates[$child_info['parent_type']]->table_name, $field_def['db_concat_fields']) . ' parent_name';
+                            $queries[$child_info['parent_type']] .= ' , '.$this->db->concat($templates[$child_info['parent_type']]->table_name, $field_def['db_concat_fields']).' parent_name';
                         } else {
                             $queries[$child_info['parent_type']] .= ' , name parent_name';
                         }
@@ -1137,7 +1137,7 @@ 
                         } elseif (isset($templates[$child_info['parent_type']]->field_defs['created_by'])) {
                             $queries[$child_info['parent_type']] .= ", created_by parent_name_owner, '{$child_info['parent_type']}' parent_name_mod";
                         }
-                        $queries[$child_info['parent_type']] .= " FROM " . $templates[$child_info['parent_type']]->table_name . " WHERE id IN ('{$child_info['parent_id']}'";
+                        $queries[$child_info['parent_type']] .= " FROM ".$templates[$child_info['parent_type']]->table_name." WHERE id IN ('{$child_info['parent_id']}'";
                     } else {
                         if (empty($parent_child_map[$child_info['parent_id']])) {
                             $queries[$child_info['parent_type']] .= " ,'{$child_info['parent_id']}'";
@@ -1149,7 +1149,7 @@ 
         }
         $results = array();
         foreach ($queries as $query) {
-            $result = $this->db->query($query . ')');
+            $result = $this->db->query($query.')');
             while ($row = $this->db->fetchByAssoc($result)) {
                 $results[$row['id']] = $row;
             }
@@ -1234,7 +1234,7 @@ 
      */
     public function get_custom_table_name()
     {
-        return $this->getTableName() . '_cstm';
+        return $this->getTableName().'_cstm';
     }
 
     /**
@@ -1474,7 +1474,7 @@ 
      */
     public function load_relationship($rel_name)
     {
-        $GLOBALS['log']->debug("SugarBean[{$this->object_name}].load_relationships, Loading relationship (" . $rel_name . ").");
+        $GLOBALS['log']->debug("SugarBean[{$this->object_name}].load_relationships, Loading relationship (".$rel_name.").");
 
         if (empty($rel_name)) {
             $GLOBALS['log']->error("SugarBean.load_relationships, Null relationship name passed.");
@@ -1509,7 +1509,7 @@ 
                 return true;
             }
         }
-        $GLOBALS['log']->debug("SugarBean.load_relationships, Error Loading relationship (" . $rel_name . ")");
+        $GLOBALS['log']->debug("SugarBean.load_relationships, Error Loading relationship (".$rel_name.")");
         return false;
     }
 
@@ -1616,7 +1616,7 @@ 
                         $idField = $value_array['id_name'];
                         if (isset($fieldDefs[$idField]) && isset($fieldDefs[$idField]['type']) && $fieldDefs[$idField]['type'] == 'link') {
                             $tmpFieldDefs = $fieldDefs[$idField];
-                            $tmpFieldDefs['vname'] = translate($value_array['vname'], $this->module_dir) . " " . $GLOBALS['app_strings']['LBL_ID'];
+                            $tmpFieldDefs['vname'] = translate($value_array['vname'], $this->module_dir)." ".$GLOBALS['app_strings']['LBL_ID'];
                             $importableFields[$idField] = $tmpFieldDefs;
                         }
                     }
@@ -1640,8 +1640,8 @@ 
 
         $key = $this->getObjectName();
         if (!array_key_exists($key, $dictionary)) {
-            $GLOBALS['log']->fatal("create_tables: Metadata for table " . $this->table_name . " does not exist");
-            display_notice("meta data absent for table " . $this->table_name . " keyed to $key ");
+            $GLOBALS['log']->fatal("create_tables: Metadata for table ".$this->table_name." does not exist");
+            display_notice("meta data absent for table ".$this->table_name." keyed to $key ");
         } else {
             if (!$this->db->tableExists($this->table_name)) {
                 $this->db->createTable($this);
@@ -1702,7 +1702,7 @@ 
      */
     public function get_audit_table_name()
     {
-        return $this->getTableName() . '_audit';
+        return $this->getTableName().'_audit';
     }
 
     /**
@@ -1720,7 +1720,7 @@ 
         require('metadata/audit_templateMetaData.php');
 
         // Bug: 52583 Need ability to customize template for audit tables
-        $custom = 'custom/metadata/audit_templateMetaData_' . $this->getTableName() . '.php';
+        $custom = 'custom/metadata/audit_templateMetaData_'.$this->getTableName().'.php';
         if (file_exists($custom)) {
             require($custom);
         }
@@ -1730,7 +1730,7 @@ 
 
         // Renaming template indexes to fit the particular audit table (removed the brittle hard coding)
         foreach ($indices as $nr => $properties) {
-            $indices[$nr]['name'] = 'idx_' . strtolower($this->getTableName()) . '_' . $properties['name'];
+            $indices[$nr]['name'] = 'idx_'.strtolower($this->getTableName()).'_'.$properties['name'];
         }
 
         $engine = null;
@@ -1754,8 +1754,8 @@ 
         global $dictionary;
         $key = $this->getObjectName();
         if (!array_key_exists($key, $dictionary)) {
-            $GLOBALS['log']->fatal("drop_tables: Metadata for table " . $this->table_name . " does not exist");
-            echo "meta data absent for table " . $this->table_name . "<br>\n";
+            $GLOBALS['log']->fatal("drop_tables: Metadata for table ".$this->table_name." does not exist");
+            echo "meta data absent for table ".$this->table_name."<br>\n";
         } else {
             if (empty($this->table_name)) {
                 return;
@@ -1763,8 +1763,8 @@ 
             if ($this->db->tableExists($this->table_name)) {
                 $this->db->dropTable($this);
             }
-            if ($this->db->tableExists($this->table_name . '_cstm')) {
-                $this->db->dropTableName($this->table_name . '_cstm');
+            if ($this->db->tableExists($this->table_name.'_cstm')) {
+                $this->db->dropTableName($this->table_name.'_cstm');
                 DynamicField::deleteCache();
             }
             if ($this->db->tableExists($this->get_audit_table_name())) {
@@ -2059,7 +2059,7 @@ 
                     break;
             }
             if ($reformatted) {
-                $GLOBALS['log']->deprecated('Formatting correction: ' . $this->module_dir . '->' . $field . ' had formatting automatically corrected. This will be removed in the future, please upgrade your external code');
+                $GLOBALS['log']->deprecated('Formatting correction: '.$this->module_dir.'->'.$field.' had formatting automatically corrected. This will be removed in the future, please upgrade your external code');
             }
         }
     }
@@ -2101,7 +2101,7 @@ 
                     $_SESSION['o_lock_object'] = $this->toArray();
                     $saveform = "<form name='save' id='save' method='POST'>";
                     foreach ($_POST as $key => $arg) {
-                        $saveform .= "<input type='hidden' name='" . addslashes($key) . "' value='" . addslashes($arg) . "'>";
+                        $saveform .= "<input type='hidden' name='".addslashes($key)."' value='".addslashes($arg)."'>";
                     }
                     $saveform .= "</form><script>document.getElementById('save').submit();</script>";
                     $_SESSION['o_lock_save'] = $saveform;
@@ -2281,7 +2281,7 @@ 
                     if ($rel_name == $new_rel_link && $this->$id != $new_rel_id) {
                         $new_rel_id = '';
                     }
-                    $GLOBALS['log']->debug('save_relationship_changes(): From relationship_field array - adding a relationship record: ' . $rel_name . ' = ' . $this->$id);
+                    $GLOBALS['log']->debug('save_relationship_changes(): From relationship_field array - adding a relationship record: '.$rel_name.' = '.$this->$id);
                     //already related the new relationship id so let's set it to false so we don't add it again using the _REQUEST['relate_i'] mechanism in a later block
                     $this->load_relationship($rel_name);
                     $rel_add = $this->$rel_name->add($this->$id);
@@ -2292,7 +2292,7 @@ 
                 } else {
                     //if before value is not empty then attempt to delete relationship
                     if (!empty($this->rel_fields_before_value[$id])) {
-                        $GLOBALS['log']->debug('save_relationship_changes(): From relationship_field array - attempting to remove the relationship record, using relationship attribute' . $rel_name);
+                        $GLOBALS['log']->debug('save_relationship_changes(): From relationship_field array - attempting to remove the relationship record, using relationship attribute'.$rel_name);
                         $this->load_relationship($rel_name);
                         $this->$rel_name->delete($this->id, $this->rel_fields_before_value[$id]);
                     }
@@ -2334,7 +2334,7 @@ 
 
                         if (!empty($this->rel_fields_before_value[$idName]) && empty($this->$idName)) {
                             //if before value is not empty then attempt to delete relationship
-                            $GLOBALS['log']->debug("save_relationship_changes(): From field_defs - attempting to remove the relationship record: {$def [ 'link' ]} = {$this->rel_fields_before_value[$def [ 'id_name' ]]}");
+                            $GLOBALS['log']->debug("save_relationship_changes(): From field_defs - attempting to remove the relationship record: {$def ['link']} = {$this->rel_fields_before_value[$def ['id_name']]}");
                             $success = $this->$def ['link']->delete($this->id, $this->rel_fields_before_value[$def ['id_name']]);
                             // just need to make sure it's true and not an array as it's possible to return an array
                             if ($success == true) {
@@ -2342,11 +2342,11 @@ 
                             } else {
                                 $modified_relationships['remove']['failure'][] = $def['link'];
                             }
-                            $GLOBALS['log']->debug("save_relationship_changes(): From field_defs - attempting to remove the relationship record returned " . var_export($success, true));
+                            $GLOBALS['log']->debug("save_relationship_changes(): From field_defs - attempting to remove the relationship record returned ".var_export($success, true));
                         }
 
                         if (!empty($this->$idName) && is_string($this->$idName)) {
-                            $GLOBALS['log']->debug("save_relationship_changes(): From field_defs - attempting to add a relationship record - {$def [ 'link' ]} = {$this->$def [ 'id_name' ]}");
+                            $GLOBALS['log']->debug("save_relationship_changes(): From field_defs - attempting to add a relationship record - {$def ['link']} = {$this->$def ['id_name']}");
 
                             $success = $this->$linkField->add($this->$idName);
 
@@ -2357,7 +2357,7 @@ 
                                 $modified_relationships['add']['failure'][] = $linkField;
                             }
 
-                            $GLOBALS['log']->debug("save_relationship_changes(): From field_defs - add a relationship record returned " . var_export($success, true));
+                            $GLOBALS['log']->debug("save_relationship_changes(): From field_defs - add a relationship record returned ".var_export($success, true));
                         }
                     } else {
                         $GLOBALS['log']->fatal("Failed to load relationship {$linkField} while saving {$this->module_dir}");
@@ -2741,10 +2741,10 @@ 
             $template_name = "Default";
         }
         if (!empty($_SESSION["special_notification"]) && $_SESSION["special_notification"]) {
-            $template_name = $beanList[$this->module_dir] . 'Special';
+            $template_name = $beanList[$this->module_dir].'Special';
         }
         if ($this->special_notification) {
-            $template_name = $beanList[$this->module_dir] . 'Special';
+            $template_name = $beanList[$this->module_dir].'Special';
         }
         $xtpl->assign("ASSIGNED_USER", $this->new_assigned_user_name);
         $xtpl->assign("ASSIGNER", $current_user->name);
@@ -2755,17 +2755,17 @@ 
             $parsedSiteUrl['port'] = 80;
         }
 
-        $port = ($parsedSiteUrl['port'] != 80) ? ":" . $parsedSiteUrl['port'] : '';
+        $port = ($parsedSiteUrl['port'] != 80) ? ":".$parsedSiteUrl['port'] : '';
         $path = !empty($parsedSiteUrl['path']) ? $parsedSiteUrl['path'] : "";
         $cleanUrl = "{$parsedSiteUrl['scheme']}://{$host}{$port}{$path}";
 
-        $xtpl->assign("URL", $cleanUrl . "/index.php?module={$this->module_dir}&action=DetailView&record={$this->id}");
+        $xtpl->assign("URL", $cleanUrl."/index.php?module={$this->module_dir}&action=DetailView&record={$this->id}");
         $xtpl->assign("SUGAR", "Sugar v{$sugar_version}");
         $xtpl->parse($template_name);
-        $xtpl->parse($template_name . "_Subject");
+        $xtpl->parse($template_name."_Subject");
 
         $notify_mail->Body = from_html(trim($xtpl->text($template_name)));
-        $notify_mail->Subject = from_html($xtpl->text($template_name . "_Subject"));
+        $notify_mail->Subject = from_html($xtpl->text($template_name."_Subject"));
 
         // cn: bug 8568 encode notify email in User's outbound email encoding
         $notify_mail->prepForOutbound();
@@ -2857,7 +2857,7 @@ 
                 if (empty($where)) {
                     $where = $owner_where;
                 } else {
-                    $where .= ' AND ' . $owner_where;
+                    $where .= ' AND '.$owner_where;
                 }
             }
         }
@@ -2911,7 +2911,7 @@ 
             if (empty($where)) {
                 $where = $owner_where;
             } else {
-                $where .= ' AND ' . $owner_where;
+                $where .= ' AND '.$owner_where;
             }
         }
         /* BEGIN - SECURITY GROUPS */
@@ -2925,9 +2925,9 @@ 
             $group_where = SecurityGroup::getGroupUsersWhere($current_user->id);
             //$group_where = "user_name = 'admin'";
             if (empty($where)) {
-                $where = " (" . $group_where . ") ";
+                $where = " (".$group_where.") ";
             } else {
-                $where .= " AND (" . $group_where . ") ";
+                $where .= " AND (".$group_where.") ";
             }
         } elseif ($this->bean_implements('ACL') && ACLController::requireSecurityGroup($this->module_dir, 'list')) {
             require_once('modules/SecurityGroups/SecurityGroup.php');
@@ -2936,12 +2936,12 @@ 
             $group_where = SecurityGroup::getGroupWhere($this->table_name, $this->module_dir, $current_user->id);
             if (!empty($owner_where)) {
                 if (empty($where)) {
-                    $where = " (" . $owner_where . " or " . $group_where . ") ";
+                    $where = " (".$owner_where." or ".$group_where.") ";
                 } else {
-                    $where .= " AND (" . $owner_where . " or " . $group_where . ") ";
+                    $where .= " AND (".$owner_where." or ".$group_where.") ";
                 }
             } else {
-                $where .= ' AND ' . $group_where;
+                $where .= ' AND '.$group_where;
             }
         }
         /* END - SECURITY GROUPS */
@@ -2960,7 +2960,7 @@ 
         $ret_array['order_by'] = '';
         //secondary selects are selects that need to be run after the primary query to retrieve additional info on main
         if ($singleSelect) {
-            $ret_array['secondary_select'] =& $ret_array['select'];
+            $ret_array['secondary_select'] = & $ret_array['select'];
             $ret_array['secondary_from'] = &$ret_array['from'];
         } else {
             $ret_array['secondary_select'] = '';
@@ -3034,7 +3034,7 @@ 
             //alias is used to alias field names
             $alias = '';
             if (isset($value['alias'])) {
-                $alias = ' as ' . $value['alias'] . ' ';
+                $alias = ' as '.$value['alias'].' ';
             }
 
             if (empty($this->field_defs[$field]) || !empty($value['force_blank'])) {
@@ -3073,29 +3073,29 @@ 
                 $selectedFields["$this->table_name.$field"] = true;
             } elseif ((!isset($data['source']) || $data['source'] == 'custom_fields') && (!empty($alias) || !empty($filter))) {
                 //add this column only if it has NOT already been added to select statement string
-                $colPos = strpos($ret_array['select'], "$this->table_name" . "_cstm" . ".$field");
+                $colPos = strpos($ret_array['select'], "$this->table_name"."_cstm".".$field");
                 if (!$colPos || $colPos < 0) {
-                    $ret_array['select'] .= ", $this->table_name" . "_cstm" . ".$field $alias";
+                    $ret_array['select'] .= ", $this->table_name"."_cstm".".$field $alias";
                 }
 
                 $selectedFields["$this->table_name.$field"] = true;
             }
 
             if ($data['type'] != 'relate' && isset($data['db_concat_fields'])) {
-                $ret_array['select'] .= ", " . $this->db->concat($this->table_name, $data['db_concat_fields']) . " as $field";
+                $ret_array['select'] .= ", ".$this->db->concat($this->table_name, $data['db_concat_fields'])." as $field";
                 $selectedFields[$this->db->concat($this->table_name, $data['db_concat_fields'])] = true;
             }
             //Custom relate field or relate fields built in module builder which have no link field associated.
             if ($data['type'] == 'relate' && (isset($data['custom_module']) || isset($data['ext2']))) {
-                $joinTableAlias = 'jt' . $jtcount;
+                $joinTableAlias = 'jt'.$jtcount;
                 $relateJoinInfo = $this->custom_fields->getRelateJoin($data, $joinTableAlias, false);
                 $ret_array['select'] .= $relateJoinInfo['select'];
                 $ret_array['from'] .= $relateJoinInfo['from'];
                 //Replace any references to the relationship in the where clause with the new alias
                 //If the link isn't set, assume that search used the local table for the field
                 $searchTable = isset($data['link']) ? $relateJoinInfo['rel_table'] : $this->table_name;
-                $field_name = $relateJoinInfo['rel_table'] . '.' . !empty($data['name']) ? $data['name'] : 'name';
-                $where = preg_replace('/(^|[\s(])' . $field_name . '/', '${1}' . $relateJoinInfo['name_field'], $where);
+                $field_name = $relateJoinInfo['rel_table'].'.'.!empty($data['name']) ? $data['name'] : 'name';
+                $where = preg_replace('/(^|[\s(])'.$field_name.'/', '${1}'.$relateJoinInfo['name_field'], $where);
                 $jtcount++;
             }
             //Parent Field
@@ -3103,7 +3103,7 @@ 
                 //See if we need to join anything by inspecting the where clause
                 $match = preg_match('/(^|[\s(])parent_([a-zA-Z]+_?[a-zA-Z]+)_([a-zA-Z]+_?[a-zA-Z]+)\.name/', $where, $matches);
                 if ($match) {
-                    $joinTableAlias = 'jt' . $jtcount;
+                    $joinTableAlias = 'jt'.$jtcount;
                     $joinModule = $matches[2];
                     $joinTable = $matches[3];
                     $localTable = $this->table_name;
@@ -3124,7 +3124,7 @@ 
                     $ret_array['from'] .= " LEFT JOIN $joinTable $joinTableAlias
                         ON $localTable.{$data['id_name']} = $joinTableAlias.id";
                     //Replace any references to the relationship in the where clause with the new alias
-                    $where = preg_replace('/(^|[\s(])parent_' . $joinModule . '_' . $joinTable . '\.name/', '${1}' . $nameField, $where);
+                    $where = preg_replace('/(^|[\s(])parent_'.$joinModule.'_'.$joinTable.'\.name/', '${1}'.$nameField, $where);
                     $jtcount++;
                 }
             }
@@ -3133,7 +3133,7 @@ 
             {
                 $linkField = $data['link'];
                 $this->load_relationship($linkField);
-                if(!empty($this->$linkField))
+                if (!empty($this->$linkField))
                 {
                     $params = array();
                     if (empty($join_type)) {
@@ -3144,12 +3144,12 @@ 
                     if (isset($data['join_name'])) {
                         $params['join_table_alias'] = $data['join_name'];
                     } else {
-                        $params['join_table_alias'] = 'jt' . $jtcount;
+                        $params['join_table_alias'] = 'jt'.$jtcount;
                     }
                     if (isset($data['join_link_name'])) {
                         $params['join_table_link_alias'] = $data['join_link_name'];
                     } else {
-                        $params['join_table_link_alias'] = 'jtl' . $jtcount;
+                        $params['join_table_link_alias'] = 'jtl'.$jtcount;
                     }
                     $join_primary = !isset($data['join_primary']) || $data['join_primary'];
 
@@ -3182,20 +3182,20 @@ 
                                 require_once($beanFiles[$beanList[$rel_module]]);
                                 $rel_mod = new $beanList[$rel_module]();
                                 if (isset($rel_mod->field_defs['assigned_user_id'])) {
-                                    $ret_array['secondary_select'] .= " , " . $params['join_table_alias'] . ".assigned_user_id {$field}_owner, '$rel_module' {$field}_mod";
+                                    $ret_array['secondary_select'] .= " , ".$params['join_table_alias'].".assigned_user_id {$field}_owner, '$rel_module' {$field}_mod";
                                 } else {
                                     if (isset($rel_mod->field_defs['created_by'])) {
-                                        $ret_array['secondary_select'] .= " , " . $params['join_table_alias'] . ".created_by {$field}_owner , '$rel_module' {$field}_mod";
+                                        $ret_array['secondary_select'] .= " , ".$params['join_table_alias'].".created_by {$field}_owner , '$rel_module' {$field}_mod";
                                     }
                                 }
                             }
                         }
 
                         if (isset($data['db_concat_fields'])) {
-                            $ret_array['secondary_select'] .= ' , ' . $this->db->concat($params['join_table_alias'], $data['db_concat_fields']) . ' ' . $field;
+                            $ret_array['secondary_select'] .= ' , '.$this->db->concat($params['join_table_alias'], $data['db_concat_fields']).' '.$field;
                         } else {
                             if (!isset($data['relationship_fields'])) {
-                                $ret_array['secondary_select'] .= ' , ' . $params['join_table_alias'] . '.' . $data['rname'] . ' ' . $field;
+                                $ret_array['secondary_select'] .= ' , '.$params['join_table_alias'].'.'.$data['rname'].' '.$field;
                             }
                         }
                         if (!$singleSelect) {
@@ -3211,54 +3211,54 @@ 
                             //27416, the $ret_array['secondary_select'] should always generate, regardless the dbtype
                             // add rel_key only if it was not already added
                             if (!$singleSelect) {
-                                $ret_array['select'] .= ", '                                    '  " . $join['rel_key'] . ' ';
+                                $ret_array['select'] .= ", '                                    '  ".$join['rel_key'].' ';
                             }
-                            $ret_array['secondary_select'] .= ', ' . $params['join_table_link_alias'] . '.' . $join['rel_key'] . ' ' . $join['rel_key'];
+                            $ret_array['secondary_select'] .= ', '.$params['join_table_link_alias'].'.'.$join['rel_key'].' '.$join['rel_key'];
                         }
                         if (isset($data['relationship_fields'])) {
                             foreach ($data['relationship_fields'] as $r_name => $alias_name) {
                                 if (!empty($secondarySelectedFields[$alias_name])) {
                                     continue;
                                 }
-                                $ret_array['secondary_select'] .= ', ' . $params['join_table_link_alias'] . '.' . $r_name . ' ' . $alias_name;
+                                $ret_array['secondary_select'] .= ', '.$params['join_table_link_alias'].'.'.$r_name.' '.$alias_name;
                                 $secondarySelectedFields[$alias_name] = true;
                             }
                         }
                         if (!$table_joined) {
-                            $ret_array['secondary_from'] .= ' ' . $join['join'] . ' AND ' . $params['join_table_alias'] . '.deleted=0';
+                            $ret_array['secondary_from'] .= ' '.$join['join'].' AND '.$params['join_table_alias'].'.deleted=0';
                             if (isset($data['link_type']) && $data['link_type'] == 'relationship_info' && ($parentbean instanceof SugarBean)) {
-                                $ret_array['secondary_where'] = $params['join_table_link_alias'] . '.' . $join['rel_key'] . "='" . $parentbean->id . "'";
+                                $ret_array['secondary_where'] = $params['join_table_link_alias'].'.'.$join['rel_key']."='".$parentbean->id."'";
                             }
                         }
                     } else {
                         if (isset($data['db_concat_fields'])) {
-                            $ret_array['select'] .= ' , ' . $this->db->concat($params['join_table_alias'], $data['db_concat_fields']) . ' ' . $field;
+                            $ret_array['select'] .= ' , '.$this->db->concat($params['join_table_alias'], $data['db_concat_fields']).' '.$field;
                         } else {
-                            $ret_array['select'] .= ' , ' . $params['join_table_alias'] . '.' . $data['rname'] . ' ' . $field;
+                            $ret_array['select'] .= ' , '.$params['join_table_alias'].'.'.$data['rname'].' '.$field;
                         }
                         if (isset($data['additionalFields'])) {
                             foreach ($data['additionalFields'] as $k => $v) {
                                 if (!empty($data['id_name']) && $data['id_name'] == $v && !empty($fields[$data['id_name']])) {
                                     continue;
                                 }
-                                $ret_array['select'] .= ' , ' . $params['join_table_alias'] . '.' . $k . ' ' . $v;
+                                $ret_array['select'] .= ' , '.$params['join_table_alias'].'.'.$k.' '.$v;
                             }
                         }
                         if (!$table_joined) {
-                            $ret_array['from'] .= ' ' . $join['join'] . ' AND ' . $params['join_table_alias'] . '.deleted=0';
+                            $ret_array['from'] .= ' '.$join['join'].' AND '.$params['join_table_alias'].'.deleted=0';
                             if (!empty($beanList[$rel_module]) && !empty($beanFiles[$beanList[$rel_module]])) {
                                 require_once($beanFiles[$beanList[$rel_module]]);
                                 $rel_mod = new $beanList[$rel_module]();
                                 if (isset($value['target_record_key']) && !empty($filter)) {
-                                    $selectedFields[$this->table_name . '.' . $value['target_record_key']] = true;
+                                    $selectedFields[$this->table_name.'.'.$value['target_record_key']] = true;
                                     $ret_array['select'] .= " , $this->table_name.{$value['target_record_key']} ";
                                 }
                                 if (isset($rel_mod->field_defs['assigned_user_id'])) {
-                                    $ret_array['select'] .= ' , ' . $params['join_table_alias'] . '.assigned_user_id ' . $field . '_owner';
+                                    $ret_array['select'] .= ' , '.$params['join_table_alias'].'.assigned_user_id '.$field.'_owner';
                                 } else {
-                                    $ret_array['select'] .= ' , ' . $params['join_table_alias'] . '.created_by ' . $field . '_owner';
+                                    $ret_array['select'] .= ' , '.$params['join_table_alias'].'.created_by '.$field.'_owner';
                                 }
-                                $ret_array['select'] .= "  , '" . $rel_module . "' " . $field . '_mod';
+                                $ret_array['select'] .= "  , '".$rel_module."' ".$field.'_mod';
                             }
                         }
                     }
@@ -3268,37 +3268,37 @@ 
                     if (isset($data['db_concat_fields'])) {
                         $buildWhere = false;
                         if (in_array('first_name', $data['db_concat_fields']) && in_array('last_name', $data['db_concat_fields'])) {
-                            $exp = '/\(\s*?' . $data['name'] . '.*?\%\'\s*?\)/';
+                            $exp = '/\(\s*?'.$data['name'].'.*?\%\'\s*?\)/';
                             if (preg_match($exp, $where, $matches)) {
                                 $search_expression = $matches[0];
                                 //Create three search conditions - first + last, first, last
-                                $first_name_search = str_replace($data['name'], $params['join_table_alias'] . '.first_name', $search_expression);
-                                $last_name_search = str_replace($data['name'], $params['join_table_alias'] . '.last_name', $search_expression);
+                                $first_name_search = str_replace($data['name'], $params['join_table_alias'].'.first_name', $search_expression);
+                                $last_name_search = str_replace($data['name'], $params['join_table_alias'].'.last_name', $search_expression);
                                 $full_name_search = str_replace($data['name'], $this->db->concat($params['join_table_alias'], $data['db_concat_fields']), $search_expression);
                                 $buildWhere = true;
-                                $where = str_replace($search_expression, '(' . $full_name_search . ' OR ' . $first_name_search . ' OR ' . $last_name_search . ')', $where);
+                                $where = str_replace($search_expression, '('.$full_name_search.' OR '.$first_name_search.' OR '.$last_name_search.')', $where);
                             }
                         }
 
                         if (!$buildWhere) {
                             $db_field = $this->db->concat($params['join_table_alias'], $data['db_concat_fields']);
-                            $where = preg_replace('/' . $data['name'] . '/', $db_field, $where);
+                            $where = preg_replace('/'.$data['name'].'/', $db_field, $where);
 
                             // For relationship fields replace their alias by the corresponding link table and r_name
                             if (isset($data['relationship_fields'])) {
                                 foreach ($data['relationship_fields'] as $r_name => $alias_name) {
                                     $db_field = $this->db->concat($params['join_table_link_alias'], $r_name);
-                                    $where = preg_replace('/' . $alias_name . '/', $db_field, $where);
+                                    $where = preg_replace('/'.$alias_name.'/', $db_field, $where);
                                 }
                             }
                         }
                     } else {
-                        $where = preg_replace('/(^|[\s(])' . $data['name'] . '/', '${1}' . $params['join_table_alias'] . '.' . $data['rname'], $where);
+                        $where = preg_replace('/(^|[\s(])'.$data['name'].'/', '${1}'.$params['join_table_alias'].'.'.$data['rname'], $where);
 
                         // For relationship fields replace their alias by the corresponding link table and r_name
                         if (isset($data['relationship_fields'])) {
                             foreach ($data['relationship_fields'] as $r_name => $alias_name) {
-                                $where = preg_replace('/(^|[\s(])' . $alias_name . '/', '${1}' . $params['join_table_link_alias'] . '.' . $r_name, $where);
+                                $where = preg_replace('/(^|[\s(])'.$alias_name.'/', '${1}'.$params['join_table_link_alias'].'.'.$r_name, $where);
                             }
                         }
                     }
@@ -3312,12 +3312,12 @@ 
             }
         }
         if (!empty($filter)) {
-            if (isset($this->field_defs['assigned_user_id']) && empty($selectedFields[$this->table_name . '.assigned_user_id'])) {
+            if (isset($this->field_defs['assigned_user_id']) && empty($selectedFields[$this->table_name.'.assigned_user_id'])) {
                 $ret_array['select'] .= ", $this->table_name.assigned_user_id ";
-            } elseif (isset($this->field_defs['created_by']) && empty($selectedFields[$this->table_name . '.created_by'])) {
+            } elseif (isset($this->field_defs['created_by']) && empty($selectedFields[$this->table_name.'.created_by'])) {
                 $ret_array['select'] .= ", $this->table_name.created_by ";
             }
-            if (isset($this->field_defs['system_id']) && empty($selectedFields[$this->table_name . '.system_id'])) {
+            if (isset($this->field_defs['system_id']) && empty($selectedFields[$this->table_name.'.system_id'])) {
                 $ret_array['select'] .= ", $this->table_name.system_id ";
             }
         }
@@ -3344,7 +3344,7 @@ 
         //make call to process the order by clause
         $order_by = $this->process_order_by($order_by);
         if (!empty($order_by)) {
-            $ret_array['order_by'] = " ORDER BY " . $order_by;
+            $ret_array['order_by'] = " ORDER BY ".$order_by;
         }
         if ($singleSelect) {
             unset($ret_array['secondary_where']);
@@ -3356,7 +3356,7 @@ 
             return $ret_array;
         }
 
-        return $ret_array['select'] . $ret_array['from'] . $ret_array['where'] . $ret_array['order_by'];
+        return $ret_array['select'].$ret_array['from'].$ret_array['where'].$ret_array['order_by'];
     }
 
 	public function get_relationship_field($field)
@@ -3431,9 +3431,9 @@ 
 
                 if (empty($field_defs['table']) && !$suppress_table_name) {
                     if ($source == 'db') {
-                        $list_column[0] = $bean_queried->table_name . '.' . $list_column[0];
+                        $list_column[0] = $bean_queried->table_name.'.'.$list_column[0];
                     } elseif ($source == 'custom_fields') {
-                        $list_column[0] = $bean_queried->table_name . '_cstm.' . $list_column[0];
+                        $list_column[0] = $bean_queried->table_name.'_cstm.'.$list_column[0];
                     }
                 }
 
@@ -3489,7 +3489,7 @@ 
          * if the row_offset is set to 'end' go to the end of the list
          */
         $toEnd = strval($row_offset) == 'end';
-        $GLOBALS['log']->debug("process_list_query: " . $query);
+        $GLOBALS['log']->debug("process_list_query: ".$query);
         if ($max_per_page == -1) {
             $max_per_page = $sugar_config['list_max_entries_per_page'];
         }
@@ -3548,14 +3548,14 @@ 
             foreach ($this->field_defs as $field => $value) {
                 if (isset($row[$field])) {
                     $temp->$field = $row[$field];
-                    $owner_field = $field . '_owner';
+                    $owner_field = $field.'_owner';
                     if (isset($row[$owner_field])) {
                         $temp->$owner_field = $row[$owner_field];
                     }
 
-                    $GLOBALS['log']->debug("$temp->object_name({$row['id']}): " . $field . " = " . $temp->$field);
-                } elseif (isset($row[$this->table_name . '.' . $field])) {
-                    $temp->$field = $row[$this->table_name . '.' . $field];
+                    $GLOBALS['log']->debug("$temp->object_name({$row['id']}): ".$field." = ".$temp->$field);
+                } elseif (isset($row[$this->table_name.'.'.$field])) {
+                    $temp->$field = $row[$this->table_name.'.'.$field];
                 } else {
                     $temp->$field = "";
                 }
@@ -3608,22 +3608,22 @@ 
     public function create_list_count_query($query)
     {
         // remove the 'order by' clause which is expected to be at the end of the query
-        $pattern = '/\sORDER BY.*/is';  // ignores the case
+        $pattern = '/\sORDER BY.*/is'; // ignores the case
         $replacement = '';
         $query = preg_replace($pattern, $replacement, $query);
         //handle distinct clause
         $star = '*';
         if (substr_count(strtolower($query), 'distinct')) {
             if (!empty($this->seed) && !empty($this->seed->table_name)) {
-                $star = 'DISTINCT ' . $this->seed->table_name . '.id';
+                $star = 'DISTINCT '.$this->seed->table_name.'.id';
             } else {
-                $star = 'DISTINCT ' . $this->table_name . '.id';
+                $star = 'DISTINCT '.$this->table_name.'.id';
             }
         }
 
         // change the select expression to 'count(*)'
-        $pattern = '/SELECT(.*?)(\s){1}FROM(\s){1}/is';  // ignores the case
-        $replacement = 'SELECT count(' . $star . ') c FROM ';
+        $pattern = '/SELECT(.*?)(\s){1}FROM(\s){1}/is'; // ignores the case
+        $replacement = 'SELECT count('.$star.') c FROM ';
 
         //if the passed query has union clause then replace all instances of the pattern.
         //this is very rare. I have seen this happening only from projects module.
@@ -3639,13 +3639,13 @@ 
                 if (!empty($matches)) {
                     if (stristr($matches[0], "distinct")) {
                         if (!empty($this->seed) && !empty($this->seed->table_name)) {
-                            $star = 'DISTINCT ' . $this->seed->table_name . '.id';
+                            $star = 'DISTINCT '.$this->seed->table_name.'.id';
                         } else {
-                            $star = 'DISTINCT ' . $this->table_name . '.id';
+                            $star = 'DISTINCT '.$this->table_name.'.id';
                         }
                     }
                 } // if
-                $replacement = 'SELECT count(' . $star . ') c FROM ';
+                $replacement = 'SELECT count('.$star.') c FROM ';
                 $union_qs[$key] = preg_replace($pattern, $replacement, $union_query, 1);
             }
             $modified_select_query = implode(" UNION ALL ", $union_qs);
@@ -3711,7 +3711,7 @@ 
             if (empty($where)) {
                 $where = $owner_where;
             } else {
-                $where .= ' AND ' . $owner_where;
+                $where .= ' AND '.$owner_where;
             }
         }
 
@@ -3723,12 +3723,12 @@ 
             $group_where = SecurityGroup::getGroupWhere($this->table_name, $this->module_dir, $current_user->id);
             if (!empty($owner_where)) {
                 if (empty($where)) {
-                    $where = " (" . $owner_where . " or " . $group_where . ") ";
+                    $where = " (".$owner_where." or ".$group_where.") ";
                 } else {
-                    $where .= " AND (" . $owner_where . " or " . $group_where . ") ";
+                    $where .= " AND (".$owner_where." or ".$group_where.") ";
                 }
             } else {
-                $where .= ' AND ' . $group_where;
+                $where .= ' AND '.$group_where;
             }
         }
         /* END - SECURITY GROUPS */
@@ -3757,7 +3757,7 @@ 
     public function process_detail_query($query, $row_offset, $limit = -1, $max_per_page = -1, $where = '', $offset = 0)
     {
         global $sugar_config;
-        $GLOBALS['log']->debug("process_detail_query: " . $query);
+        $GLOBALS['log']->debug("process_detail_query: ".$query);
         if ($max_per_page == -1) {
             $max_per_page = $sugar_config['list_max_entries_per_page'];
         }
@@ -3823,14 +3823,14 @@ 
         }
         $custom_join = $this->getCustomJoin();
 
-        $query = "SELECT $this->table_name.*" . $custom_join['select'] . " FROM $this->table_name ";
+        $query = "SELECT $this->table_name.*".$custom_join['select']." FROM $this->table_name ";
 
         $query .= $custom_join['join'];
-        $query .= " WHERE $this->table_name.id = " . $this->db->quoted($id);
+        $query .= " WHERE $this->table_name.id = ".$this->db->quoted($id);
         if ($deleted) {
             $query .= " AND $this->table_name.deleted=0";
         }
-        $GLOBALS['log']->debug("Retrieve $this->object_name : " . $query);
+        $GLOBALS['log']->debug("Retrieve $this->object_name : ".$query);
         $result = $this->db->limitQuery($query, 0, 1, true, "Retrieving record by id $this->table_name:$id found ");
         if (empty($result)) {
             return null;
@@ -3981,7 +3981,7 @@ 
             }
             if (isset($row[$field])) {
                 $this->$field = $row[$field];
-                $owner = $field . '_owner';
+                $owner = $field.'_owner';
                 if (!empty($row[$owner])) {
                     $this->$owner = $row[$owner];
                 }
@@ -4178,12 +4178,12 @@ 
         $query = 'SELECT id';
         foreach ($fields as $field => $alias) {
             if (!empty($GLOBALS['dictionary'][$object]['fields'][$field]['db_concat_fields'])) {
-                $query .= ' ,' . $this->db->concat($table, $GLOBALS['dictionary'][$object]['fields'][$field]['db_concat_fields']) . ' as ' . $alias;
+                $query .= ' ,'.$this->db->concat($table, $GLOBALS['dictionary'][$object]['fields'][$field]['db_concat_fields']).' as '.$alias;
             } elseif (!empty($GLOBALS['dictionary'][$object]['fields'][$field]) &&
                 (empty($GLOBALS['dictionary'][$object]['fields'][$field]['source']) ||
                     $GLOBALS['dictionary'][$object]['fields'][$field]['source'] != "non-db")
             ) {
-                $query .= ' ,' . $table . '.' . $field . ' as ' . $alias;
+                $query .= ' ,'.$table.'.'.$field.' as '.$alias;
             }
             if (!$return_array) {
                 $this->$alias = '';
@@ -4195,12 +4195,12 @@ 
 
 
         if (isset($GLOBALS['dictionary'][$object]['fields']['assigned_user_id'])) {
-            $query .= " , " . $table . ".assigned_user_id owner";
+            $query .= " , ".$table.".assigned_user_id owner";
         } elseif (isset($GLOBALS['dictionary'][$object]['fields']['created_by'])) {
-            $query .= " , " . $table . ".created_by owner";
+            $query .= " , ".$table.".created_by owner";
         }
-        $query .= ' FROM ' . $table . ' WHERE deleted=0 AND id=';
-        $result = $GLOBALS['db']->query($query . "'$id'");
+        $query .= ' FROM '.$table.' WHERE deleted=0 AND id=';
+        $result = $GLOBALS['db']->query($query."'$id'");
         $row = $GLOBALS['db']->fetchByAssoc($result);
         if ($return_array) {
             return $row;
@@ -4208,9 +4208,9 @@ 
         $owner = (empty($row['owner'])) ? '' : $row['owner'];
         foreach ($fields as $alias) {
             $this->$alias = (!empty($row[$alias])) ? $row[$alias] : '';
-            $alias = $alias . '_owner';
+            $alias = $alias.'_owner';
             $this->$alias = $owner;
-            $a_mod = $alias . '_mod';
+            $a_mod = $alias.'_mod';
             $this->$a_mod = $module;
         }
     }
@@ -4370,15 +4370,15 @@ 
         $entire_where = $query_array['where'];
         if (!empty($where)) {
             if (empty($entire_where)) {
-                $entire_where = ' WHERE ' . $where;
+                $entire_where = ' WHERE '.$where;
             } else {
-                $entire_where .= ' AND ' . $where;
+                $entire_where .= ' AND '.$where;
             }
         }
 
-        $query = 'SELECT ' . $child_seed->table_name . '.* ' . $query_array['from'] . ' ' . $entire_where;
+        $query = 'SELECT '.$child_seed->table_name.'.* '.$query_array['from'].' '.$entire_where;
         if (!empty($order_by)) {
-            $query .= " ORDER BY " . $order_by;
+            $query .= " ORDER BY ".$order_by;
         }
 
         return $child_seed->process_list_query($query, $row_offset, $limit, $max, $where);
@@ -4414,9 +4414,9 @@ 
      */
     public function process_full_list_query($query, $check_date = false)
     {
-        $GLOBALS['log']->debug("process_full_list_query: query is " . $query);
+        $GLOBALS['log']->debug("process_full_list_query: query is ".$query);
         $result = $this->db->query($query, false);
-        $GLOBALS['log']->debug("process_full_list_query: result is " . print_r($result, true));
+        $GLOBALS['log']->debug("process_full_list_query: result is ".print_r($result, true));
         $class = get_class($this);
         $isFirstTime = true;
         $bean = new $class();
@@ -4432,7 +4432,7 @@ 
             foreach ($bean->field_defs as $field => $value) {
                 if (isset($row[$field])) {
                     $bean->$field = $row[$field];
-                    $GLOBALS['log']->debug("process_full_list: $bean->object_name({$row['id']}): " . $field . " = " . $bean->$field);
+                    $GLOBALS['log']->debug("process_full_list: $bean->object_name({$row['id']}): ".$field." = ".$bean->$field);
                 } else {
                     $bean->$field = '';
                 }
@@ -4524,7 +4524,7 @@ 
         $this->call_custom_logic("before_restore", $custom_logic_arguments);
 
         $date_modified = $GLOBALS['timedate']->nowDb();
-        $query = "UPDATE $this->table_name set deleted=0 , date_modified = '$date_modified' where id='" . $this->db->quote($id) . "'";
+        $query = "UPDATE $this->table_name set deleted=0 , date_modified = '$date_modified' where id='".$this->db->quote($id)."'";
         $this->db->query($query, true, "Error marking record undeleted: ");
 
         $this->restoreFiles();
@@ -4554,9 +4554,9 @@ 
         $directory = $this->deleteFileDirectory();
 
         foreach ($files as $file) {
-            if (sugar_is_file('upload://deleted/' . $directory . '/' . $file)) {
-                if (!sugar_rename('upload://deleted/' . $directory . '/' . $file, 'upload://' . $file)) {
-                    $GLOBALS['log']->error('Could not move file ' . $directory . '/' . $file . ' from deleted directory');
+            if (sugar_is_file('upload://deleted/'.$directory.'/'.$file)) {
+                if (!sugar_rename('upload://deleted/'.$directory.'/'.$file, 'upload://'.$file)) {
+                    $GLOBALS['log']->error('Could not move file '.$directory.'/'.$file.' from deleted directory');
                 }
             }
         }
@@ -4565,7 +4565,7 @@ 
          * @var DBManager $db
          */
         global $db;
-        $db->query('DELETE FROM cron_remove_documents WHERE bean_id=' . $db->quoted($this->id));
+        $db->query('DELETE FROM cron_remove_documents WHERE bean_id='.$db->quoted($this->id));
 
         return true;
     }
@@ -4713,19 +4713,19 @@ 
 
         $directory = $this->deleteFileDirectory();
 
-        $isCreated = sugar_is_dir('upload://deleted/' . $directory);
+        $isCreated = sugar_is_dir('upload://deleted/'.$directory);
         if (!$isCreated) {
-            sugar_mkdir('upload://deleted/' . $directory, 0777, true);
-            $isCreated = sugar_is_dir('upload://deleted/' . $directory);
+            sugar_mkdir('upload://deleted/'.$directory, 0777, true);
+            $isCreated = sugar_is_dir('upload://deleted/'.$directory);
         }
         if (!$isCreated) {
             return false;
         }
 
         foreach ($files as $file) {
-            if (file_exists('upload://' . $file)) {
-                if (!sugar_rename('upload://' . $file, 'upload://deleted/' . $directory . '/' . $file)) {
-                    $GLOBALS['log']->error('Could not move file ' . $file . ' to deleted directory');
+            if (file_exists('upload://'.$file)) {
+                if (!sugar_rename('upload://'.$file, 'upload://deleted/'.$directory.'/'.$file)) {
+                    $GLOBALS['log']->error('Could not move file '.$file.' to deleted directory');
                 }
             }
         }
@@ -4745,7 +4745,7 @@ 
         }
         if (empty($record['id'])) {
             $record['id'] = $db->quoted(create_guid());
-            $db->query('INSERT INTO cron_remove_documents (' . implode(', ', array_keys($record)) . ') VALUES(' . implode(', ', $record) . ')');
+            $db->query('INSERT INTO cron_remove_documents ('.implode(', ', array_keys($record)).') VALUES('.implode(', ', $record).')');
         } else {
             $db->query("UPDATE cron_remove_documents SET date_modified={$record['date_modified']} WHERE id={$record['id']}");
         }
@@ -4766,7 +4766,7 @@ 
      */
     public function build_related_list($query, &$template, $row_offset = 0, $limit = -1)
     {
-        $GLOBALS['log']->debug("Finding linked records $this->object_name: " . $query);
+        $GLOBALS['log']->debug("Finding linked records $this->object_name: ".$query);
         $db = DBManagerFactory::getInstance('listviews');
 
         if (!empty($row_offset) && $row_offset != 0 && !empty($limit) && $limit != -1) {
@@ -4813,7 +4813,7 @@ 
     {
         $db = DBManagerFactory::getInstance('listviews');
         // No need to do an additional query
-        $GLOBALS['log']->debug("Finding linked records $this->object_name: " . $query);
+        $GLOBALS['log']->debug("Finding linked records $this->object_name: ".$query);
         if (empty($in) && !empty($query)) {
             $idList = $this->build_related_in($query);
             $in = $idList['in'];
@@ -4879,9 +4879,9 @@ 
         while ($row = $this->db->fetchByAssoc($result)) {
             $idList[] = $row['id'];
             if (empty($ids)) {
-                $ids = "('" . $row['id'] . "'";
+                $ids = "('".$row['id']."'";
             } else {
-                $ids .= ",'" . $row['id'] . "'";
+                $ids .= ",'".$row['id']."'";
             }
         }
         if (empty($ids)) {
@@ -4905,7 +4905,7 @@ 
      */
     public function build_related_list2($query, &$template, &$field_list)
     {
-        $GLOBALS['log']->debug("Finding linked values $this->object_name: " . $query);
+        $GLOBALS['log']->debug("Finding linked values $this->object_name: ".$query);
 
         $result = $this->db->query($query, true);
 
@@ -5019,9 +5019,9 @@ 
     {
         $where_clause = $this->get_where($fields_array, $deleted);
         $custom_join = $this->getCustomJoin();
-        $query = "SELECT $this->table_name.*" . $custom_join['select'] . " FROM $this->table_name " . $custom_join['join'];
+        $query = "SELECT $this->table_name.*".$custom_join['select']." FROM $this->table_name ".$custom_join['join'];
         $query .= " $where_clause";
-        $GLOBALS['log']->debug("Retrieve $this->object_name: " . $query);
+        $GLOBALS['log']->debug("Retrieve $this->object_name: ".$query);
         //requireSingleResult has been deprecated.
         //$result = $this->db->requireSingleResult($query, true, "Retrieving record $where_clause:");
         $result = $this->db->limitQuery($query, 0, 1, true, "Retrieving record $where_clause:");
@@ -5060,7 +5060,7 @@ 
             }
             $name = $this->db->getValidDBName($name);
 
-            $where_clause .= "$name = " . $this->db->quoted($value);
+            $where_clause .= "$name = ".$this->db->quoted($value);
         }
         if (!empty($where_clause)) {
             if ($deleted) {
@@ -5158,7 +5158,7 @@ 
         $where = '';
 
         // make sure there is a date modified
-        $date_modified = $this->db->convert("'" . $GLOBALS['timedate']->nowDb() . "'", 'datetime');
+        $date_modified = $this->db->convert("'".$GLOBALS['timedate']->nowDb()."'", 'datetime');
 
         $row = null;
         if ($check_duplicates) {
@@ -5168,7 +5168,7 @@ 
                 $where .= " AND $name = '$value' ";
             }
             $query .= $where;
-            $result = $this->db->query($query, false, "Looking For Duplicate Relationship:" . $query);
+            $result = $this->db->query($query, false, "Looking For Duplicate Relationship:".$query);
             $row = $this->db->fetchByAssoc($result);
         }
 
@@ -5177,16 +5177,16 @@ 
             if (isset($data_values)) {
                 $relate_values = array_merge($relate_values, $data_values);
             }
-            $query = "INSERT INTO $table (id, " . implode(',', array_keys($relate_values)) . ", date_modified) VALUES ('" . create_guid() . "', " . "'" . implode("', '", $relate_values) . "', " . $date_modified . ")";
+            $query = "INSERT INTO $table (id, ".implode(',', array_keys($relate_values)).", date_modified) VALUES ('".create_guid()."', "."'".implode("', '", $relate_values)."', ".$date_modified.")";
 
-            $this->db->query($query, false, "Creating Relationship:" . $query);
+            $this->db->query($query, false, "Creating Relationship:".$query);
         } elseif ($do_update) {
             $conds = array();
             foreach ($data_values as $key => $value) {
-                array_push($conds, $key . "='" . $this->db->quote($value) . "'");
+                array_push($conds, $key."='".$this->db->quote($value)."'");
             }
-            $query = "UPDATE $table SET " . implode(',', $conds) . ",date_modified=" . $date_modified . " " . $where;
-            $this->db->query($query, false, "Updating Relationship:" . $query);
+            $query = "UPDATE $table SET ".implode(',', $conds).",date_modified=".$date_modified." ".$where;
+            $this->db->query($query, false, "Updating Relationship:".$query);
         }
     }
 
@@ -5197,7 +5197,7 @@ 
             $query .= " AND $name = '$value' ";
         }
         $query .= " ORDER BY $select_id ";
-        $result = $this->db->query($query, false, "Retrieving Relationship:" . $query);
+        $result = $this->db->query($query, false, "Retrieving Relationship:".$query);
         $ids = array();
         while ($row = $this->db->fetchByAssoc($result)) {
             $ids[] = $row;
@@ -5208,13 +5208,13 @@ 
     public function loadLayoutDefs()
     {
         global $layout_defs;
-        if (empty($this->layout_def) && file_exists('modules/' . $this->module_dir . '/layout_defs.php')) {
-            include_once('modules/' . $this->module_dir . '/layout_defs.php');
-            if (file_exists('custom/modules/' . $this->module_dir . '/Ext/Layoutdefs/layoutdefs.ext.php')) {
-                include_once('custom/modules/' . $this->module_dir . '/Ext/Layoutdefs/layoutdefs.ext.php');
+        if (empty($this->layout_def) && file_exists('modules/'.$this->module_dir.'/layout_defs.php')) {
+            include_once('modules/'.$this->module_dir.'/layout_defs.php');
+            if (file_exists('custom/modules/'.$this->module_dir.'/Ext/Layoutdefs/layoutdefs.ext.php')) {
+                include_once('custom/modules/'.$this->module_dir.'/Ext/Layoutdefs/layoutdefs.ext.php');
             }
             if (empty($layout_defs[get_class($this)])) {
-                echo "\$layout_defs[" . get_class($this) . "]; does not exist";
+                echo "\$layout_defs[".get_class($this)."]; does not exist";
             }
 
             $this->layout_def = $layout_defs[get_class($this)];
@@ -5440,8 +5440,8 @@ 
         $tmp = explode(",", $order_by);
         $comma = ' ';
         foreach ($tmp as $stmp) {
-            $stmp = (substr_count($stmp, ".") > 0 ? trim($stmp) : "$qualify." . trim($stmp));
-            $order_by_clause .= $comma . $stmp;
+            $stmp = (substr_count($stmp, ".") > 0 ? trim($stmp) : "$qualify.".trim($stmp));
+            $order_by_clause .= $comma.$stmp;
             $comma = ", ";
         }
         return $order_by_clause;
@@ -5457,19 +5457,19 @@ 
         $street_field
     ) {
         if (isset($this->$street_field)) {
-            $street_field_2 = $street_field . '_2';
-            $street_field_3 = $street_field . '_3';
-            $street_field_4 = $street_field . '_4';
+            $street_field_2 = $street_field.'_2';
+            $street_field_3 = $street_field.'_3';
+            $street_field_4 = $street_field.'_4';
             if (isset($this->$street_field_2)) {
-                $this->$street_field .= "\n" . $this->$street_field_2;
+                $this->$street_field .= "\n".$this->$street_field_2;
                 unset($this->$street_field_2);
             }
             if (isset($this->$street_field_3)) {
-                $this->$street_field .= "\n" . $this->$street_field_3;
+                $this->$street_field .= "\n".$this->$street_field_3;
                 unset($this->$street_field_3);
             }
             if (isset($this->$street_field_4)) {
-                $this->$street_field .= "\n" . $this->$street_field_4;
+                $this->$street_field .= "\n".$this->$street_field_4;
                 unset($this->$street_field_4);
             }
             $this->$street_field = trim($this->$street_field, "\n");

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,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($seed, $module, $subPanel, $options);

ModuleInstall/PackageManager/PackageController.php

Spacing +76 added lines, -76 removed lines

@@ -39,23 +39,23 @@ 
 
  require_once('ModuleInstall/PackageManager/PackageManagerDisplay.php');
  require_once('ModuleInstall/PackageManager/PackageManager.php');
- class PackageController{
+ class PackageController {
         var $_pm;
 
         /**
          * Constructor: this class is called from the the ajax call and handles invoking the correct
          * functionality on the server.
          */
-        function __construct(){
+        function __construct() {
            $this->_pm = new PackageManager();
         }
 
     /**
      * @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 PackageController(){
+    function PackageController() {
         $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 {
@@ -65,18 +65,18 @@ 
     }
 
 
-        function performBasicSearch(){
+        function performBasicSearch() {
             $json = getJSONobj();
             $search_term = '';
             $node_id = '';
-             if(isset($_REQUEST['search_term'])) {
+             if (isset($_REQUEST['search_term'])) {
                 $search_term = nl2br($_REQUEST['search_term']);
             }
-             if(isset($_REQUEST['node_id'])) {
+             if (isset($_REQUEST['node_id'])) {
                 $node_id = nl2br($_REQUEST['node_id']);
             }
             $xml = PackageManager::getPackages($node_id);
-            echo 'result = ' . $json->encode(array('packages' => $xml));
+            echo 'result = '.$json->encode(array('packages' => $xml));
         }
 
         /**
@@ -87,33 +87,33 @@ 
          * @return packages     xml string consisting of the packages and releases which belong to
          *                      the category
          */
-        function getPackages(){
+        function getPackages() {
             $json = getJSONobj();
             $category_id = '';
 
-             if(isset($_REQUEST['category_id'])) {
+             if (isset($_REQUEST['category_id'])) {
                 $category_id = nl2br($_REQUEST['category_id']);
             }
             $xml = PackageManager::getPackages($category_id);
-            echo 'result = ' . $json->encode(array('package_output' => $xml));
+            echo 'result = '.$json->encode(array('package_output' => $xml));
         }
 
         /**
          * Obtain a list of releases from the server.  This function is currently used for generating the patches/langpacks for upgrade wizard
          * as well as during installation
          */
-        function getReleases(){
+        function getReleases() {
             $json = getJSONobj();
             $category_id = '';
        		$package_id = '';
        		$types = '';
-            if(isset($_REQUEST['category_id'])) {
+            if (isset($_REQUEST['category_id'])) {
                 $category_id = nl2br($_REQUEST['category_id']);
             }
-            if(isset($_REQUEST['package_id'])) {
+            if (isset($_REQUEST['package_id'])) {
                 $package_id = nl2br($_REQUEST['package_id']);
             }
-            if(isset($_REQUEST['types'])) {
+            if (isset($_REQUEST['types'])) {
                 $types = nl2br($_REQUEST['types']);
             }
             $types = explode(',', $types);
@@ -122,9 +122,9 @@ 
           	$count = count($types);
           	$index = 1;
           	$type_str = '';
-          	foreach($types as $type){
+          	foreach ($types as $type) {
           		$type_str .= "'".$type."'";
-          		if($index < $count)
+          		if ($index < $count)
           			$type_str .= ",";
           		$index++;
           	}
@@ -134,24 +134,24 @@ 
             $releases = PackageManager::getReleases($category_id, $package_id, $filter);
             $nodes = array();
             $release_map = array();
-            foreach($releases['packages'] as $release){
+            foreach ($releases['packages'] as $release) {
             	$release = PackageManager::fromNameValueList($release);
 				$nodes[] = array('description' => $release['description'], 'version' => $release['version'], 'build_number' => $release['build_number'], 'id' => $release['id']);
         		$release_map[$release['id']] = array('package_id' => $release['package_id'], 'category_id' => $release['category_id']);
         	}
         	$_SESSION['ML_PATCHES'] = $release_map;
-            echo 'result = ' . $json->encode(array('releases' => $nodes));
+            echo 'result = '.$json->encode(array('releases' => $nodes));
         }
 
         /**
          * Obtain a promotion from the depot
          */
-        function getPromotion(){
+        function getPromotion() {
             $json = getJSONobj();
 
             $header = PackageManager::getPromotion();
 
-            echo 'result = ' . $json->encode(array('promotion' => $header));
+            echo 'result = '.$json->encode(array('promotion' => $header));
         }
 
         /**
@@ -162,34 +162,34 @@ 
          * @param release_id   this is passed via POST and is the release id of the release we wish to download
          * @return bool         true is successful in downloading, false otherwise
          */
-        function download(){
+        function download() {
             global $sugar_config;
             $json = getJSONobj();
             $package_id = '';
-            $category_id  = '';
+            $category_id = '';
             $release_id = '';
-            if(isset($_REQUEST['package_id'])) {
+            if (isset($_REQUEST['package_id'])) {
                 $package_id = nl2br($_REQUEST['package_id']);
             }
-            if(isset($_REQUEST['category_id'])) {
+            if (isset($_REQUEST['category_id'])) {
                 $category_id = nl2br($_REQUEST['category_id']);
             }
-            if(isset($_REQUEST['release_id'])) {
+            if (isset($_REQUEST['release_id'])) {
                 $release_id = nl2br($_REQUEST['release_id']);
             }
             $GLOBALS['log']->debug("PACKAGE ID: ".$package_id);
             $GLOBALS['log']->debug("CATEGORY ID: ".$category_id);
             $GLOBALS['log']->debug("RELEASE ID: ".$release_id);
             $result = $this->_pm->download($category_id, $package_id, $release_id);
-            $GLOBALS['log']->debug("RESULT: ".print_r($result,true));
+            $GLOBALS['log']->debug("RESULT: ".print_r($result, true));
             $success = 'false';
-            if($result != null){
+            if ($result != null) {
                 $GLOBALS['log']->debug("Performing Setup");
                 $this->_pm->performSetup($result, 'module', false);
                 $GLOBALS['log']->debug("Complete Setup");
                 $success = 'true';
             }
-            echo 'result = ' . $json->encode(array('success' => $success));
+            echo 'result = '.$json->encode(array('success' => $success));
         }
 
          /**
@@ -198,27 +198,27 @@ 
          * @param id - the id of the parent_category, -1 if this is the root
          * @return array - a list of categories/nodes which are underneath this node
          */
-        function getCategories(){
+        function getCategories() {
             $json = getJSONobj();
             $node_id = '';
-             if(isset($_REQUEST['category_id'])) {
+             if (isset($_REQUEST['category_id'])) {
                 $node_id = nl2br($_REQUEST['category_id']);
             }
             $GLOBALS['log']->debug("NODE ID: ".$node_id);
             $nodes = PackageManager::getCategories($node_id);
-            echo 'result = ' . $json->encode(array('nodes' => $nodes));
+            echo 'result = '.$json->encode(array('nodes' => $nodes));
         }
 
-         function getNodes(){
+         function getNodes() {
             $json = getJSONobj();
             $category_id = '';
-             if(isset($_REQUEST['category_id'])) {
+             if (isset($_REQUEST['category_id'])) {
                 $category_id = nl2br($_REQUEST['category_id']);
             }
             $GLOBALS['log']->debug("CATEGORY ID: ".$category_id);
             $nodes = PackageManager::getModuleLoaderCategoryPackages($category_id);
             $GLOBALS['log']->debug(var_export($nodes, true));
-            echo 'result = ' . $json->encode(array('nodes' => $nodes));
+            echo 'result = '.$json->encode(array('nodes' => $nodes));
         }
 
         /**
@@ -226,18 +226,18 @@ 
          * @param type      the type to check for
          * @return array    return an array of releases for each given installed object if an update is found
          */
-        function checkForUpdates(){
+        function checkForUpdates() {
             $json = getJSONobj();
             $type = '';
-             if(isset($_REQUEST['type'])) {
+             if (isset($_REQUEST['type'])) {
                 $type = nl2br($_REQUEST['type']);
             }
             $pm = new PackageManager();
             $updates = $pm->checkForUpdates();
             $nodes = array();
 			$release_map = array();
-            if(!empty($updates)){
-	            foreach($updates as $update){
+            if (!empty($updates)) {
+	            foreach ($updates as $update) {
 	            	$update = PackageManager::fromNameValueList($update);
 	            	$nodes[] = array('label' => $update['name'], 'description' => $update['description'], 'version' => $update['version'], 'build_number' => $update['build_number'], 'id' => $update['id'], 'type' => $update['type']);
 					$release_map[$update['id']] = array('package_id' => $update['package_id'], 'category_id' => $update['category_id'], 'type' => $update['type']);
@@ -246,115 +246,115 @@ 
            //patches
            $filter = array(array('name' => 'type', 'value' => "'patch'"));
             $releases = $pm->getReleases('', '', $filter);
-            if(!empty($releases['packages'])){
-            	foreach($releases['packages'] as $update){
+            if (!empty($releases['packages'])) {
+            	foreach ($releases['packages'] as $update) {
 	            	$update = PackageManager::fromNameValueList($update);
 					$nodes[] = array('label' => $update['name'], 'description' => $update['description'], 'version' => $update['version'], 'build_number' => $update['build_number'], 'id' => $update['id'], 'type' => $update['type']);
 					$release_map[$update['id']] = array('package_id' => $update['package_id'], 'category_id' => $update['category_id'], 'type' => $update['type']);
 	            }
             }
 			$_SESSION['ML_PATCHES'] = $release_map;
-            echo 'result = ' . $json->encode(array('updates' => $nodes));
+            echo 'result = '.$json->encode(array('updates' => $nodes));
         }
 
-        function getLicenseText(){
+        function getLicenseText() {
             $json = getJSONobj();
             $file = '';
-            if(isset($_REQUEST['file'])) {
+            if (isset($_REQUEST['file'])) {
                 $file = hashToFile($_REQUEST['file']);
             }
             $GLOBALS['log']->debug("FILE : ".$file);
-            echo 'result = ' . $json->encode(array('license_display' => PackageManagerDisplay::buildLicenseOutput($file)));
+            echo 'result = '.$json->encode(array('license_display' => PackageManagerDisplay::buildLicenseOutput($file)));
         }
 
         /**
          *  build the list of modules that are currently in the staging area waiting to be installed
          */
-        function getPackagesInStaging(){
+        function getPackagesInStaging() {
             $packages = $this->_pm->getPackagesInStaging('module');
             $json = getJSONobj();
 
-            echo 'result = ' . $json->encode(array('packages' => $packages));
+            echo 'result = '.$json->encode(array('packages' => $packages));
         }
 
         /**
          *  build the list of modules that are currently in the staging area waiting to be installed
          */
-        function performInstall(){
+        function performInstall() {
             $file = '';
-             if(isset($_REQUEST['file'])) {
+             if (isset($_REQUEST['file'])) {
                 $file = hashToFile($_REQUEST['file']);
             }
-          	if(!empty($file)){
+          	if (!empty($file)) {
 	            $this->_pm->performInstall($file);
 			}
             $json = getJSONobj();
 
-            echo 'result = ' . $json->encode(array('result' => 'success'));
+            echo 'result = '.$json->encode(array('result' => 'success'));
         }
 
-        function authenticate(){
+        function authenticate() {
             $json = getJSONobj();
             $username = '';
             $password = '';
             $servername = '';
             $terms_checked = '';
-            if(isset($_REQUEST['username'])) {
+            if (isset($_REQUEST['username'])) {
                 $username = nl2br($_REQUEST['username']);
             }
-            if(isset($_REQUEST['password'])) {
+            if (isset($_REQUEST['password'])) {
                 $password = nl2br($_REQUEST['password']);
             }
-       		 if(isset($_REQUEST['servername'])) {
+       		 if (isset($_REQUEST['servername'])) {
                 $servername = $_REQUEST['servername'];
             }
-            if(isset($_REQUEST['terms_checked'])) {
+            if (isset($_REQUEST['terms_checked'])) {
                 $terms_checked = $_REQUEST['terms_checked'];
-                if($terms_checked == 'on')
+                if ($terms_checked == 'on')
                 	$terms_checked = true;
             }
 
-            if(!empty($username) && !empty($password)){
+            if (!empty($username) && !empty($password)) {
                 $password = md5($password);
                 $result = PackageManager::authenticate($username, $password, $servername, $terms_checked);
-                if(!is_array($result) && $result == true)
+                if (!is_array($result) && $result == true)
                     $status  = 'success';
                 else
                     $status  = $result['faultstring'];
-            }else{
-                $status  = 'failed';
+            } else {
+                $status = 'failed';
             }
 
-            echo 'result = ' . $json->encode(array('status' => $status));
+            echo 'result = '.$json->encode(array('status' => $status));
         }
 
-        function getDocumentation(){
+        function getDocumentation() {
         	$json = getJSONobj();
             $package_id = '';
             $release_id = '';
 
-            if(isset($_REQUEST['package_id'])) {
+            if (isset($_REQUEST['package_id'])) {
                 $package_id = nl2br($_REQUEST['package_id']);
             }
-            if(isset($_REQUEST['release_id'])) {
+            if (isset($_REQUEST['release_id'])) {
                 $release_id = nl2br($_REQUEST['release_id']);
             }
 
             $documents = PackageManager::getDocumentation($package_id, $release_id);
             $GLOBALS['log']->debug("DOCUMENTS: ".var_export($documents, true));
-            echo 'result = ' . $json->encode(array('documents' => $documents));
+            echo 'result = '.$json->encode(array('documents' => $documents));
         }
 
-        function downloadedDocumentation(){
+        function downloadedDocumentation() {
         	$json = getJSONobj();
             $document_id = '';
 
-            if(isset($_REQUEST['document_id'])) {
+            if (isset($_REQUEST['document_id'])) {
                 $document_id = nl2br($_REQUEST['document_id']);
             }
              $GLOBALS['log']->debug("Downloading Document: ".$document_id);
             PackageManagerComm::downloadedDocumentation($document_id);
-            echo 'result = ' . $json->encode(array('result' => 'true'));
+            echo 'result = '.$json->encode(array('result' => 'true'));
         }
 
         /**
@@ -365,27 +365,27 @@ 
          */
         protected function rmMetaFile($file, $meta)
         {
-            $metafile = pathinfo($file, PATHINFO_DIRNAME)."/". pathinfo($file, PATHINFO_FILENAME)."-$meta.php";
-            if(file_exists($metafile)) {
+            $metafile = pathinfo($file, PATHINFO_DIRNAME)."/".pathinfo($file, PATHINFO_FILENAME)."-$meta.php";
+            if (file_exists($metafile)) {
                 unlink($metafile);
             }
         }
 
- 		function remove(){
+ 		function remove() {
         	$json = getJSONobj();
             $file = '';
 
-            if(isset($_REQUEST['file'])) {
+            if (isset($_REQUEST['file'])) {
                  $file = urldecode(hashToFile($_REQUEST['file']));
             }
             $GLOBALS['log']->debug("FILE TO REMOVE: ".$file);
-            if(!empty($file)){
+            if (!empty($file)) {
             	unlink($file);
-            	foreach(array("manifest", "icon") as $meta) {
+            	foreach (array("manifest", "icon") as $meta) {
             	    $this->rmMetaFile($file, $meta);
             	}
             }
-            echo 'result = ' . $json->encode(array('result' => 'true'));
+            echo 'result = '.$json->encode(array('result' => 'true'));
         }
  }
 ?>

Braces +13 added lines, -11 removed lines

@@ -57,8 +57,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();
@@ -124,8 +123,9 @@ 
           	$type_str = '';
           	foreach($types as $type){
           		$type_str .= "'".$type."'";
-          		if($index < $count)
-          			$type_str .= ",";
+          		if($index < $count) {
+          		          			$type_str .= ",";
+          		}
           		$index++;
           	}
 
@@ -310,18 +310,20 @@ 
             }
             if(isset($_REQUEST['terms_checked'])) {
                 $terms_checked = $_REQUEST['terms_checked'];
-                if($terms_checked == 'on')
-                	$terms_checked = true;
+                if($terms_checked == 'on') {
+                                	$terms_checked = true;
+                }
             }
 
             if(!empty($username) && !empty($password)){
                 $password = md5($password);
                 $result = PackageManager::authenticate($username, $password, $servername, $terms_checked);
-                if(!is_array($result) && $result == true)
-                    $status  = 'success';
-                else
-                    $status  = $result['faultstring'];
-            }else{
+                if(!is_array($result) && $result == true) {
+                                    $status  = 'success';
+                } else {
+                                    $status  = $result['faultstring'];
+                }
+            } else{
                 $status  = 'failed';
             }
 

ModuleInstall/PackageManager/PackageManager.php

Indentation +281 added lines, -281 removed lines

@@ -89,7 +89,7 @@ 
             $name_value_list = PackageManager::fromNameValueList($name_value_list);
             return $name_value_list['description'];
         }else {
-           return '';
+            return '';
         }
     }
 
@@ -97,10 +97,10 @@ 
      * Obtain a list of category/packages/releases for use within the module loader
      */
     function getModuleLoaderCategoryPackages($category_id = ''){
-    	$filter = array();
-    	$filter = array('type' => "'module', 'theme', 'langpack'");
-    	$filter = PackageManager::toNameValueList($filter);
-    	return PackageManager::getCategoryPackages($category_id, $filter);
+        $filter = array();
+        $filter = array('type' => "'module', 'theme', 'langpack'");
+        $filter = PackageManager::toNameValueList($filter);
+        return PackageManager::getCategoryPackages($category_id, $filter);
     }
 
     /**
@@ -108,41 +108,41 @@ 
      * @return category_packages
      */
     function getCategoryPackages($category_id = '', $filter = array()){
-         $results = PackageManagerComm::getCategoryPackages($category_id, $filter);
-         PackageManagerComm::errorCheck();
-         $nodes = array();
+            $results = PackageManagerComm::getCategoryPackages($category_id, $filter);
+            PackageManagerComm::errorCheck();
+            $nodes = array();
 
         $nodes[$category_id]['packages'] = array();
         if(!empty($results['categories'])){
-	         foreach($results['categories'] as $category){
-	            $mycat = PackageManager::fromNameValueList($category);
-	            $nodes[$mycat['id']] = array('id' => $mycat['id'], 'label' => $mycat['name'], 'description' => $mycat['description'], 'type' => 'cat', 'parent' => $mycat['parent_id']);
-	            $nodes[$mycat['id']]['packages'] = array();
-	         }
-        }
-         if(!empty($results['packages'])){
-	        $uh = new UpgradeHistory();
-	         foreach($results['packages'] as $package){
-	            $mypack = PackageManager::fromNameValueList($package);
-	            $nodes[$mypack['category_id']]['packages'][$mypack['id']] = array('id' => $mypack['id'], 'label' => $mypack['name'], 'description' => $mypack['description'], 'category_id' => $mypack['category_id'], 'type' => 'package');
-	            $releases = PackageManager::getReleases($category_id, $mypack['id'], $filter);
-	            $arr_releases = array();
-	            $nodes[$mypack['category_id']]['packages'][$mypack['id']]['releases'] = array();
-	            if(!empty($releases['packages'])){
-		            foreach($releases['packages'] as $release){
-		                 $myrelease = PackageManager::fromNameValueList($release);
-		                 //check to see if we already this one installed
-		                 $result = $uh->determineIfUpgrade($myrelease['id_name'], $myrelease['version']);
-		                 $enable = false;
-		                 if($result == true || is_array($result))
-		                	 $enable = true;
-		                 $nodes[$mypack['category_id']]['packages'][$mypack['id']]['releases'][$myrelease['id']] = array('id' => $myrelease['id'], 'version' => $myrelease['version'], 'label' => $myrelease['description'], 'category_id' => $mypack['category_id'], 'package_id' => $mypack['id'], 'type' => 'release', 'enable' => $enable);
-		           	}
-	            }
-	            //array_push($nodes[$mypack['category_id']]['packages'], $package_arr);
-	         }
-         }
-         $GLOBALS['log']->debug("NODES". var_export($nodes, true));
+                foreach($results['categories'] as $category){
+                $mycat = PackageManager::fromNameValueList($category);
+                $nodes[$mycat['id']] = array('id' => $mycat['id'], 'label' => $mycat['name'], 'description' => $mycat['description'], 'type' => 'cat', 'parent' => $mycat['parent_id']);
+                $nodes[$mycat['id']]['packages'] = array();
+                }
+        }
+            if(!empty($results['packages'])){
+            $uh = new UpgradeHistory();
+                foreach($results['packages'] as $package){
+                $mypack = PackageManager::fromNameValueList($package);
+                $nodes[$mypack['category_id']]['packages'][$mypack['id']] = array('id' => $mypack['id'], 'label' => $mypack['name'], 'description' => $mypack['description'], 'category_id' => $mypack['category_id'], 'type' => 'package');
+                $releases = PackageManager::getReleases($category_id, $mypack['id'], $filter);
+                $arr_releases = array();
+                $nodes[$mypack['category_id']]['packages'][$mypack['id']]['releases'] = array();
+                if(!empty($releases['packages'])){
+                    foreach($releases['packages'] as $release){
+                            $myrelease = PackageManager::fromNameValueList($release);
+                            //check to see if we already this one installed
+                            $result = $uh->determineIfUpgrade($myrelease['id_name'], $myrelease['version']);
+                            $enable = false;
+                            if($result == true || is_array($result))
+                                $enable = true;
+                            $nodes[$mypack['category_id']]['packages'][$mypack['id']]['releases'][$myrelease['id']] = array('id' => $myrelease['id'], 'version' => $myrelease['version'], 'label' => $myrelease['description'], 'category_id' => $mypack['category_id'], 'package_id' => $mypack['id'], 'type' => 'release', 'enable' => $enable);
+                        }
+                }
+                //array_push($nodes[$mypack['category_id']]['packages'], $package_arr);
+                }
+            }
+            $GLOBALS['log']->debug("NODES". var_export($nodes, true));
         return $nodes;
     }
 
@@ -157,10 +157,10 @@ 
         $results = PackageManagerComm::getCategories($category_id, $filter);
         PackageManagerComm::errorCheck();
         if(!empty($results['categories'])){
-	        foreach($results['categories'] as $category){
-	            $mycat = PackageManager::fromNameValueList($category);
-	            $nodes[] = array('id' => $mycat['id'], 'label' => $mycat['name'], 'description' => $mycat['description'], 'type' => 'cat', 'parent' => $mycat['parent_id']);
-	        }
+            foreach($results['categories'] as $category){
+                $mycat = PackageManager::fromNameValueList($category);
+                $nodes[] = array('id' => $mycat['id'], 'label' => $mycat['name'], 'description' => $mycat['description'], 'type' => 'cat', 'parent' => $mycat['parent_id']);
+            }
         }
         return $nodes;
     }
@@ -173,17 +173,17 @@ 
         //$xml = '';
         //$xml .= '<packages>';
         if(!empty($results['packages'])){
-	        foreach($results['packages'] as $package){
-	            $mypack = PackageManager::fromNameValueList($package);
-	            $packages[$mypack['id']] = array('package_id' => $mypack['id'], 'name' => $mypack['name'], 'description' => $mypack['description'], 'category_id' => $mypack['category_id']);
-	            $releases = PackageManager::getReleases($category_id, $mypack['id']);
-	            $arr_releases = array();
-	            foreach($releases['packages'] as $release){
-	                 $myrelease = PackageManager::fromNameValueList($release);
-	                 $arr_releases[$myrelease['id']]  = array('release_id' => $myrelease['id'], 'version' => $myrelease['version'], 'description' => $myrelease['description'], 'category_id' => $mypack['category_id'], 'package_id' => $mypack['id']);
-	            }
-	            $packages[$mypack['id']]['releases'] = $arr_releases;
-	        }
+            foreach($results['packages'] as $package){
+                $mypack = PackageManager::fromNameValueList($package);
+                $packages[$mypack['id']] = array('package_id' => $mypack['id'], 'name' => $mypack['name'], 'description' => $mypack['description'], 'category_id' => $mypack['category_id']);
+                $releases = PackageManager::getReleases($category_id, $mypack['id']);
+                $arr_releases = array();
+                foreach($releases['packages'] as $release){
+                        $myrelease = PackageManager::fromNameValueList($release);
+                        $arr_releases[$myrelease['id']]  = array('release_id' => $myrelease['id'], 'version' => $myrelease['version'], 'description' => $myrelease['description'], 'category_id' => $mypack['category_id'], 'package_id' => $mypack['id']);
+                }
+                $packages[$mypack['id']]['releases'] = $arr_releases;
+            }
         }
         return $packages;
     }
@@ -208,10 +208,10 @@ 
         if(!empty($release_id)){
             $filename = PackageManagerComm::addDownload($category_id, $package_id, $release_id);
             if($filename){
-	            $GLOBALS['log']->debug('RESULT: '.$filename);
-	            PackageManagerComm::errorCheck();
-	           	$filepath = PackageManagerComm::performDownload($filename);
-	           	return $filepath;
+                $GLOBALS['log']->debug('RESULT: '.$filename);
+                PackageManagerComm::errorCheck();
+                    $filepath = PackageManagerComm::performDownload($filename);
+                    return $filepath;
             }
         }else{
             return null;
@@ -232,20 +232,20 @@ 
         PackageManagerComm::clearSession();
         $result = PackageManagerComm::login($terms_checked);
         if(is_array($result))
-        	return $result;
-       	else
-        	return true;
+            return $result;
+            else
+            return true;
     }
 
     function setCredentials($username, $password, $systemname){
 
         $admin = new Administration();
         $admin->retrieveSettings();
-         $admin->saveSetting(CREDENTIAL_CATEGORY, CREDENTIAL_USERNAME, $username);
-         $admin->saveSetting(CREDENTIAL_CATEGORY, CREDENTIAL_PASSWORD, $password);
-         if(!empty($systemname)){
-         	$admin->saveSetting('system', 'name', $systemname);
-         }
+            $admin->saveSetting(CREDENTIAL_CATEGORY, CREDENTIAL_USERNAME, $username);
+            $admin->saveSetting(CREDENTIAL_CATEGORY, CREDENTIAL_PASSWORD, $password);
+            if(!empty($systemname)){
+                $admin->saveSetting('system', 'name', $systemname);
+            }
     }
 
     static function getCredentials(){
@@ -255,21 +255,21 @@ 
         $credentials = array();
         $credentials['username'] = '';
         $credentials['password'] = '';
-		$credentials['system_name'] = '';
+        $credentials['system_name'] = '';
         if(!empty($admin->settings[CREDENTIAL_CATEGORY.'_'.CREDENTIAL_USERNAME])){
-           $credentials['username'] = $admin->settings[CREDENTIAL_CATEGORY.'_'.CREDENTIAL_USERNAME];
+            $credentials['username'] = $admin->settings[CREDENTIAL_CATEGORY.'_'.CREDENTIAL_USERNAME];
         }
         if(!empty($admin->settings[CREDENTIAL_CATEGORY.'_'.CREDENTIAL_USERNAME])){
-           $credentials['password'] = $admin->settings[CREDENTIAL_CATEGORY.'_'.CREDENTIAL_PASSWORD];
+            $credentials['password'] = $admin->settings[CREDENTIAL_CATEGORY.'_'.CREDENTIAL_PASSWORD];
         }
         if(!empty($admin->settings['system_name'])){
-           $credentials['system_name'] = $admin->settings['system_name'];
+            $credentials['system_name'] = $admin->settings['system_name'];
         }
         return $credentials;
     }
 
     function getTermsAndConditions(){
-    	return PackageManagerComm::getTermsAndConditions();
+        return PackageManagerComm::getTermsAndConditions();
 
     }
 
@@ -282,7 +282,7 @@ 
      * @return documents
      */
     function getDocumentation($package_id, $release_id){
-    	 if(!empty($release_id) || !empty($package_id)){
+            if(!empty($release_id) || !empty($package_id)){
             $documents = PackageManagerComm::getDocumentation($package_id, $release_id);
             return $documents;
         }else{
@@ -295,33 +295,33 @@ 
      * The depot will then send back a list of modules that need to be updated
      */
     function checkForUpdates(){
-    	$lists = $this->buildInstalledReleases(array('module'), true);
-		$updates = array();
-		if(!empty($lists)){
-			$updates = PackageManagerComm::checkForUpdates($lists);
-		}//fi
-		return $updates;
+        $lists = $this->buildInstalledReleases(array('module'), true);
+        $updates = array();
+        if(!empty($lists)){
+            $updates = PackageManagerComm::checkForUpdates($lists);
+        }//fi
+        return $updates;
     }
 
-     ////////////////////////////////////////////////////////
-     /////////// HELPER FUNCTIONS
+        ////////////////////////////////////////////////////////
+        /////////// HELPER FUNCTIONS
     function toNameValueList($array){
-		$list = array();
-		foreach($array as $name=>$value){
-			$list[] = array('name'=>$name, 'value'=>$value);
-		}
-		return $list;
-	}
-
-	function toNameValueLists($arrays){
-		$lists = array();
-		foreach($arrays as $array){
-			$lists[] = PackageManager::toNameValueList($array);
-		}
-		return $lists;
-	}
-
-     function fromNameValueList($nvl){
+        $list = array();
+        foreach($array as $name=>$value){
+            $list[] = array('name'=>$name, 'value'=>$value);
+        }
+        return $list;
+    }
+
+    function toNameValueLists($arrays){
+        $lists = array();
+        foreach($arrays as $array){
+            $lists[] = PackageManager::toNameValueList($array);
+        }
+        return $lists;
+    }
+
+        function fromNameValueList($nvl){
         $array = array();
         foreach($nvl as $list){
             $array[$list['name']] = $list['value'];
@@ -330,19 +330,19 @@ 
     }
 
     function buildInstalledReleases($types = array('module')){
-    	//1) get list of installed modules
-		$installeds = $this->getInstalled($types);
-		$releases = array();
-		foreach($installeds as $installed){
-			$releases[] = array('name' => $installed->name, 'id_name' => $installed->id_name, 'version' => $installed->version, 'filename' => $installed->filename, 'type' => $installed->type);
-		}
+        //1) get list of installed modules
+        $installeds = $this->getInstalled($types);
+        $releases = array();
+        foreach($installeds as $installed){
+            $releases[] = array('name' => $installed->name, 'id_name' => $installed->id_name, 'version' => $installed->version, 'filename' => $installed->filename, 'type' => $installed->type);
+        }
 
-		$lists = array();
-		$name_value_list = array();
-		if(!empty($releases)){
-			$lists = $this->toNameValueLists($releases);
-		}//fi
-		return $lists;
+        $lists = array();
+        $name_value_list = array();
+        if(!empty($releases)){
+            $lists = $this->toNameValueLists($releases);
+        }//fi
+        return $lists;
     }
 
     function buildPackageXML($package, $releases = array()){
@@ -351,19 +351,19 @@ 
         $xml .= '<name>'.$package['name'].'</name>';
         $xml .= '<description>'.$package['description'].'</description>';
         if(!empty($releases)){
-             $xml .= '<releases>';
-             foreach($releases['packages'] as $release){
-
-                 $myrelease = PackageManager::fromNameValueList($release);
-                 $xml .= '<release>';
-                 $xml .= '<release_id>'.$myrelease['id'].'</release_id>';
-                 $xml .= '<version>'.$myrelease['version'].'</version>';
-                 $xml .= '<description>'.$myrelease['description'].'</description>';
-                 $xml .= '<package_id>'.$package['id'].'</package_id>';
-                 $xml .= '<category_id>'.$package['category_id'].'</category_id>';
-                 $xml .= '</release>';
-             }
-             $xml .= '</releases>';
+                $xml .= '<releases>';
+                foreach($releases['packages'] as $release){
+
+                    $myrelease = PackageManager::fromNameValueList($release);
+                    $xml .= '<release>';
+                    $xml .= '<release_id>'.$myrelease['id'].'</release_id>';
+                    $xml .= '<version>'.$myrelease['version'].'</version>';
+                    $xml .= '<description>'.$myrelease['description'].'</description>';
+                    $xml .= '<package_id>'.$package['id'].'</package_id>';
+                    $xml .= '<category_id>'.$package['category_id'].'</category_id>';
+                    $xml .= '</release>';
+                }
+                $xml .= '</releases>';
         }
         $xml .= '</package>';
         return $xml;
@@ -444,7 +444,7 @@ 
             }
         }
 
-     if( isset($manifest['acceptable_sugar_flavors']) && sizeof($manifest['acceptable_sugar_flavors']) > 0 ){
+        if( isset($manifest['acceptable_sugar_flavors']) && sizeof($manifest['acceptable_sugar_flavors']) > 0 ){
             $flavor_ok = false;
             foreach( $manifest['acceptable_sugar_flavors'] as $match ){
                 if( $match == $sugar_flavor ){
@@ -479,7 +479,7 @@ 
         $base_upgrade_dir       = $this->upload_dir.'/upgrades';
         $base_tmp_upgrade_dir   = "$base_upgrade_dir/temp";
         $manifest_file = $this->extractManifest( $base_filename,$base_tmp_upgrade_dir);
-         $GLOBALS['log']->debug("Manifest: ".$manifest_file);
+            $GLOBALS['log']->debug("Manifest: ".$manifest_file);
         if($view == 'module')
             $license_file = $this->extractFile($base_filename, 'LICENSE.txt', $base_tmp_upgrade_dir);
         if(is_file($manifest_file)){
@@ -521,7 +521,7 @@ 
                     $messages = '<script>ajaxStatus.flashStatus("' .$base_filename.$mod_strings['LBL_UW_UPLOAD_SUCCESS'] . ', 5000");</script>';
             }else{
                 if($display_messages)
-                	$messages = '<script>ajaxStatus.flashStatus("' .$mod_strings['ERR_UW_UPLOAD_ERROR'] . ', 5000");</script>';
+                    $messages = '<script>ajaxStatus.flashStatus("' .$mod_strings['ERR_UW_UPLOAD_ERROR'] . ', 5000");</script>';
             }
         }//fi
         else{
@@ -553,9 +553,9 @@ 
         $mi = new ModuleInstaller();
         $mi->silent = $silent;
         $mod_strings = return_module_language($current_language, "Administration");
-             $GLOBALS['log']->debug("ABOUT TO INSTALL: ".$file);
+                $GLOBALS['log']->debug("ABOUT TO INSTALL: ".$file);
         if(preg_match("#.*\.zip\$#", $file)) {
-             $GLOBALS['log']->debug("1: ".$file);
+                $GLOBALS['log']->debug("1: ".$file);
             // handle manifest.php
             $target_manifest = remove_file_extension( $file ) . '-manifest.php';
             include($target_manifest);
@@ -565,18 +565,18 @@ 
             unzip($file, $unzip_dir );
             $GLOBALS['log']->debug("3: ".$unzip_dir);
             $id_name = $installdefs['id'];
-			$version = $manifest['version'];
-			$uh = new UpgradeHistory();
-			$previous_install = array();
-    		if(!empty($id_name) & !empty($version))
-    			$previous_install = $uh->determineIfUpgrade($id_name, $version);
-    		$previous_version = (empty($previous_install['version'])) ? '' : $previous_install['version'];
-    		$previous_id = (empty($previous_install['id'])) ? '' : $previous_install['id'];
+            $version = $manifest['version'];
+            $uh = new UpgradeHistory();
+            $previous_install = array();
+            if(!empty($id_name) & !empty($version))
+                $previous_install = $uh->determineIfUpgrade($id_name, $version);
+            $previous_version = (empty($previous_install['version'])) ? '' : $previous_install['version'];
+            $previous_id = (empty($previous_install['id'])) ? '' : $previous_install['id'];
 
             if(!empty($previous_version)){
-            	$mi->install($unzip_dir, true, $previous_version);
+                $mi->install($unzip_dir, true, $previous_version);
             }else{
-            	$mi->install($unzip_dir);
+                $mi->install($unzip_dir);
             }
             $GLOBALS['log']->debug("INSTALLED: ".$file);
             $new_upgrade = new UpgradeHistory();
@@ -589,11 +589,11 @@ 
             $new_upgrade->name          = $manifest['name'];
             $new_upgrade->description   = $manifest['description'];
             $new_upgrade->id_name		= $id_name;
-			$serial_manifest = array();
-			$serial_manifest['manifest'] = (isset($manifest) ? $manifest : '');
-			$serial_manifest['installdefs'] = (isset($installdefs) ? $installdefs : '');
-			$serial_manifest['upgrade_manifest'] = (isset($upgrade_manifest) ? $upgrade_manifest : '');
-			$new_upgrade->manifest		= base64_encode(serialize($serial_manifest));
+            $serial_manifest = array();
+            $serial_manifest['manifest'] = (isset($manifest) ? $manifest : '');
+            $serial_manifest['installdefs'] = (isset($installdefs) ? $installdefs : '');
+            $serial_manifest['upgrade_manifest'] = (isset($upgrade_manifest) ? $upgrade_manifest : '');
+            $new_upgrade->manifest		= base64_encode(serialize($serial_manifest));
             //$new_upgrade->unique_key    = (isset($manifest['unique_key'])) ? $manifest['unique_key'] : '';
             $new_upgrade->save();
                     //unlink($file);
@@ -601,16 +601,16 @@ 
     }
 
     function performUninstall($name){
-    	$uh = new UpgradeHistory();
-    	$uh->name = $name;
-    	$uh->id_name = $name;
-    	$found = $uh->checkForExisting($uh);
-    	if($found != null){
-    		global $sugar_config;
-	        global $mod_strings;
-	        global $current_language;
-	        $base_upgrade_dir       = $this->upload_dir.'/upgrades';
-	        $base_tmp_upgrade_dir   = "$base_upgrade_dir/temp";
+        $uh = new UpgradeHistory();
+        $uh->name = $name;
+        $uh->id_name = $name;
+        $found = $uh->checkForExisting($uh);
+        if($found != null){
+            global $sugar_config;
+            global $mod_strings;
+            global $current_language;
+            $base_upgrade_dir       = $this->upload_dir.'/upgrades';
+            $base_tmp_upgrade_dir   = "$base_upgrade_dir/temp";
             if(is_file($found->filename)){
                 if(!isset($GLOBALS['mi_remove_tables']))$GLOBALS['mi_remove_tables'] = true;
                 $unzip_dir = mk_temp_dir( $base_tmp_upgrade_dir );
@@ -625,7 +625,7 @@ 
                 //file(s_ have been deleted or are not found in the directory, allow database delete to happen but no need to change filesystem
                 $found->delete();
             }
-    	}
+        }
     }
 
     function getUITextForType( $type ){
@@ -686,10 +686,10 @@ 
         $content_values = array_values($uContent);
         $alreadyProcessed = array();
         foreach($content_values as $val){
-        	if(empty($alreadyProcessed[$val])){
-        		$upgrade_contents[] = $val;
-        		$alreadyProcessed[$val] = true;
-        	}
+            if(empty($alreadyProcessed[$val])){
+                $upgrade_contents[] = $val;
+                $alreadyProcessed[$val] = true;
+            }
         }
 
         $upgrades_available = 0;
@@ -703,35 +703,35 @@ 
             $the_base = basename($upgrade_content);
             $the_md5 = md5_file($upgrade_content);
             $md5_matches = $uh->findByMd5($the_md5);
-    		$file_install = $upgrade_content;
+            $file_install = $upgrade_content;
             if(empty($md5_matches))
             {
                 $target_manifest = remove_file_extension( $upgrade_content ) . '-manifest.php';
                 if(file_exists($target_manifest)) {
-	                require_once($target_manifest);
-
-	                $name = empty($manifest['name']) ? $upgrade_content : $manifest['name'];
-	                $version = empty($manifest['version']) ? '' : $manifest['version'];
-	                $published_date = empty($manifest['published_date']) ? '' : $manifest['published_date'];
-	                $icon = '';
-	                $description = empty($manifest['description']) ? 'None' : $manifest['description'];
-	                $uninstallable = empty($manifest['is_uninstallable']) ? 'No' : 'Yes';
-	                $type = $this->getUITextForType( $manifest['type'] );
-	                $manifest_type = $manifest['type'];
-	                $dependencies = array();
-	                if( isset( $manifest['dependencies']) ){
-	    				$dependencies    = $manifest['dependencies'];
-					}
+                    require_once($target_manifest);
+
+                    $name = empty($manifest['name']) ? $upgrade_content : $manifest['name'];
+                    $version = empty($manifest['version']) ? '' : $manifest['version'];
+                    $published_date = empty($manifest['published_date']) ? '' : $manifest['published_date'];
+                    $icon = '';
+                    $description = empty($manifest['description']) ? 'None' : $manifest['description'];
+                    $uninstallable = empty($manifest['is_uninstallable']) ? 'No' : 'Yes';
+                    $type = $this->getUITextForType( $manifest['type'] );
+                    $manifest_type = $manifest['type'];
+                    $dependencies = array();
+                    if( isset( $manifest['dependencies']) ){
+                        $dependencies    = $manifest['dependencies'];
+                    }
                 }
 
-				//check dependencies first
-				if(!empty($dependencies)) {
-					$uh = new UpgradeHistory();
-					$not_found = $uh->checkDependencies($dependencies);
-					if(!empty($not_found) && count($not_found) > 0){
-							$file_install = 'errors_'.$mod_strings['ERR_UW_NO_DEPENDENCY']."[".implode(',', $not_found)."]";
-					}
-				}
+                //check dependencies first
+                if(!empty($dependencies)) {
+                    $uh = new UpgradeHistory();
+                    $not_found = $uh->checkDependencies($dependencies);
+                    if(!empty($not_found) && count($not_found) > 0){
+                            $file_install = 'errors_'.$mod_strings['ERR_UW_NO_DEPENDENCY']."[".implode(',', $not_found)."]";
+                    }
+                }
 
                 if($view == 'default' && $manifest_type != 'patch') {
                     continue;
@@ -752,8 +752,8 @@ 
                 $upgrades_available++;
 
                 $packages[] = array('name' => $name, 'version' => $version, 'published_date' => $published_date,
-                	'description' => $description, 'uninstallable' =>$uninstallable, 'type' => $type,
-                	'file' => fileToHash($upgrade_content), 'file_install' => fileToHash($upgrade_content), 'unFile' => fileToHash($upgrade_content));
+                    'description' => $description, 'uninstallable' =>$uninstallable, 'type' => $type,
+                    'file' => fileToHash($upgrade_content), 'file_install' => fileToHash($upgrade_content), 'unFile' => fileToHash($upgrade_content));
             }//fi
         }//rof
         return $packages;
@@ -781,112 +781,112 @@ 
      * @return an array of installed upgrade_history objects
      */
     function getInstalled($types = array('module')){
-    	$uh = new UpgradeHistory();
-    	$in = "";
-    	for($i = 0; $i < count($types); $i++){
-    		$in .= "'".$types[$i]."'";
-    		if(($i+1) < count($types)){
-    			$in .= ",";
-    		}
-    	}
-    	$query = "SELECT * FROM ".$uh->table_name."	 WHERE type IN (".$in.")";
-    	return $uh->getList($query);
+        $uh = new UpgradeHistory();
+        $in = "";
+        for($i = 0; $i < count($types); $i++){
+            $in .= "'".$types[$i]."'";
+            if(($i+1) < count($types)){
+                $in .= ",";
+            }
+        }
+        $query = "SELECT * FROM ".$uh->table_name."	 WHERE type IN (".$in.")";
+        return $uh->getList($query);
     }
 
     function getinstalledPackages($types = array('module', 'langpack')){
-    	global $sugar_config;
-    	$installeds = $this->getInstalled($types);
-    	$packages = array();
-    	$upgrades_installed = 0;
-    	$uh = new UpgradeHistory();
+        global $sugar_config;
+        $installeds = $this->getInstalled($types);
+        $packages = array();
+        $upgrades_installed = 0;
+        $uh = new UpgradeHistory();
         $base_upgrade_dir       = $this->upload_dir.'/upgrades';
         $base_tmp_upgrade_dir   = "$base_upgrade_dir/temp";
-    	foreach($installeds as $installed)
-		{
-			$populate = false;
-			$filename = from_html($installed->filename);
-			$date_entered = $installed->date_entered;
-			$type = $installed->type;
-			$version = $installed->version;
-			$uninstallable = false;
-			$link = "";
-			$description = $installed->description;
-			$name = $installed->name;
-			$enabled = true;
-			$enabled_string = 'ENABLED';
-			//if the name is empty then we should try to pull from manifest and populate upgrade_history_table
-			if(empty($name)){
-				$populate = true;
-			}
-			$upgrades_installed++;
-			switch($type)
-			{
-				case "theme":
-				case "langpack":
-				case "module":
-				case "patch":
-					if($populate){
-						$manifest_file = $this->extractManifest($filename, $base_tmp_upgrade_dir);
-						require_once($manifest_file);
-						$GLOBALS['log']->info("Filling in upgrade_history table");
-						$populate = false;
-						if( isset( $manifest['name'] ) ){
-    						$name = $manifest['name'];
-    						$installed->name = $name;
-						}
-						if( isset( $manifest['description'] ) ){
-						    $description = $manifest['description'];
-						    $installed->description = $description;
-						}
-						if(isset($installdefs) && isset( $installdefs['id'] ) ){
-						    $id_name  = $installdefs['id'];
-						    $installed->id_name = $id_name;
-						}
-
-						$serial_manifest = array();
-						$serial_manifest['manifest'] = (isset($manifest) ? $manifest : '');
-						$serial_manifest['installdefs'] = (isset($installdefs) ? $installdefs : '');
-						$serial_manifest['upgrade_manifest'] = (isset($upgrade_manifest) ? $upgrade_manifest : '');
-						$installed->manifest = base64_encode(serialize($serial_manifest));
-						$installed->save();
-					}else{
-						$serial_manifest = unserialize(base64_decode($installed->manifest));
-						$manifest = $serial_manifest['manifest'];
-					}
-					if(($upgrades_installed==0 || $uh->UninstallAvailable($installeds, $installed))
-						&& is_file($filename) && !empty($manifest['is_uninstallable']))
-					{
-						$uninstallable = true;
-					}
-					$enabled = $installed->enabled;
-					if(!$enabled)
-						$enabled_string = 'DISABLED';
-					$file_uninstall = $filename;
-					if(!$uninstallable){
-						$file_uninstall = 'UNINSTALLABLE';
-						$enabled_string = 'UNINSTALLABLE';
-					} else {
-						$file_uninstall = fileToHash( $file_uninstall );
-					}
-
-				$packages[] = array(
-				    'name' => $name,
-				    'version' => $version,
-				    'type' => $type,
-				    'published_date' => $date_entered,
-				    'description' => $description,
-				    'uninstallable' =>$uninstallable,
-				    'file_install' =>  $file_uninstall ,
-				    'file' =>  fileToHash($filename),
-				    'enabled' => $enabled_string
-				);
-				break;
-				default:
-				break;
-			}
-
-		}//rof
-		return $packages;
-    }
- }
+        foreach($installeds as $installed)
+        {
+            $populate = false;
+            $filename = from_html($installed->filename);
+            $date_entered = $installed->date_entered;
+            $type = $installed->type;
+            $version = $installed->version;
+            $uninstallable = false;
+            $link = "";
+            $description = $installed->description;
+            $name = $installed->name;
+            $enabled = true;
+            $enabled_string = 'ENABLED';
+            //if the name is empty then we should try to pull from manifest and populate upgrade_history_table
+            if(empty($name)){
+                $populate = true;
+            }
+            $upgrades_installed++;
+            switch($type)
+            {
+                case "theme":
+                case "langpack":
+                case "module":
+                case "patch":
+                    if($populate){
+                        $manifest_file = $this->extractManifest($filename, $base_tmp_upgrade_dir);
+                        require_once($manifest_file);
+                        $GLOBALS['log']->info("Filling in upgrade_history table");
+                        $populate = false;
+                        if( isset( $manifest['name'] ) ){
+                            $name = $manifest['name'];
+                            $installed->name = $name;
+                        }
+                        if( isset( $manifest['description'] ) ){
+                            $description = $manifest['description'];
+                            $installed->description = $description;
+                        }
+                        if(isset($installdefs) && isset( $installdefs['id'] ) ){
+                            $id_name  = $installdefs['id'];
+                            $installed->id_name = $id_name;
+                        }
+
+                        $serial_manifest = array();
+                        $serial_manifest['manifest'] = (isset($manifest) ? $manifest : '');
+                        $serial_manifest['installdefs'] = (isset($installdefs) ? $installdefs : '');
+                        $serial_manifest['upgrade_manifest'] = (isset($upgrade_manifest) ? $upgrade_manifest : '');
+                        $installed->manifest = base64_encode(serialize($serial_manifest));
+                        $installed->save();
+                    }else{
+                        $serial_manifest = unserialize(base64_decode($installed->manifest));
+                        $manifest = $serial_manifest['manifest'];
+                    }
+                    if(($upgrades_installed==0 || $uh->UninstallAvailable($installeds, $installed))
+                        && is_file($filename) && !empty($manifest['is_uninstallable']))
+                    {
+                        $uninstallable = true;
+                    }
+                    $enabled = $installed->enabled;
+                    if(!$enabled)
+                        $enabled_string = 'DISABLED';
+                    $file_uninstall = $filename;
+                    if(!$uninstallable){
+                        $file_uninstall = 'UNINSTALLABLE';
+                        $enabled_string = 'UNINSTALLABLE';
+                    } else {
+                        $file_uninstall = fileToHash( $file_uninstall );
+                    }
+
+                $packages[] = array(
+                    'name' => $name,
+                    'version' => $version,
+                    'type' => $type,
+                    'published_date' => $date_entered,
+                    'description' => $description,
+                    'uninstallable' =>$uninstallable,
+                    'file_install' =>  $file_uninstall ,
+                    'file' =>  fileToHash($filename),
+                    'enabled' => $enabled_string
+                );
+                break;
+                default:
+                break;
+            }
+
+        }//rof
+        return $packages;
+    }
+    }
 ?>

Spacing +198 added lines, -198 removed lines

@@ -49,13 +49,13 @@ 
 require_once('include/entryPoint.php');
 require_once('ModuleInstall/PackageManager/PackageManagerComm.php');
 
-class PackageManager{
+class PackageManager {
     var $soap_client;
 
     /**
      * Constructor: In this method we will initialize the nusoap client to point to the hearbeat server
      */
-    function __construct(){
+    function __construct() {
         $this->db = DBManagerFactory::getInstance();
         $this->upload_dir = empty($GLOBALS['sugar_config']['upload_dir']) ? 'upload' : rtrim($GLOBALS['sugar_config']['upload_dir'], '/\\');
     }
@@ -63,9 +63,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 PackageManager(){
+    function PackageManager() {
         $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 {
@@ -75,7 +75,7 @@ 
     }
 
 
-    function initializeComm(){
+    function initializeComm() {
 
     }
 
@@ -83,12 +83,12 @@ 
      * Obtain a promotion from SugarDepot
      * @return string   the string from the promotion
      */
-    function getPromotion(){
+    function getPromotion() {
         $name_value_list = PackageManagerComm::getPromotion();
-        if(!empty($name_value_list)){
+        if (!empty($name_value_list)) {
             $name_value_list = PackageManager::fromNameValueList($name_value_list);
             return $name_value_list['description'];
-        }else {
+        } else {
            return '';
         }
     }
@@ -96,7 +96,7 @@ 
     /**
      * Obtain a list of category/packages/releases for use within the module loader
      */
-    function getModuleLoaderCategoryPackages($category_id = ''){
+    function getModuleLoaderCategoryPackages($category_id = '') {
     	$filter = array();
     	$filter = array('type' => "'module', 'theme', 'langpack'");
     	$filter = PackageManager::toNameValueList($filter);
@@ -107,34 +107,34 @@ 
      * Obtain the list of category_packages from SugarDepot
      * @return category_packages
      */
-    function getCategoryPackages($category_id = '', $filter = array()){
+    function getCategoryPackages($category_id = '', $filter = array()) {
          $results = PackageManagerComm::getCategoryPackages($category_id, $filter);
          PackageManagerComm::errorCheck();
          $nodes = array();
 
         $nodes[$category_id]['packages'] = array();
-        if(!empty($results['categories'])){
-	         foreach($results['categories'] as $category){
+        if (!empty($results['categories'])) {
+	         foreach ($results['categories'] as $category) {
 	            $mycat = PackageManager::fromNameValueList($category);
 	            $nodes[$mycat['id']] = array('id' => $mycat['id'], 'label' => $mycat['name'], 'description' => $mycat['description'], 'type' => 'cat', 'parent' => $mycat['parent_id']);
 	            $nodes[$mycat['id']]['packages'] = array();
 	         }
         }
-         if(!empty($results['packages'])){
+         if (!empty($results['packages'])) {
 	        $uh = new UpgradeHistory();
-	         foreach($results['packages'] as $package){
+	         foreach ($results['packages'] as $package) {
 	            $mypack = PackageManager::fromNameValueList($package);
 	            $nodes[$mypack['category_id']]['packages'][$mypack['id']] = array('id' => $mypack['id'], 'label' => $mypack['name'], 'description' => $mypack['description'], 'category_id' => $mypack['category_id'], 'type' => 'package');
 	            $releases = PackageManager::getReleases($category_id, $mypack['id'], $filter);
 	            $arr_releases = array();
 	            $nodes[$mypack['category_id']]['packages'][$mypack['id']]['releases'] = array();
-	            if(!empty($releases['packages'])){
-		            foreach($releases['packages'] as $release){
+	            if (!empty($releases['packages'])) {
+		            foreach ($releases['packages'] as $release) {
 		                 $myrelease = PackageManager::fromNameValueList($release);
 		                 //check to see if we already this one installed
 		                 $result = $uh->determineIfUpgrade($myrelease['id_name'], $myrelease['version']);
 		                 $enable = false;
-		                 if($result == true || is_array($result))
+		                 if ($result == true || is_array($result))
 		                	 $enable = true;
 		                 $nodes[$mypack['category_id']]['packages'][$mypack['id']]['releases'][$myrelease['id']] = array('id' => $myrelease['id'], 'version' => $myrelease['version'], 'label' => $myrelease['description'], 'category_id' => $mypack['category_id'], 'package_id' => $mypack['id'], 'type' => 'release', 'enable' => $enable);
 		           	}
@@ -142,7 +142,7 @@ 
 	            //array_push($nodes[$mypack['category_id']]['packages'], $package_arr);
 	         }
          }
-         $GLOBALS['log']->debug("NODES". var_export($nodes, true));
+         $GLOBALS['log']->debug("NODES".var_export($nodes, true));
         return $nodes;
     }
 
@@ -152,12 +152,12 @@ 
      * @param filter        an array of filters to pass to limit the query
      * @return array        an array of categories for display on the client
      */
-    function getCategories($category_id, $filter = array()){
+    function getCategories($category_id, $filter = array()) {
         $nodes = array();
         $results = PackageManagerComm::getCategories($category_id, $filter);
         PackageManagerComm::errorCheck();
-        if(!empty($results['categories'])){
-	        foreach($results['categories'] as $category){
+        if (!empty($results['categories'])) {
+	        foreach ($results['categories'] as $category) {
 	            $mycat = PackageManager::fromNameValueList($category);
 	            $nodes[] = array('id' => $mycat['id'], 'label' => $mycat['name'], 'description' => $mycat['description'], 'type' => 'cat', 'parent' => $mycat['parent_id']);
 	        }
@@ -165,22 +165,22 @@ 
         return $nodes;
     }
 
-    function getPackages($category_id, $filter = array()){
+    function getPackages($category_id, $filter = array()) {
         $nodes = array();
         $results = PackageManagerComm::getPackages($category_id, $filter);
         PackageManagerComm::errorCheck();
         $packages = array();
         //$xml = '';
         //$xml .= '<packages>';
-        if(!empty($results['packages'])){
-	        foreach($results['packages'] as $package){
+        if (!empty($results['packages'])) {
+	        foreach ($results['packages'] as $package) {
 	            $mypack = PackageManager::fromNameValueList($package);
 	            $packages[$mypack['id']] = array('package_id' => $mypack['id'], 'name' => $mypack['name'], 'description' => $mypack['description'], 'category_id' => $mypack['category_id']);
 	            $releases = PackageManager::getReleases($category_id, $mypack['id']);
 	            $arr_releases = array();
-	            foreach($releases['packages'] as $release){
+	            foreach ($releases['packages'] as $release) {
 	                 $myrelease = PackageManager::fromNameValueList($release);
-	                 $arr_releases[$myrelease['id']]  = array('release_id' => $myrelease['id'], 'version' => $myrelease['version'], 'description' => $myrelease['description'], 'category_id' => $mypack['category_id'], 'package_id' => $mypack['id']);
+	                 $arr_releases[$myrelease['id']] = array('release_id' => $myrelease['id'], 'version' => $myrelease['version'], 'description' => $myrelease['description'], 'category_id' => $mypack['category_id'], 'package_id' => $mypack['id']);
 	            }
 	            $packages[$mypack['id']]['releases'] = $arr_releases;
 	        }
@@ -188,7 +188,7 @@ 
         return $packages;
     }
 
-    function getReleases($category_id, $package_id, $filter = array()){
+    function getReleases($category_id, $package_id, $filter = array()) {
         $releases = PackageManagerComm::getReleases($category_id, $package_id, $filter);
         PackageManagerComm::errorCheck();
         return $releases;
@@ -205,15 +205,15 @@ 
     public function download($category_id, $package_id, $release_id)
     {
         $GLOBALS['log']->debug('RELEASE _ID: '.$release_id);
-        if(!empty($release_id)){
+        if (!empty($release_id)) {
             $filename = PackageManagerComm::addDownload($category_id, $package_id, $release_id);
-            if($filename){
+            if ($filename) {
 	            $GLOBALS['log']->debug('RESULT: '.$filename);
 	            PackageManagerComm::errorCheck();
 	           	$filepath = PackageManagerComm::performDownload($filename);
 	           	return $filepath;
             }
-        }else{
+        } else {
             return null;
         }
     }
@@ -227,28 +227,28 @@ 
      * @param systemname   the user's download key
      * @return              true if successful, false otherwise
      */
-    function authenticate($username, $password, $systemname='', $terms_checked = true){
+    function authenticate($username, $password, $systemname = '', $terms_checked = true) {
         PackageManager::setCredentials($username, $password, $systemname);
         PackageManagerComm::clearSession();
         $result = PackageManagerComm::login($terms_checked);
-        if(is_array($result))
+        if (is_array($result))
         	return $result;
        	else
         	return true;
     }
 
-    function setCredentials($username, $password, $systemname){
+    function setCredentials($username, $password, $systemname) {
 
         $admin = new Administration();
         $admin->retrieveSettings();
          $admin->saveSetting(CREDENTIAL_CATEGORY, CREDENTIAL_USERNAME, $username);
          $admin->saveSetting(CREDENTIAL_CATEGORY, CREDENTIAL_PASSWORD, $password);
-         if(!empty($systemname)){
+         if (!empty($systemname)) {
          	$admin->saveSetting('system', 'name', $systemname);
          }
     }
 
-    static function getCredentials(){
+    static function getCredentials() {
 
         $admin = new Administration();
         $admin->retrieveSettings(CREDENTIAL_CATEGORY, true);
@@ -256,19 +256,19 @@ 
         $credentials['username'] = '';
         $credentials['password'] = '';
 		$credentials['system_name'] = '';
-        if(!empty($admin->settings[CREDENTIAL_CATEGORY.'_'.CREDENTIAL_USERNAME])){
+        if (!empty($admin->settings[CREDENTIAL_CATEGORY.'_'.CREDENTIAL_USERNAME])) {
            $credentials['username'] = $admin->settings[CREDENTIAL_CATEGORY.'_'.CREDENTIAL_USERNAME];
         }
-        if(!empty($admin->settings[CREDENTIAL_CATEGORY.'_'.CREDENTIAL_USERNAME])){
+        if (!empty($admin->settings[CREDENTIAL_CATEGORY.'_'.CREDENTIAL_USERNAME])) {
            $credentials['password'] = $admin->settings[CREDENTIAL_CATEGORY.'_'.CREDENTIAL_PASSWORD];
         }
-        if(!empty($admin->settings['system_name'])){
+        if (!empty($admin->settings['system_name'])) {
            $credentials['system_name'] = $admin->settings['system_name'];
         }
         return $credentials;
     }
 
-    function getTermsAndConditions(){
+    function getTermsAndConditions() {
     	return PackageManagerComm::getTermsAndConditions();
 
     }
@@ -281,11 +281,11 @@ 
      *
      * @return documents
      */
-    function getDocumentation($package_id, $release_id){
-    	 if(!empty($release_id) || !empty($package_id)){
+    function getDocumentation($package_id, $release_id) {
+    	 if (!empty($release_id) || !empty($package_id)) {
             $documents = PackageManagerComm::getDocumentation($package_id, $release_id);
             return $documents;
-        }else{
+        } else {
             return null;
         }
     }
@@ -294,10 +294,10 @@ 
      * Grab the list of installed modules and send that list to the depot.
      * The depot will then send back a list of modules that need to be updated
      */
-    function checkForUpdates(){
+    function checkForUpdates() {
     	$lists = $this->buildInstalledReleases(array('module'), true);
 		$updates = array();
-		if(!empty($lists)){
+		if (!empty($lists)) {
 			$updates = PackageManagerComm::checkForUpdates($lists);
 		}//fi
 		return $updates;
@@ -305,54 +305,54 @@ 
 
      ////////////////////////////////////////////////////////
      /////////// HELPER FUNCTIONS
-    function toNameValueList($array){
+    function toNameValueList($array) {
 		$list = array();
-		foreach($array as $name=>$value){
+		foreach ($array as $name=>$value) {
 			$list[] = array('name'=>$name, 'value'=>$value);
 		}
 		return $list;
 	}
 
-	function toNameValueLists($arrays){
+	function toNameValueLists($arrays) {
 		$lists = array();
-		foreach($arrays as $array){
+		foreach ($arrays as $array) {
 			$lists[] = PackageManager::toNameValueList($array);
 		}
 		return $lists;
 	}
 
-     function fromNameValueList($nvl){
+     function fromNameValueList($nvl) {
         $array = array();
-        foreach($nvl as $list){
+        foreach ($nvl as $list) {
             $array[$list['name']] = $list['value'];
         }
         return $array;
     }
 
-    function buildInstalledReleases($types = array('module')){
+    function buildInstalledReleases($types = array('module')) {
     	//1) get list of installed modules
 		$installeds = $this->getInstalled($types);
 		$releases = array();
-		foreach($installeds as $installed){
+		foreach ($installeds as $installed) {
 			$releases[] = array('name' => $installed->name, 'id_name' => $installed->id_name, 'version' => $installed->version, 'filename' => $installed->filename, 'type' => $installed->type);
 		}
 
 		$lists = array();
 		$name_value_list = array();
-		if(!empty($releases)){
+		if (!empty($releases)) {
 			$lists = $this->toNameValueLists($releases);
 		}//fi
 		return $lists;
     }
 
-    function buildPackageXML($package, $releases = array()){
+    function buildPackageXML($package, $releases = array()) {
         $xml = '<package>';
         $xml .= '<package_id>'.$package['id'].'</package_id>';
         $xml .= '<name>'.$package['name'].'</name>';
         $xml .= '<description>'.$package['description'].'</description>';
-        if(!empty($releases)){
+        if (!empty($releases)) {
              $xml .= '<releases>';
-             foreach($releases['packages'] as $release){
+             foreach ($releases['packages'] as $release) {
 
                  $myrelease = PackageManager::fromNameValueList($release);
                  $xml .= '<release>';
@@ -373,7 +373,7 @@ 
 
     private function addToCleanup($dir)
     {
-        if(empty($this->cleanUpDirs)) {
+        if (empty($this->cleanUpDirs)) {
             register_shutdown_function(array($this, "cleanUpTempDir"));
         }
         $this->cleanUpDirs[] = $dir;
@@ -381,155 +381,155 @@ 
 
     public function cleanUpTempDir()
     {
-        foreach($this->cleanUpDirs as $dir) {
+        foreach ($this->cleanUpDirs as $dir) {
             rmdir_recursive($dir);
         }
     }
 
     //////////////////////////////////////////////////////////////////////
     /////////// INSTALL SECTION
-    function extractFile( $zip_file, $file_in_zip, $base_tmp_upgrade_dir){
-        $my_zip_dir = mk_temp_dir( $base_tmp_upgrade_dir );
+    function extractFile($zip_file, $file_in_zip, $base_tmp_upgrade_dir) {
+        $my_zip_dir = mk_temp_dir($base_tmp_upgrade_dir);
         $this->addToCleanup($my_zip_dir);
-        unzip_file( $zip_file, $file_in_zip, $my_zip_dir );
-        return( "$my_zip_dir/$file_in_zip" );
+        unzip_file($zip_file, $file_in_zip, $my_zip_dir);
+        return("$my_zip_dir/$file_in_zip");
     }
 
-    function extractManifest( $zip_file,$base_tmp_upgrade_dir ) {
+    function extractManifest($zip_file, $base_tmp_upgrade_dir) {
         global $sugar_config;
         $base_upgrade_dir       = $this->upload_dir."/upgrades";
         $base_tmp_upgrade_dir   = "$base_upgrade_dir/temp";
-        return $this->extractFile( $zip_file, "manifest.php",$base_tmp_upgrade_dir );
+        return $this->extractFile($zip_file, "manifest.php", $base_tmp_upgrade_dir);
     }
 
-    function validate_manifest( $manifest ){
+    function validate_manifest($manifest) {
     // takes a manifest.php manifest array and validates contents
     global $subdirs;
     global $sugar_version;
     global $sugar_flavor;
     global $mod_strings;
 
-    if( !isset($manifest['type']) ){
+    if (!isset($manifest['type'])) {
         die($mod_strings['ERROR_MANIFEST_TYPE']);
     }
     $type = $manifest['type'];
     $GLOBALS['log']->debug("Getting InstallType");
-    if( $this->getInstallType( "/$type/" ) == "" ){
+    if ($this->getInstallType("/$type/") == "") {
         $GLOBALS['log']->debug("Error with InstallType".$type);
-        die($mod_strings['ERROR_PACKAGE_TYPE']. ": '" . $type . "'." );
+        die($mod_strings['ERROR_PACKAGE_TYPE'].": '".$type."'.");
     }
     $GLOBALS['log']->debug("Passed with InstallType");
-    if( isset($manifest['acceptable_sugar_versions']) ){
+    if (isset($manifest['acceptable_sugar_versions'])) {
             $version_ok = false;
             $matches_empty = true;
-            if( isset($manifest['acceptable_sugar_versions']['exact_matches']) ){
+            if (isset($manifest['acceptable_sugar_versions']['exact_matches'])) {
                 $matches_empty = false;
-                foreach( $manifest['acceptable_sugar_versions']['exact_matches'] as $match ){
-                    if( $match == $sugar_version ){
+                foreach ($manifest['acceptable_sugar_versions']['exact_matches'] as $match) {
+                    if ($match == $sugar_version) {
                         $version_ok = true;
                     }
                 }
             }
-            if( !$version_ok && isset($manifest['acceptable_sugar_versions']['regex_matches']) ){
+            if (!$version_ok && isset($manifest['acceptable_sugar_versions']['regex_matches'])) {
                 $matches_empty = false;
-                foreach( $manifest['acceptable_sugar_versions']['regex_matches'] as $match ){
-                    if( preg_match( "/$match/", $sugar_version ) ){
+                foreach ($manifest['acceptable_sugar_versions']['regex_matches'] as $match) {
+                    if (preg_match("/$match/", $sugar_version)) {
                         $version_ok = true;
                     }
                 }
             }
 
-            if( !$matches_empty && !$version_ok ){
-                die( $mod_strings['ERROR_VERSION_INCOMPATIBLE'] . $sugar_version );
+            if (!$matches_empty && !$version_ok) {
+                die($mod_strings['ERROR_VERSION_INCOMPATIBLE'].$sugar_version);
             }
         }
 
-     if( isset($manifest['acceptable_sugar_flavors']) && sizeof($manifest['acceptable_sugar_flavors']) > 0 ){
+     if (isset($manifest['acceptable_sugar_flavors']) && sizeof($manifest['acceptable_sugar_flavors']) > 0) {
             $flavor_ok = false;
-            foreach( $manifest['acceptable_sugar_flavors'] as $match ){
-                if( $match == $sugar_flavor ){
+            foreach ($manifest['acceptable_sugar_flavors'] as $match) {
+                if ($match == $sugar_flavor) {
                     $flavor_ok = true;
                 }
             }
-            if( !$flavor_ok ){
+            if (!$flavor_ok) {
                 //die( $mod_strings['ERROR_FLAVOR_INCOMPATIBLE'] . $sugar_flavor );
             }
         }
     }
 
-    function getInstallType( $type_string ){
+    function getInstallType($type_string) {
         // detect file type
         global $subdirs;
         $subdirs = array('full', 'langpack', 'module', 'patch', 'theme', 'temp');
 
 
-        foreach( $subdirs as $subdir ){
-            if( preg_match( "#/$subdir/#", $type_string ) ){
-                return( $subdir );
+        foreach ($subdirs as $subdir) {
+            if (preg_match("#/$subdir/#", $type_string)) {
+                return($subdir);
             }
         }
         // return empty if no match
-        return( "" );
+        return("");
     }
 
-    function performSetup($tempFile, $view = 'module', $display_messages = true){
-        global $sugar_config,$mod_strings;
+    function performSetup($tempFile, $view = 'module', $display_messages = true) {
+        global $sugar_config, $mod_strings;
         $base_filename = urldecode($tempFile);
         $GLOBALS['log']->debug("BaseFileName: ".$base_filename);
         $base_upgrade_dir       = $this->upload_dir.'/upgrades';
         $base_tmp_upgrade_dir   = "$base_upgrade_dir/temp";
-        $manifest_file = $this->extractManifest( $base_filename,$base_tmp_upgrade_dir);
+        $manifest_file = $this->extractManifest($base_filename, $base_tmp_upgrade_dir);
          $GLOBALS['log']->debug("Manifest: ".$manifest_file);
-        if($view == 'module')
+        if ($view == 'module')
             $license_file = $this->extractFile($base_filename, 'LICENSE.txt', $base_tmp_upgrade_dir);
-        if(is_file($manifest_file)){
-            $GLOBALS['log']->debug("VALIDATING MANIFEST". $manifest_file);
-            require_once( $manifest_file );
-            $this->validate_manifest($manifest );
+        if (is_file($manifest_file)) {
+            $GLOBALS['log']->debug("VALIDATING MANIFEST".$manifest_file);
+            require_once($manifest_file);
+            $this->validate_manifest($manifest);
             $upgrade_zip_type = $manifest['type'];
             $GLOBALS['log']->debug("VALIDATED MANIFEST");
             // exclude the bad permutations
-            if( $view == "module" ){
-                if ($upgrade_zip_type != "module" && $upgrade_zip_type != "theme" && $upgrade_zip_type != "langpack"){
+            if ($view == "module") {
+                if ($upgrade_zip_type != "module" && $upgrade_zip_type != "theme" && $upgrade_zip_type != "langpack") {
                     $this->unlinkTempFiles();
-                    if($display_messages)
+                    if ($display_messages)
                         die($mod_strings['ERR_UW_NOT_ACCEPTIBLE_TYPE']);
                 }
-            }elseif( $view == "default" ){
-                if($upgrade_zip_type != "patch" ){
+            }elseif ($view == "default") {
+                if ($upgrade_zip_type != "patch") {
                     $this->unlinkTempFiles();
-                    if($display_messages)
+                    if ($display_messages)
                         die($mod_strings['ERR_UW_ONLY_PATCHES']);
                 }
             }
 
-            $base_filename = preg_replace( "#\\\\#", "/", $base_filename );
-            $base_filename = basename( $base_filename );
-            mkdir_recursive( "$base_upgrade_dir/$upgrade_zip_type" );
+            $base_filename = preg_replace("#\\\\#", "/", $base_filename);
+            $base_filename = basename($base_filename);
+            mkdir_recursive("$base_upgrade_dir/$upgrade_zip_type");
             $target_path = "$base_upgrade_dir/$upgrade_zip_type/$base_filename";
-            $target_manifest = remove_file_extension( $target_path ) . "-manifest.php";
+            $target_manifest = remove_file_extension($target_path)."-manifest.php";
 
-            if( isset($manifest['icon']) && $manifest['icon'] != "" ){
-                $icon_location = $this->extractFile( $tempFile ,$manifest['icon'], $base_tmp_upgrade_dir );
-                $path_parts = pathinfo( $icon_location );
-                copy( $icon_location, remove_file_extension( $target_path ) . "-icon." . $path_parts['extension'] );
+            if (isset($manifest['icon']) && $manifest['icon'] != "") {
+                $icon_location = $this->extractFile($tempFile, $manifest['icon'], $base_tmp_upgrade_dir);
+                $path_parts = pathinfo($icon_location);
+                copy($icon_location, remove_file_extension($target_path)."-icon.".$path_parts['extension']);
             }
 
-            if( copy( $tempFile , $target_path ) ){
-                copy( $manifest_file, $target_manifest );
-                if($display_messages)
-                    $messages = '<script>ajaxStatus.flashStatus("' .$base_filename.$mod_strings['LBL_UW_UPLOAD_SUCCESS'] . ', 5000");</script>';
-            }else{
-                if($display_messages)
-                	$messages = '<script>ajaxStatus.flashStatus("' .$mod_strings['ERR_UW_UPLOAD_ERROR'] . ', 5000");</script>';
+            if (copy($tempFile, $target_path)) {
+                copy($manifest_file, $target_manifest);
+                if ($display_messages)
+                    $messages = '<script>ajaxStatus.flashStatus("'.$base_filename.$mod_strings['LBL_UW_UPLOAD_SUCCESS'].', 5000");</script>';
+            } else {
+                if ($display_messages)
+                	$messages = '<script>ajaxStatus.flashStatus("'.$mod_strings['ERR_UW_UPLOAD_ERROR'].', 5000");</script>';
             }
         }//fi
-        else{
+        else {
             $this->unlinkTempFiles();
-            if($display_messages)
+            if ($display_messages)
                 die($mod_strings['ERR_UW_NO_MANIFEST']);
         }
-        if(isset($messages))
+        if (isset($messages))
             return $messages;
     }
 
@@ -539,13 +539,13 @@ 
         @unlink("upload://".$_FILES['upgrade_zip']['name']);
     }
 
-    function performInstall($file, $silent=true){
+    function performInstall($file, $silent = true) {
         global $sugar_config;
         global $mod_strings;
         global $current_language;
         $base_upgrade_dir       = $this->upload_dir.'/upgrades';
         $base_tmp_upgrade_dir   = "$base_upgrade_dir/temp";
-        if(!file_exists($base_tmp_upgrade_dir)){
+        if (!file_exists($base_tmp_upgrade_dir)) {
             mkdir_recursive($base_tmp_upgrade_dir, true);
         }
 
@@ -554,28 +554,28 @@ 
         $mi->silent = $silent;
         $mod_strings = return_module_language($current_language, "Administration");
              $GLOBALS['log']->debug("ABOUT TO INSTALL: ".$file);
-        if(preg_match("#.*\.zip\$#", $file)) {
+        if (preg_match("#.*\.zip\$#", $file)) {
              $GLOBALS['log']->debug("1: ".$file);
             // handle manifest.php
-            $target_manifest = remove_file_extension( $file ) . '-manifest.php';
+            $target_manifest = remove_file_extension($file).'-manifest.php';
             include($target_manifest);
             $GLOBALS['log']->debug("2: ".$file);
-            $unzip_dir = mk_temp_dir( $base_tmp_upgrade_dir );
+            $unzip_dir = mk_temp_dir($base_tmp_upgrade_dir);
             $this->addToCleanup($unzip_dir);
-            unzip($file, $unzip_dir );
+            unzip($file, $unzip_dir);
             $GLOBALS['log']->debug("3: ".$unzip_dir);
             $id_name = $installdefs['id'];
 			$version = $manifest['version'];
 			$uh = new UpgradeHistory();
 			$previous_install = array();
-    		if(!empty($id_name) & !empty($version))
+    		if (!empty($id_name) & !empty($version))
     			$previous_install = $uh->determineIfUpgrade($id_name, $version);
     		$previous_version = (empty($previous_install['version'])) ? '' : $previous_install['version'];
     		$previous_id = (empty($previous_install['id'])) ? '' : $previous_install['id'];
 
-            if(!empty($previous_version)){
+            if (!empty($previous_version)) {
             	$mi->install($unzip_dir, true, $previous_version);
-            }else{
+            } else {
             	$mi->install($unzip_dir);
             }
             $GLOBALS['log']->debug("INSTALLED: ".$file);
@@ -593,100 +593,100 @@ 
 			$serial_manifest['manifest'] = (isset($manifest) ? $manifest : '');
 			$serial_manifest['installdefs'] = (isset($installdefs) ? $installdefs : '');
 			$serial_manifest['upgrade_manifest'] = (isset($upgrade_manifest) ? $upgrade_manifest : '');
-			$new_upgrade->manifest		= base64_encode(serialize($serial_manifest));
+			$new_upgrade->manifest = base64_encode(serialize($serial_manifest));
             //$new_upgrade->unique_key    = (isset($manifest['unique_key'])) ? $manifest['unique_key'] : '';
             $new_upgrade->save();
                     //unlink($file);
         }//fi
     }
 
-    function performUninstall($name){
+    function performUninstall($name) {
     	$uh = new UpgradeHistory();
     	$uh->name = $name;
     	$uh->id_name = $name;
     	$found = $uh->checkForExisting($uh);
-    	if($found != null){
+    	if ($found != null) {
     		global $sugar_config;
 	        global $mod_strings;
 	        global $current_language;
 	        $base_upgrade_dir       = $this->upload_dir.'/upgrades';
 	        $base_tmp_upgrade_dir   = "$base_upgrade_dir/temp";
-            if(is_file($found->filename)){
-                if(!isset($GLOBALS['mi_remove_tables']))$GLOBALS['mi_remove_tables'] = true;
-                $unzip_dir = mk_temp_dir( $base_tmp_upgrade_dir );
-                unzip($found->filename, $unzip_dir );
+            if (is_file($found->filename)) {
+                if (!isset($GLOBALS['mi_remove_tables']))$GLOBALS['mi_remove_tables'] = true;
+                $unzip_dir = mk_temp_dir($base_tmp_upgrade_dir);
+                unzip($found->filename, $unzip_dir);
                 $mi = new ModuleInstaller();
                 $mi->silent = true;
-                $mi->uninstall( "$unzip_dir");
+                $mi->uninstall("$unzip_dir");
                 $found->delete();
-                unlink(remove_file_extension( $found->filename ) . '-manifest.php');
+                unlink(remove_file_extension($found->filename).'-manifest.php');
                 unlink($found->filename);
-            }else{
+            } else {
                 //file(s_ have been deleted or are not found in the directory, allow database delete to happen but no need to change filesystem
                 $found->delete();
             }
     	}
     }
 
-    function getUITextForType( $type ){
-        if( $type == "full" ){
-            return( "Full Upgrade" );
+    function getUITextForType($type) {
+        if ($type == "full") {
+            return("Full Upgrade");
         }
-        if( $type == "langpack" ){
-            return( "Language Pack" );
+        if ($type == "langpack") {
+            return("Language Pack");
         }
-        if( $type == "module" ){
-            return( "Module" );
+        if ($type == "module") {
+            return("Module");
         }
-        if( $type == "patch" ){
-            return( "Patch" );
+        if ($type == "patch") {
+            return("Patch");
         }
-        if( $type == "theme" ){
-            return( "Theme" );
+        if ($type == "theme") {
+            return("Theme");
         }
     }
 
-    function getImageForType( $type ){
+    function getImageForType($type) {
 
         $icon = "";
-        switch( $type ){
+        switch ($type) {
             case "full":
-                $icon = SugarThemeRegistry::current()->getImage("Upgrade", "" ,null,null,'.gif', "Upgrade");
+                $icon = SugarThemeRegistry::current()->getImage("Upgrade", "", null, null, '.gif', "Upgrade");
 
                 break;
             case "langpack":
-                $icon = SugarThemeRegistry::current()->getImage("LanguagePacks", "",null,null,'.gif',"Language Packs" );
+                $icon = SugarThemeRegistry::current()->getImage("LanguagePacks", "", null, null, '.gif', "Language Packs");
 
                 break;
             case "module":
-                $icon = SugarThemeRegistry::current()->getImage("ModuleLoader", "" ,null,null,'.gif', "Module Loader");
+                $icon = SugarThemeRegistry::current()->getImage("ModuleLoader", "", null, null, '.gif', "Module Loader");
 
                 break;
             case "patch":
-                $icon = SugarThemeRegistry::current()->getImage("PatchUpgrades", "",null,null,'.gif', "Patch Upgrades" );
+                $icon = SugarThemeRegistry::current()->getImage("PatchUpgrades", "", null, null, '.gif', "Patch Upgrades");
 
                 break;
             case "theme":
-                $icon = SugarThemeRegistry::current()->getImage("Themes", "",null,null,'.gif', "Themes" );
+                $icon = SugarThemeRegistry::current()->getImage("Themes", "", null, null, '.gif', "Themes");
 
                 break;
             default:
                 break;
         }
-        return( $icon );
+        return($icon);
     }
 
-    function getPackagesInStaging($view = 'module'){
+    function getPackagesInStaging($view = 'module') {
         global $sugar_config;
         global $current_language;
         $uh = new UpgradeHistory();
-        $base_upgrade_dir       = "upload://upgrades";
-        $uContent = findAllFiles( $base_upgrade_dir, array() , false, 'zip');
+        $base_upgrade_dir = "upload://upgrades";
+        $uContent = findAllFiles($base_upgrade_dir, array(), false, 'zip');
         $upgrade_contents = array();
         $content_values = array_values($uContent);
         $alreadyProcessed = array();
-        foreach($content_values as $val){
-        	if(empty($alreadyProcessed[$val])){
+        foreach ($content_values as $val) {
+        	if (empty($alreadyProcessed[$val])) {
         		$upgrade_contents[] = $val;
         		$alreadyProcessed[$val] = true;
         	}
@@ -695,8 +695,8 @@ 
         $upgrades_available = 0;
         $packages = array();
         $mod_strings = return_module_language($current_language, "Administration");
-        foreach($upgrade_contents as $upgrade_content) {
-            if(!preg_match('#.*\.zip$#', strtolower($upgrade_content)) || preg_match("#.*./zips/.*#", strtolower($upgrade_content))) {
+        foreach ($upgrade_contents as $upgrade_content) {
+            if (!preg_match('#.*\.zip$#', strtolower($upgrade_content)) || preg_match("#.*./zips/.*#", strtolower($upgrade_content))) {
                 continue;
             }
 
@@ -704,10 +704,10 @@ 
             $the_md5 = md5_file($upgrade_content);
             $md5_matches = $uh->findByMd5($the_md5);
     		$file_install = $upgrade_content;
-            if(empty($md5_matches))
+            if (empty($md5_matches))
             {
-                $target_manifest = remove_file_extension( $upgrade_content ) . '-manifest.php';
-                if(file_exists($target_manifest)) {
+                $target_manifest = remove_file_extension($upgrade_content).'-manifest.php';
+                if (file_exists($target_manifest)) {
 	                require_once($target_manifest);
 
 	                $name = empty($manifest['name']) ? $upgrade_content : $manifest['name'];
@@ -716,37 +716,37 @@ 
 	                $icon = '';
 	                $description = empty($manifest['description']) ? 'None' : $manifest['description'];
 	                $uninstallable = empty($manifest['is_uninstallable']) ? 'No' : 'Yes';
-	                $type = $this->getUITextForType( $manifest['type'] );
+	                $type = $this->getUITextForType($manifest['type']);
 	                $manifest_type = $manifest['type'];
 	                $dependencies = array();
-	                if( isset( $manifest['dependencies']) ){
-	    				$dependencies    = $manifest['dependencies'];
+	                if (isset($manifest['dependencies'])) {
+	    				$dependencies = $manifest['dependencies'];
 					}
                 }
 
 				//check dependencies first
-				if(!empty($dependencies)) {
+				if (!empty($dependencies)) {
 					$uh = new UpgradeHistory();
 					$not_found = $uh->checkDependencies($dependencies);
-					if(!empty($not_found) && count($not_found) > 0){
+					if (!empty($not_found) && count($not_found) > 0) {
 							$file_install = 'errors_'.$mod_strings['ERR_UW_NO_DEPENDENCY']."[".implode(',', $not_found)."]";
 					}
 				}
 
-                if($view == 'default' && $manifest_type != 'patch') {
+                if ($view == 'default' && $manifest_type != 'patch') {
                     continue;
                 }
 
-                if($view == 'module'
+                if ($view == 'module'
                     && $manifest_type != 'module' && $manifest_type != 'theme' && $manifest_type != 'langpack') {
                     continue;
                 }
 
-                if(empty($manifest['icon'])) {
-                    $icon = $this->getImageForType( $manifest['type'] );
+                if (empty($manifest['icon'])) {
+                    $icon = $this->getImageForType($manifest['type']);
                 } else {
-                    $path_parts = pathinfo( $manifest['icon'] );
-                    $icon = "<img src=\"" . remove_file_extension( $upgrade_content ) . "-icon." . $path_parts['extension'] . "\">";
+                    $path_parts = pathinfo($manifest['icon']);
+                    $icon = "<img src=\"".remove_file_extension($upgrade_content)."-icon.".$path_parts['extension']."\">";
                 }
 
                 $upgrades_available++;
@@ -759,15 +759,15 @@ 
         return $packages;
     }
 
-    function getLicenseFromFile($file){
+    function getLicenseFromFile($file) {
         global $sugar_config;
         $base_upgrade_dir       = $this->upload_dir.'/upgrades';
         $base_tmp_upgrade_dir   = "$base_upgrade_dir/temp";
         $license_file = $this->extractFile($file, 'LICENSE.txt', $base_tmp_upgrade_dir);
-        if(is_file($license_file)){
+        if (is_file($license_file)) {
             $contents = file_get_contents($license_file);
             return $contents;
-        }else{
+        } else {
             return null;
         }
     }
@@ -780,12 +780,12 @@ 
      *
      * @return an array of installed upgrade_history objects
      */
-    function getInstalled($types = array('module')){
+    function getInstalled($types = array('module')) {
     	$uh = new UpgradeHistory();
     	$in = "";
-    	for($i = 0; $i < count($types); $i++){
+    	for ($i = 0; $i < count($types); $i++) {
     		$in .= "'".$types[$i]."'";
-    		if(($i+1) < count($types)){
+    		if (($i + 1) < count($types)) {
     			$in .= ",";
     		}
     	}
@@ -793,7 +793,7 @@ 
     	return $uh->getList($query);
     }
 
-    function getinstalledPackages($types = array('module', 'langpack')){
+    function getinstalledPackages($types = array('module', 'langpack')) {
     	global $sugar_config;
     	$installeds = $this->getInstalled($types);
     	$packages = array();
@@ -801,7 +801,7 @@ 
     	$uh = new UpgradeHistory();
         $base_upgrade_dir       = $this->upload_dir.'/upgrades';
         $base_tmp_upgrade_dir   = "$base_upgrade_dir/temp";
-    	foreach($installeds as $installed)
+    	foreach ($installeds as $installed)
 		{
 			$populate = false;
 			$filename = from_html($installed->filename);
@@ -815,31 +815,31 @@ 
 			$enabled = true;
 			$enabled_string = 'ENABLED';
 			//if the name is empty then we should try to pull from manifest and populate upgrade_history_table
-			if(empty($name)){
+			if (empty($name)) {
 				$populate = true;
 			}
 			$upgrades_installed++;
-			switch($type)
+			switch ($type)
 			{
 				case "theme":
 				case "langpack":
 				case "module":
 				case "patch":
-					if($populate){
+					if ($populate) {
 						$manifest_file = $this->extractManifest($filename, $base_tmp_upgrade_dir);
 						require_once($manifest_file);
 						$GLOBALS['log']->info("Filling in upgrade_history table");
 						$populate = false;
-						if( isset( $manifest['name'] ) ){
+						if (isset($manifest['name'])) {
     						$name = $manifest['name'];
     						$installed->name = $name;
 						}
-						if( isset( $manifest['description'] ) ){
+						if (isset($manifest['description'])) {
 						    $description = $manifest['description'];
 						    $installed->description = $description;
 						}
-						if(isset($installdefs) && isset( $installdefs['id'] ) ){
-						    $id_name  = $installdefs['id'];
+						if (isset($installdefs) && isset($installdefs['id'])) {
+						    $id_name = $installdefs['id'];
 						    $installed->id_name = $id_name;
 						}
 
@@ -849,24 +849,24 @@ 
 						$serial_manifest['upgrade_manifest'] = (isset($upgrade_manifest) ? $upgrade_manifest : '');
 						$installed->manifest = base64_encode(serialize($serial_manifest));
 						$installed->save();
-					}else{
+					} else {
 						$serial_manifest = unserialize(base64_decode($installed->manifest));
 						$manifest = $serial_manifest['manifest'];
 					}
-					if(($upgrades_installed==0 || $uh->UninstallAvailable($installeds, $installed))
+					if (($upgrades_installed == 0 || $uh->UninstallAvailable($installeds, $installed))
 						&& is_file($filename) && !empty($manifest['is_uninstallable']))
 					{
 						$uninstallable = true;
 					}
 					$enabled = $installed->enabled;
-					if(!$enabled)
+					if (!$enabled)
 						$enabled_string = 'DISABLED';
 					$file_uninstall = $filename;
-					if(!$uninstallable){
+					if (!$uninstallable) {
 						$file_uninstall = 'UNINSTALLABLE';
 						$enabled_string = 'UNINSTALLABLE';
 					} else {
-						$file_uninstall = fileToHash( $file_uninstall );
+						$file_uninstall = fileToHash($file_uninstall);
 					}
 
 				$packages[] = array(
@@ -876,7 +876,7 @@ 
 				    'published_date' => $date_entered,
 				    'description' => $description,
 				    'uninstallable' =>$uninstallable,
-				    'file_install' =>  $file_uninstall ,
+				    'file_install' =>  $file_uninstall,
 				    'file' =>  fileToHash($filename),
 				    'enabled' => $enabled_string
 				);

Braces +48 added lines, -36 removed lines

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

ModuleInstall/PackageManager/ListViewPackages.php

Spacing +6 added lines, -6 removed lines

@@ -39,21 +39,21 @@ 
 
  require_once('include/ListView/ListViewSmarty.php');
 
-class ListViewPackages extends ListViewSmarty{
+class ListViewPackages extends ListViewSmarty {
     var $secondaryDisplayColumns;
     /**
      * Constructor  Call ListViewSmarty
      */
-    function __construct(){
+    function __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
      */
-    function ListViewPackages(){
+    function ListViewPackages() {
         $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 {
@@ -69,7 +69,7 @@ 
      * @param data  the data to display on the page
      * @param file  the template file to parse
      */
-    function setup($data, $file, $where, $params = Array(), $offset = 0, $limit = -1, $filter_fields = Array(), $id_field = 'id'){
+    function setup($data, $file, $where, $params = Array(), $offset = 0, $limit = -1, $filter_fields = Array(), $id_field = 'id') {
         $this->data = $data;
         $this->tpl = $file;
     }
@@ -77,7 +77,7 @@ 
     /**
      * Override the display method
      */
-    function display($end = true){
+    function display($end = true) {
         global $odd_bg, $even_bg, $app_strings;
         $this->ss->assign('rowColor', array('oddListRow', 'evenListRow'));
         $this->ss->assign('bgColor', array($odd_bg, $even_bg));

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,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($seed, $module, $subPanel, $options);

modules/DynamicFields/DynamicField.php

Spacing +211 added lines, -211 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
@@ -47,16 +47,16 @@ 
     var $base_path = "";
 
     public function __construct($module = '') {
-        $this->module = (! empty ( $module )) ? $module :( (isset($_REQUEST['module']) && ! empty($_REQUEST['module'])) ? $_REQUEST ['module'] : '');
+        $this->module = (!empty ($module)) ? $module : ((isset($_REQUEST['module']) && !empty($_REQUEST['module'])) ? $_REQUEST ['module'] : '');
         $this->base_path = "custom/Extension/modules/{$this->module}/Ext/Vardefs";
     }
 
     /**
      * @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 DynamicField($module = ''){
+    public function DynamicField($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 {
@@ -67,7 +67,7 @@ 
 
    function getModuleName()
     {
-        return $this->module ;
+        return $this->module;
     }
 
     /*
@@ -75,10 +75,10 @@ 
      */
     function getPackageName()
     {
-        return null ;
+        return null;
     }
 
-    function deleteCache(){
+    function deleteCache() {
     }
 
 
@@ -92,20 +92,20 @@ 
         if ($bean) {
             $this->bean = $bean;
         }
-        if (isset ( $this->bean->module_dir )) {
+        if (isset ($this->bean->module_dir)) {
             $this->module = $this->bean->module_dir;
         }
-        if(!isset($GLOBALS['dictionary'][$this->bean->object_name]['custom_fields'])){
-            $this->buildCache ( $this->module );
+        if (!isset($GLOBALS['dictionary'][$this->bean->object_name]['custom_fields'])) {
+            $this->buildCache($this->module);
         }
     }
 
-    function setLabel( $language='en_us' , $key , $value )
+    function setLabel($language = 'en_us', $key, $value)
     {
-        $params [ "label_" . $key ] = $value;
-        require_once 'modules/ModuleBuilder/parsers/parser.label.php' ;
-        $parser = new ParserLabel ( $this->module ) ;
-        $parser->handleSave( $params , $language);
+        $params ["label_".$key] = $value;
+        require_once 'modules/ModuleBuilder/parsers/parser.label.php';
+        $parser = new ParserLabel($this->module);
+        $parser->handleSave($params, $language);
     }
 
     /**
@@ -115,58 +115,58 @@ 
     * @param boolean saveCache Boolean value indicating whether or not to pass saveCache value to saveToVardef, defaults to true
     * @return unknown
     */
-    function buildCache($module = false, $saveCache=true) {
+    function buildCache($module = false, $saveCache = true) {
         //We can't build the cache while installing as the required database tables may not exist.
-        if (!empty($GLOBALS['installing']) && $GLOBALS['installing'] == true|| empty($GLOBALS['db']))
+        if (!empty($GLOBALS['installing']) && $GLOBALS['installing'] == true || empty($GLOBALS['db']))
             return false;
-        if($module == '../data')return false;
+        if ($module == '../data')return false;
 
-        static $results = array ( ) ;
+        static $results = array( );
 
         $where = '';
-        if (! empty ( $module )) {
+        if (!empty ($module)) {
             $where .= " custom_module='$module' AND ";
-            unset( $results[ $module ] ) ; // clear out any old results for the module as $results is declared static
+            unset($results[$module]); // clear out any old results for the module as $results is declared static
         }
         else
         {
-            $results = array ( ) ; // clear out results - if we remove a module we don't want to have its old vardefs hanging around
+            $results = array( ); // clear out results - if we remove a module we don't want to have its old vardefs hanging around
         }
 
-        $GLOBALS['log']->debug('rebuilding cache for ' . $module);
+        $GLOBALS['log']->debug('rebuilding cache for '.$module);
         $query = "SELECT * FROM fields_meta_data WHERE $where deleted = 0";
 
-        $result = $GLOBALS['db']->query ( $query );
+        $result = $GLOBALS['db']->query($query);
         require_once ('modules/DynamicFields/FieldCases.php');
 
         // retrieve the field definition from the fields_meta_data table
         // using 'encode'=false to fetchByAssoc to prevent any pre-formatting of the base metadata
         // for immediate use in HTML. This metadata will be further massaged by get_field_def() and so should not be pre-formatted
-        while ( $row = $GLOBALS['db']->fetchByAssoc ( $result, false ) ) {
-            $field = get_widget ( $row ['type'] );
+        while ($row = $GLOBALS['db']->fetchByAssoc($result, false)) {
+            $field = get_widget($row ['type']);
 
-            foreach ( $row as $key => $value ) {
+            foreach ($row as $key => $value) {
                 $field->$key = $value;
             }
             $field->default = $field->default_value;
-            $vardef = $field->get_field_def ();
+            $vardef = $field->get_field_def();
             $vardef ['id'] = $row ['id'];
             $vardef ['custom_module'] = $row ['custom_module'];
-            if (empty ( $vardef ['source'] ))
+            if (empty ($vardef ['source']))
                 $vardef ['source'] = 'custom_fields';
-            if (empty ( $results [$row ['custom_module']] ))
-                $results [$row ['custom_module']] = array ( );
+            if (empty ($results [$row ['custom_module']]))
+                $results [$row ['custom_module']] = array( );
             $results [$row ['custom_module']] [$row ['name']] = $vardef;
         }
-        if (empty ( $module )) {
-            foreach ( $results as $module => $result ) {
-                $this->saveToVardef ( $module, $result, $saveCache);
+        if (empty ($module)) {
+            foreach ($results as $module => $result) {
+                $this->saveToVardef($module, $result, $saveCache);
             }
         } else {
-            if (! empty ( $results [$module] )) {
-                $this->saveToVardef ( $module, $results [$module], $saveCache);
-            }else{
-                $this->saveToVardef ( $module, false, $saveCache);
+            if (!empty ($results [$module])) {
+                $this->saveToVardef($module, $results [$module], $saveCache);
+            } else {
+                $this->saveToVardef($module, false, $saveCache);
             }
         }
 
@@ -178,14 +178,14 @@ 
     * Returns the widget for a custom field from the fields_meta_data table.
     */
     function getFieldWidget($module, $fieldName) {
-        if (empty($module) || empty($fieldName)){
+        if (empty($module) || empty($fieldName)) {
             sugar_die("Unable to load widget for '$module' : '$fieldName'");
         }
         $query = "SELECT * FROM fields_meta_data WHERE custom_module='$module' AND name='$fieldName' AND deleted = 0";
-        $result = $GLOBALS['db']->query ( $query );
+        $result = $GLOBALS['db']->query($query);
         require_once ('modules/DynamicFields/FieldCases.php');
-        if ( $row = $GLOBALS['db']->fetchByAssoc ( $result ) ) {
-            $field = get_widget ( $row ['type'] );
+        if ($row = $GLOBALS['db']->fetchByAssoc($result)) {
+            $field = get_widget($row ['type']);
             $field->populateFromRow($row);
             return $field;
         }
@@ -199,41 +199,41 @@ 
     * @param array $result
     * @param boolean saveCache Boolean value indicating whether or not to call VardefManager::saveCache, defaults to true
     */
-    function saveToVardef($module,$result,$saveCache=true) {
+    function saveToVardef($module, $result, $saveCache = true) {
 
 
         global $beanList;
-        if (! empty ( $beanList [$module] )) {
+        if (!empty ($beanList [$module])) {
             $object = BeanFactory::getObjectName($module);
 
-            if(empty($GLOBALS['dictionary'][$object]['fields'])){
+            if (empty($GLOBALS['dictionary'][$object]['fields'])) {
                 //if the vardef isn't loaded let's try loading it.
-                VardefManager::refreshVardefs($module,$object, null, false);
+                VardefManager::refreshVardefs($module, $object, null, false);
                 //if it's still not loaded we really don't have anything useful to cache
-                if(empty($GLOBALS['dictionary'][$object]['fields']))return;
+                if (empty($GLOBALS['dictionary'][$object]['fields']))return;
             }
             if (!isset($GLOBALS['dictionary'][$object]['custom_fields'])) {
                 $GLOBALS['dictionary'][$object]['custom_fields'] = false;
             }
-            if (! empty ( $GLOBALS ['dictionary'] [$object] )) {
-                if (! empty ( $result )) {
+            if (!empty ($GLOBALS ['dictionary'] [$object])) {
+                if (!empty ($result)) {
                     // First loop to add
 
-                foreach ( $result as $field ) {
-                    foreach($field as $k=>$v){
+                foreach ($result as $field) {
+                    foreach ($field as $k=>$v) {
                         //allows values for custom fields to be defined outside of the scope of studio
-                        if(!isset($GLOBALS ['dictionary'] [$object] ['fields'] [$field ['name']][$k])){
+                        if (!isset($GLOBALS ['dictionary'] [$object] ['fields'] [$field ['name']][$k])) {
                             $GLOBALS ['dictionary'] [$object] ['fields'] [$field ['name']][$k] = $v;
                         }
                     }
                 }
 
                     // Second loop to remove
-                    foreach ( $GLOBALS ['dictionary'] [$object] ['fields'] as $name => $fieldDef ) {
+                    foreach ($GLOBALS ['dictionary'] [$object] ['fields'] as $name => $fieldDef) {
 
-                        if (isset ( $fieldDef ['custom_module'] )) {
-                            if (! isset ( $result [$name] )) {
-                                unset ( $GLOBALS ['dictionary'] [$object] ['fields'] [$name] );
+                        if (isset ($fieldDef ['custom_module'])) {
+                            if (!isset ($result [$name])) {
+                                unset ($GLOBALS ['dictionary'] [$object] ['fields'] [$name]);
                             } else {
                                 $GLOBALS ['dictionary'] [$object] ['custom_fields'] = true;
                             }
@@ -244,9 +244,9 @@ 
             }
 
             $manager = new VardefManager();
-            if($saveCache)
+            if ($saveCache)
             {
-                $manager->saveCache ($this->module, $object);
+                $manager->saveCache($this->module, $object);
             }
 
             // Everything works off of vardefs, so let's have it save the users vardefs
@@ -269,38 +269,38 @@ 
     *
     * @return array select=>select columns, join=>prebuilt join statement
     */
-  function getJOIN( $expandedList = false , $includeRelates = false, &$where = false){
-        if(!$this->bean->hasCustomFields()){
+  function getJOIN($expandedList = false, $includeRelates = false, &$where = false) {
+        if (!$this->bean->hasCustomFields()) {
             return array(
                 'select' => '',
                 'join' => ''
             );
         }
 
-        if (empty($expandedList) )
+        if (empty($expandedList))
         {
-            $select = ",{$this->bean->table_name}_cstm.*" ;
+            $select = ",{$this->bean->table_name}_cstm.*";
         }
         else
         {
             $select = '';
             $isList = is_array($expandedList);
-            foreach($this->bean->field_defs as $name=>$field)
+            foreach ($this->bean->field_defs as $name=>$field)
             {
-                if (!empty($field['source']) && $field['source'] == 'custom_fields' && (!$isList || !empty($expandedList[$name]))){
+                if (!empty($field['source']) && $field['source'] == 'custom_fields' && (!$isList || !empty($expandedList[$name]))) {
                     // assumption: that the column name in _cstm is the same as the field name. Currently true.
                     // however, two types of dynamic fields do not have columns in the custom table - html fields (they're readonly) and flex relates (parent_name doesn't exist)
-                    if ( $field['type'] != 'html' && $name != 'parent_name')
-                        $select .= ",{$this->bean->table_name}_cstm.{$name}" ;
+                    if ($field['type'] != 'html' && $name != 'parent_name')
+                        $select .= ",{$this->bean->table_name}_cstm.{$name}";
                 }
             }
         }
-        $join = " LEFT JOIN " .$this->bean->table_name. "_cstm ON " .$this->bean->table_name. ".id = ". $this->bean->table_name. "_cstm.id_c ";
+        $join = " LEFT JOIN ".$this->bean->table_name."_cstm ON ".$this->bean->table_name.".id = ".$this->bean->table_name."_cstm.id_c ";
 
         if ($includeRelates) {
             $jtAlias = "relJoin";
             $jtCount = 1;
-            foreach($this->bean->field_defs as $name=>$field)
+            foreach ($this->bean->field_defs as $name=>$field)
             {
                 if ($field['type'] == 'relate' && isset($field['custom_module'])) {
                     $relateJoinInfo = $this->getRelateJoin($field, $jtAlias.$jtCount);
@@ -311,7 +311,7 @@ 
                     {
                         $pattern = '/'.$field['name'].'\slike/i';
                         $replacement = $relateJoinInfo['name_field'].' like';
-                        $where = preg_replace($pattern,$replacement,$where);
+                        $where = preg_replace($pattern, $replacement, $where);
                     }
                     $jtCount++;
                 }
@@ -328,7 +328,7 @@ 
         }
         global $beanFiles, $beanList, $module;
         $rel_module = $field_def['module'];
-        if(empty($beanFiles[$beanList[$rel_module]])) {
+        if (empty($beanFiles[$beanList[$rel_module]])) {
             return false;
         }
 
@@ -338,25 +338,25 @@ 
         if (isset($rel_mod->field_defs['name']))
         {
             $name_field_def = $rel_mod->field_defs['name'];
-            if(isset($name_field_def['db_concat_fields']))
+            if (isset($name_field_def['db_concat_fields']))
             {
                 $name_field = db_concat($joinTableAlias, $name_field_def['db_concat_fields']);
             }
             //If the name field is non-db, we need to find another field to display
-            else if(!empty($rel_mod->field_defs['name']['source']) && $rel_mod->field_defs['name']['source'] == "non-db" && !empty($field_def['rname']))
+            else if (!empty($rel_mod->field_defs['name']['source']) && $rel_mod->field_defs['name']['source'] == "non-db" && !empty($field_def['rname']))
             {
-                $name_field = "$joinTableAlias." . $field_def['rname'];
+                $name_field = "$joinTableAlias.".$field_def['rname'];
             }
             else
             {
                 $name_field = "$joinTableAlias.name";
             }
         }
-        $tableName = isset($field_def['custom_module']) ? "{$this->bean->table_name}_cstm" : $this->bean->table_name ;
+        $tableName = isset($field_def['custom_module']) ? "{$this->bean->table_name}_cstm" : $this->bean->table_name;
         $relID = $field_def['id_name'];
         $ret_array['rel_table'] = $rel_table;
         $ret_array['name_field'] = $name_field;
-        $ret_array['select'] = ($withIdName ? ", {$tableName}.{$relID}" : "") . ", {$name_field} {$field_def['name']} ";
+        $ret_array['select'] = ($withIdName ? ", {$tableName}.{$relID}" : "").", {$name_field} {$field_def['name']} ";
         $ret_array['from'] = " LEFT JOIN $rel_table $joinTableAlias ON $tableName.$relID = $joinTableAlias.id"
                             . " AND $joinTableAlias.deleted=0 ";
         return $ret_array;
@@ -366,24 +366,24 @@ 
     * Fills in all the custom fields of type relate relationships for an object
     *
     */
-   function fill_relationships(){
+   function fill_relationships() {
         global $beanList, $beanFiles;
-        if(!empty($this->bean->relDepth)) {
-            if($this->bean->relDepth > 1)return;
-        }else{
+        if (!empty($this->bean->relDepth)) {
+            if ($this->bean->relDepth > 1)return;
+        } else {
             $this->bean->relDepth = 0;
         }
-        foreach($this->bean->field_defs as $field){
-            if(empty($field['source']) || $field['source'] != 'custom_fields')continue;
-            if($field['type'] == 'relate'){
-                $related_module =$field['ext2'];
+        foreach ($this->bean->field_defs as $field) {
+            if (empty($field['source']) || $field['source'] != 'custom_fields')continue;
+            if ($field['type'] == 'relate') {
+                $related_module = $field['ext2'];
                 $name = $field['name'];
                 if (empty($this->bean->$name)) { //Don't load the relationship twice
                     $id_name = $field['id_name'];
-                    if(isset($beanList[ $related_module])){
+                    if (isset($beanList[$related_module])) {
                         $class = $beanList[$related_module];
 
-                        if(file_exists($beanFiles[$class]) && isset($this->bean->$name)){
+                        if (file_exists($beanFiles[$class]) && isset($this->bean->$name)) {
                             require_once($beanFiles[$class]);
                             $mod = new $class();
                             $mod->relDepth = $this->bean->relDepth + 1;
@@ -401,72 +401,72 @@ 
      *
      * @param boolean $isUpdate
      */
-     function save($isUpdate){
+     function save($isUpdate) {
 
-        if($this->bean->hasCustomFields() && isset($this->bean->id)){
+        if ($this->bean->hasCustomFields() && isset($this->bean->id)) {
 
-            if($isUpdate){
-                $query = "UPDATE ". $this->bean->table_name. "_cstm SET ";
+            if ($isUpdate) {
+                $query = "UPDATE ".$this->bean->table_name."_cstm SET ";
             }
-            $queryInsert = "INSERT INTO ". $this->bean->table_name. "_cstm (id_c";
+            $queryInsert = "INSERT INTO ".$this->bean->table_name."_cstm (id_c";
             $values = "('".$this->bean->id."'";
             $first = true;
-            foreach($this->bean->field_defs as $name=>$field){
+            foreach ($this->bean->field_defs as $name=>$field) {
 
-                if(empty($field['source']) || $field['source'] != 'custom_fields')continue;
-                if($field['type'] == 'html' || $field['type'] == 'parent')continue;
-                if(isset($this->bean->$name)){
+                if (empty($field['source']) || $field['source'] != 'custom_fields')continue;
+                if ($field['type'] == 'html' || $field['type'] == 'parent')continue;
+                if (isset($this->bean->$name)) {
                     $quote = "'";
 
-                    if(in_array($field['type'], array('int', 'float', 'double', 'uint', 'ulong', 'long', 'short', 'tinyint', 'currency', 'decimal'))) {
+                    if (in_array($field['type'], array('int', 'float', 'double', 'uint', 'ulong', 'long', 'short', 'tinyint', 'currency', 'decimal'))) {
                         $quote = '';
-                        if(!isset($this->bean->$name) || !is_numeric($this->bean->$name) ){
-                            if($field['required']){
+                        if (!isset($this->bean->$name) || !is_numeric($this->bean->$name)) {
+                            if ($field['required']) {
                                 $this->bean->$name = 0;
-                            }else{
+                            } else {
                                 $this->bean->$name = 'NULL';
                             }
                         }
                     }
-                    if ( $field['type'] == 'bool' ) {
-                        if ( $this->bean->$name === FALSE )
+                    if ($field['type'] == 'bool') {
+                        if ($this->bean->$name === FALSE)
                             $this->bean->$name = '0';
-                        elseif ( $this->bean->$name === TRUE )
+                        elseif ($this->bean->$name === TRUE)
                             $this->bean->$name = '1';
                     }
 
                     $val = $this->bean->$name;
-					if(($field['type'] == 'date' || $field['type'] == 'datetimecombo') && (empty($this->bean->$name )|| $this->bean->$name == '1900-01-01')){
+					if (($field['type'] == 'date' || $field['type'] == 'datetimecombo') && (empty($this->bean->$name) || $this->bean->$name == '1900-01-01')) {
                     	$quote = '';
                         $val = 'NULL';
                         $this->bean->$name = ''; // do not set it to string 'NULL'
                     }
-                    if($isUpdate){
-                        if($first){
+                    if ($isUpdate) {
+                        if ($first) {
                             $query .= " $name=$quote".$GLOBALS['db']->quote($val)."$quote";
 
-                        }else{
+                        } else {
                             $query .= " ,$name=$quote".$GLOBALS['db']->quote($val)."$quote";
                         }
                     }
                     $first = false;
                     $queryInsert .= " ,$name";
-                    $values .= " ,$quote". $GLOBALS['db']->quote($val). "$quote";
+                    $values .= " ,$quote".$GLOBALS['db']->quote($val)."$quote";
                 }
             }
-            if($isUpdate){
-                $query.= " WHERE id_c='" . $this->bean->id ."'";
+            if ($isUpdate) {
+                $query .= " WHERE id_c='".$this->bean->id."'";
 
             }
 
             $queryInsert .= " ) VALUES $values )";
 
-            if(!$first){
-                if(!$isUpdate){
+            if (!$first) {
+                if (!$isUpdate) {
                     $GLOBALS['db']->query($queryInsert);
-                }else{
+                } else {
                     $checkquery = "SELECT id_c FROM {$this->bean->table_name}_cstm WHERE id_c = '{$this->bean->id}'";
-                    if ( $GLOBALS['db']->getOne($checkquery) ) {
+                    if ($GLOBALS['db']->getOne($checkquery)) {
                         $result = $GLOBALS['db']->query($query);
                     } else {
                         $GLOBALS['db']->query($queryInsert);
@@ -481,7 +481,7 @@ 
      * Use the widgets get_db_modify_alter_table() method to get the table sql - some widgets do not need any custom table modifications
      * @param STRING $name - field name
      */
-    function deleteField($widget){
+    function deleteField($widget) {
         require_once('modules/DynamicFields/templates/Fields/TemplateField.php');
         global $beanList;
         if (!($widget instanceof TemplateField)) {
@@ -497,10 +497,10 @@ 
             $object_name = $newName != false ? $newName : $object_name;
         }
 
-        $GLOBALS['db']->query("DELETE FROM fields_meta_data WHERE id='" . $this->module . $widget->name . "'");
-        $sql = $widget->get_db_delete_alter_table( $this->bean->table_name . "_cstm" ) ;
-        if (! empty( $sql ) )
-            $GLOBALS['db']->query( $sql );
+        $GLOBALS['db']->query("DELETE FROM fields_meta_data WHERE id='".$this->module.$widget->name."'");
+        $sql = $widget->get_db_delete_alter_table($this->bean->table_name."_cstm");
+        if (!empty($sql))
+            $GLOBALS['db']->query($sql);
 
         $this->removeVardefExtension($widget);
         VardefManager::clearVardef();
@@ -512,25 +512,25 @@ 
      * Method required by the TemplateRelatedTextField->save() method
      * Taken from MBModule's implementation
      */
-    function fieldExists($name = '', $type = ''){
+    function fieldExists($name = '', $type = '') {
         // must get the vardefs from the GLOBAL array as $bean->field_defs does not contain the values from the cache at this point
         // TODO: fix this - saveToVardefs() updates GLOBAL['dictionary'] correctly, obtaining its information directly from the fields_meta_data table via buildCache()...
         $name = $this->getDBName($name);
         $vardefs = $GLOBALS['dictionary'][$this->bean->object_name]['fields'];
-        if(!empty($vardefs)){
-            if(empty($type) && empty($name))
+        if (!empty($vardefs)) {
+            if (empty($type) && empty($name))
                 return false;
-            else if(empty($type))
+            else if (empty($type))
                 return !empty($vardefs[$name]);
-            else if(empty($name)){
-                foreach($vardefs as $def){
-                    if(!empty($def['type']) && $def['type'] == $type)
+            else if (empty($name)) {
+                foreach ($vardefs as $def) {
+                    if (!empty($def['type']) && $def['type'] == $type)
                         return true;
                 }
                 return false;
-            }else
+            } else
                 return (!empty($vardefs[$name]) && ($vardefs[$name]['type'] == $type));
-        }else{
+        } else {
             return false;
         }
     }
@@ -542,24 +542,24 @@ 
      * @param Field Object $field
      * @return boolean
      */
-    function addFieldObject(&$field){
+    function addFieldObject(&$field) {
         $GLOBALS['log']->debug('adding field');
         $object_name = $this->module;
         $db_name = $field->name;
 
         $fmd = new FieldsMetaData();
-        $id =  $fmd->retrieve($object_name.$db_name,true, false);
+        $id = $fmd->retrieve($object_name.$db_name, true, false);
         $is_update = false;
-        $label = strtoupper( $field->label );
-        if(!empty($id)){
+        $label = strtoupper($field->label);
+        if (!empty($id)) {
             $is_update = true;
-        }else{
+        } else {
             $db_name = $this->getDBName($field->name);
             $field->name = $db_name;
         }
         $this->createCustomTable();
         $fmd->id = $object_name.$db_name;
-        $fmd->custom_module= $object_name;
+        $fmd->custom_module = $object_name;
         $fmd->name = $db_name;
         $fmd->vname = $label;
         $fmd->type = $field->type;
@@ -574,16 +574,16 @@ 
         $fmd->ext4 = (isset($field->ext4) ? $field->ext4 : '');
         $fmd->comments = $field->comment;
         $fmd->massupdate = $field->massupdate;
-        $fmd->importable = ( isset ( $field->importable ) ) ? $field->importable : null ;
+        $fmd->importable = (isset ($field->importable)) ? $field->importable : null;
         $fmd->duplicate_merge = $field->duplicate_merge;
-        $fmd->audited =$field->audited;
+        $fmd->audited = $field->audited;
         $fmd->inline_edit = $field->inline_edit;
         $fmd->reportable = ($field->reportable ? 1 : 0);
-        if(!$is_update){
-            $fmd->new_with_id=true;
+        if (!$is_update) {
+            $fmd->new_with_id = true;
         }
-        if($field){
-            if(!$is_update){
+        if ($field) {
+            if (!$is_update) {
                 //Do two SQL calls here in this case
             	//The first is to create the column in the custom table without the default value
             	//The second is to modify the column created in the custom table to set the default value
@@ -593,21 +593,21 @@ 
                 // resetting default and default_value does not work for multienum and causes trouble for mssql
                 // so using a temporary variable here to indicate that we don't want default for this query
                 $field->no_default = 1;
-                $query = $field->get_db_add_alter_table($this->bean->table_name . '_cstm');
+                $query = $field->get_db_add_alter_table($this->bean->table_name.'_cstm');
                 // unsetting temporary member variable
                 unset($field->no_default);
-                if(!empty($query)){
+                if (!empty($query)) {
                 	$GLOBALS['db']->query($query, true, "Cannot create column");
 	                $field->default = $fmd->default_value;
 	                $field->default_value = $fmd->default_value;
-	                $query = $field->get_db_modify_alter_table($this->bean->table_name . '_cstm');
-	                if(!empty($query)){
+	                $query = $field->get_db_modify_alter_table($this->bean->table_name.'_cstm');
+	                if (!empty($query)) {
 	                	$GLOBALS['db']->query($query, true, "Cannot set default");
 	            	}
                 }
-            }else{
-                $query = $field->get_db_modify_alter_table($this->bean->table_name . '_cstm');
-                if(!empty($query)){
+            } else {
+                $query = $field->get_db_modify_alter_table($this->bean->table_name.'_cstm');
+                if (!empty($query)) {
                 	$GLOBALS['db']->query($query, true, "Cannot modify field");
             	}
             }
@@ -621,18 +621,18 @@ 
 
     function saveExtendedAttributes($field, $column_fields)
     {
-            require_once ('modules/ModuleBuilder/parsers/StandardField.php') ;
-            require_once ('modules/DynamicFields/FieldCases.php') ;
+            require_once ('modules/ModuleBuilder/parsers/StandardField.php');
+            require_once ('modules/DynamicFields/FieldCases.php');
             global $beanList;
 
             $to_save = array();
-            $base_field = get_widget ( $field->type) ;
-        foreach ($field->vardef_map as $property => $fmd_col){
+            $base_field = get_widget($field->type);
+        foreach ($field->vardef_map as $property => $fmd_col) {
             //Skip over attribes that are either the default or part of the normal attributes stored in the DB
             if (!isset($field->$property) || in_array($fmd_col, $column_fields) || in_array($property, $column_fields)
                 || $this->isDefaultValue($property, $field->$property, $base_field)
                 || $property == "action" || $property == "label_value" || $property == "label"
-                || (substr($property, 0,3) == 'ext' && strlen($property) == 4))
+                || (substr($property, 0, 3) == 'ext' && strlen($property) == 4))
             {
                 continue;
             }
@@ -648,19 +648,19 @@ 
     {
         switch ($property) {
             case "importable":
-                return ( $value === 'true' || $value === '1' || $value === true || $value === 1 ); break;
+                return ($value === 'true' || $value === '1' || $value === true || $value === 1); break;
             case "required":
             case "audited":
             case "inline_edit":
             case "massupdate":
-                return ( $value === 'false' || $value === '0' || $value === false || $value === 0); break;
+                return ($value === 'false' || $value === '0' || $value === false || $value === 0); break;
             case "default_value":
             case "default":
             case "help":
             case "comments":
                 return ($value == "");
             case "duplicate_merge":
-                return ( $value === 'false' || $value === '0' || $value === false || $value === 0 || $value === "disabled"); break;
+                return ($value === 'false' || $value === '0' || $value === false || $value === 0 || $value === "disabled"); break;
         }
 
         if (isset($baseField->$property))
@@ -677,10 +677,10 @@ 
         $vBean = $bean_name == "aCase" ? "Case" : $bean_name;
         $file_loc = "$this->base_path/sugarfield_{$field->name}.php";
 
-        $out =  "<?php\n // created: " . date('Y-m-d H:i:s') . "\n";
+        $out = "<?php\n // created: ".date('Y-m-d H:i:s')."\n";
         foreach ($def_override as $property => $val)
         {
-            $out .= override_value_to_string_recursive(array($vBean, "fields", $field->name, $property), "dictionary", $val) . "\n";
+            $out .= override_value_to_string_recursive(array($vBean, "fields", $field->name, $property), "dictionary", $val)."\n";
         }
 
         $out .= "\n ?>";
@@ -688,15 +688,15 @@ 
         if (!file_exists($this->base_path))
             mkdir_recursive($this->base_path);
 
-        if( $fh = @sugar_fopen( $file_loc, 'w' ) )
+        if ($fh = @sugar_fopen($file_loc, 'w'))
         {
-            fputs( $fh, $out);
-            fclose( $fh );
-            return true ;
+            fputs($fh, $out);
+            fclose($fh);
+            return true;
         }
         else
         {
-            return false ;
+            return false;
         }
     }
 
@@ -733,11 +733,11 @@ 
      * @param unknown_type $comment
      * @return boolean
      */
-    function addField($name,$label='', $type='Text',$max_size='255',$required_option='optional', $default_value='', $ext1='', $ext2='', $ext3='',$audited=0, $inline_edit = 1, $mass_update = 0 , $ext4='', $help='',$duplicate_merge=0, $comment=''){
+    function addField($name, $label = '', $type = 'Text', $max_size = '255', $required_option = 'optional', $default_value = '', $ext1 = '', $ext2 = '', $ext3 = '', $audited = 0, $inline_edit = 1, $mass_update = 0, $ext4 = '', $help = '', $duplicate_merge = 0, $comment = '') {
         require_once('modules/DynamicFields/templates/Fields/TemplateField.php');
         $field = new TemplateField();
         $field->label = $label;
-        if(empty($field->label)){
+        if (empty($field->label)) {
             $field->label = $name;
         }
         $field->name = $name;
@@ -763,10 +763,10 @@ 
      * Creates the custom table with an id of id_c
      *
      */
-    function createCustomTable($execute = true){
+    function createCustomTable($execute = true) {
         $out = "";
         if (!$GLOBALS['db']->tableExists($this->bean->table_name."_cstm")) {
-            $GLOBALS['log']->debug('creating custom table for '. $this->bean->table_name);
+            $GLOBALS['log']->debug('creating custom table for '.$this->bean->table_name);
             $iddef = array(
                 "id_c" => array(
                     "name" => "id_c",
@@ -783,21 +783,21 @@ 
            );
 
             $query = $GLOBALS['db']->createTableSQLParams($this->bean->table_name."_cstm", $iddef, $ididx);
-            if(!$GLOBALS['db']->supports("inline_keys")) {
+            if (!$GLOBALS['db']->supports("inline_keys")) {
                 $indicesArr = $GLOBALS['db']->getConstraintSql($ididx, $this->bean->table_name."_cstm");
             } else {
                 $indicesArr = array();
             }
-            if($execute) {
+            if ($execute) {
                 $GLOBALS['db']->query($query);
-                if(!empty($indicesArr)) {
-                    foreach($indicesArr as $idxq) {
+                if (!empty($indicesArr)) {
+                    foreach ($indicesArr as $idxq) {
                         $GLOBALS['db']->query($idxq);
                     }
                 }
             }
-            $out = $query . "\n";
-            if(!empty($indicesArr)) {
+            $out = $query."\n";
+            if (!empty($indicesArr)) {
                 $out .= join("\n", $indicesArr)."\n";
             }
 
@@ -811,11 +811,11 @@ 
      * Updates the db schema and adds any custom fields we have used if the custom table was dropped
      *
      */
-    function add_existing_custom_fields($execute = true){
+    function add_existing_custom_fields($execute = true) {
     	$out = "";
-        if($this->bean->hasCustomFields()){
-	        foreach($this->bean->field_defs as $name=>$data){
-	        	if(empty($data['source']) || $data['source'] != 'custom_fields')
+        if ($this->bean->hasCustomFields()) {
+	        foreach ($this->bean->field_defs as $name=>$data) {
+	        	if (empty($data['source']) || $data['source'] != 'custom_fields')
                     continue;
 	            $out .= $this->add_existing_custom_field($data, $execute);
 	        }
@@ -826,11 +826,11 @@ 
     function add_existing_custom_field($data, $execute = true)
     {
 
-        $field = get_widget ( $data ['type'] );
+        $field = get_widget($data ['type']);
         $field->populateFromRow($data);
         $query = "/*MISSING IN DATABASE - {$data['name']} -  ROW*/\n"
-                . $field->get_db_add_alter_table($this->bean->table_name . '_cstm');
-        $out = $query . "\n";
+                . $field->get_db_add_alter_table($this->bean->table_name.'_cstm');
+        $out = $query."\n";
         if ($execute)
             $GLOBALS['db']->query($query);
 
@@ -848,8 +848,8 @@ 
         $db = $GLOBALS['db'];
         $tablename = $this->bean->table_name."_cstm";
         $compareFieldDefs = $db->get_columns($tablename);
-        foreach($this->bean->field_defs as $name=>$data){
-            if(empty($data['source']) || $data['source'] != 'custom_fields')
+        foreach ($this->bean->field_defs as $name=>$data) {
+            if (empty($data['source']) || $data['source'] != 'custom_fields')
                 continue;
             /**
              * @bug 43471
@@ -859,7 +859,7 @@ 
              * force the name to be lower as it needs to be lower since that is how it's put into the key
              * in the get_columns() call above.
              */
-            if(!empty($compareFieldDefs[strtolower($name)])) {
+            if (!empty($compareFieldDefs[strtolower($name)])) {
                 continue;
             }
             $out .= $this->add_existing_custom_field($data, $execute);
@@ -878,24 +878,24 @@ 
      * @return string The core of the system label name - returns currency_id5 for example, when the full label would then be LBL_CURRENCY_ID5
      * TODO: Only the core is returned for historical reasons - switch to return the real system label
      */
-    function addLabel ( $displayLabel )
+    function addLabel($displayLabel)
     {
-        $mod_strings = return_module_language($GLOBALS[ 'current_language' ], $this->module);
+        $mod_strings = return_module_language($GLOBALS['current_language'], $this->module);
         $limit = 10;
         $count = 0;
         $field_key = $this->getDBName($displayLabel, false);
         $systemLabel = $field_key;
-        if(!$this->use_existing_labels){ // use_existing_labels defaults to false in this module; as of today, only set to true by ModuleInstaller.php
-            while( isset( $mod_strings [ $systemLabel ] ) && $count <= $limit )
+        if (!$this->use_existing_labels) { // use_existing_labels defaults to false in this module; as of today, only set to true by ModuleInstaller.php
+            while (isset($mod_strings [$systemLabel]) && $count <= $limit)
             {
-                $systemLabel = $field_key. "_$count";
+                $systemLabel = $field_key."_$count";
                 $count++;
             }
         }
         $selMod = (!empty($_REQUEST['view_module'])) ? $_REQUEST['view_module'] : $this->module;
-        require_once 'modules/ModuleBuilder/parsers/parser.label.php' ;
-        $parser = new ParserLabel ( $selMod , isset ( $_REQUEST [ 'view_package' ] ) ? $_REQUEST [ 'view_package' ] : null ) ;
-        $parser->handleSave ( array('label_'. $systemLabel => $displayLabel ) , $GLOBALS [ 'current_language' ] ) ;
+        require_once 'modules/ModuleBuilder/parsers/parser.label.php';
+        $parser = new ParserLabel($selMod, isset ($_REQUEST ['view_package']) ? $_REQUEST ['view_package'] : null);
+        $parser->handleSave(array('label_'.$systemLabel => $displayLabel), $GLOBALS ['current_language']);
 
         return $systemLabel;
     }
@@ -907,27 +907,27 @@ 
      * @param BOOLEAN $_C do we append _c to the name
      * @return STRING
      */
-    function getDBName($name, $_C= true){
+    function getDBName($name, $_C = true) {
         static $cached_results = array();
-        if(!empty($cached_results[$name]))
+        if (!empty($cached_results[$name]))
         {
             return $cached_results[$name];
         }
         $exclusions = array('parent_type', 'parent_id', 'currency_id', 'parent_name');
         // Remove any non-db friendly characters
-        $return_value = preg_replace("/[^\w]+/","_",$name);
-        if($_C == true && !in_array($return_value, $exclusions) && substr($return_value, -2) != '_c'){
+        $return_value = preg_replace("/[^\w]+/", "_", $name);
+        if ($_C == true && !in_array($return_value, $exclusions) && substr($return_value, -2) != '_c') {
             $return_value .= '_c';
         }
         $cached_results[$name] = $return_value;
         return $return_value;
     }
 
-    function setWhereClauses(&$where_clauses){
+    function setWhereClauses(&$where_clauses) {
         if (isset($this->avail_fields)) {
-            foreach($this->avail_fields as $name=>$value){
-                if(!empty($_REQUEST[$name])){
-                    $where_clauses[] = $this->bean->table_name . "_cstm.$name LIKE '". $GLOBALS['db']->quote($_REQUEST[$name]). "%'";
+            foreach ($this->avail_fields as $name=>$value) {
+                if (!empty($_REQUEST[$name])) {
+                    $where_clauses[] = $this->bean->table_name."_cstm.$name LIKE '".$GLOBALS['db']->quote($_REQUEST[$name])."%'";
                 }
             }
         }
@@ -947,12 +947,12 @@ 
 
     function retrieve()
     {
-        if(!isset($this->bean)){
+        if (!isset($this->bean)) {
             $GLOBALS['log']->fatal("DynamicField retrieve, bean not instantiated: ".var_export(debug_print_backtrace(), true));
             return false;
         }
 
-        if(!$this->bean->hasCustomFields()){
+        if (!$this->bean->hasCustomFields()) {
             return false;
         }
 
@@ -960,9 +960,9 @@ 
         $result = $GLOBALS['db']->query($query);
         $row = $GLOBALS['db']->fetchByAssoc($result);
 
-        if($row)
+        if ($row)
         {
-            foreach($row as $name=>$value)
+            foreach ($row as $name=>$value)
             {
                 // originally in pre-r30895 we checked if this field was in avail_fields i.e., in fields_meta_data and not deleted
                 // with the removal of avail_fields post-r30895 we have simplified this - we now retrieve every custom field even if previously deleted
@@ -975,12 +975,12 @@ 
 
    function populateXTPL($xtpl, $view) {
 
-        if($this->bean->hasCustomFields()){
+        if ($this->bean->hasCustomFields()) {
             $results = $this->getAllFieldsView($view, 'xtpl');
-            foreach($results as $name=>$value){
-                if(is_array($value['xtpl']))
+            foreach ($results as $name=>$value) {
+                if (is_array($value['xtpl']))
                 {
-                    foreach($value['xtpl'] as $xName=>$xValue)
+                    foreach ($value['xtpl'] as $xName=>$xValue)
                     {
                         $xtpl->assign(strtoupper($xName), $xValue);
                     }
@@ -992,24 +992,24 @@ 
 
     }
 
-    function populateAllXTPL($xtpl, $view){
+    function populateAllXTPL($xtpl, $view) {
         $this->populateXTPL($xtpl, $view);
 
     }
 
-    function getAllFieldsView($view, $type){
+    function getAllFieldsView($view, $type) {
          require_once ('modules/DynamicFields/FieldCases.php');
          $results = array();
-         foreach($this->bean->field_defs as $name=>$data){
-            if(empty($data['source']) || $data['source'] != 'custom_fields')
+         foreach ($this->bean->field_defs as $name=>$data) {
+            if (empty($data['source']) || $data['source'] != 'custom_fields')
             {
             	continue;
             }
-            $field = get_widget ( $data ['type'] );
+            $field = get_widget($data ['type']);
             $field->populateFromRow($data);
             $field->view = $view;
             $field->bean = $this->bean;
-            switch(strtolower($type))
+            switch (strtolower($type))
             {
                 case 'xtpl':
                     $results[$name] = array('xtpl'=>$field->get_xtpl());

Braces +85 added lines, -61 removed lines

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

modules/DynamicFields/FieldsMetaData.php

Indentation +74 added lines, -74 removed lines

@@ -51,75 +51,75 @@ 
 
 
 class FieldsMetaData extends SugarBean {
-	// database table columns
-	var $id;
-	var $name;
-	var $vname;
-  	var $custom_module;
-  	var $type;
-  	var $len;
-  	var $required;
-  	var $default_value;
-  	var $deleted;
-  	var $ext1;
-  	var $ext2;
-  	var $ext3;
-	var $audited;
-	var $inline_edit;
+    // database table columns
+    var $id;
+    var $name;
+    var $vname;
+        var $custom_module;
+        var $type;
+        var $len;
+        var $required;
+        var $default_value;
+        var $deleted;
+        var $ext1;
+        var $ext2;
+        var $ext3;
+    var $audited;
+    var $inline_edit;
     var $duplicate_merge;
     var $reportable;
-	var $required_fields =  array("name"=>1, "date_start"=>2, "time_start"=>3,);
-
-	var $table_name = 'fields_meta_data';
-	var $object_name = 'FieldsMetaData';
-	var $module_dir = 'DynamicFields';
-	var $column_fields = array(
-		'id',
-		'name',
-		'vname',
-		'custom_module',
-		'type',
-		'len',
-		'required',
-		'default_value',
-		'deleted',
-		'ext1',
-		'ext2',
-		'ext3',
-		'audited',
-		'inline_edit',
-		'massupdate',
+    var $required_fields =  array("name"=>1, "date_start"=>2, "time_start"=>3,);
+
+    var $table_name = 'fields_meta_data';
+    var $object_name = 'FieldsMetaData';
+    var $module_dir = 'DynamicFields';
+    var $column_fields = array(
+        'id',
+        'name',
+        'vname',
+        'custom_module',
+        'type',
+        'len',
+        'required',
+        'default_value',
+        'deleted',
+        'ext1',
+        'ext2',
+        'ext3',
+        'audited',
+        'inline_edit',
+        'massupdate',
         'duplicate_merge',
         'reportable',
-	);
-
-	var $list_fields = array(
-		'id',
-		'name',
-		'vname',
-		'type',
-		'len',
-		'required',
-		'default_value',
-		'audited',
+    );
+
+    var $list_fields = array(
+        'id',
+        'name',
+        'vname',
+        'type',
+        'len',
+        'required',
+        'default_value',
+        'audited',
         'inline_edit',
-		'massupdate',
+        'massupdate',
         'duplicate_merge',
         'reportable',
-	);
+    );
 
-	var $field_name_map;
-	var $new_schema = true;
+    var $field_name_map;
+    var $new_schema = true;
 
-	//////////////////////////////////////////////////////////////////
-	// METHODS
-	//////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////
+    // METHODS
+    //////////////////////////////////////////////////////////////////
 
     public function __construct()
-	{
-		parent::__construct();
-		$this->disable_row_level_security = true;
-	}
+    {
+        parent::__construct();
+        $this->disable_row_level_security = true;
+    }
 
     /**
      * @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
@@ -136,25 +136,25 @@ 
     }
 
 
-	function mark_deleted($id)
-	{
-		$query = "DELETE FROM $this->table_name WHERE  id='$id'";
-		$this->db->query($query, true,"Error deleting record: ");
-		$this->mark_relationships_deleted($id);
+    function mark_deleted($id)
+    {
+        $query = "DELETE FROM $this->table_name WHERE  id='$id'";
+        $this->db->query($query, true,"Error deleting record: ");
+        $this->mark_relationships_deleted($id);
 
-	}
+    }
 
-	function get_list_view_data(){
-	    $data = parent::get_list_view_data();
-	    $data['VNAME'] = translate($this->vname, $this->custom_module);
-	    $data['NAMELINK'] = '<input class="checkbox" type="checkbox" name="remove[]" value="' . $this->id . '">&nbsp;&nbsp;<a href="index.php?module=Studio&action=wizard&wizard=EditCustomFieldsWizard&option=EditCustomField&record=' . $this->id . '" >';
-	    return $data;
-	}
+    function get_list_view_data(){
+        $data = parent::get_list_view_data();
+        $data['VNAME'] = translate($this->vname, $this->custom_module);
+        $data['NAMELINK'] = '<input class="checkbox" type="checkbox" name="remove[]" value="' . $this->id . '">&nbsp;&nbsp;<a href="index.php?module=Studio&action=wizard&wizard=EditCustomFieldsWizard&option=EditCustomField&record=' . $this->id . '" >';
+        return $data;
+    }
 
 
-	function get_summary_text()
-	{
-		return $this->name;
-	}
+    function get_summary_text()
+    {
+        return $this->name;
+    }
 }
 ?>

Spacing +7 added lines, -7 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.
@@ -68,7 +68,7 @@ 
 	var $inline_edit;
     var $duplicate_merge;
     var $reportable;
-	var $required_fields =  array("name"=>1, "date_start"=>2, "time_start"=>3,);
+	var $required_fields = array("name"=>1, "date_start"=>2, "time_start"=>3,);
 
 	var $table_name = 'fields_meta_data';
 	var $object_name = 'FieldsMetaData';
@@ -124,9 +124,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 FieldsMetaData(){
+    public function FieldsMetaData() {
         $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 {
@@ -139,15 +139,15 @@ 
 	function mark_deleted($id)
 	{
 		$query = "DELETE FROM $this->table_name WHERE  id='$id'";
-		$this->db->query($query, true,"Error deleting record: ");
+		$this->db->query($query, true, "Error deleting record: ");
 		$this->mark_relationships_deleted($id);
 
 	}
 
-	function get_list_view_data(){
+	function get_list_view_data() {
 	    $data = parent::get_list_view_data();
 	    $data['VNAME'] = translate($this->vname, $this->custom_module);
-	    $data['NAMELINK'] = '<input class="checkbox" type="checkbox" name="remove[]" value="' . $this->id . '">&nbsp;&nbsp;<a href="index.php?module=Studio&action=wizard&wizard=EditCustomFieldsWizard&option=EditCustomField&record=' . $this->id . '" >';
+	    $data['NAMELINK'] = '<input class="checkbox" type="checkbox" name="remove[]" value="'.$this->id.'">&nbsp;&nbsp;<a href="index.php?module=Studio&action=wizard&wizard=EditCustomFieldsWizard&option=EditCustomField&record='.$this->id.'" >';
 	    return $data;
 	}
 

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/Reminders/Reminder.php

Spacing +10 added lines, -10 removed lines

@@ -242,7 +242,7 @@ 
         if (!empty($reminderBeans)) {
             foreach ($reminderBeans as $reminderBean) {
                 $eventBean = BeanFactory::getBean($reminderBean->related_event_module, $reminderBean->related_event_module_id);
-                if($eventBean) {
+                if ($eventBean) {
                     $remind_ts = $timedate->fromUser($eventBean->date_start)->modify("-{$reminderBean->timer_email} seconds")->ts;
                     $now_ts = $timedate->getNow()->ts;
                     if ($now_ts >= $remind_ts) {
@@ -325,7 +325,7 @@ 
                             $timeRemind = $popupReminder->timer_popup;
                             $timeStart -= $timeRemind;
 
-                            $url = 'index.php?action=DetailView&module=' . $popupReminder->related_event_module . '&record=' . $popupReminder->related_event_module_id;
+                            $url = 'index.php?action=DetailView&module='.$popupReminder->related_event_module.'&record='.$popupReminder->related_event_module_id;
                             $instructions = $app_strings['MSG_JS_ALERT_MTG_REMINDER_MEETING_MSG'];
 
                             if ($popupReminder->related_event_module == 'Meetings') {
@@ -345,8 +345,8 @@ 
 
                             $relatedToMeeting = $alert->getRelatedName($popupReminder->related_event_module, $popupReminder->related_event_module_id);
 
-                            $description = empty($desc1) ? '' : $app_strings['MSG_JS_ALERT_MTG_REMINDER_AGENDA'] . $desc1 . "\n";
-                            $description = $description . "\n" . $app_strings['MSG_JS_ALERT_MTG_REMINDER_STATUS'] . (isset($relatedEvent->status) ? $relatedEvent->status : '') . "\n" . $app_strings['MSG_JS_ALERT_MTG_REMINDER_RELATED_TO'] . $relatedToMeeting;
+                            $description = empty($desc1) ? '' : $app_strings['MSG_JS_ALERT_MTG_REMINDER_AGENDA'].$desc1."\n";
+                            $description = $description."\n".$app_strings['MSG_JS_ALERT_MTG_REMINDER_STATUS'].(isset($relatedEvent->status) ? $relatedEvent->status : '')."\n".$app_strings['MSG_JS_ALERT_MTG_REMINDER_RELATED_TO'].$relatedToMeeting;
 
 
                             if (isset($relatedEvent->date_start)) {
@@ -364,9 +364,9 @@ 
 
                             // standard functionality
                             $alert->addAlert($app_strings['MSG_JS_ALERT_MTG_REMINDER_MEETING'], $meetingName,
-                                $app_strings['MSG_JS_ALERT_MTG_REMINDER_TIME'] . $time,
-                                $app_strings['MSG_JS_ALERT_MTG_REMINDER_LOC'] . $location .
-                                $description .
+                                $app_strings['MSG_JS_ALERT_MTG_REMINDER_TIME'].$time,
+                                $app_strings['MSG_JS_ALERT_MTG_REMINDER_LOC'].$location.
+                                $description.
                                 $instructions,
                                 $timeStart - strtotime($alertDateTimeNow),
                                 $url
@@ -429,7 +429,7 @@ 
 
     private function upgradeEventPersonQuery(SugarBean $event, $person_table)
     {
-        $eventIdField = strtolower($event->object_name) . '_id';
+        $eventIdField = strtolower($event->object_name).'_id';
         $query = "
 			SELECT * FROM {$event->table_name}_{$person_table}
 			WHERE
@@ -443,9 +443,9 @@ 
     {
         $eventIdField = array_search($event->table_name, $event->relationship_fields);
         if (!$eventIdField) {
-            $eventIdField = strtolower($event->object_name . '_id');
+            $eventIdField = strtolower($event->object_name.'_id');
         }
-        $personIdField = strtolower($person->object_name) . '_id';
+        $personIdField = strtolower($person->object_name).'_id';
         $query = "
 			SELECT * FROM {$event->table_name}_{$person->table_name}
 			WHERE

modules/Administration/RebuildRelationship.php

Spacing +55 added lines, -55 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,107 +39,107 @@ 
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 
-include ('include/modules.php') ;
+include ('include/modules.php');
 
 
 
-global $db, $mod_strings ;
-$log = & $GLOBALS [ 'log' ] ;
+global $db, $mod_strings;
+$log = & $GLOBALS ['log'];
 
-$query = "DELETE FROM relationships" ;
-$db->query ( $query ) ;
+$query = "DELETE FROM relationships";
+$db->query($query);
 
 //clear cache before proceeding..
-VardefManager::clearVardef () ;
+VardefManager::clearVardef();
 
 // loop through all of the modules and create entries in the Relationships table (the relationships metadata) for every standard relationship, that is, relationships defined in the /modules/<module>/vardefs.php
 // SugarBean::createRelationshipMeta just takes the relationship definition in a file and inserts it as is into the Relationships table
 // It does not override or recreate existing relationships
-foreach ( $GLOBALS['beanFiles'] as $bean => $file )
+foreach ($GLOBALS['beanFiles'] as $bean => $file)
 {
-    if (strlen ( $file ) > 0 && file_exists ( $file ))
+    if (strlen($file) > 0 && file_exists($file))
     {
-        if (! class_exists ( $bean ))
+        if (!class_exists($bean))
         {
-            require ($file) ;
+            require ($file);
         }
-        $focus = new $bean ( ) ;
-        if ( $focus instanceOf SugarBean ) {
-            $table_name = $focus->table_name ;
-            $empty = array() ;
-            if (empty ( $_REQUEST [ 'silent' ] ))
-                echo $mod_strings [ 'LBL_REBUILD_REL_PROC_META' ] . $focus->table_name . "..." ;
-            SugarBean::createRelationshipMeta ( $focus->getObjectName (), $db, $table_name, $empty, $focus->module_dir ) ;
-            if (empty ( $_REQUEST [ 'silent' ] ))
-                echo $mod_strings [ 'LBL_DONE' ] . '<br>' ;
+        $focus = new $bean( );
+        if ($focus instanceOf SugarBean) {
+            $table_name = $focus->table_name;
+            $empty = array();
+            if (empty ($_REQUEST ['silent']))
+                echo $mod_strings ['LBL_REBUILD_REL_PROC_META'].$focus->table_name."...";
+            SugarBean::createRelationshipMeta($focus->getObjectName(), $db, $table_name, $empty, $focus->module_dir);
+            if (empty ($_REQUEST ['silent']))
+                echo $mod_strings ['LBL_DONE'].'<br>';
         }
     }
 }
 
 // do the same for custom relationships (true in the last parameter to SugarBean::createRelationshipMeta) - that is, relationships defined in the custom/modules/<modulename>/Ext/vardefs/ area
-foreach ( $GLOBALS['beanFiles'] as $bean => $file )
+foreach ($GLOBALS['beanFiles'] as $bean => $file)
 {
 	//skip this file if it does not exist
-	if(!file_exists($file)) continue;
+	if (!file_exists($file)) continue;
 
-	if (! class_exists ( $bean ))
+	if (!class_exists($bean))
     {
-        require ($file) ;
+        require ($file);
     }
-    $focus = new $bean ( ) ;
-    if ( $focus instanceOf SugarBean ) {
-        $table_name = $focus->table_name ;
-        $empty = array() ;
-        if (empty ( $_REQUEST [ 'silent' ] ))
-            echo $mod_strings [ 'LBL_REBUILD_REL_PROC_C_META' ] . $focus->table_name . "..." ;
-        SugarBean::createRelationshipMeta ( $focus->getObjectName (), $db, $table_name, $empty, $focus->module_dir, true ) ;
-        if (empty ( $_REQUEST [ 'silent' ] ))
-            echo $mod_strings [ 'LBL_DONE' ] . '<br>' ;
+    $focus = new $bean( );
+    if ($focus instanceOf SugarBean) {
+        $table_name = $focus->table_name;
+        $empty = array();
+        if (empty ($_REQUEST ['silent']))
+            echo $mod_strings ['LBL_REBUILD_REL_PROC_C_META'].$focus->table_name."...";
+        SugarBean::createRelationshipMeta($focus->getObjectName(), $db, $table_name, $empty, $focus->module_dir, true);
+        if (empty ($_REQUEST ['silent']))
+            echo $mod_strings ['LBL_DONE'].'<br>';
     }
 }
 
 // finally, whip through the list of relationships defined in TableDictionary.php, that is all the relationships in the metadata directory, and install those
-    $dictionary = array ( ) ;
-    require ('modules/TableDictionary.php') ;
+    $dictionary = array( );
+    require ('modules/TableDictionary.php');
     //for module installer incase we already loaded the table dictionary
-    if (file_exists ( 'custom/application/Ext/TableDictionary/tabledictionary.ext.php' ))
+    if (file_exists('custom/application/Ext/TableDictionary/tabledictionary.ext.php'))
     {
-        include ('custom/application/Ext/TableDictionary/tabledictionary.ext.php') ;
+        include ('custom/application/Ext/TableDictionary/tabledictionary.ext.php');
     }
-    $rel_dictionary = $dictionary ;
-    foreach ( $rel_dictionary as $rel_name => $rel_data )
+    $rel_dictionary = $dictionary;
+    foreach ($rel_dictionary as $rel_name => $rel_data)
     {
-        $table = isset($rel_data [ 'table' ]) ? $rel_data [ 'table' ] : "" ;
+        $table = isset($rel_data ['table']) ? $rel_data ['table'] : "";
 
-        if (empty ( $_REQUEST [ 'silent' ] ))
-            echo $mod_strings [ 'LBL_REBUILD_REL_PROC_C_META' ] . $rel_name . "..." ;
-        SugarBean::createRelationshipMeta ( $rel_name, $db, $table, $rel_dictionary, '' ) ;
-        if (empty ( $_REQUEST [ 'silent' ] ))
-            echo $mod_strings [ 'LBL_DONE' ] . '<br>' ;
+        if (empty ($_REQUEST ['silent']))
+            echo $mod_strings ['LBL_REBUILD_REL_PROC_C_META'].$rel_name."...";
+        SugarBean::createRelationshipMeta($rel_name, $db, $table, $rel_dictionary, '');
+        if (empty ($_REQUEST ['silent']))
+            echo $mod_strings ['LBL_DONE'].'<br>';
     }
 
 //clean relationship cache..will be rebuilt upon first access.
-if (empty ( $_REQUEST [ 'silent' ] ))
-    echo $mod_strings [ 'LBL_REBUILD_REL_DEL_CACHE' ] ;
-Relationship::delete_cache () ;
+if (empty ($_REQUEST ['silent']))
+    echo $mod_strings ['LBL_REBUILD_REL_DEL_CACHE'];
+Relationship::delete_cache();
 
 //////////////////////////////////////////////////////////////////////////////
 // Remove the "Rebuild Relationships" red text message on admin logins
 
 
-if (empty ( $_REQUEST [ 'silent' ] ))
-    echo $mod_strings [ 'LBL_REBUILD_REL_UPD_WARNING' ] ;
+if (empty ($_REQUEST ['silent']))
+    echo $mod_strings ['LBL_REBUILD_REL_UPD_WARNING'];
 
 $rel = new Relationship();
 Relationship::delete_cache();
 $rel->build_relationship_cache();
 
 // unset the session variable so it is not picked up in DisplayWarnings.php
-if (isset ( $_SESSION [ 'rebuild_relationships' ] ))
+if (isset ($_SESSION ['rebuild_relationships']))
 {
-    unset ( $_SESSION [ 'rebuild_relationships' ] ) ;
+    unset ($_SESSION ['rebuild_relationships']);
 }
 
-if (empty ( $_REQUEST [ 'silent' ] ))
-    echo $mod_strings [ 'LBL_DONE' ] ;
+if (empty ($_REQUEST ['silent']))
+    echo $mod_strings ['LBL_DONE'];
 ?>