adamjakab / SuiteCRM

include/SugarTheme/SugarTheme.php

Indentation +181 added lines, -181 removed lines

@@ -246,12 +246,12 @@ 
      */
     private $_templateCache = array();
 
-	/**
-	 * Cache built of sprite meta data
-	 *
-	 * @var array
-	 */
-	private $_spriteCache = array();
+    /**
+     * Cache built of sprite meta data
+     *
+     * @var array
+     */
+    private $_spriteCache = array();
 
     /**
      * Size of the caches after the are initialized in the constructor
@@ -263,7 +263,7 @@ 
         'imageCache'    => 0,
         'jsCache'       => 0,
         'templateCache' => 0,
-		'spriteCache'	=> 0,
+        'spriteCache'	=> 0,
         );
 
     /**
@@ -329,21 +329,21 @@ 
                     $this->_templateCache = $caches['templateCache'];
             }
             $cachedfile = sugar_cached($this->getFilePath().'/spriteCache.php');
-			if(!empty($GLOBALS['sugar_config']['use_sprites']) && sugar_is_file($cachedfile)) {
-				$this->_spriteCache = unserialize(sugar_file_get_contents($cachedfile));
-			}
+            if(!empty($GLOBALS['sugar_config']['use_sprites']) && sugar_is_file($cachedfile)) {
+                $this->_spriteCache = unserialize(sugar_file_get_contents($cachedfile));
+            }
         }
         $this->_initialCacheSize = array(
             'jsCache'       => count($this->_jsCache),
             'cssCache'      => count($this->_cssCache),
             'imageCache'    => count($this->_imageCache),
             'templateCache' => count($this->_templateCache),
-			'spriteCache' 	=> count($this->_spriteCache),
+            'spriteCache' 	=> count($this->_spriteCache),
             );
     }
 
     /**
-	 * This is needed to prevent unserialize vulnerability
+     * This is needed to prevent unserialize vulnerability
      */
     public function __wakeup()
     {
@@ -380,8 +380,8 @@ 
 
             if (is_file("$cachedir/pathCache.php"))
                 unlink("$cachedir/pathCache.php");
-			if (is_file("$cachedir/spriteCache.php"))
-				unlink("$cachedir/spriteCache.php");
+            if (is_file("$cachedir/spriteCache.php"))
+                unlink("$cachedir/spriteCache.php");
 
         }
         elseif ( !inDeveloperMode() ) {
@@ -404,12 +404,12 @@ 
                     );
 
             }
-			if ( count($this->_spriteCache) != $this->_initialCacheSize['spriteCache']) {
-				sugar_file_put_contents(
-					"$cachedir/spriteCache.php",
-					serialize($this->_spriteCache)
-				);
-			}
+            if ( count($this->_spriteCache) != $this->_initialCacheSize['spriteCache']) {
+                sugar_file_put_contents(
+                    "$cachedir/spriteCache.php",
+                    serialize($this->_spriteCache)
+                );
+            }
         }
     }
 
@@ -438,7 +438,7 @@ 
     }
 
     public function __isset($key){
-    	return isset($this->$key);
+        return isset($this->$key);
 
     }
 
@@ -603,27 +603,27 @@ 
         $html .= '<link rel="stylesheet" type="text/css" href="'.$this->getCSSURL('style.css').'" />';
 
 
-		// sprites
-		if(!empty($GLOBALS['sugar_config']['use_sprites']) && $GLOBALS['sugar_config']['use_sprites']) {
+        // sprites
+        if(!empty($GLOBALS['sugar_config']['use_sprites']) && $GLOBALS['sugar_config']['use_sprites']) {
 
-			// system wide sprites
-			if(file_exists("cache/sprites/default/sprites.css"))
-				$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/default/sprites.css').'" />';
+            // system wide sprites
+            if(file_exists("cache/sprites/default/sprites.css"))
+                $html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/default/sprites.css').'" />';
 
-			// theme specific sprites
-			if(file_exists("cache/sprites/{$this->dirName}/sprites.css"))
-				$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/'.$this->dirName.'/sprites.css').'" />';
+            // theme specific sprites
+            if(file_exists("cache/sprites/{$this->dirName}/sprites.css"))
+                $html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/'.$this->dirName.'/sprites.css').'" />';
 
-			// parent sprites
-			if($this->parentTheme && $parent = SugarThemeRegistry::get($this->parentTheme)) {
-				if(file_exists("cache/sprites/{$parent->dirName}/sprites.css"))
-					$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/'.$parent->dirName.'/sprites.css').'" />';
-			}
+            // parent sprites
+            if($this->parentTheme && $parent = SugarThemeRegistry::get($this->parentTheme)) {
+                if(file_exists("cache/sprites/{$parent->dirName}/sprites.css"))
+                    $html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/'.$parent->dirName.'/sprites.css').'" />';
+            }
 
-			// repeatable sprites
-			if(file_exists("cache/sprites/Repeatable/sprites.css"))
-				$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/Repeatable/sprites.css').'" />';
-		}
+            // repeatable sprites
+            if(file_exists("cache/sprites/Repeatable/sprites.css"))
+                $html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/Repeatable/sprites.css').'" />';
+        }
 
         // for BC during upgrade
         if ( !empty($this->colors) ) {
@@ -700,180 +700,180 @@ 
      *
      * @param  string $image image name
      * @param  string $other_attributes optional, other attributes to add to the image tag, not cached
-	 * @param  string $width optional, defaults to the actual image's width
-	 * @param  string $height optional, defaults to the actual image's height
-	 * @param  string $ext optional, image extension (TODO can we deprecate this one ?)
+     * @param  string $width optional, defaults to the actual image's width
+     * @param  string $height optional, defaults to the actual image's height
+     * @param  string $ext optional, image extension (TODO can we deprecate this one ?)
      * @param  string $alt optional, only used when image contains something useful, i.e. "Sally's profile pic"
      * @return string HTML image tag or sprite
      */
     public function getImage(
         $imageName,
         $other_attributes = '',
-		$width = null,
-		$height = null,
-		$ext = null,
+        $width = null,
+        $height = null,
+        $ext = null,
         $alt = ''
     )
     {
 
         static $cached_results = array();
 
-		// trap deprecated use of image extension
-		if(is_null($ext)) {
-			$imageNameExp = explode('.',$imageName);
-			if(count($imageNameExp) == 1)
-				$imageName .= '.gif';
-		} else {
-			$imageName .= $ext;
-		}
-
-		// trap alt attributes in other_attributes
-		if(preg_match('/alt=["\']([^\'"]+)["\']/i', $other_attributes))
-			$GLOBALS['log']->debug("Sprites: alt attribute detected for $imageName");
-		// sprite handler, makes use of own caching mechanism
-		if(!empty($GLOBALS['sugar_config']['use_sprites']) && $GLOBALS['sugar_config']['use_sprites']) {
-			// get sprite metadata
-			if($sp = $this->getSpriteMeta($imageName)) {
-				// requested size should match
-				if( (!is_null($width) && $sp['width'] == $width) || (is_null($width)) &&
-					(!is_null($height) && $sp['height'] == $height) || (is_null($height)) )
-				{
+        // trap deprecated use of image extension
+        if(is_null($ext)) {
+            $imageNameExp = explode('.',$imageName);
+            if(count($imageNameExp) == 1)
+                $imageName .= '.gif';
+        } else {
+            $imageName .= $ext;
+        }
+
+        // trap alt attributes in other_attributes
+        if(preg_match('/alt=["\']([^\'"]+)["\']/i', $other_attributes))
+            $GLOBALS['log']->debug("Sprites: alt attribute detected for $imageName");
+        // sprite handler, makes use of own caching mechanism
+        if(!empty($GLOBALS['sugar_config']['use_sprites']) && $GLOBALS['sugar_config']['use_sprites']) {
+            // get sprite metadata
+            if($sp = $this->getSpriteMeta($imageName)) {
+                // requested size should match
+                if( (!is_null($width) && $sp['width'] == $width) || (is_null($width)) &&
+                    (!is_null($height) && $sp['height'] == $height) || (is_null($height)) )
+                {
                     $other_attributes .= ' data-orig="'.$imageName.'"';
 
-                     if($sprite = $this->getSprite($sp['class'], $other_attributes, $alt))
-                     {
-                         return $sprite;
-                     }
-				}
-			}
-		}
-
-		// img caching
-		if(empty($cached_results[$imageName])) {
-			$imageURL = $this->getImageURL($imageName,false);
-			if ( empty($imageURL) )
-				return false;
+                        if($sprite = $this->getSprite($sp['class'], $other_attributes, $alt))
+                        {
+                            return $sprite;
+                        }
+                }
+            }
+        }
+
+        // img caching
+        if(empty($cached_results[$imageName])) {
+            $imageURL = $this->getImageURL($imageName,false);
+            if ( empty($imageURL) )
+                return false;
             if(strpos($imageURL, '.svg', strlen($imageURL)-4)){
                 $cached_results[$imageName] = file_get_contents($imageURL);
             } else {
                 $cached_results[$imageName] = '<img src="'.getJSPath($imageURL).'" ';
             }
 
-		}
+        }
 
-		$attr_width = (is_null($width)) ? "" : "width=\"$width\"";
-		$attr_height = (is_null($height)) ? "" : "height=\"$height\"";
+        $attr_width = (is_null($width)) ? "" : "width=\"$width\"";
+        $attr_height = (is_null($height)) ? "" : "height=\"$height\"";
 
         if(strpos($cached_results[$imageName], 'svg') !== false){
             return $cached_results[$imageName];
         }
-		return $cached_results[$imageName] . " $attr_width $attr_height $other_attributes alt=\"$alt\" />";
+        return $cached_results[$imageName] . " $attr_width $attr_height $other_attributes alt=\"$alt\" />";
+    }
+
+    /**
+     * Returns sprite meta data
+     *
+     * @param  string $imageName Image filename including extension
+     * @return array  Sprite meta data
+     */
+    public function getSpriteMeta($imageName) {
+
+        // return from cache
+        if(isset($this->_spriteCache[$imageName]))
+            return $this->_spriteCache[$imageName];
+
+            // sprite keys are base on imageURL
+        $imageURL = $this->getImageURL($imageName,false);
+        if(empty($imageURL)) {
+            $this->_spriteCache[$imageName] = false;
+            return false;
+        }
+
+        // load meta data, includes default images
+        require_once("include/SugarTheme/SugarSprites.php");
+        $meta = SugarSprites::getInstance();
+        // add current theme dir
+        $meta->loadSpriteMeta($this->dirName);
+        // add parent theme dir
+        if($this->parentTheme && $parent = SugarThemeRegistry::get($this->parentTheme)) {
+            $meta->loadSpriteMeta($parent->dirName);
+        }
+
+        // add to cache
+        if(isset($meta->sprites[$imageURL])) {
+            $this->_spriteCache[$imageName] = $meta->sprites[$imageURL];
+            // add imageURL to cache
+            //$this->_spriteCache[$imageName]['imageURL'] = $imageURL;
+        } else {
+            $this->_spriteCache[$imageName] = false;
+            $GLOBALS['log']->debug("Sprites: miss for $imageURL");
+        }
+        return $this->_spriteCache[$imageName];
+    }
+
+    /**
+     * Returns sprite HTML span tag
+     *
+     * @param  string class The md5 id used in the CSS sprites class
+     * @param  string attr  optional, list of additional html attributes
+     * @param  string title optional, the title (equivalent to alt on img)
+     * @return string HTML span tag
+     */
+    public function getSprite($class, $attr, $title) {
+
+        // handle multiple class tags
+        $class_regex = '/class=["\']([^\'"]+)["\']/i';
+        preg_match($class_regex, $attr, $match);
+        if(isset($match[1])) {
+            $attr = preg_replace($class_regex, 'class="spr_'.$class.' ${1}"', $attr);
+
+        // single class
+        } else {
+            $attr .= ' class="spr_'.$class.'"';
+        }
+
+        if($title)
+            $attr .= ' title="'.$title.'"';
+
+        // use </span> instead of /> to prevent weird UI results
+        $GLOBALS['log']->debug("Sprites: generated sprite -> $attr");
+        return "<span {$attr}></span>";
     }
 
-	/**
-	 * Returns sprite meta data
-	 *
-	 * @param  string $imageName Image filename including extension
-	 * @return array  Sprite meta data
-	 */
-	public function getSpriteMeta($imageName) {
-
-		// return from cache
-	    if(isset($this->_spriteCache[$imageName]))
-			return $this->_spriteCache[$imageName];
-
-			// sprite keys are base on imageURL
-		$imageURL = $this->getImageURL($imageName,false);
-		if(empty($imageURL)) {
-			$this->_spriteCache[$imageName] = false;
-			return false;
-		}
-
-		// load meta data, includes default images
-		require_once("include/SugarTheme/SugarSprites.php");
-		$meta = SugarSprites::getInstance();
-		// add current theme dir
-		$meta->loadSpriteMeta($this->dirName);
-		// add parent theme dir
-		if($this->parentTheme && $parent = SugarThemeRegistry::get($this->parentTheme)) {
-			$meta->loadSpriteMeta($parent->dirName);
-		}
-
-		// add to cache
-		if(isset($meta->sprites[$imageURL])) {
-			$this->_spriteCache[$imageName] = $meta->sprites[$imageURL];
-			// add imageURL to cache
-			//$this->_spriteCache[$imageName]['imageURL'] = $imageURL;
-		} else {
-			$this->_spriteCache[$imageName] = false;
-			$GLOBALS['log']->debug("Sprites: miss for $imageURL");
-		}
-		return $this->_spriteCache[$imageName];
-	}
-
-	/**
-	 * Returns sprite HTML span tag
-	 *
-	 * @param  string class The md5 id used in the CSS sprites class
-	 * @param  string attr  optional, list of additional html attributes
-	 * @param  string title optional, the title (equivalent to alt on img)
-	 * @return string HTML span tag
-	 */
-	public function getSprite($class, $attr, $title) {
-
-		// handle multiple class tags
-		$class_regex = '/class=["\']([^\'"]+)["\']/i';
-		preg_match($class_regex, $attr, $match);
-		if(isset($match[1])) {
-			$attr = preg_replace($class_regex, 'class="spr_'.$class.' ${1}"', $attr);
-
-		// single class
-		} else {
-			$attr .= ' class="spr_'.$class.'"';
-		}
-
-		if($title)
-			$attr .= ' title="'.$title.'"';
-
-		// use </span> instead of /> to prevent weird UI results
-		$GLOBALS['log']->debug("Sprites: generated sprite -> $attr");
-		return "<span {$attr}></span>";
-	}
-
-	/**
-	 * Returns a link HTML tag with or without an embedded image
-	 */
+    /**
+     * Returns a link HTML tag with or without an embedded image
+     */
     public function getLink(
-		$url,
-		$title,
-		$other_attributes = '',
+        $url,
+        $title,
+        $other_attributes = '',
         $img_name = '',
         $img_other_attributes = '',
-		$img_width = null,
-		$img_height = null,
-		$img_alt = '',
-		$img_placement = 'imageonly'
+        $img_width = null,
+        $img_height = null,
+        $img_alt = '',
+        $img_placement = 'imageonly'
     )
     {
 
-		if($img_name) {
-			$img = $this->getImage($img_name, $img_other_attributes, $img_width, $img_height, null, $img_alt);
-			if($img == false) {
-				$GLOBALS['log']->debug('Sprites: unknown image getLink');
-				$img = 'unknown';
-			}
-			switch($img_placement) {
-				case 'left': 	$inner_html = $img."<span class='title'>".$title."</span>"; break;
-				case 'right':	$inner_html = "<span class='title'>".$title."</span>".$img; break;
-				default:		$inner_html = $img; break;
-			}
-		} else {
-			$inner_html = $title;
-		}
+        if($img_name) {
+            $img = $this->getImage($img_name, $img_other_attributes, $img_width, $img_height, null, $img_alt);
+            if($img == false) {
+                $GLOBALS['log']->debug('Sprites: unknown image getLink');
+                $img = 'unknown';
+            }
+            switch($img_placement) {
+                case 'left': 	$inner_html = $img."<span class='title'>".$title."</span>"; break;
+                case 'right':	$inner_html = "<span class='title'>".$title."</span>".$img; break;
+                default:		$inner_html = $img; break;
+            }
+        } else {
+            $inner_html = $title;
+        }
 
-		return '<a href="'.$url.'" title="'.$title.'" '.$other_attributes.'>'.$inner_html.'</a>';
+        return '<a href="'.$url.'" title="'.$title.'" '.$other_attributes.'>'.$inner_html.'</a>';
 
-	}
+    }
 
     /**
      * Returns the URL for an image in the current theme. If not found in the current theme, will revert
@@ -905,8 +905,8 @@ 
             $imagePath = $filename;
         elseif (($filename = $this->_getImageFileName($this->getDefaultImagePath().'/'.$imageName)) != '')
             $imagePath = $filename;
-		elseif (($filename = $this->_getImageFileName('include/images/'.$imageName)) != '')
-			$imagePath = $filename;
+        elseif (($filename = $this->_getImageFileName('include/images/'.$imageName)) != '')
+            $imagePath = $filename;
         else {
             $GLOBALS['log']->warn("Image $imageName not found");
             return false;
@@ -1040,8 +1040,8 @@ 
         if (isset($this->parentTheme)
                 && SugarThemeRegistry::get($this->parentTheme) instanceOf SugarTheme
                 && ($filename = SugarThemeRegistry::get($this->parentTheme)->getJSURL($jsFileName,false)) != ''    && !in_array($jsFileName,$this->ignoreParentFiles)) {
-           $jsFileContents .= file_get_contents($filename);
-       } else {
+            $jsFileContents .= file_get_contents($filename);
+        } else {
             if (sugar_is_file($defaultFileName))
                 $jsFileContents .= file_get_contents($defaultFileName);
             if (sugar_is_file('custom/'.$defaultFileName))

include/SugarObjects/LanguageManager.php

Indentation +201 added lines, -201 removed lines

@@ -44,226 +44,226 @@ 
 class LanguageManager
 {
 
-	/**
-	 * Called from VardefManager to allow for caching a lang file for a module
-	 * @param module - the name of the module we are working with
-	 * @param templates - an array of templates this module uses
-	 */
-	static function createLanguageFile($module , $templates=array('default'), $refresh = false){
-		global $mod_strings, $current_language;
-		if(inDeveloperMode() || !empty($_SESSION['developerMode'])){
-        	$refresh = true;
-    	}
-		$temp_mod_strings = $mod_strings;
-		$lang = $current_language;
+    /**
+     * Called from VardefManager to allow for caching a lang file for a module
+     * @param module - the name of the module we are working with
+     * @param templates - an array of templates this module uses
+     */
+    static function createLanguageFile($module , $templates=array('default'), $refresh = false){
+        global $mod_strings, $current_language;
+        if(inDeveloperMode() || !empty($_SESSION['developerMode'])){
+            $refresh = true;
+        }
+        $temp_mod_strings = $mod_strings;
+        $lang = $current_language;
         if(empty($lang))
             $lang = $GLOBALS['sugar_config']['default_language'];
-		static $createdModules = array();
-		if(empty($createdModules[$module]) && ($refresh || !file_exists(sugar_cached('modules/').$module.'/language/'.$lang.'.lang.php'))){
-			$loaded_mod_strings = array();
-			$loaded_mod_strings = LanguageManager::loadTemplateLanguage($module , $templates, $lang , $loaded_mod_strings);
-			$createdModules[$module] = true;
-			LanguageManager::refreshLanguage($module,$lang, $loaded_mod_strings);
-		}
-	}
+        static $createdModules = array();
+        if(empty($createdModules[$module]) && ($refresh || !file_exists(sugar_cached('modules/').$module.'/language/'.$lang.'.lang.php'))){
+            $loaded_mod_strings = array();
+            $loaded_mod_strings = LanguageManager::loadTemplateLanguage($module , $templates, $lang , $loaded_mod_strings);
+            $createdModules[$module] = true;
+            LanguageManager::refreshLanguage($module,$lang, $loaded_mod_strings);
+        }
+    }
 
-	/**
-	 * Load the module  tempalte lauguage files
-	 * @param module - the name of the module we are working with
-	 * @param templates - an array of templates this module uses
-	 * @param lang - current language this module use
-	 * @param loaded_mod_strings - the string that we will add the module template language  into
-	 */
-	static function loadTemplateLanguage($module , $templates , $lang, $loaded_mod_strings){
-		$templates = array_reverse($templates);
-		foreach($templates as $template){
-			$temp = LanguageManager::addTemplate($module,$lang, $template);
-			$loaded_mod_strings = sugarLangArrayMerge($loaded_mod_strings, $temp);
-		}
-		return $loaded_mod_strings;
-	}
+    /**
+     * Load the module  tempalte lauguage files
+     * @param module - the name of the module we are working with
+     * @param templates - an array of templates this module uses
+     * @param lang - current language this module use
+     * @param loaded_mod_strings - the string that we will add the module template language  into
+     */
+    static function loadTemplateLanguage($module , $templates , $lang, $loaded_mod_strings){
+        $templates = array_reverse($templates);
+        foreach($templates as $template){
+            $temp = LanguageManager::addTemplate($module,$lang, $template);
+            $loaded_mod_strings = sugarLangArrayMerge($loaded_mod_strings, $temp);
+        }
+        return $loaded_mod_strings;
+    }
 
-	static function addTemplate($module, $lang, $template){
-		if($template == 'default')$template = 'basic';
-		$templates = array();
-		$fields = array();
-		if(empty($templates[$template])){
-			$path = 'include/SugarObjects/templates/' . $template . '/language/'.$lang.'.lang.php';
-			if(file_exists($path)){
-				require($path);
-				$templates[$template] = $mod_strings;
-			}else{
-				$path = 'include/SugarObjects/implements/' . $template . '/language/'.$lang.'.lang.php';
-				if(file_exists($path)){
-					require($path);
-					$templates[$template] = $mod_strings;
-				}
-			}
-		}
-		if(!empty($templates[$template])){
-			return $templates[$template];
-		}
-	}
+    static function addTemplate($module, $lang, $template){
+        if($template == 'default')$template = 'basic';
+        $templates = array();
+        $fields = array();
+        if(empty($templates[$template])){
+            $path = 'include/SugarObjects/templates/' . $template . '/language/'.$lang.'.lang.php';
+            if(file_exists($path)){
+                require($path);
+                $templates[$template] = $mod_strings;
+            }else{
+                $path = 'include/SugarObjects/implements/' . $template . '/language/'.$lang.'.lang.php';
+                if(file_exists($path)){
+                    require($path);
+                    $templates[$template] = $mod_strings;
+                }
+            }
+        }
+        if(!empty($templates[$template])){
+            return $templates[$template];
+        }
+    }
 
-	static function saveCache($module,$lang, $loaded_mod_strings, $additonal_objects= array()){
-		if(empty($lang))
-			$lang = $GLOBALS['sugar_config']['default_language'];
+    static function saveCache($module,$lang, $loaded_mod_strings, $additonal_objects= array()){
+        if(empty($lang))
+            $lang = $GLOBALS['sugar_config']['default_language'];
 
-		$file = create_cache_directory('modules/' . $module . '/language/'.$lang.'.lang.php');
-		write_array_to_file('mod_strings',$loaded_mod_strings, $file);
-		include($file);
+        $file = create_cache_directory('modules/' . $module . '/language/'.$lang.'.lang.php');
+        write_array_to_file('mod_strings',$loaded_mod_strings, $file);
+        include($file);
 
-		// put the item in the sugar cache.
-		$key = self::getLanguageCacheKey($module,$lang);
-		sugar_cache_put($key,$loaded_mod_strings);
-	}
+        // put the item in the sugar cache.
+        $key = self::getLanguageCacheKey($module,$lang);
+        sugar_cache_put($key,$loaded_mod_strings);
+    }
 
-	/**
-	 * clear out the language cache.
-	 * @param string module_dir the module_dir to clear, if not specified then clear
-	 *                      clear language cache for all modules.
-	 * @param string lang the name of the object we are clearing this is for sugar_cache
-	 */
-	static function clearLanguageCache($module_dir = '', $lang = ''){
-		if(empty($lang)) {
-			$languages = array_keys($GLOBALS['sugar_config']['languages']);
-		} else {
-			$languages = array($lang);
-		}
-		//if we have a module name specified then just remove that language file
-		//otherwise go through each module and clean up the language
-		if(!empty($module_dir)) {
-			foreach($languages as $clean_lang) {
-				LanguageManager::_clearCache($module_dir, $clean_lang);
-			}
-		} else {
-			$cache_dir = sugar_cached('modules/');
-			if(file_exists($cache_dir) && $dir = @opendir($cache_dir)) {
-				while(($entry = readdir($dir)) !== false) {
-					if ($entry == "." || $entry == "..") continue;
-						foreach($languages as $clean_lang) {
-							LanguageManager::_clearCache($entry, $clean_lang);
-						}
-				}
-				closedir($dir);
-			}
-		}
-	}
+    /**
+     * clear out the language cache.
+     * @param string module_dir the module_dir to clear, if not specified then clear
+     *                      clear language cache for all modules.
+     * @param string lang the name of the object we are clearing this is for sugar_cache
+     */
+    static function clearLanguageCache($module_dir = '', $lang = ''){
+        if(empty($lang)) {
+            $languages = array_keys($GLOBALS['sugar_config']['languages']);
+        } else {
+            $languages = array($lang);
+        }
+        //if we have a module name specified then just remove that language file
+        //otherwise go through each module and clean up the language
+        if(!empty($module_dir)) {
+            foreach($languages as $clean_lang) {
+                LanguageManager::_clearCache($module_dir, $clean_lang);
+            }
+        } else {
+            $cache_dir = sugar_cached('modules/');
+            if(file_exists($cache_dir) && $dir = @opendir($cache_dir)) {
+                while(($entry = readdir($dir)) !== false) {
+                    if ($entry == "." || $entry == "..") continue;
+                        foreach($languages as $clean_lang) {
+                            LanguageManager::_clearCache($entry, $clean_lang);
+                        }
+                }
+                closedir($dir);
+            }
+        }
+    }
 
-	/**
-	 * PRIVATE function used within clearLanguageCache so we do not repeat logic
-	 * @param string module_dir the module_dir to clear
-	 * @param string lang the name of the language file we are clearing this is for sugar_cache
-	 */
-	static function _clearCache($module_dir = '', $lang){
-		if(!empty($module_dir) && !empty($lang)){
-			$file = sugar_cached('modules/').$module_dir.'/language/'.$lang.'.lang.php';
-			if(file_exists($file)){
-				unlink($file);
-				$key = self::getLanguageCacheKey($module_dir,$lang);
-				sugar_cache_clear($key);
-			}
-		}
-	}
+    /**
+     * PRIVATE function used within clearLanguageCache so we do not repeat logic
+     * @param string module_dir the module_dir to clear
+     * @param string lang the name of the language file we are clearing this is for sugar_cache
+     */
+    static function _clearCache($module_dir = '', $lang){
+        if(!empty($module_dir) && !empty($lang)){
+            $file = sugar_cached('modules/').$module_dir.'/language/'.$lang.'.lang.php';
+            if(file_exists($file)){
+                unlink($file);
+                $key = self::getLanguageCacheKey($module_dir,$lang);
+                sugar_cache_clear($key);
+            }
+        }
+    }
 
-	/**
-	 * Given a module, search all of the specified locations, and any others as specified
-	 * in order to refresh the cache file
-	 *
-	 * @param string $module the given module we want to load the vardefs for
-	 * @param string $lang the given language we wish to load
-	 * @param array $additional_search_paths an array which allows a consumer to pass in additional vardef locations to search
-	 */
-	static function refreshLanguage($module, $lang, $loaded_mod_strings = array(), $additional_search_paths = null){
-		// Some of the vardefs do not correctly define dictionary as global.  Declare it first.
-		$lang_paths = array(
-					'modules/'.$module.'/language/'.$lang.'.lang.php',
-					'modules/'.$module.'/language/'.$lang.'.lang.override.php',
-					'custom/modules/'.$module.'/language/'.$lang.'.lang.php',
-					'custom/modules/'.$module.'/Ext/Language/'.$lang.'.lang.ext.php',
-				 );
+    /**
+     * Given a module, search all of the specified locations, and any others as specified
+     * in order to refresh the cache file
+     *
+     * @param string $module the given module we want to load the vardefs for
+     * @param string $lang the given language we wish to load
+     * @param array $additional_search_paths an array which allows a consumer to pass in additional vardef locations to search
+     */
+    static function refreshLanguage($module, $lang, $loaded_mod_strings = array(), $additional_search_paths = null){
+        // Some of the vardefs do not correctly define dictionary as global.  Declare it first.
+        $lang_paths = array(
+                    'modules/'.$module.'/language/'.$lang.'.lang.php',
+                    'modules/'.$module.'/language/'.$lang.'.lang.override.php',
+                    'custom/modules/'.$module.'/language/'.$lang.'.lang.php',
+                    'custom/modules/'.$module.'/Ext/Language/'.$lang.'.lang.ext.php',
+                    );
 
-		#27023, if this module template language file was not attached , get the template from this module vardef cache file if exsits and load the template language files.
-		static $createdModules;
-		if(empty($createdModules[$module]) && isset($GLOBALS['beanList'][$module])){
-				$object = $GLOBALS['beanList'][$module];
+        #27023, if this module template language file was not attached , get the template from this module vardef cache file if exsits and load the template language files.
+        static $createdModules;
+        if(empty($createdModules[$module]) && isset($GLOBALS['beanList'][$module])){
+                $object = $GLOBALS['beanList'][$module];
 
-				if ($object == 'aCase')
-		            $object = 'Case';
+                if ($object == 'aCase')
+                    $object = 'Case';
 
-		        if(!empty($GLOBALS["dictionary"]["$object"]["templates"])){
-		        	$templates = $GLOBALS["dictionary"]["$object"]["templates"];
-					$loaded_mod_strings = LanguageManager::loadTemplateLanguage($module , $templates, $lang , $loaded_mod_strings);
-					$createdModules[$module] = true;
-		        }
-		}
-		//end of fix #27023
+                if(!empty($GLOBALS["dictionary"]["$object"]["templates"])){
+                    $templates = $GLOBALS["dictionary"]["$object"]["templates"];
+                    $loaded_mod_strings = LanguageManager::loadTemplateLanguage($module , $templates, $lang , $loaded_mod_strings);
+                    $createdModules[$module] = true;
+                }
+        }
+        //end of fix #27023
 
-		// Add in additional search paths if they were provided.
-		if(!empty($additional_search_paths) && is_array($additional_search_paths))
-		{
-			$lang_paths = array_merge($lang_paths, $additional_search_paths);
-		}
+        // Add in additional search paths if they were provided.
+        if(!empty($additional_search_paths) && is_array($additional_search_paths))
+        {
+            $lang_paths = array_merge($lang_paths, $additional_search_paths);
+        }
 
-		//search a predefined set of locations for the vardef files
-		foreach($lang_paths as $path){
-			if(file_exists($path)){
-				require($path);
-				if(!empty($mod_strings)){
-					if (function_exists('sugarArrayMergeRecursive')){
-						$loaded_mod_strings = sugarArrayMergeRecursive($loaded_mod_strings, $mod_strings);
-					}
-					else{
-						$loaded_mod_strings = sugarLangArrayMerge($loaded_mod_strings, $mod_strings);
-					}
-				}
-			}
-		}
+        //search a predefined set of locations for the vardef files
+        foreach($lang_paths as $path){
+            if(file_exists($path)){
+                require($path);
+                if(!empty($mod_strings)){
+                    if (function_exists('sugarArrayMergeRecursive')){
+                        $loaded_mod_strings = sugarArrayMergeRecursive($loaded_mod_strings, $mod_strings);
+                    }
+                    else{
+                        $loaded_mod_strings = sugarLangArrayMerge($loaded_mod_strings, $mod_strings);
+                    }
+                }
+            }
+        }
 
-		//great! now that we have loaded all of our vardefs.
-		//let's go save them to the cache file.
-		if(!empty($loaded_mod_strings))
-			LanguageManager::saveCache($module, $lang, $loaded_mod_strings);
-	}
+        //great! now that we have loaded all of our vardefs.
+        //let's go save them to the cache file.
+        if(!empty($loaded_mod_strings))
+            LanguageManager::saveCache($module, $lang, $loaded_mod_strings);
+    }
 
-	static function loadModuleLanguage($module, $lang, $refresh=false){
-		//here check if the cache file exists, if it does then load it, if it doesn't
-		//then call refreshVardef
-		//if either our session or the system is set to developerMode then refresh is set to true
+    static function loadModuleLanguage($module, $lang, $refresh=false){
+        //here check if the cache file exists, if it does then load it, if it doesn't
+        //then call refreshVardef
+        //if either our session or the system is set to developerMode then refresh is set to true
 
-		// Retrieve the vardefs from cache.
-		$key = self::getLanguageCacheKey($module,$lang);
+        // Retrieve the vardefs from cache.
+        $key = self::getLanguageCacheKey($module,$lang);
 
-		if(!$refresh)
-		{
-			$return_result = sugar_cache_retrieve($key);
-			if(!empty($return_result) && is_array($return_result)){
-				return $return_result;
-			}
-		}
+        if(!$refresh)
+        {
+            $return_result = sugar_cache_retrieve($key);
+            if(!empty($return_result) && is_array($return_result)){
+                return $return_result;
+            }
+        }
 
-		// Some of the vardefs do not correctly define dictionary as global.  Declare it first.
-		$cachedfile = sugar_cached('modules/').$module.'/language/'.$lang.'.lang.php';
-		if($refresh || !file_exists($cachedfile)){
-			LanguageManager::refreshLanguage($module, $lang);
-		}
+        // Some of the vardefs do not correctly define dictionary as global.  Declare it first.
+        $cachedfile = sugar_cached('modules/').$module.'/language/'.$lang.'.lang.php';
+        if($refresh || !file_exists($cachedfile)){
+            LanguageManager::refreshLanguage($module, $lang);
+        }
 
-		//at this point we should have the cache/modules/... file
-		//which was created from the refreshVardefs so let's try to load it.
-		if(file_exists($cachedfile)){
-			global $mod_strings;
+        //at this point we should have the cache/modules/... file
+        //which was created from the refreshVardefs so let's try to load it.
+        if(file_exists($cachedfile)){
+            global $mod_strings;
 
-			require $cachedfile;
+            require $cachedfile;
 
-			// now that we hae loaded the data from disk, put it in the cache.
-			if(!empty($mod_strings))
-				sugar_cache_put($key,$mod_strings);
-			if(!empty($_SESSION['translation_mode'])){
-				$mod_strings = array_map('translated_prefix', $mod_strings);
-			}
-			return $mod_strings;
-		}
-	}
+            // now that we hae loaded the data from disk, put it in the cache.
+            if(!empty($mod_strings))
+                sugar_cache_put($key,$mod_strings);
+            if(!empty($_SESSION['translation_mode'])){
+                $mod_strings = array_map('translated_prefix', $mod_strings);
+            }
+            return $mod_strings;
+        }
+    }
 
     /**
      * Return the cache key for the module language definition
@@ -274,9 +274,9 @@ 
      * @return string
      */
     public static function getLanguageCacheKey($module, $lang)
-	{
-         return "LanguageManager.$module.$lang";
-	}
+    {
+            return "LanguageManager.$module.$lang";
+    }
 
     /**
      * Remove any cached js language strings.
@@ -302,5 +302,5 @@ 
 }
 
 function translated_prefix($key){
-	return '[translated]' . $key;
+    return '[translated]' . $key;
 }

include/SugarObjects/VardefManager.php

Indentation +7 added lines, -7 removed lines

@@ -89,9 +89,9 @@ 
      */
     public static function setCustomAllowedForModule($module, $enable) {
         if ($enable && isset($custom_disabled_modules[$module])) {
-              unset($custom_disabled_modules[$module]);
+                unset($custom_disabled_modules[$module]);
         } else if (!$enable) {
-              $custom_disabled_modules[$module] = true;
+                $custom_disabled_modules[$module] = true;
         }
     }
 
@@ -236,7 +236,7 @@ 
                     'modules/'.$module.'/vardefs.php',
                     'custom/modules/'.$module.'/Ext/Vardefs/vardefs.ext.php',
                     'custom/Extension/modules/'.$module.'/Ext/Vardefs/vardefs.php'
-                 );
+                    );
 
         // Add in additional search paths if they were provided.
         if(!empty($additional_search_paths) && is_array($additional_search_paths))
@@ -426,10 +426,10 @@ 
             //if the consumer has demanded a refresh or the cache/modules... file
             //does not exist, then we should do out and try to reload things
 
-			$cachedfile = sugar_cached('modules/'). $module . '/' . $object . 'vardefs.php';
-			if($refresh || !file_exists($cachedfile)){
-				VardefManager::refreshVardefs($module, $object, null, true, $params);
-			}
+            $cachedfile = sugar_cached('modules/'). $module . '/' . $object . 'vardefs.php';
+            if($refresh || !file_exists($cachedfile)){
+                VardefManager::refreshVardefs($module, $object, null, true, $params);
+            }
 
             //at this point we should have the cache/modules/... file
             //which was created from the refreshVardefs so let's try to load it.

include/SugarObjects/templates/basic/vardefs.php

Indentation +136 added lines, -136 removed lines

@@ -39,141 +39,141 @@ 
 
 $vardefs = array(  
 'fields' => array (
-	  'id' =>
-	  array (
-	    'name' => 'id',
-	    'vname' => 'LBL_ID',
-	    'type' => 'id',
-	    'required'=>true,
-	    'reportable'=>true,
-	    'comment' => 'Unique identifier',
-		'inline_edit' => false,
-	  ),
-	  'name'=>
-	    array(
-	    'name'=>'name',
-	    'vname'=> 'LBL_NAME',
-	    'type'=>'name',
-	    'link' => true, // bug 39288 
-		'dbType' => 'varchar',
-	    'len'=>255,
+        'id' =>
+        array (
+        'name' => 'id',
+        'vname' => 'LBL_ID',
+        'type' => 'id',
+        'required'=>true,
+        'reportable'=>true,
+        'comment' => 'Unique identifier',
+        'inline_edit' => false,
+        ),
+        'name'=>
+        array(
+        'name'=>'name',
+        'vname'=> 'LBL_NAME',
+        'type'=>'name',
+        'link' => true, // bug 39288 
+        'dbType' => 'varchar',
+        'len'=>255,
         'unified_search' => true,
         'full_text_search' => array('boost' => 3),
         'required'=>true,
-		'importable' => 'required',
+        'importable' => 'required',
         'duplicate_merge' => 'enabled',
         //'duplicate_merge_dom_value' => '3',
         'merge_filter' => 'selected',
-	    ),
-	  'date_entered' =>
-	  array (
-	    'name' => 'date_entered',
-	    'vname' => 'LBL_DATE_ENTERED',
-	    'type' => 'datetime',
-	    'group'=>'created_by_name',
-	    'comment' => 'Date record created',
-	    'enable_range_search' => true,
-	  	'options' => 'date_range_search_dom',
-		'inline_edit' => false,
-	  ),
-	  'date_modified' =>
-	  array (
-	    'name' => 'date_modified',
-	    'vname' => 'LBL_DATE_MODIFIED',
-	    'type' => 'datetime',
-	    'group'=>'modified_by_name',
-	    'comment' => 'Date record last modified',
-	    'enable_range_search' => true,
-	    'options' => 'date_range_search_dom',
-		'inline_edit' => false,
-	  ),
-		'modified_user_id' =>
-	  array (
-	    'name' => 'modified_user_id',
-	    'rname' => 'user_name',
-	    'id_name' => 'modified_user_id',
-	    'vname' => 'LBL_MODIFIED',
-	    'type' => 'assigned_user_name',
-	    'table' => 'users',
-	    'isnull' => 'false',
-	     'group'=>'modified_by_name',
-	    'dbType' => 'id',
-	    'reportable'=>true,
-	    'comment' => 'User who last modified record',
+        ),
+        'date_entered' =>
+        array (
+        'name' => 'date_entered',
+        'vname' => 'LBL_DATE_ENTERED',
+        'type' => 'datetime',
+        'group'=>'created_by_name',
+        'comment' => 'Date record created',
+        'enable_range_search' => true,
+            'options' => 'date_range_search_dom',
+        'inline_edit' => false,
+        ),
+        'date_modified' =>
+        array (
+        'name' => 'date_modified',
+        'vname' => 'LBL_DATE_MODIFIED',
+        'type' => 'datetime',
+        'group'=>'modified_by_name',
+        'comment' => 'Date record last modified',
+        'enable_range_search' => true,
+        'options' => 'date_range_search_dom',
+        'inline_edit' => false,
+        ),
+        'modified_user_id' =>
+        array (
+        'name' => 'modified_user_id',
+        'rname' => 'user_name',
+        'id_name' => 'modified_user_id',
+        'vname' => 'LBL_MODIFIED',
+        'type' => 'assigned_user_name',
+        'table' => 'users',
+        'isnull' => 'false',
+            'group'=>'modified_by_name',
+        'dbType' => 'id',
+        'reportable'=>true,
+        'comment' => 'User who last modified record',
         'massupdate' => false,
-		'inline_edit' => false,
-	  ),
-	  'modified_by_name' => 
-	  array (
-	    'name' => 'modified_by_name',
-	    'vname' => 'LBL_MODIFIED_NAME',
-	    'type' => 'relate',
-	    'reportable'=>false,
-	    'source'=>'non-db',
-	    'rname'=>'user_name',
-	    'table' => 'users',
-	    'id_name' => 'modified_user_id',
-	    'module'=>'Users',
-	    'link'=>'modified_user_link',
-	    'duplicate_merge'=>'disabled',
+        'inline_edit' => false,
+        ),
+        'modified_by_name' => 
+        array (
+        'name' => 'modified_by_name',
+        'vname' => 'LBL_MODIFIED_NAME',
+        'type' => 'relate',
+        'reportable'=>false,
+        'source'=>'non-db',
+        'rname'=>'user_name',
+        'table' => 'users',
+        'id_name' => 'modified_user_id',
+        'module'=>'Users',
+        'link'=>'modified_user_link',
+        'duplicate_merge'=>'disabled',
         'massupdate' => false,
-		'inline_edit' => false,
-	  ),  
-	  'created_by' =>
-	  array (
-	    'name' => 'created_by',
-	    'rname' => 'user_name',
-	    'id_name' => 'modified_user_id',
-	    'vname' => 'LBL_CREATED',
-	    'type' => 'assigned_user_name',
-	    'table' => 'users',
-	    'isnull' => 'false',
-	    'dbType' => 'id',
-	    'group'=>'created_by_name',
-	    'comment' => 'User who created record',
+        'inline_edit' => false,
+        ),  
+        'created_by' =>
+        array (
+        'name' => 'created_by',
+        'rname' => 'user_name',
+        'id_name' => 'modified_user_id',
+        'vname' => 'LBL_CREATED',
+        'type' => 'assigned_user_name',
+        'table' => 'users',
+        'isnull' => 'false',
+        'dbType' => 'id',
+        'group'=>'created_by_name',
+        'comment' => 'User who created record',
         'massupdate' => false,
-		'inline_edit' => false,
-	  ),
-	  'created_by_name' =>
-	  array (
-	    'name' => 'created_by_name',
-		'vname' => 'LBL_CREATED',
-		'type' => 'relate',
-		'reportable'=>false,
-	    'link' => 'created_by_link',
-	    'rname' => 'user_name',
-		'source'=>'non-db',
-		'table' => 'users',
-		'id_name' => 'created_by',
-		'module'=>'Users',
-		'duplicate_merge'=>'disabled',
+        'inline_edit' => false,
+        ),
+        'created_by_name' =>
+        array (
+        'name' => 'created_by_name',
+        'vname' => 'LBL_CREATED',
+        'type' => 'relate',
+        'reportable'=>false,
+        'link' => 'created_by_link',
+        'rname' => 'user_name',
+        'source'=>'non-db',
+        'table' => 'users',
+        'id_name' => 'created_by',
+        'module'=>'Users',
+        'duplicate_merge'=>'disabled',
         'importable' => 'false',
         'massupdate' => false,
-		'inline_edit' => false,
-	),
-	  'description' =>
-	  array (
-	    'name' => 'description',
-	    'vname' => 'LBL_DESCRIPTION',
-	    'type' => 'text',
-	    'comment' => 'Full text of the note',
-	    'rows' => 6,
-	    'cols' => 80,
-	  ),
-	  'deleted' =>
-	  array (
-	    'name' => 'deleted',
-	    'vname' => 'LBL_DELETED',
-	    'type' => 'bool',
-	    'default' => '0',
-	    'reportable'=>false,
-	    'comment' => 'Record deletion indicator'
-	  ),
+        'inline_edit' => false,
+    ),
+        'description' =>
+        array (
+        'name' => 'description',
+        'vname' => 'LBL_DESCRIPTION',
+        'type' => 'text',
+        'comment' => 'Full text of the note',
+        'rows' => 6,
+        'cols' => 80,
+        ),
+        'deleted' =>
+        array (
+        'name' => 'deleted',
+        'vname' => 'LBL_DELETED',
+        'type' => 'bool',
+        'default' => '0',
+        'reportable'=>false,
+        'comment' => 'Record deletion indicator'
+        ),
 	    
 /////////////////RELATIONSHIP LINKS////////////////////////////
-	  'created_by_link' =>
-  array (
-     'name' => 'created_by_link',
+        'created_by_link' =>
+    array (
+        'name' => 'created_by_link',
     'type' => 'link',
     'relationship' => strtolower($module) . '_created_by',
     'vname' => 'LBL_CREATED_USER',
@@ -181,9 +181,9 @@ 
     'module'=>'Users',
     'bean_name'=>'User',
     'source'=>'non-db',
-  ),
-  'modified_user_link' =>
-  array (
+    ),
+    'modified_user_link' =>
+    array (
         'name' => 'modified_user_link',
     'type' => 'link',
     'relationship' => strtolower($module). '_modified_user',
@@ -192,21 +192,21 @@ 
     'module'=>'Users',
     'bean_name'=>'User',
     'source'=>'non-db',
-  ),
+    ),
 
 ),
 'indices' => array (
-       'id'=>array('name' =>strtolower($module).'pk', 'type' =>'primary', 'fields'=>array('id')),
-       ),
+        'id'=>array('name' =>strtolower($module).'pk', 'type' =>'primary', 'fields'=>array('id')),
+        ),
 'relationships'=>array(
-	strtolower($module).'_modified_user' =>
-   array('lhs_module'=> 'Users', 'lhs_table'=> 'users', 'lhs_key' => 'id',
-   'rhs_module'=> $module, 'rhs_table'=> strtolower($module), 'rhs_key' => 'modified_user_id',
-   'relationship_type'=>'one-to-many')
-   ,strtolower($module).'_created_by' =>
-   array('lhs_module'=> 'Users', 'lhs_table'=> 'users', 'lhs_key' => 'id',
-   'rhs_module'=> $module, 'rhs_table'=> strtolower($module), 'rhs_key' => 'created_by',
-   'relationship_type'=>'one-to-many')
+    strtolower($module).'_modified_user' =>
+    array('lhs_module'=> 'Users', 'lhs_table'=> 'users', 'lhs_key' => 'id',
+    'rhs_module'=> $module, 'rhs_table'=> strtolower($module), 'rhs_key' => 'modified_user_id',
+    'relationship_type'=>'one-to-many')
+    ,strtolower($module).'_created_by' =>
+    array('lhs_module'=> 'Users', 'lhs_table'=> 'users', 'lhs_key' => 'id',
+    'rhs_module'=> $module, 'rhs_table'=> strtolower($module), 'rhs_key' => 'created_by',
+    'relationship_type'=>'one-to-many')
 ),
 
 

include/SugarObjects/templates/basic/language/en_us.lang.php

Indentation +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 'LBL_MODIFIED_USER'=>'Modified by User',
 'LBL_LIST_NAME'=>'Name',
 'LBL_EDIT_BUTTON' => 'Edit',
- 'LBL_REMOVE' => 'Remove',
+    'LBL_REMOVE' => 'Remove',
 
 
 );
\ No newline at end of file

include/database/SqlsrvManager.php

Indentation +38 added lines, -38 removed lines

@@ -143,10 +143,10 @@ 
             'url'      => 'nvarchar',
             'encrypt'  => 'nvarchar',
             'file'     => 'nvarchar',
-	        'decimal_tpl' => 'decimal(%d, %d)',
+            'decimal_tpl' => 'decimal(%d, %d)',
     );
 
-	/**
+    /**
      * @see DBManager::connect()
      */
     public function connect(array $configOptions = null, $dieOnError = false)
@@ -203,10 +203,10 @@ 
         return true;
     }
 
-	/**
+    /**
      * @see DBManager::query()
-	 */
-	public function query($sql, $dieOnError = false, $msg = '', $suppress = false, $keepResult = false)
+     */
+    public function query($sql, $dieOnError = false, $msg = '', $suppress = false, $keepResult = false)
     {
         if(is_array($sql)) {
             return $this->queryArray($sql, $dieOnError, $msg, $suppress);
@@ -232,15 +232,15 @@ 
         return $result;
     }
 
-	/**
+    /**
      * @see DBManager::getFieldsArray()
      */
-	public function getFieldsArray($result, $make_lower_case = false)
-	{
+    public function getFieldsArray($result, $make_lower_case = false)
+    {
         $field_array = array();
 
         if ( !$result ) {
-        	return false;
+            return false;
         }
 
         foreach ( sqlsrv_field_metadata($result) as $fieldMetadata ) {
@@ -252,16 +252,16 @@ 
         }
 
         return $field_array;
-	}
+    }
 
-	/**
-	 * @see DBManager::fetchRow()
-	 */
-	public function fetchRow($result)
-	{
-		if (empty($result))	return false;
+    /**
+     * @see DBManager::fetchRow()
+     */
+    public function fetchRow($result)
+    {
+        if (empty($result))	return false;
 
-	    $row = sqlsrv_fetch_array($result,SQLSRV_FETCH_ASSOC);
+        $row = sqlsrv_fetch_array($result,SQLSRV_FETCH_ASSOC);
         if (empty($row)) {
             return false;
         }
@@ -277,7 +277,7 @@ 
         }
 
         return $row;
-	}
+    }
 
     /**
      * @see DBManager::convert()
@@ -291,7 +291,7 @@ 
             return parent::convert($string, $type, $additional_parameters);
     }
 
-	/**
+    /**
      * Compares two vardefs. Overriding 39098  due to bug: 39098 . IN 6.0 we changed the id columns to dbType = 'id'
      * for example emails_beans.  In 554 the field email_id was nvarchar but in 6.0 since it id dbType = 'id' we would want to alter
      * it to varchar. This code will prevent it.
@@ -317,7 +317,7 @@ 
      */
     public function disconnect()
     {
-    	$GLOBALS['log']->debug('Calling Mssql::disconnect()');
+        $GLOBALS['log']->debug('Calling Mssql::disconnect()');
         if(!empty($this->database)){
             $this->freeResult();
             sqlsrv_close($this->database);
@@ -335,10 +335,10 @@ 
     }
 
 
-	/**
-	 * Detect if no clustered index has been created for a table; if none created then just pick the first index and make it that
-	 *
-	 * @see MssqlHelper::indexSQL()
+    /**
+     * Detect if no clustered index has been created for a table; if none created then just pick the first index and make it that
+     *
+     * @see MssqlHelper::indexSQL()
      */
     public function getConstraintSql($indices, $table)
     {
@@ -378,12 +378,12 @@ 
                 $columns[$column_name]['len']=strtolower($row['PRECISION']);
                 $columns[$column_name]['len'].=','.strtolower($row['SCALE']);
             }
-			elseif ( in_array($row['TYPE_NAME'],array('nchar','nvarchar')) ) {
-				$columns[$column_name]['len']=strtolower($row['PRECISION']);
-				if ( $row['TYPE_NAME'] == 'nvarchar' && $row['PRECISION'] == '0' ) {
-				    $columns[$column_name]['len']='max';
-				}
-			}
+            elseif ( in_array($row['TYPE_NAME'],array('nchar','nvarchar')) ) {
+                $columns[$column_name]['len']=strtolower($row['PRECISION']);
+                if ( $row['TYPE_NAME'] == 'nvarchar' && $row['PRECISION'] == '0' ) {
+                    $columns[$column_name]['len']='max';
+                }
+            }
             elseif ( !in_array($row['TYPE_NAME'],array('datetime','text')) ) {
                 $columns[$column_name]['len']=strtolower($row['LENGTH']);
             }
@@ -488,21 +488,21 @@ 
         return "TRUNCATE TABLE $name";
     }
 
-	/**
-	 * (non-PHPdoc)
-	 * @see DBManager::lastDbError()
-	 */
+    /**
+     * (non-PHPdoc)
+     * @see DBManager::lastDbError()
+     */
     public function lastDbError()
     {
         $errors = sqlsrv_errors(SQLSRV_ERR_ERRORS);
         if(empty($errors)) return false;
         global $app_strings;
         if (empty($app_strings)
-		    or !isset($app_strings['ERR_MSSQL_DB_CONTEXT'])
-			or !isset($app_strings['ERR_MSSQL_WARNING']) ) {
+            or !isset($app_strings['ERR_MSSQL_DB_CONTEXT'])
+            or !isset($app_strings['ERR_MSSQL_WARNING']) ) {
         //ignore the message from sql-server if $app_strings array is empty. This will happen
         //only if connection if made before languge is set.
-		    return false;
+            return false;
         }
         $messages = array();
         foreach($errors as $error) {
@@ -515,7 +515,7 @@ 
             }
             $sqlpos = strpos($sqlmsg, $app_strings['ERR_MSSQL_DB_CONTEXT']);
             $sqlpos2 = strpos($sqlmsg, $app_strings['ERR_MSSQL_WARNING']);
-    		if ( $sqlpos !== false || $sqlpos2 !== false) {
+            if ( $sqlpos !== false || $sqlpos2 !== false) {
                     continue;
             }
             $messages[] = $sqlmsg;

include/database/DBManagerFactory.php

Indentation +11 added lines, -11 removed lines

@@ -80,7 +80,7 @@ 
                     }
                     break;
                 case "mssql":
-                  	if ( function_exists('sqlsrv_connect')
+                      if ( function_exists('sqlsrv_connect')
                                 && (empty($config['db_mssql_force_driver']) || $config['db_mssql_force_driver'] == 'sqlsrv' )) {
                         $my_db_manager = 'SqlsrvManager';
                     } elseif (self::isFreeTDS()
@@ -122,20 +122,20 @@ 
     }
 
     /**
-	 * Returns a reference to the DB object for instance $instanceName, or the default
+     * Returns a reference to the DB object for instance $instanceName, or the default
      * instance if one is not specified
      *
      * @param  string $instanceName optional, name of the instance
      * @return object DBManager instance
      */
-	public static function getInstance($instanceName = '')
+    public static function getInstance($instanceName = '')
     {
         global $sugar_config;
         static $count = 0, $old_count = 0;
 
         //fall back to the default instance name
         if(empty($sugar_config['db'][$instanceName])){
-        	$instanceName = '';
+            $instanceName = '';
         }
         if(!isset(self::$instances[$instanceName])){
             $config = $sugar_config['dbconfig'];
@@ -248,7 +248,7 @@ 
     /**
      * Check if we have freeTDS driver installed
      * Invoked when connected to mssql. checks if we have freetds version of mssql library.
-	 * the response is put into a global variable.
+     * the response is put into a global variable.
      * @return bool
      */
     public static function isFreeTDS()
@@ -256,14 +256,14 @@ 
         static $is_freetds = null;
 
         if($is_freetds === null) {
-    		ob_start();
-    		phpinfo(INFO_MODULES);
-    		$info=ob_get_contents();
-    		ob_end_clean();
+            ob_start();
+            phpinfo(INFO_MODULES);
+            $info=ob_get_contents();
+            ob_end_clean();
 
-    		$is_freetds = (strpos($info,'FreeTDS') !== false);
+            $is_freetds = (strpos($info,'FreeTDS') !== false);
         }
 
         return $is_freetds;
-     }
+        }
 }
\ No newline at end of file

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