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

Completed

Push — develop ( 695bbe )

by Adam

created 2017-09-15 15:02 UTC

Status

Indentation +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -112,17 +112,17 @@
 block discarded – undo
     'LBL_FP_EVENTS_LEADS_1_FROM_LEADS_TITLE' => 'Leads',
     'LBL_FP_EVENTS_PROSPECTS_1_FROM_PROSPECTS_TITLE' => 'Targets',
 
-	'LBL_HOURS_ABBREV' => 'h',
-	'LBL_MINSS_ABBREV' => 'm',
+    'LBL_HOURS_ABBREV' => 'h',
+    'LBL_MINSS_ABBREV' => 'm',
 
-	// Attendance report
-	'LBL_CONTACT_NAME' => 'Name',
-	'LBL_ACCOUNT_NAME' => 'Company',
-	'LBL_SIGNATURE' => 'Signature',
-	// contacts/leads/targets subpanels
-	'LBL_LIST_INVITE_STATUS_EVENT' => 'Invited',
-	'LBL_LIST_ACCEPT_STATUS_EVENT' => 'Status',
+    // Attendance report
+    'LBL_CONTACT_NAME' => 'Name',
+    'LBL_ACCOUNT_NAME' => 'Company',
+    'LBL_SIGNATURE' => 'Signature',
+    // contacts/leads/targets subpanels
+    'LBL_LIST_INVITE_STATUS_EVENT' => 'Invited',
+    'LBL_LIST_ACCEPT_STATUS_EVENT' => 'Status',
 
-	'LBL_ACTIVITY_STATUS' => 'Activity Status',
-	'LBL_FP_EVENT_LOCATIONS_FP_EVENTS_1_FROM_FP_EVENTS_TITLE' => 'Event Locations from Events Title',
+    'LBL_ACTIVITY_STATUS' => 'Activity Status',
+    'LBL_FP_EVENT_LOCATIONS_FP_EVENTS_1_FROM_FP_EVENTS_TITLE' => 'Event Locations from Events Title',
 );

Please login to merge, or discard this patch.

modules/AOR_Conditions/conditionLines.php 2 patches

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

@@ -23,19 +23,19 @@  discard block
 block discarded – undo
  */
 
 
-function display_condition_lines($focus, $field, $value, $view){
+function display_condition_lines($focus, $field, $value, $view) {
 
     global $locale, $app_list_strings, $mod_strings;
 
     $html = '';
 
-    if (!is_file('cache/jsLanguage/AOR_Conditions/' . $GLOBALS['current_language'] . '.js')) {
+    if (!is_file('cache/jsLanguage/AOR_Conditions/'.$GLOBALS['current_language'].'.js')) {
         require_once ('include/language/jsLanguage.php');
         jsLanguage::createModuleStringsCache('AOR_Conditions', $GLOBALS['current_language']);
     }
-    $html .= '<script src="cache/jsLanguage/AOR_Conditions/'. $GLOBALS['current_language'] . '.js"></script>';
+    $html .= '<script src="cache/jsLanguage/AOR_Conditions/'.$GLOBALS['current_language'].'.js"></script>';
 
-    if($view == 'EditView'){
+    if ($view == 'EditView') {
 
         $html .= '<script src="modules/AOR_Conditions/conditionLines.js"></script>';
         $html .= "<table border='0' cellspacing='4' width='100%' id='aor_conditionLines'></table>";
@@ -45,12 +45,12 @@  discard block
 block discarded – undo
         $html .= "</div>";
 
 
-        if(isset($focus->report_module) && $focus->report_module != ''){
+        if (isset($focus->report_module) && $focus->report_module != '') {
             require_once("modules/AOW_WorkFlow/aow_utils.php");
             $html .= "<script>";
             $html .= "report_module = \"".$focus->report_module."\";";
             $html .= "document.getElementById('btn_ConditionLine').disabled = '';";
-            if($focus->id != ''){
+            if ($focus->id != '') {
                 $sql = "SELECT id FROM aor_conditions WHERE aor_report_id = '".$focus->id."' AND deleted = 0 ORDER BY condition_order ASC";
                 $result = $focus->db->query($sql);
 
@@ -58,8 +58,8 @@  discard block
 block discarded – undo
                     $condition_name = new AOR_Condition();
                     $condition_name->retrieve($row['id']);
                     $condition_name->module_path = unserialize(base64_decode($condition_name->module_path));
-                    $html .= "report_fields = \"".trim(preg_replace('/\s+/', ' ', getModuleFields(getRelatedModule($focus->report_module,$condition_name->module_path[0]))))."\";";
-                    if($condition_name->value_type == 'Date'){
+                    $html .= "report_fields = \"".trim(preg_replace('/\s+/', ' ', getModuleFields(getRelatedModule($focus->report_module, $condition_name->module_path[0]))))."\";";
+                    if ($condition_name->value_type == 'Date') {
                         $condition_name->value = unserialize(base64_decode($condition_name->value));
                     }
                     $condition_item = json_encode($condition_name->toArray());
@@ -71,12 +71,12 @@  discard block
 block discarded – undo
         }
 
     }
-    else if($view == 'DetailView'){
+    else if ($view == 'DetailView') {
         $html .= '<script src="modules/AOR_Conditions/conditionLines.js"></script>';
         $html .= "<table border='0' cellspacing='0' width='100%' id='aor_conditionLines'></table>";
 
 
-        if(isset($focus->report_module) && $focus->report_module != ''){
+        if (isset($focus->report_module) && $focus->report_module != '') {
             require_once("modules/AOW_WorkFlow/aow_utils.php");
             $html .= "<script>";
             $html .= "report_fields = \"".trim(preg_replace('/\s+/', ' ', getModuleFields($focus->report_module)))."\";";
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
                 $condition_name = new AOR_Condition();
                 $condition_name->retrieve($row['id']);
                 $condition_name->module_path = unserialize(base64_decode($condition_name->module_path));
-                if($condition_name->value_type == 'Date'){
+                if ($condition_name->value_type == 'Date') {
                     $condition_name->value = unserialize(base64_decode($condition_name->value));
                 }
                 $condition_item = json_encode($condition_name->toArray());

Please login to merge, or discard this patch.

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

@@ -70,8 +70,7 @@
 block discarded – undo
             $html .= "</script>";
         }
 
-    }
-    else if($view == 'DetailView'){
+    } else if($view == 'DetailView'){
         $html .= '<script src="modules/AOR_Conditions/conditionLines.js"></script>';
         $html .= "<table border='0' cellspacing='0' width='100%' id='aor_conditionLines'></table>";
 

Please login to merge, or discard this patch.

modules/AOR_Reports/AOR_Report.php 1 patch

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

@@ -170,7 +170,7 @@  discard block
 block discarded – undo
         foreach ($this->get_linked_beans('aor_fields', 'AOR_Fields') as $field) {
             $fields[] = $field;
         }
-        usort($fields, function ($a, $b) {
+        usort($fields, function($a, $b) {
             return $a->field_order - $b->field_order;
         });
 
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
             return '';
         }
 
-        $sql = "SELECT id FROM aor_fields WHERE aor_report_id = '" . $this->id . "' AND deleted = 0 ORDER BY field_order ASC";
+        $sql = "SELECT id FROM aor_fields WHERE aor_report_id = '".$this->id."' AND deleted = 0 ORDER BY field_order ASC";
         $result = $this->db->query($sql);
 
         $fields = array();
@@ -216,10 +216,10 @@  discard block
 block discarded – undo
                         continue;
                     }
                     $field_module = getRelatedModule($field_module, $rel);
-                    $field_alias = $field_alias . ':' . $rel;
+                    $field_alias = $field_alias.':'.$rel;
                 }
             }
-            $label = str_replace(' ', '_', $field->label) . $i;
+            $label = str_replace(' ', '_', $field->label).$i;
             $fields[$label]['field'] = $field->field;
             $fields[$label]['label'] = $field->label;
             $fields[$label]['display'] = $field->display;
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
         while ($row = $this->db->fetchByAssoc($result, false)) {
             foreach ($fields as $name => $att) {
 
-                $currency_id = isset($row[$att['alias'] . '_currency_id']) ? $row[$att['alias'] . '_currency_id'] : '';
+                $currency_id = isset($row[$att['alias'].'_currency_id']) ? $row[$att['alias'].'_currency_id'] : '';
 
                 if ($att['function'] != 'COUNT' && empty($att['params']) && !is_numeric($row[$name])) {
                     $row[$name] = trim(strip_tags(getModuleField($att['module'], $att['field'], $att['field'],
@@ -299,7 +299,7 @@  discard block
 block discarded – undo
         $rows = $this->getGroupDisplayFieldByReportId($this->id, $level);
 
         if (count($rows) > 1) {
-            $GLOBALS['log']->fatal('ambiguous group display for report ' . $this->id);
+            $GLOBALS['log']->fatal('ambiguous group display for report '.$this->id);
         } else {
             if (count($rows) == 1) {
                 $rows[0]['module_path'] = unserialize(base64_decode($rows[0]['module_path']));
@@ -326,7 +326,7 @@  discard block
 block discarded – undo
                         $html = '';
                         foreach ($path as $pth) {
                             $_fieldIdName = $this->db->quoteIdentifier($pth['field_id_name']);
-                            $query = "SELECT $_fieldIdName FROM " . $this->db->quoteIdentifier($pth['module_path'][0]) . " GROUP BY $_fieldIdName;";
+                            $query = "SELECT $_fieldIdName FROM ".$this->db->quoteIdentifier($pth['module_path'][0])." GROUP BY $_fieldIdName;";
                             $values = $this->dbSelect($query);
 
                             foreach ($values as $value) {
@@ -392,8 +392,8 @@  discard block
 block discarded – undo
     private function getMultiGroupFrameHTML($header, $body)
     {
         $html = '<div class="multi-group-list" style="border: 1px solid black; padding: 10px;">
-                    <h3>' . $header . '</h3>
-                    <div class="multi-group-list-inner">' . $body . '</div>
+                    <h3>' . $header.'</h3>
+                    <div class="multi-group-list-inner">' . $body.'</div>
                 </div>';
 
         return $html;
@@ -402,7 +402,7 @@  discard block
 block discarded – undo
     private function addDataIdValueToInnertext($html)
     {
         preg_match('/\sdata-id-value\s*=\s*"([^"]*)"/', $html, $match);
-        $html = preg_replace('/(>)([^<]*)(<\/\w+>$)/', '$1$2' . $match[1] . '$3', $html);
+        $html = preg_replace('/(>)([^<]*)(<\/\w+>$)/', '$1$2'.$match[1].'$3', $html);
 
         return $html;
     }
@@ -417,11 +417,11 @@  discard block
 block discarded – undo
         $query_array = array();
         $module = new $beanList[$this->report_module]();
 
-        $sql = "SELECT id FROM aor_fields WHERE aor_report_id = '" . $this->id . "' AND group_display = 1 AND deleted = 0 ORDER BY field_order ASC";
+        $sql = "SELECT id FROM aor_fields WHERE aor_report_id = '".$this->id."' AND group_display = 1 AND deleted = 0 ORDER BY field_order ASC";
         $field_id = $this->db->getOne($sql);
 
         if (!$field_id) {
-            $query_array['select'][] = $module->table_name . ".id AS '" . $module->table_name . "_id'";
+            $query_array['select'][] = $module->table_name.".id AS '".$module->table_name."_id'";
         }
 
         if ($field_id != '') {
@@ -438,7 +438,7 @@  discard block
 block discarded – undo
                 foreach ($path as $rel) {
                     $new_field_module = new $beanList[getRelatedModule($field_module->module_dir, $rel)];
                     $oldAlias = $table_alias;
-                    $table_alias = $table_alias . ":" . $rel;
+                    $table_alias = $table_alias.":".$rel;
 
                     $query_array = $this->build_report_query_join($rel, $table_alias, $oldAlias, $field_module,
                         'relationship', $query_array, $new_field_module);
@@ -456,23 +456,23 @@  discard block
 block discarded – undo
                     '_USD') && isset($field_module->field_defs['currency_id'])
             ) {
                 if ((isset($field_module->field_defs['currency_id']['source']) && $field_module->field_defs['currency_id']['source'] == 'custom_fields')) {
-                    $query['select'][$table_alias . '_currency_id'] = $table_alias . '_cstm' . ".currency_id AS '" . $table_alias . "_currency_id'";
+                    $query['select'][$table_alias.'_currency_id'] = $table_alias.'_cstm'.".currency_id AS '".$table_alias."_currency_id'";
                 } else {
-                    $query_array['select'][$table_alias . '_currency_id'] = $table_alias . ".currency_id AS '" . $table_alias . "_currency_id'";
+                    $query_array['select'][$table_alias.'_currency_id'] = $table_alias.".currency_id AS '".$table_alias."_currency_id'";
                 }
             }
 
             if ((isset($data['source']) && $data['source'] == 'custom_fields')) {
-                $select_field = $this->db->quoteIdentifier($table_alias . '_cstm') . '.' . $field->field;
+                $select_field = $this->db->quoteIdentifier($table_alias.'_cstm').'.'.$field->field;
                 // Fix for #1251 - added a missing parameter to the function call
-                $query_array = $this->build_report_query_join($table_alias . '_cstm', $table_alias . '_cstm',
+                $query_array = $this->build_report_query_join($table_alias.'_cstm', $table_alias.'_cstm',
                     $table_alias, $field_module, 'custom', $query);
             } else {
-                $select_field = $this->db->quoteIdentifier($table_alias) . '.' . $field->field;
+                $select_field = $this->db->quoteIdentifier($table_alias).'.'.$field->field;
             }
 
             if ($field->sort_by != '') {
-                $query_array['sort_by'][] = $field_label . ' ' . $field->sort_by;
+                $query_array['sort_by'][] = $field_label.' '.$field->sort_by;
             }
 
             if ($field->format && in_array($data['type'], array('date', 'datetime', 'datetimecombo'))) {
@@ -484,35 +484,35 @@  discard block
 block discarded – undo
             }
 
             if ($field->field_function != null) {
-                $select_field = $field->field_function . '(' . $select_field . ')';
+                $select_field = $field->field_function.'('.$select_field.')';
             }
 
             if ($field->group_by == 1) {
                 $query_array['group_by'][] = $select_field;
             }
 
-            $query_array['select'][] = $select_field . " AS '" . $field_label . "'";
+            $query_array['select'][] = $select_field." AS '".$field_label."'";
             if (isset($extra['select']) && $extra['select']) {
                 foreach ($extra['select'] as $selectField => $selectAlias) {
                     if ($selectAlias) {
-                        $query_array['select'][] = $selectField . " AS " . $selectAlias;
+                        $query_array['select'][] = $selectField." AS ".$selectAlias;
                     } else {
                         $query_array['select'][] = $selectField;
                     }
                 }
             }
-            $query_array['where'][] = $select_field . " IS NOT NULL AND ";
+            $query_array['where'][] = $select_field." IS NOT NULL AND ";
             if (isset($extra['where']) && $extra['where']) {
-                $query_array['where'][] = implode(' AND ', $extra['where']) . ' AND ';
+                $query_array['where'][] = implode(' AND ', $extra['where']).' AND ';
             }
 
             $query_array = $this->build_report_query_where($query_array);
 
             foreach ($query_array['select'] as $select) {
-                $query .= ($query == '' ? 'SELECT ' : ', ') . $select;
+                $query .= ($query == '' ? 'SELECT ' : ', ').$select;
             }
 
-            $query .= ' FROM ' . $module->table_name . ' ';
+            $query .= ' FROM '.$module->table_name.' ';
 
             if (isset($query_array['join'])) {
                 foreach ($query_array['join'] as $join) {
@@ -522,28 +522,28 @@  discard block
 block discarded – undo
             if (isset($query_array['where'])) {
                 $query_where = '';
                 foreach ($query_array['where'] as $where) {
-                    $query_where .= ($query_where == '' ? 'WHERE ' : ' ') . $where;
+                    $query_where .= ($query_where == '' ? 'WHERE ' : ' ').$where;
                 }
 
                 $query_where = $this->queryWhereRepair($query_where);
 
-                $query .= ' ' . $query_where;
+                $query .= ' '.$query_where;
             }
 
             if (isset($query_array['group_by'])) {
                 $query_group_by = '';
                 foreach ($query_array['group_by'] as $group_by) {
-                    $query_group_by .= ($query_group_by == '' ? 'GROUP BY ' : ', ') . $group_by;
+                    $query_group_by .= ($query_group_by == '' ? 'GROUP BY ' : ', ').$group_by;
                 }
-                $query .= ' ' . $query_group_by;
+                $query .= ' '.$query_group_by;
             }
 
             if (isset($query_array['sort_by'])) {
                 $query_sort_by = '';
                 foreach ($query_array['sort_by'] as $sort_by) {
-                    $query_sort_by .= ($query_sort_by == '' ? 'ORDER BY ' : ', ') . $sort_by;
+                    $query_sort_by .= ($query_sort_by == '' ? 'ORDER BY ' : ', ').$sort_by;
                 }
-                $query .= ' ' . $query_sort_by;
+                $query .= ' '.$query_sort_by;
             }
             $result = $this->db->query($query);
 
@@ -584,7 +584,7 @@  discard block
 block discarded – undo
 
         $total_rows = 0;
         $count_sql = explode('ORDER BY', $report_sql);
-        $count_query = 'SELECT count(*) c FROM (' . $count_sql[0] . ') as n';
+        $count_query = 'SELECT count(*) c FROM ('.$count_sql[0].') as n';
 
         // We have a count query.  Run it and get the results.
         $result = $this->db->query($count_query);
@@ -593,7 +593,7 @@  discard block
 block discarded – undo
             $total_rows = $assoc['c'];
         }
 
-        $html = "<table class='list aor_reports' id='report_table_" . $tableIdentifier . "' width='100%' cellspacing='0' cellpadding='0' border='0' repeat_header='1'>";
+        $html = "<table class='list aor_reports' id='report_table_".$tableIdentifier."' width='100%' cellspacing='0' cellpadding='0' border='0' repeat_header='1'>";
 
         if ($offset >= 0) {
             $start = 0;
@@ -627,33 +627,33 @@  discard block
 block discarded – undo
 
             if ($offset == 0) {
                 $html .= "<button type='button' id='listViewStartButton_top' name='listViewStartButton' title='Start' class='button' disabled='disabled'>
-                    <img src='" . SugarThemeRegistry::current()->getImageURL('start_off.gif') . "' alt='Start' align='absmiddle' border='0'>
+                    <img src='" . SugarThemeRegistry::current()->getImageURL('start_off.gif')."' alt='Start' align='absmiddle' border='0'>
                 </button>
                 <button type='button' id='listViewPrevButton_top' name='listViewPrevButton' class='button' title='Previous' disabled='disabled'>
-                    <img src='" . SugarThemeRegistry::current()->getImageURL('previous_off.gif') . "' alt='Previous' align='absmiddle' border='0'>
+                    <img src='" . SugarThemeRegistry::current()->getImageURL('previous_off.gif')."' alt='Previous' align='absmiddle' border='0'>
                 </button>";
             } else {
-                $html .= "<button type='button' id='listViewStartButton_top' name='listViewStartButton' title='Start' class='button' onclick='changeReportPage(\"" . $this->id . "\",0,\"" . $group_value . "\",\"" . $tableIdentifier . "\")'>
-                    <img src='" . SugarThemeRegistry::current()->getImageURL('start.gif') . "' alt='Start' align='absmiddle' border='0'>
+                $html .= "<button type='button' id='listViewStartButton_top' name='listViewStartButton' title='Start' class='button' onclick='changeReportPage(\"".$this->id."\",0,\"".$group_value."\",\"".$tableIdentifier."\")'>
+                    <img src='" . SugarThemeRegistry::current()->getImageURL('start.gif')."' alt='Start' align='absmiddle' border='0'>
                 </button>
-                <button type='button' id='listViewPrevButton_top' name='listViewPrevButton' class='button' title='Previous' onclick='changeReportPage(\"" . $this->id . "\"," . $previous_offset . ",\"" . $group_value . "\",\"" . $tableIdentifier . "\")'>
-                    <img src='" . SugarThemeRegistry::current()->getImageURL('previous.gif') . "' alt='Previous' align='absmiddle' border='0'>
+                <button type='button' id='listViewPrevButton_top' name='listViewPrevButton' class='button' title='Previous' onclick='changeReportPage(\"" . $this->id."\",".$previous_offset.",\"".$group_value."\",\"".$tableIdentifier."\")'>
+                    <img src='" . SugarThemeRegistry::current()->getImageURL('previous.gif')."' alt='Previous' align='absmiddle' border='0'>
                 </button>";
             }
-            $html .= " <span class='pageNumbers'>(" . $start . " - " . $end . " of " . $total_rows . ")</span>";
+            $html .= " <span class='pageNumbers'>(".$start." - ".$end." of ".$total_rows.")</span>";
             if ($next_offset < $total_rows) {
-                $html .= "<button type='button' id='listViewNextButton_top' name='listViewNextButton' title='Next' class='button' onclick='changeReportPage(\"" . $this->id . "\"," . $next_offset . ",\"" . $group_value . "\",\"" . $tableIdentifier . "\")'>
-                        <img src='" . SugarThemeRegistry::current()->getImageURL('next.gif') . "' alt='Next' align='absmiddle' border='0'>
+                $html .= "<button type='button' id='listViewNextButton_top' name='listViewNextButton' title='Next' class='button' onclick='changeReportPage(\"".$this->id."\",".$next_offset.",\"".$group_value."\",\"".$tableIdentifier."\")'>
+                        <img src='" . SugarThemeRegistry::current()->getImageURL('next.gif')."' alt='Next' align='absmiddle' border='0'>
                     </button>
-                     <button type='button' id='listViewEndButton_top' name='listViewEndButton' title='End' class='button' onclick='changeReportPage(\"" . $this->id . "\"," . $last_offset . ",\"" . $group_value . "\",\"" . $tableIdentifier . "\")'>
-                        <img src='" . SugarThemeRegistry::current()->getImageURL('end.gif') . "' alt='End' align='absmiddle' border='0'>
+                     <button type='button' id='listViewEndButton_top' name='listViewEndButton' title='End' class='button' onclick='changeReportPage(\"" . $this->id."\",".$last_offset.",\"".$group_value."\",\"".$tableIdentifier."\")'>
+                        <img src='" . SugarThemeRegistry::current()->getImageURL('end.gif')."' alt='End' align='absmiddle' border='0'>
                     </button>";
             } else {
                 $html .= "<button type='button' id='listViewNextButton_top' name='listViewNextButton' title='Next' class='button'  disabled='disabled'>
-                        <img src='" . SugarThemeRegistry::current()->getImageURL('next_off.gif') . "' alt='Next' align='absmiddle' border='0'>
+                        <img src='" . SugarThemeRegistry::current()->getImageURL('next_off.gif')."' alt='Next' align='absmiddle' border='0'>
                     </button>
                      <button type='button' id='listViewEndButton_top$dashletPaginationButtons' name='listViewEndButton' title='End' class='button'  disabled='disabled'>
-                        <img src='" . SugarThemeRegistry::current()->getImageURL('end_off.gif') . "' alt='End' align='absmiddle' border='0'>
+                        <img src='".SugarThemeRegistry::current()->getImageURL('end_off.gif')."' alt='End' align='absmiddle' border='0'>
                     </button>";
 
             }
@@ -667,10 +667,10 @@  discard block
 block discarded – undo
 
             $moduleFieldByGroupValue = $this->getModuleFieldByGroupValue($beanList, $group_value);
 
-            $html = "<H3>$moduleFieldByGroupValue</H3>" . $html;
+            $html = "<H3>$moduleFieldByGroupValue</H3>".$html;
         }
 
-        $sql = "SELECT id FROM aor_fields WHERE aor_report_id = '" . $this->id . "' AND deleted = 0 ORDER BY field_order ASC";
+        $sql = "SELECT id FROM aor_fields WHERE aor_report_id = '".$this->id."' AND deleted = 0 ORDER BY field_order ASC";
         $result = $this->db->query($sql);
 
         $html .= "<thead>";
@@ -695,10 +695,10 @@  discard block
 block discarded – undo
                         continue;
                     }
                     $field_module = getRelatedModule($field_module, $rel);
-                    $field_alias = $field_alias . ':' . $rel;
+                    $field_alias = $field_alias.':'.$rel;
                 }
             }
-            $label = str_replace(' ', '_', $field->label) . $i;
+            $label = str_replace(' ', '_', $field->label).$i;
             $fields[$label]['field'] = $field->field;
             $fields[$label]['label'] = $field->label;
             $fields[$label]['display'] = $field->display;
@@ -735,16 +735,16 @@  discard block
 block discarded – undo
 
         $totals = array();
         while ($row = $this->db->fetchByAssoc($result)) {
-            $html .= "<tr class='" . $row_class . "' height='20'>";
+            $html .= "<tr class='".$row_class."' height='20'>";
 
             foreach ($fields as $name => $att) {
                 if ($att['display']) {
                     $html .= "<td class='' valign='top' align='left'>";
                     if ($att['link'] && $links) {
-                        $html .= "<a href='" . $sugar_config['site_url'] . "/index.php?module=" . $att['module'] . "&action=DetailView&record=" . $row[$att['alias'] . '_id'] . "'>";
+                        $html .= "<a href='".$sugar_config['site_url']."/index.php?module=".$att['module']."&action=DetailView&record=".$row[$att['alias'].'_id']."'>";
                     }
 
-                    $currency_id = isset($row[$att['alias'] . '_currency_id']) ? $row[$att['alias'] . '_currency_id'] : '';
+                    $currency_id = isset($row[$att['alias'].'_currency_id']) ? $row[$att['alias'].'_currency_id'] : '';
 
                     if ($att['function'] == 'COUNT' || !empty($att['params'])) {
                         $html .= $row[$name];
@@ -799,7 +799,7 @@  discard block
 block discarded – undo
     {
         $moduleFieldByGroupValues = array();
 
-        $sql = "SELECT id FROM aor_fields WHERE aor_report_id = '" . $this->id . "' AND group_display = 1 AND deleted = 0 ORDER BY field_order ASC";
+        $sql = "SELECT id FROM aor_fields WHERE aor_report_id = '".$this->id."' AND group_display = 1 AND deleted = 0 ORDER BY field_order ASC";
         $result = $this->db->limitQuery($sql, 0, 1);
         while ($row = $this->db->fetchByAssoc($result)) {
 
@@ -823,11 +823,11 @@  discard block
 block discarded – undo
                         continue;
                     }
                     $field_module = getRelatedModule($field_module, $rel);
-                    $field_alias = $field_alias . ':' . $rel;
+                    $field_alias = $field_alias.':'.$rel;
                 }
             }
 
-            $currency_id = isset($row[$field_alias . '_currency_id']) ? $row[$field_alias . '_currency_id'] : '';
+            $currency_id = isset($row[$field_alias.'_currency_id']) ? $row[$field_alias.'_currency_id'] : '';
             $moduleFieldByGroupValues[] = getModuleField($this->report_module, $field->field, $field->field,
                 'DetailView', $group_value, '', $currency_id);
 
@@ -853,7 +853,7 @@  discard block
 block discarded – undo
                 continue;
             }
             if ($field['total']) {
-                $totalLabel = $field['label'] . " " . $app_list_strings['aor_total_options'][$field['total']];
+                $totalLabel = $field['label']." ".$app_list_strings['aor_total_options'][$field['total']];
                 $html .= "<th>{$totalLabel}</th>";
             } else {
                 $html .= "<th></th>";
@@ -879,9 +879,9 @@  discard block
 block discarded – undo
                             case 'SUM':
                             case 'AVG':
                                 if ($currency->id == -99) {
-                                    $total = $currency->symbol . format_number($total, null, null);
+                                    $total = $currency->symbol.format_number($total, null, null);
                                 } else {
-                                    $total = $currency->symbol . format_number($total, null, null,
+                                    $total = $currency->symbol.format_number($total, null, null,
                                             array('convert' => true));
                                 }
                                 break;
@@ -893,7 +893,7 @@  discard block
 block discarded – undo
                     default:
                         break;
                 }
-                $html .= "<td>" . $total . "</td>";
+                $html .= "<td>".$total."</td>";
             } else {
                 $html .= "<td></td>";
             }
@@ -920,7 +920,7 @@  discard block
 block discarded – undo
 
     private function encloseForCSV($field)
     {
-        return '"' . $field . '"';
+        return '"'.$field.'"';
     }
 
     function build_report_csv()
@@ -935,7 +935,7 @@  discard block
 block discarded – undo
         $csv = '';
         //text/comma-separated-values
 
-        $sql = "SELECT id FROM aor_fields WHERE aor_report_id = '" . $this->id . "' AND deleted = 0 ORDER BY field_order ASC";
+        $sql = "SELECT id FROM aor_fields WHERE aor_report_id = '".$this->id."' AND deleted = 0 ORDER BY field_order ASC";
         $result = $this->db->query($sql);
 
         $fields = array();
@@ -956,10 +956,10 @@  discard block
 block discarded – undo
                         continue;
                     }
                     $field_module = getRelatedModule($field_module, $rel);
-                    $field_alias = $field_alias . ':' . $rel;
+                    $field_alias = $field_alias.':'.$rel;
                 }
             }
-            $label = str_replace(' ', '_', $field->label) . $i;
+            $label = str_replace(' ', '_', $field->label).$i;
             $fields[$label]['field'] = $field->field;
             $fields[$label]['display'] = $field->display;
             $fields[$label]['function'] = $field->field_function;
@@ -980,7 +980,7 @@  discard block
 block discarded – undo
         while ($row = $this->db->fetchByAssoc($result)) {
             $csv .= "\r\n";
             foreach ($fields as $name => $att) {
-                $currency_id = isset($row[$att['alias'] . '_currency_id']) ? $row[$att['alias'] . '_currency_id'] : '';
+                $currency_id = isset($row[$att['alias'].'_currency_id']) ? $row[$att['alias'].'_currency_id'] : '';
                 if ($att['display']) {
                     if ($att['function'] != '' || $att['params'] != '') {
                         $csv .= $this->encloseForCSV($row[$name]);
@@ -997,15 +997,15 @@  discard block
 block discarded – undo
 
         ob_clean();
         header("Pragma: cache");
-        header("Content-type: text/comma-separated-values; charset=" . $GLOBALS['locale']->getExportCharset());
+        header("Content-type: text/comma-separated-values; charset=".$GLOBALS['locale']->getExportCharset());
         header("Content-Disposition: attachment; filename=\"{$this->name}.csv\"");
         header("Content-transfer-encoding: binary");
         header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-        header("Last-Modified: " . TimeDate::httpTime());
+        header("Last-Modified: ".TimeDate::httpTime());
         header("Cache-Control: post-check=0, pre-check=0", false);
-        header("Content-Length: " . mb_strlen($csv, '8bit'));
+        header("Content-Length: ".mb_strlen($csv, '8bit'));
         if (!empty($sugar_config['export_excel_compatible'])) {
-            $csv = chr(255) . chr(254) . mb_convert_encoding($csv, 'UTF-16LE', 'UTF-8');
+            $csv = chr(255).chr(254).mb_convert_encoding($csv, 'UTF-16LE', 'UTF-8');
         }
         print $csv;
 
@@ -1029,21 +1029,21 @@  discard block
 block discarded – undo
 
         $query_array = $this->build_report_query_select($query_array, $group_value);
         if (isset($extra['where']) && $extra['where']) {
-            $query_array['where'][] = implode(' AND ', $extra['where']) . ' AND ';
+            $query_array['where'][] = implode(' AND ', $extra['where']).' AND ';
         }
         $query_array = $this->build_report_query_where($query_array);
 
         foreach ($query_array['select'] as $select) {
-            $query .= ($query == '' ? 'SELECT ' : ', ') . $select;
+            $query .= ($query == '' ? 'SELECT ' : ', ').$select;
         }
 
         if (empty($query_array['group_by'])) {
             foreach ($query_array['id_select'] as $select) {
-                $query .= ', ' . $select;
+                $query .= ', '.$select;
             }
         }
 
-        $query .= ' FROM ' . $this->db->quoteIdentifier($module->table_name) . ' ';
+        $query .= ' FROM '.$this->db->quoteIdentifier($module->table_name).' ';
 
         if (isset($query_array['join'])) {
             foreach ($query_array['join'] as $join) {
@@ -1053,33 +1053,33 @@  discard block
 block discarded – undo
         if (isset($query_array['where'])) {
             $query_where = '';
             foreach ($query_array['where'] as $where) {
-                $query_where .= ($query_where == '' ? 'WHERE ' : ' ') . $where;
+                $query_where .= ($query_where == '' ? 'WHERE ' : ' ').$where;
             }
 
             $query_where = $this->queryWhereRepair($query_where);
 
-            $query .= ' ' . $query_where;
+            $query .= ' '.$query_where;
         }
 
         if (isset($query_array['group_by'])) {
             $query_group_by = '';
             foreach ($query_array['group_by'] as $group_by) {
-                $query_group_by .= ($query_group_by == '' ? 'GROUP BY ' : ', ') . $group_by;
+                $query_group_by .= ($query_group_by == '' ? 'GROUP BY ' : ', ').$group_by;
             }
             if (isset($query_array['second_group_by']) && $query_group_by != '') {
                 foreach ($query_array['second_group_by'] as $group_by) {
-                    $query_group_by .= ', ' . $group_by;
+                    $query_group_by .= ', '.$group_by;
                 }
             }
-            $query .= ' ' . $query_group_by;
+            $query .= ' '.$query_group_by;
         }
 
         if (isset($query_array['sort_by'])) {
             $query_sort_by = '';
             foreach ($query_array['sort_by'] as $sort_by) {
-                $query_sort_by .= ($query_sort_by == '' ? 'ORDER BY ' : ', ') . $sort_by;
+                $query_sort_by .= ($query_sort_by == '' ? 'ORDER BY ' : ', ').$sort_by;
             }
-            $query .= ' ' . $query_sort_by;
+            $query .= ' '.$query_sort_by;
         }
 
         return $query;
@@ -1113,10 +1113,10 @@  discard block
 block discarded – undo
         if ($beanList[$this->report_module]) {
             $module = new $beanList[$this->report_module]();
 
-            $query['id_select'][$module->table_name] = $this->db->quoteIdentifier($module->table_name) . ".id AS '" . $module->table_name . "_id'";
-            $query['id_select_group'][$module->table_name] = $this->db->quoteIdentifier($module->table_name) . ".id";
+            $query['id_select'][$module->table_name] = $this->db->quoteIdentifier($module->table_name).".id AS '".$module->table_name."_id'";
+            $query['id_select_group'][$module->table_name] = $this->db->quoteIdentifier($module->table_name).".id";
 
-            $sql = "SELECT id FROM aor_fields WHERE aor_report_id = '" . $this->id . "' AND deleted = 0 ORDER BY field_order ASC";
+            $sql = "SELECT id FROM aor_fields WHERE aor_report_id = '".$this->id."' AND deleted = 0 ORDER BY field_order ASC";
 
             $result = $this->db->query($sql);
             $i = 0;
@@ -1125,7 +1125,7 @@  discard block
 block discarded – undo
                 $field = new AOR_Field();
                 $field->retrieve($row['id']);
 
-                $field->label = str_replace(' ', '_', $field->label) . $i;
+                $field->label = str_replace(' ', '_', $field->label).$i;
 
                 $path = unserialize(base64_decode($field->module_path));
 
@@ -1136,7 +1136,7 @@  discard block
 block discarded – undo
                     foreach ($path as $rel) {
                         $new_field_module = new $beanList[getRelatedModule($field_module->module_dir, $rel)];
                         $oldAlias = $table_alias;
-                        $table_alias = $table_alias . ":" . $rel;
+                        $table_alias = $table_alias.":".$rel;
                         $query =
                             $this->build_report_query_join(
                                 $rel,
@@ -1173,20 +1173,20 @@  discard block
 block discarded – undo
 
                 if ($data['type'] == 'currency' && isset($field_module->field_defs['currency_id'])) {
                     if ((isset($field_module->field_defs['currency_id']['source']) && $field_module->field_defs['currency_id']['source'] == 'custom_fields')) {
-                        $query['select'][$table_alias . '_currency_id'] = $this->db->quoteIdentifier($table_alias . '_cstm') . ".currency_id AS '" . $table_alias . "_currency_id'";
-                        $query['second_group_by'][] = $this->db->quoteIdentifier($table_alias . '_cstm') . ".currency_id";
+                        $query['select'][$table_alias.'_currency_id'] = $this->db->quoteIdentifier($table_alias.'_cstm').".currency_id AS '".$table_alias."_currency_id'";
+                        $query['second_group_by'][] = $this->db->quoteIdentifier($table_alias.'_cstm').".currency_id";
                     } else {
-                        $query['select'][$table_alias . '_currency_id'] = $this->db->quoteIdentifier($table_alias) . ".currency_id AS '" . $table_alias . "_currency_id'";
-                        $query['second_group_by'][] = $this->db->quoteIdentifier($table_alias) . ".currency_id";
+                        $query['select'][$table_alias.'_currency_id'] = $this->db->quoteIdentifier($table_alias).".currency_id AS '".$table_alias."_currency_id'";
+                        $query['second_group_by'][] = $this->db->quoteIdentifier($table_alias).".currency_id";
                     }
                 }
 
                 if ((isset($data['source']) && $data['source'] == 'custom_fields')) {
-                    $select_field = $this->db->quoteIdentifier($table_alias . '_cstm') . '.' . $field->field;
-                    $query = $this->build_report_query_join($table_alias . '_cstm', $table_alias . '_cstm',
+                    $select_field = $this->db->quoteIdentifier($table_alias.'_cstm').'.'.$field->field;
+                    $query = $this->build_report_query_join($table_alias.'_cstm', $table_alias.'_cstm',
                         $table_alias, $field_module, 'custom', $query);
                 } else {
-                    $select_field = $this->db->quoteIdentifier($table_alias) . '.' . $field->field;
+                    $select_field = $this->db->quoteIdentifier($table_alias).'.'.$field->field;
                 }
 
                 if ($field->format && in_array($data['type'], array('date', 'datetime', 'datetimecombo'))) {
@@ -1206,19 +1206,19 @@  discard block
 block discarded – undo
                 if ($field->group_by == 1) {
                     $query['group_by'][] = $select_field;
                 } elseif ($field->field_function != null) {
-                    $select_field = $field->field_function . '(' . $select_field . ')';
+                    $select_field = $field->field_function.'('.$select_field.')';
                 } else {
                     $query['second_group_by'][] = $select_field;
                 }
 
                 if ($field->sort_by != '') {
-                    $query['sort_by'][] = $select_field . " " . $field->sort_by;
+                    $query['sort_by'][] = $select_field." ".$field->sort_by;
                 }
 
-                $query['select'][] = $select_field . " AS '" . $field->label . "'";
+                $query['select'][] = $select_field." AS '".$field->label."'";
 
                 if ($field->group_display == 1 && $group_value) {
-                    $query['where'][] = $select_field . " = '" . $group_value . "' AND ";
+                    $query['where'][] = $select_field." = '".$group_value."' AND ";
                 }
 
                 ++$i;
@@ -1245,10 +1245,10 @@  discard block
 block discarded – undo
                 case 'custom':
                     $customTable = $module->get_custom_table_name();
                     $query['join'][$alias] =
-                        'LEFT JOIN ' .
-                        $db->quoteIdentifier($customTable) .' '. $db->quoteIdentifier($alias) .
-                        ' ON ' .
-                        $db->quoteIdentifier($parentAlias) . '.id = ' . $db->quoteIdentifier($name) . '.id_c ';
+                        'LEFT JOIN '.
+                        $db->quoteIdentifier($customTable).' '.$db->quoteIdentifier($alias).
+                        ' ON '.
+                        $db->quoteIdentifier($parentAlias).'.id = '.$db->quoteIdentifier($name).'.id_c ';
                     break;
 
                 case 'relationship':
@@ -1270,7 +1270,7 @@  discard block
 block discarded – undo
                             $params['join_table_alias'] = $db->quoteIdentifier($alias);
                             $params['left_join_table_alias'] = $db->quoteIdentifier($parentAlias);
                         }
-                        $linkAlias = $parentAlias . "|" . $alias;
+                        $linkAlias = $parentAlias."|".$alias;
                         $params['join_table_link_alias'] = $db->quoteIdentifier($linkAlias);
                         $join = $module->$name->getJoin($params, true);
                         $query['join'][$alias] = $join['join'];
@@ -1278,7 +1278,7 @@  discard block
 block discarded – undo
                             $query['join'][$alias] .= $this->build_report_access_query($rel_module,
                                 $db->quoteIdentifier($alias));
                         }
-                        $query['id_select'][$alias] = $join['select'] . " AS '" . $alias . "_id'";
+                        $query['id_select'][$alias] = $join['select']." AS '".$alias."_id'";
                         $query['id_select_group'][$alias] = $join['select'];
                     }
                     break;
@@ -1299,7 +1299,7 @@  discard block
 block discarded – undo
         if ($module->bean_implements('ACL') && ACLController::requireOwner($module->module_dir, 'list')) {
             global $current_user;
             $owner_where = $module->getOwnerWhere($current_user->id);
-            $where = ' AND ' . $owner_where;
+            $where = ' AND '.$owner_where;
 
         }
 
@@ -1311,9 +1311,9 @@  discard block
 block discarded – undo
                 $owner_where = $module->getOwnerWhere($current_user->id);
                 $group_where = SecurityGroup::getGroupWhere($alias, $module->module_dir, $current_user->id);
                 if (!empty($owner_where)) {
-                    $where .= " AND (" . $owner_where . " or " . $group_where . ") ";
+                    $where .= " AND (".$owner_where." or ".$group_where.") ";
                 } else {
-                    $where .= ' AND ' . $group_where;
+                    $where .= ' AND '.$group_where;
                 }
             }
             /* END - SECURITY GROUPS */
@@ -1349,7 +1349,7 @@  discard block
 block discarded – undo
         if ($beanList[$this->report_module]) {
             $module = new $beanList[$this->report_module]();
 
-            $sql = "SELECT id FROM aor_conditions WHERE aor_report_id = '" . $this->id . "' AND deleted = 0 ORDER BY condition_order ASC";
+            $sql = "SELECT id FROM aor_conditions WHERE aor_report_id = '".$this->id."' AND deleted = 0 ORDER BY condition_order ASC";
             $result = $this->db->query($sql);
 
             $tiltLogicOp = true;
@@ -1375,7 +1375,7 @@  discard block
 block discarded – undo
                             return false;
                         }
                         $oldAlias = $table_alias;
-                        $table_alias = $table_alias . ":" . $rel;
+                        $table_alias = $table_alias.":".$rel;
                         $query = $this->build_report_query_join($rel, $table_alias, $oldAlias, $condition_module,
                             'relationship', $query, $new_condition_module);
                         $condition_module = $new_condition_module;
@@ -1406,16 +1406,16 @@  discard block
 block discarded – undo
 
                         // Debugging: security groups conditions - It's a hack to just get the query working
                         if ($condition_module->module_dir = 'SecurityGroups' && count($path) > 1) {
-                            $table_alias = $oldAlias . ':' . $rel;
+                            $table_alias = $oldAlias.':'.$rel;
                         }
                         $condition->field = 'id';
                     }
                     if ((isset($data['source']) && $data['source'] == 'custom_fields')) {
-                        $field = $this->db->quoteIdentifier($table_alias . '_cstm') . '.' . $condition->field;
-                        $query = $this->build_report_query_join($table_alias . '_cstm', $table_alias . '_cstm',
+                        $field = $this->db->quoteIdentifier($table_alias.'_cstm').'.'.$condition->field;
+                        $query = $this->build_report_query_join($table_alias.'_cstm', $table_alias.'_cstm',
                             $table_alias, $condition_module, 'custom', $query);
                     } else {
-                        $field = $this->db->quoteIdentifier($table_alias) . '.' . $condition->field;
+                        $field = $this->db->quoteIdentifier($table_alias).'.'.$condition->field;
                     }
 
                     if (!empty($this->user_parameters[$condition->id]) && $condition->parameter) {
@@ -1451,11 +1451,11 @@  discard block
 block discarded – undo
                                 $condition->field = 'id';
                             }
                             if ((isset($data['source']) && $data['source'] == 'custom_fields')) {
-                                $value = $condition_module->table_name . '_cstm.' . $condition->value;
-                                $query = $this->build_report_query_join($condition_module->table_name . '_cstm',
-                                    $table_alias . '_cstm', $table_alias, $condition_module, 'custom', $query);
+                                $value = $condition_module->table_name.'_cstm.'.$condition->value;
+                                $query = $this->build_report_query_join($condition_module->table_name.'_cstm',
+                                    $table_alias.'_cstm', $table_alias, $condition_module, 'custom', $query);
                             } else {
-                                $value = ($table_alias ? $this->db->quoteIdentifier($table_alias) : $condition_module->table_name) . '.' . $condition->value;
+                                $value = ($table_alias ? $this->db->quoteIdentifier($table_alias) : $condition_module->table_name).'.'.$condition->value;
                             }
                             break;
 
@@ -1479,17 +1479,17 @@  discard block
 block discarded – undo
                                         //$field =
                                         $value = 'CAST(GETDATE() AS DATE)';
                                     } else {
-                                        $field = 'DATE(' . $field . ')';
+                                        $field = 'DATE('.$field.')';
                                         $value = 'Curdate()';
                                     }
                                 } else {
                                     $data = $condition_module->field_defs[$params[0]];
                                     if ((isset($data['source']) && $data['source'] == 'custom_fields')) {
-                                        $value = $condition_module->table_name . '_cstm.' . $params[0];
-                                        $query = $this->build_report_query_join($condition_module->table_name . '_cstm',
-                                            $table_alias . '_cstm', $table_alias, $condition_module, 'custom', $query);
+                                        $value = $condition_module->table_name.'_cstm.'.$params[0];
+                                        $query = $this->build_report_query_join($condition_module->table_name.'_cstm',
+                                            $table_alias.'_cstm', $table_alias, $condition_module, 'custom', $query);
                                     } else {
-                                        $value = $condition_module->table_name . '.' . $params[0];
+                                        $value = $condition_module->table_name.'.'.$params[0];
                                     }
                                 }
                             }
@@ -1501,9 +1501,9 @@  discard block
 block discarded – undo
                                         $params[3] = 'hours';
                                     default:
                                         if ($sugar_config['dbconfig']['db_type'] == 'mssql') {
-                                            $value = "DATEADD(" . $params[3] . ",  " . $app_list_strings['aor_date_operator'][$params[1]] . " $params[2], $value)";
+                                            $value = "DATEADD(".$params[3].",  ".$app_list_strings['aor_date_operator'][$params[1]]." $params[2], $value)";
                                         } else {
-                                            $value = "DATE_ADD($value, INTERVAL " . $app_list_strings['aor_date_operator'][$params[1]] . " $params[2] " . $params[3] . ")";
+                                            $value = "DATE_ADD($value, INTERVAL ".$app_list_strings['aor_date_operator'][$params[1]]." $params[2] ".$params[3].")";
                                         }
                                         break;
                                 }
@@ -1522,11 +1522,11 @@  discard block
 block discarded – undo
                                     if ($value != '(') {
                                         $value .= $sep;
                                     }
-                                    $value .= $field . ' ' . $aor_sql_operator_list[$condition->operator] . " '" . $multi_value . "'";
+                                    $value .= $field.' '.$aor_sql_operator_list[$condition->operator]." '".$multi_value."'";
                                 }
                                 $value .= ')';
                             }
-                            $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op . ' ' : 'AND ')) . $value;
+                            $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op.' ' : 'AND ')).$value;
                             $where_set = true;
                             break;
                         case "Period":
@@ -1535,11 +1535,11 @@  discard block
 block discarded – undo
                             } else {
                                 $params = base64_decode($condition->value);
                             }
-                            $value = '"' . getPeriodDate($params)->format('Y-m-d H:i:s') . '"';
+                            $value = '"'.getPeriodDate($params)->format('Y-m-d H:i:s').'"';
                             break;
                         case "CurrentUserID":
                             global $current_user;
-                            $value = '"' . $current_user->id . '"';
+                            $value = '"'.$current_user->id.'"';
                             break;
                         case 'Value':
                             $utc = new DateTimeZone("UTC");
@@ -1548,132 +1548,132 @@  discard block
 block discarded – undo
                             if ($condition->operator === 'Equal_To') {
                                 if ($dateTime !== false) {
                                     $day_ahead = $dateTime->modify('+1 day');
-                                    $equal_query = "( $field  BETWEEN '" . $this->db->quote($condition->value) . "' AND '" . $this->db->quote($day_ahead->format('Y-m-d H:i:s')) . "' ) ";
-                                    $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op . ' ' : 'AND ')) . $equal_query;
+                                    $equal_query = "( $field  BETWEEN '".$this->db->quote($condition->value)."' AND '".$this->db->quote($day_ahead->format('Y-m-d H:i:s'))."' ) ";
+                                    $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op.' ' : 'AND ')).$equal_query;
                                 } elseif ($dateTime === false && $data['type'] === 'datetime') { // check for incorrectly converted dateTime
                                         $dateTime = convertToDateTime($condition->value);
 
                                         $query_date = $dateTime->format('Y-m-d H:i:s');
-                                        $equal_query = "( $field  BETWEEN '" . $this->db->quote($query_date);
+                                        $equal_query = "( $field  BETWEEN '".$this->db->quote($query_date);
                                         $day_ahead = $dateTime->modify('+1 day');
-                                        $equal_query .= "' AND '" . $this->db->quote($day_ahead->format('Y-m-d H:i:s')) . "' ) ";
-                                        $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op . ' ' : 'AND ')) . $equal_query;
+                                        $equal_query .= "' AND '".$this->db->quote($day_ahead->format('Y-m-d H:i:s'))."' ) ";
+                                        $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op.' ' : 'AND ')).$equal_query;
                                     } else {
-                                        $value = "'" . $this->db->quote($condition->value) . "'";
+                                        $value = "'".$this->db->quote($condition->value)."'";
                                         break;
                                     }
                                 $where_set = true;
                             } elseif ($condition->operator === 'Not_Equal_To') {
                                     if ($dateTime !== false) {
                                         $day_ahead = $dateTime->modify('+1 day');
-                                        $not_equal_query = "( $field NOT BETWEEN '" . $this->db->quote($condition->value) . "' AND '" . $this->db->quote($day_ahead->format('Y-m-d H:i:s')) . "' ) ";
-                                        $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op . ' ' : 'AND ')) . $not_equal_query;
+                                        $not_equal_query = "( $field NOT BETWEEN '".$this->db->quote($condition->value)."' AND '".$this->db->quote($day_ahead->format('Y-m-d H:i:s'))."' ) ";
+                                        $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op.' ' : 'AND ')).$not_equal_query;
                                     } elseif ($dateTime === false && $data['type'] === 'datetime') { // check for incorrectly converted dateTime
                                             $dateTime = convertToDateTime($condition->value);
 
                                             $query_date = $dateTime->format('Y-m-d H:i:s');
-                                            $not_equal_query = "( $field NOT BETWEEN '" . $this->db->quote($query_date);
+                                            $not_equal_query = "( $field NOT BETWEEN '".$this->db->quote($query_date);
                                             $day_ahead = $dateTime->modify('+1 day');
-                                            $not_equal_query .= "' AND '" . $this->db->quote($day_ahead->format('Y-m-d H:i:s')) . "' ) ";
-                                            $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op . ' ' : 'AND ')) . $not_equal_query;
+                                            $not_equal_query .= "' AND '".$this->db->quote($day_ahead->format('Y-m-d H:i:s'))."' ) ";
+                                            $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op.' ' : 'AND ')).$not_equal_query;
                                         } else {
-                                            $value = "'" . $this->db->quote($condition->value) . "'";
+                                            $value = "'".$this->db->quote($condition->value)."'";
                                             break;
                                         }
                                     $where_set = true;
                                 } elseif ($condition->operator === 'Greater_Than') {
                                         if ($dateTime !== false) {
-                                            $greater_than_query = "( $field > '" . $this->db->quote($condition->value) . "' ) ";
-                                            $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op . ' ' : 'AND ')) . $greater_than_query;
+                                            $greater_than_query = "( $field > '".$this->db->quote($condition->value)."' ) ";
+                                            $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op.' ' : 'AND ')).$greater_than_query;
                                         } elseif ($dateTime === false && $data['type'] === 'datetime') { // check for incorrectly converted dateTime
                                                 $dateTime = convertToDateTime($condition->value);
 
                                                 $query_date = $dateTime->format('Y-m-d H:i:s');
-                                                $greater_than_query = "( $field > '" . $this->db->quote($query_date) . "' ) ";
-                                                $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op . ' ' : 'AND ')) . $greater_than_query;
+                                                $greater_than_query = "( $field > '".$this->db->quote($query_date)."' ) ";
+                                                $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op.' ' : 'AND ')).$greater_than_query;
                                             } else {
-                                                $value = "'" . $this->db->quote($condition->value) . "'";
+                                                $value = "'".$this->db->quote($condition->value)."'";
                                                 break;
                                             }
                                         $where_set = true;
                                     } elseif ($condition->operator === 'Less_Than') {
                                             if ($dateTime !== false) {
-                                                $less_than_query = "( $field < '" . $this->db->quote($condition->value) . "' ) ";
-                                                $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op . ' ' : 'AND ')) . $less_than_query;
+                                                $less_than_query = "( $field < '".$this->db->quote($condition->value)."' ) ";
+                                                $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op.' ' : 'AND ')).$less_than_query;
                                             } elseif ($dateTime === false && $data['type'] === 'datetime') { // check for incorrectly converted dateTime
                                                     $dateTime = convertToDateTime($condition->value);
 
                                                     $query_date = $dateTime->format('Y-m-d H:i:s');
-                                                    $less_than_query = "( $field < '" . $this->db->quote($query_date) . "' ) ";
-                                                    $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op . ' ' : 'AND ')) . $less_than_query;
+                                                    $less_than_query = "( $field < '".$this->db->quote($query_date)."' ) ";
+                                                    $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op.' ' : 'AND ')).$less_than_query;
                                                 } else {
-                                                    $value = "'" . $this->db->quote($condition->value) . "'";
+                                                    $value = "'".$this->db->quote($condition->value)."'";
                                                     break;
                                                 }
                                             $where_set = true;
                                         } elseif ($condition->operator === 'Greater_Than_or_Equal_To') {
                                                 if ($dateTime !== false) {
-                                                    $equal_greater_than_query = "( $field > '" . $this->db->quote($condition->value) . "'";
+                                                    $equal_greater_than_query = "( $field > '".$this->db->quote($condition->value)."'";
                                                     $day_ahead = $dateTime->modify('+1 day');
-                                                    $equal_greater_than_query .= " OR $field  BETWEEN '" . $this->db->quote($condition->value) . "' AND '" . $this->db->quote($day_ahead->format('Y-m-d H:i:s')) . "' ) ";
-                                                    $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op . ' ' : 'AND ')) . $equal_greater_than_query;
+                                                    $equal_greater_than_query .= " OR $field  BETWEEN '".$this->db->quote($condition->value)."' AND '".$this->db->quote($day_ahead->format('Y-m-d H:i:s'))."' ) ";
+                                                    $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op.' ' : 'AND ')).$equal_greater_than_query;
                                                 } elseif ($dateTime === false && $data['type'] === 'datetime') { // check for incorrectly converted dateTime
                                                         $dateTime = convertToDateTime($condition->value);
 
                                                         $query_date = $dateTime->format('Y-m-d H:i:s');
-                                                        $equal_greater_than_query = "( $field > '" . $this->db->quote($query_date) . "'";
+                                                        $equal_greater_than_query = "( $field > '".$this->db->quote($query_date)."'";
                                                         $day_ahead = $dateTime->modify('+1 day');
-                                                        $equal_greater_than_query .= " OR $field  BETWEEN '" . $this->db->quote($query_date) . "' AND '" . $this->db->quote($day_ahead->format('Y-m-d H:i:s')) . "' ) ";
-                                                        $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op . ' ' : 'AND ')) . $equal_greater_than_query;
+                                                        $equal_greater_than_query .= " OR $field  BETWEEN '".$this->db->quote($query_date)."' AND '".$this->db->quote($day_ahead->format('Y-m-d H:i:s'))."' ) ";
+                                                        $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op.' ' : 'AND ')).$equal_greater_than_query;
                                                     } else {
-                                                        $value = "'" . $this->db->quote($condition->value) . "'";
+                                                        $value = "'".$this->db->quote($condition->value)."'";
                                                         break;
                                                     }
                                                 $where_set = true;
                                             } elseif ($condition->operator === 'Less_Than_or_Equal_To') {
                                                     if ($dateTime !== false) {
-                                                        $equal_less_than_query = "( $field < '" . $this->db->quote($condition->value) . "'";
+                                                        $equal_less_than_query = "( $field < '".$this->db->quote($condition->value)."'";
                                                         $day_ahead = $dateTime->modify('+1 day');
-                                                        $equal_less_than_query .= " OR $field  BETWEEN '" . $this->db->quote($condition->value) . "' AND '" . $this->db->quote($day_ahead->format('Y-m-d H:i:s')) . "' ) ";
-                                                        $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op . ' ' : 'AND ')) . $equal_less_than_query;
+                                                        $equal_less_than_query .= " OR $field  BETWEEN '".$this->db->quote($condition->value)."' AND '".$this->db->quote($day_ahead->format('Y-m-d H:i:s'))."' ) ";
+                                                        $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op.' ' : 'AND ')).$equal_less_than_query;
                                                     } elseif ($dateTime === false && $data['type'] === 'datetime') { // check for incorrectly converted dateTime
                                                             $dateTime = convertToDateTime($condition->value);
 
                                                             $query_date = $dateTime->format('Y-m-d H:i:s');
-                                                            $equal_less_than_query = "( $field < '" . $this->db->quote($query_date) . "'";
+                                                            $equal_less_than_query = "( $field < '".$this->db->quote($query_date)."'";
                                                             $day_ahead = $dateTime->modify('+1 day');
-                                                            $equal_less_than_query .= " OR $field  BETWEEN '" . $this->db->quote($query_date) . "' AND '" . $this->db->quote($day_ahead->format('Y-m-d H:i:s')) . "' ) ";
-                                                            $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op . ' ' : 'AND ')) . $equal_less_than_query;
+                                                            $equal_less_than_query .= " OR $field  BETWEEN '".$this->db->quote($query_date)."' AND '".$this->db->quote($day_ahead->format('Y-m-d H:i:s'))."' ) ";
+                                                            $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op.' ' : 'AND ')).$equal_less_than_query;
                                                         } else {
-                                                            $value = "'" . $this->db->quote($condition->value) . "'";
+                                                            $value = "'".$this->db->quote($condition->value)."'";
                                                             break;
                                                         }
                                                     $where_set = true;
                                                 } else {
-                                                    $value = "'" . $this->db->quote($condition->value) . "'";
+                                                    $value = "'".$this->db->quote($condition->value)."'";
                                                 }
                             break;
                         default:
-                            $value = "'" . $this->db->quote($condition->value) . "'";
+                            $value = "'".$this->db->quote($condition->value)."'";
                             break;
                     }
 
                     //handle like conditions
                     Switch ($condition->operator) {
                         case 'Contains':
-                            $value = "CONCAT('%', " . $value . " ,'%')";
+                            $value = "CONCAT('%', ".$value." ,'%')";
                             break;
                         case 'Starts_With':
-                            $value = "CONCAT(" . $value . " ,'%')";
+                            $value = "CONCAT(".$value." ,'%')";
                             break;
                         case 'Ends_With':
-                            $value = "CONCAT('%', " . $value . ")";
+                            $value = "CONCAT('%', ".$value.")";
                             break;
                     }
 
                     if ($condition->value_type == 'Value' && !$condition->value && $condition->operator == 'Equal_To') {
                         $value = "{$value} OR {$field} IS NULL)";
-                        $field = "(" . $field;
+                        $field = "(".$field;
                     }
 
                     if (!$where_set) {
@@ -1684,28 +1684,28 @@  discard block
 block discarded – undo
                                 $params = base64_decode($condition->value);
                             }
                             $date = getPeriodEndDate($params)->format('Y-m-d H:i:s');
-                            $value = '"' . getPeriodDate($params)->format('Y-m-d H:i:s') . '"';
+                            $value = '"'.getPeriodDate($params)->format('Y-m-d H:i:s').'"';
 
-                            $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op . ' ' : 'AND '));
+                            $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op.' ' : 'AND '));
                             $tiltLogicOp = false;
 
                             switch ($aor_sql_operator_list[$condition->operator]) {
                                 case "=":
-                                    $query['where'][] = $field . ' BETWEEN ' . $value . ' AND ' . '"' . $date . '"';
+                                    $query['where'][] = $field.' BETWEEN '.$value.' AND '.'"'.$date.'"';
                                     break;
                                 case "!=":
-                                    $query['where'][] = $field . ' NOT BETWEEN ' . $value . ' AND ' . '"' . $date . '"';
+                                    $query['where'][] = $field.' NOT BETWEEN '.$value.' AND '.'"'.$date.'"';
                                     break;
                                 case ">":
                                 case "<":
                                 case ">=":
                                 case "<=":
-                                    $query['where'][] = $field . ' ' . $aor_sql_operator_list[$condition->operator] . ' ' . $value;
+                                    $query['where'][] = $field.' '.$aor_sql_operator_list[$condition->operator].' '.$value;
                                     break;
                             }
                         } else {
                             if (!$where_set) {
-                                $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op . ' ' : 'AND ')) . $field . ' ' . $aor_sql_operator_list[$condition->operator] . ' ' . $value;
+                                $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op.' ' : 'AND ')).$field.' '.$aor_sql_operator_list[$condition->operator].' '.$value;
                             }
                         }
                     }
@@ -1713,7 +1713,7 @@  discard block
 block discarded – undo
                 } else {
                     if ($condition->parenthesis) {
                         if ($condition->parenthesis == 'START') {
-                            $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op . ' ' : 'AND ')) . '(';
+                            $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op.' ' : 'AND ')).'(';
                             $tiltLogicOp = true;
                         } else {
                             $query['where'][] = ')';
@@ -1730,7 +1730,7 @@  discard block
 block discarded – undo
                 array_unshift($query['where'], '(');
                 $query['where'][] = ') AND ';
             }
-            $query['where'][] = $module->table_name . ".deleted = 0 " . $this->build_report_access_query($module,
+            $query['where'][] = $module->table_name.".deleted = 0 ".$this->build_report_access_query($module,
                     $module->table_name);
 
         }

Please login to merge, or discard this patch.

modules/AOW_WorkFlow/aow_utils.php 1 patch

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

@@ -23,7 +23,7 @@  discard block
 block discarded – undo
  */
 
 
-function getModuleFields($module, $view='EditView',$value = '', $valid = array())
+function getModuleFields($module, $view = 'EditView', $value = '', $valid = array())
 {
     global $app_strings, $beanList;
 
@@ -31,68 +31,68 @@  discard block
 block discarded – undo
     $unset = array();
 
     if ($module != '') {
-        if(isset($beanList[$module]) && $beanList[$module]){
+        if (isset($beanList[$module]) && $beanList[$module]) {
             $mod = new $beanList[$module]();
-            foreach($mod->field_defs as $name => $arr){
-                if(ACLController::checkAccess($mod->module_dir, 'list', true)) {
-                    if($arr['type'] != 'link' &&((!isset($arr['source']) || $arr['source'] != 'non-db') || ($arr['type'] == 'relate' && isset($arr['id_name']))) && (empty($valid) || in_array($arr['type'], $valid)) && $name != 'currency_name' && $name != 'currency_symbol'){
-                        if(isset($arr['vname']) && $arr['vname'] != ''){
-                            $fields[$name] = rtrim(translate($arr['vname'],$mod->module_dir), ':');
+            foreach ($mod->field_defs as $name => $arr) {
+                if (ACLController::checkAccess($mod->module_dir, 'list', true)) {
+                    if ($arr['type'] != 'link' && ((!isset($arr['source']) || $arr['source'] != 'non-db') || ($arr['type'] == 'relate' && isset($arr['id_name']))) && (empty($valid) || in_array($arr['type'], $valid)) && $name != 'currency_name' && $name != 'currency_symbol') {
+                        if (isset($arr['vname']) && $arr['vname'] != '') {
+                            $fields[$name] = rtrim(translate($arr['vname'], $mod->module_dir), ':');
                         } else {
                             $fields[$name] = $name;
                         }
-                        if($arr['type'] == 'relate' && isset($arr['id_name']) && $arr['id_name'] != ''){
+                        if ($arr['type'] == 'relate' && isset($arr['id_name']) && $arr['id_name'] != '') {
                             $unset[] = $arr['id_name'];
                         }
                     }
                 }
             } //End loop.
 
-            foreach($unset as $name){
-                if(isset($fields[$name])) unset( $fields[$name]);
+            foreach ($unset as $name) {
+                if (isset($fields[$name])) unset($fields[$name]);
             }
 
         }
     }
     asort($fields);
-    if($view == 'JSON'){
+    if ($view == 'JSON') {
         return json_encode($fields);
     }
-    if($view == 'EditView'){
+    if ($view == 'EditView') {
         return get_select_options_with_id($fields, $value);
     } else {
         return $fields[$value];
     }
 }
 
-function getRelModuleFields($module, $rel_field, $view='EditView',$value = ''){
+function getRelModuleFields($module, $rel_field, $view = 'EditView', $value = '') {
     global $beanList;
 
-    if($module == $rel_field){
+    if ($module == $rel_field) {
         return getModuleFields($module, $view, $value);
     }
 
     $mod = new $beanList[$module]();
     $data = $mod->field_defs[$rel_field];
 
-    if(isset($data['module']) && $data['module'] != ''){
+    if (isset($data['module']) && $data['module'] != '') {
         return getModuleFields($data['module'], $view, $value);
     }
 
 }
 
-function getRelatedModule($module, $rel_field){
+function getRelatedModule($module, $rel_field) {
     global $beanList;
 
-    if($module == $rel_field){
+    if ($module == $rel_field) {
         return $module;
     }
 
     $mod = new $beanList[$module]();
 
-    if(isset($arr['module']) && $arr['module'] != '') {
+    if (isset($arr['module']) && $arr['module'] != '') {
         return $arr['module'];
-    } else if($mod->load_relationship($rel_field)){
+    } else if ($mod->load_relationship($rel_field)) {
         return $mod->$rel_field->getRelatedModuleName();
     }
 
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
 
 }
 
-function getModuleTreeData($module){
+function getModuleTreeData($module) {
     global $beanList, $app_list_strings;
 
     $sort_fields = array();
@@ -113,33 +113,33 @@  discard block
 block discarded – undo
     );
 
     if ($module != '') {
-        if(isset($beanList[$module]) && $beanList[$module]){
+        if (isset($beanList[$module]) && $beanList[$module]) {
             $mod = new $beanList[$module]();
 
-            foreach($mod->get_linked_fields() as $name => $arr){
-                if(isset($arr['module']) && $arr['module'] != '') {
+            foreach ($mod->get_linked_fields() as $name => $arr) {
+                if (isset($arr['module']) && $arr['module'] != '') {
                     $rel_module = $arr['module'];
-                } else if($mod->load_relationship($name)){
+                } else if ($mod->load_relationship($name)) {
                     $rel_module = $mod->$name->getRelatedModuleName();
                 }
 
                 $rel_module_label = isset($app_list_strings['moduleList'][$rel_module]) ? $app_list_strings['moduleList'][$rel_module] : $rel_module;
-                if(isset($arr['vname']) && $arr['vname'] != '') {
-                    $label = $rel_module_label . ' : ' . translate($arr['vname'], $mod->module_dir);
-                    $module_label = trim(translate($arr['vname'],$mod->module_dir),':');
-                }else {
-                    $label = $rel_module_label . ' : '. $name;
+                if (isset($arr['vname']) && $arr['vname'] != '') {
+                    $label = $rel_module_label.' : '.translate($arr['vname'], $mod->module_dir);
+                    $module_label = trim(translate($arr['vname'], $mod->module_dir), ':');
+                } else {
+                    $label = $rel_module_label.' : '.$name;
                     $module_label = $name;
                 }
-                $sort_fields[$name] = array('label'=>$label,'type'=>'relationship','module' => $rel_module,'module_label'=>$module_label);
-                if($arr['type'] == 'relate' && isset($arr['id_name']) && $arr['id_name'] != ''){
-                    if(isset($fields[$arr['id_name']])){
-                        unset( $fields[$arr['id_name']]);
+                $sort_fields[$name] = array('label'=>$label, 'type'=>'relationship', 'module' => $rel_module, 'module_label'=>$module_label);
+                if ($arr['type'] == 'relate' && isset($arr['id_name']) && $arr['id_name'] != '') {
+                    if (isset($fields[$arr['id_name']])) {
+                        unset($fields[$arr['id_name']]);
                     }
                 }
             } //End loop.
-            uasort($sort_fields,function($a,$b){
-                return strcmp($a['label'],$b['label']);
+            uasort($sort_fields, function($a, $b) {
+                return strcmp($a['label'], $b['label']);
             });
 
             $fields = array_merge((array)$fields, (array)$sort_fields);
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
     return json_encode($fields);
 }
 
-function getModuleRelationships($module, $view='EditView',$value = '')
+function getModuleRelationships($module, $view = 'EditView', $value = '')
 {
     global $beanList, $app_list_strings;
 
@@ -158,27 +158,27 @@  discard block
 block discarded – undo
     $invalid_modules = array();
 
     if ($module != '') {
-        if(isset($beanList[$module]) && $beanList[$module]){
+        if (isset($beanList[$module]) && $beanList[$module]) {
             $mod = new $beanList[$module]();
 
             /*if($mod->is_AuditEnabled()){
                 $fields['Audit'] = translate('LBL_AUDIT_TABLE','AOR_Fields');
             }*/
-            foreach($mod->get_linked_fields() as $name => $arr){
-                if(isset($arr['module']) && $arr['module'] != '') {
+            foreach ($mod->get_linked_fields() as $name => $arr) {
+                if (isset($arr['module']) && $arr['module'] != '') {
                     $rel_module = $arr['module'];
-                } else if($mod->load_relationship($name)){
+                } else if ($mod->load_relationship($name)) {
                     $rel_module = $mod->$name->getRelatedModuleName();
                 }
-                if(!in_array($rel_module,$invalid_modules)){
+                if (!in_array($rel_module, $invalid_modules)) {
                     $relModuleName = isset($app_list_strings['moduleList'][$rel_module]) ? $app_list_strings['moduleList'][$rel_module] : $rel_module;
-                    if(isset($arr['vname']) && $arr['vname'] != ''){
-                        $sort_fields[$name] = $relModuleName.' : '.translate($arr['vname'],$mod->module_dir);
+                    if (isset($arr['vname']) && $arr['vname'] != '') {
+                        $sort_fields[$name] = $relModuleName.' : '.translate($arr['vname'], $mod->module_dir);
                     } else {
-                        $sort_fields[$name] = $relModuleName.' : '. $name;
+                        $sort_fields[$name] = $relModuleName.' : '.$name;
                     }
-                    if($arr['type'] == 'relate' && isset($arr['id_name']) && $arr['id_name'] != ''){
-                        if(isset($fields[$arr['id_name']])) unset( $fields[$arr['id_name']]);
+                    if ($arr['type'] == 'relate' && isset($arr['id_name']) && $arr['id_name'] != '') {
+                        if (isset($fields[$arr['id_name']])) unset($fields[$arr['id_name']]);
                     }
                 }
             } //End loop.
@@ -186,26 +186,26 @@  discard block
 block discarded – undo
             $fields = array_merge((array)$fields, (array)$sort_fields);
         }
     }
-    if($view == 'EditView'){
+    if ($view == 'EditView') {
         return get_select_options_with_id($fields, $value);
     } else {
         return $fields[$value];
     }
 }
 
-function getValidFieldsTypes($module, $field){
+function getValidFieldsTypes($module, $field) {
     global $beanFiles, $beanList;
 
     require_once($beanFiles[$beanList[$module]]);
     $focus = new $beanList[$module];
     $vardef = $focus->getFieldDefinition($field);
 
-    switch($vardef['type']) {
+    switch ($vardef['type']) {
         case 'double':
         case 'decimal':
         case 'float':
         case 'currency':
-            $valid_type = array('double','decimal','float','currency');
+            $valid_type = array('double', 'decimal', 'float', 'currency');
             break;
         case 'uint':
         case 'ulong':
@@ -213,12 +213,12 @@  discard block
 block discarded – undo
         case 'short':
         case 'tinyint':
         case 'int':
-            $valid_type = array('uint','ulong','long','short','tinyint','int');
+            $valid_type = array('uint', 'ulong', 'long', 'short', 'tinyint', 'int');
             break;
         case 'date':
         case 'datetime':
         case 'datetimecombo':
-            $valid_type = array('date','datetime', 'datetimecombo');
+            $valid_type = array('date', 'datetime', 'datetimecombo');
             break;
         case 'id':
         case 'relate':
@@ -235,29 +235,29 @@  discard block
 block discarded – undo
 }
 
 
-function getModuleField($module, $fieldname, $aow_field, $view='EditView',$value = '', $alt_type = '', $currency_id = '', $params= array()){
+function getModuleField($module, $fieldname, $aow_field, $view = 'EditView', $value = '', $alt_type = '', $currency_id = '', $params = array()) {
     global $current_language, $app_strings, $app_list_strings, $current_user, $beanFiles, $beanList;
 
     // use the mod_strings for this module
-    $mod_strings = return_module_language($current_language,$module);
+    $mod_strings = return_module_language($current_language, $module);
 
     // set the filename for this control
-    $file = create_cache_directory('modules/AOW_WorkFlow/') . $module . $view . $alt_type . $fieldname . '.tpl';
+    $file = create_cache_directory('modules/AOW_WorkFlow/').$module.$view.$alt_type.$fieldname.'.tpl';
 
     $displayParams = array();
 
-    if ( !is_file($file)
+    if (!is_file($file)
         || inDeveloperMode()
-        || !empty($_SESSION['developerMode']) ) {
+        || !empty($_SESSION['developerMode'])) {
 
-        if ( !isset($vardef) ) {
+        if (!isset($vardef)) {
             require_once($beanFiles[$beanList[$module]]);
             $focus = new $beanList[$module];
             $vardef = $focus->getFieldDefinition($fieldname);
         }
 
         // Bug: check for AOR value SecurityGroups value missing
-        if(stristr($fieldname, 'securitygroups') != false && empty($vardef)) {
+        if (stristr($fieldname, 'securitygroups') != false && empty($vardef)) {
             require_once($beanFiles[$beanList['SecurityGroups']]);
             $module = 'SecurityGroups';
             $focus = new $beanList[$module];
@@ -268,36 +268,36 @@  discard block
 block discarded – undo
         //$displayParams['formName'] = 'EditView';
 
         // if this is the id relation field, then don't have a pop-up selector.
-        if( $vardef['type'] == 'relate' && $vardef['id_name'] == $vardef['name']) {
+        if ($vardef['type'] == 'relate' && $vardef['id_name'] == $vardef['name']) {
             $vardef['type'] = 'varchar';
         }
 
-        if(isset($vardef['precision'])) unset($vardef['precision']);
+        if (isset($vardef['precision'])) unset($vardef['precision']);
 
         //$vardef['precision'] = $locale->getPrecedentPreference('default_currency_significant_digits', $current_user);
 
         //TODO Fix datetimecomebo
         //temp work around
-        if( $vardef['type'] == 'datetimecombo') {
+        if ($vardef['type'] == 'datetimecombo') {
             $vardef['type'] = 'datetime';
         }
 
         // trim down textbox display
-        if( $vardef['type'] == 'text' ) {
+        if ($vardef['type'] == 'text') {
             $vardef['rows'] = 2;
             $vardef['cols'] = 32;
         }
 
         // create the dropdowns for the parent type fields
-        if ( $vardef['type'] == 'parent_type' ) {
+        if ($vardef['type'] == 'parent_type') {
             $vardef['type'] = 'enum';
         }
 
-        if($vardef['type'] == 'link'){
+        if ($vardef['type'] == 'link') {
             $vardef['type'] = 'relate';
             $vardef['rname'] = 'name';
             $vardef['id_name'] = $vardef['name'].'_id';
-            if((!isset($vardef['module']) || $vardef['module'] == '') && $focus->load_relationship($vardef['name'])) {
+            if ((!isset($vardef['module']) || $vardef['module'] == '') && $focus->load_relationship($vardef['name'])) {
                 $relName = $vardef['name'];
                 $vardef['module'] = $focus->$relName->getRelatedModuleName();
             }
@@ -305,24 +305,24 @@  discard block
 block discarded – undo
         }
 
         //check for $alt_type
-        if ( $alt_type != '' ) {
+        if ($alt_type != '') {
             $vardef['type'] = $alt_type;
         }
 
         // remove the special text entry field function 'getEmailAddressWidget'
-        if ( isset($vardef['function'])
-            && ( $vardef['function'] == 'getEmailAddressWidget'
-                || $vardef['function']['name'] == 'getEmailAddressWidget' ) )
+        if (isset($vardef['function'])
+            && ($vardef['function'] == 'getEmailAddressWidget'
+                || $vardef['function']['name'] == 'getEmailAddressWidget'))
             unset($vardef['function']);
 
-        if(isset($vardef['name']) && ($vardef['name'] == 'date_entered' || $vardef['name'] == 'date_modified')){
+        if (isset($vardef['name']) && ($vardef['name'] == 'date_entered' || $vardef['name'] == 'date_modified')) {
             $vardef['name'] = 'aow_temp_date';
         }
 
         // load SugarFieldHandler to render the field tpl file
         static $sfh;
 
-        if(!isset($sfh)) {
+        if (!isset($sfh)) {
             require_once('include/SugarFields/SugarFieldHandler.php');
             $sfh = new SugarFieldHandler();
         }
@@ -332,17 +332,17 @@  discard block
 block discarded – undo
         // Remove all the copyright comments
         $contents = preg_replace('/\{\*[^\}]*?\*\}/', '', $contents);
 
-        if( $view == 'EditView' &&  ($vardef['type'] == 'relate' || $vardef['type'] == 'parent')){
-            $contents = str_replace('"'.$vardef['id_name'].'"','{/literal}"{$fields.'.$vardef['name'].'.id_name}"{literal}', $contents);
-            $contents = str_replace('"'.$vardef['name'].'"','{/literal}"{$fields.'.$vardef['name'].'.name}"{literal}', $contents);
+        if ($view == 'EditView' && ($vardef['type'] == 'relate' || $vardef['type'] == 'parent')) {
+            $contents = str_replace('"'.$vardef['id_name'].'"', '{/literal}"{$fields.'.$vardef['name'].'.id_name}"{literal}', $contents);
+            $contents = str_replace('"'.$vardef['name'].'"', '{/literal}"{$fields.'.$vardef['name'].'.name}"{literal}', $contents);
         }
 
         // hack to disable one of the js calls in this control
-        if ( isset($vardef['function']) && ( $vardef['function'] == 'getCurrencyDropDown' || $vardef['function']['name'] == 'getCurrencyDropDown' ) )
+        if (isset($vardef['function']) && ($vardef['function'] == 'getCurrencyDropDown' || $vardef['function']['name'] == 'getCurrencyDropDown'))
             $contents .= "{literal}<script>function CurrencyConvertAll() { return; }</script>{/literal}";
 
         // Save it to the cache file
-        if($fh = @sugar_fopen($file, 'w')) {
+        if ($fh = @sugar_fopen($file, 'w')) {
             fputs($fh, $contents);
             fclose($fh);
         }
@@ -359,51 +359,51 @@  discard block
 block discarded – undo
     $ss->assign('TIME_FORMAT', $time_format);
     $time_separator = ":";
     $match = array();
-    if(preg_match('/\d+([^\d])\d+([^\d]*)/s', $time_format, $match)) {
+    if (preg_match('/\d+([^\d])\d+([^\d]*)/s', $time_format, $match)) {
         $time_separator = $match[1];
     }
     $t23 = strpos($time_format, '23') !== false ? '%H' : '%I';
-    if(!isset($match[2]) || $match[2] == '') {
-        $ss->assign('CALENDAR_FORMAT', $date_format . ' ' . $t23 . $time_separator . "%M");
+    if (!isset($match[2]) || $match[2] == '') {
+        $ss->assign('CALENDAR_FORMAT', $date_format.' '.$t23.$time_separator."%M");
     }
     else {
         $pm = $match[2] == "pm" ? "%P" : "%p";
-        $ss->assign('CALENDAR_FORMAT', $date_format . ' ' . $t23 . $time_separator . "%M" . $pm);
+        $ss->assign('CALENDAR_FORMAT', $date_format.' '.$t23.$time_separator."%M".$pm);
     }
 
     $ss->assign('CALENDAR_FDOW', $current_user->get_first_day_of_week());
 
     // populate the fieldlist from the vardefs
     $fieldlist = array();
-    if ( !isset($focus) || !($focus instanceof SugarBean) )
+    if (!isset($focus) || !($focus instanceof SugarBean))
         require_once($beanFiles[$beanList[$module]]);
     $focus = new $beanList[$module];
     // create the dropdowns for the parent type fields
     $vardefFields = $focus->getFieldDefinitions();
-    if (isset($vardefFields[$fieldname]['type']) && $vardefFields[$fieldname]['type'] == 'parent_type' ) {
+    if (isset($vardefFields[$fieldname]['type']) && $vardefFields[$fieldname]['type'] == 'parent_type') {
         $focus->field_defs[$fieldname]['options'] = $focus->field_defs[$vardefFields[$fieldname]['group']]['options'];
     }
-    foreach ( $vardefFields as $name => $properties ) {
+    foreach ($vardefFields as $name => $properties) {
         $fieldlist[$name] = $properties;
         // fill in enums
-        if(isset($fieldlist[$name]['options']) && is_string($fieldlist[$name]['options']) && isset($app_list_strings[$fieldlist[$name]['options']]))
+        if (isset($fieldlist[$name]['options']) && is_string($fieldlist[$name]['options']) && isset($app_list_strings[$fieldlist[$name]['options']]))
             $fieldlist[$name]['options'] = $app_list_strings[$fieldlist[$name]['options']];
         // Bug 32626: fall back on checking the mod_strings if not in the app_list_strings
-        elseif(isset($fieldlist[$name]['options']) && is_string($fieldlist[$name]['options']) && isset($mod_strings[$fieldlist[$name]['options']]))
+        elseif (isset($fieldlist[$name]['options']) && is_string($fieldlist[$name]['options']) && isset($mod_strings[$fieldlist[$name]['options']]))
             $fieldlist[$name]['options'] = $mod_strings[$fieldlist[$name]['options']];
         // Bug 22730: make sure all enums have the ability to select blank as the default value.
-        if(!isset($fieldlist[$name]['options']['']))
+        if (!isset($fieldlist[$name]['options']['']))
             $fieldlist[$name]['options'][''] = '';
     }
 
     // fill in function return values
-    if ( !in_array($fieldname,array('email1','email2')) )
+    if (!in_array($fieldname, array('email1', 'email2')))
     {
         if (!empty($fieldlist[$fieldname]['function']['returns']) && $fieldlist[$fieldname]['function']['returns'] == 'html')
         {
             $function = $fieldlist[$fieldname]['function']['name'];
             // include various functions required in the various vardefs
-            if ( isset($fieldlist[$fieldname]['function']['include']) && is_file($fieldlist[$fieldname]['function']['include']))
+            if (isset($fieldlist[$fieldname]['function']['include']) && is_file($fieldlist[$fieldname]['function']['include']))
                 require_once($fieldlist[$fieldname]['function']['include']);
             $_REQUEST[$fieldname] = $value;
             $value = $function($focus, $fieldname, $value, $view);
@@ -412,40 +412,40 @@  discard block
 block discarded – undo
         }
     }
 
-    if(isset($fieldlist[$fieldname]['type']) && $fieldlist[$fieldname]['type'] == 'link'){
+    if (isset($fieldlist[$fieldname]['type']) && $fieldlist[$fieldname]['type'] == 'link') {
         $fieldlist[$fieldname]['id_name'] = $fieldlist[$fieldname]['name'].'_id';
 
-        if((!isset($fieldlist[$fieldname]['module']) || $fieldlist[$fieldname]['module'] == '') && $focus->load_relationship($fieldlist[$fieldname]['name'])) {
+        if ((!isset($fieldlist[$fieldname]['module']) || $fieldlist[$fieldname]['module'] == '') && $focus->load_relationship($fieldlist[$fieldname]['name'])) {
             $relName = $fieldlist[$fieldname]['name'];
             $fieldlist[$fieldname]['module'] = $focus->$relName->getRelatedModuleName();
         }
     }
 
-    if(isset($fieldlist[$fieldname]['name']) && ($fieldlist[$fieldname]['name'] == 'date_entered' || $fieldlist[$fieldname]['name'] == 'date_modified')){
+    if (isset($fieldlist[$fieldname]['name']) && ($fieldlist[$fieldname]['name'] == 'date_entered' || $fieldlist[$fieldname]['name'] == 'date_modified')) {
         $fieldlist[$fieldname]['name'] = 'aow_temp_date';
         $fieldlist['aow_temp_date'] = $fieldlist[$fieldname];
         $fieldname = 'aow_temp_date';
     }
 
     $quicksearch_js = '';
-    if(isset( $fieldlist[$fieldname]['id_name'] ) && $fieldlist[$fieldname]['id_name'] != '' && $fieldlist[$fieldname]['id_name'] != $fieldlist[$fieldname]['name']){
+    if (isset($fieldlist[$fieldname]['id_name']) && $fieldlist[$fieldname]['id_name'] != '' && $fieldlist[$fieldname]['id_name'] != $fieldlist[$fieldname]['name']) {
         $rel_value = $value;
 
         require_once("include/TemplateHandler/TemplateHandler.php");
         $template_handler = new TemplateHandler();
-        $quicksearch_js = $template_handler->createQuickSearchCode($fieldlist,$fieldlist,$view);
+        $quicksearch_js = $template_handler->createQuickSearchCode($fieldlist, $fieldlist, $view);
         $quicksearch_js = str_replace($fieldname, $aow_field.'_display', $quicksearch_js);
         $quicksearch_js = str_replace($fieldlist[$fieldname]['id_name'], $aow_field, $quicksearch_js);
 
         echo $quicksearch_js;
 
-        if(isset($fieldlist[$fieldname]['module']) && $fieldlist[$fieldname]['module'] == 'Users'){
+        if (isset($fieldlist[$fieldname]['module']) && $fieldlist[$fieldname]['module'] == 'Users') {
             $rel_value = get_assigned_user_name($value);
-        } else if(isset($fieldlist[$fieldname]['module'])){
+        } else if (isset($fieldlist[$fieldname]['module'])) {
             require_once($beanFiles[$beanList[$fieldlist[$fieldname]['module']]]);
             $rel_focus = new $beanList[$fieldlist[$fieldname]['module']];
             $rel_focus->retrieve($value);
-            if(isset($fieldlist[$fieldname]['rname']) && $fieldlist[$fieldname]['rname'] != ''){
+            if (isset($fieldlist[$fieldname]['rname']) && $fieldlist[$fieldname]['rname'] != '') {
                 $relDisplayField = $fieldlist[$fieldname]['rname'];
             } else {
                 $relDisplayField = 'name';
@@ -458,17 +458,17 @@  discard block
 block discarded – undo
         $fieldlist[$fieldname]['id_name'] = $aow_field;
         $fieldlist[$fieldlist[$fieldname]['id_name']]['name'] = $aow_field;
         $fieldlist[$fieldname]['name'] = $aow_field.'_display';
-    } else if(isset( $fieldlist[$fieldname]['type'] ) && $view == 'DetailView' && ($fieldlist[$fieldname]['type'] == 'datetimecombo' || $fieldlist[$fieldname]['type'] == 'datetime' || $fieldlist[$fieldname]['type'] == 'date')){
+    } else if (isset($fieldlist[$fieldname]['type']) && $view == 'DetailView' && ($fieldlist[$fieldname]['type'] == 'datetimecombo' || $fieldlist[$fieldname]['type'] == 'datetime' || $fieldlist[$fieldname]['type'] == 'date')) {
         $value = $focus->convertField($value, $fieldlist[$fieldname]);
-        if(!empty($params['date_format']) && isset($params['date_format'])){
+        if (!empty($params['date_format']) && isset($params['date_format'])) {
             $convert_format = "Y-m-d H:i:s";
-            if($fieldlist[$fieldname]['type'] == 'date') $convert_format = "Y-m-d";
+            if ($fieldlist[$fieldname]['type'] == 'date') $convert_format = "Y-m-d";
             $fieldlist[$fieldname]['value'] = $timedate->to_display($value, $convert_format, $params['date_format']);
-        }else{
+        } else {
             $fieldlist[$fieldname]['value'] = $timedate->to_display_date_time($value, true, true);
         }
         $fieldlist[$fieldname]['name'] = $aow_field;
-    } else if(isset( $fieldlist[$fieldname]['type'] ) && ($fieldlist[$fieldname]['type'] == 'datetimecombo' || $fieldlist[$fieldname]['type'] == 'datetime' || $fieldlist[$fieldname]['type'] == 'date')){
+    } else if (isset($fieldlist[$fieldname]['type']) && ($fieldlist[$fieldname]['type'] == 'datetimecombo' || $fieldlist[$fieldname]['type'] == 'datetime' || $fieldlist[$fieldname]['type'] == 'date')) {
         $value = $focus->convertField($value, $fieldlist[$fieldname]);
         $fieldlist[$fieldname]['value'] = $timedate->to_display_date($value);
         //$fieldlist[$fieldname]['value'] = $timedate->to_display_date_time($value, true, true);
@@ -480,17 +480,17 @@  discard block
 block discarded – undo
 
     }
 
-    if(isset($fieldlist[$fieldname]['type']) && $fieldlist[$fieldname]['type'] == 'currency' && $view != 'EditView'){
+    if (isset($fieldlist[$fieldname]['type']) && $fieldlist[$fieldname]['type'] == 'currency' && $view != 'EditView') {
         static $sfh;
 
-        if(!isset($sfh)) {
+        if (!isset($sfh)) {
             require_once('include/SugarFields/SugarFieldHandler.php');
             $sfh = new SugarFieldHandler();
         }
 
-        if($currency_id != '' && !stripos($fieldname, '_USD')){
+        if ($currency_id != '' && !stripos($fieldname, '_USD')) {
             $userCurrencyId = $current_user->getPreference('currency');
-            if($currency_id != $userCurrencyId){
+            if ($currency_id != $userCurrencyId) {
                 $currency = new Currency();
                 $currency->retrieve($currency_id);
                 $value = $currency->convertToDollar($value);
@@ -505,9 +505,9 @@  discard block
 block discarded – undo
     }
 
     $ss->assign("QS_JS", $quicksearch_js);
-    $ss->assign("fields",$fieldlist);
-    $ss->assign("form_name",$view);
-    $ss->assign("bean",$focus);
+    $ss->assign("fields", $fieldlist);
+    $ss->assign("form_name", $view);
+    $ss->assign("bean", $focus);
 
     // add in any additional strings
     $ss->assign("MOD", $mod_strings);
@@ -520,7 +520,7 @@  discard block
 block discarded – undo
 
 
 
-function getDateField($module, $aow_field, $view, $value, $field_option = true){
+function getDateField($module, $aow_field, $view, $value, $field_option = true) {
     global $app_list_strings;
 
     // set $view = 'EditView' as default
@@ -530,21 +530,21 @@  discard block
 block discarded – undo
 
     $value = json_decode(html_entity_decode_utf8($value), true);
 
-    if(!file_exists('modules/AOBH_BusinessHours/AOBH_BusinessHours.php')) unset($app_list_strings['aow_date_type_list']['business_hours']);
+    if (!file_exists('modules/AOBH_BusinessHours/AOBH_BusinessHours.php')) unset($app_list_strings['aow_date_type_list']['business_hours']);
 
     $field = '';
 
-    if($view == 'EditView'){
-        $field .= "<select type='text' name='$aow_field".'[0]'."' id='$aow_field".'[0]'."' title='' tabindex='116'>". getDateFields($module, $view, $value[0], $field_option) ."</select>&nbsp;&nbsp;";
-        $field .= "<select type='text' name='$aow_field".'[1]'."' id='$aow_field".'[1]'."' onchange='date_field_change(\"$aow_field\")'  title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aow_date_operator'], $value[1]) ."</select>&nbsp;";
+    if ($view == 'EditView') {
+        $field .= "<select type='text' name='$aow_field".'[0]'."' id='$aow_field".'[0]'."' title='' tabindex='116'>".getDateFields($module, $view, $value[0], $field_option)."</select>&nbsp;&nbsp;";
+        $field .= "<select type='text' name='$aow_field".'[1]'."' id='$aow_field".'[1]'."' onchange='date_field_change(\"$aow_field\")'  title='' tabindex='116'>".get_select_options_with_id($app_list_strings['aow_date_operator'], $value[1])."</select>&nbsp;";
         $display = 'none';
-        if($value[1] == 'plus' || $value[1] == 'minus') $display = '';
+        if ($value[1] == 'plus' || $value[1] == 'minus') $display = '';
         $field .= "<input  type='text' style='display:$display' name='$aow_field".'[2]'."' id='$aow_field".'[2]'."' title='' value='$value[2]' tabindex='116'>&nbsp;";
-        $field .= "<select type='text' style='display:$display' name='$aow_field".'[3]'."' id='$aow_field".'[3]'."' title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aow_date_type_list'], $value[3]) ."</select>";
+        $field .= "<select type='text' style='display:$display' name='$aow_field".'[3]'."' id='$aow_field".'[3]'."' title='' tabindex='116'>".get_select_options_with_id($app_list_strings['aow_date_type_list'], $value[3])."</select>";
     }
     else {
         $field = getDateFields($module, $view, $value[0], $field_option).' '.$app_list_strings['aow_date_operator'][$value[1]];
-        if($value[1] == 'plus' || $value[1] == 'minus'){
+        if ($value[1] == 'plus' || $value[1] == 'minus') {
             $field .= ' '.$value[2].' '.$app_list_strings['aow_date_type_list'][$value[3]];
         }
     }
@@ -552,21 +552,21 @@  discard block
 block discarded – undo
 
 }
 
-function getDateFields($module, $view='EditView',$value = '', $field_option = true)
+function getDateFields($module, $view = 'EditView', $value = '', $field_option = true)
 {
     global $beanList, $app_list_strings;
 
     $fields = $app_list_strings['aow_date_options'];
 
-    if(!$field_option) unset($fields['field']);
+    if (!$field_option) unset($fields['field']);
 
     if ($module != '') {
-        if(isset($beanList[$module]) && $beanList[$module]){
+        if (isset($beanList[$module]) && $beanList[$module]) {
             $mod = new $beanList[$module]();
-            foreach($mod->field_defs as $name => $arr){
-                if($arr['type'] == 'date' || $arr['type'] == 'datetime' || $arr['type'] == 'datetimecombo'){
-                    if(isset($arr['vname']) && $arr['vname'] != ''){
-                        $fields[$name] = translate($arr['vname'],$mod->module_dir);
+            foreach ($mod->field_defs as $name => $arr) {
+                if ($arr['type'] == 'date' || $arr['type'] == 'datetime' || $arr['type'] == 'datetimecombo') {
+                    if (isset($arr['vname']) && $arr['vname'] != '') {
+                        $fields[$name] = translate($arr['vname'], $mod->module_dir);
                     } else {
                         $fields[$name] = $name;
                     }
@@ -575,42 +575,42 @@  discard block
 block discarded – undo
 
         }
     }
-    if($view == 'EditView'){
+    if ($view == 'EditView') {
         return get_select_options_with_id($fields, $value);
     } else {
         return $fields[$value];
     }
 }
 
-function getAssignField($aow_field, $view, $value){
+function getAssignField($aow_field, $view, $value) {
     global $app_list_strings;
 
     $value = json_decode(html_entity_decode_utf8($value), true);
 
-    $roles = get_bean_select_array(true, 'ACLRole','name', '','name',true);
+    $roles = get_bean_select_array(true, 'ACLRole', 'name', '', 'name', true);
 
-    if(!file_exists('modules/SecurityGroups/SecurityGroup.php')){
+    if (!file_exists('modules/SecurityGroups/SecurityGroup.php')) {
         unset($app_list_strings['aow_assign_options']['security_group']);
     }
-    else{
-        $securityGroups = get_bean_select_array(true, 'SecurityGroup','name', '','name',true);
+    else {
+        $securityGroups = get_bean_select_array(true, 'SecurityGroup', 'name', '', 'name', true);
     }
 
     $field = '';
 
-    if($view == 'EditView'){
-        $field .= "<select type='text' name='$aow_field".'[0]'."' id='$aow_field".'[0]'."' onchange='assign_field_change(\"$aow_field\")' title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aow_assign_options'], $value[0]) ."</select>&nbsp;&nbsp;";
-        if(!file_exists('modules/SecurityGroups/SecurityGroup.php')){
+    if ($view == 'EditView') {
+        $field .= "<select type='text' name='$aow_field".'[0]'."' id='$aow_field".'[0]'."' onchange='assign_field_change(\"$aow_field\")' title='' tabindex='116'>".get_select_options_with_id($app_list_strings['aow_assign_options'], $value[0])."</select>&nbsp;&nbsp;";
+        if (!file_exists('modules/SecurityGroups/SecurityGroup.php')) {
             $field .= "<input type='hidden' name='$aow_field".'[1]'."' id='$aow_field".'[1]'."' value=''  />";
         }
         else {
             $display = 'none';
-            if($value[0] == 'security_group') $display = '';
-            $field .= "<select type='text' style='display:$display' name='$aow_field".'[1]'."' id='$aow_field".'[1]'."' title='' tabindex='116'>". get_select_options_with_id($securityGroups, $value[1]) ."</select>&nbsp;&nbsp;";
+            if ($value[0] == 'security_group') $display = '';
+            $field .= "<select type='text' style='display:$display' name='$aow_field".'[1]'."' id='$aow_field".'[1]'."' title='' tabindex='116'>".get_select_options_with_id($securityGroups, $value[1])."</select>&nbsp;&nbsp;";
         }
         $display = 'none';
-        if($value[0] == 'role' || $value[0] == 'security_group') $display = '';
-        $field .= "<select type='text' style='display:$display' name='$aow_field".'[2]'."' id='$aow_field".'[2]'."' title='' tabindex='116'>". get_select_options_with_id($roles, $value[2]) ."</select>&nbsp;&nbsp;";
+        if ($value[0] == 'role' || $value[0] == 'security_group') $display = '';
+        $field .= "<select type='text' style='display:$display' name='$aow_field".'[2]'."' id='$aow_field".'[2]'."' title='' tabindex='116'>".get_select_options_with_id($roles, $value[2])."</select>&nbsp;&nbsp;";
     }
     else {
         $field = $app_list_strings['aow_assign_options'][$value[1]];
@@ -622,10 +622,10 @@  discard block
 block discarded – undo
 function getDropdownList($list_id, $selected_value) {
     global $app_list_strings;
     $option = '';
-    foreach($app_list_strings[$list_id] as $key => $value) {
-        if(base64_decode($selected_value) == $key) {
+    foreach ($app_list_strings[$list_id] as $key => $value) {
+        if (base64_decode($selected_value) == $key) {
             $option .= '<option value="'.$key.'" selected>'.$value.'</option>';
-        } else if($selected_value == $key) {
+        } else if ($selected_value == $key) {
             $option .= '<option value="'.$key.'" selected>'.$value.'</option>';
         }
         else {
@@ -636,7 +636,7 @@  discard block
 block discarded – undo
 }
 function getLeastBusyUser($users, $field, SugarBean $bean) {
     $counts = array();
-    foreach($users as $id) {
+    foreach ($users as $id) {
         $c = $bean->db->getOne("SELECT count(*) AS c FROM ".$bean->table_name." WHERE $field = '$id' AND deleted = 0");
         $counts[$id] = $c;
     }
@@ -647,21 +647,21 @@  discard block
 block discarded – undo
 
 function getRoundRobinUser($users, $id) {
 
-    $file = create_cache_directory('modules/AOW_WorkFlow/Users/') . $id . 'lastUser.cache.php';
+    $file = create_cache_directory('modules/AOW_WorkFlow/Users/').$id.'lastUser.cache.php';
 
-    if(isset($_SESSION['lastuser'][$id]) && $_SESSION['lastuser'][$id] != '') {
+    if (isset($_SESSION['lastuser'][$id]) && $_SESSION['lastuser'][$id] != '') {
         $users_by_key = array_flip($users); // now keys are values
         $key = $users_by_key[$_SESSION['lastuser'][$id]] + 1;
-        if(!empty($users[$key])) {
+        if (!empty($users[$key])) {
             return $users[$key];
         }
     }
-    else if (is_file($file)){
+    else if (is_file($file)) {
         require_once($file);
-        if(isset($lastUser['User']) && $lastUser['User'] != '') {
+        if (isset($lastUser['User']) && $lastUser['User'] != '') {
             $users_by_key = array_flip($users); // now keys are values
             $key = $users_by_key[$lastUser['User']] + 1;
-            if(!empty($users[$key])) {
+            if (!empty($users[$key])) {
                 return $users[$key];
             }
         }
@@ -674,31 +674,31 @@  discard block
 block discarded – undo
 
     $_SESSION['lastuser'][$id] = $user_id;
 
-    $file = create_cache_directory('modules/AOW_WorkFlow/Users/') . $id . 'lastUser.cache.php';
+    $file = create_cache_directory('modules/AOW_WorkFlow/Users/').$id.'lastUser.cache.php';
 
     $arrayString = var_export_helper(array('User' => $user_id));
 
-    $content =<<<eoq
+    $content = <<<eoq
 <?php
 	\$lastUser = {$arrayString};
 ?>
 eoq;
 
-    if($fh = @sugar_fopen($file, 'w')) {
+    if ($fh = @sugar_fopen($file, 'w')) {
         fputs($fh, $content);
         fclose($fh);
     }
     return true;
 }
 
-function getEmailableModules(){
+function getEmailableModules() {
     global $beanFiles, $beanList, $app_list_strings;
     $emailableModules = array();
-    foreach($app_list_strings['aow_moduleList'] as $bean_name => $bean_dis) {
-        if(isset($beanList[$bean_name]) && isset($beanFiles[$beanList[$bean_name]])){
+    foreach ($app_list_strings['aow_moduleList'] as $bean_name => $bean_dis) {
+        if (isset($beanList[$bean_name]) && isset($beanFiles[$beanList[$bean_name]])) {
             require_once($beanFiles[$beanList[$bean_name]]);
             $obj = new $beanList[$bean_name];
-            if($obj instanceof Person || $obj instanceof Company){
+            if ($obj instanceof Person || $obj instanceof Company) {
                 $emailableModules[] = $bean_name;
             }
         }
@@ -707,37 +707,37 @@  discard block
 block discarded – undo
     return $emailableModules;
 }
 
-function getRelatedEmailableFields($module){
+function getRelatedEmailableFields($module) {
     global $beanList, $app_list_strings;
     $relEmailFields = array();
     $checked_link = array();
     $emailableModules = getEmailableModules();
     if ($module != '') {
-        if(isset($beanList[$module]) && $beanList[$module]){
+        if (isset($beanList[$module]) && $beanList[$module]) {
             $mod = new $beanList[$module]();
 
-            foreach($mod->get_related_fields() as $field){
-                if(isset($field['link'])) $checked_link[] = $field['link'];
-                if(!isset($field['module']) || !in_array($field['module'],$emailableModules) || (isset($field['dbType']) && $field['dbType'] == "id")){
+            foreach ($mod->get_related_fields() as $field) {
+                if (isset($field['link'])) $checked_link[] = $field['link'];
+                if (!isset($field['module']) || !in_array($field['module'], $emailableModules) || (isset($field['dbType']) && $field['dbType'] == "id")) {
                     continue;
                 }
-                $relEmailFields[$field['name']] = $field['module'].": ".trim(translate($field['vname'],$mod->module_name),":");
+                $relEmailFields[$field['name']] = $field['module'].": ".trim(translate($field['vname'], $mod->module_name), ":");
             }
 
-            foreach($mod->get_linked_fields() as $field){
-                if(!in_array($field['name'],$checked_link) && !in_array($field['relationship'],$checked_link)){
-                    if(isset($field['module']) && $field['module'] != '') {
+            foreach ($mod->get_linked_fields() as $field) {
+                if (!in_array($field['name'], $checked_link) && !in_array($field['relationship'], $checked_link)) {
+                    if (isset($field['module']) && $field['module'] != '') {
                         $rel_module = $field['module'];
-                    } else if($mod->load_relationship($field['name'])){
+                    } else if ($mod->load_relationship($field['name'])) {
                         $relField = $field['name'];
                         $rel_module = $mod->$relField->getRelatedModuleName();
                     }
 
-                    if(in_array($rel_module,$emailableModules)) {
+                    if (in_array($rel_module, $emailableModules)) {
                         if (isset($field['vname']) && $field['vname'] != '') {
-                            $relEmailFields[$field['name']] = $app_list_strings['moduleList'][$rel_module] . ' : ' . translate($field['vname'], $mod->module_dir);
+                            $relEmailFields[$field['name']] = $app_list_strings['moduleList'][$rel_module].' : '.translate($field['vname'], $mod->module_dir);
                         } else {
-                            $relEmailFields[$field['name']] = $app_list_strings['moduleList'][$rel_module] . ' : ' . $field['name'];
+                            $relEmailFields[$field['name']] = $app_list_strings['moduleList'][$rel_module].' : '.$field['name'];
                         }
                     }
                 }
@@ -758,37 +758,37 @@  discard block
 block discarded – undo
     
     static $boolean_false_values = array('off', 'false', '0', 'no');
 
-    switch($bean->field_defs[$field]['type']) {
+    switch ($bean->field_defs[$field]['type']) {
         case 'datetime':
         case 'datetimecombo':
-            if(empty($value)) break;
+            if (empty($value)) break;
             if ($value == 'NULL') {
                 $value = '';
                 break;
             }
-            if ( ! preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}$/',$value) ) {
+            if (!preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}$/', $value)) {
                 // This appears to be formatted in user date/time
                 $value = $timedate->to_db($value);
             }
             break;
         case 'date':
-            if(empty($value)) break;
+            if (empty($value)) break;
             if ($value == 'NULL') {
                 $value = '';
                 break;
             }
-            if ( ! preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/',$value) ) {
+            if (!preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/', $value)) {
                 // This date appears to be formatted in the user's format
                 $value = $timedate->to_db_date($value, false);
             }
             break;
         case 'time':
-            if(empty($value)) break;
+            if (empty($value)) break;
             if ($value == 'NULL') {
                 $value = '';
                 break;
             }
-            if ( preg_match('/(am|pm)/i',$value) ) {
+            if (preg_match('/(am|pm)/i', $value)) {
                 // This time appears to be formatted in the user's format
                 $value = $timedate->fromUserTime($value)->format(TimeDate::DB_TIME_FORMAT);
             }
@@ -797,10 +797,10 @@  discard block
 block discarded – undo
         case 'decimal':
         case 'currency':
         case 'float':
-            if ( $value === '' || $value == NULL || $value == 'NULL') {
+            if ($value === '' || $value == NULL || $value == 'NULL') {
                 continue;
             }
-            if ( is_string($value) ) {
+            if (is_string($value)) {
                 $value = (float)unformat_number($value);
             }
             break;
@@ -810,19 +810,19 @@  discard block
 block discarded – undo
         case 'short':
         case 'tinyint':
         case 'int':
-            if ( $value === '' || $value == NULL || $value == 'NULL') {
+            if ($value === '' || $value == NULL || $value == 'NULL') {
                 continue;
             }
-            if ( is_string($value) ) {
+            if (is_string($value)) {
                 $value = (int)unformat_number($value);
             }
             break;
         case 'bool':
             if (empty($value)) {
                 $value = false;
-            } else if(true === $value || 1 == $value) {
+            } else if (true === $value || 1 == $value) {
                 $value = true;
-            } else if(in_array(strval($value), $boolean_false_values)) {
+            } else if (in_array(strval($value), $boolean_false_values)) {
                 $value = false;
             } else {
                 $value = true;

Please login to merge, or discard this patch.

		@@ -112,17 +112,17 @@
		block discarded – undo
112	112	'LBL_FP_EVENTS_LEADS_1_FROM_LEADS_TITLE' => 'Leads',
113	113	'LBL_FP_EVENTS_PROSPECTS_1_FROM_PROSPECTS_TITLE' => 'Targets',
114	114
115		- 'LBL_HOURS_ABBREV' => 'h',
116		- 'LBL_MINSS_ABBREV' => 'm',
	115	+ 'LBL_HOURS_ABBREV' => 'h',
	116	+ 'LBL_MINSS_ABBREV' => 'm',
117	117
118		- // Attendance report
119		- 'LBL_CONTACT_NAME' => 'Name',
120		- 'LBL_ACCOUNT_NAME' => 'Company',
121		- 'LBL_SIGNATURE' => 'Signature',
122		- // contacts/leads/targets subpanels
123		- 'LBL_LIST_INVITE_STATUS_EVENT' => 'Invited',
124		- 'LBL_LIST_ACCEPT_STATUS_EVENT' => 'Status',
	118	+ // Attendance report
	119	+ 'LBL_CONTACT_NAME' => 'Name',
	120	+ 'LBL_ACCOUNT_NAME' => 'Company',
	121	+ 'LBL_SIGNATURE' => 'Signature',
	122	+ // contacts/leads/targets subpanels
	123	+ 'LBL_LIST_INVITE_STATUS_EVENT' => 'Invited',
	124	+ 'LBL_LIST_ACCEPT_STATUS_EVENT' => 'Status',
125	125
126		- 'LBL_ACTIVITY_STATUS' => 'Activity Status',
127		- 'LBL_FP_EVENT_LOCATIONS_FP_EVENTS_1_FROM_FP_EVENTS_TITLE' => 'Event Locations from Events Title',
	126	+ 'LBL_ACTIVITY_STATUS' => 'Activity Status',
	127	+ 'LBL_FP_EVENT_LOCATIONS_FP_EVENTS_1_FROM_FP_EVENTS_TITLE' => 'Event Locations from Events Title',
128	128	);

		@@ -23,19 +23,19 @@ discard block
		block discarded – undo
23	23	*/
24	24
25	25
26		-function display_condition_lines($focus, $field, $value, $view){
	26	+function display_condition_lines($focus, $field, $value, $view) {
27	27
28	28	global $locale, $app_list_strings, $mod_strings;
29	29
30	30	$html = '';
31	31
32		- if (!is_file('cache/jsLanguage/AOR_Conditions/' . $GLOBALS['current_language'] . '.js')) {
	32	+ if (!is_file('cache/jsLanguage/AOR_Conditions/'.$GLOBALS['current_language'].'.js')) {
33	33	require_once ('include/language/jsLanguage.php');
34	34	jsLanguage::createModuleStringsCache('AOR_Conditions', $GLOBALS['current_language']);
35	35	}
36		- $html .= '<script src="cache/jsLanguage/AOR_Conditions/'. $GLOBALS['current_language'] . '.js"></script>';
	36	+ $html .= '<script src="cache/jsLanguage/AOR_Conditions/'.$GLOBALS['current_language'].'.js"></script>';
37	37
38		- if($view == 'EditView'){
	38	+ if ($view == 'EditView') {
39	39
40	40	$html .= '<script src="modules/AOR_Conditions/conditionLines.js"></script>';
41	41	$html .= "<table border='0' cellspacing='4' width='100%' id='aor_conditionLines'></table>";
		@@ -45,12 +45,12 @@ discard block
		block discarded – undo
45	45	$html .= "</div>";
46	46
47	47
48		- if(isset($focus->report_module) && $focus->report_module != ''){
	48	+ if (isset($focus->report_module) && $focus->report_module != '') {
49	49	require_once("modules/AOW_WorkFlow/aow_utils.php");
50	50	$html .= "<script>";
51	51	$html .= "report_module = \"".$focus->report_module."\";";
52	52	$html .= "document.getElementById('btn_ConditionLine').disabled = '';";
53		- if($focus->id != ''){
	53	+ if ($focus->id != '') {
54	54	$sql = "SELECT id FROM aor_conditions WHERE aor_report_id = '".$focus->id."' AND deleted = 0 ORDER BY condition_order ASC";
55	55	$result = $focus->db->query($sql);
56	56
		@@ -58,8 +58,8 @@ discard block
		block discarded – undo
58	58	$condition_name = new AOR_Condition();
59	59	$condition_name->retrieve($row['id']);
60	60	$condition_name->module_path = unserialize(base64_decode($condition_name->module_path));
61		- $html .= "report_fields = \"".trim(preg_replace('/\s+/', ' ', getModuleFields(getRelatedModule($focus->report_module,$condition_name->module_path[0]))))."\";";
62		- if($condition_name->value_type == 'Date'){
	61	+ $html .= "report_fields = \"".trim(preg_replace('/\s+/', ' ', getModuleFields(getRelatedModule($focus->report_module, $condition_name->module_path[0]))))."\";";
	62	+ if ($condition_name->value_type == 'Date') {
63	63	$condition_name->value = unserialize(base64_decode($condition_name->value));
64	64	}
65	65	$condition_item = json_encode($condition_name->toArray());
		@@ -71,12 +71,12 @@ discard block
		block discarded – undo
71	71	}
72	72
73	73	}
74		- else if($view == 'DetailView'){
	74	+ else if ($view == 'DetailView') {
75	75	$html .= '<script src="modules/AOR_Conditions/conditionLines.js"></script>';
76	76	$html .= "<table border='0' cellspacing='0' width='100%' id='aor_conditionLines'></table>";
77	77
78	78
79		- if(isset($focus->report_module) && $focus->report_module != ''){
	79	+ if (isset($focus->report_module) && $focus->report_module != '') {
80	80	require_once("modules/AOW_WorkFlow/aow_utils.php");
81	81	$html .= "<script>";
82	82	$html .= "report_fields = \"".trim(preg_replace('/\s+/', ' ', getModuleFields($focus->report_module)))."\";";
		@@ -88,7 +88,7 @@ discard block
		block discarded – undo
88	88	$condition_name = new AOR_Condition();
89	89	$condition_name->retrieve($row['id']);
90	90	$condition_name->module_path = unserialize(base64_decode($condition_name->module_path));
91		- if($condition_name->value_type == 'Date'){
	91	+ if ($condition_name->value_type == 'Date') {
92	92	$condition_name->value = unserialize(base64_decode($condition_name->value));
93	93	}
94	94	$condition_item = json_encode($condition_name->toArray());

		@@ -70,8 +70,7 @@
		block discarded – undo
70	70	$html .= "</script>";
71	71	}
72	72
73		- }
74		- else if($view == 'DetailView'){
	73	+ } else if($view == 'DetailView'){
75	74	$html .= '<script src="modules/AOR_Conditions/conditionLines.js"></script>';
76	75	$html .= "<table border='0' cellspacing='0' width='100%' id='aor_conditionLines'></table>";
77	76

adamjakab / SuiteCRM

Push — develop ( 695bbe )

Status

Category

Indentation +11 added lines, -11 removed lines patch added patch discarded remove patch

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

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

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

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