adamjakab / SuiteCRM

modules/EmailTemplates/EditView.php

Braces +42 added lines, -12 removed lines

@@ -68,7 +68,9 @@ 
 
 
 //setting default flag value so due date and time not required
-if (!isset($focus->id)) $focus->date_due_flag = 1;
+if (!isset($focus->id)) {
+    $focus->date_due_flag = 1;
+}
 
 //needed when creating a new case with default values passed in
 if (isset($_REQUEST['contact_name']) && is_null($focus->contact_name)) {
@@ -130,12 +132,16 @@ 
 $xtpl->parse("main.variable_option");
 
 $returnAction = 'index';
-if (isset($_REQUEST['return_module'])) $xtpl->assign("RETURN_MODULE", $_REQUEST['return_module']);
+if (isset($_REQUEST['return_module'])) {
+    $xtpl->assign("RETURN_MODULE", $_REQUEST['return_module']);
+}
 if (isset($_REQUEST['return_action'])) {
     $xtpl->assign("RETURN_ACTION", $_REQUEST['return_action']);
     $returnAction = $_REQUEST['return_action'];
 }
-if (isset($_REQUEST['return_id'])) $xtpl->assign("RETURN_ID", $_REQUEST['return_id']);
+if (isset($_REQUEST['return_id'])) {
+    $xtpl->assign("RETURN_ID", $_REQUEST['return_id']);
+}
 // handle Create $module then Cancel
 if (empty($_REQUEST['return_id'])) {
     $xtpl->assign("RETURN_ACTION", 'index');
@@ -164,8 +170,9 @@ 
 );
 $json = getJSONobj();
 $xtpl->assign('encoded_assigned_users_popup_request_data', $json->encode($popup_request_data));
-if (!empty($focus->assigned_user_name))
+if (!empty($focus->assigned_user_name)) {
     $xtpl->assign("ASSIGNED_USER_NAME", $focus->assigned_user_name);
+}
 
 $xtpl->assign("assign_user_select", SugarThemeRegistry::current()->getImage('id-ff-select', '', null, null, '.png', $mod_strings['LBL_SELECT']));
 $xtpl->assign("assign_user_clear", SugarThemeRegistry::current()->getImage('id-ff-clear', '', null, null, '.gif', $mod_strings['LBL_ID_FF_CLEAR']));
@@ -187,23 +194,38 @@ 
 $xtpl->assign("JSLANG", $jsLang);
 
 $xtpl->assign("ID", $focus->id);
-if (isset($focus->name)) $xtpl->assign("NAME", $focus->name); else $xtpl->assign("NAME", "");
+if (isset($focus->name)) {
+    $xtpl->assign("NAME", $focus->name);
+} else {
+    $xtpl->assign("NAME", "");
+}
 
 //Bug45632
 /* BEGIN - SECURITY GROUPS */
 /**
  * if(isset($focus->assigned_user_id)) $xtpl->assign("ASSIGNED_USER_ID", $focus->assigned_user_id); else $xtpl->assign("ASSIGNED_USER_ID", "");
  */
-if (isset($focus->assigned_user_id)) $xtpl->assign("ASSIGNED_USER_ID", $focus->assigned_user_id);
-else if (empty($focus->id) && empty($focus->assigned_user_id)) {
+if (isset($focus->assigned_user_id)) {
+    $xtpl->assign("ASSIGNED_USER_ID", $focus->assigned_user_id);
+} else if (empty($focus->id) && empty($focus->assigned_user_id)) {
     $xtpl->assign("ASSIGNED_USER_ID", $current_user->id);
     $xtpl->assign("ASSIGNED_USER_NAME", get_assigned_user_name($current_user->id));
-} else $xtpl->assign("ASSIGNED_USER_ID", "");
+} else {
+    $xtpl->assign("ASSIGNED_USER_ID", "");
+}
 /* END - SECURITY GROUPS */
 //Bug45632
 
-if (isset($focus->description)) $xtpl->assign("DESCRIPTION", $focus->description); else $xtpl->assign("DESCRIPTION", "");
-if (isset($focus->subject)) $xtpl->assign("SUBJECT", $focus->subject); else $xtpl->assign("SUBJECT", "");
+if (isset($focus->description)) {
+    $xtpl->assign("DESCRIPTION", $focus->description);
+} else {
+    $xtpl->assign("DESCRIPTION", "");
+}
+if (isset($focus->subject)) {
+    $xtpl->assign("SUBJECT", $focus->subject);
+} else {
+    $xtpl->assign("SUBJECT", "");
+}
 if ($focus->published == 'on') {
     $xtpl->assign("PUBLISHED", "CHECKED");
 }
@@ -244,8 +266,16 @@ 
 $xtpl->assign("TYPE_OPTIONS", get_select_options_with_id($app_list_strings['record_type_display'], $focus->parent_type));
 //$xtpl->assign("DEFAULT_MODULE","Accounts");
 
-if (isset($focus->body)) $xtpl->assign("BODY", $focus->body); else $xtpl->assign("BODY", "");
-if (isset($focus->body_html)) $xtpl->assign("BODY_HTML", $focus->body_html); else $xtpl->assign("BODY_HTML", "");
+if (isset($focus->body)) {
+    $xtpl->assign("BODY", $focus->body);
+} else {
+    $xtpl->assign("BODY", "");
+}
+if (isset($focus->body_html)) {
+    $xtpl->assign("BODY_HTML", $focus->body_html);
+} else {
+    $xtpl->assign("BODY_HTML", "");
+}
 
 
 // ---------------------------------

modules/FP_events/language/en_us.lang.php

Indentation +11 added lines, -11 removed lines

@@ -112,17 +112,17 @@
     'LBL_FP_EVENTS_LEADS_1_FROM_LEADS_TITLE' => 'Leads',
     'LBL_FP_EVENTS_PROSPECTS_1_FROM_PROSPECTS_TITLE' => 'Targets',
     'LBL_FP_EVENTS_FP_EVENT_DELEGATES_1_FROM_FP_EVENT_DELEGATES_TITLE' => 'Delegates',
-	'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',
 );

modules/Home/language/en_us.lang.php

Indentation +9 added lines, -9 removed lines

@@ -137,15 +137,15 @@
 
     'LBL_SOURCE_SUGAR' => 'SugarCRM Inc - providers of CE framework',
 
-  'LBL_DASHLET_TITLE' => 'My Sites',
-  'LBL_DASHLET_OPT_TITLE' => 'Title',
-  'LBL_DASHLET_INCORRECT_URL' => 'Incorrect website location is specified',
-  'LBL_DASHLET_OPT_URL' => 'Website Location',
-  'LBL_DASHLET_OPT_HEIGHT' => 'Dashlet Height (in pixels)',
-  'LBL_DASHLET_SUGAR_NEWS' => 'SuiteCRM News',
-  'LBL_DASHLET_DISCOVER_SUGAR_PRO' => 'Discover SuiteCRM',
-	'LBL_BASIC_SEARCH' => 'Quick Filter' /*for 508 compliance fix*/,
-	'LBL_ADVANCED_SEARCH' => 'Advanced Filter' /*for 508 compliance fix*/,
+    'LBL_DASHLET_TITLE' => 'My Sites',
+    'LBL_DASHLET_OPT_TITLE' => 'Title',
+    'LBL_DASHLET_INCORRECT_URL' => 'Incorrect website location is specified',
+    'LBL_DASHLET_OPT_URL' => 'Website Location',
+    'LBL_DASHLET_OPT_HEIGHT' => 'Dashlet Height (in pixels)',
+    'LBL_DASHLET_SUGAR_NEWS' => 'SuiteCRM News',
+    'LBL_DASHLET_DISCOVER_SUGAR_PRO' => 'Discover SuiteCRM',
+    'LBL_BASIC_SEARCH' => 'Quick Filter' /*for 508 compliance fix*/,
+    'LBL_ADVANCED_SEARCH' => 'Advanced Filter' /*for 508 compliance fix*/,
     'LBL_TOUR_HOME' => 'Home Icon',
     'LBL_TOUR_HOME_DESCRIPTION' => 'Quickly get back to your Home Page dashboard in one click.',
     'LBL_TOUR_MODULES' => 'Modules',

modules/OutboundEmailAccounts/language/en_us.lang.php

Indentation +33 added lines, -33 removed lines

@@ -43,39 +43,39 @@
 }
 
 $mod_strings = array (
-  'LBL_ASSIGNED_TO_ID' => 'Assigned User Id',
-  'LBL_ASSIGNED_TO_NAME' => 'Assigned to',
-  'LBL_ID' => 'ID',
-  'LBL_DATE_ENTERED' => 'Date Created',
-  'LBL_DATE_MODIFIED' => 'Date Modified',
-  'LBL_MODIFIED' => 'Modified By',
-  'LBL_MODIFIED_NAME' => 'Modified By Name',
-  'LBL_CREATED' => 'Created By',
-  'LBL_DESCRIPTION' => 'Description',
-  'LBL_DELETED' => 'Deleted',
-  'LBL_NAME' => 'Name',
-  'LBL_CREATED_USER' => 'Created by User',
-  'LBL_MODIFIED_USER' => 'Modified by User',
-  'LBL_LIST_NAME' => 'Name',
-  'LBL_EDIT_BUTTON' => 'Edit',
-  'LBL_REMOVE' => 'Remove',
-  'LBL_LIST_FORM_TITLE' => 'Outbound Email Accounts List',
-  'LBL_MODULE_NAME' => 'Outbound Email Accounts',
-  'LBL_MODULE_TITLE' => 'Outbound Email Accounts',
-  'LBL_HOMEPAGE_TITLE' => 'My Outbound Email Accounts',
-  'LNK_NEW_RECORD' => 'Create Outbound Email Accounts',
-  'LNK_LIST' => 'View Outbound Email Accounts',
-  'LBL_SEARCH_FORM_TITLE' => 'Search Outbound Email Accounts',
-  'LBL_HISTORY_SUBPANEL_TITLE' => 'View History',
-  'LBL_ACTIVITIES_SUBPANEL_TITLE' => 'Activities',
-  'LBL_NEW_FORM_TITLE' => 'New Outbound Email Accounts',
-  'LBL_USERNAME' => 'Username',
-  'LBL_PASSWORD' => 'Password',
-  'LBL_SMTP_SERVERNAME' => 'SMTP Server Name',
-  'LBL_SMTP_AUTH' => 'SMTP Auth',
-  'LBL_SMTP_PORT' => 'SMTP Port',
-  'LBL_SMTP_PROTOCOL' => 'SMTP Protocol',
-  'LBL_EDITVIEW_PANEL1' => 'Account settings',
+    'LBL_ASSIGNED_TO_ID' => 'Assigned User Id',
+    'LBL_ASSIGNED_TO_NAME' => 'Assigned to',
+    'LBL_ID' => 'ID',
+    'LBL_DATE_ENTERED' => 'Date Created',
+    'LBL_DATE_MODIFIED' => 'Date Modified',
+    'LBL_MODIFIED' => 'Modified By',
+    'LBL_MODIFIED_NAME' => 'Modified By Name',
+    'LBL_CREATED' => 'Created By',
+    'LBL_DESCRIPTION' => 'Description',
+    'LBL_DELETED' => 'Deleted',
+    'LBL_NAME' => 'Name',
+    'LBL_CREATED_USER' => 'Created by User',
+    'LBL_MODIFIED_USER' => 'Modified by User',
+    'LBL_LIST_NAME' => 'Name',
+    'LBL_EDIT_BUTTON' => 'Edit',
+    'LBL_REMOVE' => 'Remove',
+    'LBL_LIST_FORM_TITLE' => 'Outbound Email Accounts List',
+    'LBL_MODULE_NAME' => 'Outbound Email Accounts',
+    'LBL_MODULE_TITLE' => 'Outbound Email Accounts',
+    'LBL_HOMEPAGE_TITLE' => 'My Outbound Email Accounts',
+    'LNK_NEW_RECORD' => 'Create Outbound Email Accounts',
+    'LNK_LIST' => 'View Outbound Email Accounts',
+    'LBL_SEARCH_FORM_TITLE' => 'Search Outbound Email Accounts',
+    'LBL_HISTORY_SUBPANEL_TITLE' => 'View History',
+    'LBL_ACTIVITIES_SUBPANEL_TITLE' => 'Activities',
+    'LBL_NEW_FORM_TITLE' => 'New Outbound Email Accounts',
+    'LBL_USERNAME' => 'Username',
+    'LBL_PASSWORD' => 'Password',
+    'LBL_SMTP_SERVERNAME' => 'SMTP Server Name',
+    'LBL_SMTP_AUTH' => 'SMTP Auth',
+    'LBL_SMTP_PORT' => 'SMTP Port',
+    'LBL_SMTP_PROTOCOL' => 'SMTP Protocol',
+    'LBL_EDITVIEW_PANEL1' => 'Account settings',
     'LBL_CHANGE_PASSWORD' => 'Change password',
     'LBL_SEND_TEST_EMAIL' => 'Send Test Email',
 

modules/AOR_Reports/AOR_Report.php

Spacing +174 added lines, -174 removed lines

@@ -170,7 +170,7 @@ 
         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 @@ 
             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 @@ 
                         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 @@ 
         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 @@ 
         $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 @@ 
                         $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 @@ 
     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 @@ 
     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 @@ 
         $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 @@ 
                 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 @@ 
                     '_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 @@ 
             }
 
             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 @@ 
             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 @@ 
 
         $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 @@ 
             $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 @@ 
 
             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 @@ 
 
             $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 @@ 
                         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 @@ 
 
         $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 @@ 
     {
         $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 @@ 
                         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 @@ 
                 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 @@ 
                             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 @@ 
                     default:
                         break;
                 }
-                $html .= "<td>" . $total . "</td>";
+                $html .= "<td>".$total."</td>";
             } else {
                 $html .= "<td></td>";
             }
@@ -920,7 +920,7 @@ 
 
     private function encloseForCSV($field)
     {
-        return '"' . $field . '"';
+        return '"'.$field.'"';
     }
 
     function build_report_csv()
@@ -935,7 +935,7 @@ 
         $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 @@ 
                         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 @@ 
         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 @@ 
 
         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 @@ 
 
         $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 @@ 
         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 @@ 
         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 @@ 
                 $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 @@ 
                     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 @@ 
 
                 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 @@ 
                 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;
@@ -1242,7 +1242,7 @@ 
 
             switch ($type) {
                 case 'custom':
-                    $query['join'][$alias] = 'LEFT JOIN ' . $this->db->quoteIdentifier($module->get_custom_table_name()) . ' ' . $this->db->quoteIdentifier($name) . ' ON ' . $this->db->quoteIdentifier($parentAlias) . '.id = ' . $this->db->quoteIdentifier($name) . '.id_c ';
+                    $query['join'][$alias] = 'LEFT JOIN '.$this->db->quoteIdentifier($module->get_custom_table_name()).' '.$this->db->quoteIdentifier($name).' ON '.$this->db->quoteIdentifier($parentAlias).'.id = '.$this->db->quoteIdentifier($name).'.id_c ';
                     break;
 
                 case 'relationship':
@@ -1264,7 +1264,7 @@ 
                             $params['join_table_alias'] = $this->db->quoteIdentifier($alias);
                             $params['left_join_table_alias'] = $this->db->quoteIdentifier($parentAlias);
                         }
-                        $linkAlias = $parentAlias . "|" . $alias;
+                        $linkAlias = $parentAlias."|".$alias;
                         $params['join_table_link_alias'] = $this->db->quoteIdentifier($linkAlias);
                         $join = $module->$name->getJoin($params, true);
                         $query['join'][$alias] = $join['join'];
@@ -1272,7 +1272,7 @@ 
                             $query['join'][$alias] .= $this->build_report_access_query($rel_module,
                                 $this->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;
@@ -1294,7 +1294,7 @@ 
         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;
 
         }
 
@@ -1306,9 +1306,9 @@ 
                 $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 */
@@ -1344,7 +1344,7 @@ 
         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;
@@ -1370,7 +1370,7 @@ 
                             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;
@@ -1401,16 +1401,16 @@ 
 
                         // 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) {
@@ -1446,11 +1446,11 @@ 
                                 $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;
 
@@ -1474,17 +1474,17 @@ 
                                         //$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];
                                     }
                                 }
                             }
@@ -1496,9 +1496,9 @@ 
                                         $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;
                                 }
@@ -1517,11 +1517,11 @@ 
                                     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":
@@ -1530,11 +1530,11 @@ 
                             } 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");
@@ -1543,132 +1543,132 @@ 
                             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) {
@@ -1679,28 +1679,28 @@ 
                                 $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;
                             }
                         }
                     }
@@ -1708,7 +1708,7 @@ 
                 } 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'][] = ')';
@@ -1725,7 +1725,7 @@ 
                 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);
 
         }

modules/AOR_Reports/aor_utils.php

Spacing +4 added lines, -4 removed lines

@@ -111,9 +111,9 @@ 
             if ($_REQUEST['parameter_type'][$key] === 'Date') {
                 $values = array();
                 $values[] = $_REQUEST['parameter_value'][0];
-                $values[] = $_REQUEST['parameter_value'][1];;
-                $values[] = $_REQUEST['parameter_value'][2];;
-                $values[] = $_REQUEST['parameter_value'][3];;
+                $values[] = $_REQUEST['parameter_value'][1]; ;
+                $values[] = $_REQUEST['parameter_value'][2]; ;
+                $values[] = $_REQUEST['parameter_value'][3]; ;
 
                 $params[$parameterId] = array(
                     'id' => $parameterId,
@@ -392,7 +392,7 @@ 
     $offsetMonths -= 1;
     // Offset months
     if ($offsetMonths > 0) {
-        $q1start->add(new DateInterval('P' . $offsetMonths . 'M'));
+        $q1start->add(new DateInterval('P'.$offsetMonths.'M'));
     }
     $q1end = DateTime::createFromFormat(DATE_ISO8601, $q1start->format(DATE_ISO8601));
     $q1end->add(new DateInterval('P2M'));

modules/AOBH_BusinessHours/language/en_us.lang.php

Indentation +30 added lines, -30 removed lines

@@ -43,34 +43,34 @@
 }
 
 $mod_strings = array (
-  'LBL_ASSIGNED_TO_ID' => 'Assigned User Id',
-  'LBL_ASSIGNED_TO_NAME' => 'Assigned to',
-  'LBL_ID' => 'ID',
-  'LBL_DATE_ENTERED' => 'Date Created',
-  'LBL_DATE_MODIFIED' => 'Date Modified',
-  'LBL_MODIFIED' => 'Modified By',
-  'LBL_MODIFIED_NAME' => 'Modified By Name',
-  'LBL_CREATED' => 'Created By',
-  'LBL_DESCRIPTION' => 'Description',
-  'LBL_DELETED' => 'Deleted',
-  'LBL_NAME' => 'Name',
-  'LBL_CREATED_USER' => 'Created by User',
-  'LBL_MODIFIED_USER' => 'Modified by User',
-  'LBL_LIST_NAME' => 'Name',
-  'LBL_EDIT_BUTTON' => 'Edit',
-  'LBL_REMOVE' => 'Remove',
-  'LBL_LIST_FORM_TITLE' => 'Business Hours List',
-  'LBL_MODULE_NAME' => 'Business Hours',
-  'LBL_MODULE_TITLE' => 'Business Hours',
-  'LBL_HOMEPAGE_TITLE' => 'My Business Hours',
-  'LNK_NEW_RECORD' => 'Create Business Hours',
-  'LNK_LIST' => 'View Business Hours',
-  'LBL_SEARCH_FORM_TITLE' => 'Search Business Hours',
-  'LBL_HISTORY_SUBPANEL_TITLE' => 'View History',
-  'LBL_ACTIVITIES_SUBPANEL_TITLE' => 'Activities',
-  'LBL_NEW_FORM_TITLE' => 'New Business Hours',
-  'LBL_OPENING_HOURS' => 'Opening Hours',
-  'LBL_CLOSING_HOURS' => 'Closing Hours',
-  'LBL_DAY' => 'Day',
-  'LBL_OPEN' => 'Open',
+    'LBL_ASSIGNED_TO_ID' => 'Assigned User Id',
+    'LBL_ASSIGNED_TO_NAME' => 'Assigned to',
+    'LBL_ID' => 'ID',
+    'LBL_DATE_ENTERED' => 'Date Created',
+    'LBL_DATE_MODIFIED' => 'Date Modified',
+    'LBL_MODIFIED' => 'Modified By',
+    'LBL_MODIFIED_NAME' => 'Modified By Name',
+    'LBL_CREATED' => 'Created By',
+    'LBL_DESCRIPTION' => 'Description',
+    'LBL_DELETED' => 'Deleted',
+    'LBL_NAME' => 'Name',
+    'LBL_CREATED_USER' => 'Created by User',
+    'LBL_MODIFIED_USER' => 'Modified by User',
+    'LBL_LIST_NAME' => 'Name',
+    'LBL_EDIT_BUTTON' => 'Edit',
+    'LBL_REMOVE' => 'Remove',
+    'LBL_LIST_FORM_TITLE' => 'Business Hours List',
+    'LBL_MODULE_NAME' => 'Business Hours',
+    'LBL_MODULE_TITLE' => 'Business Hours',
+    'LBL_HOMEPAGE_TITLE' => 'My Business Hours',
+    'LNK_NEW_RECORD' => 'Create Business Hours',
+    'LNK_LIST' => 'View Business Hours',
+    'LBL_SEARCH_FORM_TITLE' => 'Search Business Hours',
+    'LBL_HISTORY_SUBPANEL_TITLE' => 'View History',
+    'LBL_ACTIVITIES_SUBPANEL_TITLE' => 'Activities',
+    'LBL_NEW_FORM_TITLE' => 'New Business Hours',
+    'LBL_OPENING_HOURS' => 'Opening Hours',
+    'LBL_CLOSING_HOURS' => 'Closing Hours',
+    'LBL_DAY' => 'Day',
+    'LBL_OPEN' => 'Open',
 );
\ No newline at end of file

modules/AOK_KnowledgeBase/language/en_us.lang.php

Indentation +33 added lines, -33 removed lines

@@ -43,39 +43,39 @@
 }
 
 $mod_strings = array (
-  'LBL_ASSIGNED_TO_ID' => 'Assigned User Id',
-  'LBL_ASSIGNED_TO_NAME' => 'Assigned to',
-  'LBL_ID' => 'ID',
-  'LBL_DATE_ENTERED' => 'Date Created',
-  'LBL_DATE_MODIFIED' => 'Date Modified',
-  'LBL_MODIFIED' => 'Modified By',
-  'LBL_MODIFIED_NAME' => 'Modified By Name',
-  'LBL_CREATED' => 'Created By',
-  'LBL_DESCRIPTION' => 'Body',
-  'LBL_ADDITIONAL_INFO' => 'Resolution',
-  'LBL_DELETED' => 'Deleted',
-  'LBL_NAME' => 'Title',
-  'LBL_CREATED_USER' => 'Created by User',
-  'LBL_MODIFIED_USER' => 'Modified by User',
-  'LBL_LIST_NAME' => 'Name',
-  'LBL_EDIT_BUTTON' => 'Edit',
-  'LBL_REMOVE' => 'Remove',
-  'LBL_LIST_FORM_TITLE' => 'Knowledge Base List',
-  'LBL_MODULE_NAME' => 'Knowledge Base',
-  'LBL_MODULE_TITLE' => 'Knowledge Base',
-  'LBL_HOMEPAGE_TITLE' => 'My Knowledge Base',
-  'LNK_NEW_RECORD' => 'Create Knowledge Base',
-  'LNK_LIST' => 'View Knowledge Base',
-  'LBL_SEARCH_FORM_TITLE' => 'Search Knowledge Base',
-  'LBL_HISTORY_SUBPANEL_TITLE' => 'View History',
-  'LBL_ACTIVITIES_SUBPANEL_TITLE' => 'Activities',
-  'LBL_NEW_FORM_TITLE' => 'New Knowledge Base',
-  'LBL_STATUS' => 'Status',
-  'LBL_REVISION' => 'Revision',
-  'LBL_AUTHOR_USER_ID' => 'Author (related User ID)',
-  'LBL_AUTHOR' => 'Author',
-  'LBL_APPROVER_USER_ID' => 'Approver (related User ID)',
-  'LBL_APPROVER' => 'Approver',
+    'LBL_ASSIGNED_TO_ID' => 'Assigned User Id',
+    'LBL_ASSIGNED_TO_NAME' => 'Assigned to',
+    'LBL_ID' => 'ID',
+    'LBL_DATE_ENTERED' => 'Date Created',
+    'LBL_DATE_MODIFIED' => 'Date Modified',
+    'LBL_MODIFIED' => 'Modified By',
+    'LBL_MODIFIED_NAME' => 'Modified By Name',
+    'LBL_CREATED' => 'Created By',
+    'LBL_DESCRIPTION' => 'Body',
+    'LBL_ADDITIONAL_INFO' => 'Resolution',
+    'LBL_DELETED' => 'Deleted',
+    'LBL_NAME' => 'Title',
+    'LBL_CREATED_USER' => 'Created by User',
+    'LBL_MODIFIED_USER' => 'Modified by User',
+    'LBL_LIST_NAME' => 'Name',
+    'LBL_EDIT_BUTTON' => 'Edit',
+    'LBL_REMOVE' => 'Remove',
+    'LBL_LIST_FORM_TITLE' => 'Knowledge Base List',
+    'LBL_MODULE_NAME' => 'Knowledge Base',
+    'LBL_MODULE_TITLE' => 'Knowledge Base',
+    'LBL_HOMEPAGE_TITLE' => 'My Knowledge Base',
+    'LNK_NEW_RECORD' => 'Create Knowledge Base',
+    'LNK_LIST' => 'View Knowledge Base',
+    'LBL_SEARCH_FORM_TITLE' => 'Search Knowledge Base',
+    'LBL_HISTORY_SUBPANEL_TITLE' => 'View History',
+    'LBL_ACTIVITIES_SUBPANEL_TITLE' => 'Activities',
+    'LBL_NEW_FORM_TITLE' => 'New Knowledge Base',
+    'LBL_STATUS' => 'Status',
+    'LBL_REVISION' => 'Revision',
+    'LBL_AUTHOR_USER_ID' => 'Author (related User ID)',
+    'LBL_AUTHOR' => 'Author',
+    'LBL_APPROVER_USER_ID' => 'Approver (related User ID)',
+    'LBL_APPROVER' => 'Approver',
 );
 
 $mod_strings['LBL_AOK_KB_CATEGORIES_TITLE'] = 'Categories';
\ No newline at end of file

install/language/en_us.lang.php

Indentation +427 added lines, -427 removed lines

@@ -43,296 +43,296 @@ 
 }
 
 $mod_strings = array(
-	'LBL_BASIC_SEARCH'					=> 'Quick Filter',
-	'LBL_ADVANCED_SEARCH'				=> 'Advanced Filter',
-	'LBL_BASIC_TYPE'					=> 'Basic Type',
-	'LBL_ADVANCED_TYPE'					=> 'Advanced Type',
-	'LBL_SYSOPTS_2'                     => 'What type of database will be used for the SuiteCRM instance you are about to install?',
-	'LBL_SYSOPTS_DB'					=> 'Specify Database Type',
-	'LBL_SYSOPTS_DB_TITLE'              => 'Database Type',
-	'LBL_SYSOPTS_ERRS_TITLE'			=> 'Please fix the following errors before proceeding:',
-	'ERR_DB_VERSION_FAILURE'			=> 'Unable to check database version.',
-	'DEFAULT_CHARSET'					=> 'UTF-8',
-	'ERR_ADMIN_USER_NAME_BLANK'         => 'Provide the user name for the SuiteCRM admin user. ',
-	'ERR_ADMIN_PASS_BLANK'				=> 'Provide the password for the SuiteCRM admin user. ',
-
-	'ERR_CHECKSYS'                      => 'Errors have been detected during compatibility check. In order for your SuiteCRM Installation to function properly, please take the proper steps to address the issues listed below and either press the recheck button, or try installing again.',
-	'ERR_CHECKSYS_CALL_TIME'            => 'Allow Call Time Pass Reference is On (this should be set to Off in php.ini)',
-	'ERR_CHECKSYS_CURL'					=> 'Not found: SuiteCRM Scheduler will run with limited functionality.',
-	'ERR_CHECKSYS_IMAP'					=> 'Not found: InboundEmail and Campaigns (Email) require the IMAP libraries. Neither will be functional.',
-	'ERR_CHECKSYS_MEM_LIMIT_1'			=> ' (Set this to ',
-	'ERR_CHECKSYS_MEM_LIMIT_2'			=> 'M or larger in your php.ini file)',
-	'ERR_CHECKSYS_NOT_WRITABLE'			=> 'Warning: Not Writable',
-	'ERR_CHECKSYS_PHP_INVALID_VER'		=> 'Your version of PHP is not supported by SuiteCRM. You will need to install a version that is compatible with the SuiteCRM application. Please consult the Compatibility Matrix in the Release Notes for supported PHP Versions. Your version is ',
-	'ERR_CHECKSYS_IIS_INVALID_VER'      => 'Your version of IIS is not supported by SuiteCRM. You will need to install a version that is compatible with the SuiteCRM application. Please consult the Compatibility Matrix in the Release Notes for supported IIS Versions. Your version is ',
-	'ERR_CHECKSYS_FASTCGI'              => 'We detect that you are not using a FastCGI handler mapping for PHP. You will need to install/configure a version that is compatible with the SuiteCRM application. Please consult the Compatibility Matrix in the Release Notes for supported Versions. Please see <a href="http://www.iis.net/php/" target="_blank">http://www.iis.net/php/</a> for details ',
-	'ERR_CHECKSYS_FASTCGI_LOGGING'      => 'For optimal experience using IIS/FastCGI sapi, set fastcgi.logging to 0 in your php.ini file.',
-	'LBL_DB_UNAVAILABLE'                => 'Database unavailable',
-	'LBL_CHECKSYS_DB_SUPPORT_NOT_AVAILABLE' => 'Database Support was not found. Please make sure you have the necessary drivers for one of the following supported Database Types: MySQL or MS SQLServer. You might need to uncomment the extension in the php.ini file, or recompile with the right binary file, depending on your version of PHP. Please refer to your PHP Manual for more information on how to enable Database Support.',
-	'LBL_CHECKSYS_XML_NOT_AVAILABLE'        => 'Functions associated with XML Parser Libraries that are needed by the SuiteCRM application were not found. You might need to uncomment the extension in the  php.ini file, or recompile with the right binary file, depending on your version of PHP. Please refer to your PHP Manual for more information.',
-	'ERR_CHECKSYS_MBSTRING'             => 'Functions associated with the Multibyte Strings PHP extension (mbstring) that are needed by the SuiteCRM application were not found. <br/><br/>Generally, the mbstring module is not enabled by default in PHP and must be activated with --enable-mbstring when the PHP binary is built. Please refer to your PHP Manual for more information on how to enable mbstring support.',
-	'ERR_CHECKSYS_CONFIG_NOT_WRITABLE'  => 'The config file exists but is not writeable. Please take the necessary steps to make the file writeable. Depending on your Operating system, this might require you to change the permissions by running chmod 766, or to right click on the filename to access the properties and uncheck the read only option.',
-	'ERR_CHECKSYS_CONFIG_OVERRIDE_NOT_WRITABLE'  => 'The config override file exists but is not writeable. Please take the necessary steps to make the file writeable. Depending on your Operating system, this might require you to change the permissions by running chmod 766, or to right click on the filename to access the properties and uncheck the read only option.',
-	'ERR_CHECKSYS_CUSTOM_NOT_WRITABLE'  => 'The Custom Directory exists but is not writeable. You may have to change permissions on it (chmod 766) or right click on it and uncheck the read only option, depending on your Operating System. Please take the needed steps to make the file writeable.',
-	'ERR_CHECKSYS_FILES_NOT_WRITABLE'   => "The files or directories listed below are not writeable or are missing and cannot be created. Depending on your Operating System, correcting this may require you to change permissions on the files or parent directory (chmod 755), or to right click on the parent directory and uncheck the 'read only' option and apply it to all subfolders.",
-	'LBL_CHECKSYS_OVERRIDE_CONFIG' => 'Config override',
-	'ERR_CHECKSYS_SAFE_MODE'			=> 'Safe Mode is On (you may wish to disable in php.ini)',
-	'ERR_CHECKSYS_ZLIB'					=> 'ZLib support not found: SuiteCRM reaps enormous performance benefits with zlib compression.',
-	'ERR_CHECKSYS_ZIP'					=> 'ZIP support not found: SuiteCRM needs ZIP support in order to process compressed files.',
-	'ERR_CHECKSYS_PCRE'					=> 'PCRE library not found: SuiteCRM needs PCRE library in order to process Perl style of regular expression pattern matching.',
-	'ERR_CHECKSYS_PCRE_VER'				=> 'PCRE library version: SuiteCRM needs PCRE library 7.0 or above to process Perl style of regular expression pattern matching.',
-	'ERR_DB_ADMIN'						=> 'The provided database administrator username and/or password is invalid, and a connection to the database could not be established. Please enter a valid user name and password. (Error: ',
-	'ERR_DB_ADMIN_MSSQL'                => 'The provided database administrator username and/or password is invalid, and a connection to the database could not be established. Please enter a valid user name and password.',
-	'ERR_DB_EXISTS_NOT'					=> 'The specified database does not exist.',
-	'ERR_DB_EXISTS_WITH_CONFIG'			=> 'Database already exists with config data. To run an install with the chosen database, please re-run the install and choose: "Drop and recreate existing SuiteCRM tables?"  To upgrade, use the Upgrade Wizard in the Admin Console. Please read the upgrade documentation located <a href="http://www.suitecrm.com" target="_new">here</a>.',
-	'ERR_DB_EXISTS'						=> 'The provided Database Name already exists -- cannot create another one with the same name.',
-	'ERR_DB_EXISTS_PROCEED'             => 'The provided Database Name already exists. You can<br>1. hit the back button and choose a new database name <br>2. click next and continue but all existing tables on this database will be dropped. <strong>This means your tables and data will be blown away.</strong>',
-	'ERR_DB_HOSTNAME'					=> 'Host name cannot be blank.',
-	'ERR_DB_INVALID'					=> 'Invalid database type selected.',
-	'ERR_DB_LOGIN_FAILURE'				=> 'The provided database host, username, and/or password is invalid, and a connection to the database could not be established. Please enter a valid host, username and password',
-	'ERR_DB_LOGIN_FAILURE_MYSQL'		=> 'The provided database host, username, and/or password is invalid, and a connection to the database could not be established. Please enter a valid host, username and password',
-	'ERR_DB_LOGIN_FAILURE_MSSQL'		=> 'The provided database host, username, and/or password is invalid, and a connection to the database could not be established. Please enter a valid host, username and password',
-	'ERR_DB_MYSQL_VERSION'				=> 'Your MySQL version (%s) is not supported by SuiteCRM. You will need to install a version that is compatible with the SuiteCRM application. Please consult the Compatibility Matrix in the Release Notes for supported MySQL versions.',
-	'ERR_DB_NAME'						=> 'Database name cannot be blank.',
-	'ERR_DB_MYSQL_DB_NAME_INVALID'      => "Database name cannot contain a '\\', '/', or '.'",
-	'ERR_DB_MSSQL_DB_NAME_INVALID'      => "Database name cannot begin with a number, '#', or '@' and cannot contain a space, '\"', \"'\", '*', '/', '\', '?', ':', '<', '>', '&', '!', or '-'",
-	'ERR_DB_OCI8_DB_NAME_INVALID'       => "Database name can only consist of alphanumeric characters and the symbols '#', '_' or '$'",
-	'ERR_DB_PASSWORD'					=> 'The passwords provided for the SuiteCRM database administrator do not match. Please re-enter the same passwords in the password fields.',
-	'ERR_DB_PRIV_USER'					=> 'Provide a database administrator user name. The user is required for the initial connection to the database.',
-	'ERR_DB_USER_EXISTS'				=> 'User name for SuiteCRM database user already exists -- cannot create another one with the same name. Please enter a new user name.',
-	'ERR_DB_USER'						=> 'Enter a user name for the SuiteCRM database administrator.',
-	'ERR_DBCONF_VALIDATION'				=> 'Please fix the following errors before proceeding:',
-	'ERR_DBCONF_PASSWORD_MISMATCH'      => 'The passwords provided for the SuiteCRM database user do not match. Please re-enter the same passwords in the password fields.',
-	'ERR_ERROR_GENERAL'					=> 'The following errors were encountered:',
-	'ERR_LANG_CANNOT_DELETE_FILE'		=> 'Cannot delete file: ',
-	'ERR_LANG_MISSING_FILE'				=> 'Cannot find file: ',
-	'ERR_LANG_NO_LANG_FILE'			 	=> 'No language pack file found at include/language inside: ',
-	'ERR_LANG_UPLOAD_1'					=> 'There was a problem with your upload. Please try again.',
-	'ERR_LANG_UPLOAD_2'					=> 'Language Packs must be ZIP archives.',
-	'ERR_LANG_UPLOAD_3'					=> 'PHP could not move the temp file to the upgrade directory.',
-	'ERR_LOG_DIRECTORY_NOT_EXISTS'		=> 'Log directory provided is not a valid directory.',
-	'ERR_LOG_DIRECTORY_NOT_WRITABLE'	=> 'Log directory provided is not a writable directory.',
-	'ERR_NO_DIRECT_SCRIPT'				=> 'Unable to process script directly.',
-	'ERR_NO_SINGLE_QUOTE'				=> 'Cannot use the single quotation mark for ',
-	'ERR_PASSWORD_MISMATCH'				=> 'The passwords provided for the SuiteCRM admin user do not match. Please re-enter the same passwords in the password fields.',
-	'ERR_PERFORM_CONFIG_PHP_1'			=> 'Cannot write to the <span class=stop>config.php</span> file.',
-	'ERR_PERFORM_CONFIG_PHP_2'			=> 'You can continue this installation by manually creating the config.php file and pasting the configuration information below into the config.php file. However, you <strong>must </strong>create the config.php file before you continue to the next step.',
-	'ERR_PERFORM_CONFIG_PHP_3'			=> 'Did you remember to create the config.php file?',
-	'ERR_PERFORM_CONFIG_PHP_4'			=> 'Warning: Could not write to config.php file. Please ensure it exists.',
-	'ERR_PERFORM_HTACCESS_1'			=> 'Cannot write to the ',
-	'ERR_PERFORM_HTACCESS_2'			=> ' file.',
-	'ERR_PERFORM_HTACCESS_3'			=> 'If you want to secure your log file from being accessible via browser, create an .htaccess file in your log directory with the line:',
-	'ERR_PERFORM_NO_TCPIP'				=> '<b>We could not detect an Internet connection.</b> When you do have a connection, please visit <a href="http://www.suitecrm.com/">http://www.suitecrm.com/</a> to register with SuiteCRM. By letting us know a little bit about how your company plans to use SuiteCRM, we can ensure we are always delivering the right application for your business needs.',
-	'ERR_SESSION_DIRECTORY_NOT_EXISTS'	=> 'Session directory provided is not a valid directory.',
-	'ERR_SESSION_DIRECTORY'				=> 'Session directory provided is not a writable directory.',
-	'ERR_SESSION_PATH'					=> 'Session path is required if you wish to specify your own.',
-	'ERR_SI_NO_CONFIG'					=> 'You did not include config_si.php in the document root, or you did not define $sugar_config_si in config.php',
-	'ERR_SITE_GUID'						=> 'Application ID is required if you wish to specify your own.',
-	'ERROR_SPRITE_SUPPORT'              => "Currently we are not able to locate the GD library, as a result you will not be able to use the CSS Sprite functionality.",
-	'ERR_UPLOAD_MAX_FILESIZE'			=> 'Warning: Your PHP configuration should be changed to allow files of at least 6MB to be uploaded.',
-	'LBL_UPLOAD_MAX_FILESIZE_TITLE'     => 'Upload File Size',
-	'ERR_URL_BLANK'						=> 'Provide the base URL for the SuiteCRM instance.',
-	'ERR_UW_NO_UPDATE_RECORD'			=> 'Could not locate installation record of',
-	'ERROR_FLAVOR_INCOMPATIBLE'			=> 'The uploaded file is not compatible with this flavor of SuiteCRM: ',
-	'ERROR_MANIFEST_TYPE'				=> 'Manifest file must specify the package type.',
-	'ERROR_PACKAGE_TYPE'				=> 'Manifest file specifies an unrecognized package type',
-	'ERROR_VERSION_INCOMPATIBLE'		=> 'The uploaded file is not compatible with this version of SuiteCRM: ',
-
-	'LBL_BACK'							=> 'Back',
-	'LBL_CANCEL'                        => 'Cancel',
-	'LBL_ACCEPT'                        => 'I Accept',
-	'LBL_CHECKSYS_CACHE'				=> 'Writable Cache Sub-Directories',
-	'LBL_DROP_DB_CONFIRM'               => 'The provided Database Name already exists.<br>You can either:<br>1. Click on the Cancel button and choose a new database name, or <br>2. Click the Accept button and continue. All existing tables in the database will be dropped. <strong>This means that all of the tables and pre-existing data will be blown away.</strong>',
-	'LBL_CHECKSYS_COMPONENT'			=> 'Component',
-	'LBL_CHECKSYS_CONFIG'				=> 'Writable SuiteCRM Configuration File (config.php)',
-	'LBL_CHECKSYS_CURL'					=> 'cURL Module',
-	'LBL_CHECKSYS_CUSTOM'				=> 'Writeable Custom Directory',
-	'LBL_CHECKSYS_DATA'					=> 'Writable Data Sub-Directories',
-	'LBL_CHECKSYS_IMAP'					=> 'IMAP Module',
-	'LBL_CHECKSYS_FASTCGI'             => 'FastCGI',
-	'LBL_CHECKSYS_MBSTRING'				=> 'MB Strings Module',
-	'LBL_CHECKSYS_MEM_OK'				=> 'OK (No Limit)',
-	'LBL_CHECKSYS_MEM_UNLIMITED'		=> 'OK (Unlimited)',
-	'LBL_CHECKSYS_MEM'					=> 'PHP Memory Limit',
-	'LBL_CHECKSYS_MODULE'				=> 'Writable Modules Sub-Directories and Files',
-	'LBL_CHECKSYS_NOT_AVAILABLE'		=> 'Not Available',
-	'LBL_CHECKSYS_OK'					=> 'OK',
-	'LBL_CHECKSYS_PHP_INI'				=> 'Location of your PHP configuration file (php.ini):',
-	'LBL_CHECKSYS_PHP_OK'				=> 'OK (ver ',
-	'LBL_CHECKSYS_PHPVER'				=> 'PHP Version',
-	'LBL_CHECKSYS_IISVER'               => 'IIS Version',
-	'LBL_CHECKSYS_RECHECK'				=> 'Re-check',
-	'LBL_CHECKSYS_STATUS'				=> 'Status',
-	'LBL_CHECKSYS_TITLE'				=> 'System Check Acceptance',
-	'LBL_CHECKSYS_XML'					=> 'XML Parsing',
-	'LBL_CHECKSYS_ZLIB'					=> 'ZLIB Compression Module',
-	'LBL_CHECKSYS_ZIP'					=> 'ZIP Handling Module',
-	'LBL_CHECKSYS_PCRE'					=> 'PCRE Library',
-	'LBL_CHECKSYS_FIX_FILES'            => 'Please fix the following files or directories before proceeding:',
-	'LBL_CHECKSYS_FIX_MODULE_FILES'     => 'Please fix the following module directories and the files under them before proceeding:',
-	'LBL_CHECKSYS_UPLOAD'               => 'Writable Upload Directory',
-	'LBL_CLOSE'							=> 'Close',
-	'LBL_THREE'                         => '3',
-	'LBL_CONFIRM_BE_CREATED'			=> 'be created',
-	'LBL_CONFIRM_DB_TYPE'				=> 'Database Type',
-	'LBL_CONFIRM_NOT'					=> 'not',
-	'LBL_CONFIRM_TITLE'					=> 'Confirm Settings',
-	'LBL_CONFIRM_WILL'					=> 'will',
-	'LBL_DBCONF_DB_DROP'                => 'Drop Tables',
-	'LBL_DBCONF_DB_NAME'				=> 'Database Name',
-	'LBL_DBCONF_DB_PASSWORD'			=> 'SuiteCRM Database User Password',
-	'LBL_DBCONF_DB_PASSWORD2'			=> 'Re-enter SuiteCRM Database User Password',
-	'LBL_DBCONF_DB_USER'				=> 'SuiteCRM Database User',
-	'LBL_DBCONF_SUGAR_DB_USER'          => 'SuiteCRM Database User',
-	'LBL_DBCONF_DB_ADMIN_USER'          => 'Database Administrator Username',
-	'LBL_DBCONF_DB_ADMIN_PASSWORD'      => 'Database Admin Password',
-	'LBL_DBCONF_DEMO_DATA'				=> 'Populate Database with Demo Data?',
-	'LBL_DBCONF_DEMO_DATA_TITLE'        => 'Choose Demo Data',
-	'LBL_DBCONF_HOST_NAME'				=> 'Host Name',
-	'LBL_DBCONF_HOST_INSTANCE'			=> 'Host Instance',
-	'LBL_DBCONFIG_SECURITY'             => 'For security purposes, you can specify an exclusive database user to connect to the SuiteCRM database. This user must be able to write, update and retrieve data on the SuiteCRM database that will be created for this instance. This user can be the database administrator specified above, or you can provide new or existing database user information.',
-	'LBL_DBCONFIG_PROVIDE_DD'           => 'Provide existing user',
-	'LBL_DBCONFIG_CREATE_DD'            => 'Define user to create',
-	'LBL_DBCONFIG_SAME_DD'              => 'Same as Admin User',
-	'LBL_DBCONF_TITLE'					=> 'Database Configuration',
-	'LBL_DBCONF_TITLE_NAME'             => 'Provide Database Name',
-	'LBL_DBCONF_TITLE_USER_INFO'        => 'Provide Database User Information',
-	'LBL_DBCONF_TITLE_PSWD_INFO_LABEL' => 'Password',
-	'LBL_DISABLED_DESCRIPTION_2'		=> 'After this change has been made, you may click the "Start" button below to begin your installation. <i>After the installation is complete, you will want to change the value for \'installer_locked\' to \'true\'.</i>',
-	'LBL_DISABLED_DESCRIPTION'			=> 'The installer has already been run once. As a safety measure, it has been disabled from running a second time. If you are absolutely sure you want to run it again, please go to your config.php file and locate (or add) a variable called \'installer_locked\' and set it to \'false\'. The line should look like this:',
-	'LBL_DISABLED_HELP_1'				=> 'For installation help, please visit the SuiteCRM',
-	'LBL_DISABLED_HELP_LNK'             => 'http://www.suitecrm.com/forum/index',
-	'LBL_DISABLED_HELP_2'				=> 'support forums',
-	'LBL_DISABLED_TITLE_2'				=> 'SuiteCRM Installation has been Disabled',
-	'LBL_HELP'							=> 'Help',
-	'LBL_INSTALL'                       => 'Install',
-	'LBL_INSTALL_TYPE_TITLE'            => 'Installation Options',
-	'LBL_INSTALL_TYPE_SUBTITLE'         => 'Choose Install Type',
-	'LBL_INSTALL_TYPE_TYPICAL'          => ' <b>Typical Install</b>',
-	'LBL_INSTALL_TYPE_CUSTOM'           => ' <b>Custom Install</b>',
-	'LBL_INSTALL_TYPE_MSG2'             => 'Requires minimum information for the installation. Recommended for new users.',
-	'LBL_INSTALL_TYPE_MSG3'             => 'Provides additional options to set during the installation. Most of these options are also available after installation in the admin screens. Recommended for advanced users.',
-	'LBL_LANG_1'						=> 'To use a language in SuiteCRM other than the default language (US-English), you can upload and install the language pack at this time. You will be able to upload and install language packs from within the SuiteCRM application as well. If you would like to skip this step, click Next.',
-	'LBL_LANG_BUTTON_COMMIT'			=> 'Install',
-	'LBL_LANG_BUTTON_REMOVE'			=> 'Remove',
-	'LBL_LANG_BUTTON_UNINSTALL'			=> 'Uninstall',
-	'LBL_LANG_BUTTON_UPLOAD'			=> 'Upload',
-	'LBL_LANG_NO_PACKS'					=> 'none',
-	'LBL_LANG_PACK_INSTALLED'			=> 'The following language packs have been installed: ',
-	'LBL_LANG_PACK_READY'				=> 'The following language packs are ready to be installed: ',
-	'LBL_LANG_SUCCESS'					=> 'The language pack was successfully uploaded.',
-	'LBL_LANG_TITLE'			   		=> 'Language Pack',
-	'LBL_LAUNCHING_SILENT_INSTALL'     => 'Installing SuiteCRM now. This may take up to a few minutes.',
-	'LBL_LANG_UPLOAD'					=> 'Upload a Language Pack',
-	'LBL_LICENSE_ACCEPTANCE'			=> 'License Acceptance',
-	'LBL_LICENSE_CHECKING'              => 'Checking system for compatibility.',
-	'LBL_LICENSE_CHKENV_HEADER'         => 'Checking Environment',
-	'LBL_LICENSE_CHKDB_HEADER'          => 'Verifying DB Credentials.',
-	'LBL_LICENSE_CHECK_PASSED'          => 'System passed check for compatibility.',
-	'LBL_CREATE_CACHE' => 'Preparing to Install...',
-	'LBL_LICENSE_REDIRECT'              => 'Redirecting in ',
-	'LBL_LICENSE_I_ACCEPT'				=> 'I Accept',
-	'LBL_LICENSE_PRINTABLE'				=> ' Printable View ',
-	'LBL_PRINT_SUMM'                    => 'Print Summary',
-	'LBL_LICENSE_TITLE_2'				=> 'SuiteCRM License',
-
-	'LBL_LOCALE_NAME_FIRST'				=> 'David',
-	'LBL_LOCALE_NAME_LAST'				=> 'Livingstone',
-	'LBL_LOCALE_NAME_SALUTATION'		=> 'Dr.',
-
-	'LBL_ML_ACTION'						=> 'Action',
-	'LBL_ML_DESCRIPTION'				=> 'Description',
-	'LBL_ML_INSTALLED'					=> 'Date Installed',
-	'LBL_ML_NAME'						=> 'Name',
-	'LBL_ML_PUBLISHED'					=> 'Date Published',
-	'LBL_ML_TYPE'						=> 'Type',
-	'LBL_ML_UNINSTALLABLE'				=> 'Uninstallable',
-	'LBL_ML_VERSION'					=> 'Version',
-	'LBL_MSSQL'							=> 'SQL Server',
-	'LBL_MSSQL2'                        => 'SQL Server (FreeTDS)',
-	'LBL_MSSQL_SQLSRV'				    => 'SQL Server (Microsoft SQL Server Driver for PHP)',
-	'LBL_MYSQL'							=> 'MySQL',
-	'LBL_MYSQLI'						=> 'MySQL (mysqli extension)',
-	'LBL_NEXT'							=> 'Next',
-	'LBL_NO'							=> 'No',
-	'LBL_PERFORM_ADMIN_PASSWORD'		=> 'Setting site admin password',
-	'LBL_PERFORM_CONFIG_PHP'			=> 'Creating SuiteCRM configuration file',
-	'LBL_PERFORM_CREATE_DB_1'			=> '<b>Creating the database</b> ',
-	'LBL_PERFORM_CREATE_DB_2'			=> ' <b>on</b> ',
-	'LBL_PERFORM_CREATE_DB_USER'		=> 'Creating the Database username and password...',
-	'LBL_PERFORM_CREATE_DEFAULT'		=> 'Creating default SuiteCRM data',
-	'LBL_PERFORM_DEFAULT_SCHEDULER'		=> 'Creating default scheduler jobs',
-	'LBL_PERFORM_DEFAULT_USERS'			=> 'Creating default users',
-	'LBL_PERFORM_DEMO_DATA'				=> 'Populating the database tables with demo data (this may take a little while)',
-	'LBL_PERFORM_DONE'					=> 'done<br>',
-	'LBL_PERFORM_FINISH'				=> 'Finish',
-	'LBL_PERFORM_OUTRO_1'				=> 'The setup of SuiteCRM ',
-	'LBL_PERFORM_OUTRO_2'				=> ' is now complete!',
-	'LBL_PERFORM_OUTRO_3'				=> 'Total time: ',
-	'LBL_PERFORM_OUTRO_4'				=> ' seconds.',
-	'LBL_PERFORM_OUTRO_5'				=> 'Approximate memory used: ',
-	'LBL_PERFORM_OUTRO_6'				=> ' bytes.',
-	'LBL_PERFORM_SUCCESS'				=> 'Success!',
-	'LBL_PERFORM_TABLES'				=> 'Creating SuiteCRM application tables, audit tables and relationship metadata',
-	'LBL_PERFORM_TITLE'					=> 'Perform Setup',
-	'LBL_PRINT'							=> 'Print',
-	'LBL_REG_CONF_1'					=> 'Please complete the short form below to receive product announcements, training news, special offers and special event invitations from SuiteCRM. We do not sell, rent, share or otherwise distribute the information collected here to third parties.',
-	'LBL_REG_CONF_3'					=> 'Thank you for registering. Click on the Finish button to login to SuiteCRM. You will need to log in for the first time using the username "admin" and the password you entered in step 2.',
-	'LBL_REG_TITLE'						=> 'Registration',
-	'LBL_REQUIRED'						=> '* Required field',
-
-	'LBL_SITECFG_ADMIN_Name'            => 'SuiteCRM Application Admin Name',
-	'LBL_SITECFG_ADMIN_PASS_2'			=> 'Re-enter SuiteCRM Admin User Password',
-	'LBL_SITECFG_ADMIN_PASS'			=> 'SuiteCRM Admin User Password',
-	'LBL_SITECFG_APP_ID'				=> 'Application ID',
-	'LBL_SITECFG_CUSTOM_ID_DIRECTIONS'	=> 'If selected, you must provide an application ID to override the auto-generated ID. The ID ensures that sessions of one SuiteCRM instance are not used by other instances. If you have a cluster of SuiteCRM installations, they all must share the same application ID.',
-	'LBL_SITECFG_CUSTOM_ID'				=> 'Provide Your Own Application ID',
-	'LBL_SITECFG_CUSTOM_LOG_DIRECTIONS'	=> 'If selected, you must specify a log directory to override the default directory for the SuiteCRM log. Regardless of where the log file is located, access to it through a web browser will be restricted via an .htaccess redirect.',
-	'LBL_SITECFG_CUSTOM_LOG'			=> 'Use a Custom Log Directory',
-	'LBL_SITECFG_CUSTOM_SESSION_DIRECTIONS'	=> 'If selected, you must provide a secure folder for storing SuiteCRM session information. This can be done to prevent session data from being vulnerable on shared servers.',
-	'LBL_SITECFG_CUSTOM_SESSION'		=> 'Use a Custom Session Directory for SuiteCRM',
-	'LBL_SITECFG_FIX_ERRORS'			=> '<b>Please fix the following errors before proceeding:</b>',
-	'LBL_SITECFG_LOG_DIR'				=> 'Log Directory',
-	'LBL_SITECFG_SESSION_PATH'			=> 'Path to Session Directory<br>(must be writable)',
-	'LBL_SITECFG_SITE_SECURITY'			=> 'Select Security Options',
-	'LBL_SITECFG_SUGAR_UP_DIRECTIONS'	=> 'If selected, the system will periodically check for updated versions of the application.',
-	'LBL_SITECFG_SUGAR_UP'				=> 'Automatically Check For Updates?',
-	'LBL_SITECFG_SUGAR_UPDATES'			=> 'SuiteCRM Updates Config',
-	'LBL_SITECFG_TITLE'					=> 'Site Configuration',
-	'LBL_SITECFG_TITLE2'                => 'Identify Administration User',
-	'LBL_SITECFG_SECURITY_TITLE'        => 'Site Security',
-	'LBL_SITECFG_URL'					=> 'URL of SuiteCRM Instance',
-	'LBL_SITECFG_ANONSTATS'             => 'Send Anonymous Usage Statistics?',
-	'LBL_SITECFG_ANONSTATS_DIRECTIONS'  => 'If selected, SuiteCRM will send <b>anonymous</b> statistics about your installation to SuiteCRM Inc. every time your system checks for new versions. This information will help us better understand how the application is used and guide improvements to the product.',
-	'LBL_SITECFG_URL_MSG'               => 'Enter the URL that will be used to access the SuiteCRM instance after installation. The URL will also be used as a base for the URLs in the SuiteCRM application pages. The URL should include the web server or machine name or IP address.',
-	'LBL_SITECFG_SYS_NAME_MSG'          => 'Enter a name for your system. This name will be displayed in the browser title bar when users visit the SuiteCRM application.',
-	'LBL_SITECFG_PASSWORD_MSG'          => 'After installation, you will need to use the SuiteCRM admin user (default username = admin) to log in to the SuiteCRM instance. Enter a password for this administrator user. This password can be changed after the initial login. You may also enter another admin username to use besides the default value provided.',
-	'LBL_SITECFG_COLLATION_MSG'         => 'Select collation (sorting) settings for your system. This settings will create the tables with the specific language you use. In case your language doesn\'t require special settings please use default value.',
-	'LBL_SPRITE_SUPPORT'                => 'Sprite Support',
-	'LBL_SYSTEM_CREDS'                  => 'System Credentials',
-	'LBL_SYSTEM_ENV'                    => 'System Environment',
-	'LBL_START'							=> 'Start',
-	'LBL_SHOW_PASS'                     => 'Show Passwords',
-	'LBL_HIDE_PASS'                     => 'Hide Passwords',
-	'LBL_HIDDEN'                        => '<i>(hidden)</i>',
-	'LBL_STEP1' => 'Step 1 of 2 - Pre-Installation requirements',
-	'LBL_STEP2' => 'Step 2 of 2 - Configuration',
-	'LBL_STEP'							=> 'Step',
-	'LBL_TITLE_WELCOME'					=> 'Welcome to the SuiteCRM ',
-	//welcome page variables
-	'LBL_TITLE_ARE_YOU_READY'            => 'Are you ready to install?',
-	'REQUIRED_SYS_COMP' => 'Required System Components',
-	'REQUIRED_SYS_COMP_MSG' =>
-		'Before you begin, please be sure that you have the supported versions of the following system components:<br>
+    'LBL_BASIC_SEARCH'					=> 'Quick Filter',
+    'LBL_ADVANCED_SEARCH'				=> 'Advanced Filter',
+    'LBL_BASIC_TYPE'					=> 'Basic Type',
+    'LBL_ADVANCED_TYPE'					=> 'Advanced Type',
+    'LBL_SYSOPTS_2'                     => 'What type of database will be used for the SuiteCRM instance you are about to install?',
+    'LBL_SYSOPTS_DB'					=> 'Specify Database Type',
+    'LBL_SYSOPTS_DB_TITLE'              => 'Database Type',
+    'LBL_SYSOPTS_ERRS_TITLE'			=> 'Please fix the following errors before proceeding:',
+    'ERR_DB_VERSION_FAILURE'			=> 'Unable to check database version.',
+    'DEFAULT_CHARSET'					=> 'UTF-8',
+    'ERR_ADMIN_USER_NAME_BLANK'         => 'Provide the user name for the SuiteCRM admin user. ',
+    'ERR_ADMIN_PASS_BLANK'				=> 'Provide the password for the SuiteCRM admin user. ',
+
+    'ERR_CHECKSYS'                      => 'Errors have been detected during compatibility check. In order for your SuiteCRM Installation to function properly, please take the proper steps to address the issues listed below and either press the recheck button, or try installing again.',
+    'ERR_CHECKSYS_CALL_TIME'            => 'Allow Call Time Pass Reference is On (this should be set to Off in php.ini)',
+    'ERR_CHECKSYS_CURL'					=> 'Not found: SuiteCRM Scheduler will run with limited functionality.',
+    'ERR_CHECKSYS_IMAP'					=> 'Not found: InboundEmail and Campaigns (Email) require the IMAP libraries. Neither will be functional.',
+    'ERR_CHECKSYS_MEM_LIMIT_1'			=> ' (Set this to ',
+    'ERR_CHECKSYS_MEM_LIMIT_2'			=> 'M or larger in your php.ini file)',
+    'ERR_CHECKSYS_NOT_WRITABLE'			=> 'Warning: Not Writable',
+    'ERR_CHECKSYS_PHP_INVALID_VER'		=> 'Your version of PHP is not supported by SuiteCRM. You will need to install a version that is compatible with the SuiteCRM application. Please consult the Compatibility Matrix in the Release Notes for supported PHP Versions. Your version is ',
+    'ERR_CHECKSYS_IIS_INVALID_VER'      => 'Your version of IIS is not supported by SuiteCRM. You will need to install a version that is compatible with the SuiteCRM application. Please consult the Compatibility Matrix in the Release Notes for supported IIS Versions. Your version is ',
+    'ERR_CHECKSYS_FASTCGI'              => 'We detect that you are not using a FastCGI handler mapping for PHP. You will need to install/configure a version that is compatible with the SuiteCRM application. Please consult the Compatibility Matrix in the Release Notes for supported Versions. Please see <a href="http://www.iis.net/php/" target="_blank">http://www.iis.net/php/</a> for details ',
+    'ERR_CHECKSYS_FASTCGI_LOGGING'      => 'For optimal experience using IIS/FastCGI sapi, set fastcgi.logging to 0 in your php.ini file.',
+    'LBL_DB_UNAVAILABLE'                => 'Database unavailable',
+    'LBL_CHECKSYS_DB_SUPPORT_NOT_AVAILABLE' => 'Database Support was not found. Please make sure you have the necessary drivers for one of the following supported Database Types: MySQL or MS SQLServer. You might need to uncomment the extension in the php.ini file, or recompile with the right binary file, depending on your version of PHP. Please refer to your PHP Manual for more information on how to enable Database Support.',
+    'LBL_CHECKSYS_XML_NOT_AVAILABLE'        => 'Functions associated with XML Parser Libraries that are needed by the SuiteCRM application were not found. You might need to uncomment the extension in the  php.ini file, or recompile with the right binary file, depending on your version of PHP. Please refer to your PHP Manual for more information.',
+    'ERR_CHECKSYS_MBSTRING'             => 'Functions associated with the Multibyte Strings PHP extension (mbstring) that are needed by the SuiteCRM application were not found. <br/><br/>Generally, the mbstring module is not enabled by default in PHP and must be activated with --enable-mbstring when the PHP binary is built. Please refer to your PHP Manual for more information on how to enable mbstring support.',
+    'ERR_CHECKSYS_CONFIG_NOT_WRITABLE'  => 'The config file exists but is not writeable. Please take the necessary steps to make the file writeable. Depending on your Operating system, this might require you to change the permissions by running chmod 766, or to right click on the filename to access the properties and uncheck the read only option.',
+    'ERR_CHECKSYS_CONFIG_OVERRIDE_NOT_WRITABLE'  => 'The config override file exists but is not writeable. Please take the necessary steps to make the file writeable. Depending on your Operating system, this might require you to change the permissions by running chmod 766, or to right click on the filename to access the properties and uncheck the read only option.',
+    'ERR_CHECKSYS_CUSTOM_NOT_WRITABLE'  => 'The Custom Directory exists but is not writeable. You may have to change permissions on it (chmod 766) or right click on it and uncheck the read only option, depending on your Operating System. Please take the needed steps to make the file writeable.',
+    'ERR_CHECKSYS_FILES_NOT_WRITABLE'   => "The files or directories listed below are not writeable or are missing and cannot be created. Depending on your Operating System, correcting this may require you to change permissions on the files or parent directory (chmod 755), or to right click on the parent directory and uncheck the 'read only' option and apply it to all subfolders.",
+    'LBL_CHECKSYS_OVERRIDE_CONFIG' => 'Config override',
+    'ERR_CHECKSYS_SAFE_MODE'			=> 'Safe Mode is On (you may wish to disable in php.ini)',
+    'ERR_CHECKSYS_ZLIB'					=> 'ZLib support not found: SuiteCRM reaps enormous performance benefits with zlib compression.',
+    'ERR_CHECKSYS_ZIP'					=> 'ZIP support not found: SuiteCRM needs ZIP support in order to process compressed files.',
+    'ERR_CHECKSYS_PCRE'					=> 'PCRE library not found: SuiteCRM needs PCRE library in order to process Perl style of regular expression pattern matching.',
+    'ERR_CHECKSYS_PCRE_VER'				=> 'PCRE library version: SuiteCRM needs PCRE library 7.0 or above to process Perl style of regular expression pattern matching.',
+    'ERR_DB_ADMIN'						=> 'The provided database administrator username and/or password is invalid, and a connection to the database could not be established. Please enter a valid user name and password. (Error: ',
+    'ERR_DB_ADMIN_MSSQL'                => 'The provided database administrator username and/or password is invalid, and a connection to the database could not be established. Please enter a valid user name and password.',
+    'ERR_DB_EXISTS_NOT'					=> 'The specified database does not exist.',
+    'ERR_DB_EXISTS_WITH_CONFIG'			=> 'Database already exists with config data. To run an install with the chosen database, please re-run the install and choose: "Drop and recreate existing SuiteCRM tables?"  To upgrade, use the Upgrade Wizard in the Admin Console. Please read the upgrade documentation located <a href="http://www.suitecrm.com" target="_new">here</a>.',
+    'ERR_DB_EXISTS'						=> 'The provided Database Name already exists -- cannot create another one with the same name.',
+    'ERR_DB_EXISTS_PROCEED'             => 'The provided Database Name already exists. You can<br>1. hit the back button and choose a new database name <br>2. click next and continue but all existing tables on this database will be dropped. <strong>This means your tables and data will be blown away.</strong>',
+    'ERR_DB_HOSTNAME'					=> 'Host name cannot be blank.',
+    'ERR_DB_INVALID'					=> 'Invalid database type selected.',
+    'ERR_DB_LOGIN_FAILURE'				=> 'The provided database host, username, and/or password is invalid, and a connection to the database could not be established. Please enter a valid host, username and password',
+    'ERR_DB_LOGIN_FAILURE_MYSQL'		=> 'The provided database host, username, and/or password is invalid, and a connection to the database could not be established. Please enter a valid host, username and password',
+    'ERR_DB_LOGIN_FAILURE_MSSQL'		=> 'The provided database host, username, and/or password is invalid, and a connection to the database could not be established. Please enter a valid host, username and password',
+    'ERR_DB_MYSQL_VERSION'				=> 'Your MySQL version (%s) is not supported by SuiteCRM. You will need to install a version that is compatible with the SuiteCRM application. Please consult the Compatibility Matrix in the Release Notes for supported MySQL versions.',
+    'ERR_DB_NAME'						=> 'Database name cannot be blank.',
+    'ERR_DB_MYSQL_DB_NAME_INVALID'      => "Database name cannot contain a '\\', '/', or '.'",
+    'ERR_DB_MSSQL_DB_NAME_INVALID'      => "Database name cannot begin with a number, '#', or '@' and cannot contain a space, '\"', \"'\", '*', '/', '\', '?', ':', '<', '>', '&', '!', or '-'",
+    'ERR_DB_OCI8_DB_NAME_INVALID'       => "Database name can only consist of alphanumeric characters and the symbols '#', '_' or '$'",
+    'ERR_DB_PASSWORD'					=> 'The passwords provided for the SuiteCRM database administrator do not match. Please re-enter the same passwords in the password fields.',
+    'ERR_DB_PRIV_USER'					=> 'Provide a database administrator user name. The user is required for the initial connection to the database.',
+    'ERR_DB_USER_EXISTS'				=> 'User name for SuiteCRM database user already exists -- cannot create another one with the same name. Please enter a new user name.',
+    'ERR_DB_USER'						=> 'Enter a user name for the SuiteCRM database administrator.',
+    'ERR_DBCONF_VALIDATION'				=> 'Please fix the following errors before proceeding:',
+    'ERR_DBCONF_PASSWORD_MISMATCH'      => 'The passwords provided for the SuiteCRM database user do not match. Please re-enter the same passwords in the password fields.',
+    'ERR_ERROR_GENERAL'					=> 'The following errors were encountered:',
+    'ERR_LANG_CANNOT_DELETE_FILE'		=> 'Cannot delete file: ',
+    'ERR_LANG_MISSING_FILE'				=> 'Cannot find file: ',
+    'ERR_LANG_NO_LANG_FILE'			 	=> 'No language pack file found at include/language inside: ',
+    'ERR_LANG_UPLOAD_1'					=> 'There was a problem with your upload. Please try again.',
+    'ERR_LANG_UPLOAD_2'					=> 'Language Packs must be ZIP archives.',
+    'ERR_LANG_UPLOAD_3'					=> 'PHP could not move the temp file to the upgrade directory.',
+    'ERR_LOG_DIRECTORY_NOT_EXISTS'		=> 'Log directory provided is not a valid directory.',
+    'ERR_LOG_DIRECTORY_NOT_WRITABLE'	=> 'Log directory provided is not a writable directory.',
+    'ERR_NO_DIRECT_SCRIPT'				=> 'Unable to process script directly.',
+    'ERR_NO_SINGLE_QUOTE'				=> 'Cannot use the single quotation mark for ',
+    'ERR_PASSWORD_MISMATCH'				=> 'The passwords provided for the SuiteCRM admin user do not match. Please re-enter the same passwords in the password fields.',
+    'ERR_PERFORM_CONFIG_PHP_1'			=> 'Cannot write to the <span class=stop>config.php</span> file.',
+    'ERR_PERFORM_CONFIG_PHP_2'			=> 'You can continue this installation by manually creating the config.php file and pasting the configuration information below into the config.php file. However, you <strong>must </strong>create the config.php file before you continue to the next step.',
+    'ERR_PERFORM_CONFIG_PHP_3'			=> 'Did you remember to create the config.php file?',
+    'ERR_PERFORM_CONFIG_PHP_4'			=> 'Warning: Could not write to config.php file. Please ensure it exists.',
+    'ERR_PERFORM_HTACCESS_1'			=> 'Cannot write to the ',
+    'ERR_PERFORM_HTACCESS_2'			=> ' file.',
+    'ERR_PERFORM_HTACCESS_3'			=> 'If you want to secure your log file from being accessible via browser, create an .htaccess file in your log directory with the line:',
+    'ERR_PERFORM_NO_TCPIP'				=> '<b>We could not detect an Internet connection.</b> When you do have a connection, please visit <a href="http://www.suitecrm.com/">http://www.suitecrm.com/</a> to register with SuiteCRM. By letting us know a little bit about how your company plans to use SuiteCRM, we can ensure we are always delivering the right application for your business needs.',
+    'ERR_SESSION_DIRECTORY_NOT_EXISTS'	=> 'Session directory provided is not a valid directory.',
+    'ERR_SESSION_DIRECTORY'				=> 'Session directory provided is not a writable directory.',
+    'ERR_SESSION_PATH'					=> 'Session path is required if you wish to specify your own.',
+    'ERR_SI_NO_CONFIG'					=> 'You did not include config_si.php in the document root, or you did not define $sugar_config_si in config.php',
+    'ERR_SITE_GUID'						=> 'Application ID is required if you wish to specify your own.',
+    'ERROR_SPRITE_SUPPORT'              => "Currently we are not able to locate the GD library, as a result you will not be able to use the CSS Sprite functionality.",
+    'ERR_UPLOAD_MAX_FILESIZE'			=> 'Warning: Your PHP configuration should be changed to allow files of at least 6MB to be uploaded.',
+    'LBL_UPLOAD_MAX_FILESIZE_TITLE'     => 'Upload File Size',
+    'ERR_URL_BLANK'						=> 'Provide the base URL for the SuiteCRM instance.',
+    'ERR_UW_NO_UPDATE_RECORD'			=> 'Could not locate installation record of',
+    'ERROR_FLAVOR_INCOMPATIBLE'			=> 'The uploaded file is not compatible with this flavor of SuiteCRM: ',
+    'ERROR_MANIFEST_TYPE'				=> 'Manifest file must specify the package type.',
+    'ERROR_PACKAGE_TYPE'				=> 'Manifest file specifies an unrecognized package type',
+    'ERROR_VERSION_INCOMPATIBLE'		=> 'The uploaded file is not compatible with this version of SuiteCRM: ',
+
+    'LBL_BACK'							=> 'Back',
+    'LBL_CANCEL'                        => 'Cancel',
+    'LBL_ACCEPT'                        => 'I Accept',
+    'LBL_CHECKSYS_CACHE'				=> 'Writable Cache Sub-Directories',
+    'LBL_DROP_DB_CONFIRM'               => 'The provided Database Name already exists.<br>You can either:<br>1. Click on the Cancel button and choose a new database name, or <br>2. Click the Accept button and continue. All existing tables in the database will be dropped. <strong>This means that all of the tables and pre-existing data will be blown away.</strong>',
+    'LBL_CHECKSYS_COMPONENT'			=> 'Component',
+    'LBL_CHECKSYS_CONFIG'				=> 'Writable SuiteCRM Configuration File (config.php)',
+    'LBL_CHECKSYS_CURL'					=> 'cURL Module',
+    'LBL_CHECKSYS_CUSTOM'				=> 'Writeable Custom Directory',
+    'LBL_CHECKSYS_DATA'					=> 'Writable Data Sub-Directories',
+    'LBL_CHECKSYS_IMAP'					=> 'IMAP Module',
+    'LBL_CHECKSYS_FASTCGI'             => 'FastCGI',
+    'LBL_CHECKSYS_MBSTRING'				=> 'MB Strings Module',
+    'LBL_CHECKSYS_MEM_OK'				=> 'OK (No Limit)',
+    'LBL_CHECKSYS_MEM_UNLIMITED'		=> 'OK (Unlimited)',
+    'LBL_CHECKSYS_MEM'					=> 'PHP Memory Limit',
+    'LBL_CHECKSYS_MODULE'				=> 'Writable Modules Sub-Directories and Files',
+    'LBL_CHECKSYS_NOT_AVAILABLE'		=> 'Not Available',
+    'LBL_CHECKSYS_OK'					=> 'OK',
+    'LBL_CHECKSYS_PHP_INI'				=> 'Location of your PHP configuration file (php.ini):',
+    'LBL_CHECKSYS_PHP_OK'				=> 'OK (ver ',
+    'LBL_CHECKSYS_PHPVER'				=> 'PHP Version',
+    'LBL_CHECKSYS_IISVER'               => 'IIS Version',
+    'LBL_CHECKSYS_RECHECK'				=> 'Re-check',
+    'LBL_CHECKSYS_STATUS'				=> 'Status',
+    'LBL_CHECKSYS_TITLE'				=> 'System Check Acceptance',
+    'LBL_CHECKSYS_XML'					=> 'XML Parsing',
+    'LBL_CHECKSYS_ZLIB'					=> 'ZLIB Compression Module',
+    'LBL_CHECKSYS_ZIP'					=> 'ZIP Handling Module',
+    'LBL_CHECKSYS_PCRE'					=> 'PCRE Library',
+    'LBL_CHECKSYS_FIX_FILES'            => 'Please fix the following files or directories before proceeding:',
+    'LBL_CHECKSYS_FIX_MODULE_FILES'     => 'Please fix the following module directories and the files under them before proceeding:',
+    'LBL_CHECKSYS_UPLOAD'               => 'Writable Upload Directory',
+    'LBL_CLOSE'							=> 'Close',
+    'LBL_THREE'                         => '3',
+    'LBL_CONFIRM_BE_CREATED'			=> 'be created',
+    'LBL_CONFIRM_DB_TYPE'				=> 'Database Type',
+    'LBL_CONFIRM_NOT'					=> 'not',
+    'LBL_CONFIRM_TITLE'					=> 'Confirm Settings',
+    'LBL_CONFIRM_WILL'					=> 'will',
+    'LBL_DBCONF_DB_DROP'                => 'Drop Tables',
+    'LBL_DBCONF_DB_NAME'				=> 'Database Name',
+    'LBL_DBCONF_DB_PASSWORD'			=> 'SuiteCRM Database User Password',
+    'LBL_DBCONF_DB_PASSWORD2'			=> 'Re-enter SuiteCRM Database User Password',
+    'LBL_DBCONF_DB_USER'				=> 'SuiteCRM Database User',
+    'LBL_DBCONF_SUGAR_DB_USER'          => 'SuiteCRM Database User',
+    'LBL_DBCONF_DB_ADMIN_USER'          => 'Database Administrator Username',
+    'LBL_DBCONF_DB_ADMIN_PASSWORD'      => 'Database Admin Password',
+    'LBL_DBCONF_DEMO_DATA'				=> 'Populate Database with Demo Data?',
+    'LBL_DBCONF_DEMO_DATA_TITLE'        => 'Choose Demo Data',
+    'LBL_DBCONF_HOST_NAME'				=> 'Host Name',
+    'LBL_DBCONF_HOST_INSTANCE'			=> 'Host Instance',
+    'LBL_DBCONFIG_SECURITY'             => 'For security purposes, you can specify an exclusive database user to connect to the SuiteCRM database. This user must be able to write, update and retrieve data on the SuiteCRM database that will be created for this instance. This user can be the database administrator specified above, or you can provide new or existing database user information.',
+    'LBL_DBCONFIG_PROVIDE_DD'           => 'Provide existing user',
+    'LBL_DBCONFIG_CREATE_DD'            => 'Define user to create',
+    'LBL_DBCONFIG_SAME_DD'              => 'Same as Admin User',
+    'LBL_DBCONF_TITLE'					=> 'Database Configuration',
+    'LBL_DBCONF_TITLE_NAME'             => 'Provide Database Name',
+    'LBL_DBCONF_TITLE_USER_INFO'        => 'Provide Database User Information',
+    'LBL_DBCONF_TITLE_PSWD_INFO_LABEL' => 'Password',
+    'LBL_DISABLED_DESCRIPTION_2'		=> 'After this change has been made, you may click the "Start" button below to begin your installation. <i>After the installation is complete, you will want to change the value for \'installer_locked\' to \'true\'.</i>',
+    'LBL_DISABLED_DESCRIPTION'			=> 'The installer has already been run once. As a safety measure, it has been disabled from running a second time. If you are absolutely sure you want to run it again, please go to your config.php file and locate (or add) a variable called \'installer_locked\' and set it to \'false\'. The line should look like this:',
+    'LBL_DISABLED_HELP_1'				=> 'For installation help, please visit the SuiteCRM',
+    'LBL_DISABLED_HELP_LNK'             => 'http://www.suitecrm.com/forum/index',
+    'LBL_DISABLED_HELP_2'				=> 'support forums',
+    'LBL_DISABLED_TITLE_2'				=> 'SuiteCRM Installation has been Disabled',
+    'LBL_HELP'							=> 'Help',
+    'LBL_INSTALL'                       => 'Install',
+    'LBL_INSTALL_TYPE_TITLE'            => 'Installation Options',
+    'LBL_INSTALL_TYPE_SUBTITLE'         => 'Choose Install Type',
+    'LBL_INSTALL_TYPE_TYPICAL'          => ' <b>Typical Install</b>',
+    'LBL_INSTALL_TYPE_CUSTOM'           => ' <b>Custom Install</b>',
+    'LBL_INSTALL_TYPE_MSG2'             => 'Requires minimum information for the installation. Recommended for new users.',
+    'LBL_INSTALL_TYPE_MSG3'             => 'Provides additional options to set during the installation. Most of these options are also available after installation in the admin screens. Recommended for advanced users.',
+    'LBL_LANG_1'						=> 'To use a language in SuiteCRM other than the default language (US-English), you can upload and install the language pack at this time. You will be able to upload and install language packs from within the SuiteCRM application as well. If you would like to skip this step, click Next.',
+    'LBL_LANG_BUTTON_COMMIT'			=> 'Install',
+    'LBL_LANG_BUTTON_REMOVE'			=> 'Remove',
+    'LBL_LANG_BUTTON_UNINSTALL'			=> 'Uninstall',
+    'LBL_LANG_BUTTON_UPLOAD'			=> 'Upload',
+    'LBL_LANG_NO_PACKS'					=> 'none',
+    'LBL_LANG_PACK_INSTALLED'			=> 'The following language packs have been installed: ',
+    'LBL_LANG_PACK_READY'				=> 'The following language packs are ready to be installed: ',
+    'LBL_LANG_SUCCESS'					=> 'The language pack was successfully uploaded.',
+    'LBL_LANG_TITLE'			   		=> 'Language Pack',
+    'LBL_LAUNCHING_SILENT_INSTALL'     => 'Installing SuiteCRM now. This may take up to a few minutes.',
+    'LBL_LANG_UPLOAD'					=> 'Upload a Language Pack',
+    'LBL_LICENSE_ACCEPTANCE'			=> 'License Acceptance',
+    'LBL_LICENSE_CHECKING'              => 'Checking system for compatibility.',
+    'LBL_LICENSE_CHKENV_HEADER'         => 'Checking Environment',
+    'LBL_LICENSE_CHKDB_HEADER'          => 'Verifying DB Credentials.',
+    'LBL_LICENSE_CHECK_PASSED'          => 'System passed check for compatibility.',
+    'LBL_CREATE_CACHE' => 'Preparing to Install...',
+    'LBL_LICENSE_REDIRECT'              => 'Redirecting in ',
+    'LBL_LICENSE_I_ACCEPT'				=> 'I Accept',
+    'LBL_LICENSE_PRINTABLE'				=> ' Printable View ',
+    'LBL_PRINT_SUMM'                    => 'Print Summary',
+    'LBL_LICENSE_TITLE_2'				=> 'SuiteCRM License',
+
+    'LBL_LOCALE_NAME_FIRST'				=> 'David',
+    'LBL_LOCALE_NAME_LAST'				=> 'Livingstone',
+    'LBL_LOCALE_NAME_SALUTATION'		=> 'Dr.',
+
+    'LBL_ML_ACTION'						=> 'Action',
+    'LBL_ML_DESCRIPTION'				=> 'Description',
+    'LBL_ML_INSTALLED'					=> 'Date Installed',
+    'LBL_ML_NAME'						=> 'Name',
+    'LBL_ML_PUBLISHED'					=> 'Date Published',
+    'LBL_ML_TYPE'						=> 'Type',
+    'LBL_ML_UNINSTALLABLE'				=> 'Uninstallable',
+    'LBL_ML_VERSION'					=> 'Version',
+    'LBL_MSSQL'							=> 'SQL Server',
+    'LBL_MSSQL2'                        => 'SQL Server (FreeTDS)',
+    'LBL_MSSQL_SQLSRV'				    => 'SQL Server (Microsoft SQL Server Driver for PHP)',
+    'LBL_MYSQL'							=> 'MySQL',
+    'LBL_MYSQLI'						=> 'MySQL (mysqli extension)',
+    'LBL_NEXT'							=> 'Next',
+    'LBL_NO'							=> 'No',
+    'LBL_PERFORM_ADMIN_PASSWORD'		=> 'Setting site admin password',
+    'LBL_PERFORM_CONFIG_PHP'			=> 'Creating SuiteCRM configuration file',
+    'LBL_PERFORM_CREATE_DB_1'			=> '<b>Creating the database</b> ',
+    'LBL_PERFORM_CREATE_DB_2'			=> ' <b>on</b> ',
+    'LBL_PERFORM_CREATE_DB_USER'		=> 'Creating the Database username and password...',
+    'LBL_PERFORM_CREATE_DEFAULT'		=> 'Creating default SuiteCRM data',
+    'LBL_PERFORM_DEFAULT_SCHEDULER'		=> 'Creating default scheduler jobs',
+    'LBL_PERFORM_DEFAULT_USERS'			=> 'Creating default users',
+    'LBL_PERFORM_DEMO_DATA'				=> 'Populating the database tables with demo data (this may take a little while)',
+    'LBL_PERFORM_DONE'					=> 'done<br>',
+    'LBL_PERFORM_FINISH'				=> 'Finish',
+    'LBL_PERFORM_OUTRO_1'				=> 'The setup of SuiteCRM ',
+    'LBL_PERFORM_OUTRO_2'				=> ' is now complete!',
+    'LBL_PERFORM_OUTRO_3'				=> 'Total time: ',
+    'LBL_PERFORM_OUTRO_4'				=> ' seconds.',
+    'LBL_PERFORM_OUTRO_5'				=> 'Approximate memory used: ',
+    'LBL_PERFORM_OUTRO_6'				=> ' bytes.',
+    'LBL_PERFORM_SUCCESS'				=> 'Success!',
+    'LBL_PERFORM_TABLES'				=> 'Creating SuiteCRM application tables, audit tables and relationship metadata',
+    'LBL_PERFORM_TITLE'					=> 'Perform Setup',
+    'LBL_PRINT'							=> 'Print',
+    'LBL_REG_CONF_1'					=> 'Please complete the short form below to receive product announcements, training news, special offers and special event invitations from SuiteCRM. We do not sell, rent, share or otherwise distribute the information collected here to third parties.',
+    'LBL_REG_CONF_3'					=> 'Thank you for registering. Click on the Finish button to login to SuiteCRM. You will need to log in for the first time using the username "admin" and the password you entered in step 2.',
+    'LBL_REG_TITLE'						=> 'Registration',
+    'LBL_REQUIRED'						=> '* Required field',
+
+    'LBL_SITECFG_ADMIN_Name'            => 'SuiteCRM Application Admin Name',
+    'LBL_SITECFG_ADMIN_PASS_2'			=> 'Re-enter SuiteCRM Admin User Password',
+    'LBL_SITECFG_ADMIN_PASS'			=> 'SuiteCRM Admin User Password',
+    'LBL_SITECFG_APP_ID'				=> 'Application ID',
+    'LBL_SITECFG_CUSTOM_ID_DIRECTIONS'	=> 'If selected, you must provide an application ID to override the auto-generated ID. The ID ensures that sessions of one SuiteCRM instance are not used by other instances. If you have a cluster of SuiteCRM installations, they all must share the same application ID.',
+    'LBL_SITECFG_CUSTOM_ID'				=> 'Provide Your Own Application ID',
+    'LBL_SITECFG_CUSTOM_LOG_DIRECTIONS'	=> 'If selected, you must specify a log directory to override the default directory for the SuiteCRM log. Regardless of where the log file is located, access to it through a web browser will be restricted via an .htaccess redirect.',
+    'LBL_SITECFG_CUSTOM_LOG'			=> 'Use a Custom Log Directory',
+    'LBL_SITECFG_CUSTOM_SESSION_DIRECTIONS'	=> 'If selected, you must provide a secure folder for storing SuiteCRM session information. This can be done to prevent session data from being vulnerable on shared servers.',
+    'LBL_SITECFG_CUSTOM_SESSION'		=> 'Use a Custom Session Directory for SuiteCRM',
+    'LBL_SITECFG_FIX_ERRORS'			=> '<b>Please fix the following errors before proceeding:</b>',
+    'LBL_SITECFG_LOG_DIR'				=> 'Log Directory',
+    'LBL_SITECFG_SESSION_PATH'			=> 'Path to Session Directory<br>(must be writable)',
+    'LBL_SITECFG_SITE_SECURITY'			=> 'Select Security Options',
+    'LBL_SITECFG_SUGAR_UP_DIRECTIONS'	=> 'If selected, the system will periodically check for updated versions of the application.',
+    'LBL_SITECFG_SUGAR_UP'				=> 'Automatically Check For Updates?',
+    'LBL_SITECFG_SUGAR_UPDATES'			=> 'SuiteCRM Updates Config',
+    'LBL_SITECFG_TITLE'					=> 'Site Configuration',
+    'LBL_SITECFG_TITLE2'                => 'Identify Administration User',
+    'LBL_SITECFG_SECURITY_TITLE'        => 'Site Security',
+    'LBL_SITECFG_URL'					=> 'URL of SuiteCRM Instance',
+    'LBL_SITECFG_ANONSTATS'             => 'Send Anonymous Usage Statistics?',
+    'LBL_SITECFG_ANONSTATS_DIRECTIONS'  => 'If selected, SuiteCRM will send <b>anonymous</b> statistics about your installation to SuiteCRM Inc. every time your system checks for new versions. This information will help us better understand how the application is used and guide improvements to the product.',
+    'LBL_SITECFG_URL_MSG'               => 'Enter the URL that will be used to access the SuiteCRM instance after installation. The URL will also be used as a base for the URLs in the SuiteCRM application pages. The URL should include the web server or machine name or IP address.',
+    'LBL_SITECFG_SYS_NAME_MSG'          => 'Enter a name for your system. This name will be displayed in the browser title bar when users visit the SuiteCRM application.',
+    'LBL_SITECFG_PASSWORD_MSG'          => 'After installation, you will need to use the SuiteCRM admin user (default username = admin) to log in to the SuiteCRM instance. Enter a password for this administrator user. This password can be changed after the initial login. You may also enter another admin username to use besides the default value provided.',
+    'LBL_SITECFG_COLLATION_MSG'         => 'Select collation (sorting) settings for your system. This settings will create the tables with the specific language you use. In case your language doesn\'t require special settings please use default value.',
+    'LBL_SPRITE_SUPPORT'                => 'Sprite Support',
+    'LBL_SYSTEM_CREDS'                  => 'System Credentials',
+    'LBL_SYSTEM_ENV'                    => 'System Environment',
+    'LBL_START'							=> 'Start',
+    'LBL_SHOW_PASS'                     => 'Show Passwords',
+    'LBL_HIDE_PASS'                     => 'Hide Passwords',
+    'LBL_HIDDEN'                        => '<i>(hidden)</i>',
+    'LBL_STEP1' => 'Step 1 of 2 - Pre-Installation requirements',
+    'LBL_STEP2' => 'Step 2 of 2 - Configuration',
+    'LBL_STEP'							=> 'Step',
+    'LBL_TITLE_WELCOME'					=> 'Welcome to the SuiteCRM ',
+    //welcome page variables
+    'LBL_TITLE_ARE_YOU_READY'            => 'Are you ready to install?',
+    'REQUIRED_SYS_COMP' => 'Required System Components',
+    'REQUIRED_SYS_COMP_MSG' =>
+        'Before you begin, please be sure that you have the supported versions of the following system components:<br>
                       <ul>
                       <li> Database/Database Management System (Examples: MariaDB, MySQL or SQL Server)</li>
                       <li> Web Server (Apache, IIS)</li>
                       </ul>
                       Consult the Compatibility Matrix in the Release Notes for
                       compatible system components for the SuiteCRM version that you are installing.<br>',
-	'REQUIRED_SYS_CHK' => 'Initial System Check',
-	'REQUIRED_SYS_CHK_MSG' =>
-		'When you begin the installation process, a system check will be performed on the web server on which the SuiteCRM files are located in order to
+    'REQUIRED_SYS_CHK' => 'Initial System Check',
+    'REQUIRED_SYS_CHK_MSG' =>
+        'When you begin the installation process, a system check will be performed on the web server on which the SuiteCRM files are located in order to
                       make sure the system is configured properly and has all of the necessary components
                       to successfully complete the installation. <br><br>
                       The system checks all of the following:<br>
@@ -354,9 +354,9 @@ 
 
 
 
-	'REQUIRED_INSTALLTYPE' => 'Typical or Custom install',
-	'REQUIRED_INSTALLTYPE_MSG' =>
-		'After the system check is performed, you can choose either
+    'REQUIRED_INSTALLTYPE' => 'Typical or Custom install',
+    'REQUIRED_INSTALLTYPE_MSG' =>
+        'After the system check is performed, you can choose either
                       the Typical or the Custom installation.<br><br>
                       For both <b>Typical</b> and <b>Custom</b> installations, you will need to know the following:<br>
                       <ul>
@@ -398,40 +398,40 @@ 
                                   <li><b>Character Set</b> most commonly used in your locale.<br><br></li></ul>
                                   For more detailed information, please consult the Installation Guide.
                                 ',
-	'LBL_WELCOME_PLEASE_READ_BELOW' => 'Please read the following important information before proceeding with the installation. The information will help you determine whether or not you are ready to install the application at this time.',
-
-	'LBL_WELCOME_CHOOSE_LANGUAGE'		=> '<b>Choose your language</b>',
-	'LBL_WELCOME_SETUP_WIZARD'			=> 'Setup Wizard',
-	'LBL_WIZARD_TITLE'					=> 'SuiteCRM Setup Wizard: ',
-	'LBL_YES'							=> 'Yes',
-
-	'LBL_PATCHES_TITLE'     => 'Install Latest Patches',
-	'LBL_MODULE_TITLE'      => 'Install Language Packs',
-	'LBL_PATCH_1'           => 'If you would like to skip this step, click Next.',
-	'LBL_PATCH_TITLE'       => 'System Patch',
-	'LBL_PATCH_READY'       => 'The following patch(es) are ready to be installed:',
-	'LBL_SESSION_ERR_DESCRIPTION'		=> "SuiteCRM relies upon PHP sessions to store important information while connected to this web server. Your PHP installation does not have the Session information correctly configured.
+    'LBL_WELCOME_PLEASE_READ_BELOW' => 'Please read the following important information before proceeding with the installation. The information will help you determine whether or not you are ready to install the application at this time.',
+
+    'LBL_WELCOME_CHOOSE_LANGUAGE'		=> '<b>Choose your language</b>',
+    'LBL_WELCOME_SETUP_WIZARD'			=> 'Setup Wizard',
+    'LBL_WIZARD_TITLE'					=> 'SuiteCRM Setup Wizard: ',
+    'LBL_YES'							=> 'Yes',
+
+    'LBL_PATCHES_TITLE'     => 'Install Latest Patches',
+    'LBL_MODULE_TITLE'      => 'Install Language Packs',
+    'LBL_PATCH_1'           => 'If you would like to skip this step, click Next.',
+    'LBL_PATCH_TITLE'       => 'System Patch',
+    'LBL_PATCH_READY'       => 'The following patch(es) are ready to be installed:',
+    'LBL_SESSION_ERR_DESCRIPTION'		=> "SuiteCRM relies upon PHP sessions to store important information while connected to this web server. Your PHP installation does not have the Session information correctly configured.
 											<br><br>A common misconfiguration is that the <b>'session.save_path'</b> directive is not pointing to a valid directory. <br>
 											<br> Please correct your <a target=_new href='http://us2.php.net/manual/en/ref.session.php'>PHP configuration</a> in the php.ini file located here below.",
-	'LBL_SESSION_ERR_TITLE'				=> 'PHP Sessions Configuration Error',
-	'LBL_SYSTEM_NAME'=>'System Name',
-	'LBL_COLLATION' => 'Collation Settings',
-	'LBL_REQUIRED_SYSTEM_NAME'=>'Provide a System Name for the SuiteCRM instance.',
-	'LBL_PATCH_UPLOAD' => 'Select a patch file from your local computer',
-	'LBL_INCOMPATIBLE_PHP_VERSION' => 'Php version 5 or above is required.',
-	'LBL_MINIMUM_PHP_VERSION' => 'Minimum Php version required is 5.1.0. Recommended Php version is 5.2.x.',
-	'LBL_YOUR_PHP_VERSION' => '(Your current php version is ',
-	'LBL_RECOMMENDED_PHP_VERSION' =>' Recommended php version is 5.2.x)',
-	'LBL_BACKWARD_COMPATIBILITY_ON' => 'Php Backward Compatibility mode is turned on. Set zend.ze1_compatibility_mode to Off for proceeding further',
-	'LBL_STREAM' => 'PHP allows to use stream',
-
-	'advanced_password_new_account_email' => array(
-		'subject' => 'New account information',
-		'type' => 'system',
-		'description' => 'This template is used when the System Administrator sends a new password to a user.',
-		'body' => '<div><table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width="550" align=\"\&quot;\&quot;center\&quot;\&quot;\"><tbody><tr><td colspan=\"2\"><p>Here is your account username and temporary password:</p><p>Username : $contact_user_user_name </p><p>Password : $contact_user_user_hash </p><br><p>$config_site_url</p><br><p>After you log in using the above password, you may be required to reset the password to one of your own choice.</p>   </td>         </tr><tr><td colspan=\"2\"></td>         </tr> </tbody></table> </div>',
-		'txt_body' =>
-			'
+    'LBL_SESSION_ERR_TITLE'				=> 'PHP Sessions Configuration Error',
+    'LBL_SYSTEM_NAME'=>'System Name',
+    'LBL_COLLATION' => 'Collation Settings',
+    'LBL_REQUIRED_SYSTEM_NAME'=>'Provide a System Name for the SuiteCRM instance.',
+    'LBL_PATCH_UPLOAD' => 'Select a patch file from your local computer',
+    'LBL_INCOMPATIBLE_PHP_VERSION' => 'Php version 5 or above is required.',
+    'LBL_MINIMUM_PHP_VERSION' => 'Minimum Php version required is 5.1.0. Recommended Php version is 5.2.x.',
+    'LBL_YOUR_PHP_VERSION' => '(Your current php version is ',
+    'LBL_RECOMMENDED_PHP_VERSION' =>' Recommended php version is 5.2.x)',
+    'LBL_BACKWARD_COMPATIBILITY_ON' => 'Php Backward Compatibility mode is turned on. Set zend.ze1_compatibility_mode to Off for proceeding further',
+    'LBL_STREAM' => 'PHP allows to use stream',
+
+    'advanced_password_new_account_email' => array(
+        'subject' => 'New account information',
+        'type' => 'system',
+        'description' => 'This template is used when the System Administrator sends a new password to a user.',
+        'body' => '<div><table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width="550" align=\"\&quot;\&quot;center\&quot;\&quot;\"><tbody><tr><td colspan=\"2\"><p>Here is your account username and temporary password:</p><p>Username : $contact_user_user_name </p><p>Password : $contact_user_user_hash </p><br><p>$config_site_url</p><br><p>After you log in using the above password, you may be required to reset the password to one of your own choice.</p>   </td>         </tr><tr><td colspan=\"2\"></td>         </tr> </tbody></table> </div>',
+        'txt_body' =>
+            '
 Here is your account username and temporary password:
 Username : $contact_user_user_name
 Password : $contact_user_user_hash
@@ -439,120 +439,120 @@ 
 $config_site_url
 
 After you log in using the above password, you may be required to reset the password to one of your own choice.',
-		'name' => 'System-generated password email',
-	),
-	'advanced_password_forgot_password_email' => array(
-		'subject' => 'Reset your account password',
-		'type' => 'system',
+        'name' => 'System-generated password email',
+    ),
+    'advanced_password_forgot_password_email' => array(
+        'subject' => 'Reset your account password',
+        'type' => 'system',
         'description' => "This template is used to send a user a link to click to reset the user's account password.",
-		'body' => '<div><table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width="550" align=\"\&quot;\&quot;center\&quot;\&quot;\"><tbody><tr><td colspan=\"2\"><p>You recently requested on $contact_user_pwd_last_changed to be able to reset your account password. </p><p>Click on the link below to reset your password:</p><p> $contact_user_link_guid </p>  </td>         </tr><tr><td colspan=\"2\"></td>         </tr> </tbody></table> </div>',
-		'txt_body' =>
-			'
+        'body' => '<div><table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width="550" align=\"\&quot;\&quot;center\&quot;\&quot;\"><tbody><tr><td colspan=\"2\"><p>You recently requested on $contact_user_pwd_last_changed to be able to reset your account password. </p><p>Click on the link below to reset your password:</p><p> $contact_user_link_guid </p>  </td>         </tr><tr><td colspan=\"2\"></td>         </tr> </tbody></table> </div>',
+        'txt_body' =>
+            '
 You recently requested on $contact_user_pwd_last_changed to be able to reset your account password.
 
 Click on the link below to reset your password:
 
 $contact_user_link_guid',
-		'name' => 'Forgot Password email',
-	),
-
-	// SMTP settings
-
-	'LBL_WIZARD_SMTP_DESC' => 'Provide the email account that will be used to send emails, such as the assignment notifications and new user passwords. Users will receive emails from SuiteCRM, as sent from the specified email account.',
-	'LBL_CHOOSE_EMAIL_PROVIDER'        => 'Choose your Email provider:',
-
-	'LBL_SMTPTYPE_GMAIL'                    => 'Gmail',
-	'LBL_SMTPTYPE_YAHOO'                    => 'Yahoo! Mail',
-	'LBL_SMTPTYPE_EXCHANGE'                 => 'Microsoft Exchange',
-	'LBL_SMTPTYPE_OTHER'                  => 'Other',
-	'LBL_MAIL_SMTP_SETTINGS'           => 'SMTP Server Specification',
-	'LBL_MAIL_SMTPSERVER'				=> 'SMTP Server:',
-	'LBL_MAIL_SMTPPORT'					=> 'SMTP Port:',
-	'LBL_MAIL_SMTPAUTH_REQ'				=> 'Use SMTP Authentication?',
-	'LBL_EMAIL_SMTP_SSL_OR_TLS'         => 'Enable SMTP over SSL or TLS?',
-	'LBL_GMAIL_SMTPUSER'					=> 'Gmail Email Address:',
-	'LBL_GMAIL_SMTPPASS'					=> 'Gmail Password:',
-	'LBL_ALLOW_DEFAULT_SELECTION'           => 'Allow users to use this account for outgoing email:',
-	'LBL_ALLOW_DEFAULT_SELECTION_HELP'          => 'When this option is selected, all users will be able to send emails using the same outgoing mail account used to send system notifications and alerts. If the option is not selected, users can still use the outgoing mail server after providing their own account information.',
-
-	'LBL_YAHOOMAIL_SMTPPASS'					=> 'Yahoo! Mail Password:',
-	'LBL_YAHOOMAIL_SMTPUSER'					=> 'Yahoo! Mail ID:',
-
-	'LBL_EXCHANGE_SMTPPASS'					=> 'Exchange Password:',
-	'LBL_EXCHANGE_SMTPUSER'					=> 'Exchange Username:',
-	'LBL_EXCHANGE_SMTPPORT'					=> 'Exchange Server Port:',
-	'LBL_EXCHANGE_SMTPSERVER'				=> 'Exchange Server:',
-
-
-	'LBL_MAIL_SMTPUSER'					=> 'SMTP Username:',
-	'LBL_MAIL_SMTPPASS'					=> 'SMTP Password:',
-
-	// Branding
-
-	'LBL_WIZARD_SYSTEM_TITLE' => 'Branding',
-	'LBL_WIZARD_SYSTEM_DESC' => 'Provide your organization\'s name and logo in order to brand your SuiteCRM.',
-	'SYSTEM_NAME_WIZARD'=>'Name:',
-	'SYSTEM_NAME_HELP'=>'This is the name that displays in the title bar of your browser.',
-	'NEW_LOGO'=>'Select Logo:',
-	'NEW_LOGO_HELP'=>'The image file format can be either .png or .jpg. The maximum height is 170px, and the maximum width is 450px. Any image uploaded that is larger in any direction will be scaled to these max dimensions.',
-	'COMPANY_LOGO_UPLOAD_BTN' => 'Upload',
-	'CURRENT_LOGO'=>'Current Logo:',
-	'CURRENT_LOGO_HELP'=>'This logo is displayed in the left-hand corner of the footer of the SuiteCRM application.',
-
-
-	//Scenario selection of modules
-	'LBL_WIZARD_SCENARIO_TITLE' => 'Scenario Selection',
-	'LBL_WIZARD_SCENARIO_DESC' => 'This is to allow tailoring of the displayed modules based on your requirements. Each of the modules can be enabled after install using the administration page.',
-	'LBL_WIZARD_SCENARIO_EMPTY'=> 'There are no scenarios currently set in the configuration file (config.php)',
-
-
-
-	// System Local Settings
-
-
-	'LBL_LOCALE_TITLE' => 'System Locale Settings',
-	'LBL_WIZARD_LOCALE_DESC' => 'Specify how you would like data in SuiteCRM to be displayed, based on your geographical location. The settings you provide here will be the default settings. Users will be able set their own preferences.',
-	'LBL_DATE_FORMAT' => 'Date Format:',
-	'LBL_TIME_FORMAT' => 'Time Format:',
-	'LBL_TIMEZONE' => 'Time Zone:',
-	'LBL_LANGUAGE'=>'Language:',
-	'LBL_CURRENCY'=>'Currency:',
-	'LBL_CURRENCY_SYMBOL'=>'Currency Symbol:',
-	'LBL_CURRENCY_ISO4217' => 'ISO 4217 Currency Code:',
-	'LBL_NUMBER_GROUPING_SEP' => '1000s separator:',
-	'LBL_DECIMAL_SEP' => 'Decimal symbol:',
-	'LBL_NAME_FORMAT' => 'Name Format:',
-	'UPLOAD_LOGO' => 'Please wait, logo uploading..',
-	'ERR_UPLOAD_FILETYPE' => 'File type do not allowed, please upload a jpeg or png.',
-	'ERR_LANG_UPLOAD_UNKNOWN' => 'Unknown file upload error occured.',
-	'ERR_UPLOAD_FILE_UPLOAD_ERR_INI_SIZE' => 'The uploaded file exceeds the upload_max_filesize directive in php.ini.',
-	'ERR_UPLOAD_FILE_UPLOAD_ERR_FORM_SIZE' => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.',
-	'ERR_UPLOAD_FILE_UPLOAD_ERR_PARTIAL' => 'The uploaded file was only partially uploaded.',
-	'ERR_UPLOAD_FILE_UPLOAD_ERR_NO_FILE' => 'No file was uploaded.',
-	'ERR_UPLOAD_FILE_UPLOAD_ERR_NO_TMP_DIR' => 'Missing a temporary folder.',
-	'ERR_UPLOAD_FILE_UPLOAD_ERR_CANT_WRITE' => 'Failed to write file to disk.',
-	'ERR_UPLOAD_FILE_UPLOAD_ERR_EXTENSION' => 'A PHP extension stopped the file upload. PHP does not provide a way to ascertain which extension caused the file upload to stop.',
-
-	'LBL_INSTALL_PROCESS' => 'Install...',
-
-	'LBL_EMAIL_ADDRESS' => 'Email Address:',
-	'ERR_ADMIN_EMAIL' => 'Administrator Email Address is incorrect.',
-	'ERR_SITE_URL' => 'Site URL is required.',
-
-	'STAT_CONFIGURATION' => 'Configuration relationships...',
-	'STAT_CREATE_DB' => 'Create database...',
-	//'STAT_CREATE_DB_TABLE' => 'Create database... (table: %s)',
-	'STAT_CREATE_DEFAULT_SETTINGS' => 'Create default settings...',
-	'STAT_INSTALL_FINISH' => 'Install finish...',
-	'STAT_INSTALL_FINISH_LOGIN' => 'Installation process finished, <a href="%s">please log in...</a>',
-	'LBL_LICENCE_TOOLTIP' => 'Please accept license first',
-
-	'LBL_MORE_OPTIONS_TITLE' => 'More options',
-	'LBL_START' => '',
-	'LBL_DB_CONN_ERR' => 'Database error',
-	'LBL_OLD_PHP' => 'Old PHP Version Detected!',
-	'LBL_OLD_PHP_MSG' => 'The recommended PHP version to install SuiteCRM is %s <br />Although the minimum PHP version required is %s, is not recommended due to the large number of fixed bugs, including security fixes, released in the more modern versions.<br />You are using PHP version %s, which is EOL: <a href="http://php.net/eol.php">http://php.net/eol.php</a>.<br />Please consider upgrading your PHP version. Instructions on <a href="http://php.net/migration70">http://php.net/migration70</a>. ',
-	'LBL_OLD_PHP_OK' => 'I\'m aware of the risks and wish to continue.',
+        'name' => 'Forgot Password email',
+    ),
+
+    // SMTP settings
+
+    'LBL_WIZARD_SMTP_DESC' => 'Provide the email account that will be used to send emails, such as the assignment notifications and new user passwords. Users will receive emails from SuiteCRM, as sent from the specified email account.',
+    'LBL_CHOOSE_EMAIL_PROVIDER'        => 'Choose your Email provider:',
+
+    'LBL_SMTPTYPE_GMAIL'                    => 'Gmail',
+    'LBL_SMTPTYPE_YAHOO'                    => 'Yahoo! Mail',
+    'LBL_SMTPTYPE_EXCHANGE'                 => 'Microsoft Exchange',
+    'LBL_SMTPTYPE_OTHER'                  => 'Other',
+    'LBL_MAIL_SMTP_SETTINGS'           => 'SMTP Server Specification',
+    'LBL_MAIL_SMTPSERVER'				=> 'SMTP Server:',
+    'LBL_MAIL_SMTPPORT'					=> 'SMTP Port:',
+    'LBL_MAIL_SMTPAUTH_REQ'				=> 'Use SMTP Authentication?',
+    'LBL_EMAIL_SMTP_SSL_OR_TLS'         => 'Enable SMTP over SSL or TLS?',
+    'LBL_GMAIL_SMTPUSER'					=> 'Gmail Email Address:',
+    'LBL_GMAIL_SMTPPASS'					=> 'Gmail Password:',
+    'LBL_ALLOW_DEFAULT_SELECTION'           => 'Allow users to use this account for outgoing email:',
+    'LBL_ALLOW_DEFAULT_SELECTION_HELP'          => 'When this option is selected, all users will be able to send emails using the same outgoing mail account used to send system notifications and alerts. If the option is not selected, users can still use the outgoing mail server after providing their own account information.',
+
+    'LBL_YAHOOMAIL_SMTPPASS'					=> 'Yahoo! Mail Password:',
+    'LBL_YAHOOMAIL_SMTPUSER'					=> 'Yahoo! Mail ID:',
+
+    'LBL_EXCHANGE_SMTPPASS'					=> 'Exchange Password:',
+    'LBL_EXCHANGE_SMTPUSER'					=> 'Exchange Username:',
+    'LBL_EXCHANGE_SMTPPORT'					=> 'Exchange Server Port:',
+    'LBL_EXCHANGE_SMTPSERVER'				=> 'Exchange Server:',
+
+
+    'LBL_MAIL_SMTPUSER'					=> 'SMTP Username:',
+    'LBL_MAIL_SMTPPASS'					=> 'SMTP Password:',
+
+    // Branding
+
+    'LBL_WIZARD_SYSTEM_TITLE' => 'Branding',
+    'LBL_WIZARD_SYSTEM_DESC' => 'Provide your organization\'s name and logo in order to brand your SuiteCRM.',
+    'SYSTEM_NAME_WIZARD'=>'Name:',
+    'SYSTEM_NAME_HELP'=>'This is the name that displays in the title bar of your browser.',
+    'NEW_LOGO'=>'Select Logo:',
+    'NEW_LOGO_HELP'=>'The image file format can be either .png or .jpg. The maximum height is 170px, and the maximum width is 450px. Any image uploaded that is larger in any direction will be scaled to these max dimensions.',
+    'COMPANY_LOGO_UPLOAD_BTN' => 'Upload',
+    'CURRENT_LOGO'=>'Current Logo:',
+    'CURRENT_LOGO_HELP'=>'This logo is displayed in the left-hand corner of the footer of the SuiteCRM application.',
+
+
+    //Scenario selection of modules
+    'LBL_WIZARD_SCENARIO_TITLE' => 'Scenario Selection',
+    'LBL_WIZARD_SCENARIO_DESC' => 'This is to allow tailoring of the displayed modules based on your requirements. Each of the modules can be enabled after install using the administration page.',
+    'LBL_WIZARD_SCENARIO_EMPTY'=> 'There are no scenarios currently set in the configuration file (config.php)',
+
+
+
+    // System Local Settings
+
+
+    'LBL_LOCALE_TITLE' => 'System Locale Settings',
+    'LBL_WIZARD_LOCALE_DESC' => 'Specify how you would like data in SuiteCRM to be displayed, based on your geographical location. The settings you provide here will be the default settings. Users will be able set their own preferences.',
+    'LBL_DATE_FORMAT' => 'Date Format:',
+    'LBL_TIME_FORMAT' => 'Time Format:',
+    'LBL_TIMEZONE' => 'Time Zone:',
+    'LBL_LANGUAGE'=>'Language:',
+    'LBL_CURRENCY'=>'Currency:',
+    'LBL_CURRENCY_SYMBOL'=>'Currency Symbol:',
+    'LBL_CURRENCY_ISO4217' => 'ISO 4217 Currency Code:',
+    'LBL_NUMBER_GROUPING_SEP' => '1000s separator:',
+    'LBL_DECIMAL_SEP' => 'Decimal symbol:',
+    'LBL_NAME_FORMAT' => 'Name Format:',
+    'UPLOAD_LOGO' => 'Please wait, logo uploading..',
+    'ERR_UPLOAD_FILETYPE' => 'File type do not allowed, please upload a jpeg or png.',
+    'ERR_LANG_UPLOAD_UNKNOWN' => 'Unknown file upload error occured.',
+    'ERR_UPLOAD_FILE_UPLOAD_ERR_INI_SIZE' => 'The uploaded file exceeds the upload_max_filesize directive in php.ini.',
+    'ERR_UPLOAD_FILE_UPLOAD_ERR_FORM_SIZE' => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.',
+    'ERR_UPLOAD_FILE_UPLOAD_ERR_PARTIAL' => 'The uploaded file was only partially uploaded.',
+    'ERR_UPLOAD_FILE_UPLOAD_ERR_NO_FILE' => 'No file was uploaded.',
+    'ERR_UPLOAD_FILE_UPLOAD_ERR_NO_TMP_DIR' => 'Missing a temporary folder.',
+    'ERR_UPLOAD_FILE_UPLOAD_ERR_CANT_WRITE' => 'Failed to write file to disk.',
+    'ERR_UPLOAD_FILE_UPLOAD_ERR_EXTENSION' => 'A PHP extension stopped the file upload. PHP does not provide a way to ascertain which extension caused the file upload to stop.',
+
+    'LBL_INSTALL_PROCESS' => 'Install...',
+
+    'LBL_EMAIL_ADDRESS' => 'Email Address:',
+    'ERR_ADMIN_EMAIL' => 'Administrator Email Address is incorrect.',
+    'ERR_SITE_URL' => 'Site URL is required.',
+
+    'STAT_CONFIGURATION' => 'Configuration relationships...',
+    'STAT_CREATE_DB' => 'Create database...',
+    //'STAT_CREATE_DB_TABLE' => 'Create database... (table: %s)',
+    'STAT_CREATE_DEFAULT_SETTINGS' => 'Create default settings...',
+    'STAT_INSTALL_FINISH' => 'Install finish...',
+    'STAT_INSTALL_FINISH_LOGIN' => 'Installation process finished, <a href="%s">please log in...</a>',
+    'LBL_LICENCE_TOOLTIP' => 'Please accept license first',
+
+    'LBL_MORE_OPTIONS_TITLE' => 'More options',
+    'LBL_START' => '',
+    'LBL_DB_CONN_ERR' => 'Database error',
+    'LBL_OLD_PHP' => 'Old PHP Version Detected!',
+    'LBL_OLD_PHP_MSG' => 'The recommended PHP version to install SuiteCRM is %s <br />Although the minimum PHP version required is %s, is not recommended due to the large number of fixed bugs, including security fixes, released in the more modern versions.<br />You are using PHP version %s, which is EOL: <a href="http://php.net/eol.php">http://php.net/eol.php</a>.<br />Please consider upgrading your PHP version. Instructions on <a href="http://php.net/migration70">http://php.net/migration70</a>. ',
+    'LBL_OLD_PHP_OK' => 'I\'m aware of the risks and wish to continue.',
 
     'LBL_DBCONF_TITLE_USER_INFO_LABEL' => 'User',
     'LBL_DBCONFIG_MSG3_LABEL' => 'Database Name',