Inspection of "Merge branch 'develop' into scrutinizer-code-quali..." - adamjakab/SuiteCRM - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — scrutinizer-code-quality ( 09f5a1...c4c5fb )

by Adam

created 2016-05-10 07:43 UTC

Status

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?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,7 +56,7 @@  discard block
 block discarded – undo
 
         parent::__construct($id, $def);
 
-        if(empty($def['title'])) $this->title = translate('LBL_HOMEPAGE_TITLE', 'AOK_KnowledgeBase');
+        if (empty($def['title'])) $this->title = translate('LBL_HOMEPAGE_TITLE', 'AOK_KnowledgeBase');
 
         $this->searchFields = $dashletData['AOK_KnowledgeBaseDashlet']['searchFields'];
         $this->columns = $dashletData['AOK_KnowledgeBaseDashlet']['columns'];
@@ -67,9 +67,9 @@  discard block
 block discarded – undo
     /**
      * @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 AOK_KnowledgeBaseDashlet($id, $def = null){
+    function AOK_KnowledgeBaseDashlet($id, $def = null) {
         $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 {

Please login to merge, or discard this patch.

Braces +7 added lines, -4 removed lines patch added patch discarded remove patch

@@ -1,5 +1,7 @@  discard block
 block discarded – undo
 <?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,7 +58,9 @@  discard block
 block discarded – undo
 
         parent::__construct($id, $def);
 
-        if(empty($def['title'])) $this->title = translate('LBL_HOMEPAGE_TITLE', 'AOK_KnowledgeBase');
+        if(empty($def['title'])) {
+            $this->title = translate('LBL_HOMEPAGE_TITLE', 'AOK_KnowledgeBase');
+        }
 
         $this->searchFields = $dashletData['AOK_KnowledgeBaseDashlet']['searchFields'];
         $this->columns = $dashletData['AOK_KnowledgeBaseDashlet']['columns'];
@@ -71,8 +75,7 @@  discard block
 block discarded – undo
         $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($id, $def);

Please login to merge, or discard this patch.

modules/AOS_PDF_Templates/views/view.detail.php 2 patches

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -1,19 +1,19 @@  discard block
 block discarded – undo
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 
 require_once('include/MVC/View/views/view.detail.php');
 
 class AOS_PDF_TemplatesViewDetail extends ViewDetail {
-	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 AOS_PDF_TemplatesViewDetail(){
+    function AOS_PDF_TemplatesViewDetail() {
         $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 {
@@ -23,15 +23,15 @@  discard block
 block discarded – undo
     }
 
 
-	function display(){
+	function display() {
 		$this->setDecodeHTML();
 		parent::display();
 	}
 
-	function setDecodeHTML(){
-		$this->bean->pdfheader = html_entity_decode(str_replace('&nbsp;',' ',$this->bean->pdfheader));
-		$this->bean->description = html_entity_decode(str_replace('&nbsp;',' ',$this->bean->description));
-		$this->bean->pdffooter = html_entity_decode(str_replace('&nbsp;',' ',$this->bean->pdffooter));
+	function setDecodeHTML() {
+		$this->bean->pdfheader = html_entity_decode(str_replace('&nbsp;', ' ', $this->bean->pdfheader));
+		$this->bean->description = html_entity_decode(str_replace('&nbsp;', ' ', $this->bean->description));
+		$this->bean->pdffooter = html_entity_decode(str_replace('&nbsp;', ' ', $this->bean->pdffooter));
 	}
 }
 ?>

Please login to merge, or discard this patch.

Braces +4 added lines, -3 removed lines patch added patch discarded remove patch

@@ -43,7 +43,9 @@  discard block
 block discarded – undo
  * 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 @@  discard block
 block discarded – undo
                 $count++;
             }
             echo '</table>';
-        }
-        else {
+        } else {
             echo $mod_strings['LBL_NO_SUGGESTIONS'];
         }
         die();

Please login to merge, or discard this patch.

modules/AOS_PDF_Templates/views/view.edit.php 2 patches

Spacing +71 added lines, -71 removed lines patch added patch discarded remove patch

@@ -1,19 +1,19 @@  discard block
 block discarded – undo
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 
 require_once('include/MVC/View/views/view.edit.php');
 
 class AOS_PDF_TemplatesViewEdit extends ViewEdit {
-    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 AOS_PDF_TemplatesViewEdit(){
+    function AOS_PDF_TemplatesViewEdit() {
         $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 {
@@ -23,13 +23,13 @@  discard block
 block discarded – undo
     }
 
 
-    function display(){
+    function display() {
         $this->setFields();
         parent::display();
         $this->displayTMCE();
     }
 
-    function setFields(){
+    function setFields() {
         global $app_list_strings, $mod_strings, $beanList;
 
         //Loading Sample Files
@@ -38,9 +38,9 @@  discard block
 block discarded – undo
         if ($handle = opendir('modules/AOS_PDF_Templates/samples')) {
             $sample_options_array[] = ' ';
             while (false !== ($file = readdir($handle))) {
-                if($value = ltrim(rtrim($file,'.php'),'smpl_')){
+                if ($value = ltrim(rtrim($file, '.php'), 'smpl_')) {
                     require_once('modules/AOS_PDF_Templates/samples/'.$file);
-                    $file = rtrim($file,'.php');
+                    $file = rtrim($file, '.php');
                     $file = new $file();
                     $fileArray =
                         array(
@@ -54,84 +54,84 @@  discard block
 block discarded – undo
                     $sample_options_array[$fileArray] = $value;
                 }
             }
-            $samples = get_select_options($sample_options_array,'');
+            $samples = get_select_options($sample_options_array, '');
             closedir($handle);
         }
 
-        $this->ss->assign('CUSTOM_SAMPLE','<select id="sample" name="sample" onchange="insertSample(this.options[this.selectedIndex].value)">'.
+        $this->ss->assign('CUSTOM_SAMPLE', '<select id="sample" name="sample" onchange="insertSample(this.options[this.selectedIndex].value)">'.
             $samples.
             '</select>');
 
 
-        $insert_fields_js ="<script>var moduleOptions = {\n";
-        $insert_fields_js2 ="<script>var regularOptions = {\n";
+        $insert_fields_js = "<script>var moduleOptions = {\n";
+        $insert_fields_js2 = "<script>var regularOptions = {\n";
         $modules = $app_list_strings['pdf_template_type_dom'];
 
-        foreach($modules as $moduleName => $value) {
+        foreach ($modules as $moduleName => $value) {
 
             $options_array = array(''=>'');
             $mod_options_array = array();
 
             //Getting Fields
-            if(!$beanList[$moduleName]){
+            if (!$beanList[$moduleName]) {
                 continue;
             }
             $module = new $beanList[$moduleName]();
 
-            foreach($module->field_defs as $name => $arr){
-                if(!((isset($arr['dbType']) && strtolower($arr['dbType']) == 'id') || (isset($arr['type']) && $arr['type'] == 'id') || (isset($arr['type']) && $arr['type'] == 'link'))){
-                    if(!isset($arr['reportable']) || $arr['reportable']){
-                        $options_array['$'.$module->table_name.'_'.$name] = translate($arr['vname'],$module->module_dir);
+            foreach ($module->field_defs as $name => $arr) {
+                if (!((isset($arr['dbType']) && strtolower($arr['dbType']) == 'id') || (isset($arr['type']) && $arr['type'] == 'id') || (isset($arr['type']) && $arr['type'] == 'link'))) {
+                    if (!isset($arr['reportable']) || $arr['reportable']) {
+                        $options_array['$'.$module->table_name.'_'.$name] = translate($arr['vname'], $module->module_dir);
 
                     }
                 }
             } //End loop.
 
             $options = json_encode($options_array);
-            $mod_options_array[$module->module_dir] = translate('LBL_MODULE_NAME',$module->module_dir);
-            $insert_fields_js2 .="'$moduleName':$options,\n";
+            $mod_options_array[$module->module_dir] = translate('LBL_MODULE_NAME', $module->module_dir);
+            $insert_fields_js2 .= "'$moduleName':$options,\n";
             $firstOptions = $options;
 
             $fmod_options_array = array();
-            foreach($module->field_defs as $module_name => $module_arr){
+            foreach ($module->field_defs as $module_name => $module_arr) {
 
-                if(isset($module_arr['type']) && $module_arr['type'] == 'relate' && isset($module_arr['source']) && $module_arr['source'] == 'non-db'){
+                if (isset($module_arr['type']) && $module_arr['type'] == 'relate' && isset($module_arr['source']) && $module_arr['source'] == 'non-db') {
 
                     $options_array = array(''=>'');
-                    if(isset($module_arr['module']) &&  $module_arr['module'] != '' && $module_arr['module'] != 'EmailAddress'){
+                    if (isset($module_arr['module']) && $module_arr['module'] != '' && $module_arr['module'] != 'EmailAddress') {
                         $relate_module_name = $beanList[$module_arr['module']];
                         $relate_module = new $relate_module_name();
 
-                        foreach($relate_module->field_defs as $relate_name => $relate_arr){
-                            if(!((isset($relate_arr['dbType']) && strtolower($relate_arr['dbType']) == 'id') || $relate_arr['type'] == 'id' || $relate_arr['type'] == 'link')){
-                                if((!isset($relate_arr['reportable']) || $relate_arr['reportable']) && isset($relate_arr['vname'])){
-                                    $options_array['$'.$module_arr['name'].'_'.$relate_name] = translate($relate_arr['vname'],$relate_module->module_dir);
+                        foreach ($relate_module->field_defs as $relate_name => $relate_arr) {
+                            if (!((isset($relate_arr['dbType']) && strtolower($relate_arr['dbType']) == 'id') || $relate_arr['type'] == 'id' || $relate_arr['type'] == 'link')) {
+                                if ((!isset($relate_arr['reportable']) || $relate_arr['reportable']) && isset($relate_arr['vname'])) {
+                                    $options_array['$'.$module_arr['name'].'_'.$relate_name] = translate($relate_arr['vname'], $relate_module->module_dir);
                                 }
                             }
                         } //End loop.
 
                         $options = json_encode($options_array);
 
-                        if($module_arr['vname'] != 'LBL_DELETED'){
-                            $options_array['$'.$module->table_name.'_'.$name] = translate($module_arr['vname'],$module->module_dir);
-                            $fmod_options_array[$module_arr['vname']] = translate($relate_module->module_dir).' : '.translate($module_arr['vname'],$module->module_dir);
+                        if ($module_arr['vname'] != 'LBL_DELETED') {
+                            $options_array['$'.$module->table_name.'_'.$name] = translate($module_arr['vname'], $module->module_dir);
+                            $fmod_options_array[$module_arr['vname']] = translate($relate_module->module_dir).' : '.translate($module_arr['vname'], $module->module_dir);
                         }
                         $test = $module_arr['vname'];
-                        $insert_fields_js2 .="'$test':$options,\n";
+                        $insert_fields_js2 .= "'$test':$options,\n";
                     }
                 }
             }
 
             //LINE ITEMS CODE!
-            if(isset($module->lineItems) && $module->lineItems){
+            if (isset($module->lineItems) && $module->lineItems) {
 
                 //add group fields
                 $options_array = array(''=>'');
                 $group_quote = new AOS_Line_Item_Groups();
-                foreach($group_quote->field_defs as $line_name => $line_arr){
-                    if(!((isset($line_arr['dbType']) && strtolower($line_arr['dbType']) == 'id') || $line_arr['type'] == 'id' || $line_arr['type'] == 'link')){
-                        if((!isset($line_arr['reportable']) || $line_arr['reportable']) ){//&& $line_arr['vname']  != 'LBL_NAME'
-                            $options_array['$'.$group_quote->table_name.'_'.$line_name] = translate($line_arr['vname'],$group_quote->module_dir);
+                foreach ($group_quote->field_defs as $line_name => $line_arr) {
+                    if (!((isset($line_arr['dbType']) && strtolower($line_arr['dbType']) == 'id') || $line_arr['type'] == 'id' || $line_arr['type'] == 'link')) {
+                        if ((!isset($line_arr['reportable']) || $line_arr['reportable'])) {//&& $line_arr['vname']  != 'LBL_NAME'
+                            $options_array['$'.$group_quote->table_name.'_'.$line_name] = translate($line_arr['vname'], $group_quote->module_dir);
                         }
                     }
                 }
@@ -139,26 +139,26 @@  discard block
 block discarded – undo
                 $options = json_encode($options_array);
 
                 $line_module_name = $beanList['AOS_Line_Item_Groups'];
-                $fmod_options_array[$line_module_name] = translate('LBL_LINE_ITEMS','AOS_Quotes').' : '.translate('LBL_MODULE_NAME','AOS_Line_Item_Groups');
-                $insert_fields_js2 .="'$line_module_name':$options,\n";
+                $fmod_options_array[$line_module_name] = translate('LBL_LINE_ITEMS', 'AOS_Quotes').' : '.translate('LBL_MODULE_NAME', 'AOS_Line_Item_Groups');
+                $insert_fields_js2 .= "'$line_module_name':$options,\n";
 
                 //PRODUCTS
                 $options_array = array(''=>'');
 
                 $product_quote = new AOS_Products_Quotes();
-                foreach($product_quote->field_defs as $line_name => $line_arr){
-                    if(!((isset($line_arr['dbType']) && strtolower($line_arr['dbType']) == 'id') || $line_arr['type'] == 'id' || $line_arr['type'] == 'link')){
-                        if(!isset($line_arr['reportable']) || $line_arr['reportable']){
-                            $options_array['$'.$product_quote->table_name.'_'.$line_name] = translate($line_arr['vname'],$product_quote->module_dir);
+                foreach ($product_quote->field_defs as $line_name => $line_arr) {
+                    if (!((isset($line_arr['dbType']) && strtolower($line_arr['dbType']) == 'id') || $line_arr['type'] == 'id' || $line_arr['type'] == 'link')) {
+                        if (!isset($line_arr['reportable']) || $line_arr['reportable']) {
+                            $options_array['$'.$product_quote->table_name.'_'.$line_name] = translate($line_arr['vname'], $product_quote->module_dir);
                         }
                     }
                 }
 
                 $product_quote = new AOS_Products();
-                foreach($product_quote->field_defs as $line_name => $line_arr){
-                    if(!((isset($line_arr['dbType']) && strtolower($line_arr['dbType']) == 'id') || $line_arr['type'] == 'id' || $line_arr['type'] == 'link')){
-                        if((!isset($line_arr['reportable']) || $line_arr['reportable']) && $line_arr['vname']  != 'LBL_NAME'){
-                            $options_array['$'.$product_quote->table_name.'_'.$line_name] = translate($line_arr['vname'],$product_quote->module_dir);
+                foreach ($product_quote->field_defs as $line_name => $line_arr) {
+                    if (!((isset($line_arr['dbType']) && strtolower($line_arr['dbType']) == 'id') || $line_arr['type'] == 'id' || $line_arr['type'] == 'link')) {
+                        if ((!isset($line_arr['reportable']) || $line_arr['reportable']) && $line_arr['vname'] != 'LBL_NAME') {
+                            $options_array['$'.$product_quote->table_name.'_'.$line_name] = translate($line_arr['vname'], $product_quote->module_dir);
                         }
                     }
                 }
@@ -166,41 +166,41 @@  discard block
 block discarded – undo
                 $options = json_encode($options_array);
 
                 $line_module_name = $beanList['AOS_Products_Quotes'];
-                $fmod_options_array[$line_module_name] = translate('LBL_LINE_ITEMS','AOS_Quotes').' : '.translate('LBL_MODULE_NAME','AOS_Products');
-                $insert_fields_js2 .="'$line_module_name':$options,\n";
+                $fmod_options_array[$line_module_name] = translate('LBL_LINE_ITEMS', 'AOS_Quotes').' : '.translate('LBL_MODULE_NAME', 'AOS_Products');
+                $insert_fields_js2 .= "'$line_module_name':$options,\n";
 
                 //Services
                 $options_array = array(''=>'');
-                $options_array['$aos_services_quotes_name'] = translate('LBL_SERVICE_NAME','AOS_Quotes');
-                $options_array['$aos_services_quotes_number'] = translate('LBL_LIST_NUM','AOS_Products_Quotes');
-                $options_array['$aos_services_quotes_service_list_price'] = translate('LBL_SERVICE_LIST_PRICE','AOS_Quotes');
-                $options_array['$aos_services_quotes_service_discount'] = translate('LBL_SERVICE_DISCOUNT','AOS_Quotes');
-                $options_array['$aos_services_quotes_service_unit_price'] = translate('LBL_SERVICE_PRICE','AOS_Quotes');
-                $options_array['$aos_services_quotes_vat_amt'] = translate('LBL_VAT_AMT','AOS_Quotes');
-                $options_array['$aos_services_quotes_vat'] = translate('LBL_VAT','AOS_Quotes');
-                $options_array['$aos_services_quotes_service_total_price'] = translate('LBL_TOTAL_PRICE','AOS_Quotes');
+                $options_array['$aos_services_quotes_name'] = translate('LBL_SERVICE_NAME', 'AOS_Quotes');
+                $options_array['$aos_services_quotes_number'] = translate('LBL_LIST_NUM', 'AOS_Products_Quotes');
+                $options_array['$aos_services_quotes_service_list_price'] = translate('LBL_SERVICE_LIST_PRICE', 'AOS_Quotes');
+                $options_array['$aos_services_quotes_service_discount'] = translate('LBL_SERVICE_DISCOUNT', 'AOS_Quotes');
+                $options_array['$aos_services_quotes_service_unit_price'] = translate('LBL_SERVICE_PRICE', 'AOS_Quotes');
+                $options_array['$aos_services_quotes_vat_amt'] = translate('LBL_VAT_AMT', 'AOS_Quotes');
+                $options_array['$aos_services_quotes_vat'] = translate('LBL_VAT', 'AOS_Quotes');
+                $options_array['$aos_services_quotes_service_total_price'] = translate('LBL_TOTAL_PRICE', 'AOS_Quotes');
 
                 $options = json_encode($options_array);
 
                 $s_line_module_name = 'AOS_Service_Quotes';
-                $fmod_options_array[$s_line_module_name] = translate('LBL_LINE_ITEMS','AOS_Quotes').' : '.translate('LBL_SERVICE_MODULE_NAME','AOS_Products_Quotes');
-                $insert_fields_js2 .="'$s_line_module_name':$options,\n";
+                $fmod_options_array[$s_line_module_name] = translate('LBL_LINE_ITEMS', 'AOS_Quotes').' : '.translate('LBL_SERVICE_MODULE_NAME', 'AOS_Products_Quotes');
+                $insert_fields_js2 .= "'$s_line_module_name':$options,\n";
 
 
                 $options_array = array(''=>'');
                 $currencies = new currency();
-                foreach($currencies->field_defs as $name => $arr){
-                    if(!((isset($arr['dbType']) && strtolower($arr['dbType']) == 'id') || $arr['type'] == 'id' || $arr['type'] == 'link' || $arr['type'] == 'bool' || $arr['type'] == 'datetime' || (isset($arr['link_type']) && $arr['link_type'] == 'relationship_info'))){
-                        if(isset($arr['vname']) && $arr['vname'] != 'LBL_DELETED' && $arr['vname'] != 'LBL_CURRENCIES_HASH' && $arr['vname'] != 'LBL_LIST_ACCEPT_STATUS' && $arr['vname'] != 'LBL_AUTHENTICATE_ID' && $arr['vname'] != 'LBL_MODIFIED_BY' && $arr['name'] != 'created_by_name'){
-                            $options_array['$currencies_'.$name] = translate($arr['vname'],'Currencies');
+                foreach ($currencies->field_defs as $name => $arr) {
+                    if (!((isset($arr['dbType']) && strtolower($arr['dbType']) == 'id') || $arr['type'] == 'id' || $arr['type'] == 'link' || $arr['type'] == 'bool' || $arr['type'] == 'datetime' || (isset($arr['link_type']) && $arr['link_type'] == 'relationship_info'))) {
+                        if (isset($arr['vname']) && $arr['vname'] != 'LBL_DELETED' && $arr['vname'] != 'LBL_CURRENCIES_HASH' && $arr['vname'] != 'LBL_LIST_ACCEPT_STATUS' && $arr['vname'] != 'LBL_AUTHENTICATE_ID' && $arr['vname'] != 'LBL_MODIFIED_BY' && $arr['name'] != 'created_by_name') {
+                            $options_array['$currencies_'.$name] = translate($arr['vname'], 'Currencies');
                         }
                     }
                 }
                 $options = json_encode($options_array);
 
                 $line_module_name = $beanList['Currencies'];
-                $fmod_options_array[$line_module_name] = translate('LBL_MODULE_NAME','Currencies').' : '.translate('LBL_MODULE_NAME','Currencies');
-                $insert_fields_js2 .="'$line_module_name':$options,\n";
+                $fmod_options_array[$line_module_name] = translate('LBL_MODULE_NAME', 'Currencies').' : '.translate('LBL_MODULE_NAME', 'Currencies');
+                $insert_fields_js2 .= "'$line_module_name':$options,\n";
 
             }
             array_multisort($fmod_options_array, SORT_ASC, $fmod_options_array);
@@ -208,17 +208,17 @@  discard block
 block discarded – undo
             $module_options = json_encode($mod_options_array);
 
 
-            $insert_fields_js .="'$moduleName':$module_options,\n";
-            $moduleOptions[$moduleName] = array("module" => $module_options,"option" => $firstOptions);
+            $insert_fields_js .= "'$moduleName':$module_options,\n";
+            $moduleOptions[$moduleName] = array("module" => $module_options, "option" => $firstOptions);
         } //End loop.
 
         //Sets options to original options on load.
         $insert_fields_js .= "} ;</script>";
         $insert_fields_js2 .= "} ;</script>";
         //echo $this->bean->type;
-        if($this->bean->type=='') {
+        if ($this->bean->type == '') {
             $type = key($app_list_strings['pdf_template_type_dom']);
-        }else{
+        } else {
             $type = $this->bean->type;
         }
 
@@ -241,17 +241,17 @@  discard block
 block discarded – undo
 
 HTML;
 
-        $this->ss->assign('INSERT_FIELDS',$insert_fields);
+        $this->ss->assign('INSERT_FIELDS', $insert_fields);
     }
 
-    function displayTMCE(){
+    function displayTMCE() {
         require_once("include/SugarTinyMCE.php");
         global $locale;
 
         $tiny = new SugarTinyMCE();
         $tinyMCE = $tiny->getConfig();
 
-        $js =<<<JS
+        $js = <<<JS
 		<script language="javascript" type="text/javascript">
 		$tinyMCE
 		var df = '{$locale->getPrecedentPreference('default_date_format')}';

Please login to merge, or discard this patch.

Braces +5 added lines, -4 removed lines patch added patch discarded remove patch

@@ -1,5 +1,7 @@  discard block
 block discarded – undo
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 
 
 require_once('include/Dashlets/Dashlet.php');
@@ -48,8 +50,7 @@  discard block
 block discarded – undo
         $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($id, $def);
@@ -77,7 +78,7 @@  discard block
 block discarded – undo
         if(!empty($this->report->id)) {
             //return $this->report->build_report_chart($this->charts, AOR_Report::CHART_TYPE_CHARTJS);
             return $this->report->build_report_chart($this->charts, AOR_Report::CHART_TYPE_RGRAPH);
-        }else{
+        } else{
             return '';
         }
     }

Please login to merge, or discard this patch.

Dashlets/AOS_PDF_TemplatesDashlet/AOS_PDF_TemplatesDashlet.php 2 patches

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /**
  * Products, Quotations & Invoices modules.
  * Extensions to SugarCRM
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
 
         parent::__construct($id, $def);
 
-        if(empty($def['title'])) $this->title = translate('LBL_HOMEPAGE_TITLE', 'AOS_PDF_Templates');
+        if (empty($def['title'])) $this->title = translate('LBL_HOMEPAGE_TITLE', 'AOS_PDF_Templates');
 
         $this->searchFields = $dashletData['AOS_PDF_TemplatesDashlet']['searchFields'];
         $this->columns = $dashletData['AOS_PDF_TemplatesDashlet']['columns'];
@@ -54,9 +54,9 @@  discard block
 block discarded – undo
     /**
      * @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 AOS_PDF_TemplatesDashlet($id, $def = null){
+    function AOS_PDF_TemplatesDashlet($id, $def = null) {
         $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 {

Please login to merge, or discard this patch.

Braces +7 added lines, -4 removed lines patch added patch discarded remove patch

@@ -1,5 +1,7 @@  discard block
 block discarded – undo
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /**
  * Products, Quotations & Invoices modules.
  * Extensions to SugarCRM
@@ -43,7 +45,9 @@  discard block
 block discarded – undo
 
         parent::__construct($id, $def);
 
-        if(empty($def['title'])) $this->title = translate('LBL_HOMEPAGE_TITLE', 'AOS_PDF_Templates');
+        if(empty($def['title'])) {
+            $this->title = translate('LBL_HOMEPAGE_TITLE', 'AOS_PDF_Templates');
+        }
 
         $this->searchFields = $dashletData['AOS_PDF_TemplatesDashlet']['searchFields'];
         $this->columns = $dashletData['AOS_PDF_TemplatesDashlet']['columns'];
@@ -58,8 +62,7 @@  discard block
 block discarded – undo
         $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($id, $def);

Please login to merge, or discard this patch.

modules/Groups/Group.php 2 patches

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?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.
@@ -43,8 +43,8 @@  discard block
 block discarded – undo
 
 class Group extends User {
 	// User attribute overrides
-	var $status			= 'Group';
-	var $password		= ''; // to disallow logins
+	var $status = 'Group';
+	var $password = ''; // to disallow logins
 	var $default_team;
 	var $importable = false;
 
@@ -56,9 +56,9 @@  discard block
 block discarded – undo
     /**
      * @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 Group(){
+    function Group() {
         $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 {
@@ -80,11 +80,11 @@  discard block
 block discarded – undo
 		$query = "SELECT users.*";
 		$query .= " FROM users ";
 		$where_auto = " users.deleted = 0";
-		if($where != "")
-			$query .= " WHERE $where AND " . $where_auto;
+		if ($where != "")
+			$query .= " WHERE $where AND ".$where_auto;
 		else
-			$query .= " WHERE " . $where_auto;
-		if($order_by != "")
+			$query .= " WHERE ".$where_auto;
+		if ($order_by != "")
 			$query .= " ORDER BY $order_by";
 		else
 			$query .= " ORDER BY users.user_name";

Please login to merge, or discard this patch.

Braces +14 added lines, -11 removed lines patch added patch discarded remove patch

@@ -1,5 +1,7 @@  discard block
 block discarded – undo
 <?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.
@@ -60,8 +62,7 @@  discard block
 block discarded – undo
         $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();
@@ -80,14 +81,16 @@  discard block
 block discarded – undo
 		$query = "SELECT users.*";
 		$query .= " FROM users ";
 		$where_auto = " users.deleted = 0";
-		if($where != "")
-			$query .= " WHERE $where AND " . $where_auto;
-		else
-			$query .= " WHERE " . $where_auto;
-		if($order_by != "")
-			$query .= " ORDER BY $order_by";
-		else
-			$query .= " ORDER BY users.user_name";
+		if($where != "") {
+					$query .= " WHERE $where AND " . $where_auto;
+		} else {
+					$query .= " WHERE " . $where_auto;
+		}
+		if($order_by != "") {
+					$query .= " ORDER BY $order_by";
+		} else {
+					$query .= " ORDER BY users.user_name";
+		}
 		return $query;
 	}
 

Please login to merge, or discard this patch.

modules/AM_ProjectTemplates/views/view.detail.php 2 patches

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
@@ -25,16 +25,16 @@  discard block
 block discarded – undo
 class AM_ProjectTemplatesViewDetail extends ViewDetail {
 
 
-    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 AM_ProjectTemplatesViewDetail(){
+    function AM_ProjectTemplatesViewDetail() {
         $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 {
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
     }
 
 
-    function display(){
+    function display() {
         global $app_strings, $mod_strings;
         parent::display();
 
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
                                 addToValidate("project_form", "p_name", "name", true,"'.$mod_strings['LBL_PROJECT_NAME'].'" );
                                 addToValidate("project_form", "start_date", "date", false,"'.$mod_strings['LBL_START_DATE'].'" );
                             </script>
-                             <input type="hidden" name="template_id" value="'.$this->bean->id .'" />
+                             <input type="hidden" name="template_id" value="'.$this->bean->id.'" />
                         </fieldset>
                      </form>
                 </p>

Please login to merge, or discard this patch.

Braces +4 added lines, -3 removed lines patch added patch discarded remove patch

@@ -43,7 +43,9 @@  discard block
 block discarded – undo
  * 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 @@  discard block
 block discarded – undo
                 $count++;
             }
             echo '</table>';
-        }
-        else {
+        } else {
             echo $mod_strings['LBL_NO_SUGGESTIONS'];
         }
         die();

Please login to merge, or discard this patch.

Dashlets/AM_ProjectTemplatesDashlet/AM_ProjectTemplatesDashlet.php 2 patches

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?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.
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
 
         parent::__construct($id, $def);
 
-        if(empty($def['title'])) $this->title = translate('LBL_HOMEPAGE_TITLE', 'AM_ProjectTemplates');
+        if (empty($def['title'])) $this->title = translate('LBL_HOMEPAGE_TITLE', 'AM_ProjectTemplates');
 
         $this->searchFields = $dashletData['AM_ProjectTemplatesDashlet']['searchFields'];
         $this->columns = $dashletData['AM_ProjectTemplatesDashlet']['columns'];
@@ -64,9 +64,9 @@  discard block
 block discarded – undo
     /**
      * @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 AM_ProjectTemplatesDashlet($id, $def = null){
+    function AM_ProjectTemplatesDashlet($id, $def = null) {
         $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 {

Please login to merge, or discard this patch.

Braces +7 added lines, -4 removed lines patch added patch discarded remove patch

@@ -1,5 +1,7 @@  discard block
 block discarded – undo
 <?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.
@@ -53,7 +55,9 @@  discard block
 block discarded – undo
 
         parent::__construct($id, $def);
 
-        if(empty($def['title'])) $this->title = translate('LBL_HOMEPAGE_TITLE', 'AM_ProjectTemplates');
+        if(empty($def['title'])) {
+            $this->title = translate('LBL_HOMEPAGE_TITLE', 'AM_ProjectTemplates');
+        }
 
         $this->searchFields = $dashletData['AM_ProjectTemplatesDashlet']['searchFields'];
         $this->columns = $dashletData['AM_ProjectTemplatesDashlet']['columns'];
@@ -68,8 +72,7 @@  discard block
 block discarded – undo
         $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($id, $def);

Please login to merge, or discard this patch.

modules/AOW_Conditions/AOW_Condition.php 2 patches

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -77,9 +77,9 @@  discard block
 block discarded – undo
     /**
      * @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 AOW_Condition(){
+    function AOW_Condition() {
         $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 {
@@ -99,33 +99,33 @@  discard block
 block discarded – undo
 
         require_once('modules/AOW_WorkFlow/aow_utils.php');
 
-        $line_count = count($post_data[$key . 'field']);
+        $line_count = count($post_data[$key.'field']);
         $j = 0;
         for ($i = 0; $i < $line_count; ++$i) {
 
-            if ($post_data[$key . 'deleted'][$i] == 1) {
-                $this->mark_deleted($post_data[$key . 'id'][$i]);
+            if ($post_data[$key.'deleted'][$i] == 1) {
+                $this->mark_deleted($post_data[$key.'id'][$i]);
             } else {
                 $condition = new AOW_Condition();
                 foreach ($this->field_defs as $field_def) {
                     $field_name = $field_def['name'];
-                    if (isset($post_data[$key . $field_name][$i])) {
-                        if (is_array($post_data[$key . $field_name][$i])) {
+                    if (isset($post_data[$key.$field_name][$i])) {
+                        if (is_array($post_data[$key.$field_name][$i])) {
                             if ($field_name == 'module_path') {
-                                $post_data[$key . $field_name][$i] = base64_encode(serialize($post_data[$key . $field_name][$i]));
+                                $post_data[$key.$field_name][$i] = base64_encode(serialize($post_data[$key.$field_name][$i]));
                             } else {
                                 switch ($condition->value_type) {
                                     case 'Date':
-                                        $post_data[$key . $field_name][$i] = base64_encode(serialize($post_data[$key . $field_name][$i]));
+                                        $post_data[$key.$field_name][$i] = base64_encode(serialize($post_data[$key.$field_name][$i]));
                                         break;
                                     default:
-                                        $post_data[$key . $field_name][$i] = encodeMultienumValue($post_data[$key . $field_name][$i]);
+                                        $post_data[$key.$field_name][$i] = encodeMultienumValue($post_data[$key.$field_name][$i]);
                                 }
                             }
-                        } else if ($field_name === 'value' && $post_data[$key . 'value_type'][$i] === 'Value') {
-                            $post_data[$key . $field_name][$i] = fixUpFormatting($_REQUEST['flow_module'], $condition->field, $post_data[$key . $field_name][$i]);
+                        } else if ($field_name === 'value' && $post_data[$key.'value_type'][$i] === 'Value') {
+                            $post_data[$key.$field_name][$i] = fixUpFormatting($_REQUEST['flow_module'], $condition->field, $post_data[$key.$field_name][$i]);
                         }
-                        $condition->$field_name = $post_data[$key . $field_name][$i];
+                        $condition->$field_name = $post_data[$key.$field_name][$i];
                     }
 
                 }

Please login to merge, or discard this patch.

Braces +1 added lines, -2 removed lines patch added patch discarded remove patch

@@ -23,8 +23,7 @@
 block discarded – undo
         $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);

Please login to merge, or discard this patch.

modules/Audit/Popup_picker.php 2 patches

Spacing +16 added lines, -16 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?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.
@@ -72,9 +72,9 @@  discard block
 block discarded – undo
     /**
      * @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 Popup_Picker(){
+    function Popup_Picker() {
         $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 {
@@ -101,8 +101,8 @@  discard block
 block discarded – undo
         global $audit;
         global $current_language;
 
-		$audit_list =  Audit::get_audit_list();
-        $xtpl=new XTemplate ('modules/Audit/Popup_picker.html');
+		$audit_list = Audit::get_audit_list();
+        $xtpl = new XTemplate('modules/Audit/Popup_picker.html');
 
 		$xtpl->assign('MOD', $mod_strings);
 		$xtpl->assign('APP', $app_strings);
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
 		$params[] = translate('LBL_MODULE_NAME', $focus->module_dir);
 		$params[] = $focus->get_summary_text();
 		$params[] = translate('LBL_CHANGE_LOG', 'Audit');
-		echo str_replace('</div>',"<span class='utils'>$titleExtra</span></div>",getClassicModuleTitle($focus->module_dir, $params, false));
+		echo str_replace('</div>', "<span class='utils'>$titleExtra</span></div>", getClassicModuleTitle($focus->module_dir, $params, false));
 
 		$oddRow = true;
 		$audited_fields = $focus->getAuditEnabledFieldDefinitions();
@@ -135,20 +135,20 @@  discard block
 block discarded – undo
 		$start_tag = "<table><tr><td >";
 		$end_tag = "</td></tr></table>";
 
-		if($field_count > 0)
+		if ($field_count > 0)
 		{
 			$index = 0;
-    		foreach($audited_fields as $key=>$value)
+    		foreach ($audited_fields as $key=>$value)
 			{
 				$index++;
 				$vname = '';
-				if(isset($value['vname']))
+				if (isset($value['vname']))
 					$vname = $value['vname'];
-				else if(isset($value['label']))
+				else if (isset($value['label']))
 					$vname = $value['label'];
 				$fields .= str_replace(':', '', translate($vname, $focus->module_dir));
 
-    			if($index < $field_count)
+    			if ($index < $field_count)
     			{
     				$fields .= ", ";
     			}
@@ -161,9 +161,9 @@  discard block
 block discarded – undo
     		echo $start_tag.translate('LBL_AUDITED_FIELDS', 'Audit').$end_tag;
     	}
 
-		foreach($audit_list as $audit)
+		foreach ($audit_list as $audit)
 		{
-			if(empty($audit['before_value_string']) && empty($audit['after_value_string']))
+			if (empty($audit['before_value_string']) && empty($audit['after_value_string']))
 			{
 				$before_value = $audit['before_value_text'];
 				$after_value = $audit['after_value_text'];
@@ -174,9 +174,9 @@  discard block
 block discarded – undo
 			}
 
             // Let's run the audit data through the sugar field system
-            if(isset($audit['data_type'])){
+            if (isset($audit['data_type'])) {
                 require_once('include/SugarFields/SugarFieldHandler.php');
-                $vardef = array('name'=>'audit_field','type'=>$audit['data_type']);
+                $vardef = array('name'=>'audit_field', 'type'=>$audit['data_type']);
                 $field = SugarFieldHandler::getSugarField($audit['data_type']);
                 $before_value = $field->getChangeLogSmarty(array($vardef['name']=>$before_value), $vardef, array(), $vardef['name']);
                 $after_value = $field->getChangeLogSmarty(array($vardef['name']=>$after_value), $vardef, array(), $vardef['name']);
@@ -193,7 +193,7 @@  discard block
 block discarded – undo
 
 			$xtpl->assign("ACTIVITY", $activity_fields);
 
-			if($oddRow)
+			if ($oddRow)
    			{
         		//todo move to themes
 				$xtpl->assign("ROW_COLOR", 'oddListRow');

Please login to merge, or discard this patch.

Braces +12 added lines, -13 removed lines patch added patch discarded remove patch

@@ -1,5 +1,7 @@  discard block
 block discarded – undo
 <?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.
@@ -76,8 +78,7 @@  discard block
 block discarded – undo
         $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();
@@ -142,10 +143,11 @@  discard block
 block discarded – undo
 			{
 				$index++;
 				$vname = '';
-				if(isset($value['vname']))
-					$vname = $value['vname'];
-				else if(isset($value['label']))
-					$vname = $value['label'];
+				if(isset($value['vname'])) {
+									$vname = $value['vname'];
+				} else if(isset($value['label'])) {
+									$vname = $value['label'];
+				}
 				$fields .= str_replace(':', '', translate($vname, $focus->module_dir));
 
     			if($index < $field_count)
@@ -155,8 +157,7 @@  discard block
 block discarded – undo
     		}
 
     		echo $start_tag.translate('LBL_AUDITED_FIELDS', 'Audit').$fields.$end_tag;
-    	}
-    	else
+    	} else
     	{
     		echo $start_tag.translate('LBL_AUDITED_FIELDS', 'Audit').$end_tag;
     	}
@@ -167,8 +168,7 @@  discard block
 block discarded – undo
 			{
 				$before_value = $audit['before_value_text'];
 				$after_value = $audit['after_value_text'];
-            }
-            else {
+            } else {
 				$before_value = $audit['before_value_string'];
 				$after_value = $audit['after_value_string'];
 			}
@@ -198,8 +198,7 @@  discard block
 block discarded – undo
         		//todo move to themes
 				$xtpl->assign("ROW_COLOR", 'oddListRow');
 				$xtpl->assign("BG_COLOR", $odd_bg);
-    		}
-    		else
+    		} else
     		{
         		//todo move to themes
 				$xtpl->assign("ROW_COLOR", 'evenListRow');

Please login to merge, or discard this patch.

		@@ -1,5 +1,5 @@ discard block
		block discarded – undo
1	1	<?php
2		-if(!defined('sugarEntry') \|\| !sugarEntry) die('Not A Valid Entry Point');
	2	+if (!defined('sugarEntry') \|\| !sugarEntry) die('Not A Valid Entry Point');
3	3	/*********************************************************************************
4	4	* SugarCRM Community Edition is a customer relationship management program developed by
5	5	* SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
		@@ -56,7 +56,7 @@ discard block
		block discarded – undo
56	56
57	57	parent::__construct($id, $def);
58	58
59		- if(empty($def['title'])) $this->title = translate('LBL_HOMEPAGE_TITLE', 'AOK_KnowledgeBase');
	59	+ if (empty($def['title'])) $this->title = translate('LBL_HOMEPAGE_TITLE', 'AOK_KnowledgeBase');
60	60
61	61	$this->searchFields = $dashletData['AOK_KnowledgeBaseDashlet']['searchFields'];
62	62	$this->columns = $dashletData['AOK_KnowledgeBaseDashlet']['columns'];
		@@ -67,9 +67,9 @@ discard block
		block discarded – undo
67	67	/**
68	68	* @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
69	69	*/
70		- function AOK_KnowledgeBaseDashlet($id, $def = null){
	70	+ function AOK_KnowledgeBaseDashlet($id, $def = null) {
71	71	$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
72		- if(isset($GLOBALS['log'])) {
	72	+ if (isset($GLOBALS['log'])) {
73	73	$GLOBALS['log']->deprecated($deprecatedMessage);
74	74	}
75	75	else {

		@@ -1,5 +1,7 @@ discard block
		block discarded – undo
1	1	<?php
2		-if(!defined('sugarEntry') \|\| !sugarEntry) die('Not A Valid Entry Point');
	2	+if(!defined('sugarEntry') \|\| !sugarEntry) {
	3	+ die('Not A Valid Entry Point');
	4	+}
3	5	/*********************************************************************************
4	6	* SugarCRM Community Edition is a customer relationship management program developed by
5	7	* SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
		@@ -56,7 +58,9 @@ discard block
		block discarded – undo
56	58
57	59	parent::__construct($id, $def);
58	60
59		- if(empty($def['title'])) $this->title = translate('LBL_HOMEPAGE_TITLE', 'AOK_KnowledgeBase');
	61	+ if(empty($def['title'])) {
	62	+ $this->title = translate('LBL_HOMEPAGE_TITLE', 'AOK_KnowledgeBase');
	63	+ }
60	64
61	65	$this->searchFields = $dashletData['AOK_KnowledgeBaseDashlet']['searchFields'];
62	66	$this->columns = $dashletData['AOK_KnowledgeBaseDashlet']['columns'];
		@@ -71,8 +75,7 @@ discard block
		block discarded – undo
71	75	$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
72	76	if(isset($GLOBALS['log'])) {
73	77	$GLOBALS['log']->deprecated($deprecatedMessage);
74		- }
75		- else {
	78	+ } else {
76	79	trigger_error($deprecatedMessage, E_USER_DEPRECATED);
77	80	}
78	81	self::__construct($id, $def);

		@@ -1,19 +1,19 @@ discard block
		block discarded – undo
1	1	<?php
2		-if(!defined('sugarEntry') \|\| !sugarEntry) die('Not A Valid Entry Point');
	2	+if (!defined('sugarEntry') \|\| !sugarEntry) die('Not A Valid Entry Point');
3	3
4	4	require_once('include/MVC/View/views/view.detail.php');
5	5
6	6	class AOS_PDF_TemplatesViewDetail extends ViewDetail {
7		- function __construct(){
	7	+ function __construct() {
8	8	parent::__construct();
9	9	}
10	10
11	11	/**
12	12	* @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
13	13	*/
14		- function AOS_PDF_TemplatesViewDetail(){
	14	+ function AOS_PDF_TemplatesViewDetail() {
15	15	$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
16		- if(isset($GLOBALS['log'])) {
	16	+ if (isset($GLOBALS['log'])) {
17	17	$GLOBALS['log']->deprecated($deprecatedMessage);
18	18	}
19	19	else {
		@@ -23,15 +23,15 @@ discard block
		block discarded – undo
23	23	}
24	24
25	25
26		- function display(){
	26	+ function display() {
27	27	$this->setDecodeHTML();
28	28	parent::display();
29	29	}
30	30
31		- function setDecodeHTML(){
32		- $this->bean->pdfheader = html_entity_decode(str_replace(' ',' ',$this->bean->pdfheader));
33		- $this->bean->description = html_entity_decode(str_replace(' ',' ',$this->bean->description));
34		- $this->bean->pdffooter = html_entity_decode(str_replace(' ',' ',$this->bean->pdffooter));
	31	+ function setDecodeHTML() {
	32	+ $this->bean->pdfheader = html_entity_decode(str_replace(' ', ' ', $this->bean->pdfheader));
	33	+ $this->bean->description = html_entity_decode(str_replace(' ', ' ', $this->bean->description));
	34	+ $this->bean->pdffooter = html_entity_decode(str_replace(' ', ' ', $this->bean->pdffooter));
35	35	}
36	36	}
37	37	?>

		@@ -43,7 +43,9 @@ discard block
		block discarded – undo
43	43	* Date: 06/03/15
44	44	* Comments
45	45	*/
46		-if(!defined('sugarEntry') \|\| !sugarEntry) die('Not A Valid Entry Point');
	46	+if(!defined('sugarEntry') \|\| !sugarEntry) {
	47	+ die('Not A Valid Entry Point');
	48	+}
47	49
48	50	class CasesController extends SugarController {
49	51
		@@ -90,8 +92,7 @@ discard block
		block discarded – undo
90	92	$count++;
91	93	}
92	94	echo '</table>';
93		- }
94		- else {
	95	+ } else {
95	96	echo $mod_strings['LBL_NO_SUGGESTIONS'];
96	97	}
97	98	die();

		@@ -77,9 +77,9 @@ discard block
		block discarded – undo
77	77	/**
78	78	* @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
79	79	*/
80		- function AOW_Condition(){
	80	+ function AOW_Condition() {
81	81	$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
82		- if(isset($GLOBALS['log'])) {
	82	+ if (isset($GLOBALS['log'])) {
83	83	$GLOBALS['log']->deprecated($deprecatedMessage);
84	84	}
85	85	else {
		@@ -99,33 +99,33 @@ discard block
		block discarded – undo
99	99
100	100	require_once('modules/AOW_WorkFlow/aow_utils.php');
101	101
102		- $line_count = count($post_data[$key . 'field']);
	102	+ $line_count = count($post_data[$key.'field']);
103	103	$j = 0;
104	104	for ($i = 0; $i < $line_count; ++$i) {
105	105
106		- if ($post_data[$key . 'deleted'][$i] == 1) {
107		- $this->mark_deleted($post_data[$key . 'id'][$i]);
	106	+ if ($post_data[$key.'deleted'][$i] == 1) {
	107	+ $this->mark_deleted($post_data[$key.'id'][$i]);
108	108	} else {
109	109	$condition = new AOW_Condition();
110	110	foreach ($this->field_defs as $field_def) {
111	111	$field_name = $field_def['name'];
112		- if (isset($post_data[$key . $field_name][$i])) {
113		- if (is_array($post_data[$key . $field_name][$i])) {
	112	+ if (isset($post_data[$key.$field_name][$i])) {
	113	+ if (is_array($post_data[$key.$field_name][$i])) {
114	114	if ($field_name == 'module_path') {
115		- $post_data[$key . $field_name][$i] = base64_encode(serialize($post_data[$key . $field_name][$i]));
	115	+ $post_data[$key.$field_name][$i] = base64_encode(serialize($post_data[$key.$field_name][$i]));
116	116	} else {
117	117	switch ($condition->value_type) {
118	118	case 'Date':
119		- $post_data[$key . $field_name][$i] = base64_encode(serialize($post_data[$key . $field_name][$i]));
	119	+ $post_data[$key.$field_name][$i] = base64_encode(serialize($post_data[$key.$field_name][$i]));
120	120	break;
121	121	default:
122		- $post_data[$key . $field_name][$i] = encodeMultienumValue($post_data[$key . $field_name][$i]);
	122	+ $post_data[$key.$field_name][$i] = encodeMultienumValue($post_data[$key.$field_name][$i]);
123	123	}
124	124	}
125		- } else if ($field_name === 'value' && $post_data[$key . 'value_type'][$i] === 'Value') {
126		- $post_data[$key . $field_name][$i] = fixUpFormatting($_REQUEST['flow_module'], $condition->field, $post_data[$key . $field_name][$i]);
	125	+ } else if ($field_name === 'value' && $post_data[$key.'value_type'][$i] === 'Value') {
	126	+ $post_data[$key.$field_name][$i] = fixUpFormatting($_REQUEST['flow_module'], $condition->field, $post_data[$key.$field_name][$i]);
127	127	}
128		- $condition->$field_name = $post_data[$key . $field_name][$i];
	128	+ $condition->$field_name = $post_data[$key.$field_name][$i];
129	129	}
130	130
131	131	}

		@@ -23,8 +23,7 @@
		block discarded – undo
23	23	$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
24	24	if(isset($GLOBALS['log'])) {
25	25	$GLOBALS['log']->deprecated($deprecatedMessage);
26		- }
27		- else {
	26	+ } else {
28	27	trigger_error($deprecatedMessage, E_USER_DEPRECATED);
29	28	}
30	29	self::__construct($seed, $module, $subPanel, $options);

adamjakab / SuiteCRM

Push — scrutinizer-code-quality ( 09f5a1...c4c5fb )

Status

Category

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Braces +7 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

Braces +4 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +71 added lines, -71 removed lines patch added patch discarded remove patch

Braces +5 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Braces +7 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

Braces +14 added lines, -11 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Braces +4 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Braces +7 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

Braces +1 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +16 added lines, -16 removed lines patch added patch discarded remove patch

Braces +12 added lines, -13 removed lines patch added patch discarded remove patch