adamjakab / SuiteCRM

include/utils/sugar_file_utils.php

Indentation +153 added lines, -153 removed lines

@@ -54,44 +54,44 @@ 
  * @return boolean - Returns true on success false on failure
  */
 function sugar_mkdir($pathname, $mode=null, $recursive=false, $context='') {
-	$mode = get_mode('dir_mode', $mode);
-
-	if ( sugar_is_dir($pathname,$mode) )
-	    return true;
-
-	$result = false;
-	if(empty($mode))
-		$mode = 0777;
-	if(empty($context)) {
-		$result = @mkdir($pathname, $mode, $recursive);
-	} else {
-		$result = @mkdir($pathname, $mode, $recursive, $context);
-	}
-
-	if($result){
-		if(!sugar_chmod($pathname, $mode)){
-			return false;
-		}
-		if(!empty($GLOBALS['sugar_config']['default_permissions']['user'])){
-			if(!sugar_chown($pathname)){
-				return false;
-			}
-		}
-		if(!empty($GLOBALS['sugar_config']['default_permissions']['group'])){
-   			if(!sugar_chgrp($pathname)) {
-   				return false;
-   			}
-		}
-	}
-	else {
-		$errorMessage = "Cannot create directory $pathname cannot be touched";
-		if(is_null($GLOBALS['log'])) {
-			throw new Exception("Error occurred but the system doesn't have logger. Error message: \"$errorMessage\"");
-		}
-		$GLOBALS['log']->error($errorMessage);
-	}
-
-	return $result;
+    $mode = get_mode('dir_mode', $mode);
+
+    if ( sugar_is_dir($pathname,$mode) )
+        return true;
+
+    $result = false;
+    if(empty($mode))
+        $mode = 0777;
+    if(empty($context)) {
+        $result = @mkdir($pathname, $mode, $recursive);
+    } else {
+        $result = @mkdir($pathname, $mode, $recursive, $context);
+    }
+
+    if($result){
+        if(!sugar_chmod($pathname, $mode)){
+            return false;
+        }
+        if(!empty($GLOBALS['sugar_config']['default_permissions']['user'])){
+            if(!sugar_chown($pathname)){
+                return false;
+            }
+        }
+        if(!empty($GLOBALS['sugar_config']['default_permissions']['group'])){
+                if(!sugar_chgrp($pathname)) {
+                    return false;
+                }
+        }
+    }
+    else {
+        $errorMessage = "Cannot create directory $pathname cannot be touched";
+        if(is_null($GLOBALS['log'])) {
+            throw new Exception("Error occurred but the system doesn't have logger. Error message: \"$errorMessage\"");
+        }
+        $GLOBALS['log']->error($errorMessage);
+    }
+
+    return $result;
 }
 
 /**
@@ -109,17 +109,17 @@ 
  * @return boolean - Returns a file pointer on success, false otherwise
  */
 function sugar_fopen($filename, $mode, $use_include_path=false, $context=null){
-	//check to see if the file exists, if not then use touch to create it.
-	if(!file_exists($filename)){
-		sugar_touch($filename);
-	}
+    //check to see if the file exists, if not then use touch to create it.
+    if(!file_exists($filename)){
+        sugar_touch($filename);
+    }
 
-	if(empty($context)) {
+    if(empty($context)) {
 
-		return fopen($filename, $mode, $use_include_path);
-	} else {
-		return fopen($filename, $mode, $use_include_path, $context);
-	}
+        return fopen($filename, $mode, $use_include_path);
+    } else {
+        return fopen($filename, $mode, $use_include_path, $context);
+    }
 }
 
 /**
@@ -137,23 +137,23 @@ 
  * @return int - Returns the number of bytes written to the file, false otherwise.
  */
 function sugar_file_put_contents($filename, $data, $flags=null, $context=null){
-	//check to see if the file exists, if not then use touch to create it.
-	if(!file_exists($filename)){
-		sugar_touch($filename);
-	}
-
-	if ( !is_writable($filename) ) {
-	    $GLOBALS['log']->error("File $filename cannot be written to");
-	    return false;
-	}
-
-	if(empty($flags)) {
-		return file_put_contents($filename, $data);
-	} elseif(empty($context)) {
-		return file_put_contents($filename, $data, $flags);
-	} else{
-		return file_put_contents($filename, $data, $flags, $context);
-	}
+    //check to see if the file exists, if not then use touch to create it.
+    if(!file_exists($filename)){
+        sugar_touch($filename);
+    }
+
+    if ( !is_writable($filename) ) {
+        $GLOBALS['log']->error("File $filename cannot be written to");
+        return false;
+    }
+
+    if(empty($flags)) {
+        return file_put_contents($filename, $data);
+    } elseif(empty($context)) {
+        return file_put_contents($filename, $data, $flags);
+    } else{
+        return file_put_contents($filename, $data, $flags, $context);
+    }
 }
 
 
@@ -198,7 +198,7 @@ 
 
     if(file_exists($filename))
     {
-       return sugar_chmod($filename, 0755);
+        return sugar_chmod($filename, 0755);
     }
 
     return false;
@@ -215,21 +215,21 @@ 
  * @return string|boolean - Returns a file data on success, false otherwise
  */
 function sugar_file_get_contents($filename, $use_include_path=false, $context=null){
-	//check to see if the file exists, if not then use touch to create it.
-	if(!file_exists($filename)){
-		sugar_touch($filename);
-	}
-
-	if ( !is_readable($filename) ) {
-	    $GLOBALS['log']->error("File $filename cannot be read");
-	    return false;
-	}
-
-	if(empty($context)) {
-		return file_get_contents($filename, $use_include_path);
-	} else {
-		return file_get_contents($filename, $use_include_path, $context);
-	}
+    //check to see if the file exists, if not then use touch to create it.
+    if(!file_exists($filename)){
+        sugar_touch($filename);
+    }
+
+    if ( !is_readable($filename) ) {
+        $GLOBALS['log']->error("File $filename cannot be read");
+        return false;
+    }
+
+    if(empty($context)) {
+        return file_get_contents($filename, $use_include_path);
+    } else {
+        return file_get_contents($filename, $use_include_path, $context);
+    }
 }
 
 /**
@@ -248,31 +248,31 @@ 
  */
 function sugar_touch($filename, $time=null, $atime=null) {
 
-   $result = false;
-
-   if(!empty($atime) && !empty($time)) {
-   	  $result = @touch($filename, $time, $atime);
-   } else if(!empty($time)) {
-   	  $result = @touch($filename, $time);
-   } else {
-   	  $result = @touch($filename);
-   }
-
-   if(!$result) {
-       $GLOBALS['log']->error("File $filename cannot be touched");
-       return $result;
-   }
-	if(!empty($GLOBALS['sugar_config']['default_permissions']['file_mode'])){
-		sugar_chmod($filename, $GLOBALS['sugar_config']['default_permissions']['file_mode']);
-	}
-	if(!empty($GLOBALS['sugar_config']['default_permissions']['user'])){
-		sugar_chown($filename);
-	}
-	if(!empty($GLOBALS['sugar_config']['default_permissions']['group'])){
-		sugar_chgrp($filename);
-	}
-
-   return true;
+    $result = false;
+
+    if(!empty($atime) && !empty($time)) {
+            $result = @touch($filename, $time, $atime);
+    } else if(!empty($time)) {
+            $result = @touch($filename, $time);
+    } else {
+            $result = @touch($filename);
+    }
+
+    if(!$result) {
+        $GLOBALS['log']->error("File $filename cannot be touched");
+        return $result;
+    }
+    if(!empty($GLOBALS['sugar_config']['default_permissions']['file_mode'])){
+        sugar_chmod($filename, $GLOBALS['sugar_config']['default_permissions']['file_mode']);
+    }
+    if(!empty($GLOBALS['sugar_config']['default_permissions']['user'])){
+        sugar_chown($filename);
+    }
+    if(!empty($GLOBALS['sugar_config']['default_permissions']['group'])){
+        sugar_chgrp($filename);
+    }
+
+    return true;
 }
 
 /**
@@ -287,17 +287,17 @@ 
 function sugar_chmod($filename, $mode=null) {
     if ( !is_int($mode) )
         $mode = (int) $mode;
-	if(!is_windows()){
-		if(!isset($mode)){
-			$mode = get_mode('file_mode', $mode);
-		}
+    if(!is_windows()){
+        if(!isset($mode)){
+            $mode = get_mode('file_mode', $mode);
+        }
         if(isset($mode) && $mode > 0){
-		   return @chmod($filename, $mode);
-		}else{
-	    	return false;
-		}
-	}
-	return true;
+            return @chmod($filename, $mode);
+        }else{
+            return false;
+        }
+    }
+    return true;
 }
 
 /**
@@ -310,19 +310,19 @@ 
  * @return boolean - Returns TRUE on success or FALSE on failure.
  */
 function sugar_chown($filename, $user='') {
-	if(!is_windows()){
-		if(strlen($user)){
-			return chown($filename, $user);
-		}else{
-			if(strlen($GLOBALS['sugar_config']['default_permissions']['user'])){
-				$user = $GLOBALS['sugar_config']['default_permissions']['user'];
-				return chown($filename, $user);
-			}else{
-				return false;
-			}
-		}
-	}
-	return true;
+    if(!is_windows()){
+        if(strlen($user)){
+            return chown($filename, $user);
+        }else{
+            if(strlen($GLOBALS['sugar_config']['default_permissions']['user'])){
+                $user = $GLOBALS['sugar_config']['default_permissions']['user'];
+                return chown($filename, $user);
+            }else{
+                return false;
+            }
+        }
+    }
+    return true;
 }
 
 /**
@@ -335,19 +335,19 @@ 
  * @return boolean - Returns TRUE on success or FALSE on failure.
  */
 function sugar_chgrp($filename, $group='') {
-	if(!is_windows()){
-		if(!empty($group)){
-			return chgrp($filename, $group);
-		}else{
-			if(!empty($GLOBALS['sugar_config']['default_permissions']['group'])){
-				$group = $GLOBALS['sugar_config']['default_permissions']['group'];
-				return chgrp($filename, $group);
-			}else{
-				return false;
-			}
-		}
-	}
-	return true;
+    if(!is_windows()){
+        if(!empty($group)){
+            return chgrp($filename, $group);
+        }else{
+            if(!empty($GLOBALS['sugar_config']['default_permissions']['group'])){
+                $group = $GLOBALS['sugar_config']['default_permissions']['group'];
+                return chgrp($filename, $group);
+            }else{
+                return false;
+            }
+        }
+    }
+    return true;
 }
 
 /**
@@ -361,26 +361,26 @@ 
  * @return int - the mode either found in the config file or passed in via the input parameter
  */
 function get_mode($key = 'dir_mode', $mode=null) {
-	if ( !is_int($mode) )
+    if ( !is_int($mode) )
         $mode = (int) $mode;
     if(!class_exists('SugarConfig', true)) {
-		require 'include/SugarObjects/SugarConfig.php';
-	}
-	if(!is_windows()){
-		$conf_inst=SugarConfig::getInstance();
-		$mode = $conf_inst->get('default_permissions.'.$key, $mode);
-	}
-	return $mode;
+        require 'include/SugarObjects/SugarConfig.php';
+    }
+    if(!is_windows()){
+        $conf_inst=SugarConfig::getInstance();
+        $mode = $conf_inst->get('default_permissions.'.$key, $mode);
+    }
+    return $mode;
 }
 
 function sugar_is_dir($path, $mode='r'){
-		if(defined('TEMPLATE_URL'))return is_dir($path, $mode);
-		return is_dir($path);
+        if(defined('TEMPLATE_URL'))return is_dir($path, $mode);
+        return is_dir($path);
 }
 
 function sugar_is_file($path, $mode='r'){
-		if(defined('TEMPLATE_URL'))return is_file($path, $mode);
-		return is_file($path);
+        if(defined('TEMPLATE_URL'))return is_file($path, $mode);
+        return is_file($path);
 }
 
 /**

include/modules.php

Indentation +2 added lines, -2 removed lines

@@ -237,7 +237,7 @@ 
     );
 $adminOnlyList = array(
                     //module => list of actions  (all says all actions are admin only)
-                   //'Administration'=>array('all'=>1, 'SupportPortal'=>'allow'),
+                    //'Administration'=>array('all'=>1, 'SupportPortal'=>'allow'),
                     'Dropdown'=>array('all'=>1),
                     'Dynamic'=>array('all'=>1),
                     'DynamicFields'=>array('all'=>1),
@@ -294,7 +294,7 @@ 
     'DocumentRevisions' => 'Documents',
     'EmailTemplates' => 'Emails',
     'EmailMarketing' => 'Campaigns',
- );
+    );
 $beanList['EAPM'] = 'EAPM';
 $beanFiles['EAPM'] = 'modules/EAPM/EAPM.php';
 $modules_exempt_from_availability_check['EAPM'] = 'EAPM';

include/TemplateHandler/TemplateHandler.php

Indentation +87 added lines, -87 removed lines

@@ -50,7 +50,7 @@ 
     var $templateDir = 'modules/';
     var $ss;
     function TemplateHandler() {
-      $this->cacheDir = sugar_cached('');
+        $this->cacheDir = sugar_cached('');
     }
 
     function loadSmarty(){
@@ -66,10 +66,10 @@ 
      *
      */
     static function clearAll() {
-    	global $beanList;
-		foreach($beanList as $module_dir =>$object_name){
+        global $beanList;
+        foreach($beanList as $module_dir =>$object_name){
                 TemplateHandler::clearCache($module_dir);
-		}
+        }
     }
 
 
@@ -132,7 +132,7 @@ 
                     foreach($panel as $row) {
                             foreach($row as $entry) {
                                     if(empty($entry)) {
-                                       continue;
+                                        continue;
                                     }
 
                                     if(is_array($entry) &&
@@ -140,35 +140,35 @@ 
                                        isset($entry['displayParams']) &&
                                        isset($entry['displayParams']['required']) &&
                                        $entry['displayParams']['required']) {
-                                       $panelFields[$entry['name']] = $entry;
+                                        $panelFields[$entry['name']] = $entry;
                                     }
 
                                     if(is_array($entry)) {
-                                      $defs2[$entry['name']] = $entry;
+                                        $defs2[$entry['name']] = $entry;
                                     } else {
-                                      $defs2[$entry] = array('name' => $entry);
+                                        $defs2[$entry] = array('name' => $entry);
                                     }
                             } //foreach
                     } //foreach
             } //foreach
 
             foreach($panelFields as $field=>$value) {
-                      $nameList = array();
-                      if(!is_array($value['displayParams']['required'])) {
-                         $nameList[] = $field;
-                      } else {
-                         foreach($value['displayParams']['required'] as $groupedField) {
-                                 $nameList[] = $groupedField;
-                         }
-                      }
-
-                      foreach($nameList as $x) {
-                         if(isset($defs[$x]) &&
+                        $nameList = array();
+                        if(!is_array($value['displayParams']['required'])) {
+                            $nameList[] = $field;
+                        } else {
+                            foreach($value['displayParams']['required'] as $groupedField) {
+                                    $nameList[] = $groupedField;
+                            }
+                        }
+
+                        foreach($nameList as $x) {
+                            if(isset($defs[$x]) &&
                             isset($defs[$x]['type']) &&
                             !isset($defs[$x]['required'])) {
                             $defs[$x]['required'] = true;
-                         }
-                      }
+                            }
+                        }
             } //foreach
 
             //Create a base class with field_name_map property
@@ -195,23 +195,23 @@ 
             //5) not already been added to Array
             foreach($sugarbean->field_name_map as $name=>$def) {
 
-               if($def['type']=='relate' &&
+                if($def['type']=='relate' &&
                   isset($defs2[$name]) &&
                   (!isset($defs2[$name]['validateDependency']) || $defs2[$name]['validateDependency'] === true) &&
                   isset($def['id_name']) &&
                   !in_array($name, $validatedFields)) {
 
-                  if(isset($mod_strings[$def['vname']])
+                    if(isset($mod_strings[$def['vname']])
                         || isset($app_strings[$def['vname']])
                         || translate($def['vname'],$sugarbean->module_dir) != $def['vname']) {
-                     $vname = $def['vname'];
-                  }
-                  else{
-                     $vname = "undefined";
-                  }
-                  $javascript->addToValidateBinaryDependency($name, 'alpha', $javascript->buildStringToTranslateInSmarty('ERR_SQS_NO_MATCH_FIELD').': '.$javascript->buildStringToTranslateInSmarty($vname), (!empty($def['required']) ? 'true' : 'false'), '', $def['id_name']);
-                  $validatedFields[] = $name;
-               }
+                        $vname = $def['vname'];
+                    }
+                    else{
+                        $vname = "undefined";
+                    }
+                    $javascript->addToValidateBinaryDependency($name, 'alpha', $javascript->buildStringToTranslateInSmarty('ERR_SQS_NO_MATCH_FIELD').': '.$javascript->buildStringToTranslateInSmarty($vname), (!empty($def['required']) ? 'true' : 'false'), '', $def['id_name']);
+                    $validatedFields[] = $name;
+                }
             } //foreach
 
             $contents .= "{literal}\n";
@@ -275,11 +275,11 @@ 
         }
         $file = $this->cacheDir . $this->templateDir . $module . '/' . $view . '.tpl';
         if(file_exists($file)) {
-           return $this->ss->fetch($file);
+            return $this->ss->fetch($file);
         } else {
-           global $app_strings;
-           $GLOBALS['log']->fatal($app_strings['ERR_NO_SUCH_FILE'] .": $file");
-           return $app_strings['ERR_NO_SUCH_FILE'] .": $file";
+            global $app_strings;
+            $GLOBALS['log']->fatal($app_strings['ERR_NO_SUCH_FILE'] .": $file");
+            return $app_strings['ERR_NO_SUCH_FILE'] .": $file";
         }
     }
 
@@ -329,13 +329,13 @@ 
         }
         $qsd->setFormName($view);
         if(preg_match('/^SearchForm_.+/', $view)){
-        	if(strpos($view, 'popup_query_form')){
-        		$qsd->setFormName('popup_query_form');
-            	$parsedView = 'advanced';
-        	}else{
-        		$qsd->setFormName('search_form');
-            	$parsedView = preg_replace("/^SearchForm_/", "", $view);
-        	}
+            if(strpos($view, 'popup_query_form')){
+                $qsd->setFormName('popup_query_form');
+                $parsedView = 'advanced';
+            }else{
+                $qsd->setFormName('search_form');
+                $parsedView = preg_replace("/^SearchForm_/", "", $view);
+            }
             //Loop through the Meta-Data fields to see which ones need quick search support
             foreach($defs as $f) {
                 $field = $f;
@@ -373,14 +373,14 @@ 
                             $sqs_objects[$name.'_'.$parsedView] = $qsd->getQSContact($field['name'], $field['id_name']);
                         }
                     } else {
-                         $sqs_objects[$name.'_'.$parsedView] = $qsd->getQSParent($field['module']);
-                         if(!isset($field['field_list']) && !isset($field['populate_list'])) {
-                             $sqs_objects[$name.'_'.$parsedView]['populate_list'] = array($field['name'], $field['id_name']);
-                             $sqs_objects[$name.'_'.$parsedView]['field_list'] = array('name', 'id');
-                         } else {
-                             $sqs_objects[$name.'_'.$parsedView]['populate_list'] = $field['field_list'];
-                             $sqs_objects[$name.'_'.$parsedView]['field_list'] = $field['populate_list'];
-                         }
+                            $sqs_objects[$name.'_'.$parsedView] = $qsd->getQSParent($field['module']);
+                            if(!isset($field['field_list']) && !isset($field['populate_list'])) {
+                                $sqs_objects[$name.'_'.$parsedView]['populate_list'] = array($field['name'], $field['id_name']);
+                                $sqs_objects[$name.'_'.$parsedView]['field_list'] = array('name', 'id');
+                            } else {
+                                $sqs_objects[$name.'_'.$parsedView]['populate_list'] = $field['field_list'];
+                                $sqs_objects[$name.'_'.$parsedView]['field_list'] = $field['populate_list'];
+                            }
                     }
                 } else if($field['type'] == 'parent') {
                     $sqs_objects[$name.'_'.$parsedView] = $qsd->getQSParent();
@@ -388,7 +388,7 @@ 
             } //foreach
 
             foreach ( $sqs_objects as $name => $field )
-               foreach ( $field['populate_list'] as $key => $fieldname )
+                foreach ( $field['populate_list'] as $key => $fieldname )
                     $sqs_objects[$name]['populate_list'][$key] = $sqs_objects[$name]['populate_list'][$key] . '_'.$parsedView;
         }else{
             //Loop through the Meta-Data fields to see which ones need quick search support
@@ -413,7 +413,7 @@ 
                             $field['id_name'] = $module.$field['id_name'];
                     }
                 }
-				$name = $qsd->form_name . '_' . $field['name'];
+                $name = $qsd->form_name . '_' . $field['name'];
 
 
                 if($field['type'] == 'relate' && isset($field['module']) && (preg_match('/_name$|_c$/si',$name) || !empty($field['quicksearch']))) {
@@ -427,15 +427,15 @@ 
                         } else if($matches[0] == 'Users'){
                             if($field['name'] == 'reports_to_name'){
                                 $sqs_objects[$name] = $qsd->getQSUser('reports_to_name','reports_to_id');
-                             // Bug #52994 : QuickSearch for a 1-M User relationship changes assigned to user
+                                // Bug #52994 : QuickSearch for a 1-M User relationship changes assigned to user
                             }elseif($field['name'] == 'assigned_user_name'){
-                                 $sqs_objects[$name] = $qsd->getQSUser('assigned_user_name','assigned_user_id');
-                             }
-                             else
-                             {
-                                 $sqs_objects[$name] = $qsd->getQSUser($field['name'], $field['id_name']);
+                                    $sqs_objects[$name] = $qsd->getQSUser('assigned_user_name','assigned_user_id');
+                                }
+                                else
+                                {
+                                    $sqs_objects[$name] = $qsd->getQSUser($field['name'], $field['id_name']);
 
-							}
+                            }
                         } else if($matches[0] == 'Campaigns') {
                             $sqs_objects[$name] = $qsd->loadQSObject('Campaigns', 'Campaign', $field['name'], $field['id_name'], $field['id_name']);
                         } else if($matches[0] == 'Accounts') {
@@ -486,39 +486,39 @@ 
                 //merge populate_list && field_list with vardef
                 if (!empty($field['field_list']) && !empty($field['populate_list'])) {
                     for ($j=0; $j<count($field['field_list']); $j++) {
-                		//search for the same couple (field_list_item,populate_field_item)
-               			$field_list_item = $field['field_list'][$j];
-               			$field_list_item_alternate = $qsd->form_name . '_' . $field['field_list'][$j];
-               			$populate_list_item = $field['populate_list'][$j];
-                		$found = false;
-                		for ($k=0; $k<count($sqs_objects[$name]['field_list']); $k++) {
-                			if (($field_list_item == $sqs_objects[$name]['populate_list'][$k] || $field_list_item_alternate == $sqs_objects[$name]['populate_list'][$k]) && //il faut inverser field_list et populate_list (cf lignes 465,466 ci-dessus)
-                				$populate_list_item == $sqs_objects[$name]['field_list'][$k]) {
-                				$found = true;
-                				break;
-                			}
-                		}
-                		if (!$found) {
-                			$sqs_objects[$name]['field_list'][] = $field['populate_list'][$j]; // as in lines 462 and 463
-                			$sqs_objects[$name]['populate_list'][] = $field['field_list'][$j];
-                		}
-                	}
+                        //search for the same couple (field_list_item,populate_field_item)
+                            $field_list_item = $field['field_list'][$j];
+                            $field_list_item_alternate = $qsd->form_name . '_' . $field['field_list'][$j];
+                            $populate_list_item = $field['populate_list'][$j];
+                        $found = false;
+                        for ($k=0; $k<count($sqs_objects[$name]['field_list']); $k++) {
+                            if (($field_list_item == $sqs_objects[$name]['populate_list'][$k] || $field_list_item_alternate == $sqs_objects[$name]['populate_list'][$k]) && //il faut inverser field_list et populate_list (cf lignes 465,466 ci-dessus)
+                                $populate_list_item == $sqs_objects[$name]['field_list'][$k]) {
+                                $found = true;
+                                break;
+                            }
+                        }
+                        if (!$found) {
+                            $sqs_objects[$name]['field_list'][] = $field['populate_list'][$j]; // as in lines 462 and 463
+                            $sqs_objects[$name]['populate_list'][] = $field['field_list'][$j];
+                        }
+                    }
                 }
 
             } //foreach
         }
 
-       //Implement QuickSearch for the field
-       if(!empty($sqs_objects) && count($sqs_objects) > 0) {
-           $quicksearch_js = '<script language="javascript">';
-           $quicksearch_js.= 'if(typeof sqs_objects == \'undefined\'){var sqs_objects = new Array;}';
-           $json = getJSONobj();
-           foreach($sqs_objects as $sqsfield=>$sqsfieldArray){
-               $quicksearch_js .= "sqs_objects['$sqsfield']={$json->encode($sqsfieldArray)};";
-           }
-           return $quicksearch_js . '</script>';
-       }
-       return '';
+        //Implement QuickSearch for the field
+        if(!empty($sqs_objects) && count($sqs_objects) > 0) {
+            $quicksearch_js = '<script language="javascript">';
+            $quicksearch_js.= 'if(typeof sqs_objects == \'undefined\'){var sqs_objects = new Array;}';
+            $json = getJSONobj();
+            foreach($sqs_objects as $sqsfield=>$sqsfieldArray){
+                $quicksearch_js .= "sqs_objects['$sqsfield']={$json->encode($sqsfieldArray)};";
+            }
+            return $quicksearch_js . '</script>';
+        }
+        return '';
     }
 
     

include/connectors/ConnectorFactory.php

Indentation +37 added lines, -37 removed lines

@@ -44,45 +44,45 @@
  */
 class ConnectorFactory{
 
-	static $source_map = array();
+    static $source_map = array();
 
-	public static function getInstance($source_name){
-		if(empty(self::$source_map[$source_name])) {
-			require_once('include/connectors/sources/SourceFactory.php');
-			require_once('include/connectors/component.php');
-			$source = SourceFactory::getSource($source_name);
-			$component = new component();
-			$component->setSource($source);
-			$component->init();
-			self::$source_map[$source_name] = $component;
-		}
-		return self::$source_map[$source_name];
-	}
+    public static function getInstance($source_name){
+        if(empty(self::$source_map[$source_name])) {
+            require_once('include/connectors/sources/SourceFactory.php');
+            require_once('include/connectors/component.php');
+            $source = SourceFactory::getSource($source_name);
+            $component = new component();
+            $component->setSource($source);
+            $component->init();
+            self::$source_map[$source_name] = $component;
+        }
+        return self::$source_map[$source_name];
+    }
 
-	/**
-	 * Split the class name by _ and go through the class name
-	 * which represents the inheritance structure to load up all required parents.
-	 * @param string $class the root class we want to load.
-	 */
-	public static function load($class, $type){
-		self::loadClass($class, $type);
-	}
+    /**
+     * Split the class name by _ and go through the class name
+     * which represents the inheritance structure to load up all required parents.
+     * @param string $class the root class we want to load.
+     */
+    public static function load($class, $type){
+        self::loadClass($class, $type);
+    }
 
-	/**
-	 * include a source class file.
-	 * @param string $class a class file to include.
-	 */
-	public static function loadClass($class, $type){
-		$dir = str_replace('_','/',$class);
-		$parts = explode("/", $dir);
-		$file = $parts[count($parts)-1] . '.php';
-		if(file_exists("custom/modules/Connectors/connectors/{$type}/{$dir}/$file")){
-			require_once("custom/modules/Connectors/connectors/{$type}/{$dir}/$file");
-		} else if(file_exists("modules/Connectors/connectors/{$type}/{$dir}/$file")) {
-			require_once("modules/Connectors/connectors/{$type}/{$dir}/$file");
-		} else if(file_exists("connectors/{$type}/{$dir}/$file")) {
-			require_once("connectors/{$type}/{$dir}/$file");
-		}
-	}
+    /**
+     * include a source class file.
+     * @param string $class a class file to include.
+     */
+    public static function loadClass($class, $type){
+        $dir = str_replace('_','/',$class);
+        $parts = explode("/", $dir);
+        $file = $parts[count($parts)-1] . '.php';
+        if(file_exists("custom/modules/Connectors/connectors/{$type}/{$dir}/$file")){
+            require_once("custom/modules/Connectors/connectors/{$type}/{$dir}/$file");
+        } else if(file_exists("modules/Connectors/connectors/{$type}/{$dir}/$file")) {
+            require_once("modules/Connectors/connectors/{$type}/{$dir}/$file");
+        } else if(file_exists("connectors/{$type}/{$dir}/$file")) {
+            require_once("connectors/{$type}/{$dir}/$file");
+        }
+    }
 }
 ?>
\ No newline at end of file

include/MVC/View/SugarView.php

Indentation +135 added lines, -135 removed lines

@@ -125,11 +125,11 @@ 
 
         //For the ajaxUI, we need to use output buffering to return the page in an ajax friendly format
         if ($this->_getOption('json_output')){
-			ob_start();
-			if(!empty($_REQUEST['ajax_load']) && !empty($_REQUEST['loadLanguageJS'])) {
-				echo $this->_getModLanguageJS();
-			}
-		}
+            ob_start();
+            if(!empty($_REQUEST['ajax_load']) && !empty($_REQUEST['loadLanguageJS'])) {
+                echo $this->_getModLanguageJS();
+            }
+        }
 
         if ($this->_getOption('show_header')) {
             $this->displayHeader();
@@ -175,11 +175,11 @@ 
             $module = $this->module;
             $ajax_ret = array(
                 'content' => mb_detect_encoding($content) == "UTF-8" ? $content : utf8_encode($content),
-                 'menu' => array(
-                     'module' => $module,
-                     'label' => translate($module),
-                     $this->getMenu($module),
-                 ),
+                    'menu' => array(
+                        'module' => $module,
+                        'label' => translate($module),
+                        $this->getMenu($module),
+                    ),
                 'title' => $this->getBrowserTitle(),
                 'action' => isset($_REQUEST['action']) ? $_REQUEST['action'] : "",
                 'record' => isset($_REQUEST['record']) ? $_REQUEST['record'] : "",
@@ -422,10 +422,10 @@ 
                         "URL"   => current($attributevalue),
                         "SUBMENU" => array(),
                         );
-                   if(substr($gcls[$key]["URL"], 0, 11) == "javascript:") {
-                       $gcls[$key]["ONCLICK"] = substr($gcls[$key]["URL"],11);
-                       $gcls[$key]["URL"] = "javascript:void(0)";
-                   }
+                    if(substr($gcls[$key]["URL"], 0, 11) == "javascript:") {
+                        $gcls[$key]["ONCLICK"] = substr($gcls[$key]["URL"],11);
+                        $gcls[$key]["URL"] = "javascript:void(0)";
+                    }
                 }
                 // and now the sublinks
                 if ( $linkattribute == 'submenu' && is_array($attributevalue) ) {
@@ -434,10 +434,10 @@ 
                             "LABEL" => key($submenulinkinfo),
                             "URL"   => current($submenulinkinfo),
                         );
-                       if(substr($gcls[$key]['SUBMENU'][$submenulinkkey]["URL"], 0, 11) == "javascript:") {
-                           $gcls[$key]['SUBMENU'][$submenulinkkey]["ONCLICK"] = substr($gcls[$key]['SUBMENU'][$submenulinkkey]["URL"],11);
-                           $gcls[$key]['SUBMENU'][$submenulinkkey]["URL"] = "javascript:void(0)";
-                       }
+                        if(substr($gcls[$key]['SUBMENU'][$submenulinkkey]["URL"], 0, 11) == "javascript:") {
+                            $gcls[$key]['SUBMENU'][$submenulinkkey]["ONCLICK"] = substr($gcls[$key]['SUBMENU'][$submenulinkkey]["URL"],11);
+                            $gcls[$key]['SUBMENU'][$submenulinkkey]["URL"] = "javascript:void(0)";
+                        }
                 }
             }
         }
@@ -665,14 +665,14 @@ 
             $ss->assign("shortcutExtraMenu",$shortcutExtraMenu);
         }
        
-       if(!empty($current_user)){
-       	$ss->assign("max_tabs", $current_user->getPreference("max_tabs"));
-       } 
+        if(!empty($current_user)){
+            $ss->assign("max_tabs", $current_user->getPreference("max_tabs"));
+        } 
       
        
         $imageURL = SugarThemeRegistry::current()->getImageURL("dashboard.png");
         $homeImage = "<img src='$imageURL'>";
-		$ss->assign("homeImage",$homeImage);
+        $ss->assign("homeImage",$homeImage);
         global $mod_strings;
         $mod_strings = $bakModStrings;
         $headerTpl = $themeObject->getTemplate('header.tpl');
@@ -777,12 +777,12 @@ 
         list ($num_grp_sep, $dec_sep) = get_number_seperators();
 
         $the_script = "<script type=\"text/javascript\">\n" . "\tvar time_reg_format = '" .
-             $timereg['format'] . "';\n" . "\tvar date_reg_format = '" .
-             $datereg['format'] . "';\n" . "\tvar date_reg_positions = { $date_pos };\n" .
-             "\tvar time_separator = '$time_separator';\n" .
-             "\tvar cal_date_format = '$cal_date_format';\n" .
-             "\tvar time_offset = $hour_offset;\n" . "\tvar num_grp_sep = '$num_grp_sep';\n" .
-             "\tvar dec_sep = '$dec_sep';\n" . "</script>";
+                $timereg['format'] . "';\n" . "\tvar date_reg_format = '" .
+                $datereg['format'] . "';\n" . "\tvar date_reg_positions = { $date_pos };\n" .
+                "\tvar time_separator = '$time_separator';\n" .
+                "\tvar cal_date_format = '$cal_date_format';\n" .
+                "\tvar time_offset = $hour_offset;\n" . "\tvar num_grp_sep = '$num_grp_sep';\n" .
+                "\tvar dec_sep = '$dec_sep';\n" . "</script>";
 
         return $the_script;
     }
@@ -847,7 +847,7 @@ 
             }
             echo getVersionedScript('cache/jsLanguage/'. $GLOBALS['current_language'] . '.js', $GLOBALS['sugar_config']['js_lang_version']);
 
-			echo $this->_getModLanguageJS();
+            echo $this->_getModLanguageJS();
 
             if(isset( $sugar_config['disc_client']) && $sugar_config['disc_client'])
                 echo getVersionedScript('modules/Sync/headersync.js');
@@ -863,13 +863,13 @@ 
         }
     }
 
-	protected function _getModLanguageJS(){
-		if (!is_file(sugar_cached('jsLanguage/') . $this->module . '/' . $GLOBALS['current_language'] . '.js')) {
-			require_once ('include/language/jsLanguage.php');
-			jsLanguage::createModuleStringsCache($this->module, $GLOBALS['current_language']);
-		}
-		return getVersionedScript("cache/jsLanguage/{$this->module}/". $GLOBALS['current_language'] . '.js', $GLOBALS['sugar_config']['js_lang_version']);
-	}
+    protected function _getModLanguageJS(){
+        if (!is_file(sugar_cached('jsLanguage/') . $this->module . '/' . $GLOBALS['current_language'] . '.js')) {
+            require_once ('include/language/jsLanguage.php');
+            jsLanguage::createModuleStringsCache($this->module, $GLOBALS['current_language']);
+        }
+        return getVersionedScript("cache/jsLanguage/{$this->module}/". $GLOBALS['current_language'] . '.js', $GLOBALS['sugar_config']['js_lang_version']);
+    }
 
     /**
      * Called from process(). This method will display the footer on the page.
@@ -882,7 +882,7 @@ 
         global $sugar_config;
         global $app_strings;
         global $mod_strings;
-		$themeObject = SugarThemeRegistry::current();
+        $themeObject = SugarThemeRegistry::current();
         //decide whether or not to show themepicker, default is to show
         $showThemePicker = true;
         if (isset($sugar_config['showThemePicker'])) {
@@ -893,30 +893,30 @@ 
         $ss->assign("AUTHENTICATED",isset($_SESSION["authenticated_user_id"]));
         $ss->assign('MOD',return_module_language($GLOBALS['current_language'], 'Users'));
 
-		$bottomLinkList = array();
-		 if (isset($this->action) && $this->action != "EditView") {
-			 $bottomLinkList['print'] = array($app_strings['LNK_PRINT'] => getPrintLink());
-		}
-		$bottomLinkList['backtotop'] = array($app_strings['LNK_BACKTOTOP'] => 'javascript:SUGAR.util.top();');
-
-		$bottomLinksStr = "";
-		foreach($bottomLinkList as $key => $value) {
-			foreach($value as $text => $link) {
-				   $href = $link;
-				   if(substr($link, 0, 11) == "javascript:") {
-                       $onclick = " onclick=\"".substr($link,11)."\"";
-                       $href = "javascript:void(0)";
-                   } else {
-                   		$onclick = "";
-                   	}
+        $bottomLinkList = array();
+            if (isset($this->action) && $this->action != "EditView") {
+                $bottomLinkList['print'] = array($app_strings['LNK_PRINT'] => getPrintLink());
+        }
+        $bottomLinkList['backtotop'] = array($app_strings['LNK_BACKTOTOP'] => 'javascript:SUGAR.util.top();');
+
+        $bottomLinksStr = "";
+        foreach($bottomLinkList as $key => $value) {
+            foreach($value as $text => $link) {
+                    $href = $link;
+                    if(substr($link, 0, 11) == "javascript:") {
+                        $onclick = " onclick=\"".substr($link,11)."\"";
+                        $href = "javascript:void(0)";
+                    } else {
+                            $onclick = "";
+                        }
                 $imageURL = SugarThemeRegistry::current()->getImageURL($key.'.gif');
-				$bottomLinksStr .= "<a href=\"{$href}\"";
-				$bottomLinksStr .= (isset($onclick)) ? $onclick : "";
-				$bottomLinksStr .= "><img src='{$imageURL}' alt=''>"; //keeping alt blank on purpose for 508 (text will be read instead)
-				$bottomLinksStr .= " ".$text."</a>";
-			}
-		}
-		$ss->assign("BOTTOMLINKS",$bottomLinksStr);
+                $bottomLinksStr .= "<a href=\"{$href}\"";
+                $bottomLinksStr .= (isset($onclick)) ? $onclick : "";
+                $bottomLinksStr .= "><img src='{$imageURL}' alt=''>"; //keeping alt blank on purpose for 508 (text will be read instead)
+                $bottomLinksStr .= " ".$text."</a>";
+            }
+        }
+        $ss->assign("BOTTOMLINKS",$bottomLinksStr);
         if (SugarConfig::getInstance()->get('calculate_response_time', false))
             $ss->assign('STATISTICS',$this->_getStatistics());
 
@@ -946,7 +946,7 @@ 
         $attribLinkImg = "<img style='margin-top: 2px' border='0' width='120' height='34' src='include/images/poweredby_sugarcrm_65.png' alt='Powered By SugarCRM'>\n";
 
 
-		// handle resizing of the company logo correctly on the fly
+        // handle resizing of the company logo correctly on the fly
         $companyLogoURL = $themeObject->getImageURL('company_logo.png');
         $companyLogoURL_arr = explode('?', $companyLogoURL);
         $companyLogoURL = $companyLogoURL_arr[0];
@@ -1069,7 +1069,7 @@ 
 
 
         $trackerManager = TrackerManager::getInstance();
-	    $trackerManager->save();
+        $trackerManager->save();
 
     }
 
@@ -1109,7 +1109,7 @@ 
         $deltaTime = $endTime - $GLOBALS['startTime'];
         $response_time_string = $GLOBALS['app_strings']['LBL_SERVER_RESPONSE_TIME'] . ' ' . number_format(round($deltaTime, 2), 2) . ' ' . $GLOBALS['app_strings']['LBL_SERVER_RESPONSE_TIME_SECONDS'];
         $return = $response_time_string;
-       // $return .= '<br />';
+        // $return .= '<br />';
         if (!empty($GLOBALS['sugar_config']['show_page_resources'])) {
             // Print out the resources used in constructing the page.
             $included_files = get_included_files();
@@ -1170,8 +1170,8 @@ 
             {
                 $data = array
                 (
-                   !empty($this->module) ? $this->module : $GLOBALS['app_strings']['LBL_LINK_NONE'],
-                   !empty($this->action) ? $this->action : $GLOBALS['app_strings']['LBL_LINK_NONE'],
+                    !empty($this->module) ? $this->module : $GLOBALS['app_strings']['LBL_LINK_NONE'],
+                    !empty($this->action) ? $this->action : $GLOBALS['app_strings']['LBL_LINK_NONE'],
                 );
 
                 $output = string_format($GLOBALS['app_strings']['LBL_SERVER_MEMORY_LOG_MESSAGE'], $data) . $newline;
@@ -1240,15 +1240,15 @@ 
     }
 
     /**
-    * Returns the module name which should be highlighted in the module menu
+     * Returns the module name which should be highlighted in the module menu
      */
     protected function _getModuleTab()
     {
         global $app_list_strings, $moduleTabMap, $current_user;
 
-		$userTabs = query_module_access_list($current_user);
-		//If the home tab is in the user array use it as the default tab, otherwise use the first element in the tab array
-		$defaultTab = (in_array("Home",$userTabs)) ? "Home" : key($userTabs);
+        $userTabs = query_module_access_list($current_user);
+        //If the home tab is in the user array use it as the default tab, otherwise use the first element in the tab array
+        $defaultTab = (in_array("Home",$userTabs)) ? "Home" : key($userTabs);
 		
         // Need to figure out what tab this module belongs to, most modules have their own tabs, but there are exceptions.
         if ( !empty($_REQUEST['module_tab']) )
@@ -1264,17 +1264,17 @@ 
         elseif ( !isset($app_list_strings['moduleList'][$this->module]) )
             return $defaultTab;
         elseif ( isset($_REQUEST['action']) && $_REQUEST['action'] == "ajaxui" )
-        	return $defaultTab;
+            return $defaultTab;
         else
             return $this->module;
     }
 
-   /**
-    * Return the "breadcrumbs" to display at the top of the page
-    *
-    * @param  bool $show_help optional, true if we show the help links
-    * @return HTML string containing breadcrumb title
-    */
+    /**
+     * Return the "breadcrumbs" to display at the top of the page
+     *
+     * @param  bool $show_help optional, true if we show the help links
+     * @return HTML string containing breadcrumb title
+     */
     public function getModuleTitle(
         $show_help = true
         )
@@ -1288,13 +1288,13 @@ 
         $params = $this->_getModuleTitleParams();
         $index = 0;
 
-		if(SugarThemeRegistry::current()->directionality == "rtl") {
-			$params = array_reverse($params);
-		}
-		if(count($params) > 1) {
-			array_shift($params);
-		}
-		$count = count($params);
+        if(SugarThemeRegistry::current()->directionality == "rtl") {
+            $params = array_reverse($params);
+        }
+        if(count($params) > 1) {
+            array_shift($params);
+        }
+        $count = count($params);
         $paramString = '';
         foreach($params as $parm){
             $index++;
@@ -1305,13 +1305,13 @@ 
         }
 
         if(!empty($paramString)){
-               $theTitle .= "<h2> $paramString </h2>";
+                $theTitle .= "<h2> $paramString </h2>";
 
             if($this->type == "detail"){
                 $theTitle .= "<div class='favorite' record_id='" . $this->bean->id . "' module='" . $this->bean->module_dir . "'><div class='favorite_icon_outline'>" . SugarThemeRegistry::current()->getImage('favorite-star-outline','title="' . translate('LBL_DASHLET_EDIT', 'Home') . '" border="0"  align="absmiddle"', null,null,'.gif',translate('LBL_DASHLET_EDIT', 'Home')) . "</div>
                                                     <div class='favorite_icon_fill'>" . SugarThemeRegistry::current()->getImage('favorite-star','title="' . translate('LBL_DASHLET_EDIT', 'Home') . '" border="0"  align="absmiddle"', null,null,'.gif',translate('LBL_DASHLET_EDIT', 'Home')) . "</div></div>";
             }
-           }
+            }
 
         // bug 56131 - restore conditional so that link doesn't appear where it shouldn't
         if($show_help || $this->type == 'list') {
@@ -1384,7 +1384,7 @@ 
     protected function _getModuleTitleParams($browserTitle = false)
     {
         $params = array($this->_getModuleTitleListParam($browserTitle));
-		//$params = array();
+        //$params = array();
         if (isset($this->action)){
             switch ($this->action) {
             case 'EditView':
@@ -1414,48 +1414,48 @@ 
      */
     protected function _getModuleTitleListParam( $browserTitle = false )
     {
-    	global $current_user;
-    	global $app_strings;
-
-    	if(!empty($GLOBALS['app_list_strings']['moduleList'][$this->module]))
-    		$firstParam = $GLOBALS['app_list_strings']['moduleList'][$this->module];
-    	else
-    		$firstParam = $this->module;
-
-    	$iconPath = $this->getModuleTitleIconPath($this->module);
-    	if($this->action == "ListView" || $this->action == "index") {
-    	    if (!empty($iconPath) && !$browserTitle) {
-    	    	if (SugarThemeRegistry::current()->directionality == "ltr") {
-    	    		return $app_strings['LBL_SEARCH']."&nbsp;"
-    	    			 . "$firstParam";
-
-    	    	} else {
-					return "$firstParam"
-					     . "&nbsp;".$app_strings['LBL_SEARCH'];
-    	    	}
-			} else {
-				return $firstParam;
-			}
-    	}
-    	else {
-		    if (!empty($iconPath) && !$browserTitle) {
-				//return "<a href='index.php?module={$this->module}&action=index'>$this->module</a>";
-			} else {
-				return $firstParam;
-			}
-    	}
+        global $current_user;
+        global $app_strings;
+
+        if(!empty($GLOBALS['app_list_strings']['moduleList'][$this->module]))
+            $firstParam = $GLOBALS['app_list_strings']['moduleList'][$this->module];
+        else
+            $firstParam = $this->module;
+
+        $iconPath = $this->getModuleTitleIconPath($this->module);
+        if($this->action == "ListView" || $this->action == "index") {
+            if (!empty($iconPath) && !$browserTitle) {
+                if (SugarThemeRegistry::current()->directionality == "ltr") {
+                    return $app_strings['LBL_SEARCH']."&nbsp;"
+                            . "$firstParam";
+
+                } else {
+                    return "$firstParam"
+                            . "&nbsp;".$app_strings['LBL_SEARCH'];
+                }
+            } else {
+                return $firstParam;
+            }
+        }
+        else {
+            if (!empty($iconPath) && !$browserTitle) {
+                //return "<a href='index.php?module={$this->module}&action=index'>$this->module</a>";
+            } else {
+                return $firstParam;
+            }
+        }
     }
 
     protected function getModuleTitleIconPath($module)
     {
-    	$iconPath = "";
-    	if(is_file(SugarThemeRegistry::current()->getImageURL('icon_'.$module.'_32.png',false))) {
-    		$iconPath = SugarThemeRegistry::current()->getImageURL('icon_'.$module.'_32.png');
-    	}
-    	else if (is_file(SugarThemeRegistry::current()->getImageURL('icon_'.ucfirst($module).'_32.png',false))) {
-    		$iconPath = SugarThemeRegistry::current()->getImageURL('icon_'.ucfirst($module).'_32.png');
-    	}
-    	return $iconPath;
+        $iconPath = "";
+        if(is_file(SugarThemeRegistry::current()->getImageURL('icon_'.$module.'_32.png',false))) {
+            $iconPath = SugarThemeRegistry::current()->getImageURL('icon_'.$module.'_32.png');
+        }
+        else if (is_file(SugarThemeRegistry::current()->getImageURL('icon_'.ucfirst($module).'_32.png',false))) {
+            $iconPath = SugarThemeRegistry::current()->getImageURL('icon_'.ucfirst($module).'_32.png');
+        }
+        return $iconPath;
     }
 
     /**
@@ -1485,11 +1485,11 @@ 
      */
     public function getBreadCrumbSymbol()
     {
-    	if(SugarThemeRegistry::current()->directionality == "ltr") {
-        	return "<span class='pointer'>&raquo;</span>";
+        if(SugarThemeRegistry::current()->directionality == "ltr") {
+            return "<span class='pointer'>&raquo;</span>";
         }
         else {
-        	return "<span class='pointer'>&laquo;</span>";
+            return "<span class='pointer'>&laquo;</span>";
         }
     }
 
@@ -1658,20 +1658,20 @@ 
     }
 
     /**
-	 * Determines whether the state of the post global array indicates there was an error uploading a
+     * Determines whether the state of the post global array indicates there was an error uploading a
      * file that exceeds the post_max_size setting.  Such an error can be detected if:
      *  1. The Server['REQUEST_METHOD'] will still point to POST
      *  2. POST and FILES global arrays will be returned empty despite the request method
      * This also results in a redirect to the home page (due to lack of module and action in POST)
      *
-	 * @return boolean indicating true or false
-	 */
+     * @return boolean indicating true or false
+     */
     public function checkPostMaxSizeError(){
-         //if the referrer is post, and the post array is empty, then an error has occurred, most likely
-         //while uploading a file that exceeds the post_max_size.
-         if(empty($_FILES) && empty($_POST) && isset($_SERVER['REQUEST_METHOD']) && strtolower($_SERVER['REQUEST_METHOD']) == 'post'){
-             $GLOBALS['log']->fatal($GLOBALS['app_strings']['UPLOAD_ERROR_HOME_TEXT']);
-             return true;
+            //if the referrer is post, and the post array is empty, then an error has occurred, most likely
+            //while uploading a file that exceeds the post_max_size.
+            if(empty($_FILES) && empty($_POST) && isset($_SERVER['REQUEST_METHOD']) && strtolower($_SERVER['REQUEST_METHOD']) == 'post'){
+                $GLOBALS['log']->fatal($GLOBALS['app_strings']['UPLOAD_ERROR_HOME_TEXT']);
+                return true;
         }
         return false;
     }

include/MVC/Controller/ControllerFactory.php

Indentation +37 added lines, -37 removed lines

@@ -44,43 +44,43 @@
  */
 class ControllerFactory
 {
-	/**
-	 * Obtain an instance of the correct controller.
-	 *
-	 * @return an instance of SugarController
-	 */
-	static function getController($module){
-		$class = ucfirst($module).'Controller';
-		$customClass = 'Custom' . $class;
-		if(file_exists('custom/modules/'.$module.'/controller.php')){
-			$customClass = 'Custom' . $class;
-			require_once('custom/modules/'.$module.'/controller.php');
-			if(class_exists($customClass)){
-				$controller = new $customClass();
-			}else if(class_exists($class)){
-				$controller = new $class();
-			}
-		}elseif(file_exists('modules/'.$module.'/controller.php')){
-			require_once('modules/'.$module.'/controller.php');
-			if(class_exists($customClass)){
-				$controller = new $customClass();
-			}else if(class_exists($class)){
-				$controller = new $class();
-			}
-		}else{
-			if(file_exists('custom/include/MVC/Controller/SugarController.php')){
-				require_once('custom/include/MVC/Controller/SugarController.php');
-			}
-			if(class_exists('CustomSugarController')){
-				$controller = new CustomSugarController();
-			}else{
-			$controller = new SugarController();
-			}
-		}
-		//setup the controller
-		$controller->setup($module);
-		return $controller;
-	}
+    /**
+     * Obtain an instance of the correct controller.
+     *
+     * @return an instance of SugarController
+     */
+    static function getController($module){
+        $class = ucfirst($module).'Controller';
+        $customClass = 'Custom' . $class;
+        if(file_exists('custom/modules/'.$module.'/controller.php')){
+            $customClass = 'Custom' . $class;
+            require_once('custom/modules/'.$module.'/controller.php');
+            if(class_exists($customClass)){
+                $controller = new $customClass();
+            }else if(class_exists($class)){
+                $controller = new $class();
+            }
+        }elseif(file_exists('modules/'.$module.'/controller.php')){
+            require_once('modules/'.$module.'/controller.php');
+            if(class_exists($customClass)){
+                $controller = new $customClass();
+            }else if(class_exists($class)){
+                $controller = new $class();
+            }
+        }else{
+            if(file_exists('custom/include/MVC/Controller/SugarController.php')){
+                require_once('custom/include/MVC/Controller/SugarController.php');
+            }
+            if(class_exists('CustomSugarController')){
+                $controller = new CustomSugarController();
+            }else{
+            $controller = new SugarController();
+            }
+        }
+        //setup the controller
+        $controller->setup($module);
+        return $controller;
+    }
 
 }
 ?>
\ No newline at end of file

include/MVC/Controller/SugarController.php

Indentation +678 added lines, -678 removed lines

@@ -44,247 +44,247 @@ 
  * @api
  */
 class SugarController{
-	/**
-	 * remap actions in here
-	 * e.g. make all detail views go to edit views
-	 * $action_remap = array('detailview'=>'editview');
-	 */
-	protected $action_remap = array('index'=>'listview');
-	/**
-	 * The name of the current module.
-	 */
-	public $module = 'Home';
-	/**
-	 * The name of the target module.
-	 */
-	public $target_module = null;
-	/**
-	 * The name of the current action.
-	 */
-	public $action = 'index';
-	/**
-	 * The id of the current record.
-	 */
-	public $record = '';
-	/**
-	 * The name of the return module.
-	 */
-	public $return_module = null;
-	/**
-	 * The name of the return action.
-	 */
-	public $return_action = null;
-	/**
-	 * The id of the return record.
-	 */
-	public $return_id = null;
-	/**
-	 * If the action was remapped it will be set to do_action and then we will just
-	 * use do_action for the actual action to perform.
-	 */
-	protected $do_action = 'index';
-	/**
-	 * If a bean is present that set it.
-	 */
-	public $bean = null;
-	/**
-	 * url to redirect to
-	 */
-	public $redirect_url = '';
-	/**
-	 * any subcontroller can modify this to change the view
-	 */
-	public $view = 'classic';
-	/**
-	 * this array will hold the mappings between a key and an object for use within the view.
-	 */
-	public $view_object_map = array();
+    /**
+     * remap actions in here
+     * e.g. make all detail views go to edit views
+     * $action_remap = array('detailview'=>'editview');
+     */
+    protected $action_remap = array('index'=>'listview');
+    /**
+     * The name of the current module.
+     */
+    public $module = 'Home';
+    /**
+     * The name of the target module.
+     */
+    public $target_module = null;
+    /**
+     * The name of the current action.
+     */
+    public $action = 'index';
+    /**
+     * The id of the current record.
+     */
+    public $record = '';
+    /**
+     * The name of the return module.
+     */
+    public $return_module = null;
+    /**
+     * The name of the return action.
+     */
+    public $return_action = null;
+    /**
+     * The id of the return record.
+     */
+    public $return_id = null;
+    /**
+     * If the action was remapped it will be set to do_action and then we will just
+     * use do_action for the actual action to perform.
+     */
+    protected $do_action = 'index';
+    /**
+     * If a bean is present that set it.
+     */
+    public $bean = null;
+    /**
+     * url to redirect to
+     */
+    public $redirect_url = '';
+    /**
+     * any subcontroller can modify this to change the view
+     */
+    public $view = 'classic';
+    /**
+     * this array will hold the mappings between a key and an object for use within the view.
+     */
+    public $view_object_map = array();
 
-	/**
-	 * This array holds the methods that handleAction() will invoke, in sequence.
-	 */
-	protected $tasks = array(
-					   'pre_action',
-					   'do_action',
-					   'post_action'
-					   );
-	/**
-	 * List of options to run through within the process() method.
-	 * This list is meant to easily allow additions for new functionality as well as
-	 * the ability to add a controller's own handling.
-	 */
-	public $process_tasks = array(
-						'blockFileAccess',
-						'handleEntryPoint',
-						'callLegacyCode',
-						'remapAction',
-						'handle_action',
-						'handleActionMaps',
-					);
-	/**
-	 * Whether or not the action has been handled by $process_tasks
-	 *
-	 * @var bool
-	 */
-	protected $_processed = false;
-	/**
-	 * Map an action directly to a file
-	 */
-	/**
-	 * Map an action directly to a file. This will be loaded from action_file_map.php
-	 */
-	protected $action_file_map = array();
-	/**
-	 * Map an action directly to a view
-	 */
-	/**
-	 * Map an action directly to a view. This will be loaded from action_view_map.php
-	 */
-	protected $action_view_map = array();
+    /**
+     * This array holds the methods that handleAction() will invoke, in sequence.
+     */
+    protected $tasks = array(
+                        'pre_action',
+                        'do_action',
+                        'post_action'
+                        );
+    /**
+     * List of options to run through within the process() method.
+     * This list is meant to easily allow additions for new functionality as well as
+     * the ability to add a controller's own handling.
+     */
+    public $process_tasks = array(
+                        'blockFileAccess',
+                        'handleEntryPoint',
+                        'callLegacyCode',
+                        'remapAction',
+                        'handle_action',
+                        'handleActionMaps',
+                    );
+    /**
+     * Whether or not the action has been handled by $process_tasks
+     *
+     * @var bool
+     */
+    protected $_processed = false;
+    /**
+     * Map an action directly to a file
+     */
+    /**
+     * Map an action directly to a file. This will be loaded from action_file_map.php
+     */
+    protected $action_file_map = array();
+    /**
+     * Map an action directly to a view
+     */
+    /**
+     * Map an action directly to a view. This will be loaded from action_view_map.php
+     */
+    protected $action_view_map = array();
 
-	/**
-	 * This can be set from the application to tell us whether we have authorization to
-	 * process the action. If this is set we will default to the noaccess view.
-	 */
-	public $hasAccess = true;
+    /**
+     * This can be set from the application to tell us whether we have authorization to
+     * process the action. If this is set we will default to the noaccess view.
+     */
+    public $hasAccess = true;
 
-	/**
-	 * Map case sensitive filenames to action.  This is used for linux/unix systems
-	 * where filenames are case sensitive
-	 */
-	public static $action_case_file = array(
-										'editview'=>'EditView',
-										'detailview'=>'DetailView',
-										'listview'=>'ListView'
-									  );
-
-	/**
-	 * Constructor. This ie meant tot load up the module, action, record as well
-	 * as the mapping arrays.
-	 */
-	function SugarController(){
-	}
+    /**
+     * Map case sensitive filenames to action.  This is used for linux/unix systems
+     * where filenames are case sensitive
+     */
+    public static $action_case_file = array(
+                                        'editview'=>'EditView',
+                                        'detailview'=>'DetailView',
+                                        'listview'=>'ListView'
+                                        );
 
-	/**
-	 * Called from SugarApplication and is meant to perform the setup operations
-	 * on the controller.
-	 *
-	 */
-	public function setup($module = ''){
-		if(empty($module) && !empty($_REQUEST['module']))
-			$module = $_REQUEST['module'];
-		//set the module
-		if(!empty($module))
-			$this->setModule($module);
-
-		if(!empty($_REQUEST['target_module']) && $_REQUEST['target_module'] != 'undefined') {
-			$this->target_module = $_REQUEST['target_module'];
-		}
-		//set properties on the controller from the $_REQUEST
-		$this->loadPropertiesFromRequest();
-		//load the mapping files
-		$this->loadMappings();
-	}
-	/**
-	 * Set the module on the Controller
-	 *
-	 * @param object $module
-	 */
-	public function setModule($module){
-		$this->module = $module;
-	}
+    /**
+     * Constructor. This ie meant tot load up the module, action, record as well
+     * as the mapping arrays.
+     */
+    function SugarController(){
+    }
 
-	/**
-	 * Set properties on the Controller from the $_REQUEST
-	 *
-	 */
-	private function loadPropertiesFromRequest(){
-		if(!empty($_REQUEST['action']))
-			$this->action = $_REQUEST['action'];
-		if(!empty($_REQUEST['record']))
-			$this->record = $_REQUEST['record'];
-		if(!empty($_REQUEST['view']))
-			$this->view = $_REQUEST['view'];
-		if(!empty($_REQUEST['return_module']))
-			$this->return_module = $_REQUEST['return_module'];
-		if(!empty($_REQUEST['return_action']))
-			$this->return_action = $_REQUEST['return_action'];
-		if(!empty($_REQUEST['return_id']))
-			$this->return_id = $_REQUEST['return_id'];
-	}
+    /**
+     * Called from SugarApplication and is meant to perform the setup operations
+     * on the controller.
+     *
+     */
+    public function setup($module = ''){
+        if(empty($module) && !empty($_REQUEST['module']))
+            $module = $_REQUEST['module'];
+        //set the module
+        if(!empty($module))
+            $this->setModule($module);
+
+        if(!empty($_REQUEST['target_module']) && $_REQUEST['target_module'] != 'undefined') {
+            $this->target_module = $_REQUEST['target_module'];
+        }
+        //set properties on the controller from the $_REQUEST
+        $this->loadPropertiesFromRequest();
+        //load the mapping files
+        $this->loadMappings();
+    }
+    /**
+     * Set the module on the Controller
+     *
+     * @param object $module
+     */
+    public function setModule($module){
+        $this->module = $module;
+    }
 
-	/**
-	 * Load map files for use within the Controller
-	 *
-	 */
-	private function loadMappings(){
-		$this->loadMapping('action_view_map');
-		$this->loadMapping('action_file_map');
-		$this->loadMapping('action_remap', true);
-	}
+    /**
+     * Set properties on the Controller from the $_REQUEST
+     *
+     */
+    private function loadPropertiesFromRequest(){
+        if(!empty($_REQUEST['action']))
+            $this->action = $_REQUEST['action'];
+        if(!empty($_REQUEST['record']))
+            $this->record = $_REQUEST['record'];
+        if(!empty($_REQUEST['view']))
+            $this->view = $_REQUEST['view'];
+        if(!empty($_REQUEST['return_module']))
+            $this->return_module = $_REQUEST['return_module'];
+        if(!empty($_REQUEST['return_action']))
+            $this->return_action = $_REQUEST['return_action'];
+        if(!empty($_REQUEST['return_id']))
+            $this->return_id = $_REQUEST['return_id'];
+    }
 
-	/**
-	 * Given a record id load the bean. This bean is accessible from any sub controllers.
-	 */
-	public function loadBean()
-	{
-		if(!empty($GLOBALS['beanList'][$this->module])){
-			$class = $GLOBALS['beanList'][$this->module];
-			if(!empty($GLOBALS['beanFiles'][$class])){
-				require_once($GLOBALS['beanFiles'][$class]);
-				$this->bean = new $class();
-				if(!empty($this->record)){
-					$this->bean->retrieve($this->record);
-					if($this->bean)
-						$GLOBALS['FOCUS'] = $this->bean;
-				}
-			}
-		}
-	}
+    /**
+     * Load map files for use within the Controller
+     *
+     */
+    private function loadMappings(){
+        $this->loadMapping('action_view_map');
+        $this->loadMapping('action_file_map');
+        $this->loadMapping('action_remap', true);
+    }
 
-	/**
-	 * Generic load method to load mapping arrays.
-	 */
-	private function loadMapping($var, $merge = false){
-		$$var = sugar_cache_retrieve("CONTROLLER_". $var . "_".$this->module);
-		if(!$$var){
-			if($merge && !empty($this->$var)){
-				$$var = $this->$var;
-			}else{
-				$$var = array();
-			}
-			if(file_exists('include/MVC/Controller/'. $var . '.php')){
-				require('include/MVC/Controller/'. $var . '.php');
-			}
-			if(file_exists('modules/'.$this->module.'/'. $var . '.php')){
-				require('modules/'.$this->module.'/'. $var . '.php');
-			}
-			if(file_exists('custom/modules/'.$this->module.'/'. $var . '.php')){
-				require('custom/modules/'.$this->module.'/'. $var . '.php');
-			}
-			if(file_exists('custom/include/MVC/Controller/'. $var . '.php')){
-				require('custom/include/MVC/Controller/'. $var . '.php');
-			}
+    /**
+     * Given a record id load the bean. This bean is accessible from any sub controllers.
+     */
+    public function loadBean()
+    {
+        if(!empty($GLOBALS['beanList'][$this->module])){
+            $class = $GLOBALS['beanList'][$this->module];
+            if(!empty($GLOBALS['beanFiles'][$class])){
+                require_once($GLOBALS['beanFiles'][$class]);
+                $this->bean = new $class();
+                if(!empty($this->record)){
+                    $this->bean->retrieve($this->record);
+                    if($this->bean)
+                        $GLOBALS['FOCUS'] = $this->bean;
+                }
+            }
+        }
+    }
+
+    /**
+     * Generic load method to load mapping arrays.
+     */
+    private function loadMapping($var, $merge = false){
+        $$var = sugar_cache_retrieve("CONTROLLER_". $var . "_".$this->module);
+        if(!$$var){
+            if($merge && !empty($this->$var)){
+                $$var = $this->$var;
+            }else{
+                $$var = array();
+            }
+            if(file_exists('include/MVC/Controller/'. $var . '.php')){
+                require('include/MVC/Controller/'. $var . '.php');
+            }
+            if(file_exists('modules/'.$this->module.'/'. $var . '.php')){
+                require('modules/'.$this->module.'/'. $var . '.php');
+            }
+            if(file_exists('custom/modules/'.$this->module.'/'. $var . '.php')){
+                require('custom/modules/'.$this->module.'/'. $var . '.php');
+            }
+            if(file_exists('custom/include/MVC/Controller/'. $var . '.php')){
+                require('custom/include/MVC/Controller/'. $var . '.php');
+            }
 
             // entry_point_registry -> EntryPointRegistry
 
-			$varname = str_replace(" ","",ucwords(str_replace("_"," ", $var)));
+            $varname = str_replace(" ","",ucwords(str_replace("_"," ", $var)));
             if(file_exists("custom/application/Ext/$varname/$var.ext.php")){
-				require("custom/application/Ext/$varname/$var.ext.php");
-	        }
-			if(file_exists("custom/modules/{$this->module}/Ext/$varname/$var.ext.php")){
-				require("custom/modules/{$this->module}/Ext/$varname/$var.ext.php");
-			}
-
-			sugar_cache_put("CONTROLLER_". $var . "_".$this->module, $$var);
-		}
-		$this->$var = $$var;
-	}
+                require("custom/application/Ext/$varname/$var.ext.php");
+            }
+            if(file_exists("custom/modules/{$this->module}/Ext/$varname/$var.ext.php")){
+                require("custom/modules/{$this->module}/Ext/$varname/$var.ext.php");
+            }
 
-	/**
-	 * This method is called from SugarApplication->execute and it will bootstrap the entire controller process
-	 */
-	final public function execute()
+            sugar_cache_put("CONTROLLER_". $var . "_".$this->module, $$var);
+        }
+        $this->$var = $$var;
+    }
+
+    /**
+     * This method is called from SugarApplication->execute and it will bootstrap the entire controller process
+     */
+    final public function execute()
     {
 
         try
@@ -296,7 +296,7 @@ 
             }
             elseif(!empty($this->redirect_url))
             {
-            			$this->redirect();
+                        $this->redirect();
             }
         }
         catch (Exception $e)
@@ -306,12 +306,12 @@ 
 
 
 
-	}
+    }
 
     /**
-      * Handle exception
-      * @param Exception $e
-      */
+     * Handle exception
+     * @param Exception $e
+     */
     protected function handleException(Exception $e)
     {
         $GLOBALS['log']->fatal('Exception in Controller: ' . $e->getMessage());
@@ -328,52 +328,52 @@ 
         }
     }
 
-	/**
-	 * Display the appropriate view.
-	 */
-	private function processView(){
-		if(!isset($this->view_object_map['remap_action']) && isset($this->action_view_map[strtolower($this->action)]))
-		{
-		  $this->view_object_map['remap_action'] = $this->action_view_map[strtolower($this->action)];
-		}
-		$view = ViewFactory::loadView($this->view, $this->module, $this->bean, $this->view_object_map, $this->target_module);
-		$GLOBALS['current_view'] = $view;
-		if(!empty($this->bean) && !$this->bean->ACLAccess($view->type) && $view->type != 'list'){
-			ACLController::displayNoAccess(true);
-			sugar_cleanup(true);
-		}
-		if(isset($this->errors)){
-		  $view->errors = $this->errors;
-		}
-		$view->process();
-	}
+    /**
+     * Display the appropriate view.
+     */
+    private function processView(){
+        if(!isset($this->view_object_map['remap_action']) && isset($this->action_view_map[strtolower($this->action)]))
+        {
+            $this->view_object_map['remap_action'] = $this->action_view_map[strtolower($this->action)];
+        }
+        $view = ViewFactory::loadView($this->view, $this->module, $this->bean, $this->view_object_map, $this->target_module);
+        $GLOBALS['current_view'] = $view;
+        if(!empty($this->bean) && !$this->bean->ACLAccess($view->type) && $view->type != 'list'){
+            ACLController::displayNoAccess(true);
+            sugar_cleanup(true);
+        }
+        if(isset($this->errors)){
+            $view->errors = $this->errors;
+        }
+        $view->process();
+    }
 
-	/**
-	 * Meant to be overridden by a subclass and allows for specific functionality to be
-	 * injected prior to the process() method being called.
-	 */
-	public function preProcess()
-	{}
-
-	/**
-	 * if we have a function to support the action use it otherwise use the default action
-	 *
-	 * 1) check for file
-	 * 2) check for action
-	 */
-	public function process(){
-		$GLOBALS['action'] = $this->action;
-		$GLOBALS['module'] = $this->module;
+    /**
+     * Meant to be overridden by a subclass and allows for specific functionality to be
+     * injected prior to the process() method being called.
+     */
+    public function preProcess()
+    {}
 
-		//check to ensure we have access to the module.
-		if($this->hasAccess){
-			$this->do_action = $this->action;
+    /**
+     * if we have a function to support the action use it otherwise use the default action
+     *
+     * 1) check for file
+     * 2) check for action
+     */
+    public function process(){
+        $GLOBALS['action'] = $this->action;
+        $GLOBALS['module'] = $this->module;
 
-			$file = self::getActionFilename($this->do_action);
+        //check to ensure we have access to the module.
+        if($this->hasAccess){
+            $this->do_action = $this->action;
 
-			$this->loadBean();
+            $file = self::getActionFilename($this->do_action);
 
-			$processed = false;
+            $this->loadBean();
+
+            $processed = false;
             if (!$this->_processed) {
                 foreach ($this->process_tasks as $process) {
                     $this->$process();
@@ -383,173 +383,173 @@ 
                 }
             }
 
-			$this->redirect();
-		}else{
-			$this->no_access();
-		}
-	}
+            $this->redirect();
+        }else{
+            $this->no_access();
+        }
+    }
 
-	/**
-	 * This method is called from the process method. I could also be called within an action_* method.
-	 * It allows a developer to override any one of these methods contained within,
-	 * or if the developer so chooses they can override the entire action_* method.
-	 *
-	 * @return true if any one of the pre_, do_, or post_ methods have been defined,
-	 * false otherwise.  This is important b/c if none of these methods exists, then we will run the
-	 * action_default() method.
-	 */
-	protected function handle_action(){
-		$processed = false;
-		foreach($this->tasks as $task){
-			$processed = ($this->$task() || $processed);
-		}
-		$this->_processed = $processed;
-	}
+    /**
+     * This method is called from the process method. I could also be called within an action_* method.
+     * It allows a developer to override any one of these methods contained within,
+     * or if the developer so chooses they can override the entire action_* method.
+     *
+     * @return true if any one of the pre_, do_, or post_ methods have been defined,
+     * false otherwise.  This is important b/c if none of these methods exists, then we will run the
+     * action_default() method.
+     */
+    protected function handle_action(){
+        $processed = false;
+        foreach($this->tasks as $task){
+            $processed = ($this->$task() || $processed);
+        }
+        $this->_processed = $processed;
+    }
 
-	/**
-	 * Perform an action prior to the specified action.
-	 * This can be overridde in a sub-class
-	 */
-	private function pre_action(){
-		$function = 'pre_' . $this->action;
-		if($this->hasFunction($function)){
-			$GLOBALS['log']->debug('Performing pre_action');
-			$this->$function();
-			return true;
-		}
-		return false;
-	}
+    /**
+     * Perform an action prior to the specified action.
+     * This can be overridde in a sub-class
+     */
+    private function pre_action(){
+        $function = 'pre_' . $this->action;
+        if($this->hasFunction($function)){
+            $GLOBALS['log']->debug('Performing pre_action');
+            $this->$function();
+            return true;
+        }
+        return false;
+    }
 
-	/**
-	 * Perform the specified action.
-	 * This can be overridde in a sub-class
-	 */
-	private function do_action(){
-		$function =  'action_'. strtolower($this->do_action);
-		if($this->hasFunction($function)){
-			$GLOBALS['log']->debug('Performing action: '.$function.' MODULE: '.$this->module);
-			$this->$function();
-			return true;
-		}
-		return false;
-	}
+    /**
+     * Perform the specified action.
+     * This can be overridde in a sub-class
+     */
+    private function do_action(){
+        $function =  'action_'. strtolower($this->do_action);
+        if($this->hasFunction($function)){
+            $GLOBALS['log']->debug('Performing action: '.$function.' MODULE: '.$this->module);
+            $this->$function();
+            return true;
+        }
+        return false;
+    }
 
-	/**
-	 * Perform an action after to the specified action has occurred.
-	 * This can be overridde in a sub-class
-	 */
-	private function post_action(){
-		$function = 'post_' . $this->action;
-		if($this->hasFunction($function)){
-			$GLOBALS['log']->debug('Performing post_action');
-			$this->$function();
-			return true;
-		}
-		return false;
-	}
+    /**
+     * Perform an action after to the specified action has occurred.
+     * This can be overridde in a sub-class
+     */
+    private function post_action(){
+        $function = 'post_' . $this->action;
+        if($this->hasFunction($function)){
+            $GLOBALS['log']->debug('Performing post_action');
+            $this->$function();
+            return true;
+        }
+        return false;
+    }
 
-	/**
-	 * If there is no action found then display an error to the user.
-	 */
-	protected function no_action(){
-		sugar_die($GLOBALS['app_strings']['LBL_NO_ACTION']);
-	}
+    /**
+     * If there is no action found then display an error to the user.
+     */
+    protected function no_action(){
+        sugar_die($GLOBALS['app_strings']['LBL_NO_ACTION']);
+    }
 
-	/**
-	 * The default action handler for instances where we do not have access to process.
-	 */
-	protected function no_access(){
-		$this->view = 'noaccess';
-	}
+    /**
+     * The default action handler for instances where we do not have access to process.
+     */
+    protected function no_access(){
+        $this->view = 'noaccess';
+    }
 
-	///////////////////////////////////////////////
-	/////// HELPER FUNCTIONS
-	///////////////////////////////////////////////
+    ///////////////////////////////////////////////
+    /////// HELPER FUNCTIONS
+    ///////////////////////////////////////////////
 
-	/**
-	 * Determine if a given function exists on the objects
-	 * @param function - the function to check
-	 * @return true if the method exists on the object, false otherwise
-	 */
-	protected function hasFunction($function){
-		return method_exists($this, $function);
-	}
+    /**
+     * Determine if a given function exists on the objects
+     * @param function - the function to check
+     * @return true if the method exists on the object, false otherwise
+     */
+    protected function hasFunction($function){
+        return method_exists($this, $function);
+    }
 
 
-	/**
-	 * Set the url to which we will want to redirect
-	 *
-	 * @param string url - the url to which we will want to redirect
-	 */
-	protected function set_redirect($url){
-		$this->redirect_url = $url;
-	}
+    /**
+     * Set the url to which we will want to redirect
+     *
+     * @param string url - the url to which we will want to redirect
+     */
+    protected function set_redirect($url){
+        $this->redirect_url = $url;
+    }
 
-	/**
-	 * Perform redirection based on the redirect_url
-	 *
-	 */
-	protected function redirect(){
+    /**
+     * Perform redirection based on the redirect_url
+     *
+     */
+    protected function redirect(){
 
-		if(!empty($this->redirect_url))
-			SugarApplication::redirect($this->redirect_url);
-	}
+        if(!empty($this->redirect_url))
+            SugarApplication::redirect($this->redirect_url);
+    }
 
-	////////////////////////////////////////////////////////
-	////// DEFAULT ACTIONS
-	///////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////
+    ////// DEFAULT ACTIONS
+    ///////////////////////////////////////////////////////
 
-	/*
+    /*
 	 * Save a bean
 	 */
 
-	/**
-	 * Do some processing before saving the bean to the database.
-	 */
-	public function pre_save(){
-		if(!empty($_POST['assigned_user_id']) && $_POST['assigned_user_id'] != $this->bean->assigned_user_id && $_POST['assigned_user_id'] != $GLOBALS['current_user']->id && empty($GLOBALS['sugar_config']['exclude_notifications'][$this->bean->module_dir])){
-			$this->bean->notify_on_save = true;
-		}
-		$GLOBALS['log']->debug("SugarController:: performing pre_save.");
+    /**
+     * Do some processing before saving the bean to the database.
+     */
+    public function pre_save(){
+        if(!empty($_POST['assigned_user_id']) && $_POST['assigned_user_id'] != $this->bean->assigned_user_id && $_POST['assigned_user_id'] != $GLOBALS['current_user']->id && empty($GLOBALS['sugar_config']['exclude_notifications'][$this->bean->module_dir])){
+            $this->bean->notify_on_save = true;
+        }
+        $GLOBALS['log']->debug("SugarController:: performing pre_save.");
         require_once('include/SugarFields/SugarFieldHandler.php');
         $sfh = new SugarFieldHandler();
-		foreach($this->bean->field_defs as $field => $properties) {
-			$type = !empty($properties['custom_type']) ? $properties['custom_type'] : $properties['type'];
-		    $sf = $sfh->getSugarField(ucfirst($type), true);
-			if(isset($_POST[$field])) {
-				if(is_array($_POST[$field]) && !empty($properties['isMultiSelect'])) {
-					if(empty($_POST[$field][0])) {
-						unset($_POST[$field][0]);
-					}
-					$_POST[$field] = encodeMultienumValue($_POST[$field]);
-				}
-				$this->bean->$field = $_POST[$field];
-			} else if(!empty($properties['isMultiSelect']) && !isset($_POST[$field]) && isset($_POST[$field . '_multiselect'])) {
-				$this->bean->$field = '';
-			}
+        foreach($this->bean->field_defs as $field => $properties) {
+            $type = !empty($properties['custom_type']) ? $properties['custom_type'] : $properties['type'];
+            $sf = $sfh->getSugarField(ucfirst($type), true);
+            if(isset($_POST[$field])) {
+                if(is_array($_POST[$field]) && !empty($properties['isMultiSelect'])) {
+                    if(empty($_POST[$field][0])) {
+                        unset($_POST[$field][0]);
+                    }
+                    $_POST[$field] = encodeMultienumValue($_POST[$field]);
+                }
+                $this->bean->$field = $_POST[$field];
+            } else if(!empty($properties['isMultiSelect']) && !isset($_POST[$field]) && isset($_POST[$field . '_multiselect'])) {
+                $this->bean->$field = '';
+            }
             if($sf != null){
                 $sf->save($this->bean, $_POST, $field, $properties);
             }
-		}
-
-		foreach($this->bean->relationship_fields as $field=>$link){
-			if(!empty($_POST[$field])){
-				$this->bean->$field = $_POST[$field];
-			}
-		}
-		if(!$this->bean->ACLAccess('save')){
-			ACLController::displayNoAccess(true);
-			sugar_cleanup(true);
-		}
-		$this->bean->unformat_all_fields();
-	}
+        }
 
-	/**
-	 * Perform the actual save
-	 */
-	public function action_save(){
-		$this->bean->save(!empty($this->bean->notify_on_save));
-	}
+        foreach($this->bean->relationship_fields as $field=>$link){
+            if(!empty($_POST[$field])){
+                $this->bean->$field = $_POST[$field];
+            }
+        }
+        if(!$this->bean->ACLAccess('save')){
+            ACLController::displayNoAccess(true);
+            sugar_cleanup(true);
+        }
+        $this->bean->unformat_all_fields();
+    }
+
+    /**
+     * Perform the actual save
+     */
+    public function action_save(){
+        $this->bean->save(!empty($this->bean->notify_on_save));
+    }
 
 
     public function action_spot()
@@ -558,43 +558,43 @@ 
     }
 
 
-	/**
-	 * Specify what happens after the save has occurred.
-	 */
-	protected function post_save(){
-		$module = (!empty($this->return_module) ? $this->return_module : $this->module);
-		$action = (!empty($this->return_action) ? $this->return_action : 'DetailView');
-		$id = (!empty($this->return_id) ? $this->return_id : $this->bean->id);
+    /**
+     * Specify what happens after the save has occurred.
+     */
+    protected function post_save(){
+        $module = (!empty($this->return_module) ? $this->return_module : $this->module);
+        $action = (!empty($this->return_action) ? $this->return_action : 'DetailView');
+        $id = (!empty($this->return_id) ? $this->return_id : $this->bean->id);
 
-		$url = "index.php?module=".$module."&action=".$action."&record=".$id;
-		$this->set_redirect($url);
-	}
+        $url = "index.php?module=".$module."&action=".$action."&record=".$id;
+        $this->set_redirect($url);
+    }
 
-	/*
+    /*
 	 * Delete a bean
 	 */
 
-	/**
-	 * Perform the actual deletion.
-	 */
-	protected function action_delete(){
-		//do any pre delete processing
-		//if there is some custom logic for deletion.
-		if(!empty($_REQUEST['record'])){
-			if(!$this->bean->ACLAccess('Delete')){
-				ACLController::displayNoAccess(true);
-				sugar_cleanup(true);
-			}
-			$this->bean->mark_deleted($_REQUEST['record']);
-		}else{
-			sugar_die("A record number must be specified to delete");
-		}
-	}
+    /**
+     * Perform the actual deletion.
+     */
+    protected function action_delete(){
+        //do any pre delete processing
+        //if there is some custom logic for deletion.
+        if(!empty($_REQUEST['record'])){
+            if(!$this->bean->ACLAccess('Delete')){
+                ACLController::displayNoAccess(true);
+                sugar_cleanup(true);
+            }
+            $this->bean->mark_deleted($_REQUEST['record']);
+        }else{
+            sugar_die("A record number must be specified to delete");
+        }
+    }
 
-	/**
-	 * Specify what happens after the deletion has occurred.
-	 */
-	protected function post_delete(){
+    /**
+     * Specify what happens after the deletion has occurred.
+     */
+    protected function post_delete(){
         if (empty($_REQUEST['return_url'])) {
             $return_module = isset($_REQUEST['return_module']) ?
                 $_REQUEST['return_module'] :
@@ -610,23 +610,23 @@ 
             $url = $_REQUEST['return_url'];
         }
 
-		//eggsurplus Bug 23816: maintain VCR after an edit/save. If it is a duplicate then don't worry about it. The offset is now worthless.
-		if(isset($_REQUEST['offset']) && empty($_REQUEST['duplicateSave'])) {
-		    $url .= "&offset=".$_REQUEST['offset'];
-		}
+        //eggsurplus Bug 23816: maintain VCR after an edit/save. If it is a duplicate then don't worry about it. The offset is now worthless.
+        if(isset($_REQUEST['offset']) && empty($_REQUEST['duplicateSave'])) {
+            $url .= "&offset=".$_REQUEST['offset'];
+        }
 
-		$this->set_redirect($url);
-	}
-	/**
-	 * Perform the actual massupdate.
-	 */
-	protected function action_massupdate(){
-		if(!empty($_REQUEST['massupdate']) && $_REQUEST['massupdate'] == 'true' && (!empty($_REQUEST['uid']) || !empty($_REQUEST['entire']))){
-			if(!empty($_REQUEST['Delete']) && $_REQUEST['Delete']=='true' && !$this->bean->ACLAccess('delete')
+        $this->set_redirect($url);
+    }
+    /**
+     * Perform the actual massupdate.
+     */
+    protected function action_massupdate(){
+        if(!empty($_REQUEST['massupdate']) && $_REQUEST['massupdate'] == 'true' && (!empty($_REQUEST['uid']) || !empty($_REQUEST['entire']))){
+            if(!empty($_REQUEST['Delete']) && $_REQUEST['Delete']=='true' && !$this->bean->ACLAccess('delete')
                 || (empty($_REQUEST['Delete']) || $_REQUEST['Delete']!='true') && !$this->bean->ACLAccess('save')){
-				ACLController::displayNoAccess(true);
-				sugar_cleanup(true);
-			}
+                ACLController::displayNoAccess(true);
+                sugar_cleanup(true);
+            }
 
             set_time_limit(0);//I'm wondering if we will set it never goes timeout here.
             // until we have more efficient way of handling MU, we have to disable the limit
@@ -652,35 +652,35 @@ 
             unset($_REQUEST[$seed->module_dir.'2_'.strtoupper($seed->object_name).'_offset']);//after massupdate, the page should redirect to no offset page
             $storeQuery->saveFromRequest($_REQUEST['module']);
             $_REQUEST = array('return_module' => $temp_req['return_module'], 'return_action' => $temp_req['return_action']);//for post_massupdate, to go back to original page.
-		}else{
-			sugar_die("You must massupdate at least one record");
-		}
-	}
-	/**
-	 * Specify what happens after the massupdate has occurred.
-	 */
-	protected function post_massupdate(){
-		$return_module = isset($_REQUEST['return_module']) ?
-			$_REQUEST['return_module'] :
-			$GLOBALS['sugar_config']['default_module'];
-		$return_action = isset($_REQUEST['return_action']) ?
-			$_REQUEST['return_action'] :
-			$GLOBALS['sugar_config']['default_action'];
-		$url = "index.php?module=".$return_module."&action=".$return_action;
-		if($return_module == 'Emails'){//specificly for My Achieves
-			if(!empty($this->req_for_email['type']) && !empty($this->req_for_email['ie_assigned_user_id'])) {
-				$url = $url . "&type=".$this->req_for_email['type']."&assigned_user_id=".$this->req_for_email['ie_assigned_user_id'];
-			}
-		}
-		$this->set_redirect($url);
-	}
-	/**
-	 * Perform the listview action
-	 */
-	protected function action_listview(){
-		$this->view_object_map['bean'] = $this->bean;
-		$this->view = 'list';
-	}
+        }else{
+            sugar_die("You must massupdate at least one record");
+        }
+    }
+    /**
+     * Specify what happens after the massupdate has occurred.
+     */
+    protected function post_massupdate(){
+        $return_module = isset($_REQUEST['return_module']) ?
+            $_REQUEST['return_module'] :
+            $GLOBALS['sugar_config']['default_module'];
+        $return_action = isset($_REQUEST['return_action']) ?
+            $_REQUEST['return_action'] :
+            $GLOBALS['sugar_config']['default_action'];
+        $url = "index.php?module=".$return_module."&action=".$return_action;
+        if($return_module == 'Emails'){//specificly for My Achieves
+            if(!empty($this->req_for_email['type']) && !empty($this->req_for_email['ie_assigned_user_id'])) {
+                $url = $url . "&type=".$this->req_for_email['type']."&assigned_user_id=".$this->req_for_email['ie_assigned_user_id'];
+            }
+        }
+        $this->set_redirect($url);
+    }
+    /**
+     * Perform the listview action
+     */
+    protected function action_listview(){
+        $this->view_object_map['bean'] = $this->bean;
+        $this->view = 'list';
+    }
 
 /*
 
@@ -689,63 +689,63 @@ 
 	}
 */
 
-	/**
-	 * Action to handle when using a file as was done in previous versions of Sugar.
-	 */
-	protected function action_default(){
-		$this->view = 'classic';
-	}
+    /**
+     * Action to handle when using a file as was done in previous versions of Sugar.
+     */
+    protected function action_default(){
+        $this->view = 'classic';
+    }
 
-	/**
-	 * this method id used within a Dashlet when performing an ajax call
-	 */
-	protected function action_callmethoddashlet(){
-		if(!empty($_REQUEST['id'])) {
-		    $id = $_REQUEST['id'];
-		    $requestedMethod = $_REQUEST['method'];
-		    $dashletDefs = $GLOBALS['current_user']->getPreference('dashlets', 'Home'); // load user's dashlets config
-		    if(!empty($dashletDefs[$id])) {
-		        require_once($dashletDefs[$id]['fileLocation']);
-
-		        $dashlet = new $dashletDefs[$id]['className']($id, (isset($dashletDefs[$id]['options']) ? $dashletDefs[$id]['options'] : array()));
-
-		        if(method_exists($dashlet, $requestedMethod) || method_exists($dashlet, '__call')) {
-		            echo $dashlet->$requestedMethod();
-		        }
-		        else {
-		            echo 'no method';
-		        }
-		    }
-		}
-	}
+    /**
+     * this method id used within a Dashlet when performing an ajax call
+     */
+    protected function action_callmethoddashlet(){
+        if(!empty($_REQUEST['id'])) {
+            $id = $_REQUEST['id'];
+            $requestedMethod = $_REQUEST['method'];
+            $dashletDefs = $GLOBALS['current_user']->getPreference('dashlets', 'Home'); // load user's dashlets config
+            if(!empty($dashletDefs[$id])) {
+                require_once($dashletDefs[$id]['fileLocation']);
+
+                $dashlet = new $dashletDefs[$id]['className']($id, (isset($dashletDefs[$id]['options']) ? $dashletDefs[$id]['options'] : array()));
+
+                if(method_exists($dashlet, $requestedMethod) || method_exists($dashlet, '__call')) {
+                    echo $dashlet->$requestedMethod();
+                }
+                else {
+                    echo 'no method';
+                }
+            }
+        }
+    }
 
-	/**
-	 * this method is used within a Dashlet when the options configuration is posted
-	 */
-	protected function action_configuredashlet(){
-		global $current_user, $mod_strings;
-
-		if(!empty($_REQUEST['id'])) {
-		    $id = $_REQUEST['id'];
-		    $dashletDefs = $current_user->getPreference('dashlets', $_REQUEST['module']); // load user's dashlets config
-		    require_once($dashletDefs[$id]['fileLocation']);
-
-		    $dashlet = new $dashletDefs[$id]['className']($id, (isset($dashletDefs[$id]['options']) ? $dashletDefs[$id]['options'] : array()));
-		    if(!empty($_REQUEST['configure']) && $_REQUEST['configure']) { // save settings
-		        $dashletDefs[$id]['options'] = $dashlet->saveOptions($_REQUEST);
-		        $current_user->setPreference('dashlets', $dashletDefs, 0, $_REQUEST['module']);
-		    }
-		    else { // display options
-		        $json = getJSONobj();
-		        return 'result = ' . $json->encode((array('header' => $dashlet->title . ' : ' . $mod_strings['LBL_OPTIONS'],
-		                                                 'body'  => $dashlet->displayOptions())));
-
-		    }
-		}
-		else {
-		    return '0';
-		}
-	}
+    /**
+     * this method is used within a Dashlet when the options configuration is posted
+     */
+    protected function action_configuredashlet(){
+        global $current_user, $mod_strings;
+
+        if(!empty($_REQUEST['id'])) {
+            $id = $_REQUEST['id'];
+            $dashletDefs = $current_user->getPreference('dashlets', $_REQUEST['module']); // load user's dashlets config
+            require_once($dashletDefs[$id]['fileLocation']);
+
+            $dashlet = new $dashletDefs[$id]['className']($id, (isset($dashletDefs[$id]['options']) ? $dashletDefs[$id]['options'] : array()));
+            if(!empty($_REQUEST['configure']) && $_REQUEST['configure']) { // save settings
+                $dashletDefs[$id]['options'] = $dashlet->saveOptions($_REQUEST);
+                $current_user->setPreference('dashlets', $dashletDefs, 0, $_REQUEST['module']);
+            }
+            else { // display options
+                $json = getJSONobj();
+                return 'result = ' . $json->encode((array('header' => $dashlet->title . ' : ' . $mod_strings['LBL_OPTIONS'],
+                                                            'body'  => $dashlet->displayOptions())));
+
+            }
+        }
+        else {
+            return '0';
+        }
+    }
 
     /**
      * Global method to delete an attachment
@@ -775,84 +775,84 @@ 
         sugar_cleanup(true);
     }
 
-	/**
-	 * getActionFilename
-	 */
-	public static function getActionFilename($action) {
-	   if(isset(self::$action_case_file[$action])) {
-	   	  return self::$action_case_file[$action];
-	   }
-	   return $action;
-	}
+    /**
+     * getActionFilename
+     */
+    public static function getActionFilename($action) {
+        if(isset(self::$action_case_file[$action])) {
+                return self::$action_case_file[$action];
+        }
+        return $action;
+    }
 
-	/********************************************************************/
-	// 				PROCESS TASKS
-	/********************************************************************/
+    /********************************************************************/
+    // 				PROCESS TASKS
+    /********************************************************************/
 
-	/**
-	 * Given the module and action, determine whether the super/admin has prevented access
-	 * to this url. In addition if any links specified for this module, load the links into
-	 * GLOBALS
-	 *
-	 * @return true if we want to stop processing, false if processing should continue
-	 */
-	private function blockFileAccess(){
-		//check if the we have enabled file_access_control and if so then check the mappings on the request;
-		if(!empty($GLOBALS['sugar_config']['admin_access_control']) && $GLOBALS['sugar_config']['admin_access_control']){
-			$this->loadMapping('file_access_control_map');
-			//since we have this turned on, check the mapping file
-			$module = strtolower($this->module);
-			$action = strtolower($this->do_action);
-			if(!empty($this->file_access_control_map['modules'][$module]['links'])){
-				$GLOBALS['admin_access_control_links'] = $this->file_access_control_map['modules'][$module]['links'];
-			}
-
-			if(!empty($this->file_access_control_map['modules'][$module]['actions']) && (in_array($action, $this->file_access_control_map['modules'][$module]['actions']) || !empty($this->file_access_control_map['modules'][$module]['actions'][$action]))){
-				//check params
-				if(!empty($this->file_access_control_map['modules'][$module]['actions'][$action]['params'])){
-					$block = true;
-					$params = $this->file_access_control_map['modules'][$module]['actions'][$action]['params'];
-					foreach($params as $param => $paramVals){
-						if(!empty($_REQUEST[$param])){
-							if(!in_array($_REQUEST[$param], $paramVals)){
-								$block = false;
-								break;
-							}
-						}
-					}
-					if($block){
-						$this->_processed = true;
-						$this->no_access();
-					}
-				}else{
-					$this->_processed = true;
-					$this->no_access();
-				}
-			}
-		}else
-			$this->_processed = false;
-	}
+    /**
+     * Given the module and action, determine whether the super/admin has prevented access
+     * to this url. In addition if any links specified for this module, load the links into
+     * GLOBALS
+     *
+     * @return true if we want to stop processing, false if processing should continue
+     */
+    private function blockFileAccess(){
+        //check if the we have enabled file_access_control and if so then check the mappings on the request;
+        if(!empty($GLOBALS['sugar_config']['admin_access_control']) && $GLOBALS['sugar_config']['admin_access_control']){
+            $this->loadMapping('file_access_control_map');
+            //since we have this turned on, check the mapping file
+            $module = strtolower($this->module);
+            $action = strtolower($this->do_action);
+            if(!empty($this->file_access_control_map['modules'][$module]['links'])){
+                $GLOBALS['admin_access_control_links'] = $this->file_access_control_map['modules'][$module]['links'];
+            }
 
-	/**
-	 * This code is part of the entry points reworking. We have consolidated all
-	 * entry points to go through index.php. Now in order to bring up an entry point
-	 * it will follow the format:
-	 * 'index.php?entryPoint=download'
-	 * the download entry point is mapped in the following file: entry_point_registry.php
-	 *
-	 */
-	private function handleEntryPoint(){
-		if(!empty($_REQUEST['entryPoint'])){
-			$this->loadMapping('entry_point_registry');
-			$entryPoint = $_REQUEST['entryPoint'];
-
-			if(!empty($this->entry_point_registry[$entryPoint])){
-				require_once($this->entry_point_registry[$entryPoint]['file']);
-				$this->_processed = true;
-				$this->view = '';
-			}
-		}
-	}
+            if(!empty($this->file_access_control_map['modules'][$module]['actions']) && (in_array($action, $this->file_access_control_map['modules'][$module]['actions']) || !empty($this->file_access_control_map['modules'][$module]['actions'][$action]))){
+                //check params
+                if(!empty($this->file_access_control_map['modules'][$module]['actions'][$action]['params'])){
+                    $block = true;
+                    $params = $this->file_access_control_map['modules'][$module]['actions'][$action]['params'];
+                    foreach($params as $param => $paramVals){
+                        if(!empty($_REQUEST[$param])){
+                            if(!in_array($_REQUEST[$param], $paramVals)){
+                                $block = false;
+                                break;
+                            }
+                        }
+                    }
+                    if($block){
+                        $this->_processed = true;
+                        $this->no_access();
+                    }
+                }else{
+                    $this->_processed = true;
+                    $this->no_access();
+                }
+            }
+        }else
+            $this->_processed = false;
+    }
+
+    /**
+     * This code is part of the entry points reworking. We have consolidated all
+     * entry points to go through index.php. Now in order to bring up an entry point
+     * it will follow the format:
+     * 'index.php?entryPoint=download'
+     * the download entry point is mapped in the following file: entry_point_registry.php
+     *
+     */
+    private function handleEntryPoint(){
+        if(!empty($_REQUEST['entryPoint'])){
+            $this->loadMapping('entry_point_registry');
+            $entryPoint = $_REQUEST['entryPoint'];
+
+            if(!empty($this->entry_point_registry[$entryPoint])){
+                require_once($this->entry_point_registry[$entryPoint]['file']);
+                $this->_processed = true;
+                $this->view = '';
+            }
+        }
+    }
 
     /**
      * Checks to see if the requested entry point requires auth
@@ -870,67 +870,67 @@ 
         return true;
     }
 
-	/**
-	 * Meant to handle old views e.g. DetailView.php.
-	 *
-	 */
-	protected function callLegacyCode()
-	{
-		$file = self::getActionFilename($this->do_action);
-		if ( isset($this->action_view_map[strtolower($this->do_action)]) ) {
-	        $action = $this->action_view_map[strtolower($this->do_action)];
-	    }
-	    else {
-	        $action = $this->do_action;
-	    }
-	    // index actions actually maps to the view.list.php view
-	    if ( $action == 'index' ) {
-	        $action = 'list';
-	    }
-
-		if ((file_exists('modules/' . $this->module . '/'. $file . '.php')
+    /**
+     * Meant to handle old views e.g. DetailView.php.
+     *
+     */
+    protected function callLegacyCode()
+    {
+        $file = self::getActionFilename($this->do_action);
+        if ( isset($this->action_view_map[strtolower($this->do_action)]) ) {
+            $action = $this->action_view_map[strtolower($this->do_action)];
+        }
+        else {
+            $action = $this->do_action;
+        }
+        // index actions actually maps to the view.list.php view
+        if ( $action == 'index' ) {
+            $action = 'list';
+        }
+
+        if ((file_exists('modules/' . $this->module . '/'. $file . '.php')
                 && !file_exists('modules/' . $this->module . '/views/view.'. $action . '.php'))
             || (file_exists('custom/modules/' . $this->module . '/'. $file . '.php')
                 && !file_exists('custom/modules/' . $this->module . '/views/view.'. $action . '.php'))
             ) {
-			// A 'classic' module, using the old pre-MVC display files
-			// We should now discard the bean we just obtained for tracking as the pre-MVC module will instantiate its own
-			unset($GLOBALS['FOCUS']);
-			$GLOBALS['log']->debug('Module:' . $this->module . ' using file: '. $file);
-			$this->action_default();
-			$this->_processed = true;
-		}
-	}
+            // A 'classic' module, using the old pre-MVC display files
+            // We should now discard the bean we just obtained for tracking as the pre-MVC module will instantiate its own
+            unset($GLOBALS['FOCUS']);
+            $GLOBALS['log']->debug('Module:' . $this->module . ' using file: '. $file);
+            $this->action_default();
+            $this->_processed = true;
+        }
+    }
 
-	/**
-	 * If the action has been remapped to a different action as defined in
-	 * action_file_map.php or action_view_map.php load those maps here.
-	 *
-	 */
-	private function handleActionMaps(){
-		if(!empty($this->action_file_map[strtolower($this->do_action)])){
-			$this->view = '';
-			$GLOBALS['log']->debug('Using Action File Map:' . $this->action_file_map[strtolower($this->do_action)]);
-			require_once($this->action_file_map[strtolower($this->do_action)]);
-			$this->_processed = true;
-		}elseif(!empty($this->action_view_map[strtolower($this->do_action)])){
-			$GLOBALS['log']->debug('Using Action View Map:' . $this->action_view_map[strtolower($this->do_action)]);
-			$this->view = $this->action_view_map[strtolower($this->do_action)];
-			$this->_processed = true;
-		}else
-			$this->no_action();
-	}
+    /**
+     * If the action has been remapped to a different action as defined in
+     * action_file_map.php or action_view_map.php load those maps here.
+     *
+     */
+    private function handleActionMaps(){
+        if(!empty($this->action_file_map[strtolower($this->do_action)])){
+            $this->view = '';
+            $GLOBALS['log']->debug('Using Action File Map:' . $this->action_file_map[strtolower($this->do_action)]);
+            require_once($this->action_file_map[strtolower($this->do_action)]);
+            $this->_processed = true;
+        }elseif(!empty($this->action_view_map[strtolower($this->do_action)])){
+            $GLOBALS['log']->debug('Using Action View Map:' . $this->action_view_map[strtolower($this->do_action)]);
+            $this->view = $this->action_view_map[strtolower($this->do_action)];
+            $this->_processed = true;
+        }else
+            $this->no_action();
+    }
 
-	/**
-	 * Actually remap the action if required.
-	 *
-	 */
-	protected function remapAction(){
-		if(!empty($this->action_remap[$this->do_action])){
-			$this->action = $this->action_remap[$this->do_action];
-			$this->do_action = $this->action;
-		}
-	}
+    /**
+     * Actually remap the action if required.
+     *
+     */
+    protected function remapAction(){
+        if(!empty($this->action_remap[$this->do_action])){
+            $this->action = $this->action_remap[$this->do_action];
+            $this->do_action = $this->action;
+        }
+    }
 
 }
 ?>

include/MVC/Controller/entry_point_registry.php

Indentation +24 added lines, -24 removed lines

@@ -39,19 +39,19 @@ 
  ********************************************************************************/
 
 $entry_point_registry = array(
-	'emailImage' => array('file' => 'modules/EmailMan/EmailImage.php', 'auth' => false),
-	'download' => array('file' => 'download.php', 'auth' => true),
-	'export' => array('file' => 'export.php', 'auth' => true),
-	'export_dataset' => array('file' => 'export_dataset.php', 'auth' => true),
-	'Changenewpassword' => array('file' => 'modules/Users/Changenewpassword.php', 'auth' => false),
-	'GeneratePassword' => array('file' => 'modules/Users/GeneratePassword.php', 'auth' => false),
-	'vCard' => array('file' => 'vCard.php', 'auth' => true),
-	'pdf' => array('file' => 'pdf.php', 'auth' => true),
-	'minify' => array('file' => 'jssource/minify.php', 'auth' => true),
+    'emailImage' => array('file' => 'modules/EmailMan/EmailImage.php', 'auth' => false),
+    'download' => array('file' => 'download.php', 'auth' => true),
+    'export' => array('file' => 'export.php', 'auth' => true),
+    'export_dataset' => array('file' => 'export_dataset.php', 'auth' => true),
+    'Changenewpassword' => array('file' => 'modules/Users/Changenewpassword.php', 'auth' => false),
+    'GeneratePassword' => array('file' => 'modules/Users/GeneratePassword.php', 'auth' => false),
+    'vCard' => array('file' => 'vCard.php', 'auth' => true),
+    'pdf' => array('file' => 'pdf.php', 'auth' => true),
+    'minify' => array('file' => 'jssource/minify.php', 'auth' => true),
     'json_server' => array('file' => 'json_server.php', 'auth' => true),
     'get_url' => array('file' => 'get_url.php', 'auth' => true),
-	'HandleAjaxCall' => array('file' => 'HandleAjaxCall.php', 'auth' => true),
-	'TreeData' => array('file' => 'TreeData.php', 'auth' => true),
+    'HandleAjaxCall' => array('file' => 'HandleAjaxCall.php', 'auth' => true),
+    'TreeData' => array('file' => 'TreeData.php', 'auth' => true),
     'image' => array('file' => 'modules/Campaigns/image.php', 'auth' => false),
     'campaign_trackerv2' => array('file' => 'modules/Campaigns/Tracker.php', 'auth' => false),
     'WebToLeadCapture' => array('file' => 'modules/Campaigns/WebToLeadCapture.php', 'auth' => false),
@@ -59,7 +59,7 @@ 
     'acceptDecline' => array('file' => 'modules/Contacts/AcceptDecline.php', 'auth' => false),
     'leadCapture' => array('file' => 'modules/Leads/Capture.php', 'auth' => false),
     'process_queue' => array('file' => 'process_queue.php', 'auth' => true),
-	'zipatcher' => array('file' => 'zipatcher.php', 'auth' => true),
+    'zipatcher' => array('file' => 'zipatcher.php', 'auth' => true),
     'mm_get_doc' => array('file' => 'modules/MailMerge/get_doc.php', 'auth' => true),
     'getImage' => array('file' => 'include/SugarTheme/getImage.php', 'auth' => false),
     'GenerateQuickComposeFrame' => array('file' => 'modules/Emails/GenerateQuickComposeFrame.php', 'auth' => true),
@@ -68,18 +68,18 @@ 
     'UploadFileCheck' => array('file' => 'modules/Configurator/UploadFileCheck.php', 'auth' => true),
     'SAML'=>  array('file' => 'modules/Users/authentication/SAMLAuthenticate/index.php', 'auth' => false),
     'jslang'=> array('file' => 'include/language/getJSLanguage.php', 'auth' => true),
-	'deleteAttachment' => array('file' => 'modules/FP_events/responseEntryPoint.php', 'auth' => false),
-	'responseEntryPoint' => array('file' => 'modules/FP_events/responseEntryPoint.php', 'auth' => false),
-	'formLetter' => array('file' => 'modules/AOS_PDF_Templates/formLetterPdf.php' , 'auth' => true),
-	'generatePdf' => array('file' => 'modules/AOS_PDF_Templates/generatePdf.php' , 'auth' => true),
-	'Reschedule' => array('file' => 'modules/Calls_Reschedule/Reschedule_popup.php' , 'auth' => true),
-	'Reschedule2' => array('file' => 'modules/Calls/Reschedule.php' , 'auth' => true),
-	'social' => array('file' => 'include/social/get_data.php' , 'auth' => true),
-	'social_reader' => array('file' => 'include/social/get_feed_data.php' , 'auth' => true),
-	'add_dash_page' => array('file' => 'modules/Home/AddDashboardPages.php' , 'auth' => true),
-	'retrieve_dash_page' => array('file' => 'include/MySugar/retrieve_dash_page.php' , 'auth' => true),
-	'remove_dash_page' => array('file' => 'modules/Home/RemoveDashboardPages.php' , 'auth' => true),
-	'rename_dash_page' => array('file' => 'modules/Home/RenameDashboardPages.php' , 'auth' => true)
+    'deleteAttachment' => array('file' => 'modules/FP_events/responseEntryPoint.php', 'auth' => false),
+    'responseEntryPoint' => array('file' => 'modules/FP_events/responseEntryPoint.php', 'auth' => false),
+    'formLetter' => array('file' => 'modules/AOS_PDF_Templates/formLetterPdf.php' , 'auth' => true),
+    'generatePdf' => array('file' => 'modules/AOS_PDF_Templates/generatePdf.php' , 'auth' => true),
+    'Reschedule' => array('file' => 'modules/Calls_Reschedule/Reschedule_popup.php' , 'auth' => true),
+    'Reschedule2' => array('file' => 'modules/Calls/Reschedule.php' , 'auth' => true),
+    'social' => array('file' => 'include/social/get_data.php' , 'auth' => true),
+    'social_reader' => array('file' => 'include/social/get_feed_data.php' , 'auth' => true),
+    'add_dash_page' => array('file' => 'modules/Home/AddDashboardPages.php' , 'auth' => true),
+    'retrieve_dash_page' => array('file' => 'include/MySugar/retrieve_dash_page.php' , 'auth' => true),
+    'remove_dash_page' => array('file' => 'modules/Home/RemoveDashboardPages.php' , 'auth' => true),
+    'rename_dash_page' => array('file' => 'modules/Home/RenameDashboardPages.php' , 'auth' => true)
 );
 
 ?>

include/MVC/Controller/action_view_map.php

Indentation +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
  * To change the template for this generated file go to
  * Window - Preferences - PHPeclipse - PHP - Code Templates
  */
- //format '<action_name>' => '<view_name>'
+    //format '<action_name>' => '<view_name>'
 $action_view_map['multieditview']= 'multiedit';
 $action_view_map['detailview']= 'detail';
 $action_view_map['editview']= 'edit';