adamjakab / SuiteCRM

modules/Home/UnifiedSearchAdvanced.php

Indentation +297 added lines, -297 removed lines

@@ -69,95 +69,95 @@ 
         $this->cache_display = sugar_cached('modules/unified_search_modules_display.php');
     }
 
-	function getDropDownDiv($tpl = 'modules/Home/UnifiedSearchAdvanced.tpl') {
-		global $app_list_strings, $app_strings;
+    function getDropDownDiv($tpl = 'modules/Home/UnifiedSearchAdvanced.tpl') {
+        global $app_list_strings, $app_strings;
 
-		if(!file_exists($this->cache_search))
-		{
-			$this->buildCache();
-		}
+        if(!file_exists($this->cache_search))
+        {
+            $this->buildCache();
+        }
 
-		$unified_search_modules_display = $this->getUnifiedSearchModulesDisplay();
+        $unified_search_modules_display = $this->getUnifiedSearchModulesDisplay();
 
-		global $mod_strings, $modListHeader, $app_list_strings, $current_user, $app_strings, $beanList;
-		$users_modules = $current_user->getPreference('globalSearch', 'search');
+        global $mod_strings, $modListHeader, $app_list_strings, $current_user, $app_strings, $beanList;
+        $users_modules = $current_user->getPreference('globalSearch', 'search');
 
-		// preferences are empty, select all
-		if(empty($users_modules)) {
-			$users_modules = array();
-			foreach($unified_search_modules_display as $module=>$data) {
-				if (!empty($data['visible']) ) {
+        // preferences are empty, select all
+        if(empty($users_modules)) {
+            $users_modules = array();
+            foreach($unified_search_modules_display as $module=>$data) {
+                if (!empty($data['visible']) ) {
                     $users_modules[$module] = $beanList[$module];
                 }
-			}
-			$current_user->setPreference('globalSearch', $users_modules, 0, 'search');
-		}
+            }
+            $current_user->setPreference('globalSearch', $users_modules, 0, 'search');
+        }
 
-		$sugar_smarty = new Sugar_Smarty();
+        $sugar_smarty = new Sugar_Smarty();
 
-		$modules_to_search = array();
+        $modules_to_search = array();
 
-		foreach($users_modules as $key=>$module)
-		{
+        foreach($users_modules as $key=>$module)
+        {
             if(ACLController::checkAccess($key, 'list', true))
             {
                 $modules_to_search[$key]['checked'] = true;
             }
-		}
-
-		if(!empty($this->query_string))
-		{
-			$sugar_smarty->assign('query_string', securexss($this->query_string));
-		} else {
-			$sugar_smarty->assign('query_string', '');
-		}
-
-		$sugar_smarty->assign('MOD', return_module_language($GLOBALS['current_language'], 'Administration'));
-		$sugar_smarty->assign('APP', $app_strings);
-		$sugar_smarty->assign('USE_SEARCH_GIF', 0);
-		$sugar_smarty->assign('LBL_SEARCH_BUTTON_LABEL', $app_strings['LBL_SEARCH_BUTTON_LABEL']);
-		$sugar_smarty->assign('LBL_SEARCH_BUTTON_TITLE', $app_strings['LBL_SEARCH_BUTTON_TITLE']);
-		$sugar_smarty->assign('LBL_SEARCH', $app_strings['LBL_SEARCH']);
-
-		$json_enabled = array();
-		$json_disabled = array();
-
-		//Now add the rest of the modules that are searchable via Global Search settings
-		foreach($unified_search_modules_display as $module=>$data)
-		{
-			if(!isset($modules_to_search[$module]) && $data['visible'] && ACLController::checkAccess($module, 'list', true))
-			{
-			   $modules_to_search[$module]['checked'] = false;
-			} else if (isset($modules_to_search[$module]) && !$data['visible']) {
-			   unset($modules_to_search[$module]);
-			}
-		}
-
-		//Create the two lists (doing it this way preserves the user's ordering choice for enabled modules)
-		foreach($modules_to_search as $module=>$data)
-		{
-			$label = isset($app_list_strings['moduleList'][$module]) ? $app_list_strings['moduleList'][$module] : $module;
-			if(!empty($data['checked']))
-			{
-				$json_enabled[] = array("module" => $module, 'label' => $label);
-			} else {
-				$json_disabled[] = array("module" => $module, 'label' => $label);
-			}
-		}
-
-		$sugar_smarty->assign('enabled_modules', json_encode($json_enabled));
-		$sugar_smarty->assign('disabled_modules', json_encode($json_disabled));
-
-		$showDiv = $current_user->getPreference('showGSDiv', 'search');
-		if(!isset($showDiv))
-		{
-		   $showDiv = 'no';
-		}
-
-		$sugar_smarty->assign('SHOWGSDIV', $showDiv);
-		$sugar_smarty->debugging = true;
-		return $sugar_smarty->fetch($tpl);
-	}
+        }
+
+        if(!empty($this->query_string))
+        {
+            $sugar_smarty->assign('query_string', securexss($this->query_string));
+        } else {
+            $sugar_smarty->assign('query_string', '');
+        }
+
+        $sugar_smarty->assign('MOD', return_module_language($GLOBALS['current_language'], 'Administration'));
+        $sugar_smarty->assign('APP', $app_strings);
+        $sugar_smarty->assign('USE_SEARCH_GIF', 0);
+        $sugar_smarty->assign('LBL_SEARCH_BUTTON_LABEL', $app_strings['LBL_SEARCH_BUTTON_LABEL']);
+        $sugar_smarty->assign('LBL_SEARCH_BUTTON_TITLE', $app_strings['LBL_SEARCH_BUTTON_TITLE']);
+        $sugar_smarty->assign('LBL_SEARCH', $app_strings['LBL_SEARCH']);
+
+        $json_enabled = array();
+        $json_disabled = array();
+
+        //Now add the rest of the modules that are searchable via Global Search settings
+        foreach($unified_search_modules_display as $module=>$data)
+        {
+            if(!isset($modules_to_search[$module]) && $data['visible'] && ACLController::checkAccess($module, 'list', true))
+            {
+                $modules_to_search[$module]['checked'] = false;
+            } else if (isset($modules_to_search[$module]) && !$data['visible']) {
+                unset($modules_to_search[$module]);
+            }
+        }
+
+        //Create the two lists (doing it this way preserves the user's ordering choice for enabled modules)
+        foreach($modules_to_search as $module=>$data)
+        {
+            $label = isset($app_list_strings['moduleList'][$module]) ? $app_list_strings['moduleList'][$module] : $module;
+            if(!empty($data['checked']))
+            {
+                $json_enabled[] = array("module" => $module, 'label' => $label);
+            } else {
+                $json_disabled[] = array("module" => $module, 'label' => $label);
+            }
+        }
+
+        $sugar_smarty->assign('enabled_modules', json_encode($json_enabled));
+        $sugar_smarty->assign('disabled_modules', json_encode($json_disabled));
+
+        $showDiv = $current_user->getPreference('showGSDiv', 'search');
+        if(!isset($showDiv))
+        {
+            $showDiv = 'no';
+        }
+
+        $sugar_smarty->assign('SHOWGSDIV', $showDiv);
+        $sugar_smarty->debugging = true;
+        return $sugar_smarty->fetch($tpl);
+    }
 
 
     /**
@@ -170,70 +170,70 @@ 
      *
      *
      */
-	function search() {
+    function search() {
 
         $unified_search_modules = $this->getUnifiedSearchModules();
-		$unified_search_modules_display = $this->getUnifiedSearchModulesDisplay();
+        $unified_search_modules_display = $this->getUnifiedSearchModulesDisplay();
 
 
-		require_once 'include/ListView/ListViewSmarty.php';
+        require_once 'include/ListView/ListViewSmarty.php';
 
-		global $modListHeader, $beanList, $beanFiles, $current_language, $app_strings, $current_user, $mod_strings;
-		$home_mod_strings = return_module_language($current_language, 'Home');
+        global $modListHeader, $beanList, $beanFiles, $current_language, $app_strings, $current_user, $mod_strings;
+        $home_mod_strings = return_module_language($current_language, 'Home');
 
-		$this->query_string = $GLOBALS['db']->quote(securexss(from_html(clean_string($this->query_string, 'UNIFIED_SEARCH'))));
+        $this->query_string = $GLOBALS['db']->quote(securexss(from_html(clean_string($this->query_string, 'UNIFIED_SEARCH'))));
 
-		if(!empty($_REQUEST['advanced']) && $_REQUEST['advanced'] != 'false') {
-			$modules_to_search = array();
-			if(!empty($_REQUEST['search_modules']))
-			{
-			    foreach(explode (',', $_REQUEST['search_modules'] ) as $key)
-	            {
+        if(!empty($_REQUEST['advanced']) && $_REQUEST['advanced'] != 'false') {
+            $modules_to_search = array();
+            if(!empty($_REQUEST['search_modules']))
+            {
+                foreach(explode (',', $_REQUEST['search_modules'] ) as $key)
+                {
                     if (isset($unified_search_modules_display[$key]) && !empty($unified_search_modules_display[$key]['visible']))
                     {
                         $modules_to_search[$key] = $beanList[$key];
                     }
-	            }
-			}
-
-			$current_user->setPreference('showGSDiv', isset($_REQUEST['showGSDiv']) ? $_REQUEST['showGSDiv'] : 'no', 0, 'search');
-			$current_user->setPreference('globalSearch', $modules_to_search, 0, 'search'); // save selections to user preference
-		} else {
-			$users_modules = $current_user->getPreference('globalSearch', 'search');
-			$modules_to_search = array();
-
-			if(!empty($users_modules)) {
-				// use user's previous selections
-			    foreach ( $users_modules as $key => $value ) {
-			    	if (isset($unified_search_modules_display[$key]) && !empty($unified_search_modules_display[$key]['visible'])) {
-		            	$modules_to_search[$key] = $beanList[$key];
-		        	}
-			    }
-			} else {
-				foreach($unified_search_modules_display as $module=>$data) {
-				    if (!empty($data['visible']) ) {
-				        $modules_to_search[$module] = $beanList[$module];
-				    }
-				}
-			}
-			$current_user->setPreference('globalSearch', $modules_to_search, 'search');
-		}
-
-
-		$templateFile = 'modules/Home/UnifiedSearchAdvancedForm.tpl';
-		if(file_exists('custom/' . $templateFile))
-		{
-		   $templateFile = 'custom/'.$templateFile;
-		}
-
-		echo $this->getDropDownDiv($templateFile);
-
-		$module_results = array();
-		$module_counts = array();
-		$has_results = false;
-
-		if(!empty($this->query_string)) {
-			foreach($modules_to_search as $moduleName => $beanName) {
+                }
+            }
+
+            $current_user->setPreference('showGSDiv', isset($_REQUEST['showGSDiv']) ? $_REQUEST['showGSDiv'] : 'no', 0, 'search');
+            $current_user->setPreference('globalSearch', $modules_to_search, 0, 'search'); // save selections to user preference
+        } else {
+            $users_modules = $current_user->getPreference('globalSearch', 'search');
+            $modules_to_search = array();
+
+            if(!empty($users_modules)) {
+                // use user's previous selections
+                foreach ( $users_modules as $key => $value ) {
+                    if (isset($unified_search_modules_display[$key]) && !empty($unified_search_modules_display[$key]['visible'])) {
+                        $modules_to_search[$key] = $beanList[$key];
+                    }
+                }
+            } else {
+                foreach($unified_search_modules_display as $module=>$data) {
+                    if (!empty($data['visible']) ) {
+                        $modules_to_search[$module] = $beanList[$module];
+                    }
+                }
+            }
+            $current_user->setPreference('globalSearch', $modules_to_search, 'search');
+        }
+
+
+        $templateFile = 'modules/Home/UnifiedSearchAdvancedForm.tpl';
+        if(file_exists('custom/' . $templateFile))
+        {
+            $templateFile = 'custom/'.$templateFile;
+        }
+
+        echo $this->getDropDownDiv($templateFile);
+
+        $module_results = array();
+        $module_counts = array();
+        $has_results = false;
+
+        if(!empty($this->query_string)) {
+            foreach($modules_to_search as $moduleName => $beanName) {
                 require_once $beanFiles[$beanName] ;
                 $seed = new $beanName();
 
@@ -243,7 +243,7 @@ 
 
                 //retrieve the original list view defs and store for processing in case of custom layout changes
                 require('modules/'.$seed->module_dir.'/metadata/listviewdefs.php');
-				$orig_listViewDefs = $listViewDefs;
+                $orig_listViewDefs = $listViewDefs;
 
                 if(file_exists('custom/modules/'.$seed->module_dir.'/metadata/listviewdefs.php'))
                 {
@@ -255,20 +255,20 @@ 
                     continue;
                 }
 
-			    $unifiedSearchFields = array () ;
+                $unifiedSearchFields = array () ;
                 $innerJoins = array();
                 foreach ( $unified_search_modules[ $moduleName ]['fields'] as $field=>$def )
                 {
-                	$listViewCheckField = strtoupper($field);
-                	//check to see if the field is in listview defs
-					if ( empty($listViewDefs[$seed->module_dir][$listViewCheckField]['default']) ) {
-						//check to see if field is in original list view defs (in case we are using custom layout defs)
-						if (!empty($orig_listViewDefs[$seed->module_dir][$listViewCheckField]['default']) ) {
-							//if we are here then the layout has been customized, but the field is still needed for query creation
-							$listViewDefs[$seed->module_dir][$listViewCheckField] = $orig_listViewDefs[$seed->module_dir][$listViewCheckField];
-						}
+                    $listViewCheckField = strtoupper($field);
+                    //check to see if the field is in listview defs
+                    if ( empty($listViewDefs[$seed->module_dir][$listViewCheckField]['default']) ) {
+                        //check to see if field is in original list view defs (in case we are using custom layout defs)
+                        if (!empty($orig_listViewDefs[$seed->module_dir][$listViewCheckField]['default']) ) {
+                            //if we are here then the layout has been customized, but the field is still needed for query creation
+                            $listViewDefs[$seed->module_dir][$listViewCheckField] = $orig_listViewDefs[$seed->module_dir][$listViewCheckField];
+                        }
 
-					}
+                    }
 
                     //bug: 34125 we might want to try to use the LEFT JOIN operator instead of the INNER JOIN in the case we are
                     //joining against a field that has not been populated.
@@ -302,7 +302,7 @@ 
                 require_once $beanFiles[$beanName] ;
                 $seed = new $beanName();
                 
-				require_once $this->searchFormPath;
+                require_once $this->searchFormPath;
                 $searchForm = new $this->searchFormClass ( $seed, $moduleName ) ;
 
                 $searchForm->setup (array ( $moduleName => array() ) , $unifiedSearchFields , '' , 'saved_views' /* hack to avoid setup doing further unwanted processing */ ) ;
@@ -311,11 +311,11 @@ 
                 $params = array('custom_select' => "");
                 foreach($innerJoins as $field=>$def) {
                     if (isset ($def['db_field'])) {
-                      foreach($def['db_field'] as $dbfield)
-                          $where_clauses[] = $dbfield . " LIKE '" . $this->query_string . "%'";
-                          $params['custom_select'] .= ", $dbfield";
-                          $params['distinct'] = true;
-                          //$filterFields[$dbfield] = $dbfield;
+                        foreach($def['db_field'] as $dbfield)
+                            $where_clauses[] = $dbfield . " LIKE '" . $this->query_string . "%'";
+                            $params['custom_select'] .= ", $dbfield";
+                            $params['distinct'] = true;
+                            //$filterFields[$dbfield] = $dbfield;
                     }
                 }
 
@@ -341,9 +341,9 @@ 
 
                 if(count($displayColumns) > 0)
                 {
-                	$lv->displayColumns = $displayColumns;
+                    $lv->displayColumns = $displayColumns;
                 } else {
-                	$lv->displayColumns = $listViewDefs[$seed->module_dir];
+                    $lv->displayColumns = $listViewDefs[$seed->module_dir];
                 }
 
                 $lv->export = false;
@@ -368,56 +368,56 @@ 
                     $module_results[$moduleName] .= $lv->display(false, false);
                 }
 
-			}
-		}
+            }
+        }
 
-		if($has_results) {
-			foreach($module_counts as $name=>$value) {
-				echo $module_results[$name];
-			}
-		} else if(empty($_REQUEST['form_only'])) {
-			echo $home_mod_strings['LBL_NO_RESULTS'];
-			echo $home_mod_strings['LBL_NO_RESULTS_TIPS'];
-		}
+        if($has_results) {
+            foreach($module_counts as $name=>$value) {
+                echo $module_results[$name];
+            }
+        } else if(empty($_REQUEST['form_only'])) {
+            echo $home_mod_strings['LBL_NO_RESULTS'];
+            echo $home_mod_strings['LBL_NO_RESULTS_TIPS'];
+        }
 
-	}
+    }
 
-	function buildCache()
-	{
+    function buildCache()
+    {
 
-		global $beanList, $beanFiles, $dictionary;
+        global $beanList, $beanFiles, $dictionary;
 
-		$supported_modules = array();
+        $supported_modules = array();
 
-		foreach($beanList as $moduleName=>$beanName)
-		{
-			if (!isset($beanFiles[$beanName]))
-				continue;
+        foreach($beanList as $moduleName=>$beanName)
+        {
+            if (!isset($beanFiles[$beanName]))
+                continue;
 
-			$beanName = BeanFactory::getObjectName($moduleName);
-			$manager = new VardefManager ( );
-			$manager->loadVardef( $moduleName , $beanName ) ;
+            $beanName = BeanFactory::getObjectName($moduleName);
+            $manager = new VardefManager ( );
+            $manager->loadVardef( $moduleName , $beanName ) ;
 
-			// obtain the field definitions used by generateSearchWhere (duplicate code in view.list.php)
-			if(file_exists('custom/modules/'.$moduleName.'/metadata/metafiles.php')){
+            // obtain the field definitions used by generateSearchWhere (duplicate code in view.list.php)
+            if(file_exists('custom/modules/'.$moduleName.'/metadata/metafiles.php')){
                 require('custom/modules/'.$moduleName.'/metadata/metafiles.php');
             }elseif(file_exists('modules/'.$moduleName.'/metadata/metafiles.php')){
                 require('modules/'.$moduleName.'/metadata/metafiles.php');
             }
 
 
-			if(!empty($metafiles[$moduleName]['searchfields']))
-			{
-				require $metafiles[$moduleName]['searchfields'] ;
-			} else if(file_exists("modules/{$moduleName}/metadata/SearchFields.php")) {
-				require "modules/{$moduleName}/metadata/SearchFields.php" ;
-			}
+            if(!empty($metafiles[$moduleName]['searchfields']))
+            {
+                require $metafiles[$moduleName]['searchfields'] ;
+            } else if(file_exists("modules/{$moduleName}/metadata/SearchFields.php")) {
+                require "modules/{$moduleName}/metadata/SearchFields.php" ;
+            }
 
-			//Load custom SearchFields.php if it exists
-			if(file_exists("custom/modules/{$moduleName}/metadata/SearchFields.php"))
-			{
-				require "custom/modules/{$moduleName}/metadata/SearchFields.php" ;
-			}				
+            //Load custom SearchFields.php if it exists
+            if(file_exists("custom/modules/{$moduleName}/metadata/SearchFields.php"))
+            {
+                require "custom/modules/{$moduleName}/metadata/SearchFields.php" ;
+            }				
 
             //If there are $searchFields are empty, just continue, there are no search fields defined for the module
             if(empty($searchFields[$moduleName]))
@@ -425,34 +425,34 @@ 
                 continue;
             }
 
-			$isCustomModule = preg_match('/^([a-z0-9]{1,5})_([a-z0-9_]+)$/i' , $moduleName);
-
-			//If the bean supports unified search or if it's a custom module bean and unified search is not defined
-			if(!empty($dictionary[$beanName]['unified_search']) || $isCustomModule)
-			{
-				$fields = array();
-				foreach ( $dictionary [ $beanName ][ 'fields' ] as $field => $def )
-				{
-					// We cannot enable or disable unified_search for email in the vardefs as we don't actually have a vardef entry for 'email'
-					// the searchFields entry for 'email' doesn't correspond to any vardef entry. Instead it contains SQL to directly perform the search.
-					// So as a proxy we allow any field in the vardefs that has a name starting with 'email...' to be tagged with the 'unified_search' parameter
-
-					if (strpos($field,'email') !== false)
-					{
-						$field = 'email' ;
-					}
-
-					//bug: 38139 - allow phone to be searched through Global Search
-					if (strpos($field,'phone') !== false)
-					{
-						$field = 'phone' ;
-					}
-
-					if ( !empty($def['unified_search']) && isset ( $searchFields [ $moduleName ] [ $field ]  ))
-					{
-						$fields [ $field ] = $searchFields [ $moduleName ] [ $field ] ;
-					}
-				}
+            $isCustomModule = preg_match('/^([a-z0-9]{1,5})_([a-z0-9_]+)$/i' , $moduleName);
+
+            //If the bean supports unified search or if it's a custom module bean and unified search is not defined
+            if(!empty($dictionary[$beanName]['unified_search']) || $isCustomModule)
+            {
+                $fields = array();
+                foreach ( $dictionary [ $beanName ][ 'fields' ] as $field => $def )
+                {
+                    // We cannot enable or disable unified_search for email in the vardefs as we don't actually have a vardef entry for 'email'
+                    // the searchFields entry for 'email' doesn't correspond to any vardef entry. Instead it contains SQL to directly perform the search.
+                    // So as a proxy we allow any field in the vardefs that has a name starting with 'email...' to be tagged with the 'unified_search' parameter
+
+                    if (strpos($field,'email') !== false)
+                    {
+                        $field = 'email' ;
+                    }
+
+                    //bug: 38139 - allow phone to be searched through Global Search
+                    if (strpos($field,'phone') !== false)
+                    {
+                        $field = 'phone' ;
+                    }
+
+                    if ( !empty($def['unified_search']) && isset ( $searchFields [ $moduleName ] [ $field ]  ))
+                    {
+                        $fields [ $field ] = $searchFields [ $moduleName ] [ $field ] ;
+                    }
+                }
 
                 foreach ($searchFields[$moduleName] as $field => $def)
                 {
@@ -465,23 +465,23 @@ 
                     }
                 }
 
-				if(count($fields) > 0) {
-					$supported_modules [$moduleName] ['fields'] = $fields;
-					if (isset($dictionary[$beanName]['unified_search_default_enabled']) && $dictionary[$beanName]['unified_search_default_enabled'] === TRUE)
-					{
+                if(count($fields) > 0) {
+                    $supported_modules [$moduleName] ['fields'] = $fields;
+                    if (isset($dictionary[$beanName]['unified_search_default_enabled']) && $dictionary[$beanName]['unified_search_default_enabled'] === TRUE)
+                    {
                         $supported_modules [$moduleName]['default'] = true;
                     } else {
                         $supported_modules [$moduleName]['default'] = false;
                     }
-				}
+                }
 
-			}
+            }
 
-		}
+        }
 
-		ksort($supported_modules);
-		write_array_to_file('unified_search_modules', $supported_modules, $this->cache_search);
-	}
+        ksort($supported_modules);
+        write_array_to_file('unified_search_modules', $supported_modules, $this->cache_search);
+    }
 
     /**
      * Retrieve the enabled and disabled modules used for global search.
@@ -525,9 +525,9 @@ 
                 $label = isset($app_list_strings['moduleList'][$module]) ? $app_list_strings['moduleList'][$module] : $module;
                 if($data['default'])
                 {
-                  $json_enabled[] = array("module" => $module, 'label' => $label);
+                    $json_enabled[] = array("module" => $module, 'label' => $label);
                 } else {
-                  $json_disabled[] = array("module" => $module, 'label' => $label);
+                    $json_disabled[] = array("module" => $module, 'label' => $label);
                 }
             }
         }
@@ -536,47 +536,47 @@ 
     }
 
 
-	/**
-	 * saveGlobalSearchSettings
-	 * This method handles the administrator's request to save the searchable modules selected and stores
-	 * the results in the unified_search_modules_display.php file
-	 *
-	 */
-	function saveGlobalSearchSettings()
-	{
-		if(isset($_REQUEST['enabled_modules']))
-		{
+    /**
+     * saveGlobalSearchSettings
+     * This method handles the administrator's request to save the searchable modules selected and stores
+     * the results in the unified_search_modules_display.php file
+     *
+     */
+    function saveGlobalSearchSettings()
+    {
+        if(isset($_REQUEST['enabled_modules']))
+        {
             $unified_search_modules_display = $this->getUnifiedSearchModulesDisplay();
 
-			$new_unified_search_modules_display = array();
+            $new_unified_search_modules_display = array();
 
             foreach(explode (',', $_REQUEST['enabled_modules'] ) as $module)
             {
                 $new_unified_search_modules_display[$module]['visible'] = true;
             }
 
-			foreach($unified_search_modules_display as $module=>$data)
-			{
-				if(!isset($new_unified_search_modules_display[$module]))
-				{
-				   $new_unified_search_modules_display[$module]['visible'] = false;
-				}
-			}
-
-			$this->writeUnifiedSearchModulesDisplayFile($new_unified_search_modules_display);
-		}
-	}
-
-
-	public static function unlinkUnifiedSearchModulesFile() {
-		//clear the unified_search_module.php file
-		$cache_search = sugar_cached('modules/unified_search_modules.php');
-    	if(file_exists($cache_search))
-    	{
-    		$GLOBALS['log']->info("unlink {$cache_search}");
-    		unlink($cache_search);
-    	}
-	}
+            foreach($unified_search_modules_display as $module=>$data)
+            {
+                if(!isset($new_unified_search_modules_display[$module]))
+                {
+                    $new_unified_search_modules_display[$module]['visible'] = false;
+                }
+            }
+
+            $this->writeUnifiedSearchModulesDisplayFile($new_unified_search_modules_display);
+        }
+    }
+
+
+    public static function unlinkUnifiedSearchModulesFile() {
+        //clear the unified_search_module.php file
+        $cache_search = sugar_cached('modules/unified_search_modules.php');
+        if(file_exists($cache_search))
+        {
+            $GLOBALS['log']->info("unlink {$cache_search}");
+            unlink($cache_search);
+        }
+    }
     
 
     /**
@@ -589,21 +589,21 @@ 
      */
     public function getUnifiedSearchModules()
     {
-		//Make directory if it doesn't exist
+        //Make directory if it doesn't exist
         $cachedir = sugar_cached('modules');
-		if(!file_exists($cachedir))
-		{
-		   mkdir_recursive($cachedir);
-		}
+        if(!file_exists($cachedir))
+        {
+            mkdir_recursive($cachedir);
+        }
 
-		//Load unified_search_modules.php file
+        //Load unified_search_modules.php file
         $cachedFile = sugar_cached('modules/unified_search_modules.php');
-		if(!file_exists($cachedFile))
-		{
-			$this->buildCache();
-		}
+        if(!file_exists($cachedFile))
+        {
+            $this->buildCache();
+        }
 
-		include $cachedFile;
+        include $cachedFile;
         return $unified_search_modules;
     }
 
@@ -618,8 +618,8 @@ 
      */
     public function getUnifiedSearchModulesDisplay()
     {
-		if(!file_exists('custom/modules/unified_search_modules_display.php'))
-		{
+        if(!file_exists('custom/modules/unified_search_modules_display.php'))
+        {
             $unified_search_modules = $this->getUnifiedSearchModules();
 
             $unified_search_modules_display = array();
@@ -633,13 +633,13 @@ 
             }
 
             $this->writeUnifiedSearchModulesDisplayFile($unified_search_modules_display);
-		}
+        }
 
-		include('custom/modules/unified_search_modules_display.php');
+        include('custom/modules/unified_search_modules_display.php');
         return $unified_search_modules_display;
     }
 
-	/*
+    /*
 	 * writeUnifiedSearchModulesDisplayFile
 	 * Private method to handle writing the unified_search_modules_display value to file
 	 *
@@ -647,35 +647,35 @@ 
 	 * @return boolean value indication whether or not file was successfully written
 	 * @throws Exception Thrown if the file write operation fails
 	 */
-	private function writeUnifiedSearchModulesDisplayFile($unified_search_modules_display)
-	{
-		if(is_null($unified_search_modules_display) || empty($unified_search_modules_display))
-		{
-		   return false;
-		}
-
-	    if(!write_array_to_file("unified_search_modules_display", $unified_search_modules_display, 'custom/modules/unified_search_modules_display.php'))
-	    {
-	    	//Log error message and throw Exception
-	    	global $app_strings;
-	    	$msg = string_format($app_strings['ERR_FILE_WRITE'], array('custom/modules/unified_search_modules_display.php'));
-	    	$GLOBALS['log']->error($msg);
-	    	throw new Exception($msg);
-	    }
-
-	    return true;
-	}
+    private function writeUnifiedSearchModulesDisplayFile($unified_search_modules_display)
+    {
+        if(is_null($unified_search_modules_display) || empty($unified_search_modules_display))
+        {
+            return false;
+        }
+
+        if(!write_array_to_file("unified_search_modules_display", $unified_search_modules_display, 'custom/modules/unified_search_modules_display.php'))
+        {
+            //Log error message and throw Exception
+            global $app_strings;
+            $msg = string_format($app_strings['ERR_FILE_WRITE'], array('custom/modules/unified_search_modules_display.php'));
+            $GLOBALS['log']->error($msg);
+            throw new Exception($msg);
+        }
+
+        return true;
+    }
 }
 
 
 function unified_search_modules_cmp($a, $b) {
-	if(!isset($a['translated']) || !isset($b['translated']))
-	{
-	   return 0;
-	}
+    if(!isset($a['translated']) || !isset($b['translated']))
+    {
+        return 0;
+    }
 
-	$name1 = strtolower($a['translated']);
-	$name2 = strtolower($b['translated']);
+    $name1 = strtolower($a['translated']);
+    $name2 = strtolower($b['translated']);
 
-	return $name1 < $name2 ? -1 : 1;
+    return $name1 < $name2 ? -1 : 1;
 }

modules/Administration/DisplayWarnings.php

Indentation +31 added lines, -31 removed lines

@@ -42,8 +42,8 @@ 
 
 global $db;
 function displayAdminError($errorString){
-	$output = '<p class="error">' . $errorString .'</p>';
-		echo $output;
+    $output = '<p class="error">' . $errorString .'</p>';
+        echo $output;
 }
 
 if(!empty($_SESSION['display_lotuslive_alert'])){
@@ -54,11 +54,11 @@ 
 
 
 if(isset($_SESSION['rebuild_relationships'])){
-	displayAdminError(translate('MSG_REBUILD_RELATIONSHIPS', 'Administration'));
+    displayAdminError(translate('MSG_REBUILD_RELATIONSHIPS', 'Administration'));
 }
 
 if(isset($_SESSION['rebuild_extensions'])){
-	displayAdminError(translate('MSG_REBUILD_EXTENSIONS', 'Administration'));
+    displayAdminError(translate('MSG_REBUILD_EXTENSIONS', 'Administration'));
 }
 
 if ( (strpos($_SERVER["SERVER_SOFTWARE"],'Microsoft-IIS') !== false) && (php_sapi_name() == 'cgi-fcgi') && (ini_get('fastcgi.logging') != '0') ) {
@@ -66,16 +66,16 @@ 
 }
 if(is_admin($current_user)){
 if(!empty($_SESSION['COULD_NOT_CONNECT'])){
-	displayAdminError(translate('LBL_COULD_NOT_CONNECT', 'Administration') . ' '. $timedate->to_display_date_time($_SESSION['COULD_NOT_CONNECT']));
+    displayAdminError(translate('LBL_COULD_NOT_CONNECT', 'Administration') . ' '. $timedate->to_display_date_time($_SESSION['COULD_NOT_CONNECT']));
 }
 if(!empty($_SESSION['EXCEEDING_OC_LICENSES']) && $_SESSION['EXCEEDING_OC_LICENSES'] == true){
     displayAdminError(translate('LBL_EXCEEDING_OC_LICENSES', 'Administration'));
 }
 if(isset($license) && !empty($license->settings['license_msg_admin'])){
     // UUDDLRLRBA
-	$GLOBALS['log']->fatal(base64_decode($license->settings['license_msg_admin']));
+    $GLOBALS['log']->fatal(base64_decode($license->settings['license_msg_admin']));
     //displayAdminError(base64_decode($license->settings['license_msg_admin']));
-	return;
+    return;
 }
 
 //No SMTP server is set up Error.
@@ -96,40 +96,40 @@ 
     displayAdminError(translate('WARN_NO_SMTP_SERVER_AVAILABLE_ERROR','Administration'));
 }
 
- if(!empty($dbconfig['db_host_name']) || $sugar_config['sugar_version'] != $sugar_version ){
-       		displayAdminError(translate('WARN_REPAIR_CONFIG', 'Administration'));
+    if(!empty($dbconfig['db_host_name']) || $sugar_config['sugar_version'] != $sugar_version ){
+                displayAdminError(translate('WARN_REPAIR_CONFIG', 'Administration'));
         }
 
         if( !isset($sugar_config['installer_locked']) || $sugar_config['installer_locked'] == false ){
-        	displayAdminError(translate('WARN_INSTALLER_LOCKED', 'Administration'));
-		}
+            displayAdminError(translate('WARN_INSTALLER_LOCKED', 'Administration'));
+        }
 
 
         if(empty($GLOBALS['sugar_config']['admin_access_control'])){
-			if(isset($_SESSION['invalid_versions'])){
-				$invalid_versions = $_SESSION['invalid_versions'];
-				foreach($invalid_versions as $invalid){
-					displayAdminError(translate('WARN_UPGRADE', 'Administration'). $invalid['name'] .translate('WARN_UPGRADE2', 'Administration'));
-				}
-			}
-
-			if (isset($_SESSION['available_version'])){
-				if($_SESSION['available_version'] != $sugar_version)
-				{
-					displayAdminError(translate('WARN_UPGRADENOTE', 'Administration').$_SESSION['available_version_description']);
-				}
-			}
+            if(isset($_SESSION['invalid_versions'])){
+                $invalid_versions = $_SESSION['invalid_versions'];
+                foreach($invalid_versions as $invalid){
+                    displayAdminError(translate('WARN_UPGRADE', 'Administration'). $invalid['name'] .translate('WARN_UPGRADE2', 'Administration'));
+                }
+            }
+
+            if (isset($_SESSION['available_version'])){
+                if($_SESSION['available_version'] != $sugar_version)
+                {
+                    displayAdminError(translate('WARN_UPGRADENOTE', 'Administration').$_SESSION['available_version_description']);
+                }
+            }
         }
 
 
-		if(isset($_SESSION['administrator_error']))
-		{
-			// Only print DB errors once otherwise they will still look broken
-			// after they are fixed.
-			displayAdminError($_SESSION['administrator_error']);
-		}
+        if(isset($_SESSION['administrator_error']))
+        {
+            // Only print DB errors once otherwise they will still look broken
+            // after they are fixed.
+            displayAdminError($_SESSION['administrator_error']);
+        }
 
-		unset($_SESSION['administrator_error']);
+        unset($_SESSION['administrator_error']);
 }
 
 ?>

Spacing +25 added lines, -25 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -41,37 +41,37 @@ 
 
 
 global $db;
-function displayAdminError($errorString){
-	$output = '<p class="error">' . $errorString .'</p>';
+function displayAdminError($errorString) {
+	$output = '<p class="error">'.$errorString.'</p>';
 		echo $output;
 }
 
-if(!empty($_SESSION['display_lotuslive_alert'])){
+if (!empty($_SESSION['display_lotuslive_alert'])) {
     displayAdminError(translate('MSG_RECONNECT_LOTUSLIVE', 'Administration'));
 }
 
 
 
 
-if(isset($_SESSION['rebuild_relationships'])){
+if (isset($_SESSION['rebuild_relationships'])) {
 	displayAdminError(translate('MSG_REBUILD_RELATIONSHIPS', 'Administration'));
 }
 
-if(isset($_SESSION['rebuild_extensions'])){
+if (isset($_SESSION['rebuild_extensions'])) {
 	displayAdminError(translate('MSG_REBUILD_EXTENSIONS', 'Administration'));
 }
 
-if ( (strpos($_SERVER["SERVER_SOFTWARE"],'Microsoft-IIS') !== false) && (php_sapi_name() == 'cgi-fcgi') && (ini_get('fastcgi.logging') != '0') ) {
+if ((strpos($_SERVER["SERVER_SOFTWARE"], 'Microsoft-IIS') !== false) && (php_sapi_name() == 'cgi-fcgi') && (ini_get('fastcgi.logging') != '0')) {
     displayAdminError(translate('LBL_FASTCGI_LOGGING', 'Administration'));
 }
-if(is_admin($current_user)){
-if(!empty($_SESSION['COULD_NOT_CONNECT'])){
-	displayAdminError(translate('LBL_COULD_NOT_CONNECT', 'Administration') . ' '. $timedate->to_display_date_time($_SESSION['COULD_NOT_CONNECT']));
+if (is_admin($current_user)) {
+if (!empty($_SESSION['COULD_NOT_CONNECT'])) {
+	displayAdminError(translate('LBL_COULD_NOT_CONNECT', 'Administration').' '.$timedate->to_display_date_time($_SESSION['COULD_NOT_CONNECT']));
 }
-if(!empty($_SESSION['EXCEEDING_OC_LICENSES']) && $_SESSION['EXCEEDING_OC_LICENSES'] == true){
+if (!empty($_SESSION['EXCEEDING_OC_LICENSES']) && $_SESSION['EXCEEDING_OC_LICENSES'] == true) {
     displayAdminError(translate('LBL_EXCEEDING_OC_LICENSES', 'Administration'));
 }
-if(isset($license) && !empty($license->settings['license_msg_admin'])){
+if (isset($license) && !empty($license->settings['license_msg_admin'])) {
     // UUDDLRLRBA
 	$GLOBALS['log']->fatal(base64_decode($license->settings['license_msg_admin']));
     //displayAdminError(base64_decode($license->settings['license_msg_admin']));
@@ -86,35 +86,35 @@ 
 //If sendmail has been configured by setting the config variable ignore this warning
 $sendMailEnabled = isset($sugar_config['allow_sendmail_outbound']) && $sugar_config['allow_sendmail_outbound'];
 
-if(trim($admin->settings['mail_smtpserver']) == '' && !$sendMailEnabled) {
-    if($admin->settings['notify_on']) {
+if (trim($admin->settings['mail_smtpserver']) == '' && !$sendMailEnabled) {
+    if ($admin->settings['notify_on']) {
         $smtp_error = true;
     }
 }
 
-if($smtp_error) {
-    displayAdminError(translate('WARN_NO_SMTP_SERVER_AVAILABLE_ERROR','Administration'));
+if ($smtp_error) {
+    displayAdminError(translate('WARN_NO_SMTP_SERVER_AVAILABLE_ERROR', 'Administration'));
 }
 
- if(!empty($dbconfig['db_host_name']) || $sugar_config['sugar_version'] != $sugar_version ){
+ if (!empty($dbconfig['db_host_name']) || $sugar_config['sugar_version'] != $sugar_version) {
        		displayAdminError(translate('WARN_REPAIR_CONFIG', 'Administration'));
         }
 
-        if( !isset($sugar_config['installer_locked']) || $sugar_config['installer_locked'] == false ){
+        if (!isset($sugar_config['installer_locked']) || $sugar_config['installer_locked'] == false) {
         	displayAdminError(translate('WARN_INSTALLER_LOCKED', 'Administration'));
 		}
 
 
-        if(empty($GLOBALS['sugar_config']['admin_access_control'])){
-			if(isset($_SESSION['invalid_versions'])){
+        if (empty($GLOBALS['sugar_config']['admin_access_control'])) {
+			if (isset($_SESSION['invalid_versions'])) {
 				$invalid_versions = $_SESSION['invalid_versions'];
-				foreach($invalid_versions as $invalid){
-					displayAdminError(translate('WARN_UPGRADE', 'Administration'). $invalid['name'] .translate('WARN_UPGRADE2', 'Administration'));
+				foreach ($invalid_versions as $invalid) {
+					displayAdminError(translate('WARN_UPGRADE', 'Administration').$invalid['name'].translate('WARN_UPGRADE2', 'Administration'));
 				}
 			}
 
-			if (isset($_SESSION['available_version'])){
-				if($_SESSION['available_version'] != $sugar_version)
+			if (isset($_SESSION['available_version'])) {
+				if ($_SESSION['available_version'] != $sugar_version)
 				{
 					displayAdminError(translate('WARN_UPGRADENOTE', 'Administration').$_SESSION['available_version_description']);
 				}
@@ -122,7 +122,7 @@ 
         }
 
 
-		if(isset($_SESSION['administrator_error']))
+		if (isset($_SESSION['administrator_error']))
 		{
 			// Only print DB errors once otherwise they will still look broken
 			// after they are fixed.

modules/Administration/Administration.php

Spacing +21 added lines, -21 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -68,7 +68,7 @@ 
 
     );
     var $disable_custom_fields = true;
-    var $checkbox_fields = Array("notify_send_by_default", "mail_smtpauth_req", "notify_on", 'portal_on', 'skypeout_on', 'system_mailmerge_on', 'proxy_auth', 'proxy_on', 'system_ldap_enabled','captcha_on');
+    var $checkbox_fields = Array("notify_send_by_default", "mail_smtpauth_req", "notify_on", 'portal_on', 'skypeout_on', 'system_mailmerge_on', 'proxy_auth', 'proxy_on', 'system_ldap_enabled', 'captcha_on');
 
     function Administration() {
         parent::SugarBean();
@@ -76,16 +76,16 @@ 
         $this->setupCustomFields('Administration');
     }
 
-    function retrieveSettings($category = FALSE, $clean=false) {
+    function retrieveSettings($category = FALSE, $clean = false) {
         // declare a cache for all settings
         $settings_cache = sugar_cache_retrieve('admin_settings_cache');
 
-        if($clean) {
+        if ($clean) {
             $settings_cache = array();
         }
 
         // Check for a cache hit
-        if(!empty($settings_cache)) {
+        if (!empty($settings_cache)) {
             $this->settings = $settings_cache;
             if (!empty($this->settings[$category]))
             {
@@ -93,7 +93,7 @@ 
             }
         }
 
-        if ( ! empty($category) ) {
+        if (!empty($category)) {
             $query = "SELECT category, name, value FROM {$this->table_name} WHERE category = '{$category}'";
         } else {
             $query = "SELECT category, name, value FROM {$this->table_name}";
@@ -101,12 +101,12 @@ 
 
         $result = $this->db->query($query, true, "Unable to retrieve system settings");
 
-        if(empty($result)) {
+        if (empty($result)) {
             return NULL;
         }
 
-        while($row = $this->db->fetchByAssoc($result)) {
-            if($row['category']."_".$row['name'] == 'ldap_admin_password' || $row['category']."_".$row['name'] == 'proxy_password')
+        while ($row = $this->db->fetchByAssoc($result)) {
+            if ($row['category']."_".$row['name'] == 'ldap_admin_password' || $row['category']."_".$row['name'] == 'proxy_password')
                 $this->settings[$row['category']."_".$row['name']] = $this->decrypt_after_retrieve($row['value']);
             else
                 $this->settings[$row['category']."_".$row['name']] = $row['value'];
@@ -114,7 +114,7 @@ 
         }
         $this->settings[$category] = true;
 
-        if(!isset($this->settings["mail_sendtype"])) {
+        if (!isset($this->settings["mail_sendtype"])) {
             // outbound email settings
             $oe = new OutboundEmail();
             $oe->getSystemMailerSettings();
@@ -126,7 +126,7 @@ 
         }
 
         // At this point, we have built a new array that should be cached.
-        sugar_cache_put('admin_settings_cache',$this->settings);
+        sugar_cache_put('admin_settings_cache', $this->settings);
         return $this;
     }
 
@@ -136,16 +136,16 @@ 
         // outbound email settings
         $oe = new OutboundEmail();
 
-        foreach($_POST as $key => $val) {
+        foreach ($_POST as $key => $val) {
             $prefix = $this->get_config_prefix($key);
-            if(in_array($prefix[0], $this->config_categories)) {
-                if(is_array($val)){
-                    $val=implode(",",$val);
+            if (in_array($prefix[0], $this->config_categories)) {
+                if (is_array($val)) {
+                    $val = implode(",", $val);
                 }
                 $this->saveSetting($prefix[0], $prefix[1], $val);
             }
-            if(strpos($key, "mail_") !== false) {
-                if(in_array($key, $oe->field_defs)) {
+            if (strpos($key, "mail_") !== false) {
+                if (in_array($key, $oe->field_defs)) {
                     $oe->$key = $val;
                 }
             }
@@ -165,13 +165,13 @@ 
         $row = $this->db->fetchByAssoc($result);
         $row_count = $row['the_count'];
 
-        if($category."_".$key == 'ldap_admin_password' || $category."_".$key == 'proxy_password')
+        if ($category."_".$key == 'ldap_admin_password' || $category."_".$key == 'proxy_password')
             $value = $this->encrpyt_before_save($value);
 
-        if( $row_count == 0){
+        if ($row_count == 0) {
             $result = $this->db->query("INSERT INTO config (value, category, name) VALUES ('$value','$category', '$key')");
         }
-        else{
+        else {
             $result = $this->db->query("UPDATE config SET value = '{$value}' WHERE category = '{$category}' AND name = '{$key}'");
         }
         sugar_cache_clear('admin_settings_cache');
@@ -179,7 +179,7 @@ 
     }
 
     function get_config_prefix($str) {
-        return Array(substr($str, 0, strpos($str, "_")), substr($str, strpos($str, "_")+1));
+        return Array(substr($str, 0, strpos($str, "_")), substr($str, strpos($str, "_") + 1));
     }
 }
 ?>

Braces +15 added lines, -11 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -106,10 +108,11 @@ 
         }
 
         while($row = $this->db->fetchByAssoc($result)) {
-            if($row['category']."_".$row['name'] == 'ldap_admin_password' || $row['category']."_".$row['name'] == 'proxy_password')
-                $this->settings[$row['category']."_".$row['name']] = $this->decrypt_after_retrieve($row['value']);
-            else
-                $this->settings[$row['category']."_".$row['name']] = $row['value'];
+            if($row['category']."_".$row['name'] == 'ldap_admin_password' || $row['category']."_".$row['name'] == 'proxy_password') {
+                            $this->settings[$row['category']."_".$row['name']] = $this->decrypt_after_retrieve($row['value']);
+            } else {
+                            $this->settings[$row['category']."_".$row['name']] = $row['value'];
+            }
             $this->settings[$row['category']] = true;
         }
         $this->settings[$category] = true;
@@ -120,8 +123,9 @@ 
             $oe->getSystemMailerSettings();
 
             foreach ($oe->field_defs as $def) {
-                if (strpos($def, "mail_") !== false)
-                    $this->settings[$def] = $oe->$def;
+                if (strpos($def, "mail_") !== false) {
+                                    $this->settings[$def] = $oe->$def;
+                }
             }
         }
 
@@ -165,13 +169,13 @@ 
         $row = $this->db->fetchByAssoc($result);
         $row_count = $row['the_count'];
 
-        if($category."_".$key == 'ldap_admin_password' || $category."_".$key == 'proxy_password')
-            $value = $this->encrpyt_before_save($value);
+        if($category."_".$key == 'ldap_admin_password' || $category."_".$key == 'proxy_password') {
+                    $value = $this->encrpyt_before_save($value);
+        }
 
         if( $row_count == 0){
             $result = $this->db->query("INSERT INTO config (value, category, name) VALUES ('$value','$category', '$key')");
-        }
-        else{
+        } else{
             $result = $this->db->query("UPDATE config SET value = '{$value}' WHERE category = '{$category}' AND name = '{$key}'");
         }
         sugar_cache_clear('admin_settings_cache');

modules/AOP_Case_Updates/Case_Updates.php

Spacing +30 added lines, -30 removed lines

@@ -23,7 +23,7 @@ 
  */
 
 
-function display_updates($focus, $field, $value, $view){
+function display_updates($focus, $field, $value, $view) {
     global $mod_strings;
 
     $hideImage = SugarThemeRegistry::current()->getImageURL('basic_search.gif');
@@ -127,8 +127,8 @@ 
 </script>
 A;
 
-    $updates = $focus->get_linked_beans('aop_case_updates',"AOP_Case_Updates");
-    if(!$updates || is_null($focus->id)){
+    $updates = $focus->get_linked_beans('aop_case_updates', "AOP_Case_Updates");
+    if (!$updates || is_null($focus->id)) {
         $html .= quick_edit_case_updates($focus);
         return $html;
         //return $mod_strings['LBL_NO_CASE_UPDATES'];
@@ -154,18 +154,18 @@ 
 EOD;
 
 
-    usort($updates,function($a,$b){
+    usort($updates, function($a, $b) {
         $aDate = $a->fetched_row['date_entered'];
         $bDate = $b->fetched_row['date_entered'];
-        if($aDate < $bDate){
+        if ($aDate < $bDate) {
             return -1;
-        }elseif($aDate > $bDate){
+        }elseif ($aDate > $bDate) {
             return 1;
         }
         return 0;
     });
 
-    foreach($updates as $update){
+    foreach ($updates as $update) {
         $html .= display_single_update($update, $hideImage);
     }
     $html .= "</div>";
@@ -178,9 +178,9 @@ 
 /**
  * @return mixed|string|void
  */
-function display_update_form(){
+function display_update_form() {
     global $mod_strings, $app_strings;
-    $sugar_smarty	= new Sugar_Smarty();
+    $sugar_smarty = new Sugar_Smarty();
     $sugar_smarty->assign('MOD', $mod_strings);
     $sugar_smarty->assign('APP', $app_strings);
     return $sugar_smarty->fetch('modules/AOP_Case_Updates/tpl/caseUpdateForm.tpl');
@@ -191,23 +191,23 @@ 
  * @param SugarBean $update
  * @return string - html to be displayed
  */
-function getUpdateDisplayHead(SugarBean $update){
+function getUpdateDisplayHead(SugarBean $update) {
     global $mod_strings;
-    if($update->contact_id){
+    if ($update->contact_id) {
         $name = $update->getUpdateContact()->name;
-    }elseif($update->assigned_user_id){
+    }elseif ($update->assigned_user_id) {
         $name = $update->getUpdateUser()->name;
-    }else{
+    } else {
         $name = "Unknown";
     }
     $html = "<a href='' onclick='toggleCaseUpdate(\"".$update->id."\");return false;'>";
     $html .= "<img  id='caseUpdate".$update->id."Image' class='caseUpdateImage' src='".SugarThemeRegistry::current()->getImageURL('basic_search.gif')."'>";
     $html .= "</a>";
-    $html .= "<span>".($update->internal ? "<strong>" . $mod_strings['LBL_INTERNAL'] . "</strong> " : '') .$name . " ".$update->date_entered."</span><br>";
-    $notes = $update->get_linked_beans('notes','Notes');
-    if($notes){
-        $html.= $mod_strings['LBL_AOP_CASE_ATTACHMENTS'];
-        foreach($notes as $note){
+    $html .= "<span>".($update->internal ? "<strong>".$mod_strings['LBL_INTERNAL']."</strong> " : '').$name." ".$update->date_entered."</span><br>";
+    $notes = $update->get_linked_beans('notes', 'Notes');
+    if ($notes) {
+        $html .= $mod_strings['LBL_AOP_CASE_ATTACHMENTS'];
+        foreach ($notes as $note) {
             $html .= "<a href='index.php?module=Notes&action=DetailView&record={$note->id}'>{$note->filename}</a>&nbsp;";
         }
     }
@@ -220,12 +220,12 @@ 
  * @param AOP_Case_Updates $update
  * @return string - the html for the update
  */
-function display_single_update(AOP_Case_Updates $update){
+function display_single_update(AOP_Case_Updates $update) {
 
     /*if assigned user*/
-    if($update->assigned_user_id){
+    if ($update->assigned_user_id) {
         /*if internal update*/
-        if ($update->internal){
+        if ($update->internal) {
             $html = "<div id='caseStyleInternal'>".getUpdateDisplayHead($update);
             $html .= "<div id='caseUpdate".$update->id."' class='caseUpdate'>";
             $html .= nl2br(html_entity_decode($update->description));
@@ -243,7 +243,7 @@ 
     }
 
     /*if contact user*/
-    if($update->contact_id){
+    if ($update->contact_id) {
         $html = "<div id='extramargin'><div id='caseStyleContact'>".getUpdateDisplayHead($update);
         $html .= "<div id='caseUpdate".$update->id."' class='caseUpdate'>";
         $html .= nl2br(html_entity_decode($update->description));
@@ -259,11 +259,11 @@ 
  * @param $case
  * @return string - html link
  */
-function display_case_attachments($case){
+function display_case_attachments($case) {
     $html = '';
-    $notes = $case->get_linked_beans('notes','Notes');
-    if($notes){
-        foreach($notes as $note){
+    $notes = $case->get_linked_beans('notes', 'Notes');
+    if ($notes) {
+        foreach ($notes as $note) {
             $html .= "<a href='index.php?module=Notes&action=DetailView&record={$note->id}'>{$note->filename}</a>&nbsp;";
         }
     }
@@ -277,11 +277,11 @@ 
  *
  * @return string - the html to be displayed and javascript
  */
-function quick_edit_case_updates($case){
+function quick_edit_case_updates($case) {
     global $action;
 
     //on DetailView only
-    if($action != 'DetailView') return;
+    if ($action != 'DetailView') return;
 
     //current record id
     $record = $_GET['record'];
@@ -294,12 +294,12 @@ 
     $roles = $acl->getUserRoles($id);
 
     //Return if user cannot edit cases
-    if(in_array( "no edit cases", $roles) || $roles === "no edit cases"){
+    if (in_array("no edit cases", $roles) || $roles === "no edit cases") {
 
         return;
     }
     $internalChecked = '';
-    if($case->internal){
+    if ($case->internal) {
         $internalChecked = "checked='checked'";
     }
     $html = <<< EOD

modules/AOP_Case_Updates/AOP_Case_Updates.php

Spacing +48 added lines, -48 removed lines

@@ -30,35 +30,35 @@ 
 require_once 'include/clean.php';
 class AOP_Case_Updates extends AOP_Case_Updates_sugar {
 
-    function AOP_Case_Updates(){
+    function AOP_Case_Updates() {
         parent::AOP_Case_Updates_sugar();
     }
 
-    function save($check_notify = false){
+    function save($check_notify = false) {
         $this->name = SugarCleaner::cleanHtml($this->name);
         $this->description = SugarCleaner::cleanHtml($this->description);
         global $current_user, $sugar_config;
         parent::save($check_notify);
         $email_template = new EmailTemplate();
-        if($_REQUEST['module'] == 'Import'){
+        if ($_REQUEST['module'] == 'Import') {
             //Don't send email on import
             return;
         }
-        if(!isAOPEnabled()){
+        if (!isAOPEnabled()) {
             return;
         }
-        if($this->internal){
+        if ($this->internal) {
             return;
         }
         $signature = array();
         $addDelimiter = true;
         $aop_config = $sugar_config['aop'];
-        if($this->assigned_user_id){
-            if($aop_config['contact_email_template_id']){
+        if ($this->assigned_user_id) {
+            if ($aop_config['contact_email_template_id']) {
                 $email_template = $email_template->retrieve($aop_config['contact_email_template_id']);
                 $signature = $current_user->getDefaultSignature();
             }
-            if($email_template) {
+            if ($email_template) {
                 foreach ($this->getContacts() as $contact) {
                     $GLOBALS['log']->info("AOPCaseUpdates: Calling send email");
                     $emails = array();
@@ -66,15 +66,15 @@ 
                     $res = $this->sendEmail($emails, $email_template, $signature, $this->case_id, $addDelimiter, $contact->id);
                 }
             }
-        }else{
+        } else {
             $emails = $this->getEmailForUser();
-            if($aop_config['user_email_template_id']){
+            if ($aop_config['user_email_template_id']) {
                 $email_template = $email_template->retrieve($aop_config['user_email_template_id']);
             }
             $addDelimiter = false;
-            if($emails && $email_template){
+            if ($emails && $email_template) {
                 $GLOBALS['log']->info("AOPCaseUpdates: Calling send email");
-                $res = $this->sendEmail($emails, $email_template, $signature, $this->case_id, $addDelimiter,$this->contact_id);
+                $res = $this->sendEmail($emails, $email_template, $signature, $this->case_id, $addDelimiter, $this->contact_id);
             }
         }
 
@@ -83,68 +83,68 @@ 
     /**
      * @return aCase
      */
-    public function getCase(){
-        $case = BeanFactory::getBean("Cases",$this->case_id);
+    public function getCase() {
+        $case = BeanFactory::getBean("Cases", $this->case_id);
         return $case;
     }
 
-    public function getContacts(){
+    public function getContacts() {
         $case = $this->getCase();
-        if($case){
-            return $case->get_linked_beans("contacts","Contacts");
+        if ($case) {
+            return $case->get_linked_beans("contacts", "Contacts");
         }
         return null;
     }
 
-    public function getUpdateContact(){
-        if($this->contact_id){
-            return BeanFactory::getBean("Contacts",$this->contact_id);
+    public function getUpdateContact() {
+        if ($this->contact_id) {
+            return BeanFactory::getBean("Contacts", $this->contact_id);
         }
         return null;
     }
-    public function getUser(){
-        $user = BeanFactory::getBean('Users',$this->getCase()->assigned_user_id);
+    public function getUser() {
+        $user = BeanFactory::getBean('Users', $this->getCase()->assigned_user_id);
         return $user;
     }
-    public function getUpdateUser(){
-        $user = BeanFactory::getBean('Users',$this->assigned_user_id);
+    public function getUpdateUser() {
+        $user = BeanFactory::getBean('Users', $this->assigned_user_id);
         return $user;
     }
 
-    private function getEmailForUser(){
+    private function getEmailForUser() {
         $user = $this->getUser();
-        if($user){
+        if ($user) {
             return array($user->emailAddress->getPrimaryAddress($user));
         }
         return array();
     }
 
-    private function populateTemplate(EmailTemplate $template, $addDelimiter = true, $contactId = null){
+    private function populateTemplate(EmailTemplate $template, $addDelimiter = true, $contactId = null) {
         global $app_strings, $sugar_config;
         //Order of beans seems to matter here so we place contact first.
         $userId = '';
         $user = $this->getUpdateUser();
-        if(!$user){
+        if (!$user) {
             $this->getUser();
         }
-        $beans = array("Contacts" => $contactId,"Cases" => $this->getCase()->id, "Users" => $user->id, "AOP_Case_Updates" => $this->id);
+        $beans = array("Contacts" => $contactId, "Cases" => $this->getCase()->id, "Users" => $user->id, "AOP_Case_Updates" => $this->id);
         $ret = array();
-        $ret['subject'] = from_html(aop_parse_template($template->subject,$beans));
-        $body = aop_parse_template(str_replace("\$sugarurl",$sugar_config['site_url'],$template->body_html),$beans);
-        $bodyAlt = aop_parse_template(str_replace("\$sugarurl",$sugar_config['site_url'],$template->body),$beans);
-        if($addDelimiter){
-            $body = $app_strings['LBL_AOP_EMAIL_REPLY_DELIMITER'] . $body;
-            $bodyAlt = $app_strings['LBL_AOP_EMAIL_REPLY_DELIMITER'] . $bodyAlt;
+        $ret['subject'] = from_html(aop_parse_template($template->subject, $beans));
+        $body = aop_parse_template(str_replace("\$sugarurl", $sugar_config['site_url'], $template->body_html), $beans);
+        $bodyAlt = aop_parse_template(str_replace("\$sugarurl", $sugar_config['site_url'], $template->body), $beans);
+        if ($addDelimiter) {
+            $body = $app_strings['LBL_AOP_EMAIL_REPLY_DELIMITER'].$body;
+            $bodyAlt = $app_strings['LBL_AOP_EMAIL_REPLY_DELIMITER'].$bodyAlt;
         }
         $ret['body'] = from_html($body);
         $ret['body_alt'] = strip_tags(from_html($bodyAlt));
         return $ret;
     }
 
-    private function sendEmail($emails, $template, $signature = array(), $caseId = null, $addDelimiter = true, $contactId = null){
+    private function sendEmail($emails, $template, $signature = array(), $caseId = null, $addDelimiter = true, $contactId = null) {
         $GLOBALS['log']->info("AOPCaseUpdates: sendEmail called");
         require_once("include/SugarPHPMailer.php");
-        $mailer=new SugarPHPMailer();
+        $mailer = new SugarPHPMailer();
         $admin = new Administration();
         $admin->retrieveSettings();
 
@@ -152,35 +152,35 @@ 
         $mailer->setMailerForSystem();
 
         $signatureHTML = "";
-        if($signature && array_key_exists("signature_html",$signature)){
+        if ($signature && array_key_exists("signature_html", $signature)) {
             $signatureHTML = from_html($signature['signature_html']);
         }
         $signaturePlain = "";
-        if($signature && array_key_exists("signature",$signature)){
+        if ($signature && array_key_exists("signature", $signature)) {
             $signaturePlain = $signature['signature'];
         }
         $emailSettings = getPortalEmailSettings();
         $text = $this->populateTemplate($template, $addDelimiter, $contactId);
         $mailer->Subject = $text['subject'];
-        $mailer->Body = $text['body'] . $signatureHTML;
+        $mailer->Body = $text['body'].$signatureHTML;
         $mailer->IsHTML(true);
-        $mailer->AltBody = $text['body_alt'] . $signaturePlain;
+        $mailer->AltBody = $text['body_alt'].$signaturePlain;
         $mailer->From     = $emailSettings['from_address'];
         $mailer->FromName = $emailSettings['from_name'];
-        foreach($emails as $email){
+        foreach ($emails as $email) {
             $mailer->AddAddress($email);
         }
-        if ($mailer->Send()){
+        if ($mailer->Send()) {
             require_once('modules/Emails/Email.php');
             $emailObj = new Email();
-            $emailObj->to_addrs = implode(",",$emails);
-            $emailObj->type= 'out';
+            $emailObj->to_addrs = implode(",", $emails);
+            $emailObj->type = 'out';
             $emailObj->deleted = '0';
             $emailObj->name = $mailer->Subject;
             $emailObj->description = $mailer->AltBody;
             $emailObj->description_html = $mailer->Body;
             $emailObj->from_addr = $mailer->From;
-            if ( $caseId) {
+            if ($caseId) {
                 $emailObj->parent_type = "Cases";
                 $emailObj->parent_id = $caseId;
             }
@@ -189,8 +189,8 @@ 
             $emailObj->created_by = '1';
             $emailObj->status = 'sent';
             $emailObj->save();
-        }else{
-            $GLOBALS['log']->info("AOPCaseUpdates: Could not send email:  " . $mailer->ErrorInfo);
+        } else {
+            $GLOBALS['log']->info("AOPCaseUpdates: Could not send email:  ".$mailer->ErrorInfo);
             return false;
         }
         return true;

modules/AOP_Case_Updates/CaseUpdatesHook.php

Spacing +104 added lines, -104 removed lines

@@ -25,27 +25,27 @@ 
 class CaseUpdatesHook {
     private $slug_size = 50;
 
-    private function getCaseCounts(){
+    private function getCaseCounts() {
         global $db;
         $counts = array();
         $r = $db->query("SELECT users.id,count(cases.id) AS c FROM users LEFT JOIN cases ON (cases.assigned_user_id = users.id AND cases.status != 'Closed' AND cases.status != 'Duplicate' AND cases.status != 'Rejected') WHERE NOT users.deleted GROUP BY users.id");
-        while($a = $db->fetchByAssoc($r)){
+        while ($a = $db->fetchByAssoc($r)) {
             $counts[$a['id']] = $a['c'];
         }
         return $counts;
     }
 
-    private function getAssignToUser(){
+    private function getAssignToUser() {
         require_once 'modules/AOP_Case_Updates/AOPAssignManager.php';
         $assignManager = new AOPAssignManager();
         return $assignManager->getNextAssignedUser();
     }
 
-    private function arrangeFilesArray(){
+    private function arrangeFilesArray() {
         $count = 0;
-        foreach($_FILES['case_update_file'] as $key => $vals){
-            foreach($vals as $index => $val){
-                if(!array_key_exists('case_update_file'.$index,$_FILES)){
+        foreach ($_FILES['case_update_file'] as $key => $vals) {
+            foreach ($vals as $index => $val) {
+                if (!array_key_exists('case_update_file'.$index, $_FILES)) {
                     $_FILES['case_update_file'.$index] = array();
                     $count++;
                 }
@@ -56,34 +56,34 @@ 
     }
 
 
-    public function saveUpdate($bean, $event, $arguments){
-        if(!isAOPEnabled()){
+    public function saveUpdate($bean, $event, $arguments) {
+        if (!isAOPEnabled()) {
             return;
         }
         global $current_user, $app_list_strings;
-        if(empty($bean->fetched_row) || !$bean->id){
+        if (empty($bean->fetched_row) || !$bean->id) {
 
-            if(!$bean->state){
+            if (!$bean->state) {
                 $bean->state = $app_list_strings['case_state_default_key'];
             }
-            if($bean->status == "New"){
+            if ($bean->status == "New") {
                 $bean->status = $app_list_strings['case_status_default_key'];
             }
 
             //New case - assign
-            if(!$bean->assigned_user_id){
+            if (!$bean->assigned_user_id) {
                 $userId = $this->getAssignToUser();
                 $bean->assigned_user_id = $userId;
                 $bean->notify_inworkflow = true;
             }
             return;
         }
-        if($_REQUEST['module'] == 'Import'){
+        if ($_REQUEST['module'] == 'Import') {
             return;
         }
         //Grab the update field and create a new update with it.
         $text = $bean->update_text;
-        if(!$text && empty($_FILES['case_update_file'])){
+        if (!$text && empty($_FILES['case_update_file'])) {
             //No text or files, so nothing really to save.
             return;
         }
@@ -93,8 +93,8 @@ 
         $case_update->internal = $bean->internal;
         $bean->internal = false;
         $case_update->assigned_user_id = $current_user->id;
-        if(strlen($text) > $this->slug_size){
-            $case_update->name = substr($text,0,$this->slug_size)."...";
+        if (strlen($text) > $this->slug_size) {
+            $case_update->name = substr($text, 0, $this->slug_size)."...";
         }
         $case_update->description = nl2br($text);
         $case_update->case_id = $bean->id;
@@ -102,12 +102,12 @@ 
 
         $fileCount = $this->arrangeFilesArray();
 
-        for($x = 0; $x < $fileCount; $x++){
-            if($_FILES['case_update_file']['error'][$x] == UPLOAD_ERR_NO_FILE){
+        for ($x = 0; $x < $fileCount; $x++) {
+            if ($_FILES['case_update_file']['error'][$x] == UPLOAD_ERR_NO_FILE) {
                 continue;
             }
             $uploadFile = new UploadFile('case_update_file'.$x);
-            if(!$uploadFile->confirm_upload()){
+            if (!$uploadFile->confirm_upload()) {
                 continue;
             }
             $note = $this->newNote($case_update->id);
@@ -118,13 +118,13 @@ 
             $uploadFile->final_move($note->id);
         }
         $postPrefix = 'case_update_id_';
-        foreach($_POST as $key => $val){
-            if(strpos($key, $postPrefix) !== 0 || empty($val)){
+        foreach ($_POST as $key => $val) {
+            if (strpos($key, $postPrefix) !== 0 || empty($val)) {
                 continue;
             }
             //Val is selected doc id
-            $doc = BeanFactory::getBean('Documents',$val);
-            if(!$doc){
+            $doc = BeanFactory::getBean('Documents', $val);
+            if (!$doc) {
                 continue;
             }
             $note = $this->newNote($case_update->id);
@@ -134,11 +134,11 @@ 
             $note->save();
             $srcFile = "upload://{$doc->document_revision_id}";
             $destFile = "upload://{$note->id}";
-            copy($srcFile,$destFile);
+            copy($srcFile, $destFile);
         }
     }
 
-    private function newNote($caseUpdateId){
+    private function newNote($caseUpdateId) {
         $note = BeanFactory::newBean('Notes');
         $note->parent_type = 'AOP_Case_Updates';
         $note->parent_id = $caseUpdateId;
@@ -146,30 +146,30 @@ 
         return $note;
     }
 
-    private function linkAccountAndCase($case_id,$account_id){
-        if(!$account_id || !$case_id){
+    private function linkAccountAndCase($case_id, $account_id) {
+        if (!$account_id || !$case_id) {
             return;
         }
-        $case = BeanFactory::getBean("Cases",$case_id);
-        if(!$case->account_id){
+        $case = BeanFactory::getBean("Cases", $case_id);
+        if (!$case->account_id) {
             $case->account_id = $account_id;
             $case->save();
         }
     }
 
-    public function assignAccount($bean, $event, $arguments){
-        if($arguments['module'] != "Cases" || $arguments['related_module'] != "Contacts"){
+    public function assignAccount($bean, $event, $arguments) {
+        if ($arguments['module'] != "Cases" || $arguments['related_module'] != "Contacts") {
             return;
         }
-        if(!isAOPEnabled()){
+        if (!isAOPEnabled()) {
             return;
         }
-        $contact = BeanFactory::getBean("Contacts",$arguments['related_id']);
+        $contact = BeanFactory::getBean("Contacts", $arguments['related_id']);
         $contact->load_relationship("accounts");
-        if(!$contact || !$contact->account_id){
+        if (!$contact || !$contact->account_id) {
             return;
         }
-        $this->linkAccountAndCase($bean->id,$contact->account_id);
+        $this->linkAccountAndCase($bean->id, $contact->account_id);
     }
 
     /**
@@ -178,26 +178,26 @@ 
      * @param $event
      * @param $arguments
      */
-    public function saveEmailUpdate($bean, $event, $arguments){
+    public function saveEmailUpdate($bean, $event, $arguments) {
         global $mod_strings;
-        if($bean->intent != "createcase" || $bean->parent_type != "Cases"){
+        if ($bean->intent != "createcase" || $bean->parent_type != "Cases") {
             $GLOBALS['log']->warn("CaseUpdatesHook: saveEmailUpdate: Not a create case or wrong parent type");
             return;
         }
-        if(!isAOPEnabled()){
+        if (!isAOPEnabled()) {
             return;
         }
-        if(!$bean->parent_id ){
+        if (!$bean->parent_id) {
             $GLOBALS['log']->warn("CaseUpdatesHook: saveEmailUpdate No parent id");
             return;
         }
 
-        if($bean->cases){
+        if ($bean->cases) {
             $GLOBALS['log']->warn("CaseUpdatesHook: saveEmailUpdate cases already set");
             return;
         }
 
-        if($bean->fetched_row['parent_id']){
+        if ($bean->fetched_row['parent_id']) {
             //Will have been processed already
             return;
         }
@@ -206,10 +206,10 @@ 
         $ea = new SugarEmailAddress();
         $beans = $ea->getBeansByEmailAddress($bean->from_addr);
         $contact_id = null;
-        foreach($beans as $emailBean){
-            if($emailBean->module_name == "Contacts" && !empty($emailBean->id)){
+        foreach ($beans as $emailBean) {
+            if ($emailBean->module_name == "Contacts" && !empty($emailBean->id)) {
                 $contact_id = $emailBean->id;
-                $this->linkAccountAndCase($bean->parent_id,$emailBean->account_id);
+                $this->linkAccountAndCase($bean->parent_id, $emailBean->account_id);
             }
         }
         $case_update = new AOP_Case_Updates();
@@ -220,8 +220,8 @@ 
         $case_update->internal = false;
         $case_update->case_id = $bean->parent_id;
         $case_update->save();
-        $notes = $bean->get_linked_beans('notes','Notes');
-        foreach($notes as $note){
+        $notes = $bean->get_linked_beans('notes', 'Notes');
+        foreach ($notes as $note) {
             //Link notes to case update also
             $newNote = BeanFactory::newBean('Notes');
             $newNote->name = $note->name;
@@ -232,7 +232,7 @@ 
             $newNote->save();
             $srcFile = "upload://{$note->id}";
             $destFile = "upload://{$newNote->id}";
-            copy($srcFile,$destFile);
+            copy($srcFile, $destFile);
         }
 
         $this->updateCaseStatus($case_update->case_id);
@@ -242,71 +242,71 @@ 
      * Changes the status of the supplied case based on the case_status_changes config values.
      * @param $caseId
      */
-    private function updateCaseStatus($caseId){
+    private function updateCaseStatus($caseId) {
         global $sugar_config;
-        if(empty($caseId)){
+        if (empty($caseId)) {
             return;
         }
-        if(empty($sugar_config['aop']['case_status_changes'])){
+        if (empty($sugar_config['aop']['case_status_changes'])) {
             return;
         }
-        $statusMap = json_decode($sugar_config['aop']['case_status_changes'],1);
-        if(empty($statusMap)){
+        $statusMap = json_decode($sugar_config['aop']['case_status_changes'], 1);
+        if (empty($statusMap)) {
             return;
         }
-        $case = BeanFactory::getBean('Cases',$caseId);
-        if(empty($case)){
+        $case = BeanFactory::getBean('Cases', $caseId);
+        if (empty($case)) {
             return;
         }
-        if(array_key_exists($case->status,$statusMap)){
+        if (array_key_exists($case->status, $statusMap)) {
             $case->status = $statusMap[$case->status];
-            $statusBits = explode('_',$case->status);
+            $statusBits = explode('_', $case->status);
             $case->state = array_shift($statusBits);
             $case->save();
         }
 
     }
 
-    private function unquoteEmail($text){
+    private function unquoteEmail($text) {
         global $app_strings;
         $text = html_entity_decode($text);
-        $text = preg_replace('/(\r\n|\r|\n)/s',"\n",$text);
-        $pos = strpos($text,$app_strings['LBL_AOP_EMAIL_REPLY_DELIMITER']);
-        if($pos !== false){
-            $text = substr($text,0,$pos);
+        $text = preg_replace('/(\r\n|\r|\n)/s', "\n", $text);
+        $pos = strpos($text, $app_strings['LBL_AOP_EMAIL_REPLY_DELIMITER']);
+        if ($pos !== false) {
+            $text = substr($text, 0, $pos);
         }
         return $text;
     }
 
-    public function closureNotifyPrep($bean, $event, $arguments){
-        if($_REQUEST['module'] == 'Import'){
+    public function closureNotifyPrep($bean, $event, $arguments) {
+        if ($_REQUEST['module'] == 'Import') {
             return;
         }
-        if($bean->state!= "Closed" || $bean->fetched_row['state'] == "Closed"){
+        if ($bean->state != "Closed" || $bean->fetched_row['state'] == "Closed") {
             $bean->send_closure_email = false;
-        }else{
+        } else {
             $bean->send_closure_email = true;
         }
 
     }
 
-    public function closureNotify($bean, $event, $arguments){
-        if($_REQUEST['module'] == 'Import'){
+    public function closureNotify($bean, $event, $arguments) {
+        if ($_REQUEST['module'] == 'Import') {
             return;
         }
-        if($bean->state != "Closed" || !$bean->send_closure_email){
+        if ($bean->state != "Closed" || !$bean->send_closure_email) {
             return;
         }
         $this->sendClosureEmail($bean, $arguments['related_bean']);
     }
 
-    private function sendClosureEmail(aCase $bean){
-        if(!isAOPEnabled()){
+    private function sendClosureEmail(aCase $bean) {
+        if (!isAOPEnabled()) {
             return;
         }
         $GLOBALS['log']->warn("CaseUpdatesHook: sendClosureEmail called");
         require_once("include/SugarPHPMailer.php");
-        $mailer=new SugarPHPMailer();
+        $mailer = new SugarPHPMailer();
         $admin = new Administration();
         $admin->retrieveSettings();
 
@@ -317,15 +317,15 @@ 
         $aop_config = $this->getAOPConfig();
         $email_template = $email_template->retrieve($aop_config['case_closure_email_template_id']);
 
-        if(!$email_template){
+        if (!$email_template) {
             $GLOBALS['log']->warn("CaseUpdatesHook: sendClosureEmail template is empty");
             return false;
         }
 
-        $contact = $bean->get_linked_beans("contacts","Contact");
-        if($contact){
+        $contact = $bean->get_linked_beans("contacts", "Contact");
+        if ($contact) {
             $contact = $contact[0];
-        }else{
+        } else {
             return false;
         }
 
@@ -342,10 +342,10 @@ 
         $email = $contact->emailAddress->getPrimaryAddress($contact);
 
         $mailer->AddAddress($email);
-        if (!$mailer->Send()){
-            $GLOBALS['log']->info("CaseUpdatesHook: Could not send email:  " . $mailer->ErrorInfo);
+        if (!$mailer->Send()) {
+            $GLOBALS['log']->info("CaseUpdatesHook: Could not send email:  ".$mailer->ErrorInfo);
             return false;
-        }else{
+        } else {
             $this->logEmail($email, $mailer, $bean->id);
             return true;
         }
@@ -358,25 +358,25 @@ 
      * @param $event
      * @param $arguments
      */
-    public function creationNotify($bean, $event, $arguments){
-        if($_REQUEST['module'] == 'Import'){
+    public function creationNotify($bean, $event, $arguments) {
+        if ($_REQUEST['module'] == 'Import') {
             return;
         }
-        if($arguments['module'] != "Cases" || $arguments['related_module'] != "Contacts"){
+        if ($arguments['module'] != "Cases" || $arguments['related_module'] != "Contacts") {
             return;
         }
-        if(!$bean->fetched_row){
+        if (!$bean->fetched_row) {
             return;
         }
-        if(!empty($arguments['related_bean'])){
+        if (!empty($arguments['related_bean'])) {
             $contact = $arguments['related_bean'];
-        }else{
-            $contact = BeanFactory::getBean("Contacts",$arguments['related_id']);
+        } else {
+            $contact = BeanFactory::getBean("Contacts", $arguments['related_id']);
         }
         $this->sendCreationEmail($bean, $contact);
     }
 
-    private function populateTemplate(EmailTemplate $template, aCase $bean, $contact){
+    private function populateTemplate(EmailTemplate $template, aCase $bean, $contact) {
         global $app_strings, $sugar_config;
         //Order of beans seems to matter here so we place contact first.
         $beans = array(
@@ -385,26 +385,26 @@ 
             "Users" => $bean->assigned_user_id
         );
         $ret = array();
-        $ret['subject'] = from_html(aop_parse_template($template->subject,$beans));
-        $ret['body'] = from_html($app_strings['LBL_AOP_EMAIL_REPLY_DELIMITER'].aop_parse_template(str_replace("\$sugarurl",$sugar_config['site_url'],$template->body_html),$beans));
-        $ret['body_alt'] = strip_tags(from_html(aop_parse_template(str_replace("\$sugarurl",$sugar_config['site_url'],$template->body),$beans)));
+        $ret['subject'] = from_html(aop_parse_template($template->subject, $beans));
+        $ret['body'] = from_html($app_strings['LBL_AOP_EMAIL_REPLY_DELIMITER'].aop_parse_template(str_replace("\$sugarurl", $sugar_config['site_url'], $template->body_html), $beans));
+        $ret['body_alt'] = strip_tags(from_html(aop_parse_template(str_replace("\$sugarurl", $sugar_config['site_url'], $template->body), $beans)));
         return $ret;
     }
 
-    private function getAOPConfig(){
+    private function getAOPConfig() {
         global $sugar_config;
-        if(!array_key_exists("aop",$sugar_config)){
+        if (!array_key_exists("aop", $sugar_config)) {
             return array();
         }
         return $sugar_config['aop'];
     }
 
-    private function sendCreationEmail(aCase $bean, $contact){
-        if(!isAOPEnabled()){
+    private function sendCreationEmail(aCase $bean, $contact) {
+        if (!isAOPEnabled()) {
             return;
         }
         require_once("include/SugarPHPMailer.php");
-        $mailer=new SugarPHPMailer();
+        $mailer = new SugarPHPMailer();
         $admin = new Administration();
         $admin->retrieveSettings();
 
@@ -415,7 +415,7 @@ 
 
         $aop_config = $this->getAOPConfig();
         $email_template = $email_template->retrieve($aop_config['case_creation_email_template_id']);
-        if(!$aop_config['case_creation_email_template_id'] || !$email_template){
+        if (!$aop_config['case_creation_email_template_id'] || !$email_template) {
             $GLOBALS['log']->warn("CaseUpdatesHook: sendCreationEmail template is empty");
             return false;
         }
@@ -429,24 +429,24 @@ 
         $mailer->From     = $emailSettings['from_address'];
         $mailer->FromName = $emailSettings['from_name'];
         $email = $contact->emailAddress->getPrimaryAddress($contact);
-        if(empty($email) && !empty($contact->email1)){
+        if (empty($email) && !empty($contact->email1)) {
             $email = $contact->email1;
         }
         $mailer->AddAddress($email);
-        if (!$mailer->Send()){
-            $GLOBALS['log']->info("CaseUpdatesHook: Could not send email:  " . $mailer->ErrorInfo);
+        if (!$mailer->Send()) {
+            $GLOBALS['log']->info("CaseUpdatesHook: Could not send email:  ".$mailer->ErrorInfo);
             return false;
-        }else{
+        } else {
             $this->logEmail($email, $mailer, $bean->id);
             return true;
         }
     }
 
-    private function logEmail($email, $mailer, $caseId = null){
+    private function logEmail($email, $mailer, $caseId = null) {
         require_once('modules/Emails/Email.php');
         $emailObj = new Email();
         $emailObj->to_addrs = $email;
-        $emailObj->type= 'out';
+        $emailObj->type = 'out';
         $emailObj->deleted = '0';
         $emailObj->name = $mailer->Subject;
         $emailObj->description = $mailer->AltBody;
@@ -463,7 +463,7 @@ 
         $emailObj->save();
     }
 
-    public function filterHTML($bean, $event, $arguments){
-        $bean->description = SugarCleaner::cleanHtml($bean->description,true);
+    public function filterHTML($bean, $event, $arguments) {
+        $bean->description = SugarCleaner::cleanHtml($bean->description, true);
     }
 }

modules/AOR_Fields/AOR_Field.php

Spacing +12 added lines, -12 removed lines

@@ -82,11 +82,11 @@ 
 
         require_once('modules/AOW_WorkFlow/aow_utils.php');
 
-        $line_count = count($post_data[$key . 'field']);
+        $line_count = count($post_data[$key.'field']);
         for ($i = 0; $i < $line_count; ++$i) {
 
-            if ($post_data[$key . 'deleted'][$i] == 1) {
-                $this->mark_deleted($post_data[$key . 'id'][$i]);
+            if ($post_data[$key.'deleted'][$i] == 1) {
+                $this->mark_deleted($post_data[$key.'id'][$i]);
             } else {
                 $field = new AOR_Field();
                 $field->group_display = false;
@@ -102,22 +102,22 @@ 
 
                 foreach ($this->field_defs as $field_def) {
                     $field_name = $field_def['name'];
-                    if (is_array($post_data[$key . $field_name])) {
-                        if ($field_name != 'group_display' && isset($post_data[$key . $field_name][$i])) {
-                            if (is_array($post_data[$key . $field_name][$i])) {
-                                $post_data[$key . $field_name][$i] = base64_encode(serialize($post_data[$key . $field_name][$i]));
+                    if (is_array($post_data[$key.$field_name])) {
+                        if ($field_name != 'group_display' && isset($post_data[$key.$field_name][$i])) {
+                            if (is_array($post_data[$key.$field_name][$i])) {
+                                $post_data[$key.$field_name][$i] = base64_encode(serialize($post_data[$key.$field_name][$i]));
                             } else if ($field_name == 'value') {
-                                $post_data[$key . $field_name][$i] = fixUpFormatting($_REQUEST['report_module'], $field->field, $post_data[$key . $field_name][$i]);
+                                $post_data[$key.$field_name][$i] = fixUpFormatting($_REQUEST['report_module'], $field->field, $post_data[$key.$field_name][$i]);
                             }
                             if ($field_name == 'module_path') {
-                                $post_data[$key . $field_name][$i] = base64_encode(serialize(explode(":", $post_data[$key . $field_name][$i])));
+                                $post_data[$key.$field_name][$i] = base64_encode(serialize(explode(":", $post_data[$key.$field_name][$i])));
                             }
-                            $field->$field_name = $post_data[$key . $field_name][$i];
+                            $field->$field_name = $post_data[$key.$field_name][$i];
                         }
-                    } else if (is_null($post_data[$key . $field_name])) {
+                    } else if (is_null($post_data[$key.$field_name])) {
                         // do nothing
                     } else {
-                        throw new Exception('illegal type in post data at key ' . $key . $field_name . ' ' . gettype($post_data[$key . $field_name]));
+                        throw new Exception('illegal type in post data at key '.$key.$field_name.' '.gettype($post_data[$key.$field_name]));
                     }
 
                 }

modules/ModuleBuilder/views/view.modulefields.php

Indentation +38 added lines, -38 removed lines

@@ -45,20 +45,20 @@ 
     var $mbModule;
     
     /**
-	 * @see SugarView::_getModuleTitleParams()
-	 */
-	protected function _getModuleTitleParams($browserTitle = false)
-	{
-	    global $mod_strings;
+     * @see SugarView::_getModuleTitleParams()
+     */
+    protected function _getModuleTitleParams($browserTitle = false)
+    {
+        global $mod_strings;
 	    
-    	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
-    	   ModuleBuilderController::getModuleTitle(),
-    	   );
+        return array(
+            translate('LBL_MODULE_NAME','Administration'),
+            ModuleBuilderController::getModuleTitle(),
+            );
     }
 
-	function display()
-	{
+    function display()
+    {
         $smarty = new Sugar_Smarty();
         global $mod_strings;
         $bak_mod_strings=$mod_strings;
@@ -92,13 +92,13 @@ 
                 if ($this->isValidStudioField($def))
                 {
                     $def['label'] = translate($def['vname'], $module_name);
-					//Custom relate fields will have a non-db source, but custom_module set
-                	if(isset($def['source']) && $def['source'] == 'custom_fields' || isset($def['custom_module'])) {
-                       $f[$mod_strings['LBL_HCUSTOM']][$def['name']] = $def;
-                       $def['custom'] = true;
+                    //Custom relate fields will have a non-db source, but custom_module set
+                    if(isset($def['source']) && $def['source'] == 'custom_fields' || isset($def['custom_module'])) {
+                        $f[$mod_strings['LBL_HCUSTOM']][$def['name']] = $def;
+                        $def['custom'] = true;
                     } else {
-                       $f[$mod_strings['LBL_HDEFAULT']][$def['name']] = $def;
-                       $def['custom'] = false;
+                        $f[$mod_strings['LBL_HDEFAULT']][$def['name']] = $def;
+                        $def['custom'] = false;
                     }
 
                     $def['type'] = isset($fieldTypes[$def['type']]) ? $fieldTypes[$def['type']] : ucfirst($def['type']);
@@ -183,15 +183,15 @@ 
                     {
                         if (isset($loadedFields[$field]))
                         {
-                           unset($this->mbModule->mbvardefs->vardefs['fields'][$k][$field]);
+                            unset($this->mbModule->mbvardefs->vardefs['fields'][$k][$field]);
                         } else {
-                           $this->mbModule->mbvardefs->vardefs['fields'][$k][$field]['label'] = isset($def['vname']) && isset($this->mbModule->mblanguage->strings[$current_language.'.lang.php'][$def['vname']]) ? $this->mbModule->mblanguage->strings[$current_language.'.lang.php'][$def['vname']] : $field;
-                           $customFieldsData[$field] = ($k == $this->mbModule->name) ? true : false;
-                           $loadedFields[$field] = true;
+                            $this->mbModule->mbvardefs->vardefs['fields'][$k][$field]['label'] = isset($def['vname']) && isset($this->mbModule->mblanguage->strings[$current_language.'.lang.php'][$def['vname']]) ? $this->mbModule->mblanguage->strings[$current_language.'.lang.php'][$def['vname']] : $field;
+                            $customFieldsData[$field] = ($k == $this->mbModule->name) ? true : false;
+                            $loadedFields[$field] = true;
 
-                           $type = $this->mbModule->mbvardefs->vardefs['fields'][$k][$field]['type'];
-                           $this->mbModule->mbvardefs->vardefs['fields'][$k][$field]['type'] = isset($fieldTypes[$type]) ? $fieldTypes[$type] : ucfirst($type);
-                           $fieldsData[] = $this->mbModule->mbvardefs->vardefs['fields'][$k][$field];
+                            $type = $this->mbModule->mbvardefs->vardefs['fields'][$k][$field]['type'];
+                            $this->mbModule->mbvardefs->vardefs['fields'][$k][$field]['type'] = isset($fieldTypes[$type]) ? $fieldTypes[$type] : ucfirst($type);
+                            $fieldsData[] = $this->mbModule->mbvardefs->vardefs['fields'][$k][$field];
                         }
                     }
                 }
@@ -249,29 +249,29 @@ 
     function isValidStudioField(
         $def
         )
-	{
-    	if (isset($def['studio'])) {
+    {
+        if (isset($def['studio'])) {
             if (is_array($def [ 'studio' ]))
             {
-    			if (isset($def['studio']['editField']) && $def['studio']['editField'] == true)
+                if (isset($def['studio']['editField']) && $def['studio']['editField'] == true)
                     return true;
-    			if (isset($def['studio']['required']) && $def['studio']['required'])
+                if (isset($def['studio']['required']) && $def['studio']['required'])
                     return true;
                     
-    		} else
-    		{
-    			if ($def['studio'] == 'visible')
+            } else
+            {
+                if ($def['studio'] == 'visible')
                     return true;
                 if ($def['studio'] == 'hidden' || $def['studio'] == 'false' || !$def['studio'] )
                     return false;
             }
         }
-    	if (empty($def ['source']) || $def ['source'] == 'db' || $def ['source'] == 'custom_fields')
-		{
-    		if ($def ['type'] != 'id' && (empty($def ['dbType']) || $def ['dbType'] != 'id'))
-		  return true;
-		}
+        if (empty($def ['source']) || $def ['source'] == 'db' || $def ['source'] == 'custom_fields')
+        {
+            if ($def ['type'] != 'id' && (empty($def ['dbType']) || $def ['dbType'] != 'id'))
+            return true;
+        }
 		
-		return false;
-	}
+        return false;
+    }
 }
\ No newline at end of file

install/language/en_us.lang.php

Indentation +396 added lines, -396 removed lines

@@ -43,40 +43,40 @@ 
  * *******************************************************************************/
 
 $mod_strings = array(
-	'LBL_BASIC_SEARCH'					=> 'Basic Search',
-	'LBL_ADVANCED_SEARCH'				=> 'Advanced Search',
-	'LBL_BASIC_TYPE'					=> 'Basic Type',
-	'LBL_ADVANCED_TYPE'					=> 'Advanced Type',
-	'LBL_SYSOPTS_1'						=> 'Select from the following system configuration options below.',
+    'LBL_BASIC_SEARCH'					=> 'Basic Search',
+    'LBL_ADVANCED_SEARCH'				=> 'Advanced Search',
+    'LBL_BASIC_TYPE'					=> 'Basic Type',
+    'LBL_ADVANCED_TYPE'					=> 'Advanced Type',
+    'LBL_SYSOPTS_1'						=> 'Select from the following system configuration options below.',
     'LBL_SYSOPTS_2'                     => 'What type of database will be used for the SuiteCRM instance you are about to install?',
-	'LBL_SYSOPTS_CONFIG'				=> 'System Configuration',
-	'LBL_SYSOPTS_DB_TYPE'				=> '',
-	'LBL_SYSOPTS_DB'					=> 'Specify Database Type',
+    'LBL_SYSOPTS_CONFIG'				=> 'System Configuration',
+    'LBL_SYSOPTS_DB_TYPE'				=> '',
+    'LBL_SYSOPTS_DB'					=> 'Specify Database Type',
     'LBL_SYSOPTS_DB_TITLE'              => 'Database Type',
-	'LBL_SYSOPTS_ERRS_TITLE'			=> 'Please fix the following errors before proceeding:',
-	'LBL_MAKE_DIRECTORY_WRITABLE'      => 'Please make the following directory writable:',
+    'LBL_SYSOPTS_ERRS_TITLE'			=> 'Please fix the following errors before proceeding:',
+    'LBL_MAKE_DIRECTORY_WRITABLE'      => 'Please make the following directory writable:',
     'ERR_DB_VERSION_FAILURE'			=> 'Unable to check database version.',
-	'DEFAULT_CHARSET'					=> 'UTF-8',
+    '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_ADMIN_PASS_BLANK'				=> 'Provide the password for the SuiteCRM admin user. ',
 
     //'ERR_CHECKSYS_CALL_TIME'			=> 'Allow Call Time Pass Reference is Off (please enable in php.ini)',
     '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_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_MSSQL_MQGPC'			=> 'Magic Quotes GPC cannot be turned "On" when using MS SQL Server.',
-	'ERR_CHECKSYS_MEM_LIMIT_0'			=> 'Warning: ',
-	'ERR_CHECKSYS_MEM_LIMIT_1'			=> ' (Set this to ',
-	'ERR_CHECKSYS_MEM_LIMIT_2'			=> 'M or larger in your php.ini file)',
-	'ERR_CHECKSYS_MYSQL_VERSION'		=> 'Minimum Version 4.1.2 - Found: ',
-	'ERR_CHECKSYS_NO_SESSIONS'			=> 'Failed to write and read session variables.  Unable to proceed with the installation.',
-	'ERR_CHECKSYS_NOT_VALID_DIR'		=> 'Not A Valid Directory',
-	'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.',
+    'ERR_CHECKSYS_MSSQL_MQGPC'			=> 'Magic Quotes GPC cannot be turned "On" when using MS SQL Server.',
+    'ERR_CHECKSYS_MEM_LIMIT_0'			=> 'Warning: ',
+    'ERR_CHECKSYS_MEM_LIMIT_1'			=> ' (Set this to ',
+    'ERR_CHECKSYS_MEM_LIMIT_2'			=> 'M or larger in your php.ini file)',
+    'ERR_CHECKSYS_MYSQL_VERSION'		=> 'Minimum Version 4.1.2 - Found: ',
+    'ERR_CHECKSYS_NO_SESSIONS'			=> 'Failed to write and read session variables.  Unable to proceed with the installation.',
+    'ERR_CHECKSYS_NOT_VALID_DIR'		=> 'Not A Valid Directory',
+    '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.',
     'ERR_CHECKSYS_PHP_UNSUPPORTED'		=> 'Unsupported PHP Version Installed: ( ver',
     '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.',
@@ -89,184 +89,184 @@ 
     '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 (please disable in php.ini)',
-	'ERR_CHECKSYS_SAFE_MODE'			=> 'Safe Mode is On (you may wish to disable in php.ini)',
+    //'ERR_CHECKSYS_SAFE_MODE'			=> 'Safe Mode is On (please disable in php.ini)',
+    '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'						=> '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_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_NAME2'						=> "Database name cannot contain a '\\', '/', or '.'",
+    '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_NAME2'						=> "Database name cannot contain a '\\', '/', or '.'",
     '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_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_LICENSE_MISSING'				=> 'Missing Required Fields',
-	'ERR_LICENSE_NOT_FOUND'				=> 'License file not found!',
-	'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_LOG_DIRECTORY_REQUIRED'		=> 'Log directory is required if you wish to specify your own.',
-	'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.',
+    '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_LICENSE_MISSING'				=> 'Missing Required Fields',
+    'ERR_LICENSE_NOT_FOUND'				=> 'License file not found!',
+    '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_LOG_DIRECTORY_REQUIRED'		=> 'Log directory is required if you wish to specify your own.',
+    '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.',
+    '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 (Community Edition, Professional, or Enterprise) of SuiteCRM: ',
-	'ERROR_LICENSE_EXPIRED'				=> "Error: Your license expired ",
-	'ERROR_LICENSE_EXPIRED2'			=> " day(s) ago.   Please go to the <a href='index.php?action=LicenseSettings&module=Administration'>'\"License Management\"</a>  in the Admin screen to enter your new license key.  If you do not enter a new license key within 30 days of your license key expiration, you will no longer be able to log in to this application.",
-	'ERROR_MANIFEST_TYPE'				=> 'Manifest file must specify the package type.',
-	'ERROR_PACKAGE_TYPE'				=> 'Manifest file specifies an unrecognized package type',
-	'ERROR_VALIDATION_EXPIRED'			=> "Error: Your validation key expired ",
-	'ERROR_VALIDATION_EXPIRED2'			=> " day(s) ago.   Please go to the <a href='index.php?action=LicenseSettings&module=Administration'>'\"License Management\"</a> in the Admin screen to enter your new validation key.  If you do not enter a new validation key within 30 days of your validation key expiration, you will no longer be able to log in to this application.",
-	'ERROR_VERSION_INCOMPATIBLE'		=> 'The uploaded file is not compatible with this version of SuiteCRM: ',
-
-	'LBL_BACK'							=> 'Back',
+    '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 (Community Edition, Professional, or Enterprise) of SuiteCRM: ',
+    'ERROR_LICENSE_EXPIRED'				=> "Error: Your license expired ",
+    'ERROR_LICENSE_EXPIRED2'			=> " day(s) ago.   Please go to the <a href='index.php?action=LicenseSettings&module=Administration'>'\"License Management\"</a>  in the Admin screen to enter your new license key.  If you do not enter a new license key within 30 days of your license key expiration, you will no longer be able to log in to this application.",
+    'ERROR_MANIFEST_TYPE'				=> 'Manifest file must specify the package type.',
+    'ERROR_PACKAGE_TYPE'				=> 'Manifest file specifies an unrecognized package type',
+    'ERROR_VALIDATION_EXPIRED'			=> "Error: Your validation key expired ",
+    'ERROR_VALIDATION_EXPIRED2'			=> " day(s) ago.   Please go to the <a href='index.php?action=LicenseSettings&module=Administration'>'\"License Management\"</a> in the Admin screen to enter your new validation key.  If you do not enter a new validation key within 30 days of your validation key expiration, you will no longer be able to log in to this application.",
+    '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_1'					=> 'In order for your SuiteCRM installation to function properly, please ensure all of the system check items listed below are green. If any are red, please take the necessary steps to fix them.<BR><BR> For help on these system checks, please visit the <a href="http://www.suitecrm.com" target="_blank">SuiteCRM</a>.',
-	'LBL_CHECKSYS_CACHE'				=> 'Writable Cache Sub-Directories',
+    'LBL_CHECKSYS_1'					=> 'In order for your SuiteCRM installation to function properly, please ensure all of the system check items listed below are green. If any are red, please take the necessary steps to fix them.<BR><BR> For help on these system checks, please visit the <a href="http://www.suitecrm.com" target="_blank">SuiteCRM</a>.',
+    '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_CALL_TIME'			=> 'PHP Allow Call Time Pass Reference Turned Off',
+    'LBL_CHECKSYS_CALL_TIME'			=> 'PHP Allow Call Time Pass Reference Turned Off',
     'LBL_CHECKSYS_COMPONENT'			=> 'Component',
-	'LBL_CHECKSYS_COMPONENT_OPTIONAL'	=> 'Optional Components',
-	'LBL_CHECKSYS_CONFIG'				=> 'Writable SuiteCRM Configuration File (config.php)',
-	'LBL_CHECKSYS_CONFIG_OVERRIDE'		=> 'Writable SuiteCRM Configuration File (config_override.php)',
-	'LBL_CHECKSYS_CURL'					=> 'cURL Module',
+    'LBL_CHECKSYS_COMPONENT_OPTIONAL'	=> 'Optional Components',
+    'LBL_CHECKSYS_CONFIG'				=> 'Writable SuiteCRM Configuration File (config.php)',
+    'LBL_CHECKSYS_CONFIG_OVERRIDE'		=> 'Writable SuiteCRM Configuration File (config_override.php)',
+    'LBL_CHECKSYS_CURL'					=> 'cURL Module',
     'LBL_CHECKSYS_SESSION_SAVE_PATH'    => 'Session Save Path Setting',
-	'LBL_CHECKSYS_CUSTOM'				=> 'Writeable Custom Directory',
-	'LBL_CHECKSYS_DATA'					=> 'Writable Data Sub-Directories',
-	'LBL_CHECKSYS_IMAP'					=> 'IMAP Module',
-	'LBL_CHECKSYS_FASTCGI'             => 'FastCGI',
-	'LBL_CHECKSYS_MQGPC'				=> 'Magic Quotes GPC',
-	'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_MYSQL_VERSION'		=> 'MySQL Version',
-	'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_CUSTOM'				=> 'Writeable Custom Directory',
+    'LBL_CHECKSYS_DATA'					=> 'Writable Data Sub-Directories',
+    'LBL_CHECKSYS_IMAP'					=> 'IMAP Module',
+    'LBL_CHECKSYS_FASTCGI'             => 'FastCGI',
+    'LBL_CHECKSYS_MQGPC'				=> 'Magic Quotes GPC',
+    '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_MYSQL_VERSION'		=> 'MySQL Version',
+    '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_SAFE_MODE'			=> 'PHP Safe Mode Turned Off',
-	'LBL_CHECKSYS_SESSION'				=> 'Writable Session Save Path (',
-	'LBL_CHECKSYS_STATUS'				=> 'Status',
-	'LBL_CHECKSYS_TITLE'				=> 'System Check Acceptance',
-	'LBL_CHECKSYS_VER'					=> 'Found: ( ver ',
-	'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_RECHECK'				=> 'Re-check',
+    'LBL_CHECKSYS_SAFE_MODE'			=> 'PHP Safe Mode Turned Off',
+    'LBL_CHECKSYS_SESSION'				=> 'Writable Session Save Path (',
+    'LBL_CHECKSYS_STATUS'				=> 'Status',
+    'LBL_CHECKSYS_TITLE'				=> 'System Check Acceptance',
+    'LBL_CHECKSYS_VER'					=> 'Found: ( ver ',
+    '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_DIRECTIONS'			=> 'Please confirm the settings below.  If you would like to change any of the values, click "Back" to edit.  Otherwise, click "Next" to start the installation.',
-	'LBL_CONFIRM_LICENSE_TITLE'			=> 'License Information',
-	'LBL_CONFIRM_NOT'					=> 'not',
-	'LBL_CONFIRM_TITLE'					=> 'Confirm Settings',
-	'LBL_CONFIRM_WILL'					=> 'will',
-	'LBL_DBCONF_CREATE_DB'				=> 'Create Database',
-	'LBL_DBCONF_CREATE_USER'			=> 'Create User',
-	'LBL_DBCONF_DB_DROP_CREATE_WARN'	=> 'Caution: All SuiteCRM data will be erased<br>if this box is checked.',
-	'LBL_DBCONF_DB_DROP_CREATE'			=> 'Drop and Recreate Existing SuiteCRM tables?',
+    'LBL_CONFIRM_BE_CREATED'			=> 'be created',
+    'LBL_CONFIRM_DB_TYPE'				=> 'Database Type',
+    'LBL_CONFIRM_DIRECTIONS'			=> 'Please confirm the settings below.  If you would like to change any of the values, click "Back" to edit.  Otherwise, click "Next" to start the installation.',
+    'LBL_CONFIRM_LICENSE_TITLE'			=> 'License Information',
+    'LBL_CONFIRM_NOT'					=> 'not',
+    'LBL_CONFIRM_TITLE'					=> 'Confirm Settings',
+    'LBL_CONFIRM_WILL'					=> 'will',
+    'LBL_DBCONF_CREATE_DB'				=> 'Create Database',
+    'LBL_DBCONF_CREATE_USER'			=> 'Create User',
+    'LBL_DBCONF_DB_DROP_CREATE_WARN'	=> 'Caution: All SuiteCRM data will be erased<br>if this box is checked.',
+    'LBL_DBCONF_DB_DROP_CREATE'			=> 'Drop and Recreate Existing SuiteCRM tables?',
     '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_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'				=> '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_DBCONF_HOST_PORT'				=> 'Port',
-	'LBL_DBCONF_INSTRUCTIONS'			=> 'Please enter your database configuration information below. If you are unsure of what to fill in, we suggest that you use the default values.',
-	'LBL_DBCONF_MB_DEMO_DATA'			=> 'Use multi-byte text in demo data?',
+    'LBL_DBCONF_HOST_NAME'				=> 'Host Name',
+    'LBL_DBCONF_HOST_INSTANCE'			=> 'Host Instance',
+    'LBL_DBCONF_HOST_PORT'				=> 'Port',
+    'LBL_DBCONF_INSTRUCTIONS'			=> 'Please enter your database configuration information below. If you are unsure of what to fill in, we suggest that you use the default values.',
+    'LBL_DBCONF_MB_DEMO_DATA'			=> 'Use multi-byte text in demo data?',
     'LBL_DBCONFIG_MSG2'                 => 'Name of web server or machine (host) on which the database is located ( such as localhost or www.mydomain.com ):',
-	'LBL_DBCONFIG_MSG2_LABEL' => 'Host Name',
+    'LBL_DBCONFIG_MSG2_LABEL' => 'Host Name',
     'LBL_DBCONFIG_MSG3'                 => 'Name of the database that will contain the data for the SuiteCRM instance you are about to install:',
-	'LBL_DBCONFIG_MSG3_LABEL' => 'Database Name',
+    'LBL_DBCONFIG_MSG3_LABEL' => 'Database Name',
     'LBL_DBCONFIG_B_MSG1'               => 'The username and password of a database administrator who can create database tables and users and who can write to the database is necessary in order to set up the SuiteCRM database.',
-	'LBL_DBCONFIG_B_MSG1_LABEL' => '',
+    'LBL_DBCONFIG_B_MSG1_LABEL' => '',
     '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_AUTO_DD'              => 'Do it for me',
     '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_I18NFIX'              => 'Apply database column expansion for varchar and char types (up to 255) for multi-byte data?',
+    //'LBL_DBCONF_I18NFIX'              => 'Apply database column expansion for varchar and char types (up to 255) for multi-byte data?',
     'LBL_FTS'                           => 'Full Text Search',
     'LBL_FTS_INSTALLED'                 => 'Installed',
     'LBL_FTS_INSTALLED_ERR1'            => 'Full Text Search capability is not installed.',
     'LBL_FTS_INSTALLED_ERR2'            => 'You can still install but will not be able to use Full Text Search functionality.  Please refer to your database server install guide on how to do this, or contact your Administrator.',
-	'LBL_DBCONF_PRIV_PASS'				=> 'Privileged Database User Password',
-	'LBL_DBCONF_PRIV_USER_2'			=> 'Database Account Above Is a Privileged User?',
-	'LBL_DBCONF_PRIV_USER_DIRECTIONS'	=> 'This privileged database user must have the proper permissions to create a database, drop/create tables, and create a user.  This privileged database user will only be used to perform these tasks as needed during the installation process.  You may also use the same database user as above if that user has sufficient privileges.',
-	'LBL_DBCONF_PRIV_USER'				=> 'Privileged Database User Name',
-	'LBL_DBCONF_TITLE'					=> 'Database Configuration',
+    'LBL_DBCONF_PRIV_PASS'				=> 'Privileged Database User Password',
+    'LBL_DBCONF_PRIV_USER_2'			=> 'Database Account Above Is a Privileged User?',
+    'LBL_DBCONF_PRIV_USER_DIRECTIONS'	=> 'This privileged database user must have the proper permissions to create a database, drop/create tables, and create a user.  This privileged database user will only be used to perform these tasks as needed during the installation process.  You may also use the same database user as above if that user has sufficient privileges.',
+    'LBL_DBCONF_PRIV_USER'				=> 'Privileged Database User Name',
+    'LBL_DBCONF_TITLE'					=> 'Database Configuration',
     'LBL_DBCONF_TITLE_NAME'             => 'Provide Database Name',
     'LBL_DBCONF_TITLE_USER_INFO'        => 'Provide Database User Information',
-	'LBL_DBCONF_TITLE_USER_INFO_LABEL' => 'User',
-	'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_DBCONF_TITLE_USER_INFO_LABEL' => 'User',
+    '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_DISABLED_TITLE'				=> 'SuiteCRM Installation Disabled',
-	'LBL_EMAIL_CHARSET_DESC'			=> 'Character Set most commonly used in your locale',
-	'LBL_EMAIL_CHARSET_TITLE'			=> 'Outbound Email Settings',
+    'LBL_DISABLED_HELP_2'				=> 'support forums',
+    'LBL_DISABLED_TITLE_2'				=> 'SuiteCRM Installation has been Disabled',
+    'LBL_DISABLED_TITLE'				=> 'SuiteCRM Installation Disabled',
+    'LBL_EMAIL_CHARSET_DESC'			=> 'Character Set most commonly used in your locale',
+    'LBL_EMAIL_CHARSET_TITLE'			=> 'Outbound Email Settings',
     'LBL_EMAIL_CHARSET_CONF'            => 'Character Set for Outbound Email ',
-	'LBL_HELP'							=> 'Help',
+    'LBL_HELP'							=> 'Help',
     'LBL_INSTALL'                       => 'Install',
     'LBL_INSTALL_TYPE_TITLE'            => 'Installation Options',
     'LBL_INSTALL_TYPE_SUBTITLE'         => 'Choose Install Type',
@@ -275,158 +275,158 @@ 
     'LBL_INSTALL_TYPE_MSG1'             => 'The key is required for general application functionality, but it is not required for installation. You do not need to enter the key at this time, but you will need to provide the key after you have installed the application.',
     '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_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_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_CREATE_CACHE' => 'Preparing to Install...',
     'LBL_LICENSE_REDIRECT'              => 'Redirecting in ',
-	'LBL_LICENSE_DIRECTIONS'			=> 'If you have your license information, please enter it in the fields below.',
-	'LBL_LICENSE_DOWNLOAD_KEY'			=> 'Enter Download Key',
-	'LBL_LICENSE_EXPIRY'				=> 'Expiration Date',
-	'LBL_LICENSE_I_ACCEPT'				=> 'I Accept',
-	'LBL_LICENSE_NUM_USERS'				=> 'Number of Users',
-	'LBL_LICENSE_OC_DIRECTIONS'			=> 'Please enter the number of purchased offline clients.',
-	'LBL_LICENSE_OC_NUM'				=> 'Number of Offline Client Licenses',
-	'LBL_LICENSE_OC'					=> 'Offline Client Licenses',
-	'LBL_LICENSE_PRINTABLE'				=> ' Printable View ',
+    'LBL_LICENSE_DIRECTIONS'			=> 'If you have your license information, please enter it in the fields below.',
+    'LBL_LICENSE_DOWNLOAD_KEY'			=> 'Enter Download Key',
+    'LBL_LICENSE_EXPIRY'				=> 'Expiration Date',
+    'LBL_LICENSE_I_ACCEPT'				=> 'I Accept',
+    'LBL_LICENSE_NUM_USERS'				=> 'Number of Users',
+    'LBL_LICENSE_OC_DIRECTIONS'			=> 'Please enter the number of purchased offline clients.',
+    'LBL_LICENSE_OC_NUM'				=> 'Number of Offline Client Licenses',
+    'LBL_LICENSE_OC'					=> 'Offline Client Licenses',
+    'LBL_LICENSE_PRINTABLE'				=> ' Printable View ',
     'LBL_PRINT_SUMM'                    => 'Print Summary',
-	'LBL_LICENSE_TITLE_2'				=> 'SuiteCRM License',
-	'LBL_LICENSE_TITLE'					=> 'License Information',
-	'LBL_LICENSE_USERS'					=> 'Licensed Users',
-
-	'LBL_LOCALE_CURRENCY'				=> 'Currency Settings',
-	'LBL_LOCALE_CURR_DEFAULT'			=> 'Default Currency',
-	'LBL_LOCALE_CURR_SYMBOL'			=> 'Currency Symbol',
-	'LBL_LOCALE_CURR_ISO'				=> 'Currency Code (ISO 4217)',
-	'LBL_LOCALE_CURR_1000S'				=> '1000s Separator',
-	'LBL_LOCALE_CURR_DECIMAL'			=> 'Decimal Separator',
-	'LBL_LOCALE_CURR_EXAMPLE'			=> 'Example',
-	'LBL_LOCALE_CURR_SIG_DIGITS'		=> 'Significant Digits',
-	'LBL_LOCALE_DATEF'					=> 'Default Date Format',
-	'LBL_LOCALE_DESC'					=> 'The specified locale settings will be reflected globally within the SuiteCRM instance.',
-	'LBL_LOCALE_EXPORT'					=> 'Character Set for Import/Export<br> <i>(Email, .csv, vCard, PDF, data import)</i>',
-	'LBL_LOCALE_EXPORT_DELIMITER'		=> 'Export (.csv) Delimiter',
-	'LBL_LOCALE_EXPORT_TITLE'			=> 'Import/Export Settings',
-	'LBL_LOCALE_LANG'					=> 'Default Language',
-	'LBL_LOCALE_NAMEF'					=> 'Default Name Format',
-	'LBL_LOCALE_NAMEF_DESC'				=> 's = salutation<br />f = first name<br />l = last name',
-	'LBL_LOCALE_NAME_FIRST'				=> 'David',
-	'LBL_LOCALE_NAME_LAST'				=> 'Livingstone',
-	'LBL_LOCALE_NAME_SALUTATION'		=> 'Dr.',
-	'LBL_LOCALE_TIMEF'					=> 'Default Time Format',
-	'LBL_LOCALE_TITLE'					=> 'Locale Settings',
+    'LBL_LICENSE_TITLE_2'				=> 'SuiteCRM License',
+    'LBL_LICENSE_TITLE'					=> 'License Information',
+    'LBL_LICENSE_USERS'					=> 'Licensed Users',
+
+    'LBL_LOCALE_CURRENCY'				=> 'Currency Settings',
+    'LBL_LOCALE_CURR_DEFAULT'			=> 'Default Currency',
+    'LBL_LOCALE_CURR_SYMBOL'			=> 'Currency Symbol',
+    'LBL_LOCALE_CURR_ISO'				=> 'Currency Code (ISO 4217)',
+    'LBL_LOCALE_CURR_1000S'				=> '1000s Separator',
+    'LBL_LOCALE_CURR_DECIMAL'			=> 'Decimal Separator',
+    'LBL_LOCALE_CURR_EXAMPLE'			=> 'Example',
+    'LBL_LOCALE_CURR_SIG_DIGITS'		=> 'Significant Digits',
+    'LBL_LOCALE_DATEF'					=> 'Default Date Format',
+    'LBL_LOCALE_DESC'					=> 'The specified locale settings will be reflected globally within the SuiteCRM instance.',
+    'LBL_LOCALE_EXPORT'					=> 'Character Set for Import/Export<br> <i>(Email, .csv, vCard, PDF, data import)</i>',
+    'LBL_LOCALE_EXPORT_DELIMITER'		=> 'Export (.csv) Delimiter',
+    'LBL_LOCALE_EXPORT_TITLE'			=> 'Import/Export Settings',
+    'LBL_LOCALE_LANG'					=> 'Default Language',
+    'LBL_LOCALE_NAMEF'					=> 'Default Name Format',
+    'LBL_LOCALE_NAMEF_DESC'				=> 's = salutation<br />f = first name<br />l = last name',
+    'LBL_LOCALE_NAME_FIRST'				=> 'David',
+    'LBL_LOCALE_NAME_LAST'				=> 'Livingstone',
+    'LBL_LOCALE_NAME_SALUTATION'		=> 'Dr.',
+    'LBL_LOCALE_TIMEF'					=> 'Default Time Format',
+    'LBL_LOCALE_TITLE'					=> 'Locale Settings',
     'LBL_CUSTOMIZE_LOCALE'              => 'Customize Locale Settings',
-	'LBL_LOCALE_UI'						=> 'User Interface',
-
-	'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_LOCALE_UI'						=> 'User Interface',
+
+    '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_IBM_DB2'						=> 'IBM DB2',
-	'LBL_NEXT'							=> 'Next',
-	'LBL_NO'							=> 'No',
+    'LBL_IBM_DB2'						=> 'IBM DB2',
+    'LBL_NEXT'							=> 'Next',
+    'LBL_NO'							=> 'No',
     'LBL_ORACLE'						=> 'Oracle',
-	'LBL_PERFORM_ADMIN_PASSWORD'		=> 'Setting site admin password',
-	'LBL_PERFORM_AUDIT_TABLE'			=> 'audit table / ',
-	'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_CREATE_LOCALHOST'		=> 'Creating the Database username and password for localhost...',
-	'LBL_PERFORM_CREATE_RELATIONSHIPS'	=> 'Creating SuiteCRM relationship tables',
-	'LBL_PERFORM_CREATING'				=> 'creating / ',
-	'LBL_PERFORM_DEFAULT_REPORTS'		=> 'Creating default reports',
-	'LBL_PERFORM_DEFAULT_SCHEDULER'		=> 'Creating default scheduler jobs',
-	'LBL_PERFORM_DEFAULT_SETTINGS'		=> 'Inserting default settings',
-	'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_DROPPING'				=> 'dropping / ',
-	'LBL_PERFORM_FINISH'				=> 'Finish',
-	'LBL_PERFORM_LICENSE_SETTINGS'		=> 'Updating license information',
-	'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_OUTRO_7'				=> 'Your system is now installed and configured for use.',
-	'LBL_PERFORM_REL_META'				=> 'relationship meta ... ',
-	'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_2'					=> 'Your name and email address are the only required fields for registration. All other fields are optional, but very helpful. 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_PERFORM_ADMIN_PASSWORD'		=> 'Setting site admin password',
+    'LBL_PERFORM_AUDIT_TABLE'			=> 'audit table / ',
+    '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_CREATE_LOCALHOST'		=> 'Creating the Database username and password for localhost...',
+    'LBL_PERFORM_CREATE_RELATIONSHIPS'	=> 'Creating SuiteCRM relationship tables',
+    'LBL_PERFORM_CREATING'				=> 'creating / ',
+    'LBL_PERFORM_DEFAULT_REPORTS'		=> 'Creating default reports',
+    'LBL_PERFORM_DEFAULT_SCHEDULER'		=> 'Creating default scheduler jobs',
+    'LBL_PERFORM_DEFAULT_SETTINGS'		=> 'Inserting default settings',
+    '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_DROPPING'				=> 'dropping / ',
+    'LBL_PERFORM_FINISH'				=> 'Finish',
+    'LBL_PERFORM_LICENSE_SETTINGS'		=> 'Updating license information',
+    '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_OUTRO_7'				=> 'Your system is now installed and configured for use.',
+    'LBL_PERFORM_REL_META'				=> 'relationship meta ... ',
+    '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_2'					=> 'Your name and email address are the only required fields for registration. All other fields are optional, but very helpful. 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_REG_NO_THANKS'                 => 'No Thanks',
     'LBL_REG_SKIP_THIS_STEP'            => 'Skip this Step',
-	'LBL_REQUIRED'						=> '* Required field',
+    '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_WARN'		=> 'Caution: This will override the admin password of any previous installation.',
-	'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_DIRECTIONS'			=> 'Please enter your site configuration information below. If you are unsure of the fields, we suggest that you use the default values.',
-	'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_ADMIN_PASS_2'			=> 'Re-enter SuiteCRM Admin User Password',
+    'LBL_SITECFG_ADMIN_PASS_WARN'		=> 'Caution: This will override the admin password of any previous installation.',
+    '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_DIRECTIONS'			=> 'Please enter your site configuration information below. If you are unsure of the fields, we suggest that you use the default values.',
+    '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_USE_DEFAULTS'			=> 'Use Defaults?',
-	'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'					=> 'URL of SuiteCRM Instance',
+    'LBL_SITECFG_USE_DEFAULTS'			=> 'Use Defaults?',
+    '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_CREDS'                  => 'System Credentials',
     'LBL_SYSTEM_ENV'                    => 'System Environment',
-	'LBL_START'							=> 'Start',
+    '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_STEP1' => 'Step 1 of 2 - Pre-Installation requirements',
+    'LBL_STEP2' => 'Step 2 of 2 - Configuration',
 //    'LBL_STEP1'                         => 'Step 1 of 8 - Pre-Installation requirements',
 //    'LBL_STEP2'                         => 'Step 2 of 8 - License Agreement',
 //    'LBL_STEP3'                         => 'Step 3 of 8 - Installation Type',
@@ -436,11 +436,11 @@ 
 //    'LBL_STEP7'                         => 'Step 7 of 8 - Confirm Settings',
 //    'LBL_STEP8'                         => 'Step 8 of 8 - Installation Successful',
 //	'LBL_NO_THANKS'						=> 'Continue to installer',
-	'LBL_CHOOSE_LANG'					=> '<b>Choose your language</b>',
-	'LBL_STEP'							=> 'Step',
-	'LBL_TITLE_WELCOME'					=> 'Welcome to the SuiteCRM ',
-	'LBL_WELCOME_1'						=> 'This installer creates the SuiteCRM database tables and sets the configuration variables that you need to start. The entire process should take about ten minutes.',
-	'LBL_WELCOME_2'						=> 'For installation documentation, please visit the <a href="http://www.SuiteCRM.com/" target="_blank">SuiteCRM</a>.  <BR><BR> You can also find help from the SuiteCRM Community in the <a href="http://www.SuiteCRM.com/" target="_blank">SuiteCRM Forums</a>.',
+    'LBL_CHOOSE_LANG'					=> '<b>Choose your language</b>',
+    'LBL_STEP'							=> 'Step',
+    'LBL_TITLE_WELCOME'					=> 'Welcome to the SuiteCRM ',
+    'LBL_WELCOME_1'						=> 'This installer creates the SuiteCRM database tables and sets the configuration variables that you need to start. The entire process should take about ten minutes.',
+    'LBL_WELCOME_2'						=> 'For installation documentation, please visit the <a href="http://www.SuiteCRM.com/" target="_blank">SuiteCRM</a>.  <BR><BR> You can also find help from the SuiteCRM Community in the <a href="http://www.SuiteCRM.com/" target="_blank">SuiteCRM Forums</a>.',
     //welcome page variables
     'LBL_TITLE_ARE_YOU_READY'            => 'Are you ready to install?',
     'REQUIRED_SYS_COMP' => 'Required System Components',
@@ -523,20 +523,20 @@ 
                                 ',
     '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_WELCOME_TITLE_WELCOME'			=> 'Welcome to the SuiteCRM ',
-	'LBL_WELCOME_TITLE'					=> 'SuiteCRM Setup Wizard',
-	'LBL_WIZARD_TITLE'					=> 'SuiteCRM Setup Wizard: ',
-	'LBL_YES'							=> 'Yes',
+    'LBL_WELCOME_CHOOSE_LANGUAGE'		=> '<b>Choose your language</b>',
+    'LBL_WELCOME_SETUP_WIZARD'			=> 'Setup Wizard',
+    'LBL_WELCOME_TITLE_WELCOME'			=> 'Welcome to the SuiteCRM ',
+    'LBL_WELCOME_TITLE'					=> 'SuiteCRM Setup Wizard',
+    'LBL_WIZARD_TITLE'					=> 'SuiteCRM Setup Wizard: ',
+    'LBL_YES'							=> 'Yes',
     'LBL_YES_MULTI'                     => 'Yes - Multibyte',
-	// OOTB Scheduler Job Names:
-	'LBL_OOTB_WORKFLOW'		=> 'Process Workflow Tasks',
-	'LBL_OOTB_REPORTS'		=> 'Run Report Generation Scheduled Tasks',
-	'LBL_OOTB_IE'			=> 'Check Inbound Mailboxes',
-	'LBL_OOTB_BOUNCE'		=> 'Run Nightly Process Bounced Campaign Emails',
+    // OOTB Scheduler Job Names:
+    'LBL_OOTB_WORKFLOW'		=> 'Process Workflow Tasks',
+    'LBL_OOTB_REPORTS'		=> 'Run Report Generation Scheduled Tasks',
+    'LBL_OOTB_IE'			=> 'Check Inbound Mailboxes',
+    'LBL_OOTB_BOUNCE'		=> 'Run Nightly Process Bounced Campaign Emails',
     'LBL_OOTB_CAMPAIGN'		=> 'Run Nightly Mass Email Campaigns',
-	'LBL_OOTB_PRUNE'		=> 'Prune Database on 1st of Month',
+    'LBL_OOTB_PRUNE'		=> 'Prune Database on 1st of Month',
     'LBL_OOTB_TRACKER'		=> 'Prune tracker tables',
     'LBL_OOTB_SUGARFEEDS'   => 'Prune SuiteCRM Feed Tables',
     'LBL_OOTB_SEND_EMAIL_REMINDERS'	=> 'Run Email Reminder Notifications',
@@ -550,19 +550,19 @@ 
     '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_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_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_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(
@@ -594,91 +594,91 @@ 
         '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:',
+    // 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.',
 
-	// 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' => '',
+    // 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' => '',
 
 
 );