adamjakab / SuiteCRM

include/generic/SugarWidgets/SugarWidgetFieldparent_type.php

Spacing +6 added lines, -6 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -50,9 +50,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 SugarWidgetFieldparent_type(&$layout_manager){
+    function SugarWidgetFieldparent_type(&$layout_manager) {
         $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 {
@@ -63,9 +63,9 @@ 
 
 
     function displayListPlain($layout_def) {
-        $value= $this->_get_list_value($layout_def);
-        if (isset($layout_def['widget_type']) && $layout_def['widget_type'] =='checkbox') {
-            if ($value != '' &&  ($value == 'on' || intval($value) == 1 || $value == 'yes'))
+        $value = $this->_get_list_value($layout_def);
+        if (isset($layout_def['widget_type']) && $layout_def['widget_type'] == 'checkbox') {
+            if ($value != '' && ($value == 'on' || intval($value) == 1 || $value == 'yes'))
             {
                 return "<input name='checkbox_display' class='checkbox' type='checkbox' disabled='true' checked>";
             }

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();

include/generic/SugarWidgets/SugarWidgetSubPanelTopSelectButton.php

Spacing +33 added lines, -33 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.
@@ -46,17 +46,17 @@ 
 class SugarWidgetSubPanelTopSelectButton extends SugarWidgetSubPanelTopButton
 {
 	//button_properties is a collection of properties associated with the widget_class definition. layoutmanager
-	function __construct($button_properties=array())
+	function __construct($button_properties = array())
 	{
-		$this->button_properties=$button_properties;
+		$this->button_properties = $button_properties;
 	}
 
     /**
      * @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 SugarWidgetSubPanelTopSelectButton($button_properties=array()){
+    function SugarWidgetSubPanelTopSelectButton($button_properties = array()) {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -68,7 +68,7 @@ 
 
     public function getWidgetId($buttonSuffix = true)
     {
-        return parent::getWidgetId(false) . 'select_button';
+        return parent::getWidgetId(false).'select_button';
     }
 
     public function getDisplayName()
@@ -81,38 +81,38 @@ 
 		global $app_strings;
 		$initial_filter = '';
 
-	    $this->title     = $this->getTitle();
+	    $this->title = $this->getTitle();
         $this->accesskey = $this->getAccesskey();
         $this->value     = $this->getDisplayName();
 
 		if (is_array($this->button_properties)) {
-			if( isset($this->button_properties['title'])) {
+			if (isset($this->button_properties['title'])) {
 				$this->title = $app_strings[$this->button_properties['title']];
 			}
-			if( isset($this->button_properties['accesskey'])) {
+			if (isset($this->button_properties['accesskey'])) {
 				$this->accesskey = $app_strings[$this->button_properties['accesskey']];
 			}
-			if( isset($this->button_properties['form_value'])) {
+			if (isset($this->button_properties['form_value'])) {
 				$this->value = $app_strings[$this->button_properties['form_value']];
 			}
-			if( isset($this->button_properties['module'])) {
+			if (isset($this->button_properties['module'])) {
 				$this->module_name = $this->button_properties['module'];
 			}
 		}
 
 
 		$focus = $widget_data['focus'];
-		if(ACLController::moduleSupportsACL($widget_data['module']) && !ACLController::checkAccess($widget_data['module'], 'list', true)){
-			$button = ' <input type="button" name="' . $this->getWidgetId() . '" id="' . $this->getWidgetId() . '" class="button"' . "\n"
-			. ' title="' . $this->title . '"'
-			. ' value="' . $this->value . "\"\n"
+		if (ACLController::moduleSupportsACL($widget_data['module']) && !ACLController::checkAccess($widget_data['module'], 'list', true)) {
+			$button = ' <input type="button" name="'.$this->getWidgetId().'" id="'.$this->getWidgetId().'" class="button"'."\n"
+			. ' title="'.$this->title.'"'
+			. ' value="'.$this->value."\"\n"
 			.' disabled />';
 			return $button;
 		}
 
 		//refresh the whole page after end of action?
 		$refresh_page = 0;
-		if(!empty($widget_data['subpanel_definition']->_instance_properties['refresh_page'])){
+		if (!empty($widget_data['subpanel_definition']->_instance_properties['refresh_page'])) {
 			$refresh_page = 1;
 		}
 
@@ -124,31 +124,31 @@ 
 			$this->module_name = $subpanel_definition->get_module_name();
 		}
 		$link_field_name = $subpanel_definition->get_data_source_name(true);
-		$popup_mode='Single';
-		if(isset($widget_data['mode'])){
-			$popup_mode=$widget_data['mode'];
+		$popup_mode = 'Single';
+		if (isset($widget_data['mode'])) {
+			$popup_mode = $widget_data['mode'];
 		}
-		if(isset($widget_data['initial_filter_fields'])){
+		if (isset($widget_data['initial_filter_fields'])) {
 			if (is_array($widget_data['initial_filter_fields'])) {
 				foreach ($widget_data['initial_filter_fields'] as $value=>$alias) {
 					if (isset($focus->$value) and !empty($focus->$value)) {
-						$initial_filter.="&".$alias . '='.urlencode($focus->$value);
+						$initial_filter .= "&".$alias.'='.urlencode($focus->$value);
 					}
 				}
 			}
 		}
-		$create="true";
-		if(isset($widget_data['create'])){
-			$create=$widget_data['create'];
+		$create = "true";
+		if (isset($widget_data['create'])) {
+			$create = $widget_data['create'];
 		}
 		$return_module = $_REQUEST['module'];
 		$return_action = 'SubPanelViewer';
 		$return_id = $_REQUEST['record'];
 
 		//field_to_name_array
-		$fton_array= array('id' => 'subpanel_id');
-		if(isset($widget_data['field_to_name_array']) && is_array($widget_data['field_to_name_array'])){
-			$fton_array=array_merge($fton_array,$widget_data['field_to_name_array']);
+		$fton_array = array('id' => 'subpanel_id');
+		if (isset($widget_data['field_to_name_array']) && is_array($widget_data['field_to_name_array'])) {
+			$fton_array = array_merge($fton_array, $widget_data['field_to_name_array']);
 		}
 
 		$return_url = "index.php?module=$return_module&action=$return_action&subpanel=$subpanel_name&record=$return_id&sugar_body_only=1";
@@ -174,21 +174,21 @@ 
 
                 if (is_array($this->button_properties) && !empty($this->button_properties['add_to_passthru_data']))
                 {
-                    $popup_request_data['passthru_data']= array_merge($popup_request_data['passthru_data'],$this->button_properties['add_to_passthru_data']);
+                    $popup_request_data['passthru_data'] = array_merge($popup_request_data['passthru_data'], $this->button_properties['add_to_passthru_data']);
                 }
 
 		if (is_array($this->button_properties) && !empty($this->button_properties['add_to_passthru_data']['return_type'])) {
 
-			if ($this->button_properties['add_to_passthru_data']['return_type']=='report') {
-				$initial_filter = "&module_name=". urlencode($widget_data['module']);
+			if ($this->button_properties['add_to_passthru_data']['return_type'] == 'report') {
+				$initial_filter = "&module_name=".urlencode($widget_data['module']);
 			}
 		}
         //acl_roles_users_selectuser_button
 
         $json_encoded_php_array = $this->_create_json_encoded_popup_request($popup_request_data);
-		return ' <input type="button" name="' . $this->getWidgetId() . '" id="' . $this->getWidgetId() . '" class="button"' . "\n"
-				. ' title="' . $this->title . '"'
-			. ' value="' . $this->value . "\"\n"
+		return ' <input type="button" name="'.$this->getWidgetId().'" id="'.$this->getWidgetId().'" class="button"'."\n"
+				. ' title="'.$this->title.'"'
+			. ' value="'.$this->value."\"\n"
 			. " onclick='open_popup(\"$this->module_name\",600,400,\"$initial_filter\",true,true,$json_encoded_php_array,\"$popup_mode\",$create);' />\n";
 	}
 

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();

include/generic/SugarWidgets/SugarWidgetFielddouble.php

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -49,9 +49,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 SugarWidgetFieldDouble(&$layout_manager){
+    function SugarWidgetFieldDouble(&$layout_manager) {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {

Braces +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();

include/generic/SugarWidgets/SugarWidgetFieldname.php

Spacing +31 added lines, -31 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.
@@ -55,9 +55,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 SugarWidgetFieldName(&$layout_manager){
+    function SugarWidgetFieldName(&$layout_manager) {
         $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 @@ 
 
 	function displayList(&$layout_def)
 	{
-		if(empty($layout_def['column_key']))
+		if (empty($layout_def['column_key']))
 		{
 			return $this->displayListPlain($layout_def);
 		}
@@ -80,7 +80,7 @@ 
 		$key = $this->_get_column_alias($layout_def);
 		$key = strtoupper($key);
 
-		if(empty($layout_def['fields'][$key]))
+		if (empty($layout_def['fields'][$key]))
 		{
 		  $layout_def['name'] = $name;
 			return $this->displayListPlain($layout_def);
@@ -106,7 +106,7 @@ 
             $field_type = $field_def['type'];
             $str .= "</a>";
             if ($field_name == 'name')
-                $str .= "&nbsp;" .SugarThemeRegistry::current()->getImage("edit_inline","border='0' alt='Edit Layout' align='bottom' onClick='SUGAR.reportsInlineEdit.inlineEdit(\"$div_id\",\"$value\",\"$module\",\"$record\",\"$field_name\",\"$field_type\");'");
+                $str .= "&nbsp;".SugarThemeRegistry::current()->getImage("edit_inline", "border='0' alt='Edit Layout' align='bottom' onClick='SUGAR.reportsInlineEdit.inlineEdit(\"$div_id\",\"$value\",\"$module\",\"$record\",\"$field_name\",\"$field_type\");'");
             $str .= "</div>";
         }
 		return $str;
@@ -114,7 +114,7 @@ 
 
 	function _get_normal_column_select($layout_def)
 	{
-        if ( isset($this->reporter->all_fields) ) {
+        if (isset($this->reporter->all_fields)) {
             $field_def = $this->reporter->all_fields[$layout_def['column_key']];
         } else {
             $field_def = array();
@@ -126,9 +126,9 @@ 
 		}
 
 		//	 'fields' are the two fields to concatenate to create the name.
-		if ( ! empty($layout_def['table_alias'])) {
+		if (!empty($layout_def['table_alias'])) {
 		    $alias = $this->reporter->db->concat($layout_def['table_alias'], $field_def['fields']);
-		} elseif (! empty($layout_def['name'])) {
+		} elseif (!empty($layout_def['name'])) {
 			$alias = $layout_def['name'];
 		} else {
 			$alias = "*";
@@ -141,14 +141,14 @@ 
 	{
 		global $locale, $current_user;
 
-        if ( isset($this->reporter->all_fields) ) {
+        if (isset($this->reporter->all_fields)) {
             $field_def = $this->reporter->all_fields[$layout_def['column_key']];
         } else {
             $field_def = array();
         }
 
         //	 'fields' are the two fields to concatenate to create the name
-        if(!isset($field_def['fields']))
+        if (!isset($field_def['fields']))
         {
 			return $this->_get_normal_column_select($layout_def);
         }
@@ -159,22 +159,22 @@ 
 			return parent::_get_column_select($layout_def);
 		}
 
-		if ( ! empty($layout_def['table_alias'])) {
+		if (!empty($layout_def['table_alias'])) {
 		    $comps = preg_split("/([fl])/", $localeNameFormat, null, PREG_SPLIT_DELIM_CAPTURE);
 		    $name = array();
-		    foreach($comps as $val) {
-		        if($val == 'f') {
+		    foreach ($comps as $val) {
+		        if ($val == 'f') {
 		            $name[] = $this->reporter->db->convert($layout_def['table_alias'].".".$field_def['fields'][0], 'IFNULL', array("''"));
-		        } elseif($val == 'l') {
+		        } elseif ($val == 'l') {
 		            $name[] = $this->reporter->db->convert($layout_def['table_alias'].".".$field_def['fields'][1], 'IFNULL', array("''"));
 		        } else {
-		            if(!empty($val)) {
+		            if (!empty($val)) {
 		                $name[] = $this->reporter->db->quoted($val);
 		            }
 		        }
 		    }
 		    $alias = $this->reporter->db->convert($name, "CONCAT");
-		} elseif (! empty($layout_def['name']))	{
+		} elseif (!empty($layout_def['name'])) {
 			$alias = $layout_def['name'];
 		} else {
 			$alias = "*";
@@ -190,7 +190,7 @@ 
 		$layout_def['type'] = 'id';
 		$input_name0 = $layout_def['input_name0'];
 
-		if ( is_array($layout_def['input_name0']))
+		if (is_array($layout_def['input_name0']))
 		{
 			$input_name0 = $layout_def['input_name0'][0];
 		}
@@ -210,7 +210,7 @@ 
 		$layout_def['type'] = 'id';
 		$input_name0 = $layout_def['input_name0'];
 
-		if ( is_array($layout_def['input_name0']))
+		if (is_array($layout_def['input_name0']))
 		{
 			$input_name0 = $layout_def['input_name0'][0];
 		}
@@ -227,23 +227,23 @@ 
 	function queryFilterone_of($layout_def, $rename_columns = true)
 	{
 
-        if($rename_columns) { // this was a hack to get reports working, sugarwidgets should not be renaming $name!
+        if ($rename_columns) { // this was a hack to get reports working, sugarwidgets should not be renaming $name!
     		$layout_def['name'] = 'id';
     		$layout_def['type'] = 'id';
         }
 		$arr = array();
 
-		foreach($layout_def['input_name0'] as $value)
+		foreach ($layout_def['input_name0'] as $value)
 		{
 			if ($value == 'Current User') {
 				global $current_user;
-				array_push($arr,$this->reporter->db->quoted($current_user->id));
+				array_push($arr, $this->reporter->db->quoted($current_user->id));
 			}
 			else
-				array_push($arr,$this->reporter->db->quoted($value));
+				array_push($arr, $this->reporter->db->quoted($value));
 		}
 
-		$str = implode(",",$arr);
+		$str = implode(",", $arr);
 
 		return SugarWidgetFieldid::_get_column_select($layout_def)." IN (".$str.")\n";
 	}
@@ -251,34 +251,34 @@ 
 	function queryFilternot_one_of($layout_def, $rename_columns = true)
 	{
 
-        if($rename_columns) { // this was a hack to get reports working, sugarwidgets should not be renaming $name!
+        if ($rename_columns) { // this was a hack to get reports working, sugarwidgets should not be renaming $name!
     		$layout_def['name'] = 'id';
     		$layout_def['type'] = 'id';
         }
 		$arr = array();
 
-		foreach($layout_def['input_name0'] as $value)
+		foreach ($layout_def['input_name0'] as $value)
 		{
 			if ($value == 'Current User') {
 				global $current_user;
-				array_push($arr,$this->reporter->db->quoted($current_user->id));
+				array_push($arr, $this->reporter->db->quoted($current_user->id));
 			}
 			else
-				array_push($arr,$this->reporter->db->quoted($value));
+				array_push($arr, $this->reporter->db->quoted($value));
 		}
 
-		$str = implode(",",$arr);
+		$str = implode(",", $arr);
 
 		return SugarWidgetFieldid::_get_column_select($layout_def)." NOT IN (".$str.")\n";
 	}
 
 	function &queryGroupBy($layout_def)
 	{
-        if($layout_def['name'] == 'full_name') {
+        if ($layout_def['name'] == 'full_name') {
              $layout_def['name'] = 'id';
              $layout_def['type'] = 'id';
 
-             $group_by =  SugarWidgetFieldid::_get_column_select($layout_def)."\n";
+             $group_by = SugarWidgetFieldid::_get_column_select($layout_def)."\n";
         } else {
             // group by clause for user name passes through here.
              $group_by = $this->_get_column_select($layout_def)."\n";

Braces +14 added lines, -11 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -59,8 +61,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct($layout_manager);
@@ -89,8 +90,9 @@ 
 		$record = $layout_def['fields'][$key];
 		$layout_def['name'] = $name;
 		global $current_user;
-		if ($module == 'Users' && !is_admin($current_user))
-        	$module = 'Employees';
+		if ($module == 'Users' && !is_admin($current_user)) {
+		        	$module = 'Employees';
+		}
 		$str = "<a target='_blank' href=\"index.php?action=DetailView&module=$module&record=$record\">";
 		$str .= $this->displayListPlain($layout_def);
 		$str .= "</a>";
@@ -105,8 +107,9 @@ 
             $field_name = $layout_def['name'];
             $field_type = $field_def['type'];
             $str .= "</a>";
-            if ($field_name == 'name')
-                $str .= "&nbsp;" .SugarThemeRegistry::current()->getImage("edit_inline","border='0' alt='Edit Layout' align='bottom' onClick='SUGAR.reportsInlineEdit.inlineEdit(\"$div_id\",\"$value\",\"$module\",\"$record\",\"$field_name\",\"$field_type\");'");
+            if ($field_name == 'name') {
+                            $str .= "&nbsp;" .SugarThemeRegistry::current()->getImage("edit_inline","border='0' alt='Edit Layout' align='bottom' onClick='SUGAR.reportsInlineEdit.inlineEdit(\"$div_id\",\"$value\",\"$module\",\"$record\",\"$field_name\",\"$field_type\");'");
+            }
             $str .= "</div>";
         }
 		return $str;
@@ -238,9 +241,9 @@ 
 			if ($value == 'Current User') {
 				global $current_user;
 				array_push($arr,$this->reporter->db->quoted($current_user->id));
+			} else {
+							array_push($arr,$this->reporter->db->quoted($value));
 			}
-			else
-				array_push($arr,$this->reporter->db->quoted($value));
 		}
 
 		$str = implode(",",$arr);
@@ -262,9 +265,9 @@ 
 			if ($value == 'Current User') {
 				global $current_user;
 				array_push($arr,$this->reporter->db->quoted($current_user->id));
+			} else {
+							array_push($arr,$this->reporter->db->quoted($value));
 			}
-			else
-				array_push($arr,$this->reporter->db->quoted($value));
 		}
 
 		$str = implode(",",$arr);

include/generic/SugarWidgets/SugarWidgetSubPanelTopButton.php

Spacing +63 added lines, -63 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.
@@ -56,27 +56,27 @@ 
 
 	/** Take the keys for the strings and look them up.  Module is literal, the rest are label keys
 	*/
-	function __construct($module='', $title='', $access_key='', $form_value='')
+	function __construct($module = '', $title = '', $access_key = '', $form_value = '')
 	{
 		global $app_strings;
 
-		if(is_array($module))
+		if (is_array($module))
 		{
 			// it is really the class details from the mapping
 			$class_details = $module;
 
 			// If keys were passed into the constructor, translate them from keys to values.
-			if(!empty($class_details['module']))
+			if (!empty($class_details['module']))
 				$this->module = $class_details['module'];
-			if(!empty($class_details['title']))
+			if (!empty($class_details['title']))
 				$this->title = $app_strings[$class_details['title']];
-			if(!empty($class_details['access_key']))
+			if (!empty($class_details['access_key']))
 				$this->access_key = $app_strings[$class_details['access_key']];
-			if(!empty($class_details['form_value']))
+			if (!empty($class_details['form_value']))
 				$this->form_value = translate($class_details['form_value'], $this->module);
-			if(!empty($class_details['additional_form_fields']))
+			if (!empty($class_details['additional_form_fields']))
 				$this->additional_form_fields = $class_details['additional_form_fields'];
-			if(!empty($class_details['ACL'])){
+			if (!empty($class_details['ACL'])) {
 				$this->acl = $class_details['ACL'];
 			}
 		}
@@ -85,11 +85,11 @@ 
 			$this->module = $module;
 
 			// If keys were passed into the constructor, translate them from keys to values.
-			if(!empty($title))
+			if (!empty($title))
 				$this->title = $app_strings[$title];
-			if(!empty($access_key))
+			if (!empty($access_key))
 				$this->access_key = $app_strings[$access_key];
-			if(!empty($form_value))
+			if (!empty($form_value))
 				$this->form_value = translate($form_value, $module);
 		}
 	}
@@ -97,9 +97,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 SugarWidgetSubPanelTopButton($module='', $title='', $access_key='', $form_value=''){
+    function SugarWidgetSubPanelTopButton($module = '', $title = '', $access_key = '', $form_value = '') {
         $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 {
@@ -110,8 +110,8 @@ 
 
     public function getWidgetId($buttonSuffix = true)
     {
-    	$widgetID = parent::getWidgetId() . '_'.preg_replace('[ ]', '', mb_strtolower($this->form_value, 'UTF-8'));
-    	if($buttonSuffix){
+    	$widgetID = parent::getWidgetId().'_'.preg_replace('[ ]', '', mb_strtolower($this->form_value, 'UTF-8'));
+    	if ($buttonSuffix) {
     		$widgetID .= '_button';
     	}
         return $widgetID;
@@ -123,11 +123,11 @@ 
         global $currentModule;
 
         // Create the additional form fields with real values if they were not passed in
-        if(empty($additionalFormFields) && $this->additional_form_fields)
+        if (empty($additionalFormFields) && $this->additional_form_fields)
         {
-            foreach($this->additional_form_fields as $key=>$value)
+            foreach ($this->additional_form_fields as $key=>$value)
             {
-                if(!empty($defines['focus']->$value))
+                if (!empty($defines['focus']->$value))
                 {
                     $additionalFormFields[$key] = $defines['focus']->$value;
                 }
@@ -139,7 +139,7 @@ 
         }
 
 
-		if(!empty($this->module))
+		if (!empty($this->module))
         {
             $defines['child_module_name'] = $this->module;
         }
@@ -148,7 +148,7 @@ 
             $defines['child_module_name'] = $defines['module'];
         }
 
-        $defines['parent_bean_name'] = get_class( $defines['focus']);
+        $defines['parent_bean_name'] = get_class($defines['focus']);
 		$relationship_name = $this->get_subpanel_relationship_name($defines);
 
 
@@ -158,65 +158,65 @@ 
         $formValues['module'] = $defines['child_module_name'];
         $formValues[strtolower($defines['parent_bean_name'])."_id"] = $defines['focus']->id;
 
-        if(isset($defines['focus']->name))
+        if (isset($defines['focus']->name))
         {
             $formValues[strtolower($defines['parent_bean_name'])."_name"] = $defines['focus']->name;
             // #26451,add these fields for custom one-to-many relate field.
-            if(!empty($defines['child_module_name'])){
+            if (!empty($defines['child_module_name'])) {
                 $formValues[$relationship_name."_name"] = $defines['focus']->name;
             	$childFocusName = !empty($GLOBALS['beanList'][$defines['child_module_name']]) ? $GLOBALS['beanList'][$defines['child_module_name']] : "";
-            	if(!empty($GLOBALS['dictionary'][ $childFocusName ]["fields"][$relationship_name .'_name']['id_name'])){
-            		$formValues[$GLOBALS['dictionary'][ $childFocusName ]["fields"][$relationship_name .'_name']['id_name']] = $defines['focus']->id;
+            	if (!empty($GLOBALS['dictionary'][$childFocusName]["fields"][$relationship_name.'_name']['id_name'])) {
+            		$formValues[$GLOBALS['dictionary'][$childFocusName]["fields"][$relationship_name.'_name']['id_name']] = $defines['focus']->id;
             	}
             }
         }
 
         $formValues['return_module'] = $currentModule;
 
-        if($currentModule == 'Campaigns'){
+        if ($currentModule == 'Campaigns') {
             $formValues['return_action'] = "DetailView";
-        }else{
+        } else {
             $formValues['return_action'] = $defines['action'];
-            if ( $formValues['return_action'] == 'SubPanelViewer' ) {
+            if ($formValues['return_action'] == 'SubPanelViewer') {
                 $formValues['return_action'] = 'DetailView';
             }
         }
 
         $formValues['return_id'] = $defines['focus']->id;
         $formValues['return_relationship'] = $relationship_name;
-        switch ( strtolower( $currentModule ) )
+        switch (strtolower($currentModule))
         {
             case 'prospects' :
-                $name = $defines['focus']->account_name ;
-                break ;
+                $name = $defines['focus']->account_name;
+                break;
             case 'documents' :
-                $name = $defines['focus']->document_name ;
-                break ;
+                $name = $defines['focus']->document_name;
+                break;
             case 'kbdocuments' :
-                $name = $defines['focus']->kbdocument_name ;
-                break ;
+                $name = $defines['focus']->kbdocument_name;
+                break;
             case 'leads' :
             case 'contacts' :
-                $name = $defines['focus']->first_name . " " .$defines['focus']->last_name ;
-                break ;
+                $name = $defines['focus']->first_name." ".$defines['focus']->last_name;
+                break;
             default :
                $name = (isset($defines['focus']->name)) ? $defines['focus']->name : "";
         }
         $formValues['return_name'] = $name;
 
         // TODO: move this out and get $additionalFormFields working properly
-        if(empty($additionalFormFields['parent_type']))
+        if (empty($additionalFormFields['parent_type']))
         {
-            if($defines['focus']->object_name=='Contact') {
+            if ($defines['focus']->object_name == 'Contact') {
                 $additionalFormFields['parent_type'] = 'Accounts';
             }
             else {
                 $additionalFormFields['parent_type'] = $defines['focus']->module_dir;
             }
         }
-        if(empty($additionalFormFields['parent_name']))
+        if (empty($additionalFormFields['parent_name']))
         {
-            if($defines['focus']->object_name=='Contact') {
+            if ($defines['focus']->object_name == 'Contact') {
                 $additionalFormFields['parent_name'] = $defines['focus']->account_name;
                 $additionalFormFields['account_name'] = $defines['focus']->account_name;
             }
@@ -224,54 +224,54 @@ 
                 $additionalFormFields['parent_name'] = $defines['focus']->name;
             }
         }
-        if(empty($additionalFormFields['parent_id']))
+        if (empty($additionalFormFields['parent_id']))
         {
-            if($defines['focus']->object_name=='Contact') {
+            if ($defines['focus']->object_name == 'Contact') {
                 $additionalFormFields['parent_id'] = $defines['focus']->account_id;
                 $additionalFormFields['account_id'] = $defines['focus']->account_id;
-            } else if($defines['focus']->object_name=='Contract') {
+            } else if ($defines['focus']->object_name == 'Contract') {
             	$additionalFormFields['contract_id'] = $defines['focus']->id;
             } else {
                 $additionalFormFields['parent_id'] = $defines['focus']->id;
             }
         }
 
-        if ($defines['focus']->object_name=='Opportunity') {
+        if ($defines['focus']->object_name == 'Opportunity') {
             $additionalFormFields['account_id'] = $defines['focus']->account_id;
             $additionalFormFields['account_name'] = $defines['focus']->account_name;
         }
 
-        if (!empty($defines['child_module_name']) and $defines['child_module_name']=='Contacts' and !empty($defines['parent_bean_name']) and $defines['parent_bean_name']=='contact' ) {
-            if (!empty($defines['focus']->id ) and !empty($defines['focus']->name)) {
+        if (!empty($defines['child_module_name']) and $defines['child_module_name'] == 'Contacts' and !empty($defines['parent_bean_name']) and $defines['parent_bean_name'] == 'contact') {
+            if (!empty($defines['focus']->id) and !empty($defines['focus']->name)) {
                 $formValues['reports_to_id'] = $defines['focus']->id;
                 $formValues['reports_to_name'] = $defines['focus']->name;
             }
         }
         $formValues['action'] = "EditView";
 
-        if ( $asUrl ) {
+        if ($asUrl) {
             $returnLink = '';
-            foreach($formValues as $key => $value ) {
+            foreach ($formValues as $key => $value) {
                 $returnLink .= $key.'='.$value.'&';
             }
-            foreach($additionalFormFields as $key => $value ) {
+            foreach ($additionalFormFields as $key => $value) {
                 $returnLink .= $key.'='.$value.'&';
             }
-            $returnLink = rtrim($returnLink,'&');
+            $returnLink = rtrim($returnLink, '&');
 
             return $returnLink;
         } else {
 
-            $form = 'form' . $relationship_name;
-            $button = '<form action="index.php" method="post" name="form" id="' . $form . "\">\n";
-            foreach($formValues as $key => $value) {
-                $button .= "<input type='hidden' name='" . $key . "' value='" . $value . "' />\n";
+            $form = 'form'.$relationship_name;
+            $button = '<form action="index.php" method="post" name="form" id="'.$form."\">\n";
+            foreach ($formValues as $key => $value) {
+                $button .= "<input type='hidden' name='".$key."' value='".$value."' />\n";
             }
 
             // fill in additional form fields for all but action
-            foreach($additionalFormFields as $key => $value) {
-                if($key != 'action') {
-                    $button .= "<input type='hidden' name='" . $key . "' value='" . $value . "' />\n";
+            foreach ($additionalFormFields as $key => $value) {
+                if ($key != 'action') {
+                    $button .= "<input type='hidden' name='".$key."' value='".$value."' />\n";
                 }
             }
 
@@ -283,18 +283,18 @@ 
 	/** This default function is used to create the HTML for a simple button */
 	function display($defines, $additionalFormFields = null, $nonbutton = false)
 	{
-		$temp='';
+		$temp = '';
 		$inputID = $this->getWidgetId();
 
-		if(!empty($this->acl) && ACLController::moduleSupportsACL($defines['module'])  &&  !ACLController::checkAccess($defines['module'], $this->acl, true)){
+		if (!empty($this->acl) && ACLController::moduleSupportsACL($defines['module']) && !ACLController::checkAccess($defines['module'], $this->acl, true)) {
 			return $temp;
 		}
 
 		global $app_strings;
 
-        if ( isset($_REQUEST['layout_def_key']) && $_REQUEST['layout_def_key'] == 'UserEAPM' ) {
+        if (isset($_REQUEST['layout_def_key']) && $_REQUEST['layout_def_key'] == 'UserEAPM') {
             // Subpanels generally don't go on the editview, so we have to handle this special
-            $megaLink = $this->_get_form($defines, $additionalFormFields,true);
+            $megaLink = $this->_get_form($defines, $additionalFormFields, true);
             $button = "<input title='$this->title' accesskey='$this->access_key' class='button' type='submit' name='$inputID' id='$inputID' value='$this->form_value' onclick='javascript:document.location=\"index.php?".$megaLink."\"; return false;'/>";
         } else {
             $button = $this->_get_form($defines, $additionalFormFields);
@@ -323,7 +323,7 @@ 
 	 */
 	function get_subpanel_relationship_name($defines) {
 		 $relationship_name = '';
-		 if(!empty($defines)) {
+		 if (!empty($defines)) {
 		 	$relationship_name = isset($defines['module']) ? $defines['module'] : '';
 	     	$dataSource = $defines['subpanel_definition']->get_data_source_name(true);
          	if (!empty($dataSource)) {

Braces +34 added lines, -30 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -66,31 +68,38 @@ 
 			$class_details = $module;
 
 			// If keys were passed into the constructor, translate them from keys to values.
-			if(!empty($class_details['module']))
-				$this->module = $class_details['module'];
-			if(!empty($class_details['title']))
-				$this->title = $app_strings[$class_details['title']];
-			if(!empty($class_details['access_key']))
-				$this->access_key = $app_strings[$class_details['access_key']];
-			if(!empty($class_details['form_value']))
-				$this->form_value = translate($class_details['form_value'], $this->module);
-			if(!empty($class_details['additional_form_fields']))
-				$this->additional_form_fields = $class_details['additional_form_fields'];
+			if(!empty($class_details['module'])) {
+							$this->module = $class_details['module'];
+			}
+			if(!empty($class_details['title'])) {
+							$this->title = $app_strings[$class_details['title']];
+			}
+			if(!empty($class_details['access_key'])) {
+							$this->access_key = $app_strings[$class_details['access_key']];
+			}
+			if(!empty($class_details['form_value'])) {
+							$this->form_value = translate($class_details['form_value'], $this->module);
+			}
+			if(!empty($class_details['additional_form_fields'])) {
+							$this->additional_form_fields = $class_details['additional_form_fields'];
+			}
 			if(!empty($class_details['ACL'])){
 				$this->acl = $class_details['ACL'];
 			}
-		}
-		else
+		} else
 		{
 			$this->module = $module;
 
 			// If keys were passed into the constructor, translate them from keys to values.
-			if(!empty($title))
-				$this->title = $app_strings[$title];
-			if(!empty($access_key))
-				$this->access_key = $app_strings[$access_key];
-			if(!empty($form_value))
-				$this->form_value = translate($form_value, $module);
+			if(!empty($title)) {
+							$this->title = $app_strings[$title];
+			}
+			if(!empty($access_key)) {
+							$this->access_key = $app_strings[$access_key];
+			}
+			if(!empty($form_value)) {
+							$this->form_value = translate($form_value, $module);
+			}
 		}
 	}
 
@@ -101,8 +110,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, $title, $access_key, $form_value);
@@ -130,8 +138,7 @@ 
                 if(!empty($defines['focus']->$value))
                 {
                     $additionalFormFields[$key] = $defines['focus']->$value;
-                }
-                else
+                } else
                 {
                     $additionalFormFields[$key] = '';
                 }
@@ -142,8 +149,7 @@ 
 		if(!empty($this->module))
         {
             $defines['child_module_name'] = $this->module;
-        }
-        else
+        } else
         {
             $defines['child_module_name'] = $defines['module'];
         }
@@ -175,7 +181,7 @@ 
 
         if($currentModule == 'Campaigns'){
             $formValues['return_action'] = "DetailView";
-        }else{
+        } else{
             $formValues['return_action'] = $defines['action'];
             if ( $formValues['return_action'] == 'SubPanelViewer' ) {
                 $formValues['return_action'] = 'DetailView';
@@ -209,8 +215,7 @@ 
         {
             if($defines['focus']->object_name=='Contact') {
                 $additionalFormFields['parent_type'] = 'Accounts';
-            }
-            else {
+            } else {
                 $additionalFormFields['parent_type'] = $defines['focus']->module_dir;
             }
         }
@@ -219,8 +224,7 @@ 
             if($defines['focus']->object_name=='Contact') {
                 $additionalFormFields['parent_name'] = $defines['focus']->account_name;
                 $additionalFormFields['account_name'] = $defines['focus']->account_name;
-            }
-            else {
+            } else {
                 $additionalFormFields['parent_name'] = $defines['focus']->name;
             }
         }

include/generic/SugarWidgets/SugarWidgetFieldtext.php

Spacing +4 added lines, -4 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.
@@ -50,9 +50,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 SugarWidgetFieldText(&$layout_manager){
+    function SugarWidgetFieldText(&$layout_manager) {
         $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 {
@@ -71,7 +71,7 @@ 
     function queryFilterNot_Equals_Str($layout_def)
     {
         $column = $this->_get_column_select($layout_def);
-        return "($column IS NULL OR ". $this->reporter->db->convert($column, "text2char")." != ".
+        return "($column IS NULL OR ".$this->reporter->db->convert($column, "text2char")." != ".
             $this->reporter->db->quoted($layout_def['input_name0']).")";
     }
 

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();

include/generic/SugarWidgets/SugarWidgetFielddynamicenum.php

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -46,9 +46,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 SugarWidgetFielddynamicenum($layout_manager){
+    public function SugarWidgetFielddynamicenum($layout_manager) {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {

Braces +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();

include/Pear/XML_HTMLSax3/HTMLSax3/Decorators.php

Doc Comments +11 added lines

@@ -112,6 +112,8 @@ 
     * @param object handler object being decorated
     * @param string original open handler method
     * @param string original close handler method
+    * @param string $orig_open_method
+    * @param string $orig_close_method
     * @access protected
     */
     function __construct(&$orig_obj, $orig_open_method, $orig_close_method) {
@@ -162,6 +164,7 @@ 
     * Constructs XML_HTMLSax3_LineFeed
     * @param object handler object being decorated
     * @param string original handler method
+    * @param string $orig_method
     * @access protected
     */
     function XML_HTMLSax3_LineFeed(&$orig_obj, $orig_method) {
@@ -204,6 +207,7 @@ 
     * Constructs XML_HTMLSax3_Tab
     * @param object handler object being decorated
     * @param string original handler method
+    * @param string $orig_method
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {
@@ -247,6 +251,7 @@ 
     * Constructs XML_HTMLSax3_Entities_Parsed
     * @param object handler object being decorated
     * @param string original handler method
+    * @param string $orig_method
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {
@@ -271,6 +276,10 @@ 
 * Compatibility with older PHP versions
 */
 if (version_compare(phpversion(), '4.3', '<') && !function_exists('html_entity_decode') ) {
+
+    /**
+     * @param integer $style
+     */
     function html_entity_decode($str, $style=ENT_NOQUOTES) {
         return strtr($str,
             array_flip(get_html_translation_table(HTML_ENTITIES,$style)));
@@ -299,6 +308,7 @@ 
     * Constructs XML_HTMLSax3_Entities_Unparsed
     * @param object handler object being decorated
     * @param string original handler method
+    * @param string $orig_method
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {
@@ -342,6 +352,7 @@ 
     * Constructs XML_HTMLSax3_Entities_Unparsed
     * @param object handler object being decorated
     * @param string original handler method
+    * @param string $orig_method
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {

Spacing +29 added lines, -29 removed lines

@@ -52,16 +52,16 @@ 
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {
-        $this->orig_obj =& $orig_obj;
+        $this->orig_obj = & $orig_obj;
         $this->orig_method = $orig_method;
     }
 
     /**
      * @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 XML_HTMLSax3_Trim(&$orig_obj, $orig_method){
+    function XML_HTMLSax3_Trim(&$orig_obj, $orig_method) {
         $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 {
@@ -115,7 +115,7 @@ 
     * @access protected
     */
     function __construct(&$orig_obj, $orig_open_method, $orig_close_method) {
-        $this->orig_obj =& $orig_obj;
+        $this->orig_obj = & $orig_obj;
         $this->orig_open_method = $orig_open_method;
         $this->orig_close_method = $orig_close_method;
     }
@@ -126,7 +126,7 @@ 
     * @param array tag attributes
     * @access protected
     */
-    function foldOpen(&$parser, $tag, $attrs=array(), $empty = FALSE) {
+    function foldOpen(&$parser, $tag, $attrs = array(), $empty = FALSE) {
         $this->orig_obj->{$this->orig_open_method}($parser, strtoupper($tag), $attrs, $empty);
     }
     /**
@@ -165,7 +165,7 @@ 
     * @access protected
     */
     function XML_HTMLSax3_LineFeed(&$orig_obj, $orig_method) {
-        $this->orig_obj =& $orig_obj;
+        $this->orig_obj = & $orig_obj;
         $this->orig_method = $orig_method;
     }
     /**
@@ -175,8 +175,8 @@ 
     * @access protected
     */
     function breakData(&$parser, $data) {
-        $data = explode("\n",$data);
-        foreach ( $data as $chunk ) {
+        $data = explode("\n", $data);
+        foreach ($data as $chunk) {
             $this->orig_obj->{$this->orig_method}($parser, $chunk);
         }
     }
@@ -207,7 +207,7 @@ 
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {
-        $this->orig_obj =& $orig_obj;
+        $this->orig_obj = & $orig_obj;
         $this->orig_method = $orig_method;
     }
     /**
@@ -217,8 +217,8 @@ 
     * @access protected
     */
     function breakData(&$parser, $data) {
-        $data = explode("\t",$data);
-        foreach ( $data as $chunk ) {
+        $data = explode("\t", $data);
+        foreach ($data as $chunk) {
             $this->orig_obj->{$this->orig_method}($this, $chunk);
         }
     }
@@ -250,7 +250,7 @@ 
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {
-        $this->orig_obj =& $orig_obj;
+        $this->orig_obj = & $orig_obj;
         $this->orig_method = $orig_method;
     }
     /**
@@ -260,9 +260,9 @@ 
     * @access protected
     */
     function breakData(&$parser, $data) {
-        $data = preg_split('/(&.+?;)/',$data,-1,PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
-        foreach ( $data as $chunk ) {
-            $chunk = html_entity_decode($chunk,ENT_NOQUOTES);
+        $data = preg_split('/(&.+?;)/', $data, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+        foreach ($data as $chunk) {
+            $chunk = html_entity_decode($chunk, ENT_NOQUOTES);
             $this->orig_obj->{$this->orig_method}($this, $chunk);
         }
     }
@@ -270,10 +270,10 @@ 
 /**
 * Compatibility with older PHP versions
 */
-if (version_compare(phpversion(), '4.3', '<') && !function_exists('html_entity_decode') ) {
-    function html_entity_decode($str, $style=ENT_NOQUOTES) {
+if (version_compare(phpversion(), '4.3', '<') && !function_exists('html_entity_decode')) {
+    function html_entity_decode($str, $style = ENT_NOQUOTES) {
         return strtr($str,
-            array_flip(get_html_translation_table(HTML_ENTITIES,$style)));
+            array_flip(get_html_translation_table(HTML_ENTITIES, $style)));
     }
 }
 /**
@@ -302,7 +302,7 @@ 
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {
-        $this->orig_obj =& $orig_obj;
+        $this->orig_obj = & $orig_obj;
         $this->orig_method = $orig_method;
     }
     /**
@@ -312,8 +312,8 @@ 
     * @access protected
     */
     function breakData(&$parser, $data) {
-        $data = preg_split('/(&.+?;)/',$data,-1,PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
-        foreach ( $data as $chunk ) {
+        $data = preg_split('/(&.+?;)/', $data, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+        foreach ($data as $chunk) {
             $this->orig_obj->{$this->orig_method}($this, $chunk);
         }
     }
@@ -345,7 +345,7 @@ 
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {
-        $this->orig_obj =& $orig_obj;
+        $this->orig_obj = & $orig_obj;
         $this->orig_method = $orig_method;
     }
     /**
@@ -356,20 +356,20 @@ 
     */
     function strip(&$parser, $data) {
         // Check for HTML comments first
-        if ( substr($data,0,2) == '--' ) {
+        if (substr($data, 0, 2) == '--') {
             $patterns = array(
-                '/^\-\-/',          // Opening comment: --
-                '/\-\-$/',          // Closing comment: --
+                '/^\-\-/', // Opening comment: --
+                '/\-\-$/', // Closing comment: --
             );
-            $data = preg_replace($patterns,'',$data);
+            $data = preg_replace($patterns, '', $data);
 
         // Check for XML CDATA sections (note: don't do both!)
-        } else if ( substr($data,0,1) == '[' ) {
+        } else if (substr($data, 0, 1) == '[') {
             $patterns = array(
                 '/^\[.*CDATA.*\[/s', // Opening CDATA
-                '/\].*\]$/s',       // Closing CDATA
+                '/\].*\]$/s', // Closing CDATA
                 );
-            $data = preg_replace($patterns,'',$data);
+            $data = preg_replace($patterns, '', $data);
         }
 
         $this->orig_obj->{$this->orig_method}($this, $data);

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/ModuleBuilder/MB/MBLanguage.php

Doc Comments +6 added lines

@@ -67,6 +67,9 @@ 
 			$this->generateAppStrings();
 		}
 
+		/**
+		 * @param string $file
+		 */
 		function loadStrings($file)
         {
             $module = strtoupper($this->name);
@@ -90,6 +93,9 @@ 
 			}
 		}
 
+	    /**
+	     * @param string $file
+	     */
 	    function loadAppListStrings($file){
             if(!file_exists($file))return;
 			//we may not need this when loading in the app strings, but there is no harm

Indentation +199 added lines, -199 removed lines

@@ -38,14 +38,14 @@ 
  ********************************************************************************/
 
 class MBLanguage{
-		var $iTemplates = array();
-		var $templates = array();
-		function __construct( $name, $path, $label, $key_name){
-			$this->path = $path;
-			$this->name = $name;
-			$this->key_name = $key_name;
-			$this->label = $label;
-		}
+        var $iTemplates = array();
+        var $templates = array();
+        function __construct( $name, $path, $label, $key_name){
+            $this->path = $path;
+            $this->name = $name;
+            $this->key_name = $key_name;
+            $this->label = $label;
+        }
 
     /**
      * @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
@@ -62,116 +62,116 @@ 
     }
 
 
-		function load(){
-			$this->generateModStrings();
-			$this->generateAppStrings();
-		}
+        function load(){
+            $this->generateModStrings();
+            $this->generateAppStrings();
+        }
 
-		function loadStrings($file)
+        function loadStrings($file)
         {
             $module = strtoupper($this->name);
             $object_name = strtoupper($this->key_name);
             $_object_name = strtolower($this->name);
-			if(!file_exists($file))return;
+            if(!file_exists($file))return;
 
-			$d = dir($file);
-			while($e = $d->read()){
-				if(substr($e, 0, 1) != '.' && is_file($file . '/' . $e)){
-					include($file.'/'. $e);
-					if(empty($this->strings[$e])){
+            $d = dir($file);
+            while($e = $d->read()){
+                if(substr($e, 0, 1) != '.' && is_file($file . '/' . $e)){
+                    include($file.'/'. $e);
+                    if(empty($this->strings[$e])){
 
-						$this->strings[$e] = $mod_strings;
-					}else{
-						$this->strings[$e] = array_merge($this->strings[$e], $mod_strings);
-					}
+                        $this->strings[$e] = $mod_strings;
+                    }else{
+                        $this->strings[$e] = array_merge($this->strings[$e], $mod_strings);
+                    }
 
 
-				}
-			}
-		}
+                }
+            }
+        }
 
-	    function loadAppListStrings($file){
+        function loadAppListStrings($file){
             if(!file_exists($file))return;
-			//we may not need this when loading in the app strings, but there is no harm
-			//in setting it.
-			$object_name = strtolower($this->key_name);
-
-			$d = dir($file);
-			while($e = $d->read()){
-				if(substr($e, 0, 1) != '.' && is_file($file . '/' . $e)){
-					include($file.'/'. $e);
-					if(empty($this->appListStrings[$e])){
-
-						$this->appListStrings[$e] = $app_list_strings;
-					}else{
-						$this->appListStrings[$e] = array_merge($this->appListStrings[$e], $app_list_strings);
-					}
-
-
-				}
-			}
-		}
-
-		function generateModStrings(){
-			$this->strings = array();
-			$this->loadTemplates();
-
-			foreach($this->iTemplates as $template=>$val){
-				$file = MB_IMPLEMENTS . '/' . $template . '/language';
-				$this->loadStrings($file);
-			}
-			foreach($this->templates as $template=>$val){
-				$file = MB_TEMPLATES . '/' . $template . '/language';
-				$this->loadStrings($file);
-			}
-			$this->loadStrings($this->path . '/language');
-		}
-
-		function getModStrings($language='en_us'){
-			$language .= '.lang.php';
-			if(!empty($this->strings[$language]) && $language != 'en_us.lang.php'){
-			    return sugarLangArrayMerge($this->strings['en_us.lang.php'], $this->strings[$language]);
-			}
-			if(!empty($this->strings['en_us.lang.php']))return $this->strings['en_us.lang.php'];
-			$empty = array();
-			return $empty;
-		}
-		function getAppListStrings($language='en_us'){
-			$language .= '.lang.php';
-			if(!empty($this->appListStrings[$language]) && $language != 'en_us.lang.php'){
-			    return sugarLangArrayMerge($this->appListStrings['en_us.lang.php'], $this->appListStrings[$language]);
-			}
-			if(!empty($this->appListStrings['en_us.lang.php']))return $this->appListStrings['en_us.lang.php'];
-			$empty = array();
-			return $empty;
-		}
-
-		function generateAppStrings($buildFromTemplate = true){
-			$this->appListStrings = array('en_us.lang.php'=>array());
-			//By default, generate app strings for the current language as well.
-			$this->appListStrings[$GLOBALS [ 'current_language' ] . ".lang.php"] = array();
-			$this->loadAppListStrings($this->path . '/../../language/application');
-
-			if($buildFromTemplate){
-				//go through the templates application strings and load anything that is needed
-				foreach($this->iTemplates as $template=>$val){
-					$file = MB_IMPLEMENTS . '/' . $template . '/language/application';
-					$this->loadAppListStrings($file);
-				}
-				foreach($this->templates as $template=>$val){
-					$file = MB_TEMPLATES . '/' . $template . '/language/application';
-					$this->loadAppListStrings($file);
-				}
-			}
-		}
-		function save($key_name, $duplicate=false, $rename=false){
-			$header = file_get_contents('modules/ModuleBuilder/MB/header.php');
-			$save_path = $this->path . '/language';
-			mkdir_recursive($save_path);
-			foreach($this->strings as $lang=>$values){
-				//Check if the module Label has changed.
-				$renameLang = $rename || empty($values) || (isset($values['LBL_MODULE_NAME']) && $this->label != $values['LBL_MODULE_NAME']);
-				$mod_strings = return_module_language(str_replace('.lang.php','',$lang), 'ModuleBuilder');
+            //we may not need this when loading in the app strings, but there is no harm
+            //in setting it.
+            $object_name = strtolower($this->key_name);
+
+            $d = dir($file);
+            while($e = $d->read()){
+                if(substr($e, 0, 1) != '.' && is_file($file . '/' . $e)){
+                    include($file.'/'. $e);
+                    if(empty($this->appListStrings[$e])){
+
+                        $this->appListStrings[$e] = $app_list_strings;
+                    }else{
+                        $this->appListStrings[$e] = array_merge($this->appListStrings[$e], $app_list_strings);
+                    }
+
+
+                }
+            }
+        }
+
+        function generateModStrings(){
+            $this->strings = array();
+            $this->loadTemplates();
+
+            foreach($this->iTemplates as $template=>$val){
+                $file = MB_IMPLEMENTS . '/' . $template . '/language';
+                $this->loadStrings($file);
+            }
+            foreach($this->templates as $template=>$val){
+                $file = MB_TEMPLATES . '/' . $template . '/language';
+                $this->loadStrings($file);
+            }
+            $this->loadStrings($this->path . '/language');
+        }
+
+        function getModStrings($language='en_us'){
+            $language .= '.lang.php';
+            if(!empty($this->strings[$language]) && $language != 'en_us.lang.php'){
+                return sugarLangArrayMerge($this->strings['en_us.lang.php'], $this->strings[$language]);
+            }
+            if(!empty($this->strings['en_us.lang.php']))return $this->strings['en_us.lang.php'];
+            $empty = array();
+            return $empty;
+        }
+        function getAppListStrings($language='en_us'){
+            $language .= '.lang.php';
+            if(!empty($this->appListStrings[$language]) && $language != 'en_us.lang.php'){
+                return sugarLangArrayMerge($this->appListStrings['en_us.lang.php'], $this->appListStrings[$language]);
+            }
+            if(!empty($this->appListStrings['en_us.lang.php']))return $this->appListStrings['en_us.lang.php'];
+            $empty = array();
+            return $empty;
+        }
+
+        function generateAppStrings($buildFromTemplate = true){
+            $this->appListStrings = array('en_us.lang.php'=>array());
+            //By default, generate app strings for the current language as well.
+            $this->appListStrings[$GLOBALS [ 'current_language' ] . ".lang.php"] = array();
+            $this->loadAppListStrings($this->path . '/../../language/application');
+
+            if($buildFromTemplate){
+                //go through the templates application strings and load anything that is needed
+                foreach($this->iTemplates as $template=>$val){
+                    $file = MB_IMPLEMENTS . '/' . $template . '/language/application';
+                    $this->loadAppListStrings($file);
+                }
+                foreach($this->templates as $template=>$val){
+                    $file = MB_TEMPLATES . '/' . $template . '/language/application';
+                    $this->loadAppListStrings($file);
+                }
+            }
+        }
+        function save($key_name, $duplicate=false, $rename=false){
+            $header = file_get_contents('modules/ModuleBuilder/MB/header.php');
+            $save_path = $this->path . '/language';
+            mkdir_recursive($save_path);
+            foreach($this->strings as $lang=>$values){
+                //Check if the module Label has changed.
+                $renameLang = $rename || empty($values) || (isset($values['LBL_MODULE_NAME']) && $this->label != $values['LBL_MODULE_NAME']);
+                $mod_strings = return_module_language(str_replace('.lang.php','',$lang), 'ModuleBuilder');
                 $required = array(
                 'LBL_LIST_FORM_TITLE'=>$this->label . " " . $mod_strings['LBL_LIST'],
                 'LBL_MODULE_NAME'=>$this->label,
@@ -187,98 +187,98 @@ 
                 'LBL_'.strtoupper($this->key_name).'_SUBPANEL_TITLE'=>$this->label,
                 'LBL_NEW_FORM_TITLE' => $mod_strings['LBL_NEW'] ." ". $this->label,
                 );
-				foreach($required as $k=>$v){
-					if(empty($values[$k]) || $renameLang){
-						$values[$k] = $v;
-					}
-				}
-				write_array_to_file('mod_strings', $values, $save_path .'/'.$lang,'w', $header);
-			}
-			$app_save_path = $this->path . '/../../language/application';
-			mkdir_recursive($app_save_path);
-			$key_changed = ($this->key_name != $key_name);
-
-			foreach($this->appListStrings as $lang=>$values){
-				// Load previously created modules data
-				// $app_list_strings = array (); --- fix for issue #305
-				$neededFile = $app_save_path . '/'. $lang;
-				if (file_exists($neededFile)) {
-					include $neededFile;
-				}
-
-
-				if(!$duplicate){
-					unset($values['moduleList'][$this->key_name]);
-				}
-
-
-				// $values = sugarLangArrayMerge($values, $app_list_strings); --- fix for issue #305
-				$values['moduleList'][$key_name]= $this->label;
-
-
-				$appFile = $header. "\n";
-				require_once('include/utils/array_utils.php');
-				$this->getGlobalAppListStringsForMB($values);
-				foreach($values as $key=>$array){
-					if($duplicate){
-						//keep the original when duplicating
-						$appFile .= override_value_to_string_recursive2 ('app_list_strings', $key, $array);
-					}
-					$okey = $key;
-					if($key_changed)$key = str_replace($this->key_name, $key_name, $key);
-					if($key_changed)$key = str_replace(strtolower($this->key_name), strtolower($key_name), $key);
-					// if we aren't duplicating or the key has changed let's add it
-					if(!$duplicate || $okey != $key){
-						$appFile .= override_value_to_string_recursive2 ('app_list_strings', $key, $array);
-					}
-				}
-
-				$fp = sugar_fopen($app_save_path . '/'. $lang, 'w');
-				fwrite($fp, $appFile);
-				fclose($fp);
-			}
-		}
-
-		/**
-		*  If there is no this dropdown list  in  custom\modulebuilder\packages\$package\language\application\$lang.lang.php ,
-		*  we will include it from global app_list_string array into custom\modulebuilder\packages\$package\language\application\$lang.lang.php
-		*  when we create a dropdown filed  and the value is created in MB.(#20728 )
-		**/
-		function getGlobalAppListStringsForMB(&$values){
-			//Ensure it comes from MB
-			if(!empty($_REQUEST['view_package']) && !empty($_REQUEST['type']) && $_REQUEST['type'] == 'enum'  && !empty($_REQUEST['options'])){
-				if(!isset($values[$_REQUEST['options']])){
-					global $app_list_strings;
-					if(!empty($app_list_strings[$_REQUEST['options']])){
-						$values[$_REQUEST['options']]  = $app_list_strings[$_REQUEST['options']];
-					}
-				}
-			}
-		}
-
-		function build($path){
-			if(file_exists($this->path.'/language/'))
-			copy_recursive($this->path.'/language/', $path . '/language/');
-		}
-
-		function loadTemplates() {
-			if(empty($this->templates)){
-				if (file_exists("$this->path/config.php")) {
-					include "$this->path/config.php";
-					$this->templates = $config['templates'];
-					$this->iTemplates = array();
-				}
-			}
-		}
-
-		/**
-		 * Reset the templates and load the language files again.  This is called from
-		 * MBModule->save() once the config file has been written.
-		 */
-		function reload(){
-			$this->templates = null;
-			$this->load();
-		}
+                foreach($required as $k=>$v){
+                    if(empty($values[$k]) || $renameLang){
+                        $values[$k] = $v;
+                    }
+                }
+                write_array_to_file('mod_strings', $values, $save_path .'/'.$lang,'w', $header);
+            }
+            $app_save_path = $this->path . '/../../language/application';
+            mkdir_recursive($app_save_path);
+            $key_changed = ($this->key_name != $key_name);
+
+            foreach($this->appListStrings as $lang=>$values){
+                // Load previously created modules data
+                // $app_list_strings = array (); --- fix for issue #305
+                $neededFile = $app_save_path . '/'. $lang;
+                if (file_exists($neededFile)) {
+                    include $neededFile;
+                }
+
+
+                if(!$duplicate){
+                    unset($values['moduleList'][$this->key_name]);
+                }
+
+
+                // $values = sugarLangArrayMerge($values, $app_list_strings); --- fix for issue #305
+                $values['moduleList'][$key_name]= $this->label;
+
+
+                $appFile = $header. "\n";
+                require_once('include/utils/array_utils.php');
+                $this->getGlobalAppListStringsForMB($values);
+                foreach($values as $key=>$array){
+                    if($duplicate){
+                        //keep the original when duplicating
+                        $appFile .= override_value_to_string_recursive2 ('app_list_strings', $key, $array);
+                    }
+                    $okey = $key;
+                    if($key_changed)$key = str_replace($this->key_name, $key_name, $key);
+                    if($key_changed)$key = str_replace(strtolower($this->key_name), strtolower($key_name), $key);
+                    // if we aren't duplicating or the key has changed let's add it
+                    if(!$duplicate || $okey != $key){
+                        $appFile .= override_value_to_string_recursive2 ('app_list_strings', $key, $array);
+                    }
+                }
+
+                $fp = sugar_fopen($app_save_path . '/'. $lang, 'w');
+                fwrite($fp, $appFile);
+                fclose($fp);
+            }
+        }
+
+        /**
+         *  If there is no this dropdown list  in  custom\modulebuilder\packages\$package\language\application\$lang.lang.php ,
+         *  we will include it from global app_list_string array into custom\modulebuilder\packages\$package\language\application\$lang.lang.php
+         *  when we create a dropdown filed  and the value is created in MB.(#20728 )
+         **/
+        function getGlobalAppListStringsForMB(&$values){
+            //Ensure it comes from MB
+            if(!empty($_REQUEST['view_package']) && !empty($_REQUEST['type']) && $_REQUEST['type'] == 'enum'  && !empty($_REQUEST['options'])){
+                if(!isset($values[$_REQUEST['options']])){
+                    global $app_list_strings;
+                    if(!empty($app_list_strings[$_REQUEST['options']])){
+                        $values[$_REQUEST['options']]  = $app_list_strings[$_REQUEST['options']];
+                    }
+                }
+            }
+        }
+
+        function build($path){
+            if(file_exists($this->path.'/language/'))
+            copy_recursive($this->path.'/language/', $path . '/language/');
+        }
+
+        function loadTemplates() {
+            if(empty($this->templates)){
+                if (file_exists("$this->path/config.php")) {
+                    include "$this->path/config.php";
+                    $this->templates = $config['templates'];
+                    $this->iTemplates = array();
+                }
+            }
+        }
+
+        /**
+         * Reset the templates and load the language files again.  This is called from
+         * MBModule->save() once the config file has been written.
+         */
+        function reload(){
+            $this->templates = null;
+            $this->load();
+        }
 
     /**
      * Attempts to translate the given label if it is contained in this

Spacing +78 added lines, -78 removed lines

@@ -37,10 +37,10 @@ 
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 
-class MBLanguage{
+class MBLanguage {
 		var $iTemplates = array();
 		var $templates = array();
-		function __construct( $name, $path, $label, $key_name){
+		function __construct($name, $path, $label, $key_name) {
 			$this->path = $path;
 			$this->name = $name;
 			$this->key_name = $key_name;
@@ -50,9 +50,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 MBLanguage($name, $path, $label, $key_name){
+    function MBLanguage($name, $path, $label, $key_name) {
         $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 {
@@ -62,7 +62,7 @@ 
     }
 
 
-		function load(){
+		function load() {
 			$this->generateModStrings();
 			$this->generateAppStrings();
 		}
@@ -72,16 +72,16 @@ 
             $module = strtoupper($this->name);
             $object_name = strtoupper($this->key_name);
             $_object_name = strtolower($this->name);
-			if(!file_exists($file))return;
+			if (!file_exists($file))return;
 
 			$d = dir($file);
-			while($e = $d->read()){
-				if(substr($e, 0, 1) != '.' && is_file($file . '/' . $e)){
-					include($file.'/'. $e);
-					if(empty($this->strings[$e])){
+			while ($e = $d->read()) {
+				if (substr($e, 0, 1) != '.' && is_file($file.'/'.$e)) {
+					include($file.'/'.$e);
+					if (empty($this->strings[$e])) {
 
 						$this->strings[$e] = $mod_strings;
-					}else{
+					} else {
 						$this->strings[$e] = array_merge($this->strings[$e], $mod_strings);
 					}
 
@@ -90,20 +90,20 @@ 
 			}
 		}
 
-	    function loadAppListStrings($file){
-            if(!file_exists($file))return;
+	    function loadAppListStrings($file) {
+            if (!file_exists($file))return;
 			//we may not need this when loading in the app strings, but there is no harm
 			//in setting it.
 			$object_name = strtolower($this->key_name);
 
 			$d = dir($file);
-			while($e = $d->read()){
-				if(substr($e, 0, 1) != '.' && is_file($file . '/' . $e)){
-					include($file.'/'. $e);
-					if(empty($this->appListStrings[$e])){
+			while ($e = $d->read()) {
+				if (substr($e, 0, 1) != '.' && is_file($file.'/'.$e)) {
+					include($file.'/'.$e);
+					if (empty($this->appListStrings[$e])) {
 
 						$this->appListStrings[$e] = $app_list_strings;
-					}else{
+					} else {
 						$this->appListStrings[$e] = array_merge($this->appListStrings[$e], $app_list_strings);
 					}
 
@@ -112,128 +112,128 @@ 
 			}
 		}
 
-		function generateModStrings(){
+		function generateModStrings() {
 			$this->strings = array();
 			$this->loadTemplates();
 
-			foreach($this->iTemplates as $template=>$val){
-				$file = MB_IMPLEMENTS . '/' . $template . '/language';
+			foreach ($this->iTemplates as $template=>$val) {
+				$file = MB_IMPLEMENTS.'/'.$template.'/language';
 				$this->loadStrings($file);
 			}
-			foreach($this->templates as $template=>$val){
-				$file = MB_TEMPLATES . '/' . $template . '/language';
+			foreach ($this->templates as $template=>$val) {
+				$file = MB_TEMPLATES.'/'.$template.'/language';
 				$this->loadStrings($file);
 			}
-			$this->loadStrings($this->path . '/language');
+			$this->loadStrings($this->path.'/language');
 		}
 
-		function getModStrings($language='en_us'){
+		function getModStrings($language = 'en_us') {
 			$language .= '.lang.php';
-			if(!empty($this->strings[$language]) && $language != 'en_us.lang.php'){
+			if (!empty($this->strings[$language]) && $language != 'en_us.lang.php') {
 			    return sugarLangArrayMerge($this->strings['en_us.lang.php'], $this->strings[$language]);
 			}
-			if(!empty($this->strings['en_us.lang.php']))return $this->strings['en_us.lang.php'];
+			if (!empty($this->strings['en_us.lang.php']))return $this->strings['en_us.lang.php'];
 			$empty = array();
 			return $empty;
 		}
-		function getAppListStrings($language='en_us'){
+		function getAppListStrings($language = 'en_us') {
 			$language .= '.lang.php';
-			if(!empty($this->appListStrings[$language]) && $language != 'en_us.lang.php'){
+			if (!empty($this->appListStrings[$language]) && $language != 'en_us.lang.php') {
 			    return sugarLangArrayMerge($this->appListStrings['en_us.lang.php'], $this->appListStrings[$language]);
 			}
-			if(!empty($this->appListStrings['en_us.lang.php']))return $this->appListStrings['en_us.lang.php'];
+			if (!empty($this->appListStrings['en_us.lang.php']))return $this->appListStrings['en_us.lang.php'];
 			$empty = array();
 			return $empty;
 		}
 
-		function generateAppStrings($buildFromTemplate = true){
+		function generateAppStrings($buildFromTemplate = true) {
 			$this->appListStrings = array('en_us.lang.php'=>array());
 			//By default, generate app strings for the current language as well.
-			$this->appListStrings[$GLOBALS [ 'current_language' ] . ".lang.php"] = array();
-			$this->loadAppListStrings($this->path . '/../../language/application');
+			$this->appListStrings[$GLOBALS ['current_language'].".lang.php"] = array();
+			$this->loadAppListStrings($this->path.'/../../language/application');
 
-			if($buildFromTemplate){
+			if ($buildFromTemplate) {
 				//go through the templates application strings and load anything that is needed
-				foreach($this->iTemplates as $template=>$val){
-					$file = MB_IMPLEMENTS . '/' . $template . '/language/application';
+				foreach ($this->iTemplates as $template=>$val) {
+					$file = MB_IMPLEMENTS.'/'.$template.'/language/application';
 					$this->loadAppListStrings($file);
 				}
-				foreach($this->templates as $template=>$val){
-					$file = MB_TEMPLATES . '/' . $template . '/language/application';
+				foreach ($this->templates as $template=>$val) {
+					$file = MB_TEMPLATES.'/'.$template.'/language/application';
 					$this->loadAppListStrings($file);
 				}
 			}
 		}
-		function save($key_name, $duplicate=false, $rename=false){
+		function save($key_name, $duplicate = false, $rename = false) {
 			$header = file_get_contents('modules/ModuleBuilder/MB/header.php');
-			$save_path = $this->path . '/language';
+			$save_path = $this->path.'/language';
 			mkdir_recursive($save_path);
-			foreach($this->strings as $lang=>$values){
+			foreach ($this->strings as $lang=>$values) {
 				//Check if the module Label has changed.
 				$renameLang = $rename || empty($values) || (isset($values['LBL_MODULE_NAME']) && $this->label != $values['LBL_MODULE_NAME']);
-				$mod_strings = return_module_language(str_replace('.lang.php','',$lang), 'ModuleBuilder');
+				$mod_strings = return_module_language(str_replace('.lang.php', '', $lang), 'ModuleBuilder');
                 $required = array(
-                'LBL_LIST_FORM_TITLE'=>$this->label . " " . $mod_strings['LBL_LIST'],
+                'LBL_LIST_FORM_TITLE'=>$this->label." ".$mod_strings['LBL_LIST'],
                 'LBL_MODULE_NAME'=>$this->label,
                 'LBL_MODULE_TITLE'=>$this->label,
-                'LBL_HOMEPAGE_TITLE'=>$mod_strings['LBL_HOMEPAGE_PREFIX'] . " " . $this->label,
+                'LBL_HOMEPAGE_TITLE'=>$mod_strings['LBL_HOMEPAGE_PREFIX']." ".$this->label,
                 //FOR GENERIC MENU
-                'LNK_NEW_RECORD'=>$mod_strings['LBL_CREATE'] ." ". $this->label,
-                'LNK_LIST'=>$mod_strings['LBL_VIEW'] ." ". $this->label,
-                'LNK_IMPORT_'.strtoupper($this->key_name)=>translate('LBL_IMPORT') ." ". $this->label,
-                'LBL_SEARCH_FORM_TITLE'=>$mod_strings['LBL_SEARCH'] ." ". $this->label,
+                'LNK_NEW_RECORD'=>$mod_strings['LBL_CREATE']." ".$this->label,
+                'LNK_LIST'=>$mod_strings['LBL_VIEW']." ".$this->label,
+                'LNK_IMPORT_'.strtoupper($this->key_name)=>translate('LBL_IMPORT')." ".$this->label,
+                'LBL_SEARCH_FORM_TITLE'=>$mod_strings['LBL_SEARCH']." ".$this->label,
                 'LBL_HISTORY_SUBPANEL_TITLE'=>$mod_strings['LBL_HISTORY'],
                 'LBL_ACTIVITIES_SUBPANEL_TITLE'=>$mod_strings['LBL_ACTIVITIES'],
                 'LBL_'.strtoupper($this->key_name).'_SUBPANEL_TITLE'=>$this->label,
-                'LBL_NEW_FORM_TITLE' => $mod_strings['LBL_NEW'] ." ". $this->label,
+                'LBL_NEW_FORM_TITLE' => $mod_strings['LBL_NEW']." ".$this->label,
                 );
-				foreach($required as $k=>$v){
-					if(empty($values[$k]) || $renameLang){
+				foreach ($required as $k=>$v) {
+					if (empty($values[$k]) || $renameLang) {
 						$values[$k] = $v;
 					}
 				}
-				write_array_to_file('mod_strings', $values, $save_path .'/'.$lang,'w', $header);
+				write_array_to_file('mod_strings', $values, $save_path.'/'.$lang, 'w', $header);
 			}
-			$app_save_path = $this->path . '/../../language/application';
+			$app_save_path = $this->path.'/../../language/application';
 			mkdir_recursive($app_save_path);
 			$key_changed = ($this->key_name != $key_name);
 
-			foreach($this->appListStrings as $lang=>$values){
+			foreach ($this->appListStrings as $lang=>$values) {
 				// Load previously created modules data
 				// $app_list_strings = array (); --- fix for issue #305
-				$neededFile = $app_save_path . '/'. $lang;
+				$neededFile = $app_save_path.'/'.$lang;
 				if (file_exists($neededFile)) {
 					include $neededFile;
 				}
 
 
-				if(!$duplicate){
+				if (!$duplicate) {
 					unset($values['moduleList'][$this->key_name]);
 				}
 
 
 				// $values = sugarLangArrayMerge($values, $app_list_strings); --- fix for issue #305
-				$values['moduleList'][$key_name]= $this->label;
+				$values['moduleList'][$key_name] = $this->label;
 
 
-				$appFile = $header. "\n";
+				$appFile = $header."\n";
 				require_once('include/utils/array_utils.php');
 				$this->getGlobalAppListStringsForMB($values);
-				foreach($values as $key=>$array){
-					if($duplicate){
+				foreach ($values as $key=>$array) {
+					if ($duplicate) {
 						//keep the original when duplicating
-						$appFile .= override_value_to_string_recursive2 ('app_list_strings', $key, $array);
+						$appFile .= override_value_to_string_recursive2('app_list_strings', $key, $array);
 					}
 					$okey = $key;
-					if($key_changed)$key = str_replace($this->key_name, $key_name, $key);
-					if($key_changed)$key = str_replace(strtolower($this->key_name), strtolower($key_name), $key);
+					if ($key_changed)$key = str_replace($this->key_name, $key_name, $key);
+					if ($key_changed)$key = str_replace(strtolower($this->key_name), strtolower($key_name), $key);
 					// if we aren't duplicating or the key has changed let's add it
-					if(!$duplicate || $okey != $key){
-						$appFile .= override_value_to_string_recursive2 ('app_list_strings', $key, $array);
+					if (!$duplicate || $okey != $key) {
+						$appFile .= override_value_to_string_recursive2('app_list_strings', $key, $array);
 					}
 				}
 
-				$fp = sugar_fopen($app_save_path . '/'. $lang, 'w');
+				$fp = sugar_fopen($app_save_path.'/'.$lang, 'w');
 				fwrite($fp, $appFile);
 				fclose($fp);
 			}
@@ -244,25 +244,25 @@ 
 		*  we will include it from global app_list_string array into custom\modulebuilder\packages\$package\language\application\$lang.lang.php
 		*  when we create a dropdown filed  and the value is created in MB.(#20728 )
 		**/
-		function getGlobalAppListStringsForMB(&$values){
+		function getGlobalAppListStringsForMB(&$values) {
 			//Ensure it comes from MB
-			if(!empty($_REQUEST['view_package']) && !empty($_REQUEST['type']) && $_REQUEST['type'] == 'enum'  && !empty($_REQUEST['options'])){
-				if(!isset($values[$_REQUEST['options']])){
+			if (!empty($_REQUEST['view_package']) && !empty($_REQUEST['type']) && $_REQUEST['type'] == 'enum' && !empty($_REQUEST['options'])) {
+				if (!isset($values[$_REQUEST['options']])) {
 					global $app_list_strings;
-					if(!empty($app_list_strings[$_REQUEST['options']])){
-						$values[$_REQUEST['options']]  = $app_list_strings[$_REQUEST['options']];
+					if (!empty($app_list_strings[$_REQUEST['options']])) {
+						$values[$_REQUEST['options']] = $app_list_strings[$_REQUEST['options']];
 					}
 				}
 			}
 		}
 
-		function build($path){
-			if(file_exists($this->path.'/language/'))
-			copy_recursive($this->path.'/language/', $path . '/language/');
+		function build($path) {
+			if (file_exists($this->path.'/language/'))
+			copy_recursive($this->path.'/language/', $path.'/language/');
 		}
 
 		function loadTemplates() {
-			if(empty($this->templates)){
+			if (empty($this->templates)) {
 				if (file_exists("$this->path/config.php")) {
 					include "$this->path/config.php";
 					$this->templates = $config['templates'];
@@ -275,7 +275,7 @@ 
 		 * Reset the templates and load the language files again.  This is called from
 		 * MBModule->save() once the config file has been written.
 		 */
-		function reload(){
+		function reload() {
 			$this->templates = null;
 			$this->load();
 		}
@@ -288,8 +288,8 @@ 
      * @param string $language Language to use to translate the label
      * @return string
      */
-    public function translate($label, $language = "en_us"){
-            $language = $language . ".lang.php";
+    public function translate($label, $language = "en_us") {
+            $language = $language.".lang.php";
             if (isset($this->strings[$language][$label]))
                 return $this->strings[$language][$label];
 

Braces +30 added lines, -16 removed lines

@@ -54,8 +54,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($name, $path, $label, $key_name);
@@ -72,7 +71,9 @@ 
             $module = strtoupper($this->name);
             $object_name = strtoupper($this->key_name);
             $_object_name = strtolower($this->name);
-			if(!file_exists($file))return;
+			if(!file_exists($file)) {
+			    return;
+			}
 
 			$d = dir($file);
 			while($e = $d->read()){
@@ -81,7 +82,7 @@ 
 					if(empty($this->strings[$e])){
 
 						$this->strings[$e] = $mod_strings;
-					}else{
+					} else{
 						$this->strings[$e] = array_merge($this->strings[$e], $mod_strings);
 					}
 
@@ -91,7 +92,9 @@ 
 		}
 
 	    function loadAppListStrings($file){
-            if(!file_exists($file))return;
+            if(!file_exists($file)) {
+                return;
+            }
 			//we may not need this when loading in the app strings, but there is no harm
 			//in setting it.
 			$object_name = strtolower($this->key_name);
@@ -103,7 +106,7 @@ 
 					if(empty($this->appListStrings[$e])){
 
 						$this->appListStrings[$e] = $app_list_strings;
-					}else{
+					} else{
 						$this->appListStrings[$e] = array_merge($this->appListStrings[$e], $app_list_strings);
 					}
 
@@ -132,7 +135,9 @@ 
 			if(!empty($this->strings[$language]) && $language != 'en_us.lang.php'){
 			    return sugarLangArrayMerge($this->strings['en_us.lang.php'], $this->strings[$language]);
 			}
-			if(!empty($this->strings['en_us.lang.php']))return $this->strings['en_us.lang.php'];
+			if(!empty($this->strings['en_us.lang.php'])) {
+			    return $this->strings['en_us.lang.php'];
+			}
 			$empty = array();
 			return $empty;
 		}
@@ -141,7 +146,9 @@ 
 			if(!empty($this->appListStrings[$language]) && $language != 'en_us.lang.php'){
 			    return sugarLangArrayMerge($this->appListStrings['en_us.lang.php'], $this->appListStrings[$language]);
 			}
-			if(!empty($this->appListStrings['en_us.lang.php']))return $this->appListStrings['en_us.lang.php'];
+			if(!empty($this->appListStrings['en_us.lang.php'])) {
+			    return $this->appListStrings['en_us.lang.php'];
+			}
 			$empty = array();
 			return $empty;
 		}
@@ -225,8 +232,12 @@ 
 						$appFile .= override_value_to_string_recursive2 ('app_list_strings', $key, $array);
 					}
 					$okey = $key;
-					if($key_changed)$key = str_replace($this->key_name, $key_name, $key);
-					if($key_changed)$key = str_replace(strtolower($this->key_name), strtolower($key_name), $key);
+					if($key_changed) {
+					    $key = str_replace($this->key_name, $key_name, $key);
+					}
+					if($key_changed) {
+					    $key = str_replace(strtolower($this->key_name), strtolower($key_name), $key);
+					}
 					// if we aren't duplicating or the key has changed let's add it
 					if(!$duplicate || $okey != $key){
 						$appFile .= override_value_to_string_recursive2 ('app_list_strings', $key, $array);
@@ -257,8 +268,9 @@ 
 		}
 
 		function build($path){
-			if(file_exists($this->path.'/language/'))
-			copy_recursive($this->path.'/language/', $path . '/language/');
+			if(file_exists($this->path.'/language/')) {
+						copy_recursive($this->path.'/language/', $path . '/language/');
+			}
 		}
 
 		function loadTemplates() {
@@ -290,11 +302,13 @@ 
      */
     public function translate($label, $language = "en_us"){
             $language = $language . ".lang.php";
-            if (isset($this->strings[$language][$label]))
-                return $this->strings[$language][$label];
+            if (isset($this->strings[$language][$label])) {
+                            return $this->strings[$language][$label];
+            }
 
-            if (isset($this->appListStrings[$language][$label]))
-                return $this->appListStrings[$language][$label];
+            if (isset($this->appListStrings[$language][$label])) {
+                            return $this->appListStrings[$language][$label];
+            }
 
             return $label;
         }