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))

Spacing +139 added lines, -139 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -46,7 +46,7 @@ 
  * theme basis.
  ********************************************************************************/
 
-if(!defined('JSMIN_AS_LIB'))
+if (!defined('JSMIN_AS_LIB'))
     define('JSMIN_AS_LIB', true);
 
 require_once("include/SugarTheme/cssmin.php");
@@ -114,7 +114,7 @@ 
      * @deprecated only here for BC during upgrades
      * @var array
      */
-    protected $fonts  = array();
+    protected $fonts = array();
 
     /**
      * Maximum sugar version this theme is for; defaults to 5.5.1 as all the themes without this
@@ -292,44 +292,44 @@ 
         )
     {
         // apply parent theme's properties first
-        if ( isset($defaults['parentTheme']) ) {
+        if (isset($defaults['parentTheme'])) {
             $themedef = array();
             include("themes/{$defaults['parentTheme']}/themedef.php");
-            foreach ( $themedef as $key => $value ) {
-                if ( property_exists(__CLASS__,$key) ) {
+            foreach ($themedef as $key => $value) {
+                if (property_exists(__CLASS__, $key)) {
                     // For all arrays ( except colors and fonts ) you can just specify the items
                     // to change instead of all of the values
-                    if ( is_array($this->$key) && !in_array($key,array('colors','fonts')) )
-                        $this->$key = array_merge($this->$key,$value);
+                    if (is_array($this->$key) && !in_array($key, array('colors', 'fonts')))
+                        $this->$key = array_merge($this->$key, $value);
                     else
                         $this->$key = $value;
                 }
             }
         }
-        foreach ( $defaults as $key => $value ) {
-            if ( property_exists(__CLASS__,$key) ) {
+        foreach ($defaults as $key => $value) {
+            if (property_exists(__CLASS__, $key)) {
                 // For all arrays ( except colors and fonts ) you can just specify the items
                 // to change instead of all of the values
-                if ( is_array($this->$key) && !in_array($key,array('colors','fonts')) )
-                    $this->$key = array_merge($this->$key,$value);
+                if (is_array($this->$key) && !in_array($key, array('colors', 'fonts')))
+                    $this->$key = array_merge($this->$key, $value);
                 else
                     $this->$key = $value;
             }
         }
-        if ( !inDeveloperMode() ) {
-            if ( sugar_is_file($cachedfile = sugar_cached($this->getFilePath().'/pathCache.php'))) {
+        if (!inDeveloperMode()) {
+            if (sugar_is_file($cachedfile = sugar_cached($this->getFilePath().'/pathCache.php'))) {
                 $caches = unserialize(file_get_contents($cachedfile));
-                if ( isset($caches['jsCache']) )
+                if (isset($caches['jsCache']))
                     $this->_jsCache       = $caches['jsCache'];
-                if ( isset($caches['cssCache']) )
+                if (isset($caches['cssCache']))
                     $this->_cssCache      = $caches['cssCache'];
-                if ( isset($caches['imageCache']) )
+                if (isset($caches['imageCache']))
                     $this->_imageCache    = $caches['imageCache'];
-                if ( isset($caches['templateCache']) )
+                if (isset($caches['templateCache']))
                     $this->_templateCache = $caches['templateCache'];
             }
             $cachedfile = sugar_cached($this->getFilePath().'/spriteCache.php');
-			if(!empty($GLOBALS['sugar_config']['use_sprites']) && sugar_is_file($cachedfile)) {
+			if (!empty($GLOBALS['sugar_config']['use_sprites']) && sugar_is_file($cachedfile)) {
 				$this->_spriteCache = unserialize(sugar_file_get_contents($cachedfile));
 			}
         }
@@ -348,7 +348,7 @@ 
     public function __wakeup()
     {
         // clean all properties
-        foreach(get_object_vars($this) as $k => $v) {
+        foreach (get_object_vars($this) as $k => $v) {
             $this->$k = null;
         }
         throw new Exception("Not a serializable object");
@@ -361,14 +361,14 @@ 
     public function __destruct()
     {
         // Set the current directory to one which we expect it to be (i.e. the root directory of the install
-        $dir = realpath(dirname(__FILE__) . '/../..');
+        $dir = realpath(dirname(__FILE__).'/../..');
         static $includePathIsPatched = false;
         if ($includePathIsPatched == false)
         {
             $path = explode(PATH_SEPARATOR, get_include_path());
             if (in_array($dir, $path) == false)
             {
-                set_include_path($dir . PATH_SEPARATOR . get_include_path());
+                set_include_path($dir.PATH_SEPARATOR.get_include_path());
             }
             $includePathIsPatched = true;
         }
@@ -376,7 +376,7 @@ 
         $cachedir = sugar_cached($this->getFilePath());
         sugar_mkdir($cachedir, 0775, true);
         // clear out the cache on destroy if we are asked to
-        if ( $this->_clearCacheOnDestroy ) {
+        if ($this->_clearCacheOnDestroy) {
 
             if (is_file("$cachedir/pathCache.php"))
                 unlink("$cachedir/pathCache.php");
@@ -384,9 +384,9 @@ 
 				unlink("$cachedir/spriteCache.php");
 
         }
-        elseif ( !inDeveloperMode() ) {
+        elseif (!inDeveloperMode()) {
             // only update the caches if they have been changed in this request
-            if ( count($this->_jsCache) != $this->_initialCacheSize['jsCache']
+            if (count($this->_jsCache) != $this->_initialCacheSize['jsCache']
                     || count($this->_cssCache) != $this->_initialCacheSize['cssCache']
                     || count($this->_imageCache) != $this->_initialCacheSize['imageCache']
                     || count($this->_templateCache) != $this->_initialCacheSize['templateCache']
@@ -404,7 +404,7 @@ 
                     );
 
             }
-			if ( count($this->_spriteCache) != $this->_initialCacheSize['spriteCache']) {
+			if (count($this->_spriteCache) != $this->_initialCacheSize['spriteCache']) {
 				sugar_file_put_contents(
 					"$cachedir/spriteCache.php",
 					serialize($this->_spriteCache)
@@ -433,11 +433,11 @@ 
         $key
         )
     {
-        if ( isset($this->$key) )
+        if (isset($this->$key))
             return $this->$key;
     }
 
-    public function __isset($key){
+    public function __isset($key) {
     	return isset($this->$key);
 
     }
@@ -604,38 +604,38 @@ 
 
 
 		// sprites
-		if(!empty($GLOBALS['sugar_config']['use_sprites']) && $GLOBALS['sugar_config']['use_sprites']) {
+		if (!empty($GLOBALS['sugar_config']['use_sprites']) && $GLOBALS['sugar_config']['use_sprites']) {
 
 			// system wide sprites
-			if(file_exists("cache/sprites/default/sprites.css"))
+			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"))
+			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"))
+			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"))
+			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) ) {
-            if ( isset($_SESSION['authenticated_user_theme_color']) && in_array($_SESSION['authenticated_user_theme_color'], $this->colors))
+        if (!empty($this->colors)) {
+            if (isset($_SESSION['authenticated_user_theme_color']) && in_array($_SESSION['authenticated_user_theme_color'], $this->colors))
                 $color = $_SESSION['authenticated_user_theme_color'];
             else
                 $color = $this->colors[0];
             $html .= '<link rel="stylesheet" type="text/css" href="'.$this->getCSSURL('colors.'.$color.'.css').'" id="current_color_style" />';
         }
 
-        if ( !empty($this->fonts) ) {
-            if ( isset($_SESSION['authenticated_user_theme_font']) && in_array($_SESSION['authenticated_user_theme_font'], $this->fonts))
+        if (!empty($this->fonts)) {
+            if (isset($_SESSION['authenticated_user_theme_font']) && in_array($_SESSION['authenticated_user_theme_font'], $this->fonts))
                 $font = $_SESSION['authenticated_user_theme_font'];
             else
                 $font = $this->fonts[0];
@@ -669,7 +669,7 @@ 
         $templateName
         )
     {
-        if ( isset($this->_templateCache[$templateName]) )
+        if (isset($this->_templateCache[$templateName]))
             return $this->_templateCache[$templateName];
 
         $templatePath = '';
@@ -719,28 +719,28 @@ 
         static $cached_results = array();
 
 		// trap deprecated use of image extension
-		if(is_null($ext)) {
-			$imageNameExp = explode('.',$imageName);
-			if(count($imageNameExp) == 1)
+		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))
+		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']) {
+		if (!empty($GLOBALS['sugar_config']['use_sprites']) && $GLOBALS['sugar_config']['use_sprites']) {
 			// get sprite metadata
-			if($sp = $this->getSpriteMeta($imageName)) {
+			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)) )
+				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))
+                     if ($sprite = $this->getSprite($sp['class'], $other_attributes, $alt))
                      {
                          return $sprite;
                      }
@@ -749,11 +749,11 @@ 
 		}
 
 		// img caching
-		if(empty($cached_results[$imageName])) {
-			$imageURL = $this->getImageURL($imageName,false);
-			if ( empty($imageURL) )
+		if (empty($cached_results[$imageName])) {
+			$imageURL = $this->getImageURL($imageName, false);
+			if (empty($imageURL))
 				return false;
-            if(strpos($imageURL, '.svg', strlen($imageURL)-4)){
+            if (strpos($imageURL, '.svg', strlen($imageURL) - 4)) {
                 $cached_results[$imageName] = file_get_contents($imageURL);
             } else {
                 $cached_results[$imageName] = '<img src="'.getJSPath($imageURL).'" ';
@@ -764,10 +764,10 @@ 
 		$attr_width = (is_null($width)) ? "" : "width=\"$width\"";
 		$attr_height = (is_null($height)) ? "" : "height=\"$height\"";
 
-        if(strpos($cached_results[$imageName], 'svg') !== false){
+        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\" />";
     }
 
 	/**
@@ -779,12 +779,12 @@ 
 	public function getSpriteMeta($imageName) {
 
 		// return from cache
-	    if(isset($this->_spriteCache[$imageName]))
+	    if (isset($this->_spriteCache[$imageName]))
 			return $this->_spriteCache[$imageName];
 
 			// sprite keys are base on imageURL
-		$imageURL = $this->getImageURL($imageName,false);
-		if(empty($imageURL)) {
+		$imageURL = $this->getImageURL($imageName, false);
+		if (empty($imageURL)) {
 			$this->_spriteCache[$imageName] = false;
 			return false;
 		}
@@ -795,12 +795,12 @@ 
 		// add current theme dir
 		$meta->loadSpriteMeta($this->dirName);
 		// add parent theme dir
-		if($this->parentTheme && $parent = SugarThemeRegistry::get($this->parentTheme)) {
+		if ($this->parentTheme && $parent = SugarThemeRegistry::get($this->parentTheme)) {
 			$meta->loadSpriteMeta($parent->dirName);
 		}
 
 		// add to cache
-		if(isset($meta->sprites[$imageURL])) {
+		if (isset($meta->sprites[$imageURL])) {
 			$this->_spriteCache[$imageName] = $meta->sprites[$imageURL];
 			// add imageURL to cache
 			//$this->_spriteCache[$imageName]['imageURL'] = $imageURL;
@@ -824,7 +824,7 @@ 
 		// handle multiple class tags
 		$class_regex = '/class=["\']([^\'"]+)["\']/i';
 		preg_match($class_regex, $attr, $match);
-		if(isset($match[1])) {
+		if (isset($match[1])) {
 			$attr = preg_replace($class_regex, 'class="spr_'.$class.' ${1}"', $attr);
 
 		// single class
@@ -832,7 +832,7 @@ 
 			$attr .= ' class="spr_'.$class.'"';
 		}
 
-		if($title)
+		if ($title)
 			$attr .= ' title="'.$title.'"';
 
 		// use </span> instead of /> to prevent weird UI results
@@ -856,13 +856,13 @@ 
     )
     {
 
-		if($img_name) {
+		if ($img_name) {
 			$img = $this->getImage($img_name, $img_other_attributes, $img_width, $img_height, null, $img_alt);
-			if($img == false) {
+			if ($img == false) {
 				$GLOBALS['log']->debug('Sprites: unknown image getLink');
 				$img = 'unknown';
 			}
-			switch($img_placement) {
+			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;
@@ -885,9 +885,9 @@ 
     public function getImageURL(
         $imageName,
         $addJSPath = true
-        ){
-        if ( isset($this->_imageCache[$imageName]) ) {
-            if ( $addJSPath )
+        ) {
+        if (isset($this->_imageCache[$imageName])) {
+            if ($addJSPath)
                 return getJSPath($this->_imageCache[$imageName]);
             else
                 return $this->_imageCache[$imageName];
@@ -899,7 +899,7 @@ 
             $imagePath = $filename;
         elseif (isset($this->parentTheme)
                 && SugarThemeRegistry::get($this->parentTheme) instanceOf SugarTheme
-                && ($filename = SugarThemeRegistry::get($this->parentTheme)->getImageURL($imageName,false)) != '')
+                && ($filename = SugarThemeRegistry::get($this->parentTheme)->getImageURL($imageName, false)) != '')
             $imagePath = $filename;
         elseif (($filename = $this->_getImageFileName('custom/'.$this->getDefaultImagePath().'/'.$imageName)) != '')
             $imagePath = $filename;
@@ -914,7 +914,7 @@ 
 
         $this->_imageCache[$imageName] = $imagePath;
 
-        if ( $addJSPath )
+        if ($addJSPath)
             return getJSPath($imagePath);
 
         return $imagePath;
@@ -931,13 +931,13 @@ 
         )
     {
         // return now if the extension matches that of which we are looking for
-        if ( sugar_is_file($imageName) )
+        if (sugar_is_file($imageName))
             return $imageName;
         $pathParts = pathinfo($imageName);
-        foreach ( $this->imageExtensions as $extension )
-            if ( isset($pathParts['extension']) )
-                if ( ( $extension != $pathParts['extension'] )
-                        && sugar_is_file($pathParts['dirname'].'/'.$pathParts['filename'].'.'.$extension) )
+        foreach ($this->imageExtensions as $extension)
+            if (isset($pathParts['extension']))
+                if (($extension != $pathParts['extension'])
+                        && sugar_is_file($pathParts['dirname'].'/'.$pathParts['filename'].'.'.$extension))
                     return $pathParts['dirname'].'/'.$pathParts['filename'].'.'.$extension;
 
         return '';
@@ -953,8 +953,8 @@ 
      */
     public function getCSSURL($cssFileName, $returnURL = true)
     {
-        if ( isset($this->_cssCache[$cssFileName]) && sugar_is_file(sugar_cached($this->_cssCache[$cssFileName])) ) {
-            if ( $returnURL )
+        if (isset($this->_cssCache[$cssFileName]) && sugar_is_file(sugar_cached($this->_cssCache[$cssFileName]))) {
+            if ($returnURL)
                 return getJSPath("cache/".$this->_cssCache[$cssFileName]);
             else
                 return sugar_cached($this->_cssCache[$cssFileName]);
@@ -965,7 +965,7 @@ 
         $fullFileName = $this->getCSSPath().'/'.$cssFileName;
         if (isset($this->parentTheme)
                 && SugarThemeRegistry::get($this->parentTheme) instanceOf SugarTheme
-                && ($filename = SugarThemeRegistry::get($this->parentTheme)->getCSSURL($cssFileName,false)) != '')
+                && ($filename = SugarThemeRegistry::get($this->parentTheme)->getCSSURL($cssFileName, false)) != '')
             $cssFileContents .= file_get_contents($filename);
         else {
             if (sugar_is_file($defaultFileName))
@@ -994,24 +994,24 @@ 
 
         // if this is the style.css file, prepend the base.css and calendar-win2k-cold-1.css
         // files before the theme styles
-        if ( $cssFileName == 'style.css' && !isset($this->parentTheme) ) {
-            if ( inDeveloperMode() )
-                $cssFileContents = file_get_contents('include/javascript/yui/build/base/base.css') . $cssFileContents;
+        if ($cssFileName == 'style.css' && !isset($this->parentTheme)) {
+            if (inDeveloperMode())
+                $cssFileContents = file_get_contents('include/javascript/yui/build/base/base.css').$cssFileContents;
             else
-                $cssFileContents = file_get_contents('include/javascript/yui/build/base/base-min.css') . $cssFileContents;
+                $cssFileContents = file_get_contents('include/javascript/yui/build/base/base-min.css').$cssFileContents;
         }
 
         // minify the css
-        if ( !inDeveloperMode() && !sugar_is_file($cssFilePath) ) {
+        if (!inDeveloperMode() && !sugar_is_file($cssFilePath)) {
             $cssFileContents = cssmin::minify($cssFileContents);
         }
 
         // now write the css to cache
-        sugar_file_put_contents($cssFilePath,$cssFileContents);
+        sugar_file_put_contents($cssFilePath, $cssFileContents);
 
         $this->_cssCache[$cssFileName] = $fullFileName;
 
-        if ( $returnURL )
+        if ($returnURL)
             return getJSPath("cache/".$fullFileName);
 
         return sugar_cached($fullFileName);
@@ -1027,8 +1027,8 @@ 
      */
     public function getJSURL($jsFileName, $returnURL = true)
     {
-        if ( isset($this->_jsCache[$jsFileName]) && sugar_is_file(sugar_cached($this->_jsCache[$jsFileName])) ) {
-            if ( $returnURL )
+        if (isset($this->_jsCache[$jsFileName]) && sugar_is_file(sugar_cached($this->_jsCache[$jsFileName]))) {
+            if ($returnURL)
                 return getJSPath("cache/".$this->_jsCache[$jsFileName]);
             else
                 return sugar_cached($this->_jsCache[$jsFileName]);
@@ -1039,7 +1039,7 @@ 
         $defaultFileName = $this->getDefaultJSPath().'/'.$jsFileName;
         if (isset($this->parentTheme)
                 && SugarThemeRegistry::get($this->parentTheme) instanceOf SugarTheme
-                && ($filename = SugarThemeRegistry::get($this->parentTheme)->getJSURL($jsFileName,false)) != ''    && !in_array($jsFileName,$this->ignoreParentFiles)) {
+                && ($filename = SugarThemeRegistry::get($this->parentTheme)->getJSURL($jsFileName, false)) != '' && !in_array($jsFileName, $this->ignoreParentFiles)) {
            $jsFileContents .= file_get_contents($filename);
        } else {
             if (sugar_is_file($defaultFileName))
@@ -1060,18 +1060,18 @@ 
         $jsFilePath = create_cache_directory($fullFileName);
 
         // minify the js
-        if ( !inDeveloperMode()&& !sugar_is_file(str_replace('.js','-min.js',$jsFilePath)) ) {
+        if (!inDeveloperMode() && !sugar_is_file(str_replace('.js', '-min.js', $jsFilePath))) {
             $jsFileContents = SugarMin::minify($jsFileContents);
-            $jsFilePath = str_replace('.js','-min.js',$jsFilePath);
-            $fullFileName = str_replace('.js','-min.js',$fullFileName);
+            $jsFilePath = str_replace('.js', '-min.js', $jsFilePath);
+            $fullFileName = str_replace('.js', '-min.js', $fullFileName);
         }
 
         // now write the js to cache
-        sugar_file_put_contents($jsFilePath,$jsFileContents);
+        sugar_file_put_contents($jsFilePath, $jsFileContents);
 
         $this->_jsCache[$jsFileName] = $fullFileName;
 
-        if ( $returnURL )
+        if ($returnURL)
             return getJSPath("cache/".$fullFileName);
 
         return sugar_cached($fullFileName);
@@ -1087,7 +1087,7 @@ 
         // first, lets get all the paths of where to look
         $pathsToSearch = array($this->getImagePath());
         $theme = $this;
-        while (isset($theme->parentTheme) && SugarThemeRegistry::get($theme->parentTheme) instanceOf SugarTheme ) {
+        while (isset($theme->parentTheme) && SugarThemeRegistry::get($theme->parentTheme) instanceOf SugarTheme) {
             $theme = SugarThemeRegistry::get($theme->parentTheme);
             $pathsToSearch[] = $theme->getImagePath();
         }
@@ -1095,7 +1095,7 @@ 
 
         // now build the array
         $imageArray = array();
-        foreach ( $pathsToSearch as $path )
+        foreach ($pathsToSearch as $path)
         {
             if (!sugar_is_dir($path)) $path = "custom/$path";
             if (sugar_is_dir($path) && is_readable($path) && $dir = opendir($path)) {
@@ -1107,8 +1107,8 @@ 
                             || $file == "Attic"
                             )
                         continue;
-                    if ( !isset($imageArray[$file]) )
-                        $imageArray[$file] = $this->getImageURL($file,false);
+                    if (!isset($imageArray[$file]))
+                        $imageArray[$file] = $this->getImageURL($file, false);
                 }
                 closedir($dir);
             }
@@ -1130,13 +1130,13 @@ 
 
         $config = array();
 
-        foreach($this->config_options as $name => $def){
+        foreach ($this->config_options as $name => $def) {
             $config[$name] = $def;
 
             $value = '';
-            if(isset($sugar_config['theme_settings'][$this->dirName][$name])){
+            if (isset($sugar_config['theme_settings'][$this->dirName][$name])) {
                 $value = $sugar_config['theme_settings'][$this->dirName][$name];
-            } else if(isset($def['default'])){
+            } else if (isset($def['default'])) {
                 $value = $def['default'];
             }
             $config[$name] = $value;
@@ -1189,28 +1189,28 @@ 
         }
 
         // Assume theme is designed for 5.5.x if not specified otherwise
-        if ( !isset($themedef['version']) )
+        if (!isset($themedef['version']))
             $themedef['version']['regex_matches'] = array('5\.5\.*');
 
         // Check to see if theme is valid for this version of Sugar; return false if not
         $version_ok = false;
-        if( isset($themedef['version']['exact_matches']) ){
+        if (isset($themedef['version']['exact_matches'])) {
             $matches_empty = false;
-            foreach( $themedef['version']['exact_matches'] as $match ){
-                if( $match == $GLOBALS['sugar_version'] ){
+            foreach ($themedef['version']['exact_matches'] as $match) {
+                if ($match == $GLOBALS['sugar_version']) {
                     $version_ok = true;
                 }
             }
         }
-        if( !$version_ok && isset($themedef['version']['regex_matches']) ){
+        if (!$version_ok && isset($themedef['version']['regex_matches'])) {
             $matches_empty = false;
-            foreach( $themedef['version']['regex_matches'] as $match ){
-                if( preg_match( "/$match/", $GLOBALS['sugar_version'] ) ){
+            foreach ($themedef['version']['regex_matches'] as $match) {
+                if (preg_match("/$match/", $GLOBALS['sugar_version'])) {
                     $version_ok = true;
                 }
             }
         }
-        if ( !$version_ok )
+        if (!$version_ok)
             return false;
 
         $theme = new SugarTheme($themedef);
@@ -1226,7 +1226,7 @@ 
         $themeName
         )
     {
-        if ( self::exists($themeName) )
+        if (self::exists($themeName))
             unset(self::$_themes[$themeName]);
     }
 
@@ -1239,7 +1239,7 @@ 
         $themeName
         )
     {
-        if ( isset(self::$_themes[$themeName]) )
+        if (isset(self::$_themes[$themeName]))
             return self::$_themes[$themeName];
     }
 
@@ -1250,7 +1250,7 @@ 
      */
     public static function current()
     {
-        if ( !isset(self::$_currentTheme) )
+        if (!isset(self::$_currentTheme))
             self::buildRegistry();
 
         return self::$_themes[self::$_currentTheme];
@@ -1263,10 +1263,10 @@ 
      */
     public static function getDefault()
     {
-        if ( !isset(self::$_currentTheme) )
+        if (!isset(self::$_currentTheme))
             self::buildRegistry();
 
-        if ( isset($GLOBALS['sugar_config']['default_theme']) && self::exists($GLOBALS['sugar_config']['default_theme']) ) {
+        if (isset($GLOBALS['sugar_config']['default_theme']) && self::exists($GLOBALS['sugar_config']['default_theme'])) {
             return self::get($GLOBALS['sugar_config']['default_theme']);
         }
         $array_keys = array_keys(self::availableThemes());
@@ -1295,7 +1295,7 @@ 
         $themeName
         )
     {
-        if ( !self::exists($themeName) )
+        if (!self::exists($themeName))
             return false;
 
         self::$_currentTheme = $themeName;
@@ -1312,17 +1312,17 @@ 
     public static function buildRegistry()
     {
         self::$_themes = array();
-        $dirs = array("themes/","custom/themes/");
+        $dirs = array("themes/", "custom/themes/");
 
         // check for a default themedef file
         $themedefDefault = array();
-        if ( sugar_is_file("custom/themes/default/themedef.php") ) {
+        if (sugar_is_file("custom/themes/default/themedef.php")) {
             $themedef = array();
             require("custom/themes/default/themedef.php");
             $themedefDefault = $themedef;
         }
 
-        foreach ($dirs as $dirPath ) {
+        foreach ($dirs as $dirPath) {
             if (sugar_is_dir('./'.$dirPath) && is_readable('./'.$dirPath) && $dir = opendir('./'.$dirPath)) {
                 while (($file = readdir($dir)) !== false) {
                     if ($file == ".."
@@ -1337,18 +1337,18 @@ 
                         continue;
                     $themedef = array();
                     require("./{$dirPath}{$file}/themedef.php");
-                    $themedef = array_merge($themedef,$themedefDefault);
+                    $themedef = array_merge($themedef, $themedefDefault);
                     $themedef['dirName'] = $file;
                     // check for theme already existing in the registry
                     // if so, then it will override the current one
-                    if ( self::exists($themedef['dirName']) ) {
+                    if (self::exists($themedef['dirName'])) {
                         $existingTheme = self::get($themedef['dirName']);
-                        foreach ( SugarTheme::getThemeDefFields() as $field )
-                            if ( !isset($themedef[$field]) )
+                        foreach (SugarTheme::getThemeDefFields() as $field)
+                            if (!isset($themedef[$field]))
                                 $themedef[$field] = $existingTheme->$field;
                         self::remove($themedef['dirName']);
                     }
-                    if ( isset($themedef['name']) ) {
+                    if (isset($themedef['name'])) {
                         self::add($themedef);
                     }
                 }
@@ -1356,8 +1356,8 @@ 
             }
         }
         // default to setting the default theme as the current theme
-        if ( !isset($GLOBALS['sugar_config']['default_theme']) || !self::set($GLOBALS['sugar_config']['default_theme']) ) {
-            if ( count(self::availableThemes()) == 0 )
+        if (!isset($GLOBALS['sugar_config']['default_theme']) || !self::set($GLOBALS['sugar_config']['default_theme'])) {
+            if (count(self::availableThemes()) == 0)
             {
                 sugar_die('No valid themes are found on this instance');
             } else {
@@ -1379,9 +1379,9 @@ 
     private static function getDefaultThemeKey()
     {
         $availableThemes = self::availableThemes();
-        foreach($availableThemes as $key=>$theme)
+        foreach ($availableThemes as $key=>$theme)
         {
-            if(strtolower($key) == 'sugar')
+            if (strtolower($key) == 'sugar')
             {
                 return $key;
             }
@@ -1400,11 +1400,11 @@ 
     {
         $themelist = array();
         $disabledThemes = array();
-        if ( isset($GLOBALS['sugar_config']['disabled_themes']) )
-            $disabledThemes = explode(',',$GLOBALS['sugar_config']['disabled_themes']);
+        if (isset($GLOBALS['sugar_config']['disabled_themes']))
+            $disabledThemes = explode(',', $GLOBALS['sugar_config']['disabled_themes']);
 
-        foreach ( self::$_themes as $themename => $themeobject ) {
-            if ( in_array($themename,$disabledThemes) )
+        foreach (self::$_themes as $themename => $themeobject) {
+            if (in_array($themename, $disabledThemes))
                 continue;
             $themelist[$themeobject->dirName] = $themeobject->name;
         }
@@ -1421,11 +1421,11 @@ 
     {
         $themelist = array();
         $disabledThemes = array();
-        if ( isset($GLOBALS['sugar_config']['disabled_themes']) )
-            $disabledThemes = explode(',',$GLOBALS['sugar_config']['disabled_themes']);
+        if (isset($GLOBALS['sugar_config']['disabled_themes']))
+            $disabledThemes = explode(',', $GLOBALS['sugar_config']['disabled_themes']);
 
-        foreach ( self::$_themes as $themename => $themeobject ) {
-            if ( in_array($themename,$disabledThemes) )
+        foreach (self::$_themes as $themename => $themeobject) {
+            if (in_array($themename, $disabledThemes))
                 $themelist[$themeobject->dirName] = $themeobject->name;
         }
 
@@ -1441,7 +1441,7 @@ 
     {
         $themelist = array();
 
-        foreach ( self::$_themes as $themename => $themeobject )
+        foreach (self::$_themes as $themename => $themeobject)
             $themelist[$themeobject->dirName] = $themeobject->name;
 
         return $themelist;
@@ -1478,18 +1478,18 @@ 
     {
         global $sugar_config;
 
-        if ( !self::exists($themeName) )
+        if (!self::exists($themeName))
             return false;
 
         $config = array();
 
-        foreach(self::$_themes[$themeName]->config_options as $name => $def){
+        foreach (self::$_themes[$themeName]->config_options as $name => $def) {
             $config[$name] = $def;
 
             $value = '';
-            if(isset($sugar_config['theme_settings'][$themeName][$name])){
+            if (isset($sugar_config['theme_settings'][$themeName][$name])) {
                 $value = $sugar_config['theme_settings'][$themeName][$name];
-            } else if(isset($def['default'])){
+            } else if (isset($def['default'])) {
                 $value = $def['default'];
             }
             $config[$name]['value'] = $value;
@@ -1505,7 +1505,7 @@ 
      */
     public static function clearAllCaches()
     {
-        foreach ( self::$_themes as $themeobject ) {
+        foreach (self::$_themes as $themeobject) {
             $themeobject->clearCache();
         }
     }

Braces +216 added lines, -158 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -46,8 +48,9 @@ 
  * theme basis.
  ********************************************************************************/
 
-if(!defined('JSMIN_AS_LIB'))
+if(!defined('JSMIN_AS_LIB')) {
     define('JSMIN_AS_LIB', true);
+}
 
 require_once("include/SugarTheme/cssmin.php");
 require_once("jssource/jsmin.php");
@@ -299,10 +302,11 @@ 
                 if ( property_exists(__CLASS__,$key) ) {
                     // For all arrays ( except colors and fonts ) you can just specify the items
                     // to change instead of all of the values
-                    if ( is_array($this->$key) && !in_array($key,array('colors','fonts')) )
-                        $this->$key = array_merge($this->$key,$value);
-                    else
-                        $this->$key = $value;
+                    if ( is_array($this->$key) && !in_array($key,array('colors','fonts')) ) {
+                                            $this->$key = array_merge($this->$key,$value);
+                    } else {
+                                            $this->$key = $value;
+                    }
                 }
             }
         }
@@ -310,23 +314,28 @@ 
             if ( property_exists(__CLASS__,$key) ) {
                 // For all arrays ( except colors and fonts ) you can just specify the items
                 // to change instead of all of the values
-                if ( is_array($this->$key) && !in_array($key,array('colors','fonts')) )
-                    $this->$key = array_merge($this->$key,$value);
-                else
-                    $this->$key = $value;
+                if ( is_array($this->$key) && !in_array($key,array('colors','fonts')) ) {
+                                    $this->$key = array_merge($this->$key,$value);
+                } else {
+                                    $this->$key = $value;
+                }
             }
         }
         if ( !inDeveloperMode() ) {
             if ( sugar_is_file($cachedfile = sugar_cached($this->getFilePath().'/pathCache.php'))) {
                 $caches = unserialize(file_get_contents($cachedfile));
-                if ( isset($caches['jsCache']) )
-                    $this->_jsCache       = $caches['jsCache'];
-                if ( isset($caches['cssCache']) )
-                    $this->_cssCache      = $caches['cssCache'];
-                if ( isset($caches['imageCache']) )
-                    $this->_imageCache    = $caches['imageCache'];
-                if ( isset($caches['templateCache']) )
-                    $this->_templateCache = $caches['templateCache'];
+                if ( isset($caches['jsCache']) ) {
+                                    $this->_jsCache       = $caches['jsCache'];
+                }
+                if ( isset($caches['cssCache']) ) {
+                                    $this->_cssCache      = $caches['cssCache'];
+                }
+                if ( isset($caches['imageCache']) ) {
+                                    $this->_imageCache    = $caches['imageCache'];
+                }
+                if ( isset($caches['templateCache']) ) {
+                                    $this->_templateCache = $caches['templateCache'];
+                }
             }
             $cachedfile = sugar_cached($this->getFilePath().'/spriteCache.php');
 			if(!empty($GLOBALS['sugar_config']['use_sprites']) && sugar_is_file($cachedfile)) {
@@ -378,13 +387,14 @@ 
         // clear out the cache on destroy if we are asked to
         if ( $this->_clearCacheOnDestroy ) {
 
-            if (is_file("$cachedir/pathCache.php"))
-                unlink("$cachedir/pathCache.php");
-			if (is_file("$cachedir/spriteCache.php"))
-				unlink("$cachedir/spriteCache.php");
+            if (is_file("$cachedir/pathCache.php")) {
+                            unlink("$cachedir/pathCache.php");
+            }
+			if (is_file("$cachedir/spriteCache.php")) {
+							unlink("$cachedir/spriteCache.php");
+			}
 
-        }
-        elseif ( !inDeveloperMode() ) {
+        } elseif ( !inDeveloperMode() ) {
             // only update the caches if they have been changed in this request
             if ( count($this->_jsCache) != $this->_initialCacheSize['jsCache']
                     || count($this->_cssCache) != $this->_initialCacheSize['cssCache']
@@ -433,8 +443,9 @@ 
         $key
         )
     {
-        if ( isset($this->$key) )
-            return $this->$key;
+        if ( isset($this->$key) ) {
+                    return $this->$key;
+        }
     }
 
     public function __isset($key){
@@ -607,38 +618,44 @@ 
 		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').'" />';
+			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').'" />';
+			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').'" />';
+				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').'" />';
+			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) ) {
-            if ( isset($_SESSION['authenticated_user_theme_color']) && in_array($_SESSION['authenticated_user_theme_color'], $this->colors))
-                $color = $_SESSION['authenticated_user_theme_color'];
-            else
-                $color = $this->colors[0];
+            if ( isset($_SESSION['authenticated_user_theme_color']) && in_array($_SESSION['authenticated_user_theme_color'], $this->colors)) {
+                            $color = $_SESSION['authenticated_user_theme_color'];
+            } else {
+                            $color = $this->colors[0];
+            }
             $html .= '<link rel="stylesheet" type="text/css" href="'.$this->getCSSURL('colors.'.$color.'.css').'" id="current_color_style" />';
         }
 
         if ( !empty($this->fonts) ) {
-            if ( isset($_SESSION['authenticated_user_theme_font']) && in_array($_SESSION['authenticated_user_theme_font'], $this->fonts))
-                $font = $_SESSION['authenticated_user_theme_font'];
-            else
-                $font = $this->fonts[0];
+            if ( isset($_SESSION['authenticated_user_theme_font']) && in_array($_SESSION['authenticated_user_theme_font'], $this->fonts)) {
+                            $font = $_SESSION['authenticated_user_theme_font'];
+            } else {
+                            $font = $this->fonts[0];
+            }
             $html .= '<link rel="stylesheet" type="text/css" href="'.$this->getCSSURL('fonts.'.$font.'.css').'" id="current_font_style" />';
         }
 
@@ -669,23 +686,24 @@ 
         $templateName
         )
     {
-        if ( isset($this->_templateCache[$templateName]) )
-            return $this->_templateCache[$templateName];
+        if ( isset($this->_templateCache[$templateName]) ) {
+                    return $this->_templateCache[$templateName];
+        }
 
         $templatePath = '';
-        if (sugar_is_file('custom/'.$this->getTemplatePath().'/'.$templateName))
-            $templatePath = 'custom/'.$this->getTemplatePath().'/'.$templateName;
-        elseif (sugar_is_file($this->getTemplatePath().'/'.$templateName))
-            $templatePath = $this->getTemplatePath().'/'.$templateName;
-        elseif (isset($this->parentTheme)
+        if (sugar_is_file('custom/'.$this->getTemplatePath().'/'.$templateName)) {
+                    $templatePath = 'custom/'.$this->getTemplatePath().'/'.$templateName;
+        } elseif (sugar_is_file($this->getTemplatePath().'/'.$templateName)) {
+                    $templatePath = $this->getTemplatePath().'/'.$templateName;
+        } elseif (isset($this->parentTheme)
                 && SugarThemeRegistry::get($this->parentTheme) instanceOf SugarTheme
-                && ($filename = SugarThemeRegistry::get($this->parentTheme)->getTemplate($templateName)) != '')
-            $templatePath = $filename;
-        elseif (sugar_is_file('custom/'.$this->getDefaultTemplatePath().'/'.$templateName))
-            $templatePath = 'custom/'.$this->getDefaultTemplatePath().'/'.$templateName;
-        elseif (sugar_is_file($this->getDefaultTemplatePath().'/'.$templateName))
-            $templatePath = $this->getDefaultTemplatePath().'/'.$templateName;
-        else {
+                && ($filename = SugarThemeRegistry::get($this->parentTheme)->getTemplate($templateName)) != '') {
+                    $templatePath = $filename;
+        } elseif (sugar_is_file('custom/'.$this->getDefaultTemplatePath().'/'.$templateName)) {
+                    $templatePath = 'custom/'.$this->getDefaultTemplatePath().'/'.$templateName;
+        } elseif (sugar_is_file($this->getDefaultTemplatePath().'/'.$templateName)) {
+                    $templatePath = $this->getDefaultTemplatePath().'/'.$templateName;
+        } else {
             $GLOBALS['log']->warn("Template $templateName not found");
             return false;
         }
@@ -721,15 +739,17 @@ 
 		// trap deprecated use of image extension
 		if(is_null($ext)) {
 			$imageNameExp = explode('.',$imageName);
-			if(count($imageNameExp) == 1)
-				$imageName .= '.gif';
+			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");
+		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
@@ -751,8 +771,9 @@ 
 		// img caching
 		if(empty($cached_results[$imageName])) {
 			$imageURL = $this->getImageURL($imageName,false);
-			if ( empty($imageURL) )
-				return false;
+			if ( empty($imageURL) ) {
+							return false;
+			}
             if(strpos($imageURL, '.svg', strlen($imageURL)-4)){
                 $cached_results[$imageName] = file_get_contents($imageURL);
             } else {
@@ -779,8 +800,9 @@ 
 	public function getSpriteMeta($imageName) {
 
 		// return from cache
-	    if(isset($this->_spriteCache[$imageName]))
-			return $this->_spriteCache[$imageName];
+	    if(isset($this->_spriteCache[$imageName])) {
+	    			return $this->_spriteCache[$imageName];
+	    }
 
 			// sprite keys are base on imageURL
 		$imageURL = $this->getImageURL($imageName,false);
@@ -832,8 +854,9 @@ 
 			$attr .= ' class="spr_'.$class.'"';
 		}
 
-		if($title)
-			$attr .= ' title="'.$title.'"';
+		if($title) {
+					$attr .= ' title="'.$title.'"';
+		}
 
 		// use </span> instead of /> to prevent weird UI results
 		$GLOBALS['log']->debug("Sprites: generated sprite -> $attr");
@@ -887,35 +910,37 @@ 
         $addJSPath = true
         ){
         if ( isset($this->_imageCache[$imageName]) ) {
-            if ( $addJSPath )
-                return getJSPath($this->_imageCache[$imageName]);
-            else
-                return $this->_imageCache[$imageName];
+            if ( $addJSPath ) {
+                            return getJSPath($this->_imageCache[$imageName]);
+            } else {
+                            return $this->_imageCache[$imageName];
+            }
         }
         $imagePath = '';
-        if (($filename = $this->_getImageFileName('custom/'.$this->getImagePath().'/'.$imageName)) != '')
-            $imagePath = $filename;
-        elseif (($filename = $this->_getImageFileName($this->getImagePath().'/'.$imageName)) != '')
-            $imagePath = $filename;
-        elseif (isset($this->parentTheme)
+        if (($filename = $this->_getImageFileName('custom/'.$this->getImagePath().'/'.$imageName)) != '') {
+                    $imagePath = $filename;
+        } elseif (($filename = $this->_getImageFileName($this->getImagePath().'/'.$imageName)) != '') {
+                    $imagePath = $filename;
+        } elseif (isset($this->parentTheme)
                 && SugarThemeRegistry::get($this->parentTheme) instanceOf SugarTheme
-                && ($filename = SugarThemeRegistry::get($this->parentTheme)->getImageURL($imageName,false)) != '')
-            $imagePath = $filename;
-        elseif (($filename = $this->_getImageFileName('custom/'.$this->getDefaultImagePath().'/'.$imageName)) != '')
-            $imagePath = $filename;
-        elseif (($filename = $this->_getImageFileName($this->getDefaultImagePath().'/'.$imageName)) != '')
-            $imagePath = $filename;
-		elseif (($filename = $this->_getImageFileName('include/images/'.$imageName)) != '')
-			$imagePath = $filename;
-        else {
+                && ($filename = SugarThemeRegistry::get($this->parentTheme)->getImageURL($imageName,false)) != '') {
+                    $imagePath = $filename;
+        } elseif (($filename = $this->_getImageFileName('custom/'.$this->getDefaultImagePath().'/'.$imageName)) != '') {
+                    $imagePath = $filename;
+        } elseif (($filename = $this->_getImageFileName($this->getDefaultImagePath().'/'.$imageName)) != '') {
+                    $imagePath = $filename;
+        } elseif (($filename = $this->_getImageFileName('include/images/'.$imageName)) != '') {
+					$imagePath = $filename;
+		} else {
             $GLOBALS['log']->warn("Image $imageName not found");
             return false;
         }
 
         $this->_imageCache[$imageName] = $imagePath;
 
-        if ( $addJSPath )
-            return getJSPath($imagePath);
+        if ( $addJSPath ) {
+                    return getJSPath($imagePath);
+        }
 
         return $imagePath;
     }
@@ -931,14 +956,16 @@ 
         )
     {
         // return now if the extension matches that of which we are looking for
-        if ( sugar_is_file($imageName) )
-            return $imageName;
+        if ( sugar_is_file($imageName) ) {
+                    return $imageName;
+        }
         $pathParts = pathinfo($imageName);
-        foreach ( $this->imageExtensions as $extension )
-            if ( isset($pathParts['extension']) )
+        foreach ( $this->imageExtensions as $extension ) {
+                    if ( isset($pathParts['extension']) )
                 if ( ( $extension != $pathParts['extension'] )
                         && sugar_is_file($pathParts['dirname'].'/'.$pathParts['filename'].'.'.$extension) )
                     return $pathParts['dirname'].'/'.$pathParts['filename'].'.'.$extension;
+        }
 
         return '';
     }
@@ -954,10 +981,11 @@ 
     public function getCSSURL($cssFileName, $returnURL = true)
     {
         if ( isset($this->_cssCache[$cssFileName]) && sugar_is_file(sugar_cached($this->_cssCache[$cssFileName])) ) {
-            if ( $returnURL )
-                return getJSPath("cache/".$this->_cssCache[$cssFileName]);
-            else
-                return sugar_cached($this->_cssCache[$cssFileName]);
+            if ( $returnURL ) {
+                            return getJSPath("cache/".$this->_cssCache[$cssFileName]);
+            } else {
+                            return sugar_cached($this->_cssCache[$cssFileName]);
+            }
         }
 
         $cssFileContents = '';
@@ -965,13 +993,15 @@ 
         $fullFileName = $this->getCSSPath().'/'.$cssFileName;
         if (isset($this->parentTheme)
                 && SugarThemeRegistry::get($this->parentTheme) instanceOf SugarTheme
-                && ($filename = SugarThemeRegistry::get($this->parentTheme)->getCSSURL($cssFileName,false)) != '')
-            $cssFileContents .= file_get_contents($filename);
-        else {
-            if (sugar_is_file($defaultFileName))
-                $cssFileContents .= file_get_contents($defaultFileName);
-            if (sugar_is_file('custom/'.$defaultFileName))
-                $cssFileContents .= file_get_contents('custom/'.$defaultFileName);
+                && ($filename = SugarThemeRegistry::get($this->parentTheme)->getCSSURL($cssFileName,false)) != '') {
+                    $cssFileContents .= file_get_contents($filename);
+        } else {
+            if (sugar_is_file($defaultFileName)) {
+                            $cssFileContents .= file_get_contents($defaultFileName);
+            }
+            if (sugar_is_file('custom/'.$defaultFileName)) {
+                            $cssFileContents .= file_get_contents('custom/'.$defaultFileName);
+            }
         }
         if (sugar_is_file($fullFileName)) {
             $cssFileContents .= file_get_contents($fullFileName);
@@ -995,10 +1025,11 @@ 
         // if this is the style.css file, prepend the base.css and calendar-win2k-cold-1.css
         // files before the theme styles
         if ( $cssFileName == 'style.css' && !isset($this->parentTheme) ) {
-            if ( inDeveloperMode() )
-                $cssFileContents = file_get_contents('include/javascript/yui/build/base/base.css') . $cssFileContents;
-            else
-                $cssFileContents = file_get_contents('include/javascript/yui/build/base/base-min.css') . $cssFileContents;
+            if ( inDeveloperMode() ) {
+                            $cssFileContents = file_get_contents('include/javascript/yui/build/base/base.css') . $cssFileContents;
+            } else {
+                            $cssFileContents = file_get_contents('include/javascript/yui/build/base/base-min.css') . $cssFileContents;
+            }
         }
 
         // minify the css
@@ -1011,8 +1042,9 @@ 
 
         $this->_cssCache[$cssFileName] = $fullFileName;
 
-        if ( $returnURL )
-            return getJSPath("cache/".$fullFileName);
+        if ( $returnURL ) {
+                    return getJSPath("cache/".$fullFileName);
+        }
 
         return sugar_cached($fullFileName);
     }
@@ -1028,10 +1060,11 @@ 
     public function getJSURL($jsFileName, $returnURL = true)
     {
         if ( isset($this->_jsCache[$jsFileName]) && sugar_is_file(sugar_cached($this->_jsCache[$jsFileName])) ) {
-            if ( $returnURL )
-                return getJSPath("cache/".$this->_jsCache[$jsFileName]);
-            else
-                return sugar_cached($this->_jsCache[$jsFileName]);
+            if ( $returnURL ) {
+                            return getJSPath("cache/".$this->_jsCache[$jsFileName]);
+            } else {
+                            return sugar_cached($this->_jsCache[$jsFileName]);
+            }
         }
 
         $jsFileContents = '';
@@ -1042,15 +1075,19 @@ 
                 && ($filename = SugarThemeRegistry::get($this->parentTheme)->getJSURL($jsFileName,false)) != ''    && !in_array($jsFileName,$this->ignoreParentFiles)) {
            $jsFileContents .= file_get_contents($filename);
        } else {
-            if (sugar_is_file($defaultFileName))
-                $jsFileContents .= file_get_contents($defaultFileName);
-            if (sugar_is_file('custom/'.$defaultFileName))
-                $jsFileContents .= file_get_contents('custom/'.$defaultFileName);
+            if (sugar_is_file($defaultFileName)) {
+                            $jsFileContents .= file_get_contents($defaultFileName);
+            }
+            if (sugar_is_file('custom/'.$defaultFileName)) {
+                            $jsFileContents .= file_get_contents('custom/'.$defaultFileName);
+            }
+        }
+        if (sugar_is_file($fullFileName)) {
+                    $jsFileContents .= file_get_contents($fullFileName);
+        }
+        if (sugar_is_file('custom/'.$fullFileName)) {
+                    $jsFileContents .= file_get_contents('custom/'.$fullFileName);
         }
-        if (sugar_is_file($fullFileName))
-            $jsFileContents .= file_get_contents($fullFileName);
-        if (sugar_is_file('custom/'.$fullFileName))
-            $jsFileContents .= file_get_contents('custom/'.$fullFileName);
         if (empty($jsFileContents)) {
             $GLOBALS['log']->warn("Javascript File $jsFileName not found");
             return false;
@@ -1071,8 +1108,9 @@ 
 
         $this->_jsCache[$jsFileName] = $fullFileName;
 
-        if ( $returnURL )
-            return getJSPath("cache/".$fullFileName);
+        if ( $returnURL ) {
+                    return getJSPath("cache/".$fullFileName);
+        }
 
         return sugar_cached($fullFileName);
     }
@@ -1097,7 +1135,9 @@ 
         $imageArray = array();
         foreach ( $pathsToSearch as $path )
         {
-            if (!sugar_is_dir($path)) $path = "custom/$path";
+            if (!sugar_is_dir($path)) {
+                $path = "custom/$path";
+            }
             if (sugar_is_dir($path) && is_readable($path) && $dir = opendir($path)) {
                 while (($file = readdir($dir)) !== false) {
                     if ($file == ".."
@@ -1105,10 +1145,12 @@ 
                             || $file == ".svn"
                             || $file == "CVS"
                             || $file == "Attic"
-                            )
-                        continue;
-                    if ( !isset($imageArray[$file]) )
-                        $imageArray[$file] = $this->getImageURL($file,false);
+                            ) {
+                                            continue;
+                    }
+                    if ( !isset($imageArray[$file]) ) {
+                                            $imageArray[$file] = $this->getImageURL($file,false);
+                    }
                 }
                 closedir($dir);
             }
@@ -1189,8 +1231,9 @@ 
         }
 
         // Assume theme is designed for 5.5.x if not specified otherwise
-        if ( !isset($themedef['version']) )
-            $themedef['version']['regex_matches'] = array('5\.5\.*');
+        if ( !isset($themedef['version']) ) {
+                    $themedef['version']['regex_matches'] = array('5\.5\.*');
+        }
 
         // Check to see if theme is valid for this version of Sugar; return false if not
         $version_ok = false;
@@ -1210,8 +1253,9 @@ 
                 }
             }
         }
-        if ( !$version_ok )
-            return false;
+        if ( !$version_ok ) {
+                    return false;
+        }
 
         $theme = new SugarTheme($themedef);
         self::$_themes[$theme->dirName] = $theme;
@@ -1226,8 +1270,9 @@ 
         $themeName
         )
     {
-        if ( self::exists($themeName) )
-            unset(self::$_themes[$themeName]);
+        if ( self::exists($themeName) ) {
+                    unset(self::$_themes[$themeName]);
+        }
     }
 
     /**
@@ -1239,8 +1284,9 @@ 
         $themeName
         )
     {
-        if ( isset(self::$_themes[$themeName]) )
-            return self::$_themes[$themeName];
+        if ( isset(self::$_themes[$themeName]) ) {
+                    return self::$_themes[$themeName];
+        }
     }
 
     /**
@@ -1250,8 +1296,9 @@ 
      */
     public static function current()
     {
-        if ( !isset(self::$_currentTheme) )
-            self::buildRegistry();
+        if ( !isset(self::$_currentTheme) ) {
+                    self::buildRegistry();
+        }
 
         return self::$_themes[self::$_currentTheme];
     }
@@ -1263,8 +1310,9 @@ 
      */
     public static function getDefault()
     {
-        if ( !isset(self::$_currentTheme) )
-            self::buildRegistry();
+        if ( !isset(self::$_currentTheme) ) {
+                    self::buildRegistry();
+        }
 
         if ( isset($GLOBALS['sugar_config']['default_theme']) && self::exists($GLOBALS['sugar_config']['default_theme']) ) {
             return self::get($GLOBALS['sugar_config']['default_theme']);
@@ -1295,8 +1343,9 @@ 
         $themeName
         )
     {
-        if ( !self::exists($themeName) )
-            return false;
+        if ( !self::exists($themeName) ) {
+                    return false;
+        }
 
         self::$_currentTheme = $themeName;
 
@@ -1333,8 +1382,9 @@ 
                             || $file == "default"
                             || !sugar_is_dir("./$dirPath".$file)
                             || !sugar_is_file("./{$dirPath}{$file}/themedef.php")
-                            )
-                        continue;
+                            ) {
+                                            continue;
+                    }
                     $themedef = array();
                     require("./{$dirPath}{$file}/themedef.php");
                     $themedef = array_merge($themedef,$themedefDefault);
@@ -1343,9 +1393,10 @@ 
                     // if so, then it will override the current one
                     if ( self::exists($themedef['dirName']) ) {
                         $existingTheme = self::get($themedef['dirName']);
-                        foreach ( SugarTheme::getThemeDefFields() as $field )
-                            if ( !isset($themedef[$field]) )
+                        foreach ( SugarTheme::getThemeDefFields() as $field ) {
+                                                    if ( !isset($themedef[$field]) )
                                 $themedef[$field] = $existingTheme->$field;
+                        }
                         self::remove($themedef['dirName']);
                     }
                     if ( isset($themedef['name']) ) {
@@ -1400,12 +1451,14 @@ 
     {
         $themelist = array();
         $disabledThemes = array();
-        if ( isset($GLOBALS['sugar_config']['disabled_themes']) )
-            $disabledThemes = explode(',',$GLOBALS['sugar_config']['disabled_themes']);
+        if ( isset($GLOBALS['sugar_config']['disabled_themes']) ) {
+                    $disabledThemes = explode(',',$GLOBALS['sugar_config']['disabled_themes']);
+        }
 
         foreach ( self::$_themes as $themename => $themeobject ) {
-            if ( in_array($themename,$disabledThemes) )
-                continue;
+            if ( in_array($themename,$disabledThemes) ) {
+                            continue;
+            }
             $themelist[$themeobject->dirName] = $themeobject->name;
         }
         asort($themelist, SORT_STRING);
@@ -1421,12 +1474,14 @@ 
     {
         $themelist = array();
         $disabledThemes = array();
-        if ( isset($GLOBALS['sugar_config']['disabled_themes']) )
-            $disabledThemes = explode(',',$GLOBALS['sugar_config']['disabled_themes']);
+        if ( isset($GLOBALS['sugar_config']['disabled_themes']) ) {
+                    $disabledThemes = explode(',',$GLOBALS['sugar_config']['disabled_themes']);
+        }
 
         foreach ( self::$_themes as $themename => $themeobject ) {
-            if ( in_array($themename,$disabledThemes) )
-                $themelist[$themeobject->dirName] = $themeobject->name;
+            if ( in_array($themename,$disabledThemes) ) {
+                            $themelist[$themeobject->dirName] = $themeobject->name;
+            }
         }
 
         return $themelist;
@@ -1441,8 +1496,9 @@ 
     {
         $themelist = array();
 
-        foreach ( self::$_themes as $themename => $themeobject )
-            $themelist[$themeobject->dirName] = $themeobject->name;
+        foreach ( self::$_themes as $themename => $themeobject ) {
+                    $themelist[$themeobject->dirName] = $themeobject->name;
+        }
 
         return $themelist;
     }
@@ -1456,8 +1512,9 @@ 
     {
         $themelist = array();
         $disabledThemes = array();
-        if (isset($GLOBALS['sugar_config']['disabled_themes']))
-            $disabledThemes = explode(',', $GLOBALS['sugar_config']['disabled_themes']);
+        if (isset($GLOBALS['sugar_config']['disabled_themes'])) {
+                    $disabledThemes = explode(',', $GLOBALS['sugar_config']['disabled_themes']);
+        }
 
         foreach (self::$_themes as $themename => $themeobject) {
             $themearray['name'] = $themeobject->name;
@@ -1478,8 +1535,9 @@ 
     {
         global $sugar_config;
 
-        if ( !self::exists($themeName) )
-            return false;
+        if ( !self::exists($themeName) ) {
+                    return false;
+        }
 
         $config = array();
 

Doc Comments +4 added lines, -2 removed lines

@@ -458,7 +458,7 @@ 
     /**
      * Return array of all valid fields that can be specified in the themedef.php file
      *
-     * @return array
+     * @return string[]
      */
     public static function getThemeDefFields()
     {
@@ -698,7 +698,7 @@ 
     /**
      * Returns an image tag for the given image.
      *
-     * @param  string $image image name
+     * @param  string $imageName 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
@@ -817,6 +817,8 @@ 
 	 * @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)
+	 * @param string $attr
+	 * @param string $title
 	 * @return string HTML span tag
 	 */
 	public function getSprite($class, $attr, $title) {

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;
 }

Spacing +60 added lines, -60 removed lines

@@ -49,21 +49,21 @@ 
 	 * @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){
+	static function createLanguageFile($module, $templates = array('default'), $refresh = false) {
 		global $mod_strings, $current_language;
-		if(inDeveloperMode() || !empty($_SESSION['developerMode'])){
+		if (inDeveloperMode() || !empty($_SESSION['developerMode'])) {
         	$refresh = true;
     	}
 		$temp_mod_strings = $mod_strings;
 		$lang = $current_language;
-        if(empty($lang))
+        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'))){
+		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);
+			$loaded_mod_strings = LanguageManager::loadTemplateLanguage($module, $templates, $lang, $loaded_mod_strings);
 			$createdModules[$module] = true;
-			LanguageManager::refreshLanguage($module,$lang, $loaded_mod_strings);
+			LanguageManager::refreshLanguage($module, $lang, $loaded_mod_strings);
 		}
 	}
 
@@ -74,48 +74,48 @@ 
 	 * @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){
+	static function loadTemplateLanguage($module, $templates, $lang, $loaded_mod_strings) {
 		$templates = array_reverse($templates);
-		foreach($templates as $template){
-			$temp = LanguageManager::addTemplate($module,$lang, $template);
+		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';
+	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)){
+		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)){
+			} else {
+				$path = 'include/SugarObjects/implements/'.$template.'/language/'.$lang.'.lang.php';
+				if (file_exists($path)) {
 					require($path);
 					$templates[$template] = $mod_strings;
 				}
 			}
 		}
-		if(!empty($templates[$template])){
+		if (!empty($templates[$template])) {
 			return $templates[$template];
 		}
 	}
 
-	static function saveCache($module,$lang, $loaded_mod_strings, $additonal_objects= array()){
-		if(empty($lang))
+	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);
+		$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);
+		$key = self::getLanguageCacheKey($module, $lang);
+		sugar_cache_put($key, $loaded_mod_strings);
 	}
 
 	/**
@@ -124,24 +124,24 @@ 
 	 *                      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)) {
+	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) {
+		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 (file_exists($cache_dir) && $dir = @opendir($cache_dir)) {
+				while (($entry = readdir($dir)) !== false) {
 					if ($entry == "." || $entry == "..") continue;
-						foreach($languages as $clean_lang) {
+						foreach ($languages as $clean_lang) {
 							LanguageManager::_clearCache($entry, $clean_lang);
 						}
 				}
@@ -155,12 +155,12 @@ 
 	 * @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)){
+	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)){
+			if (file_exists($file)) {
 				unlink($file);
-				$key = self::getLanguageCacheKey($module_dir,$lang);
+				$key = self::getLanguageCacheKey($module_dir, $lang);
 				sugar_cache_clear($key);
 			}
 		}
@@ -174,7 +174,7 @@ 
 	 * @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){
+	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',
@@ -185,35 +185,35 @@ 
 
 		#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])){
+		if (empty($createdModules[$module]) && isset($GLOBALS['beanList'][$module])) {
 				$object = $GLOBALS['beanList'][$module];
 
 				if ($object == 'aCase')
 		            $object = 'Case';
 
-		        if(!empty($GLOBALS["dictionary"]["$object"]["templates"])){
+		        if (!empty($GLOBALS["dictionary"]["$object"]["templates"])) {
 		        	$templates = $GLOBALS["dictionary"]["$object"]["templates"];
-					$loaded_mod_strings = LanguageManager::loadTemplateLanguage($module , $templates, $lang , $loaded_mod_strings);
+					$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))
+		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)){
+		foreach ($lang_paths as $path) {
+			if (file_exists($path)) {
 				require($path);
-				if(!empty($mod_strings)){
-					if (function_exists('sugarArrayMergeRecursive')){
+				if (!empty($mod_strings)) {
+					if (function_exists('sugarArrayMergeRecursive')) {
 						$loaded_mod_strings = sugarArrayMergeRecursive($loaded_mod_strings, $mod_strings);
 					}
-					else{
+					else {
 						$loaded_mod_strings = sugarLangArrayMerge($loaded_mod_strings, $mod_strings);
 					}
 				}
@@ -222,43 +222,43 @@ 
 
 		//great! now that we have loaded all of our vardefs.
 		//let's go save them to the cache file.
-		if(!empty($loaded_mod_strings))
+		if (!empty($loaded_mod_strings))
 			LanguageManager::saveCache($module, $lang, $loaded_mod_strings);
 	}
 
-	static function loadModuleLanguage($module, $lang, $refresh=false){
+	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);
+		$key = self::getLanguageCacheKey($module, $lang);
 
-		if(!$refresh)
+		if (!$refresh)
 		{
 			$return_result = sugar_cache_retrieve($key);
-			if(!empty($return_result) && is_array($return_result)){
+			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)){
+		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)){
+		if (file_exists($cachedfile)) {
 			global $mod_strings;
 
 			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'])){
+			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;
@@ -288,19 +288,19 @@ 
     {
         $jsFiles = array();
         getFiles($jsFiles, sugar_cached('jsLanguage'));
-        foreach($jsFiles as $file) {
+        foreach ($jsFiles as $file) {
             unlink($file);
         }
 
-        if( empty($GLOBALS['sugar_config']['js_lang_version']) )
+        if (empty($GLOBALS['sugar_config']['js_lang_version']))
             $GLOBALS['sugar_config']['js_lang_version'] = 1;
         else
             $GLOBALS['sugar_config']['js_lang_version'] += 1;
 
-        write_array_to_file( "sugar_config", $GLOBALS['sugar_config'], "config.php");
+        write_array_to_file("sugar_config", $GLOBALS['sugar_config'], "config.php");
     }
 }
 
-function translated_prefix($key){
-	return '[translated]' . $key;
+function translated_prefix($key) {
+	return '[translated]'.$key;
 }

Braces +28 added lines, -19 removed lines

@@ -56,8 +56,9 @@ 
     	}
 		$temp_mod_strings = $mod_strings;
 		$lang = $current_language;
-        if(empty($lang))
-            $lang = $GLOBALS['sugar_config']['default_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();
@@ -84,7 +85,9 @@ 
 	}
 
 	static function addTemplate($module, $lang, $template){
-		if($template == 'default')$template = 'basic';
+		if($template == 'default') {
+		    $template = 'basic';
+		}
 		$templates = array();
 		$fields = array();
 		if(empty($templates[$template])){
@@ -92,7 +95,7 @@ 
 			if(file_exists($path)){
 				require($path);
 				$templates[$template] = $mod_strings;
-			}else{
+			} else{
 				$path = 'include/SugarObjects/implements/' . $template . '/language/'.$lang.'.lang.php';
 				if(file_exists($path)){
 					require($path);
@@ -106,8 +109,9 @@ 
 	}
 
 	static function saveCache($module,$lang, $loaded_mod_strings, $additonal_objects= array()){
-		if(empty($lang))
-			$lang = $GLOBALS['sugar_config']['default_language'];
+		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);
@@ -140,7 +144,9 @@ 
 			$cache_dir = sugar_cached('modules/');
 			if(file_exists($cache_dir) && $dir = @opendir($cache_dir)) {
 				while(($entry = readdir($dir)) !== false) {
-					if ($entry == "." || $entry == "..") continue;
+					if ($entry == "." || $entry == "..") {
+					    continue;
+					}
 						foreach($languages as $clean_lang) {
 							LanguageManager::_clearCache($entry, $clean_lang);
 						}
@@ -188,8 +194,9 @@ 
 		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"];
@@ -212,8 +219,7 @@ 
 				if(!empty($mod_strings)){
 					if (function_exists('sugarArrayMergeRecursive')){
 						$loaded_mod_strings = sugarArrayMergeRecursive($loaded_mod_strings, $mod_strings);
-					}
-					else{
+					} else{
 						$loaded_mod_strings = sugarLangArrayMerge($loaded_mod_strings, $mod_strings);
 					}
 				}
@@ -222,8 +228,9 @@ 
 
 		//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);
+		if(!empty($loaded_mod_strings)) {
+					LanguageManager::saveCache($module, $lang, $loaded_mod_strings);
+		}
 	}
 
 	static function loadModuleLanguage($module, $lang, $refresh=false){
@@ -256,8 +263,9 @@ 
 			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($mod_strings)) {
+							sugar_cache_put($key,$mod_strings);
+			}
 			if(!empty($_SESSION['translation_mode'])){
 				$mod_strings = array_map('translated_prefix', $mod_strings);
 			}
@@ -292,10 +300,11 @@ 
             unlink($file);
         }
 
-        if( empty($GLOBALS['sugar_config']['js_lang_version']) )
-            $GLOBALS['sugar_config']['js_lang_version'] = 1;
-        else
-            $GLOBALS['sugar_config']['js_lang_version'] += 1;
+        if( empty($GLOBALS['sugar_config']['js_lang_version']) ) {
+                    $GLOBALS['sugar_config']['js_lang_version'] = 1;
+        } else {
+                    $GLOBALS['sugar_config']['js_lang_version'] += 1;
+        }
 
         write_array_to_file( "sugar_config", $GLOBALS['sugar_config'], "config.php");
     }

Doc Comments +7 added lines

@@ -105,6 +105,10 @@ 
 		}
 	}
 
+	/**
+	 * @param string $module
+	 * @param string $lang
+	 */
 	static function saveCache($module,$lang, $loaded_mod_strings, $additonal_objects= array()){
 		if(empty($lang))
 			$lang = $GLOBALS['sugar_config']['default_language'];
@@ -226,6 +230,9 @@ 
 			LanguageManager::saveCache($module, $lang, $loaded_mod_strings);
 	}
 
+	/**
+	 * @param string $module
+	 */
 	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

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.

Braces +44 added lines, -24 removed lines

@@ -96,14 +96,18 @@ 
     }
 
     static function addTemplate($module, $object, $template, $object_name=false){
-        if($template == 'default')$template = 'basic';
+        if($template == 'default') {
+            $template = 'basic';
+        }
         $templates = array();
         $fields = array();
-        if(empty($object_name))$object_name = $object;
+        if(empty($object_name)) {
+            $object_name = $object;
+        }
         $_object_name = strtolower($object_name);
         if(!empty($GLOBALS['dictionary'][$object]['table'])){
             $table_name = $GLOBALS['dictionary'][$object]['table'];
-        }else{
+        } else{
             $table_name = strtolower($module);
         }
 
@@ -112,7 +116,7 @@ 
             if(file_exists($path)){
                 require($path);
                 $templates[$template] = $vardefs;
-            }else{
+            } else{
                 $path = 'include/SugarObjects/implements/' . $template . '/vardefs.php';
                 if(file_exists($path)){
                     require($path);
@@ -122,12 +126,22 @@ 
         }
        
         if(!empty($templates[$template])){
-            if(empty($GLOBALS['dictionary'][$object]['fields']))$GLOBALS['dictionary'][$object]['fields'] = array();
-            if(empty($GLOBALS['dictionary'][$object]['relationships']))$GLOBALS['dictionary'][$object]['relationships'] = array();
-            if(empty($GLOBALS['dictionary'][$object]['indices']))$GLOBALS['dictionary'][$object]['indices'] = array();
+            if(empty($GLOBALS['dictionary'][$object]['fields'])) {
+                $GLOBALS['dictionary'][$object]['fields'] = array();
+            }
+            if(empty($GLOBALS['dictionary'][$object]['relationships'])) {
+                $GLOBALS['dictionary'][$object]['relationships'] = array();
+            }
+            if(empty($GLOBALS['dictionary'][$object]['indices'])) {
+                $GLOBALS['dictionary'][$object]['indices'] = array();
+            }
             $GLOBALS['dictionary'][$object]['fields'] = array_merge($templates[$template]['fields'], $GLOBALS['dictionary'][$object]['fields']);
-            if(!empty($templates[$template]['relationships']))$GLOBALS['dictionary'][$object]['relationships'] = array_merge($templates[$template]['relationships'], $GLOBALS['dictionary'][$object]['relationships']);
-            if(!empty($templates[$template]['indices']))$GLOBALS['dictionary'][$object]['indices'] = array_merge($templates[$template]['indices'], $GLOBALS['dictionary'][$object]['indices']);
+            if(!empty($templates[$template]['relationships'])) {
+                $GLOBALS['dictionary'][$object]['relationships'] = array_merge($templates[$template]['relationships'], $GLOBALS['dictionary'][$object]['relationships']);
+            }
+            if(!empty($templates[$template]['indices'])) {
+                $GLOBALS['dictionary'][$object]['indices'] = array_merge($templates[$template]['indices'], $GLOBALS['dictionary'][$object]['indices']);
+            }
             // maintain a record of this objects inheritance from the SugarObject templates...
             $GLOBALS['dictionary'][$object]['templates'][ $template ] = $template ;
         }
@@ -160,8 +174,9 @@ 
      */
     static function saveCache($module,$object, $additonal_objects= array()){
 
-        if (empty($GLOBALS['dictionary'][$object]))
-            $object = BeanFactory::getObjectName($module);
+        if (empty($GLOBALS['dictionary'][$object])) {
+                    $object = BeanFactory::getObjectName($module);
+        }
         $file = create_cache_directory('modules/' . $module . '/' . $object . 'vardefs.php');
 
         $out="<?php \n \$GLOBALS[\"dictionary\"][\"". $object . "\"]=" . var_export($GLOBALS['dictionary'][$object], true) .";";
@@ -189,7 +204,7 @@ 
         //otherwise go through each module and remove the vardefs.php
         if(!empty($module_dir) && !empty($object_name)){
             VardefManager::_clearCache($module_dir, $object_name);
-        }else{
+        } else{
             global $beanList;
             foreach($beanList as $module_dir => $object_name){
                 VardefManager::_clearCache($module_dir, $object_name);
@@ -308,11 +323,13 @@ 
         }
 
         //Cache link fields for this call in a static variable
-        if (!isset(self::$linkFields))
-            self::$linkFields = array();
+        if (!isset(self::$linkFields)) {
+                    self::$linkFields = array();
+        }
 
-        if (isset(self::$linkFields[$object]))
-            return self::$linkFields[$object];
+        if (isset(self::$linkFields[$object])) {
+                    return self::$linkFields[$object];
+        }
 
         $vardef = $dictionary[$object];
         $links = array();
@@ -335,8 +352,9 @@ 
     {
         $cacheKey = "LFR{$module}{$object}{$relName}";
         $cacheValue = sugar_cache_retrieve($cacheKey);
-        if(!empty($cacheValue))
-            return $cacheValue;
+        if(!empty($cacheValue)) {
+                    return $cacheValue;
+        }
 
         $relLinkFields = self::getLinkFieldsForModule($module, $object);
         $matches = array();
@@ -350,13 +368,15 @@ 
                 }
             }
         }
-        if (empty($matches))
-            return false;
-        if (sizeof($matches) == 1)
-            $results = $matches[0];
-        else
-            //For relationships where both sides are the same module, more than one link will be returned
+        if (empty($matches)) {
+                    return false;
+        }
+        if (sizeof($matches) == 1) {
+                    $results = $matches[0];
+        } else {
+                    //For relationships where both sides are the same module, more than one link will be returned
             $results = $matches;
+        }
 
         sugar_cache_put($cacheKey, $results);
         return $results ;

Spacing +58 added lines, -58 removed lines

@@ -42,7 +42,7 @@ 
  * Vardefs management
  * @api
  */
-class VardefManager{
+class VardefManager {
     static $custom_disabled_modules = array();
     static $linkFields;
 
@@ -67,8 +67,8 @@ 
         if (isset(VardefManager::$custom_disabled_modules[$module]))
         {
             $vardef_paths = array(
-                'custom/modules/' . $module . '/Ext/Vardefs/vardefs.ext.php',
-                'custom/Extension/modules/' . $module . '/Ext/Vardefs/vardefs.php'
+                'custom/modules/'.$module.'/Ext/Vardefs/vardefs.ext.php',
+                'custom/Extension/modules/'.$module.'/Ext/Vardefs/vardefs.php'
             );
 
             //search a predefined set of locations for the vardef files
@@ -95,41 +95,41 @@ 
         }
     }
 
-    static function addTemplate($module, $object, $template, $object_name=false){
-        if($template == 'default')$template = 'basic';
+    static function addTemplate($module, $object, $template, $object_name = false) {
+        if ($template == 'default')$template = 'basic';
         $templates = array();
         $fields = array();
-        if(empty($object_name))$object_name = $object;
+        if (empty($object_name))$object_name = $object;
         $_object_name = strtolower($object_name);
-        if(!empty($GLOBALS['dictionary'][$object]['table'])){
+        if (!empty($GLOBALS['dictionary'][$object]['table'])) {
             $table_name = $GLOBALS['dictionary'][$object]['table'];
-        }else{
+        } else {
             $table_name = strtolower($module);
         }
 
-        if(empty($templates[$template])){
-            $path = 'include/SugarObjects/templates/' . $template . '/vardefs.php';
-            if(file_exists($path)){
+        if (empty($templates[$template])) {
+            $path = 'include/SugarObjects/templates/'.$template.'/vardefs.php';
+            if (file_exists($path)) {
                 require($path);
                 $templates[$template] = $vardefs;
-            }else{
-                $path = 'include/SugarObjects/implements/' . $template . '/vardefs.php';
-                if(file_exists($path)){
+            } else {
+                $path = 'include/SugarObjects/implements/'.$template.'/vardefs.php';
+                if (file_exists($path)) {
                     require($path);
                     $templates[$template] = $vardefs;
                 }
             }
         }
        
-        if(!empty($templates[$template])){
-            if(empty($GLOBALS['dictionary'][$object]['fields']))$GLOBALS['dictionary'][$object]['fields'] = array();
-            if(empty($GLOBALS['dictionary'][$object]['relationships']))$GLOBALS['dictionary'][$object]['relationships'] = array();
-            if(empty($GLOBALS['dictionary'][$object]['indices']))$GLOBALS['dictionary'][$object]['indices'] = array();
+        if (!empty($templates[$template])) {
+            if (empty($GLOBALS['dictionary'][$object]['fields']))$GLOBALS['dictionary'][$object]['fields'] = array();
+            if (empty($GLOBALS['dictionary'][$object]['relationships']))$GLOBALS['dictionary'][$object]['relationships'] = array();
+            if (empty($GLOBALS['dictionary'][$object]['indices']))$GLOBALS['dictionary'][$object]['indices'] = array();
             $GLOBALS['dictionary'][$object]['fields'] = array_merge($templates[$template]['fields'], $GLOBALS['dictionary'][$object]['fields']);
-            if(!empty($templates[$template]['relationships']))$GLOBALS['dictionary'][$object]['relationships'] = array_merge($templates[$template]['relationships'], $GLOBALS['dictionary'][$object]['relationships']);
-            if(!empty($templates[$template]['indices']))$GLOBALS['dictionary'][$object]['indices'] = array_merge($templates[$template]['indices'], $GLOBALS['dictionary'][$object]['indices']);
+            if (!empty($templates[$template]['relationships']))$GLOBALS['dictionary'][$object]['relationships'] = array_merge($templates[$template]['relationships'], $GLOBALS['dictionary'][$object]['relationships']);
+            if (!empty($templates[$template]['indices']))$GLOBALS['dictionary'][$object]['indices'] = array_merge($templates[$template]['indices'], $GLOBALS['dictionary'][$object]['indices']);
             // maintain a record of this objects inheritance from the SugarObject templates...
-            $GLOBALS['dictionary'][$object]['templates'][ $template ] = $template ;
+            $GLOBALS['dictionary'][$object]['templates'][$template] = $template;
         }
     }
 
@@ -142,7 +142,7 @@ 
      */
     static function cleanVardefs($fieldDefs)
     {
-        if(isset($fieldDefs['fields'])) {
+        if (isset($fieldDefs['fields'])) {
             foreach ($fieldDefs['fields'] as $field => $defs) {
                 if (empty($defs['name']) || empty($defs['type'])) {
                     unset($fieldDefs['fields'][$field]);
@@ -158,7 +158,7 @@ 
      * @param string $module the name of the module
      * @param string $object the name of the object
      */
-    static function saveCache($module,$object, $additonal_objects= array()){
+    static function saveCache($module, $object, $additonal_objects = array()) {
 
         if (empty($GLOBALS['dictionary'][$object]))
             $object = BeanFactory::getObjectName($module);
@@ -166,17 +166,17 @@ 
         //Sometimes bad definitions can get in from left over extensions or file system lag(caching). We need to clean those.
         $data = self::cleanVardefs($GLOBALS['dictionary'][$object]);
 
-        $file = create_cache_directory('modules/' . $module . '/' . $object . 'vardefs.php');
+        $file = create_cache_directory('modules/'.$module.'/'.$object.'vardefs.php');
 
-        $out="<?php \n \$GLOBALS[\"dictionary\"][\"". $object . "\"]=" . var_export($data, true) .";";
+        $out = "<?php \n \$GLOBALS[\"dictionary\"][\"".$object."\"]=".var_export($data, true).";";
         sugar_file_put_contents_atomic($file, $out);
-        if ( sugar_is_file($file) && is_readable($file)) {
+        if (sugar_is_file($file) && is_readable($file)) {
             include($file);
         }
 
         // put the item in the sugar cache.
         $key = "VardefManager.$module.$object";
-        sugar_cache_put($key,$data);
+        sugar_cache_put($key, $data);
     }
 
     /**
@@ -186,14 +186,14 @@ 
      *                      clear vardef cache for all modules.
      * @param string object_name the name of the object we are clearing this is for sugar_cache
      */
-    static function clearVardef($module_dir = '', $object_name = ''){
+    static function clearVardef($module_dir = '', $object_name = '') {
         //if we have a module name specified then just remove that vardef file
         //otherwise go through each module and remove the vardefs.php
-        if(!empty($module_dir) && !empty($object_name)){
+        if (!empty($module_dir) && !empty($object_name)) {
             VardefManager::_clearCache($module_dir, $object_name);
-        }else{
+        } else {
             global $beanList;
-            foreach($beanList as $module_dir => $object_name){
+            foreach ($beanList as $module_dir => $object_name) {
                 VardefManager::_clearCache($module_dir, $object_name);
             }
         }
@@ -204,8 +204,8 @@ 
      * @param string module_dir the module_dir to clear
      * @param string object_name the name of the object we are clearing this is for sugar_cache
      */
-    static function _clearCache($module_dir = '', $object_name = ''){
-        if(!empty($module_dir) && !empty($object_name)){
+    static function _clearCache($module_dir = '', $object_name = '') {
+        if (!empty($module_dir) && !empty($object_name)) {
 
             //Some modules like cases have a bean name that doesn't match the object name
             if (empty($GLOBALS['dictionary'][$object_name])) {
@@ -213,9 +213,9 @@ 
                 $object_name = $newName != false ? $newName : $object_name;
             }
 
-            $file = sugar_cached('modules/').$module_dir.'/' . $object_name . 'vardefs.php';
+            $file = sugar_cached('modules/').$module_dir.'/'.$object_name.'vardefs.php';
 
-            if(file_exists($file)){
+            if (file_exists($file)) {
                 unlink($file);
                 $key = "VardefManager.$module_dir.$object_name";
                 sugar_cache_clear($key);
@@ -231,7 +231,7 @@ 
      * @param string $object the given object we wish to load the vardefs for
      * @param array $additional_search_paths an array which allows a consumer to pass in additional vardef locations to search
      */
-    static function refreshVardefs($module, $object, $additional_search_paths = null, $cacheCustom = true, $params = array()){
+    static function refreshVardefs($module, $object, $additional_search_paths = null, $cacheCustom = true, $params = array()) {
         // Some of the vardefs do not correctly define dictionary as global.  Declare it first.
         global $dictionary, $beanList;
         $vardef_paths = array(
@@ -241,20 +241,20 @@ 
                  );
 
         // Add in additional search paths if they were provided.
-        if(!empty($additional_search_paths) && is_array($additional_search_paths))
+        if (!empty($additional_search_paths) && is_array($additional_search_paths))
         {
             $vardef_paths = array_merge($vardef_paths, $additional_search_paths);
         }
         $found = false;
         //search a predefined set of locations for the vardef files
-        foreach($vardef_paths as $path){
-            if(file_exists($path)){
+        foreach ($vardef_paths as $path) {
+            if (file_exists($path)) {
                 require($path);
                 $found = true;
             }
         }
         //Some modules have multiple beans, we need to see if this object has a module_dir that is different from its module_name
-        if(!$found){
+        if (!$found) {
             $temp = BeanFactory::newBean($module);
             if ($temp)
             {
@@ -273,15 +273,15 @@ 
         }
 
         //load custom fields into the vardef cache
-        if($cacheCustom){
+        if ($cacheCustom) {
             require_once("modules/DynamicFields/DynamicField.php");
-            $df = new DynamicField ($module) ;
+            $df = new DynamicField($module);
             $df->buildCache($module, false);
         }
 
         //great! now that we have loaded all of our vardefs.
         //let's go save them to the cache file.
-        if(!empty($dictionary[$object])) {
+        if (!empty($dictionary[$object])) {
             VardefManager::saveCache($module, $object);
         }
     }
@@ -318,10 +318,10 @@ 
 
         $vardef = $dictionary[$object];
         $links = array();
-        foreach($vardef['fields'] as $name => $def)
+        foreach ($vardef['fields'] as $name => $def)
         {
             //Look through all link fields for related modules that have calculated fields that use that relationship
-            if(!empty($def['type']) && $def['type'] == 'link' && !empty($def['relationship']))
+            if (!empty($def['type']) && $def['type'] == 'link' && !empty($def['relationship']))
             {
                 $links[$name] = $def;
             }
@@ -337,14 +337,14 @@ 
     {
         $cacheKey = "LFR{$module}{$object}{$relName}";
         $cacheValue = sugar_cache_retrieve($cacheKey);
-        if(!empty($cacheValue))
+        if (!empty($cacheValue))
             return $cacheValue;
 
         $relLinkFields = self::getLinkFieldsForModule($module, $object);
         $matches = array();
         if (!empty($relLinkFields))
         {
-            foreach($relLinkFields as $rfName => $rfDef)
+            foreach ($relLinkFields as $rfName => $rfDef)
             {
                 if ($rfDef['relationship'] == $relName)
                 {
@@ -361,7 +361,7 @@ 
             $results = $matches;
 
         sugar_cache_put($cacheKey, $results);
-        return $results ;
+        return $results;
     }
 
 
@@ -400,22 +400,22 @@ 
      * @param string $object the given object we wish to load the vardefs for
      * @param bool   $refresh whether or not we wish to refresh the cache file.
      */
-    static function loadVardef($module, $object, $refresh=false, $params = array()){
+    static function loadVardef($module, $object, $refresh = false, $params = array()) {
         //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
-        if(inDeveloperMode() || !empty($_SESSION['developerMode'])){
+        if (inDeveloperMode() || !empty($_SESSION['developerMode'])) {
             $refresh = true;
         }
         // Retrieve the vardefs from cache.
         $key = "VardefManager.$module.$object";
 
-        if(!$refresh)
+        if (!$refresh)
         {
             $return_result = sugar_cache_retrieve($key);
             $return_result = self::applyGlobalAccountRequirements($return_result);
 
-            if(!empty($return_result))
+            if (!empty($return_result))
             {
                 $GLOBALS['dictionary'][$object] = $return_result;
                 return;
@@ -424,28 +424,28 @@ 
 
         // Some of the vardefs do not correctly define dictionary as global.  Declare it first.
         global $dictionary;
-        if(empty($GLOBALS['dictionary'][$object]) || $refresh){
+        if (empty($GLOBALS['dictionary'][$object]) || $refresh) {
             //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)){
+			$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.
-            if(file_exists($cachedfile))
+            if (file_exists($cachedfile))
             {
                 if (is_readable($cachedfile))
                 {
                     include($cachedfile);
                 }
                 // now that we hae loaded the data from disk, put it in the cache.
-                if(!empty($GLOBALS['dictionary'][$object]))
+                if (!empty($GLOBALS['dictionary'][$object]))
                 {
                     $GLOBALS['dictionary'][$object] = self::applyGlobalAccountRequirements($GLOBALS['dictionary'][$object]);
-                    sugar_cache_put($key,$GLOBALS['dictionary'][$object]);
+                    sugar_cache_put($key, $GLOBALS['dictionary'][$object]);
                 }
             }
         }

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')
 ),
 
 

Spacing +15 added lines, -15 removed lines

@@ -38,9 +38,9 @@ 
  ********************************************************************************/
 
 $vardefs = array(  
-'fields' => array (
+'fields' => array(
 	  'id' =>
-	  array (
+	  array(
 	    'name' => 'id',
 	    'vname' => 'LBL_ID',
 	    'type' => 'id',
@@ -66,7 +66,7 @@ 
         'merge_filter' => 'selected',
 	    ),
 	  'date_entered' =>
-	  array (
+	  array(
 	    'name' => 'date_entered',
 	    'vname' => 'LBL_DATE_ENTERED',
 	    'type' => 'datetime',
@@ -77,7 +77,7 @@ 
 		'inline_edit' => false,
 	  ),
 	  'date_modified' =>
-	  array (
+	  array(
 	    'name' => 'date_modified',
 	    'vname' => 'LBL_DATE_MODIFIED',
 	    'type' => 'datetime',
@@ -88,7 +88,7 @@ 
 		'inline_edit' => false,
 	  ),
 		'modified_user_id' =>
-	  array (
+	  array(
 	    'name' => 'modified_user_id',
 	    'rname' => 'user_name',
 	    'id_name' => 'modified_user_id',
@@ -104,7 +104,7 @@ 
 		'inline_edit' => false,
 	  ),
 	  'modified_by_name' => 
-	  array (
+	  array(
 	    'name' => 'modified_by_name',
 	    'vname' => 'LBL_MODIFIED_NAME',
 	    'type' => 'relate',
@@ -120,7 +120,7 @@ 
 		'inline_edit' => false,
 	  ),  
 	  'created_by' =>
-	  array (
+	  array(
 	    'name' => 'created_by',
 	    'rname' => 'user_name',
 	    'id_name' => 'modified_user_id',
@@ -135,7 +135,7 @@ 
 		'inline_edit' => false,
 	  ),
 	  'created_by_name' =>
-	  array (
+	  array(
 	    'name' => 'created_by_name',
 		'vname' => 'LBL_CREATED',
 		'type' => 'relate',
@@ -152,7 +152,7 @@ 
 		'inline_edit' => false,
 	),
 	  'description' =>
-	  array (
+	  array(
 	    'name' => 'description',
 	    'vname' => 'LBL_DESCRIPTION',
 	    'type' => 'text',
@@ -161,7 +161,7 @@ 
 	    'cols' => 80,
 	  ),
 	  'deleted' =>
-	  array (
+	  array(
 	    'name' => 'deleted',
 	    'vname' => 'LBL_DELETED',
 	    'type' => 'bool',
@@ -172,10 +172,10 @@ 
 	    
 /////////////////RELATIONSHIP LINKS////////////////////////////
 	  'created_by_link' =>
-  array (
+  array(
      'name' => 'created_by_link',
     'type' => 'link',
-    'relationship' => strtolower($module) . '_created_by',
+    'relationship' => strtolower($module).'_created_by',
     'vname' => 'LBL_CREATED_USER',
     'link_type' => 'one',
     'module'=>'Users',
@@ -183,10 +183,10 @@ 
     'source'=>'non-db',
   ),
   'modified_user_link' =>
-  array (
+  array(
         'name' => 'modified_user_link',
     'type' => 'link',
-    'relationship' => strtolower($module). '_modified_user',
+    'relationship' => strtolower($module).'_modified_user',
     'vname' => 'LBL_MODIFIED_USER',
     'link_type' => 'one',
     'module'=>'Users',
@@ -195,7 +195,7 @@ 
   ),
 
 ),
-'indices' => array (
+'indices' => array(
        'id'=>array('name' =>strtolower($module).'pk', 'type' =>'primary', 'fields'=>array('id')),
        ),
 'relationships'=>array(

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;

Spacing +57 added lines, -57 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -175,14 +175,14 @@ 
                     "ReturnDatesAsStrings" => true,
                     "MultipleActiveResultSets" => true,
                     );
-        if(!empty($configOptions['db_name'])) {
+        if (!empty($configOptions['db_name'])) {
             $options["Database"] = $configOptions['db_name'];
         }
         $this->database = sqlsrv_connect($connect_param, $options);
-        if(empty($this->database)) {
+        if (empty($this->database)) {
             $GLOBALS['log']->fatal("Could not connect to server ".$configOptions['db_host_name']." as ".$configOptions['db_user_name'].".");
-            if($dieOnError) {
-                    if(isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
+            if ($dieOnError) {
+                    if (isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
                         sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
                     } else {
                         sugar_die("Could not connect to the database. Please refer to suitecrm.log for details.");
@@ -192,7 +192,7 @@ 
             }
         }
 
-        if($this->checkError('Could Not Connect:', $dieOnError))
+        if ($this->checkError('Could Not Connect:', $dieOnError))
             $GLOBALS['log']->info("connected to db");
 
         sqlsrv_query($this->database, 'SET DATEFORMAT mdy');
@@ -208,26 +208,26 @@ 
 	 */
 	public function query($sql, $dieOnError = false, $msg = '', $suppress = false, $keepResult = false)
     {
-        if(is_array($sql)) {
+        if (is_array($sql)) {
             return $this->queryArray($sql, $dieOnError, $msg, $suppress);
         }
         $sql = $this->_appendN($sql);
 
         $this->countQuery($sql);
-        $GLOBALS['log']->info('Query:' . $sql);
+        $GLOBALS['log']->info('Query:'.$sql);
         $this->checkConnection();
         $this->query_time = microtime(true);
 
-        $result = $suppress?@sqlsrv_query($this->database, $sql):sqlsrv_query($this->database, $sql);
+        $result = $suppress ? @sqlsrv_query($this->database, $sql) : sqlsrv_query($this->database, $sql);
 
         $this->query_time = microtime(true) - $this->query_time;
         $GLOBALS['log']->info('Query Execution Time:'.$this->query_time);
 
 
-        $this->checkError($msg.' Query Failed:' . $sql . '::', $dieOnError);
+        $this->checkError($msg.' Query Failed:'.$sql.'::', $dieOnError);
 
         //suppress non error messages
-        sqlsrv_configure('WarningsReturnAsErrors',false);
+        sqlsrv_configure('WarningsReturnAsErrors', false);
 
         return $result;
     }
@@ -239,13 +239,13 @@ 
 	{
         $field_array = array();
 
-        if ( !$result ) {
+        if (!$result) {
         	return false;
         }
 
-        foreach ( sqlsrv_field_metadata($result) as $fieldMetadata ) {
+        foreach (sqlsrv_field_metadata($result) as $fieldMetadata) {
             $key = $fieldMetadata['Name'];
-            if($make_lower_case==true)
+            if ($make_lower_case == true)
                 $key = strtolower($key);
 
             $field_array[] = $key;
@@ -261,12 +261,12 @@ 
 	{
 		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;
         }
 
-        foreach($row as $key => $column) {
+        foreach ($row as $key => $column) {
             // MSSQL returns a space " " when a varchar column is empty ("") and not null.
             // We need to strip empty spaces
             // notice we only strip if one space is returned.  we do not want to strip
@@ -284,7 +284,7 @@ 
      */
     public function convert($string, $type, array $additional_parameters = array())
     {
-        if ( $type == 'datetime')
+        if ($type == 'datetime')
         // see http://msdn.microsoft.com/en-us/library/ms187928.aspx for details
             return "CONVERT(datetime,$string,120)";
         else
@@ -300,10 +300,10 @@ 
      * @param  array  $fielddef2
      * @return bool   true if they match, false if they don't
      */
-    public function compareVarDefs($fielddef1,$fielddef2, $ignoreName = false)
+    public function compareVarDefs($fielddef1, $fielddef2, $ignoreName = false)
     {
-        if((isset($fielddef2['dbType']) && $fielddef2['dbType'] == 'id') || preg_match('/(_id$|^id$)/', $fielddef2['name'])){
-            if(isset($fielddef1['type']) && isset($fielddef2['type'])){
+        if ((isset($fielddef2['dbType']) && $fielddef2['dbType'] == 'id') || preg_match('/(_id$|^id$)/', $fielddef2['name'])) {
+            if (isset($fielddef1['type']) && isset($fielddef2['type'])) {
                 $fielddef2['type'] = $fielddef1['type'];
             }
         }
@@ -318,7 +318,7 @@ 
     public function disconnect()
     {
     	$GLOBALS['log']->debug('Calling Mssql::disconnect()');
-        if(!empty($this->database)){
+        if (!empty($this->database)) {
             $this->freeResult();
             sqlsrv_close($this->database);
             $this->database = null;
@@ -330,7 +330,7 @@ 
      */
     protected function freeDbResult($dbResult)
     {
-        if(!empty($dbResult))
+        if (!empty($dbResult))
             sqlsrv_free_stmt($dbResult);
     }
 
@@ -342,19 +342,19 @@ 
      */
     public function getConstraintSql($indices, $table)
     {
-        if ( $this->doesTableHaveAClusteredIndexDefined($table) ) {
+        if ($this->doesTableHaveAClusteredIndexDefined($table)) {
             return parent::getConstraintSql($indices, $table);
         }
 
         // check to see if one of the passed in indices is a primary one; if so we can bail as well
-        foreach ( $indices as $index ) {
-            if ( $index['type'] == 'primary' ) {
+        foreach ($indices as $index) {
+            if ($index['type'] == 'primary') {
                 return parent::getConstraintSql($indices, $table);
             }
         }
 
         // Change the first index listed to be a clustered one instead ( so we have at least one for the table )
-        if ( isset($indices[0]) ) {
+        if (isset($indices[0])) {
             $indices[0]['type'] = 'clustered';
         }
 
@@ -370,41 +370,41 @@ 
         $result = $this->query("sp_columns_90 $tablename");
 
         $columns = array();
-        while (($row=$this->fetchByAssoc($result)) !=null) {
+        while (($row = $this->fetchByAssoc($result)) != null) {
             $column_name = strtolower($row['COLUMN_NAME']);
-            $columns[$column_name]['name']=$column_name;
-            $columns[$column_name]['type']=strtolower($row['TYPE_NAME']);
-            if ( $row['TYPE_NAME'] == 'decimal' ) {
-                $columns[$column_name]['len']=strtolower($row['PRECISION']);
-                $columns[$column_name]['len'].=','.strtolower($row['SCALE']);
+            $columns[$column_name]['name'] = $column_name;
+            $columns[$column_name]['type'] = strtolower($row['TYPE_NAME']);
+            if ($row['TYPE_NAME'] == 'decimal') {
+                $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']);
+            elseif (!in_array($row['TYPE_NAME'], array('datetime', 'text'))) {
+                $columns[$column_name]['len'] = strtolower($row['LENGTH']);
             }
-            if ( stristr($row['TYPE_NAME'],'identity') ) {
+            if (stristr($row['TYPE_NAME'], 'identity')) {
                 $columns[$column_name]['auto_increment'] = '1';
-                $columns[$column_name]['type']=str_replace(' identity','',strtolower($row['TYPE_NAME']));
+                $columns[$column_name]['type'] = str_replace(' identity', '', strtolower($row['TYPE_NAME']));
             }
 
-            if (!empty($row['IS_NULLABLE']) && $row['IS_NULLABLE'] == 'NO' && (empty($row['KEY']) || !stristr($row['KEY'],'PRI')))
+            if (!empty($row['IS_NULLABLE']) && $row['IS_NULLABLE'] == 'NO' && (empty($row['KEY']) || !stristr($row['KEY'], 'PRI')))
                 $columns[strtolower($row['COLUMN_NAME'])]['required'] = 'true';
 
             $column_def = 1;
-            if ( strtolower($tablename) == 'relationships' ) {
+            if (strtolower($tablename) == 'relationships') {
                 $column_def = $this->getOne("select cdefault from syscolumns where id = object_id('relationships') and name = '$column_name'");
             }
-            if ( $column_def != 0 && ($row['COLUMN_DEF'] != null)) {	// NOTE Not using !empty as an empty string may be a viable default value.
+            if ($column_def != 0 && ($row['COLUMN_DEF'] != null)) {	// NOTE Not using !empty as an empty string may be a viable default value.
                 $matches = array();
-                $row['COLUMN_DEF'] = html_entity_decode($row['COLUMN_DEF'],ENT_QUOTES);
-                if ( preg_match('/\([\(|\'](.*)[\)|\']\)/i',$row['COLUMN_DEF'],$matches) )
+                $row['COLUMN_DEF'] = html_entity_decode($row['COLUMN_DEF'], ENT_QUOTES);
+                if (preg_match('/\([\(|\'](.*)[\)|\']\)/i', $row['COLUMN_DEF'], $matches))
                     $columns[$column_name]['default'] = $matches[1];
-                elseif ( preg_match('/\(N\'(.*)\'\)/i',$row['COLUMN_DEF'],$matches) )
+                elseif (preg_match('/\(N\'(.*)\'\)/i', $row['COLUMN_DEF'], $matches))
                     $columns[$column_name]['default'] = $matches[1];
                 else
                     $columns[$column_name]['default'] = $row['COLUMN_DEF'];
@@ -430,7 +430,7 @@ 
 EOSQL;
 
         $result = $this->getOne($query);
-        if ( !$result ) {
+        if (!$result) {
             return false;
         }
 
@@ -453,7 +453,7 @@ 
 EOSQL;
 
         $result = $this->getOne($query);
-        if ( !$result ) {
+        if (!$result) {
             return false;
         }
 
@@ -466,10 +466,10 @@ 
      * @see DBManager::changeColumnSQL()
      * @see MssqlHelper::changeColumnSQL()
      */
-    protected function changeColumnSQL($tablename,$fieldDefs, $action, $ignoreRequired = false)
+    protected function changeColumnSQL($tablename, $fieldDefs, $action, $ignoreRequired = false)
     {
         $sql = '';
-        if ( $action == 'drop' && $this->doesTableHaveAFulltextIndexDefined($tablename) ) {
+        if ($action == 'drop' && $this->doesTableHaveAFulltextIndexDefined($tablename)) {
             $sql .= "DROP FULLTEXT INDEX ON {$tablename}";
         }
 
@@ -495,33 +495,33 @@ 
     public function lastDbError()
     {
         $errors = sqlsrv_errors(SQLSRV_ERR_ERRORS);
-        if(empty($errors)) return false;
+        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_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;
         }
         $messages = array();
-        foreach($errors as $error) {
+        foreach ($errors as $error) {
             $sqlmsg = $error['message'];
             $sqlpos = strpos($sqlmsg, 'Changed database context to');
             $sqlpos2 = strpos($sqlmsg, 'Warning:');
             $sqlpos3 = strpos($sqlmsg, 'Checking identity information:');
-            if ( $sqlpos !== false || $sqlpos2 !== false || $sqlpos3 !== false ) {
+            if ($sqlpos !== false || $sqlpos2 !== false || $sqlpos3 !== false) {
                 continue;
             }
             $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;
         }
 
-        if(!empty($messages)) {
+        if (!empty($messages)) {
             return join("\n", $messages);
         }
         return false;
@@ -548,7 +548,7 @@ 
     protected function verifyGenericQueryRollback($type, $table, $query)
     {
         $this->log->debug("verifying $type statement");
-        if(!sqlsrv_begin_transaction($this->database)) {
+        if (!sqlsrv_begin_transaction($this->database)) {
             return "Failed to create transaction";
         }
         $this->query($query, false);

Braces +43 added lines, -31 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -153,16 +155,18 @@ 
     {
         global $sugar_config;
 
-        if (is_null($configOptions))
-            $configOptions = $sugar_config['dbconfig'];
+        if (is_null($configOptions)) {
+                    $configOptions = $sugar_config['dbconfig'];
+        }
 
         //set the connections parameters
         $connect_param = '';
         $configOptions['db_host_instance'] = trim($configOptions['db_host_instance']);
-        if (empty($configOptions['db_host_instance']))
-            $connect_param = $configOptions['db_host_name'];
-        else
-            $connect_param = $configOptions['db_host_name']."\\".$configOptions['db_host_instance'];
+        if (empty($configOptions['db_host_instance'])) {
+                    $connect_param = $configOptions['db_host_name'];
+        } else {
+                    $connect_param = $configOptions['db_host_name']."\\".$configOptions['db_host_instance'];
+        }
 
         /*
          * Don't try to specifically use a persistent connection
@@ -192,8 +196,9 @@ 
             }
         }
 
-        if($this->checkError('Could Not Connect:', $dieOnError))
-            $GLOBALS['log']->info("connected to db");
+        if($this->checkError('Could Not Connect:', $dieOnError)) {
+                    $GLOBALS['log']->info("connected to db");
+        }
 
         sqlsrv_query($this->database, 'SET DATEFORMAT mdy');
 
@@ -245,8 +250,9 @@ 
 
         foreach ( sqlsrv_field_metadata($result) as $fieldMetadata ) {
             $key = $fieldMetadata['Name'];
-            if($make_lower_case==true)
-                $key = strtolower($key);
+            if($make_lower_case==true) {
+                            $key = strtolower($key);
+            }
 
             $field_array[] = $key;
         }
@@ -259,7 +265,9 @@ 
 	 */
 	public function fetchRow($result)
 	{
-		if (empty($result))	return false;
+		if (empty($result)) {
+		    return false;
+		}
 
 	    $row = sqlsrv_fetch_array($result,SQLSRV_FETCH_ASSOC);
         if (empty($row)) {
@@ -284,11 +292,12 @@ 
      */
     public function convert($string, $type, array $additional_parameters = array())
     {
-        if ( $type == 'datetime')
-        // see http://msdn.microsoft.com/en-us/library/ms187928.aspx for details
+        if ( $type == 'datetime') {
+                // see http://msdn.microsoft.com/en-us/library/ms187928.aspx for details
             return "CONVERT(datetime,$string,120)";
-        else
-            return parent::convert($string, $type, $additional_parameters);
+        } else {
+                    return parent::convert($string, $type, $additional_parameters);
+        }
     }
 
 	/**
@@ -330,8 +339,9 @@ 
      */
     protected function freeDbResult($dbResult)
     {
-        if(!empty($dbResult))
-            sqlsrv_free_stmt($dbResult);
+        if(!empty($dbResult)) {
+                    sqlsrv_free_stmt($dbResult);
+        }
     }
 
 
@@ -377,14 +387,12 @@ 
             if ( $row['TYPE_NAME'] == 'decimal' ) {
                 $columns[$column_name]['len']=strtolower($row['PRECISION']);
                 $columns[$column_name]['len'].=','.strtolower($row['SCALE']);
-            }
-			elseif ( in_array($row['TYPE_NAME'],array('nchar','nvarchar')) ) {
+            } 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')) ) {
+			} elseif ( !in_array($row['TYPE_NAME'],array('datetime','text')) ) {
                 $columns[$column_name]['len']=strtolower($row['LENGTH']);
             }
             if ( stristr($row['TYPE_NAME'],'identity') ) {
@@ -392,8 +400,9 @@ 
                 $columns[$column_name]['type']=str_replace(' identity','',strtolower($row['TYPE_NAME']));
             }
 
-            if (!empty($row['IS_NULLABLE']) && $row['IS_NULLABLE'] == 'NO' && (empty($row['KEY']) || !stristr($row['KEY'],'PRI')))
-                $columns[strtolower($row['COLUMN_NAME'])]['required'] = 'true';
+            if (!empty($row['IS_NULLABLE']) && $row['IS_NULLABLE'] == 'NO' && (empty($row['KEY']) || !stristr($row['KEY'],'PRI'))) {
+                            $columns[strtolower($row['COLUMN_NAME'])]['required'] = 'true';
+            }
 
             $column_def = 1;
             if ( strtolower($tablename) == 'relationships' ) {
@@ -402,12 +411,13 @@ 
             if ( $column_def != 0 && ($row['COLUMN_DEF'] != null)) {	// NOTE Not using !empty as an empty string may be a viable default value.
                 $matches = array();
                 $row['COLUMN_DEF'] = html_entity_decode($row['COLUMN_DEF'],ENT_QUOTES);
-                if ( preg_match('/\([\(|\'](.*)[\)|\']\)/i',$row['COLUMN_DEF'],$matches) )
-                    $columns[$column_name]['default'] = $matches[1];
-                elseif ( preg_match('/\(N\'(.*)\'\)/i',$row['COLUMN_DEF'],$matches) )
-                    $columns[$column_name]['default'] = $matches[1];
-                else
-                    $columns[$column_name]['default'] = $row['COLUMN_DEF'];
+                if ( preg_match('/\([\(|\'](.*)[\)|\']\)/i',$row['COLUMN_DEF'],$matches) ) {
+                                    $columns[$column_name]['default'] = $matches[1];
+                } elseif ( preg_match('/\(N\'(.*)\'\)/i',$row['COLUMN_DEF'],$matches) ) {
+                                    $columns[$column_name]['default'] = $matches[1];
+                } else {
+                                    $columns[$column_name]['default'] = $row['COLUMN_DEF'];
+                }
             }
         }
         return $columns;
@@ -495,7 +505,9 @@ 
     public function lastDbError()
     {
         $errors = sqlsrv_errors(SQLSRV_ERR_ERRORS);
-        if(empty($errors)) return false;
+        if(empty($errors)) {
+            return false;
+        }
         global $app_strings;
         if (empty($app_strings)
 		    or !isset($app_strings['ERR_MSSQL_DB_CONTEXT'])

Doc Comments +1 added lines, -1 removed lines

@@ -540,7 +540,7 @@
 
     /**
      * Execute data manipulation statement, then roll it back
-     * @param  $type
+     * @param  string $type
      * @param  $table
      * @param  $query
      * @return string

include/database/MssqlManager.php

Indentation +156 added lines, -156 removed lines

@@ -140,8 +140,8 @@ 
             'relate'   => 'varchar',
             'multienum'=> 'text',
             'html'     => 'text',
-			'longhtml' => 'text',
-    		'datetime' => 'datetime',
+            'longhtml' => 'text',
+            'datetime' => 'datetime',
             'datetimecombo' => 'datetime',
             'time'     => 'datetime',
             'bool'     => 'bit',
@@ -156,7 +156,7 @@ 
             'url'      => 'varchar',
             'encrypt'  => 'varchar',
             'file'     => 'varchar',
-	        'decimal_tpl' => 'decimal(%d, %d)',
+            'decimal_tpl' => 'decimal(%d, %d)',
             );
 
     protected $connectOptions = null;
@@ -236,16 +236,16 @@ 
         //it will throw an Unable to select database message.
 
         if(!empty($configOptions['db_name']) && !@mssql_select_db($configOptions['db_name'], $this->database)){
-			$connected = false;
-			for($i=0;$i<5;$i++){
-				usleep(200000);
-				if(@mssql_select_db($configOptions['db_name'], $this->database)){
-					$connected = true;
-					break;
-				}
-			}
-			if(!$connected){
-			    $GLOBALS['log']->fatal( "Unable to select database {$configOptions['db_name']}");
+            $connected = false;
+            for($i=0;$i<5;$i++){
+                usleep(200000);
+                if(@mssql_select_db($configOptions['db_name'], $this->database)){
+                    $connected = true;
+                    break;
+                }
+            }
+            if(!$connected){
+                $GLOBALS['log']->fatal( "Unable to select database {$configOptions['db_name']}");
                 if($dieOnError) {
                     if(isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
                         sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
@@ -255,8 +255,8 @@ 
                 } else {
                     return false;
                 }
-			}
-         }
+            }
+            }
 
         if(!$this->checkError('Could Not Connect', $dieOnError))
             $GLOBALS['log']->info("connected to db");
@@ -267,18 +267,18 @@ 
         return true;
     }
 
-	/**
+    /**
      * @see DBManager::version()
      */
     public function version()
     {
         return $this->getOne("SELECT @@VERSION as version");
-	}
+    }
 
-	/**
+    /**
      * @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);
@@ -287,7 +287,7 @@ 
         if ((substr_count($sql, "'") & 1))
             $GLOBALS['log']->error("SQL statement[" . $sql . "] has odd number of single quotes.");
 
-		$sql = $this->_appendN($sql);
+        $sql = $this->_appendN($sql);
 
         $GLOBALS['log']->info('Query:' . $sql);
         $this->checkConnection();
@@ -295,7 +295,7 @@ 
         $this->query_time = microtime(true);
 
         // Bug 34892 - Clear out previous error message by checking the @@ERROR global variable
-		@mssql_query("SELECT @@ERROR", $this->database);
+        @mssql_query("SELECT @@ERROR", $this->database);
 
         $result = $suppress?@mssql_query($sql, $this->database):mssql_query($sql, $this->database);
 
@@ -305,18 +305,18 @@ 
             //				  not affect the functionality of the query
             $sqlmsg = mssql_get_last_message();
             $sqlpos = strpos($sqlmsg, 'Changed database context to');
-			$sqlpos2 = strpos($sqlmsg, 'Warning:');
-			$sqlpos3 = strpos($sqlmsg, 'Checking identity information:');
+            $sqlpos2 = strpos($sqlmsg, 'Warning:');
+            $sqlpos3 = strpos($sqlmsg, 'Checking identity information:');
 
-			if ($sqlpos !== false || $sqlpos2 !== false || $sqlpos3 !== false)		// if sqlmsg has 'Changed database context to', just log it
-				$GLOBALS['log']->debug($sqlmsg . ": " . $sql );
-			else {
-				$GLOBALS['log']->fatal($sqlmsg . ": " . $sql );
-				if($dieOnError)
-					sugar_die('SQL Error : ' . $sqlmsg);
-				else
-					echo 'SQL Error : ' . $sqlmsg;
-			}
+            if ($sqlpos !== false || $sqlpos2 !== false || $sqlpos3 !== false)		// if sqlmsg has 'Changed database context to', just log it
+                $GLOBALS['log']->debug($sqlmsg . ": " . $sql );
+            else {
+                $GLOBALS['log']->fatal($sqlmsg . ": " . $sql );
+                if($dieOnError)
+                    sugar_die('SQL Error : ' . $sqlmsg);
+                else
+                    echo 'SQL Error : ' . $sqlmsg;
+            }
         }
 
         $this->query_time = microtime(true) - $this->query_time;
@@ -426,8 +426,8 @@ 
         return $limitUnionSQL;
     }
 
-	/**
-	 * FIXME: verify and thoroughly test this code, these regexps look fishy
+    /**
+     * FIXME: verify and thoroughly test this code, these regexps look fishy
      * @see DBManager::limitQuery()
      */
     public function limitQuery($sql, $start, $count, $dieOnError = false, $msg = '', $execute = true)
@@ -569,7 +569,7 @@ 
                     }else{
                         //if there is a distinct clause, form query with rownumber after distinct
                         if ($hasDistinct) {
-                             $newSQL = "SELECT TOP $count * FROM
+                                $newSQL = "SELECT TOP $count * FROM
                                             (
                             SELECT ROW_NUMBER() OVER (ORDER BY ".$grpByStr.") AS row_number, count(*) counter, " . $distinctSQLARRAY[0] . "
                                                         " . $distinctSQLARRAY[1] . "
@@ -579,7 +579,7 @@ 
                                             WHERE row_number > $start";
                         }
                         else {
-                             $newSQL = "SELECT TOP $count * FROM
+                                $newSQL = "SELECT TOP $count * FROM
                                            (
                                   " . $matches[1] . " ROW_NUMBER() OVER (ORDER BY " . $sqlArray['FROM'][0]['alias'] . ".id) AS row_number, " . $matches[2] . $matches[3]. "
                                            )
@@ -626,7 +626,7 @@ 
         while ($i<$count && $offset<strlen($p_sql)) {
             if ($offset > strlen($p_sql))
             {
-				break;
+                break;
             }
 
             $beg_sin = strpos($p_sql, $strip_beg, $offset);
@@ -665,7 +665,7 @@ 
      * @param  array  $pattern_array
      * @return string
      */
-	private function addPatternToSQL($token, array $pattern_array)
+    private function addPatternToSQL($token, array $pattern_array)
     {
         //strip all single quotes out
         $pattern_array = array_reverse($pattern_array);
@@ -684,7 +684,7 @@ 
      * @param  string $alias
      * @return string
      */
-	private function getAliasFromSQL($sql, $alias)
+    private function getAliasFromSQL($sql, $alias)
     {
         $matches = array();
         preg_match('/^(.*SELECT)(.*?FROM.*WHERE)(.*)$/isU',$sql, $matches);
@@ -786,7 +786,7 @@ 
 
         // If there is no ordering direction (ASC/DESC), use ASC by default
         if (strpos($orig_order_match, " ") === false) {
-        	$orig_order_match .= " ASC";
+            $orig_order_match .= " ASC";
         }
 
         //grab first space in order by
@@ -810,11 +810,11 @@ 
                 $lastSpacePos = strrpos($containsColStr, " ");
                 //use positions of column name, space before name, and length of column to find the correct column name
                 $col_name = substr($sql, $lastSpacePos, $colMatchPos-$lastSpacePos+strlen($orderMatch));
-				//bug 25485. When sorting by a custom field in Account List and then pressing NEXT >, system gives an error
-				$containsCommaPos = strpos($col_name, ",");
-				if($containsCommaPos !== false) {
-					$col_name = substr($col_name, $containsCommaPos+1);
-				}
+                //bug 25485. When sorting by a custom field in Account List and then pressing NEXT >, system gives an error
+                $containsCommaPos = strpos($col_name, ",");
+                if($containsCommaPos !== false) {
+                    $col_name = substr($col_name, $containsCommaPos+1);
+                }
                 //add the "asc/desc" order back
                 $col_name = $col_name. " ". $asc_desc;
 
@@ -967,14 +967,14 @@ 
     }
 
 
-	/**
+    /**
      * @see DBManager::getFieldsArray()
      */
-	public function getFieldsArray($result, $make_lower_case = false)
-	{
-		$field_array = array();
+    public function getFieldsArray($result, $make_lower_case = false)
+    {
+        $field_array = array();
 
-		if(! isset($result) || empty($result))
+        if(! isset($result) || empty($result))
             return 0;
 
         $i = 0;
@@ -991,37 +991,37 @@ 
         }
 
         return $field_array;
-	}
+    }
 
     /**
      * @see DBManager::getAffectedRowCount()
      */
-	public function getAffectedRowCount($result)
+    public function getAffectedRowCount($result)
     {
         return $this->getOne("SELECT @@ROWCOUNT");
     }
 
-	/**
-	 * @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 = mssql_fetch_assoc($result);
         //MSSQL returns a space " " when a varchar column is empty ("") and not null.
         //We need to iterate through the returned row array and strip empty spaces
         if(!empty($row)){
             foreach($row as $key => $column) {
-               //notice we only strip if one space is returned.  we do not want to strip
-               //strings with intentional spaces (" foo ")
-               if (!empty($column) && $column ==" ") {
-                   $row[$key] = '';
-               }
+                //notice we only strip if one space is returned.  we do not want to strip
+                //strings with intentional spaces (" foo ")
+                if (!empty($column) && $column ==" ") {
+                    $row[$key] = '';
+                }
             }
         }
         return $row;
-	}
+    }
 
     /**
      * @see DBManager::quote()
@@ -1069,7 +1069,7 @@ 
             if (!empty($r)) {
                 while ($a = $this->fetchByAssoc($r)) {
                     $row = array_values($a);
-					$tables[]=$row[0];
+                    $tables[]=$row[0];
                 }
                 return $tables;
             }
@@ -1126,7 +1126,7 @@ 
                 )
                 ";
                 //create full text index
-                 $FTSqry[] = "CREATE FULLTEXT INDEX ON fts_wakeup
+                    $FTSqry[] = "CREATE FULLTEXT INDEX ON fts_wakeup
                 (
                     body
                     Language 0X0
@@ -1195,7 +1195,7 @@ 
                     $len = $this->date_formats[$additional_parameters[0]];
                     return "LEFT(CONVERT(varchar($len),". $string . ",120),$len)";
                 } else {
-                   return "LEFT(CONVERT(varchar(10),". $string . ",120),10)";
+                    return "LEFT(CONVERT(varchar(10),". $string . ",120),10)";
                 }
             case 'ifnull':
                 if(empty($additional_parameters_string)) {
@@ -1237,14 +1237,14 @@ 
             case 'datetime': return substr($string, 0,19);
             case 'date': return substr($string, 0, 10);
             case 'time': return substr($string, 11);
-		}
-		return $string;
+        }
+        return $string;
     }
 
     /**
      * @see DBManager::createTableSQLParams()
      */
-	public function createTableSQLParams($tablename, $fieldDefs, $indices)
+    public function createTableSQLParams($tablename, $fieldDefs, $indices)
     {
         if (empty($tablename) || empty($fieldDefs))
             return '';
@@ -1322,7 +1322,7 @@ 
             break;
         default:
             return '';
-    	}
+        }
     }
 
     /**
@@ -1338,14 +1338,14 @@ 
         $columns = array();
         if ($this->isFieldArray($fieldDefs)) {
             foreach ($fieldDefs as $def)
-      		{
-          		//if the column is being modified drop the default value
-          		//constraint if it exists. alterSQLRep will add the constraint back
-          		if (!empty($constraints[$def['name']])) {
-          			$sql.=" ALTER TABLE " . $tablename . " DROP CONSTRAINT " . $constraints[$def['name']];
-          		}
-          		//check to see if we need to drop related indexes before the alter
-          		$indices = $this->get_indices($tablename);
+                {
+                    //if the column is being modified drop the default value
+                    //constraint if it exists. alterSQLRep will add the constraint back
+                    if (!empty($constraints[$def['name']])) {
+                        $sql.=" ALTER TABLE " . $tablename . " DROP CONSTRAINT " . $constraints[$def['name']];
+                    }
+                    //check to see if we need to drop related indexes before the alter
+                    $indices = $this->get_indices($tablename);
                 foreach ( $indices as $index ) {
                     if ( in_array($def['name'],$index['fields']) ) {
                         $sql  .= ' ' . $this->add_drop_constraint($tablename,$index,true).' ';
@@ -1353,16 +1353,16 @@ 
                     }
                 }
 
-          		$columns[] = $this->alterSQLRep($action, $def, $ignoreRequired,$tablename);
-      		}
+                    $columns[] = $this->alterSQLRep($action, $def, $ignoreRequired,$tablename);
+                }
         }
         else {
             //if the column is being modified drop the default value
-      		//constraint if it exists. alterSQLRep will add the constraint back
-      		if (!empty($constraints[$fieldDefs['name']])) {
-      			$sql.=" ALTER TABLE " . $tablename . " DROP CONSTRAINT " . $constraints[$fieldDefs['name']];
-      		}
-      		//check to see if we need to drop related indexes before the alter
+                //constraint if it exists. alterSQLRep will add the constraint back
+                if (!empty($constraints[$fieldDefs['name']])) {
+                    $sql.=" ALTER TABLE " . $tablename . " DROP CONSTRAINT " . $constraints[$fieldDefs['name']];
+                }
+                //check to see if we need to drop related indexes before the alter
             $indices = $this->get_indices($tablename);
             foreach ( $indices as $index ) {
                 if ( in_array($fieldDefs['name'],$index['fields']) ) {
@@ -1372,7 +1372,7 @@ 
             }
 
 
-          	$columns[] = $this->alterSQLRep($action, $fieldDefs, $ignoreRequired,$tablename);
+                $columns[] = $this->alterSQLRep($action, $fieldDefs, $ignoreRequired,$tablename);
         }
 
         $columns = implode(", ", $columns);
@@ -1383,8 +1383,8 @@ 
 
     protected function setAutoIncrement($table, $field_name)
     {
-		return "identity(1,1)";
-	}
+        return "identity(1,1)";
+    }
 
     /**
      * @see DBManager::setAutoIncrementStart()
@@ -1393,16 +1393,16 @@ 
     {
         if($start_value > 1)
             $start_value -= 1;
-		$this->query("DBCC CHECKIDENT ('$table', RESEED, $start_value) WITH NO_INFOMSGS");
+        $this->query("DBCC CHECKIDENT ('$table', RESEED, $start_value) WITH NO_INFOMSGS");
         return true;
     }
 
-	/**
+    /**
      * @see DBManager::getAutoIncrement()
      */
     public function getAutoIncrement($table, $field_name)
     {
-		$result = $this->getOne("select IDENT_CURRENT('$table') + IDENT_INCR ( '$table' ) as 'Auto_increment'");
+        $result = $this->getOne("select IDENT_CURRENT('$table') + IDENT_INCR ( '$table' ) as 'Auto_increment'");
         return $result;
     }
 
@@ -1457,8 +1457,8 @@ 
                 $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']);
+            elseif ( in_array($row['TYPE_NAME'],array('nchar','nvarchar')) )
+                $columns[$column_name]['len']=strtolower($row['PRECISION']);
             elseif ( !in_array($row['TYPE_NAME'],array('datetime','text')) )
                 $columns[$column_name]['len']=strtolower($row['LENGTH']);
             if ( stristr($row['TYPE_NAME'],'identity') ) {
@@ -1585,7 +1585,7 @@ 
     protected function full_text_indexing_enabled($dbname = null)
     {
         // check to see if we already have install setting in session
-    	if(!isset($_SESSION['IsFulltextInstalled']))
+        if(!isset($_SESSION['IsFulltextInstalled']))
             $_SESSION['IsFulltextInstalled'] = $this->full_text_indexing_installed();
 
         // check to see if FTS Indexing service is installed
@@ -1593,27 +1593,27 @@ 
             return false;
 
         // grab the dbname if it was not passed through
-		if (empty($dbname)) {
-			global $sugar_config;
-			$dbname = $sugar_config['dbconfig']['db_name'];
-		}
+        if (empty($dbname)) {
+            global $sugar_config;
+            $dbname = $sugar_config['dbconfig']['db_name'];
+        }
         //we already know that Indexing service is installed, now check
         //to see if it is enabled
-		$res = $this->getOne("SELECT DATABASEPROPERTY('$dbname', 'IsFulltextEnabled') ftext");
+        $res = $this->getOne("SELECT DATABASEPROPERTY('$dbname', 'IsFulltextEnabled') ftext");
         return !empty($res);
-	}
+    }
 
     /**
      * Creates default full text catalog
      */
-	protected function create_default_full_text_catalog()
+    protected function create_default_full_text_catalog()
     {
-		if ($this->full_text_indexing_enabled()) {
-		    $catalog = $this->ftsCatalogName();
+        if ($this->full_text_indexing_enabled()) {
+            $catalog = $this->ftsCatalogName();
             $GLOBALS['log']->debug("Creating the default catalog for full-text indexing, $catalog");
 
             //drop catalog if exists.
-			$ret = $this->query("
+            $ret = $this->query("
                 if not exists(
                     select *
                         from sys.fulltext_catalogs
@@ -1621,11 +1621,11 @@ 
                         )
                 CREATE FULLTEXT CATALOG $catalog");
 
-			if (empty($ret)) {
-				$GLOBALS['log']->error("Error creating default full-text catalog, $catalog");
-			}
-		}
-	}
+            if (empty($ret)) {
+                $GLOBALS['log']->error("Error creating default full-text catalog, $catalog");
+            }
+        }
+    }
 
     /**
      * Function returns name of the constraint automatically generated by sql-server.
@@ -1635,7 +1635,7 @@ 
      * @param  string $column
      * @return string
      */
-	private function get_field_default_constraint_name($table, $column = null)
+    private function get_field_default_constraint_name($table, $column = null)
     {
         static $results = array();
 
@@ -1670,7 +1670,7 @@ 
         }
 
         return null;
-	}
+    }
 
     /**
      * @see DBManager::massageFieldDef()
@@ -1692,7 +1692,7 @@ 
                 case 'varchar'  :
                 case 'nvarchar' :
                                   $fieldDef['len'] = $this->isTextType($fieldDef['dbType']) ? 'max' : '255';
-                                  break;
+                                    break;
                 case 'image'    : $fieldDef['len'] = '2147483647'; break;
                 case 'ntext'    : $fieldDef['len'] = '2147483646'; break;   // Note: this is from legacy code, don't know if this is correct
             }
@@ -1701,7 +1701,7 @@ 
            && empty($fieldDef['precision'])
            && !strpos($fieldDef['len'], ','))
         {
-             $fieldDef['len'] .= ',0'; // Adding 0 precision if it is not specified
+                $fieldDef['len'] .= ',0'; // Adding 0 precision if it is not specified
         }
 
         if(empty($fieldDef['default'])
@@ -1709,8 +1709,8 @@ 
         {
             $fieldDef['default'] = '0';
         }
-		if (isset($fieldDef['required']) && $fieldDef['required'] && !isset($fieldDef['default']) )
-			$fieldDef['default'] = '';
+        if (isset($fieldDef['required']) && $fieldDef['required'] && !isset($fieldDef['default']) )
+            $fieldDef['default'] = '';
 //        if ($fieldDef['type'] == 'bit' && empty($fieldDef['len']) )
 //            $fieldDef['len'] = '1';
 //		if ($fieldDef['type'] == 'bool' && empty($fieldDef['len']) )
@@ -1739,30 +1739,30 @@ 
      */
     protected function oneColumnSQLRep($fieldDef, $ignoreRequired = false, $table = '', $return_as_array = false)
     {
-    	//Bug 25814
-		if(isset($fieldDef['name'])){
-		    $colType = $this->getFieldType($fieldDef);
-        	if(stristr($this->getFieldType($fieldDef), 'decimal') && isset($fieldDef['len'])){
-				$fieldDef['len'] = min($fieldDef['len'],38);
-			}
-		    //bug: 39690 float(8) is interpreted as real and this generates a diff when doing repair
-			if(stristr($colType, 'float') && isset($fieldDef['len']) && $fieldDef['len'] == 8){
-				unset($fieldDef['len']);
-			}
-		}
-
-		// always return as array for post-processing
-		$ref = parent::oneColumnSQLRep($fieldDef, $ignoreRequired, $table, true);
-
-		// Bug 24307 - Don't add precision for float fields.
-		if ( stristr($ref['colType'],'float') )
-			$ref['colType'] = preg_replace('/(,\d+)/','',$ref['colType']);
+        //Bug 25814
+        if(isset($fieldDef['name'])){
+            $colType = $this->getFieldType($fieldDef);
+            if(stristr($this->getFieldType($fieldDef), 'decimal') && isset($fieldDef['len'])){
+                $fieldDef['len'] = min($fieldDef['len'],38);
+            }
+            //bug: 39690 float(8) is interpreted as real and this generates a diff when doing repair
+            if(stristr($colType, 'float') && isset($fieldDef['len']) && $fieldDef['len'] == 8){
+                unset($fieldDef['len']);
+            }
+        }
+
+        // always return as array for post-processing
+        $ref = parent::oneColumnSQLRep($fieldDef, $ignoreRequired, $table, true);
+
+        // Bug 24307 - Don't add precision for float fields.
+        if ( stristr($ref['colType'],'float') )
+            $ref['colType'] = preg_replace('/(,\d+)/','',$ref['colType']);
 
         if ( $return_as_array )
             return $ref;
         else
             return "{$ref['name']} {$ref['colType']} {$ref['default']} {$ref['required']} {$ref['auto_increment']}";
-	}
+    }
 
     /**
      * Saves changes to module's audit table
@@ -1771,13 +1771,13 @@ 
      * @param array  $changes changes
      */
     public function save_audit_records(SugarBean $bean, $changes)
-	{
-		//Bug 25078 fixed by Martin Hu: sqlserver haven't 'date' type, trim extra "00:00:00"
-		if($changes['data_type'] == 'date'){
-			$changes['before'] = str_replace(' 00:00:00','',$changes['before']);
-		}
-		parent::save_audit_records($bean,$changes);
-	}
+    {
+        //Bug 25078 fixed by Martin Hu: sqlserver haven't 'date' type, trim extra "00:00:00"
+        if($changes['data_type'] == 'date'){
+            $changes['before'] = str_replace(' 00:00:00','',$changes['before']);
+        }
+        parent::save_audit_records($bean,$changes);
+    }
 
     /**
      * Disconnects from the database
@@ -1786,7 +1786,7 @@ 
      */
     public function disconnect()
     {
-    	$GLOBALS['log']->debug('Calling Mssql::disconnect()');
+        $GLOBALS['log']->debug('Calling Mssql::disconnect()');
         if(!empty($this->database)){
             $this->freeResult();
             mssql_close($this->database);
@@ -1803,21 +1803,21 @@ 
             mssql_free_result($dbResult);
     }
 
-	/**
-	 * (non-PHPdoc)
-	 * @see DBManager::lastDbError()
-	 */
+    /**
+     * (non-PHPdoc)
+     * @see DBManager::lastDbError()
+     */
     public function lastDbError()
     {
         $sqlmsg = mssql_get_last_message();
         if(empty($sqlmsg)) 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 language is set.
-		    return false;
+            return false;
         }
 
         $sqlpos = strpos($sqlmsg, 'Changed database context to');
@@ -1826,7 +1826,7 @@ 
         if ( $sqlpos !== false || $sqlpos2 !== false || $sqlpos3 !== false ) {
             return false;
         } else {
-        	global $app_strings;
+            global $app_strings;
             //ERR_MSSQL_DB_CONTEXT: localized version of 'Changed database context to' message
             if (empty($app_strings) or !isset($app_strings['ERR_MSSQL_DB_CONTEXT'])) {
                 //ignore the message from sql-server if $app_strings array is empty. This will happen
@@ -1842,7 +1842,7 @@ 
         }
 
         if ( strlen($sqlmsg) > 2 ) {
-        	return "SQL Server error: " . $sqlmsg;
+            return "SQL Server error: " . $sqlmsg;
         }
 
         return false;
@@ -2065,7 +2065,7 @@ 
     public function installConfig()
     {
         return array(
-        	'LBL_DBCONFIG_MSG3' =>  array(
+            'LBL_DBCONFIG_MSG3' =>  array(
                 "setup_db_database_name" => array("label" => 'LBL_DBCONF_DB_NAME', "required" => true),
             ),
             'LBL_DBCONFIG_MSG2' =>  array(
@@ -2097,8 +2097,8 @@ 
      * @return string
      */
 
-	public function getGuidSQL()
+    public function getGuidSQL()
     {
-      	return 'NEWID()';
+            return 'NEWID()';
     }
 }

Switch Indentation +71 added lines, -71 removed lines

@@ -1304,24 +1304,24 @@ 
     protected function alterSQLRep($action, array $def, $ignoreRequired, $tablename)
     {
         switch($action){
-        case 'add':
-             $f_def=$this->oneColumnSQLRep($def, $ignoreRequired,$tablename,false);
-            return "ADD " . $f_def;
-            break;
-        case 'drop':
-            return "DROP COLUMN " . $def['name'];
-            break;
-        case 'modify':
-            //You cannot specify a default value for a column for MSSQL
-            $f_def  = $this->oneColumnSQLRep($def, $ignoreRequired,$tablename, true);
-            $f_stmt = "ALTER COLUMN ".$f_def['name'].' '.$f_def['colType'].' '.
-                        $f_def['required'].' '.$f_def['auto_increment']."\n";
-            if (!empty( $f_def['default']))
-                $f_stmt .= " ALTER TABLE " . $tablename .  " ADD  ". $f_def['default'] . " FOR " . $def['name'];
-            return $f_stmt;
-            break;
-        default:
-            return '';
+            case 'add':
+                 $f_def=$this->oneColumnSQLRep($def, $ignoreRequired,$tablename,false);
+                return "ADD " . $f_def;
+                break;
+            case 'drop':
+                return "DROP COLUMN " . $def['name'];
+                break;
+            case 'modify':
+                //You cannot specify a default value for a column for MSSQL
+                $f_def  = $this->oneColumnSQLRep($def, $ignoreRequired,$tablename, true);
+                $f_stmt = "ALTER COLUMN ".$f_def['name'].' '.$f_def['colType'].' '.
+                            $f_def['required'].' '.$f_def['auto_increment']."\n";
+                if (!empty( $f_def['default']))
+                    $f_stmt .= " ALTER TABLE " . $tablename .  " ADD  ". $f_def['default'] . " FOR " . $def['name'];
+                return $f_stmt;
+                break;
+            default:
+                return '';
     	}
     }
 
@@ -1511,59 +1511,59 @@ 
 
         switch ($type){
         // generic indices
-        case 'index':
-        case 'alternate_key':
-            if ($drop)
-                $sql = "DROP INDEX {$name} ON {$table}";
-            else
-                $sql = "CREATE INDEX {$name} ON {$table} ({$fields})";
-            break;
-        case 'clustered':
-            if ($drop)
-                $sql = "DROP INDEX {$name} ON {$table}";
-            else
-                $sql = "CREATE CLUSTERED INDEX $name ON $table ($fields)";
-            break;
-            // constraints as indices
-        case 'unique':
-            if ($drop)
-                $sql = "ALTER TABLE {$table} DROP CONSTRAINT $name";
-            else
-                $sql = "ALTER TABLE {$table} ADD CONSTRAINT {$name} UNIQUE ({$fields})";
-            break;
-        case 'primary':
-            if ($drop)
-                $sql = "ALTER TABLE {$table} DROP CONSTRAINT {$name}";
-            else
-                $sql = "ALTER TABLE {$table} ADD CONSTRAINT {$name} PRIMARY KEY ({$fields})";
-            break;
-        case 'foreign':
-            if ($drop)
-                $sql = "ALTER TABLE {$table} DROP FOREIGN KEY ({$fields})";
-            else
-                $sql = "ALTER TABLE {$table} ADD CONSTRAINT {$name}  FOREIGN KEY ({$fields}) REFERENCES {$definition['foreignTable']}({$definition['foreignFields']})";
-            break;
-        case 'fulltext':
-            if ($this->full_text_indexing_enabled() && $drop) {
-                $sql = "DROP FULLTEXT INDEX ON {$table}";
-            } elseif ($this->full_text_indexing_enabled()) {
-                $catalog_name=$this->ftsCatalogName();
-                if ( isset($definition['catalog_name']) && $definition['catalog_name'] != 'default')
-                    $catalog_name = $definition['catalog_name'];
-
-                $language = "Language 1033";
-                if (isset($definition['language']) && !empty($definition['language']))
-                    $language = "Language " . $definition['language'];
-
-                $key_index = $definition['key_index'];
-
-                $change_tracking = "auto";
-                if (isset($definition['change_tracking']) && !empty($definition['change_tracking']))
-                    $change_tracking = $definition['change_tracking'];
-
-                $sql = " CREATE FULLTEXT INDEX ON $table ($fields $language) KEY INDEX $key_index ON $catalog_name WITH CHANGE_TRACKING $change_tracking" ;
-            }
-            break;
+            case 'index':
+            case 'alternate_key':
+                if ($drop)
+                    $sql = "DROP INDEX {$name} ON {$table}";
+                else
+                    $sql = "CREATE INDEX {$name} ON {$table} ({$fields})";
+                break;
+            case 'clustered':
+                if ($drop)
+                    $sql = "DROP INDEX {$name} ON {$table}";
+                else
+                    $sql = "CREATE CLUSTERED INDEX $name ON $table ($fields)";
+                break;
+                // constraints as indices
+            case 'unique':
+                if ($drop)
+                    $sql = "ALTER TABLE {$table} DROP CONSTRAINT $name";
+                else
+                    $sql = "ALTER TABLE {$table} ADD CONSTRAINT {$name} UNIQUE ({$fields})";
+                break;
+            case 'primary':
+                if ($drop)
+                    $sql = "ALTER TABLE {$table} DROP CONSTRAINT {$name}";
+                else
+                    $sql = "ALTER TABLE {$table} ADD CONSTRAINT {$name} PRIMARY KEY ({$fields})";
+                break;
+            case 'foreign':
+                if ($drop)
+                    $sql = "ALTER TABLE {$table} DROP FOREIGN KEY ({$fields})";
+                else
+                    $sql = "ALTER TABLE {$table} ADD CONSTRAINT {$name}  FOREIGN KEY ({$fields}) REFERENCES {$definition['foreignTable']}({$definition['foreignFields']})";
+                break;
+            case 'fulltext':
+                if ($this->full_text_indexing_enabled() && $drop) {
+                    $sql = "DROP FULLTEXT INDEX ON {$table}";
+                } elseif ($this->full_text_indexing_enabled()) {
+                    $catalog_name=$this->ftsCatalogName();
+                    if ( isset($definition['catalog_name']) && $definition['catalog_name'] != 'default')
+                        $catalog_name = $definition['catalog_name'];
+
+                    $language = "Language 1033";
+                    if (isset($definition['language']) && !empty($definition['language']))
+                        $language = "Language " . $definition['language'];
+
+                    $key_index = $definition['key_index'];
+
+                    $change_tracking = "auto";
+                    if (isset($definition['change_tracking']) && !empty($definition['change_tracking']))
+                        $change_tracking = $definition['change_tracking'];
+
+                    $sql = " CREATE FULLTEXT INDEX ON $table ($fields $language) KEY INDEX $key_index ON $catalog_name WITH CHANGE_TRACKING $change_tracking" ;
+                }
+                break;
         }
         return $sql;
     }

Braces +202 added lines, -159 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -168,8 +170,9 @@ 
     {
         global $sugar_config;
 
-        if (is_null($configOptions))
-            $configOptions = $sugar_config['dbconfig'];
+        if (is_null($configOptions)) {
+                    $configOptions = $sugar_config['dbconfig'];
+        }
 
         //SET DATEFORMAT to 'YYYY-MM-DD''
         ini_set('mssql.datetimeconvert', '0');
@@ -258,8 +261,9 @@ 
 			}
          }
 
-        if(!$this->checkError('Could Not Connect', $dieOnError))
-            $GLOBALS['log']->info("connected to db");
+        if(!$this->checkError('Could Not Connect', $dieOnError)) {
+                    $GLOBALS['log']->info("connected to db");
+        }
 
         $this->connectOptions = $configOptions;
 
@@ -284,8 +288,9 @@ 
             return $this->queryArray($sql, $dieOnError, $msg, $suppress);
         }
         // Flag if there are odd number of single quotes
-        if ((substr_count($sql, "'") & 1))
-            $GLOBALS['log']->error("SQL statement[" . $sql . "] has odd number of single quotes.");
+        if ((substr_count($sql, "'") & 1)) {
+                    $GLOBALS['log']->error("SQL statement[" . $sql . "] has odd number of single quotes.");
+        }
 
 		$sql = $this->_appendN($sql);
 
@@ -308,14 +313,16 @@ 
 			$sqlpos2 = strpos($sqlmsg, 'Warning:');
 			$sqlpos3 = strpos($sqlmsg, 'Checking identity information:');
 
-			if ($sqlpos !== false || $sqlpos2 !== false || $sqlpos3 !== false)		// if sqlmsg has 'Changed database context to', just log it
+			if ($sqlpos !== false || $sqlpos2 !== false || $sqlpos3 !== false) {
+			    // if sqlmsg has 'Changed database context to', just log it
 				$GLOBALS['log']->debug($sqlmsg . ": " . $sql );
-			else {
+			} else {
 				$GLOBALS['log']->fatal($sqlmsg . ": " . $sql );
-				if($dieOnError)
-					sugar_die('SQL Error : ' . $sqlmsg);
-				else
-					echo 'SQL Error : ' . $sqlmsg;
+				if($dieOnError) {
+									sugar_die('SQL Error : ' . $sqlmsg);
+				} else {
+									echo 'SQL Error : ' . $sqlmsg;
+				}
 			}
         }
 
@@ -340,8 +347,9 @@ 
     private function handleUnionLimitQuery($sql, $start, $count)
     {
         //set the start to 0, no negs
-        if ($start < 0)
-            $start=0;
+        if ($start < 0) {
+                    $start=0;
+        }
 
         $GLOBALS['log']->debug(print_r(func_get_args(),true));
 
@@ -390,8 +398,7 @@ 
                 $rowNumOrderBy = 'id';
                 $unionOrderBy = "";
             }
-        }
-        else {
+        } else {
             //there are no order by elements, so just pass back string
             $unionsql = $sql;
             //with no guidance on what to use for required order by in rownumber function,
@@ -413,8 +420,7 @@ 
         if ($count == 1 && $start == 0)
         {
             $limitUnionSQL = "SELECT TOP $count * FROM (" .$unionsql .") as top_count ".$unionOrderBy;
-        }
-        else
+        } else
         {
             $limitUnionSQL = "SELECT TOP $count * FROM( select ROW_NUMBER() OVER ( order by "
             .$rowNumOrderBy.") AS row_number, * FROM ("
@@ -436,11 +442,12 @@ 
         $count = (int)$count;
         $newSQL = $sql;
         $distinctSQLARRAY = array();
-        if (strpos($sql, "UNION") && !preg_match("/(')(UNION).?(')/i", $sql))
-            $newSQL = $this->handleUnionLimitQuery($sql,$start,$count);
-        else {
-            if ($start < 0)
-                $start = 0;
+        if (strpos($sql, "UNION") && !preg_match("/(')(UNION).?(')/i", $sql)) {
+                    $newSQL = $this->handleUnionLimitQuery($sql,$start,$count);
+        } else {
+            if ($start < 0) {
+                            $start = 0;
+            }
             $GLOBALS['log']->debug(print_r(func_get_args(),true));
             $this->lastsql = $sql;
             $matches = array();
@@ -461,20 +468,17 @@ 
                                     " . $selectPart[2] . $orderByMatch[1]. "
                                 ) AS a
                                 WHERE row_number > $start";
-                        }
-                        else {
+                        } else {
                             $newSQL = $matches[1] . " TOP $count " . $matches[2] . $matches[3];
                         }
-                    }
-                    else {
+                    } else {
                         $distinct_o = strpos($match_two, "distinct");
                         $up_to_distinct_str = substr($match_two, 0, $distinct_o);
                         //check to see if the distinct is within a function, if so, then proceed as normal
                         if (strpos($up_to_distinct_str,"(")) {
                             //proceed as normal
                             $newSQL = $matches[1] . " TOP $count " . $matches[2] . $matches[3];
-                        }
-                        else {
+                        } else {
                             //if distinct is not within a function, then parse
                             //string contains distinct clause, "TOP needs to come after Distinct"
                             //get position of distinct
@@ -556,8 +560,7 @@ 
                                                 group by " . $grpByStr . "
                                         ) AS a
                                         WHERE row_number > $start";
-                        }
-                        else {
+                        } else {
                         $newSQL = "SELECT TOP $count * FROM
                                     (
                                         " . $matches[1] . " ROW_NUMBER()
@@ -566,7 +569,7 @@ 
                                     ) AS a
                                     WHERE row_number > $start";
                         }
-                    }else{
+                    } else{
                         //if there is a distinct clause, form query with rownumber after distinct
                         if ($hasDistinct) {
                              $newSQL = "SELECT TOP $count * FROM
@@ -577,8 +580,7 @@ 
                                             )
                                             AS a
                                             WHERE row_number > $start";
-                        }
-                        else {
+                        } else {
                              $newSQL = "SELECT TOP $count * FROM
                                            (
                                   " . $matches[1] . " ROW_NUMBER() OVER (ORDER BY " . $sqlArray['FROM'][0]['alias'] . ".id) AS row_number, " . $matches[2] . $matches[3]. "
@@ -617,8 +619,9 @@ 
         //strip all single quotes out
         $count = substr_count ( $p_sql, $strip_beg);
         $increment = 1;
-        if ($strip_beg != $strip_end)
-            $increment = 2;
+        if ($strip_beg != $strip_end) {
+                    $increment = 2;
+        }
 
         $i=0;
         $offset = 0;
@@ -780,9 +783,10 @@ 
     {
         $sql = strtolower($sql);
         $orig_order_match = trim($orig_order_match);
-        if (strpos($orig_order_match, ".") != 0)
-            //this has a tablename defined, pass in the order match
+        if (strpos($orig_order_match, ".") != 0) {
+                    //this has a tablename defined, pass in the order match
             return $orig_order_match;
+        }
 
         // If there is no ordering direction (ASC/DESC), use ASC by default
         if (strpos($orig_order_match, " ") === false) {
@@ -824,15 +828,15 @@ 
             //break out of here, log this
             $GLOBALS['log']->debug("No match was found for order by, pass string back untouched as: $orig_order_match");
             return $orig_order_match;
-        }
-        else {
+        } else {
             //if found, then parse and return
             //grab string up to the aliased column
             $GLOBALS['log']->debug("order by found, process sql string");
 
             $psql = (trim($this->getAliasFromSQL($sql, $orderMatch )));
-            if (empty($psql))
-                $psql = trim(substr($sql, 0, $found_in_sql));
+            if (empty($psql)) {
+                            $psql = trim(substr($sql, 0, $found_in_sql));
+            }
 
             //grab the last comma before the alias
             preg_match('/\s+' . trim($orderMatch). '/', $psql, $match, PREG_OFFSET_CAPTURE);
@@ -845,8 +849,9 @@ 
             //this is especially true for unified search from home screen
 
             $alias_beg_pos = 0;
-            if(strpos($psql, " as "))
-                $alias_beg_pos = strpos($psql, " as ");
+            if(strpos($psql, " as ")) {
+                            $alias_beg_pos = strpos($psql, " as ");
+            }
 
             // Bug # 44923 - This breaks the query and does not properly filter isnull
             // as there are other functions such as ltrim and rtrim.
@@ -883,8 +888,9 @@ 
         //correct table name.
         if (($module_str != 'Reports' && $module_str != 'SavedReport') && isset($beanList[$module_str])  &&  isset($beanFiles[$beanList[$module_str]])){
             //if the class is not already loaded, then load files
-            if (!class_exists($beanList[$module_str]))
-                require_once($beanFiles[$beanList[$module_str]]);
+            if (!class_exists($beanList[$module_str])) {
+                            require_once($beanFiles[$beanList[$module_str]]);
+            }
 
             //instantiate new bean
             $module_bean = new $beanList[$module_str]();
@@ -897,8 +903,7 @@ 
                 $GLOBALS['log']->debug("Could not find table name for module $module_str. ");
                 $tbl_name = $module_str;
             }
-        }
-        else {
+        } else {
             //since the module does NOT exist in beanlist, then we have to parse the string
             //and grab the table name from the passed in sql
             $GLOBALS['log']->debug("Could not find table name from module in request, retrieve from passed in sql");
@@ -919,8 +924,9 @@ 
                 // MFH BUG #14009: Also check to see if there are any carriage returns before the next space so that we don't grab any arbitrary joins or other tables.
                 $carriage_ret = strpos($tableEnd,"\n");
                 $next_space = strpos($tableEnd," " );
-                if ($carriage_ret < $next_space)
-                    $next_space = $carriage_ret;
+                if ($carriage_ret < $next_space) {
+                                    $next_space = $carriage_ret;
+                }
                 if ($next_space > 0) {
                     $tbl_name= substr($tableEnd,0, $next_space);
                     if(empty($tbl_name)){
@@ -943,18 +949,17 @@ 
                         || $alias_tbl_name == "outer"
                         || $alias_tbl_name == "right") {
                         //not aliased, do nothing
-                    }
-                    elseif ($alias_tbl_name == "as") {
+                    } elseif ($alias_tbl_name == "as") {
                             //the next word is the table name
                             $aliasTableEnd = trim(substr($aliasTableEnd, $alias_space));
                             $alias_space = strpos ($aliasTableEnd, " " );
                             if ($alias_space > 0) {
                                 $alias_tbl_name= trim(substr($aliasTableEnd,0, $alias_space));
-                                if (!empty($alias_tbl_name))
-                                    $tbl_name = $alias_tbl_name;
+                                if (!empty($alias_tbl_name)) {
+                                                                    $tbl_name = $alias_tbl_name;
+                                }
                             }
-                    }
-                    else {
+                    } else {
                         //this is table alias
                         $tbl_name = $alias_tbl_name;
                     }
@@ -974,16 +979,19 @@ 
 	{
 		$field_array = array();
 
-		if(! isset($result) || empty($result))
-            return 0;
+		if(! isset($result) || empty($result)) {
+		            return 0;
+		}
 
         $i = 0;
         while ($i < mssql_num_fields($result)) {
             $meta = mssql_fetch_field($result, $i);
-            if (!$meta)
-                return 0;
-            if($make_lower_case==true)
-                $meta->name = strtolower($meta->name);
+            if (!$meta) {
+                            return 0;
+            }
+            if($make_lower_case==true) {
+                            $meta->name = strtolower($meta->name);
+            }
 
             $field_array[] = $meta->name;
 
@@ -1006,7 +1014,9 @@ 
 	 */
 	public function fetchRow($result)
 	{
-		if (empty($result))	return false;
+		if (empty($result)) {
+		    return false;
+		}
 
         $row = mssql_fetch_assoc($result);
         //MSSQL returns a space " " when a varchar column is empty ("") and not null.
@@ -1088,8 +1098,9 @@ 
             $tables = array();
             $r = $this->query('SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES');
             if (is_resource($r)) {
-                while ($a = $this->fetchByAssoc($r))
-                    $tables[] = $a['TABLE_NAME'];
+                while ($a = $this->fetchByAssoc($r)) {
+                                    $tables[] = $a['TABLE_NAME'];
+                }
 
                 return $tables;
             }
@@ -1246,12 +1257,14 @@ 
      */
 	public function createTableSQLParams($tablename, $fieldDefs, $indices)
     {
-        if (empty($tablename) || empty($fieldDefs))
-            return '';
+        if (empty($tablename) || empty($fieldDefs)) {
+                    return '';
+        }
 
         $columns = $this->columnSQLRep($fieldDefs, false, $tablename);
-        if (empty($columns))
-            return '';
+        if (empty($columns)) {
+                    return '';
+        }
 
         return "CREATE TABLE $tablename ($columns)";
     }
@@ -1263,7 +1276,9 @@ 
     public function isTextType($type)
     {
         $type = strtolower($type);
-        if(!isset($this->type_map[$type])) return false;
+        if(!isset($this->type_map[$type])) {
+            return false;
+        }
         return in_array($this->type_map[$type], array('ntext','text','image', 'nvarchar(max)'));
     }
 
@@ -1316,8 +1331,9 @@ 
             $f_def  = $this->oneColumnSQLRep($def, $ignoreRequired,$tablename, true);
             $f_stmt = "ALTER COLUMN ".$f_def['name'].' '.$f_def['colType'].' '.
                         $f_def['required'].' '.$f_def['auto_increment']."\n";
-            if (!empty( $f_def['default']))
-                $f_stmt .= " ALTER TABLE " . $tablename .  " ADD  ". $f_def['default'] . " FOR " . $def['name'];
+            if (!empty( $f_def['default'])) {
+                            $f_stmt .= " ALTER TABLE " . $tablename .  " ADD  ". $f_def['default'] . " FOR " . $def['name'];
+            }
             return $f_stmt;
             break;
         default:
@@ -1355,8 +1371,7 @@ 
 
           		$columns[] = $this->alterSQLRep($action, $def, $ignoreRequired,$tablename);
       		}
-        }
-        else {
+        } else {
             //if the column is being modified drop the default value
       		//constraint if it exists. alterSQLRep will add the constraint back
       		if (!empty($constraints[$fieldDefs['name']])) {
@@ -1391,8 +1406,9 @@ 
      */
     public function setAutoIncrementStart($table, $field_name, $start_value)
     {
-        if($start_value > 1)
-            $start_value -= 1;
+        if($start_value > 1) {
+                    $start_value -= 1;
+        }
 		$this->query("DBCC CHECKIDENT ('$table', RESEED, $start_value) WITH NO_INFOMSGS");
         return true;
     }
@@ -1428,10 +1444,11 @@ 
         $indices = array();
         while (($row=$this->fetchByAssoc($result)) != null) {
             $index_type = 'index';
-            if ($row['is_primary_key'] == '1')
-                $index_type = 'primary';
-            elseif ($row['is_unique'] == 1 )
-                $index_type = 'unique';
+            if ($row['is_primary_key'] == '1') {
+                            $index_type = 'primary';
+            } elseif ($row['is_unique'] == 1 ) {
+                            $index_type = 'unique';
+            }
             $name = strtolower($row['index_name']);
             $indices[$name]['name']     = $name;
             $indices[$name]['type']     = $index_type;
@@ -1456,18 +1473,19 @@ 
             if ( $row['TYPE_NAME'] == 'decimal' ) {
                 $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']);
+			} elseif ( !in_array($row['TYPE_NAME'],array('datetime','text')) ) {
+                            $columns[$column_name]['len']=strtolower($row['LENGTH']);
             }
-			elseif ( in_array($row['TYPE_NAME'],array('nchar','nvarchar')) )
-				$columns[$column_name]['len']=strtolower($row['PRECISION']);
-            elseif ( !in_array($row['TYPE_NAME'],array('datetime','text')) )
-                $columns[$column_name]['len']=strtolower($row['LENGTH']);
             if ( stristr($row['TYPE_NAME'],'identity') ) {
                 $columns[$column_name]['auto_increment'] = '1';
                 $columns[$column_name]['type']=str_replace(' identity','',strtolower($row['TYPE_NAME']));
             }
 
-            if (!empty($row['IS_NULLABLE']) && $row['IS_NULLABLE'] == 'NO' && (empty($row['KEY']) || !stristr($row['KEY'],'PRI')))
-                $columns[strtolower($row['COLUMN_NAME'])]['required'] = 'true';
+            if (!empty($row['IS_NULLABLE']) && $row['IS_NULLABLE'] == 'NO' && (empty($row['KEY']) || !stristr($row['KEY'],'PRI'))) {
+                            $columns[strtolower($row['COLUMN_NAME'])]['required'] = 'true';
+            }
 
             $column_def = 1;
             if ( strtolower($tablename) == 'relationships' ) {
@@ -1476,12 +1494,13 @@ 
             if ( $column_def != 0 && ($row['COLUMN_DEF'] != null)) {	// NOTE Not using !empty as an empty string may be a viable default value.
                 $matches = array();
                 $row['COLUMN_DEF'] = html_entity_decode($row['COLUMN_DEF'],ENT_QUOTES);
-                if ( preg_match('/\([\(|\'](.*)[\)|\']\)/i',$row['COLUMN_DEF'],$matches) )
-                    $columns[$column_name]['default'] = $matches[1];
-                elseif ( preg_match('/\(N\'(.*)\'\)/i',$row['COLUMN_DEF'],$matches) )
-                    $columns[$column_name]['default'] = $matches[1];
-                else
-                    $columns[$column_name]['default'] = $row['COLUMN_DEF'];
+                if ( preg_match('/\([\(|\'](.*)[\)|\']\)/i',$row['COLUMN_DEF'],$matches) ) {
+                                    $columns[$column_name]['default'] = $matches[1];
+                } elseif ( preg_match('/\(N\'(.*)\'\)/i',$row['COLUMN_DEF'],$matches) ) {
+                                    $columns[$column_name]['default'] = $matches[1];
+                } else {
+                                    $columns[$column_name]['default'] = $row['COLUMN_DEF'];
+                }
             }
         }
         return $columns;
@@ -1513,53 +1532,61 @@ 
         // generic indices
         case 'index':
         case 'alternate_key':
-            if ($drop)
-                $sql = "DROP INDEX {$name} ON {$table}";
-            else
-                $sql = "CREATE INDEX {$name} ON {$table} ({$fields})";
+            if ($drop) {
+                            $sql = "DROP INDEX {$name} ON {$table}";
+            } else {
+                            $sql = "CREATE INDEX {$name} ON {$table} ({$fields})";
+            }
             break;
         case 'clustered':
-            if ($drop)
-                $sql = "DROP INDEX {$name} ON {$table}";
-            else
-                $sql = "CREATE CLUSTERED INDEX $name ON $table ($fields)";
+            if ($drop) {
+                            $sql = "DROP INDEX {$name} ON {$table}";
+            } else {
+                            $sql = "CREATE CLUSTERED INDEX $name ON $table ($fields)";
+            }
             break;
             // constraints as indices
         case 'unique':
-            if ($drop)
-                $sql = "ALTER TABLE {$table} DROP CONSTRAINT $name";
-            else
-                $sql = "ALTER TABLE {$table} ADD CONSTRAINT {$name} UNIQUE ({$fields})";
+            if ($drop) {
+                            $sql = "ALTER TABLE {$table} DROP CONSTRAINT $name";
+            } else {
+                            $sql = "ALTER TABLE {$table} ADD CONSTRAINT {$name} UNIQUE ({$fields})";
+            }
             break;
         case 'primary':
-            if ($drop)
-                $sql = "ALTER TABLE {$table} DROP CONSTRAINT {$name}";
-            else
-                $sql = "ALTER TABLE {$table} ADD CONSTRAINT {$name} PRIMARY KEY ({$fields})";
+            if ($drop) {
+                            $sql = "ALTER TABLE {$table} DROP CONSTRAINT {$name}";
+            } else {
+                            $sql = "ALTER TABLE {$table} ADD CONSTRAINT {$name} PRIMARY KEY ({$fields})";
+            }
             break;
         case 'foreign':
-            if ($drop)
-                $sql = "ALTER TABLE {$table} DROP FOREIGN KEY ({$fields})";
-            else
-                $sql = "ALTER TABLE {$table} ADD CONSTRAINT {$name}  FOREIGN KEY ({$fields}) REFERENCES {$definition['foreignTable']}({$definition['foreignFields']})";
+            if ($drop) {
+                            $sql = "ALTER TABLE {$table} DROP FOREIGN KEY ({$fields})";
+            } else {
+                            $sql = "ALTER TABLE {$table} ADD CONSTRAINT {$name}  FOREIGN KEY ({$fields}) REFERENCES {$definition['foreignTable']}({$definition['foreignFields']})";
+            }
             break;
         case 'fulltext':
             if ($this->full_text_indexing_enabled() && $drop) {
                 $sql = "DROP FULLTEXT INDEX ON {$table}";
             } elseif ($this->full_text_indexing_enabled()) {
                 $catalog_name=$this->ftsCatalogName();
-                if ( isset($definition['catalog_name']) && $definition['catalog_name'] != 'default')
-                    $catalog_name = $definition['catalog_name'];
+                if ( isset($definition['catalog_name']) && $definition['catalog_name'] != 'default') {
+                                    $catalog_name = $definition['catalog_name'];
+                }
 
                 $language = "Language 1033";
-                if (isset($definition['language']) && !empty($definition['language']))
-                    $language = "Language " . $definition['language'];
+                if (isset($definition['language']) && !empty($definition['language'])) {
+                                    $language = "Language " . $definition['language'];
+                }
 
                 $key_index = $definition['key_index'];
 
                 $change_tracking = "auto";
-                if (isset($definition['change_tracking']) && !empty($definition['change_tracking']))
-                    $change_tracking = $definition['change_tracking'];
+                if (isset($definition['change_tracking']) && !empty($definition['change_tracking'])) {
+                                    $change_tracking = $definition['change_tracking'];
+                }
 
                 $sql = " CREATE FULLTEXT INDEX ON $table ($fields $language) KEY INDEX $key_index ON $catalog_name WITH CHANGE_TRACKING $change_tracking" ;
             }
@@ -1585,12 +1612,14 @@ 
     protected function full_text_indexing_enabled($dbname = null)
     {
         // check to see if we already have install setting in session
-    	if(!isset($_SESSION['IsFulltextInstalled']))
-            $_SESSION['IsFulltextInstalled'] = $this->full_text_indexing_installed();
+    	if(!isset($_SESSION['IsFulltextInstalled'])) {
+    	            $_SESSION['IsFulltextInstalled'] = $this->full_text_indexing_installed();
+    	}
 
         // check to see if FTS Indexing service is installed
-        if(empty($_SESSION['IsFulltextInstalled']))
-            return false;
+        if(empty($_SESSION['IsFulltextInstalled'])) {
+                    return false;
+        }
 
         // grab the dbname if it was not passed through
 		if (empty($dbname)) {
@@ -1639,8 +1668,9 @@ 
     {
         static $results = array();
 
-        if ( empty($column) && isset($results[$table]) )
-            return $results[$table];
+        if ( empty($column) && isset($results[$table]) ) {
+                    return $results[$table];
+        }
 
         $query = <<<EOQ
 select s.name, o.name, c.name dtrt, d.name ctrt
@@ -1653,18 +1683,20 @@ 
             on s.schema_id = o.schema_id
     where o.name = '$table'
 EOQ;
-        if ( !empty($column) )
-            $query .= " and c.name = '$column'";
+        if ( !empty($column) ) {
+                    $query .= " and c.name = '$column'";
+        }
         $res = $this->query($query);
         if ( !empty($column) ) {
             $row = $this->fetchByAssoc($res);
-            if (!empty($row))
-                return $row['ctrt'];
-        }
-        else {
+            if (!empty($row)) {
+                            return $row['ctrt'];
+            }
+        } else {
             $returnResult = array();
-            while ( $row = $this->fetchByAssoc($res) )
-                $returnResult[$row['dtrt']] = $row['ctrt'];
+            while ( $row = $this->fetchByAssoc($res) ) {
+                            $returnResult[$row['dtrt']] = $row['ctrt'];
+            }
             $results[$table] = $returnResult;
             return $returnResult;
         }
@@ -1679,8 +1711,9 @@ 
     {
         parent::massageFieldDef($fieldDef,$tablename);
 
-        if ($fieldDef['type'] == 'int')
-            $fieldDef['len'] = '4';
+        if ($fieldDef['type'] == 'int') {
+                    $fieldDef['len'] = '4';
+        }
 
         if(empty($fieldDef['len']))
         {
@@ -1709,9 +1742,10 @@ 
         {
             $fieldDef['default'] = '0';
         }
-		if (isset($fieldDef['required']) && $fieldDef['required'] && !isset($fieldDef['default']) )
-			$fieldDef['default'] = '';
-//        if ($fieldDef['type'] == 'bit' && empty($fieldDef['len']) )
+		if (isset($fieldDef['required']) && $fieldDef['required'] && !isset($fieldDef['default']) ) {
+					$fieldDef['default'] = '';
+		}
+		//        if ($fieldDef['type'] == 'bit' && empty($fieldDef['len']) )
 //            $fieldDef['len'] = '1';
 //		if ($fieldDef['type'] == 'bool' && empty($fieldDef['len']) )
 //            $fieldDef['len'] = '1';
@@ -1755,13 +1789,15 @@ 
 		$ref = parent::oneColumnSQLRep($fieldDef, $ignoreRequired, $table, true);
 
 		// Bug 24307 - Don't add precision for float fields.
-		if ( stristr($ref['colType'],'float') )
-			$ref['colType'] = preg_replace('/(,\d+)/','',$ref['colType']);
+		if ( stristr($ref['colType'],'float') ) {
+					$ref['colType'] = preg_replace('/(,\d+)/','',$ref['colType']);
+		}
 
-        if ( $return_as_array )
-            return $ref;
-        else
-            return "{$ref['name']} {$ref['colType']} {$ref['default']} {$ref['required']} {$ref['auto_increment']}";
+        if ( $return_as_array ) {
+                    return $ref;
+        } else {
+                    return "{$ref['name']} {$ref['colType']} {$ref['default']} {$ref['required']} {$ref['auto_increment']}";
+        }
 	}
 
     /**
@@ -1799,8 +1835,9 @@ 
      */
     protected function freeDbResult($dbResult)
     {
-        if(!empty($dbResult))
-            mssql_free_result($dbResult);
+        if(!empty($dbResult)) {
+                    mssql_free_result($dbResult);
+        }
     }
 
 	/**
@@ -1810,7 +1847,9 @@ 
     public function lastDbError()
     {
         $sqlmsg = mssql_get_last_message();
-        if(empty($sqlmsg)) return false;
+        if(empty($sqlmsg)) {
+            return false;
+        }
         global $app_strings;
         if (empty($app_strings)
 		    or !isset($app_strings['ERR_MSSQL_DB_CONTEXT'])
@@ -1833,11 +1872,11 @@ 
                 //only if connection if made before languge is set.
                 $GLOBALS['log']->debug("Ignoring this database message: " . $sqlmsg);
                 return false;
-            }
-            else {
+            } else {
                 $sqlpos = strpos($sqlmsg, $app_strings['ERR_MSSQL_DB_CONTEXT']);
-                if ( $sqlpos !== false )
-                    return false;
+                if ( $sqlpos !== false ) {
+                                    return false;
+                }
             }
         }
 
@@ -1882,8 +1921,9 @@ 
     protected function _appendN($sql)
     {
         // If there are no single quotes, don't bother, will just assume there is no character data
-        if (strpos($sql, "'") === false)
-            return $sql;
+        if (strpos($sql, "'") === false) {
+                    return $sql;
+        }
 
         // Flag if there are odd number of single quotes, just continue without trying to append N
         if ((substr_count($sql, "'") & 1)) {
@@ -1922,14 +1962,17 @@ 
             }
         }
 
-        if (!empty($replace))
-            $sql = str_replace(array_keys($replace), $replace, $sql);
+        if (!empty($replace)) {
+                    $sql = str_replace(array_keys($replace), $replace, $sql);
+        }
 
-        if (!empty($pairs))
-            $sql = str_replace(array_keys($pairs), $pairs, $sql);
+        if (!empty($pairs)) {
+                    $sql = str_replace(array_keys($pairs), $pairs, $sql);
+        }
 
-        if(strpos($sql, "<@#@#@PAIR@#@#@>"))
-            $sql = str_replace(array('<@#@#@PAIR@#@#@>'), array("''"), $sql);
+        if(strpos($sql, "<@#@#@PAIR@#@#@>")) {
+                    $sql = str_replace(array('<@#@#@PAIR@#@#@>'), array("''"), $sql);
+        }
 
         return $sql;
     }

Doc Comments +4 added lines, -4 removed lines

@@ -1298,7 +1298,7 @@ 
      * modify operation
      * @param string $action
      * @param array  $def
-     * @param bool   $ignorRequired
+     * @param boolean   $ignoreRequired
      * @param string $tablename
      */
     protected function alterSQLRep($action, array $def, $ignoreRequired, $tablename)
@@ -1767,7 +1767,7 @@ 
     /**
      * Saves changes to module's audit table
      *
-     * @param object $bean    Sugarbean instance
+     * @param SugarBean $bean    Sugarbean instance
      * @param array  $changes changes
      */
     public function save_audit_records(SugarBean $bean, $changes)
@@ -1876,7 +1876,7 @@ 
      * This is a utility function to prepend the "N" character in front of SQL values that are
      * surrounded by single quotes.
      *
-     * @param  $sql string SQL statement
+     * @param  string $sql string SQL statement
      * @return string SQL statement with single quote values prepended with "N" character for nvarchar columns
      */
     protected function _appendN($sql)
@@ -1947,7 +1947,7 @@ 
 
     /**
      * Generate fulltext query from set of terms
-     * @param string $fields Field to search against
+     * @param string $field Field to search against
      * @param array $terms Search terms that may be or not be in the result
      * @param array $must_terms Search terms that have to be in the result
      * @param array $exclude_terms Search terms that have to be not in the result

Spacing +254 added lines, -254 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -175,11 +175,11 @@ 
         ini_set('mssql.datetimeconvert', '0');
 
         //set the text size and textlimit to max number so that blob columns are not truncated
-        ini_set('mssql.textlimit','2147483647');
-        ini_set('mssql.textsize','2147483647');
-        ini_set('mssql.charset','UTF-8');
+        ini_set('mssql.textlimit', '2147483647');
+        ini_set('mssql.textsize', '2147483647');
+        ini_set('mssql.charset', 'UTF-8');
 
-        if(!empty($configOptions['db_host_instance'])) {
+        if (!empty($configOptions['db_host_instance'])) {
             $configOptions['db_host_instance'] = trim($configOptions['db_host_instance']);
         }
         //set the connections parameters
@@ -191,37 +191,37 @@ 
 
         //create persistent connection
         if ($this->getOption('persistent')) {
-            $this->database =@mssql_pconnect(
-                $connect_param ,
+            $this->database = @mssql_pconnect(
+                $connect_param,
                 $configOptions['db_user_name'],
                 $configOptions['db_password']
                 );
         }
         //if no persistent connection created, then create regular connection
-        if(!$this->database){
+        if (!$this->database) {
             $this->database = mssql_connect(
-                    $connect_param ,
+                    $connect_param,
                     $configOptions['db_user_name'],
                     $configOptions['db_password']
                     );
-            if(!$this->database){
+            if (!$this->database) {
                 $GLOBALS['log']->fatal("Could not connect to server ".$configOptions['db_host_name'].
                     " as ".$configOptions['db_user_name'].".");
-                if($dieOnError) {
+                if ($dieOnError) {
                     sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
                 } else {
                     return false;
                 }
             }
-            if($this->database && $this->getOption('persistent')){
+            if ($this->database && $this->getOption('persistent')) {
                 $_SESSION['administrator_error'] = "<B>Severe Performance Degradation: Persistent Database Connections "
                     . "not working.  Please set \$sugar_config['dbconfigoption']['persistent'] to false in your "
                     . "config.php file</B>";
             }
         }
         //make sure connection exists
-        if(!$this->database) {
-                if($dieOnError) {
+        if (!$this->database) {
+                if ($dieOnError) {
                     sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
                 } else {
                     return false;
@@ -235,19 +235,19 @@ 
         //mssql db maximum number of 5 times at the interval of .2 second. If can not connect
         //it will throw an Unable to select database message.
 
-        if(!empty($configOptions['db_name']) && !@mssql_select_db($configOptions['db_name'], $this->database)){
+        if (!empty($configOptions['db_name']) && !@mssql_select_db($configOptions['db_name'], $this->database)) {
 			$connected = false;
-			for($i=0;$i<5;$i++){
+			for ($i = 0; $i < 5; $i++) {
 				usleep(200000);
-				if(@mssql_select_db($configOptions['db_name'], $this->database)){
+				if (@mssql_select_db($configOptions['db_name'], $this->database)) {
 					$connected = true;
 					break;
 				}
 			}
-			if(!$connected){
-			    $GLOBALS['log']->fatal( "Unable to select database {$configOptions['db_name']}");
-                if($dieOnError) {
-                    if(isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
+			if (!$connected) {
+			    $GLOBALS['log']->fatal("Unable to select database {$configOptions['db_name']}");
+                if ($dieOnError) {
+                    if (isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
                         sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
                     } else {
                         sugar_die("Could not connect to the database. Please refer to suitecrm.log for details.");
@@ -258,7 +258,7 @@ 
 			}
          }
 
-        if(!$this->checkError('Could Not Connect', $dieOnError))
+        if (!$this->checkError('Could Not Connect', $dieOnError))
             $GLOBALS['log']->info("connected to db");
 
         $this->connectOptions = $configOptions;
@@ -280,16 +280,16 @@ 
 	 */
 	public function query($sql, $dieOnError = false, $msg = '', $suppress = false, $keepResult = false)
     {
-        if(is_array($sql)) {
+        if (is_array($sql)) {
             return $this->queryArray($sql, $dieOnError, $msg, $suppress);
         }
         // Flag if there are odd number of single quotes
         if ((substr_count($sql, "'") & 1))
-            $GLOBALS['log']->error("SQL statement[" . $sql . "] has odd number of single quotes.");
+            $GLOBALS['log']->error("SQL statement[".$sql."] has odd number of single quotes.");
 
 		$sql = $this->_appendN($sql);
 
-        $GLOBALS['log']->info('Query:' . $sql);
+        $GLOBALS['log']->info('Query:'.$sql);
         $this->checkConnection();
         $this->countQuery($sql);
         $this->query_time = microtime(true);
@@ -297,7 +297,7 @@ 
         // Bug 34892 - Clear out previous error message by checking the @@ERROR global variable
 		@mssql_query("SELECT @@ERROR", $this->database);
 
-        $result = $suppress?@mssql_query($sql, $this->database):mssql_query($sql, $this->database);
+        $result = $suppress ? @mssql_query($sql, $this->database) : mssql_query($sql, $this->database);
 
         if (!$result) {
             // awu Bug 10657: ignoring mssql error message 'Changed database context to' - an intermittent
@@ -309,13 +309,13 @@ 
 			$sqlpos3 = strpos($sqlmsg, 'Checking identity information:');
 
 			if ($sqlpos !== false || $sqlpos2 !== false || $sqlpos3 !== false)		// if sqlmsg has 'Changed database context to', just log it
-				$GLOBALS['log']->debug($sqlmsg . ": " . $sql );
+				$GLOBALS['log']->debug($sqlmsg.": ".$sql);
 			else {
-				$GLOBALS['log']->fatal($sqlmsg . ": " . $sql );
-				if($dieOnError)
-					sugar_die('SQL Error : ' . $sqlmsg);
+				$GLOBALS['log']->fatal($sqlmsg.": ".$sql);
+				if ($dieOnError)
+					sugar_die('SQL Error : '.$sqlmsg);
 				else
-					echo 'SQL Error : ' . $sqlmsg;
+					echo 'SQL Error : '.$sqlmsg;
 			}
         }
 
@@ -323,7 +323,7 @@ 
         $GLOBALS['log']->info('Query Execution Time:'.$this->query_time);
 
 
-        $this->checkError($msg.' Query Failed: ' . $sql, $dieOnError);
+        $this->checkError($msg.' Query Failed: '.$sql, $dieOnError);
 
         return $result;
     }
@@ -341,14 +341,14 @@ 
     {
         //set the start to 0, no negs
         if ($start < 0)
-            $start=0;
+            $start = 0;
 
-        $GLOBALS['log']->debug(print_r(func_get_args(),true));
+        $GLOBALS['log']->debug(print_r(func_get_args(), true));
 
         $this->lastsql = $sql;
 
         //change the casing to lower for easier string comparison, and trim whitespaces
-        $sql = strtolower(trim($sql)) ;
+        $sql = strtolower(trim($sql));
 
         //set default sql
         $limitUnionSQL = $sql;
@@ -364,16 +364,16 @@ 
         $arr_count = 0;
 
         //process if there are elements
-        if ($unionOrderByCount){
+        if ($unionOrderByCount) {
             //we really want the last order by, so reconstruct string
             //adding a 1 to count, as we dont wish to process the last element
             $unionsql = '';
-            while ($unionOrderByCount>$arr_count+1) {
+            while ($unionOrderByCount > $arr_count + 1) {
                 $unionsql .= $orderByArray[$arr_count];
-                $arr_count = $arr_count+1;
+                $arr_count = $arr_count + 1;
                 //add an "order by" string back if we are coming into loop again
                 //remember they were taken out when array was created
-                if ($unionOrderByCount>$arr_count+1) {
+                if ($unionOrderByCount > $arr_count + 1) {
                     $unionsql .= "order by";
                 }
             }
@@ -403,7 +403,7 @@ 
         //so we do not want to strip the alias like in other queries.  Just add the "order by" string and
         //pass column name as is
         if ($unionOrderBy != '') {
-            $unionOrderBy = ' order by ' . $unionOrderBy;
+            $unionOrderBy = ' order by '.$unionOrderBy;
         }
 
         //Bug 56560, use top query in conjunction with rownumber() function
@@ -412,13 +412,13 @@ 
         //If not for paging, no need to use rownumber() function
         if ($count == 1 && $start == 0)
         {
-            $limitUnionSQL = "SELECT TOP $count * FROM (" .$unionsql .") as top_count ".$unionOrderBy;
+            $limitUnionSQL = "SELECT TOP $count * FROM (".$unionsql.") as top_count ".$unionOrderBy;
         }
         else
         {
             $limitUnionSQL = "SELECT TOP $count * FROM( select ROW_NUMBER() OVER ( order by "
             .$rowNumOrderBy.") AS row_number, * FROM ("
-            .$unionsql .") As numbered) "
+            .$unionsql.") As numbered) "
             . "As top_count_limit WHERE row_number > $start "
             .$unionOrderBy;
         }
@@ -437,64 +437,64 @@ 
         $newSQL = $sql;
         $distinctSQLARRAY = array();
         if (strpos($sql, "UNION") && !preg_match("/(')(UNION).?(')/i", $sql))
-            $newSQL = $this->handleUnionLimitQuery($sql,$start,$count);
+            $newSQL = $this->handleUnionLimitQuery($sql, $start, $count);
         else {
             if ($start < 0)
                 $start = 0;
-            $GLOBALS['log']->debug(print_r(func_get_args(),true));
+            $GLOBALS['log']->debug(print_r(func_get_args(), true));
             $this->lastsql = $sql;
             $matches = array();
-            preg_match('/^(.*SELECT\b)(.*?\bFROM\b.*\bWHERE\b)(.*)$/isU',$sql, $matches);
+            preg_match('/^(.*SELECT\b)(.*?\bFROM\b.*\bWHERE\b)(.*)$/isU', $sql, $matches);
             if (!empty($matches[3])) {
                 if ($start == 0) {
                     $match_two = strtolower($matches[2]);
-                    if (!strpos($match_two, "distinct")> 0 && strpos($match_two, "distinct") !==0) {
+                    if (!strpos($match_two, "distinct") > 0 && strpos($match_two, "distinct") !== 0) {
                         $orderByMatch = array();
-                        preg_match('/^(.*)(\bORDER BY\b)(.*)$/is',$matches[3], $orderByMatch);
+                        preg_match('/^(.*)(\bORDER BY\b)(.*)$/is', $matches[3], $orderByMatch);
                         if (!empty($orderByMatch[3])) {
                             $selectPart = array();
                             preg_match('/^(.*)(\bFROM\b.*)$/isU', $matches[2], $selectPart);
                             $newSQL = "SELECT TOP $count * FROM
                                 (
-                                    " . $matches[1] . $selectPart[1] . ", ROW_NUMBER()
-                                    OVER (ORDER BY " . $this->returnOrderBy($sql, $orderByMatch[3]) . ") AS row_number
-                                    " . $selectPart[2] . $orderByMatch[1]. "
+                                    ".$matches[1].$selectPart[1].", ROW_NUMBER()
+                                    OVER (ORDER BY " . $this->returnOrderBy($sql, $orderByMatch[3]).") AS row_number
+                                    " . $selectPart[2].$orderByMatch[1]."
                                 ) AS a
                                 WHERE row_number > $start";
                         }
                         else {
-                            $newSQL = $matches[1] . " TOP $count " . $matches[2] . $matches[3];
+                            $newSQL = $matches[1]." TOP $count ".$matches[2].$matches[3];
                         }
                     }
                     else {
                         $distinct_o = strpos($match_two, "distinct");
                         $up_to_distinct_str = substr($match_two, 0, $distinct_o);
                         //check to see if the distinct is within a function, if so, then proceed as normal
-                        if (strpos($up_to_distinct_str,"(")) {
+                        if (strpos($up_to_distinct_str, "(")) {
                             //proceed as normal
-                            $newSQL = $matches[1] . " TOP $count " . $matches[2] . $matches[3];
+                            $newSQL = $matches[1]." TOP $count ".$matches[2].$matches[3];
                         }
                         else {
                             //if distinct is not within a function, then parse
                             //string contains distinct clause, "TOP needs to come after Distinct"
                             //get position of distinct
                             $match_zero = strtolower($matches[0]);
-                            $distinct_pos = strpos($match_zero , "distinct");
+                            $distinct_pos = strpos($match_zero, "distinct");
                             //get position of where
                             $where_pos = strpos($match_zero, "where");
                             //parse through string
-                            $beg = substr($matches[0], 0, $distinct_pos+9 );
-                            $mid = substr($matches[0], strlen($beg), ($where_pos+5) - (strlen($beg)));
-                            $end = substr($matches[0], strlen($beg) + strlen($mid) );
+                            $beg = substr($matches[0], 0, $distinct_pos + 9);
+                            $mid = substr($matches[0], strlen($beg), ($where_pos + 5) - (strlen($beg)));
+                            $end = substr($matches[0], strlen($beg) + strlen($mid));
                             //repopulate matches array
                             $matches[1] = $beg; $matches[2] = $mid; $matches[3] = $end;
 
-                            $newSQL = $matches[1] . " TOP $count " . $matches[2] . $matches[3];
+                            $newSQL = $matches[1]." TOP $count ".$matches[2].$matches[3];
                         }
                     }
                 } else {
                     $orderByMatch = array();
-                    preg_match('/^(.*)(\bORDER BY\b)(.*)$/is',$matches[3], $orderByMatch);
+                    preg_match('/^(.*)(\bORDER BY\b)(.*)$/is', $matches[3], $orderByMatch);
 
                     //if there is a distinct clause, parse sql string as we will have to insert the rownumber
                     //for paging, AFTER the distinct clause
@@ -512,8 +512,8 @@ 
 
                         //take out the select and distinct from string so we can reuse in group by
                         $dist_str = 'distinct';
-                        preg_match('/\b' . $dist_str . '\b/simU', $matches_sql, $matchesPartSQL, PREG_OFFSET_CAPTURE);
-                        $matches_sql = trim(substr($matches_sql,$matchesPartSQL[0][1] + strlen($dist_str)));
+                        preg_match('/\b'.$dist_str.'\b/simU', $matches_sql, $matchesPartSQL, PREG_OFFSET_CAPTURE);
+                        $matches_sql = trim(substr($matches_sql, $matchesPartSQL[0][1] + strlen($dist_str)));
                         //get the position of where and from for further processing
                         preg_match('/\bfrom\b/simU', $matches_sql, $matchesPartSQL, PREG_OFFSET_CAPTURE);
                         $from_pos = $matchesPartSQL[0][1];
@@ -521,17 +521,17 @@ 
                         $where_pos = $matchesPartSQL[0][1];
                         //split the sql into a string before and after the from clause
                         //we will use the columns being selected to construct the group by clause
-                        if ($from_pos>0 ) {
+                        if ($from_pos > 0) {
                             $distinctSQLARRAY[0] = substr($matches_sql, 0, $from_pos);
                             $distinctSQLARRAY[1] = substr($matches_sql, $from_pos);
                             //get position of order by (if it exists) so we can strip it from the string
                             $ob_pos = strpos($distinctSQLARRAY[1], "order by");
                             if ($ob_pos) {
-                                $distinctSQLARRAY[1] = substr($distinctSQLARRAY[1],0,$ob_pos);
+                                $distinctSQLARRAY[1] = substr($distinctSQLARRAY[1], 0, $ob_pos);
                             }
 
                             // strip off last closing parentheses from the where clause
-                            $distinctSQLARRAY[1] = preg_replace('/\)\s$/',' ',$distinctSQLARRAY[1]);
+                            $distinctSQLARRAY[1] = preg_replace('/\)\s$/', ' ', $distinctSQLARRAY[1]);
                         }
 
                         $grpByStr = array();
@@ -550,30 +550,30 @@ 
                             $newSQL = "SELECT TOP $count * FROM
                                         (
                                             SELECT ROW_NUMBER()
-                                                OVER (ORDER BY " . preg_replace('/^' . $dist_str . '\s+/', '', $this->returnOrderBy($sql, $orderByMatch[3])) . ") AS row_number,
-                                                count(*) counter, " . $distinctSQLARRAY[0] . "
-                                                " . $distinctSQLARRAY[1] . "
-                                                group by " . $grpByStr . "
+                                                OVER (ORDER BY ".preg_replace('/^'.$dist_str.'\s+/', '', $this->returnOrderBy($sql, $orderByMatch[3])).") AS row_number,
+                                                count(*) counter, " . $distinctSQLARRAY[0]."
+                                                " . $distinctSQLARRAY[1]."
+                                                group by " . $grpByStr."
                                         ) AS a
                                         WHERE row_number > $start";
                         }
                         else {
                         $newSQL = "SELECT TOP $count * FROM
                                     (
-                                        " . $matches[1] . " ROW_NUMBER()
-                                        OVER (ORDER BY " . $this->returnOrderBy($sql, $orderByMatch[3]) . ") AS row_number,
-                                        " . $matches[2] . $orderByMatch[1]. "
+                                        ".$matches[1]." ROW_NUMBER()
+                                        OVER (ORDER BY " . $this->returnOrderBy($sql, $orderByMatch[3]).") AS row_number,
+                                        " . $matches[2].$orderByMatch[1]."
                                     ) AS a
                                     WHERE row_number > $start";
                         }
-                    }else{
+                    } else {
                         //if there is a distinct clause, form query with rownumber after distinct
                         if ($hasDistinct) {
                              $newSQL = "SELECT TOP $count * FROM
                                             (
-                            SELECT ROW_NUMBER() OVER (ORDER BY ".$grpByStr.") AS row_number, count(*) counter, " . $distinctSQLARRAY[0] . "
-                                                        " . $distinctSQLARRAY[1] . "
-                                                    group by " . $grpByStr . "
+                            SELECT ROW_NUMBER() OVER (ORDER BY ".$grpByStr.") AS row_number, count(*) counter, ".$distinctSQLARRAY[0]."
+                                                        " . $distinctSQLARRAY[1]."
+                                                    group by " . $grpByStr."
                                             )
                                             AS a
                                             WHERE row_number > $start";
@@ -581,7 +581,7 @@ 
                         else {
                              $newSQL = "SELECT TOP $count * FROM
                                            (
-                                  " . $matches[1] . " ROW_NUMBER() OVER (ORDER BY " . $sqlArray['FROM'][0]['alias'] . ".id) AS row_number, " . $matches[2] . $matches[3]. "
+                                  ".$matches[1]." ROW_NUMBER() OVER (ORDER BY ".$sqlArray['FROM'][0]['alias'].".id) AS row_number, ".$matches[2].$matches[3]."
                                            )
                                            AS a
                                            WHERE row_number > $start";
@@ -591,9 +591,9 @@ 
             }
         }
 
-        $GLOBALS['log']->debug('Limit Query: ' . $newSQL);
-        if($execute) {
-            $result =  $this->query($newSQL, $dieOnError, $msg);
+        $GLOBALS['log']->debug('Limit Query: '.$newSQL);
+        if ($execute) {
+            $result = $this->query($newSQL, $dieOnError, $msg);
             $this->dump_slow_queries($newSQL);
             return $result;
         } else {
@@ -615,15 +615,15 @@ 
     private function removePatternFromSQL($p_sql, $strip_beg, $strip_end, $patt = 'patt')
     {
         //strip all single quotes out
-        $count = substr_count ( $p_sql, $strip_beg);
+        $count = substr_count($p_sql, $strip_beg);
         $increment = 1;
         if ($strip_beg != $strip_end)
             $increment = 2;
 
-        $i=0;
+        $i = 0;
         $offset = 0;
         $strip_array = array();
-        while ($i<$count && $offset<strlen($p_sql)) {
+        while ($i < $count && $offset < strlen($p_sql)) {
             if ($offset > strlen($p_sql))
             {
 				break;
@@ -634,23 +634,23 @@ 
             {
                 break;
             }
-            $sec_sin = strpos($p_sql, $strip_end, $beg_sin+1);
-            $strip_array[$patt.$i] = substr($p_sql, $beg_sin, $sec_sin - $beg_sin +1);
+            $sec_sin = strpos($p_sql, $strip_end, $beg_sin + 1);
+            $strip_array[$patt.$i] = substr($p_sql, $beg_sin, $sec_sin - $beg_sin + 1);
             if ($increment > 1) {
                 //we are in here because beginning and end patterns are not identical, so search for nesting
-                $exists = strpos($strip_array[$patt.$i], $strip_beg );
-                if ($exists>=0) {
-                    $nested_pos = (strrpos($strip_array[$patt.$i], $strip_beg ));
-                    $strip_array[$patt.$i] = substr($p_sql,$nested_pos+$beg_sin,$sec_sin - ($nested_pos+$beg_sin)+1);
-                    $p_sql = substr($p_sql, 0, $nested_pos+$beg_sin) . " ##". $patt.$i."## " . substr($p_sql, $sec_sin+1);
+                $exists = strpos($strip_array[$patt.$i], $strip_beg);
+                if ($exists >= 0) {
+                    $nested_pos = (strrpos($strip_array[$patt.$i], $strip_beg));
+                    $strip_array[$patt.$i] = substr($p_sql, $nested_pos + $beg_sin, $sec_sin - ($nested_pos + $beg_sin) + 1);
+                    $p_sql = substr($p_sql, 0, $nested_pos + $beg_sin)." ##".$patt.$i."## ".substr($p_sql, $sec_sin + 1);
                     $i = $i + 1;
                     continue;
                 }
             }
-            $p_len = strlen("##". $patt.$i."##");
-            $p_sql = substr($p_sql, 0, $beg_sin) . " ##". $patt.$i."## " . substr($p_sql, $sec_sin+1);
+            $p_len = strlen("##".$patt.$i."##");
+            $p_sql = substr($p_sql, 0, $beg_sin)." ##".$patt.$i."## ".substr($p_sql, $sec_sin + 1);
             //move the marker up
-            $offset = ($sec_sin-($sec_sin-$beg_sin))+$p_len+1; // Adjusting the starting point of the marker
+            $offset = ($sec_sin - ($sec_sin - $beg_sin)) + $p_len + 1; // Adjusting the starting point of the marker
 
             $i = $i + 1;
         }
@@ -672,7 +672,7 @@ 
         $pattern_array = array_reverse($pattern_array);
 
         foreach ($pattern_array as $key => $replace) {
-            $token = str_replace( " ##".$key."## ", $replace,$token);
+            $token = str_replace(" ##".$key."## ", $replace, $token);
         }
 
         return $token;
@@ -688,11 +688,11 @@ 
 	private function getAliasFromSQL($sql, $alias)
     {
         $matches = array();
-        preg_match('/^(.*SELECT)(.*?FROM.*WHERE)(.*)$/isU',$sql, $matches);
+        preg_match('/^(.*SELECT)(.*?FROM.*WHERE)(.*)$/isU', $sql, $matches);
         //parse all single and double  quotes out of array
-        $sin_array = $this->removePatternFromSQL($matches[2], "'", "'","sin_");
+        $sin_array = $this->removePatternFromSQL($matches[2], "'", "'", "sin_");
         $new_sql = array_pop($sin_array);
-        $dub_array = $this->removePatternFromSQL($new_sql, "\"", "\"","dub_");
+        $dub_array = $this->removePatternFromSQL($new_sql, "\"", "\"", "dub_");
         $new_sql = array_pop($dub_array);
 
         //search for parenthesis
@@ -701,7 +701,7 @@ 
 
         //all functions should be removed now, so split the array on commas
         $mstr_sql_array = explode(",", $new_sql);
-        foreach($mstr_sql_array as $token ) {
+        foreach ($mstr_sql_array as $token) {
             if (strpos($token, $alias)) {
                 //found token, add back comments
                 $token = $this->addPatternToSQL($token, $paren_array);
@@ -739,7 +739,7 @@ 
         $found = $found_in_sql;
 
         //if still no match found, then we need to parse through the string
-        if (!$found_in_sql){
+        if (!$found_in_sql) {
             //get count of how many times the match exists in string
             $found_count = substr_count($sql, $orderMatch);
             $i = 0;
@@ -748,21 +748,21 @@ 
             //loop through string as many times as there is a match
             while ($found_count > $i) {
                 //get the first match
-                $found_in_sql = strpos($sql, $orderMatch,$first_);
+                $found_in_sql = strpos($sql, $orderMatch, $first_);
                 //make sure there was a match
-                if($found_in_sql){
+                if ($found_in_sql) {
                     //grab the next 2 individual characters
-                    $str_plusone = substr($sql,$found_in_sql + $len,1);
-                    $str_plustwo = substr($sql,$found_in_sql + $len+1,1);
+                    $str_plusone = substr($sql, $found_in_sql + $len, 1);
+                    $str_plustwo = substr($sql, $found_in_sql + $len + 1, 1);
                     //if one of those characters is a comma, then we have our alias
-                    if ($str_plusone === "," || $str_plustwo === ","){
+                    if ($str_plusone === "," || $str_plustwo === ",") {
                         //keep track of this position
                         $found = $found_in_sql;
                     }
                 }
                 //set the offset and increase the iteration counter
-                $first_ = $found_in_sql+$len;
-                $i = $i+1;
+                $first_ = $found_in_sql + $len;
+                $i = $i + 1;
             }
         }
         //return $found, defaults have been set, so if no match was found it will be a negative number
@@ -794,8 +794,8 @@ 
         $firstSpace = strpos($orig_order_match, " ");
 
         //split order by into column name and ascending/descending
-        $orderMatch = " " . strtolower(substr($orig_order_match, 0, $firstSpace));
-        $asc_desc = trim(substr($orig_order_match,$firstSpace));
+        $orderMatch = " ".strtolower(substr($orig_order_match, 0, $firstSpace));
+        $asc_desc = trim(substr($orig_order_match, $firstSpace));
 
         //look for column name as an alias in sql string
         $found_in_sql = $this->findColumnByAlias($sql, $orderMatch);
@@ -806,18 +806,18 @@ 
             $colMatchPos = strpos($sql, $orderMatch);
             if ($colMatchPos !== false) {
                 //grab sub string up to column name
-                $containsColStr = substr($sql,0, $colMatchPos);
+                $containsColStr = substr($sql, 0, $colMatchPos);
                 //get position of first space, so we can grab table name
                 $lastSpacePos = strrpos($containsColStr, " ");
                 //use positions of column name, space before name, and length of column to find the correct column name
-                $col_name = substr($sql, $lastSpacePos, $colMatchPos-$lastSpacePos+strlen($orderMatch));
+                $col_name = substr($sql, $lastSpacePos, $colMatchPos - $lastSpacePos + strlen($orderMatch));
 				//bug 25485. When sorting by a custom field in Account List and then pressing NEXT >, system gives an error
 				$containsCommaPos = strpos($col_name, ",");
-				if($containsCommaPos !== false) {
-					$col_name = substr($col_name, $containsCommaPos+1);
+				if ($containsCommaPos !== false) {
+					$col_name = substr($col_name, $containsCommaPos + 1);
 				}
                 //add the "asc/desc" order back
-                $col_name = $col_name. " ". $asc_desc;
+                $col_name = $col_name." ".$asc_desc;
 
                 //return column name
                 return $col_name;
@@ -831,22 +831,22 @@ 
             //grab string up to the aliased column
             $GLOBALS['log']->debug("order by found, process sql string");
 
-            $psql = (trim($this->getAliasFromSQL($sql, $orderMatch )));
+            $psql = (trim($this->getAliasFromSQL($sql, $orderMatch)));
             if (empty($psql))
                 $psql = trim(substr($sql, 0, $found_in_sql));
 
             //grab the last comma before the alias
-            preg_match('/\s+' . trim($orderMatch). '/', $psql, $match, PREG_OFFSET_CAPTURE);
+            preg_match('/\s+'.trim($orderMatch).'/', $psql, $match, PREG_OFFSET_CAPTURE);
             $comma_pos = $match[0][1];
             //substring between the comma and the alias to find the joined_table alias and column name
-            $col_name = substr($psql,0, $comma_pos);
+            $col_name = substr($psql, 0, $comma_pos);
 
             //make sure the string does not have an end parenthesis
             //and is not part of a function (i.e. "ISNULL(leads.last_name,'') as name"  )
             //this is especially true for unified search from home screen
 
             $alias_beg_pos = 0;
-            if(strpos($psql, " as "))
+            if (strpos($psql, " as "))
                 $alias_beg_pos = strpos($psql, " as ");
 
             // Bug # 44923 - This breaks the query and does not properly filter isnull
@@ -855,13 +855,13 @@ 
                 $alias_beg_pos = strpos($psql, " "); */
 
             if ($alias_beg_pos > 0) {
-                $col_name = substr($psql,0, $alias_beg_pos );
+                $col_name = substr($psql, 0, $alias_beg_pos);
             }
             //add the "asc/desc" order back
-            $col_name = $col_name. " ". $asc_desc;
+            $col_name = $col_name." ".$asc_desc;
 
             //pass in new order by
-            $GLOBALS['log']->debug("order by being returned is " . $col_name);
+            $GLOBALS['log']->debug("order by being returned is ".$col_name);
             return $col_name;
         }
     }
@@ -877,12 +877,12 @@ 
     {
 
         global $beanList, $beanFiles;
-        $GLOBALS['log']->debug("Module being processed is " . $module_str);
+        $GLOBALS['log']->debug("Module being processed is ".$module_str);
         //get the right module files
         //the module string exists in bean list, then process bean for correct table name
         //note that we exempt the reports module from this, as queries from reporting module should be parsed for
         //correct table name.
-        if (($module_str != 'Reports' && $module_str != 'SavedReport') && isset($beanList[$module_str])  &&  isset($beanFiles[$beanList[$module_str]])){
+        if (($module_str != 'Reports' && $module_str != 'SavedReport') && isset($beanList[$module_str]) && isset($beanFiles[$beanList[$module_str]])) {
             //if the class is not already loaded, then load files
             if (!class_exists($beanList[$module_str]))
                 require_once($beanFiles[$beanList[$module_str]]);
@@ -894,7 +894,7 @@ 
             //make sure table name is not just a blank space, or empty
             $tbl_name = trim($tbl_name);
 
-            if(empty($tbl_name)){
+            if (empty($tbl_name)) {
                 $GLOBALS['log']->debug("Could not find table name for module $module_str. ");
                 $tbl_name = $module_str;
             }
@@ -911,20 +911,20 @@ 
             $sql = str_replace(array("\n", "\r"), " ", $sql);
 
             //look for the location of the "from" in sql string
-            $fromLoc = strpos($sql," from " );
-            if ($fromLoc>0){
+            $fromLoc = strpos($sql, " from ");
+            if ($fromLoc > 0) {
                 //found from, substring from the " FROM " string in sql to end
-                $tableEnd = substr($sql, $fromLoc+6);
+                $tableEnd = substr($sql, $fromLoc + 6);
                 //We know that tablename will be next parameter after from, so
                 //grab the next space after table name.
                 // MFH BUG #14009: Also check to see if there are any carriage returns before the next space so that we don't grab any arbitrary joins or other tables.
-                $carriage_ret = strpos($tableEnd,"\n");
-                $next_space = strpos($tableEnd," " );
+                $carriage_ret = strpos($tableEnd, "\n");
+                $next_space = strpos($tableEnd, " ");
                 if ($carriage_ret < $next_space)
                     $next_space = $carriage_ret;
                 if ($next_space > 0) {
-                    $tbl_name= substr($tableEnd,0, $next_space);
-                    if(empty($tbl_name)){
+                    $tbl_name = substr($tableEnd, 0, $next_space);
+                    if (empty($tbl_name)) {
                         $GLOBALS['log']->debug("Could not find table name sql either, return $module_str. ");
                         $tbl_name = $module_str;
                     }
@@ -932,11 +932,11 @@ 
 
                 //grab the table, to see if it is aliased
                 $aliasTableEnd = trim(substr($tableEnd, $next_space));
-                $alias_space = strpos ($aliasTableEnd, " " );
-                if ($alias_space > 0){
-                    $alias_tbl_name= substr($aliasTableEnd,0, $alias_space);
+                $alias_space = strpos($aliasTableEnd, " ");
+                if ($alias_space > 0) {
+                    $alias_tbl_name = substr($aliasTableEnd, 0, $alias_space);
                     strtolower($alias_tbl_name);
-                    if(empty($alias_tbl_name)
+                    if (empty($alias_tbl_name)
                         || $alias_tbl_name == "where"
                         || $alias_tbl_name == "inner"
                         || $alias_tbl_name == "left"
@@ -948,9 +948,9 @@ 
                     elseif ($alias_tbl_name == "as") {
                             //the next word is the table name
                             $aliasTableEnd = trim(substr($aliasTableEnd, $alias_space));
-                            $alias_space = strpos ($aliasTableEnd, " " );
+                            $alias_space = strpos($aliasTableEnd, " ");
                             if ($alias_space > 0) {
-                                $alias_tbl_name= trim(substr($aliasTableEnd,0, $alias_space));
+                                $alias_tbl_name = trim(substr($aliasTableEnd, 0, $alias_space));
                                 if (!empty($alias_tbl_name))
                                     $tbl_name = $alias_tbl_name;
                             }
@@ -975,7 +975,7 @@ 
 	{
 		$field_array = array();
 
-		if(! isset($result) || empty($result))
+		if (!isset($result) || empty($result))
             return 0;
 
         $i = 0;
@@ -983,7 +983,7 @@ 
             $meta = mssql_fetch_field($result, $i);
             if (!$meta)
                 return 0;
-            if($make_lower_case==true)
+            if ($make_lower_case == true)
                 $meta->name = strtolower($meta->name);
 
             $field_array[] = $meta->name;
@@ -1012,11 +1012,11 @@ 
         $row = mssql_fetch_assoc($result);
         //MSSQL returns a space " " when a varchar column is empty ("") and not null.
         //We need to iterate through the returned row array and strip empty spaces
-        if(!empty($row)){
-            foreach($row as $key => $column) {
+        if (!empty($row)) {
+            foreach ($row as $key => $column) {
                //notice we only strip if one space is returned.  we do not want to strip
                //strings with intentional spaces (" foo ")
-               if (!empty($column) && $column ==" ") {
+               if (!empty($column) && $column == " ") {
                    $row[$key] = '';
                }
             }
@@ -1029,10 +1029,10 @@ 
      */
     public function quote($string)
     {
-        if(is_array($string)) {
+        if (is_array($string)) {
             return $this->arrayQuote($string);
         }
-        return str_replace("'","''", $this->quoteInternal($string));
+        return str_replace("'", "''", $this->quoteInternal($string));
     }
 
     /**
@@ -1070,7 +1070,7 @@ 
             if (!empty($r)) {
                 while ($a = $this->fetchByAssoc($r)) {
                     $row = array_values($a);
-					$tables[]=$row[0];
+					$tables[] = $row[0];
                 }
                 return $tables;
             }
@@ -1085,7 +1085,7 @@ 
     {
         $GLOBALS['log']->debug('MSSQL fetching table list');
 
-        if($this->getDatabase()) {
+        if ($this->getDatabase()) {
             $tables = array();
             $r = $this->query('SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES');
             if (is_resource($r)) {
@@ -1109,7 +1109,7 @@ 
     {
         $GLOBALS['log']->debug('MSSQL about to wakeup FTS');
 
-        if($this->getDatabase()) {
+        if ($this->getDatabase()) {
                 //create wakeup catalog
                 $FTSqry[] = "if not exists(  select * from sys.fulltext_catalogs where name ='wakeup_catalog' )
                 CREATE FULLTEXT CATALOG wakeup_catalog
@@ -1149,7 +1149,7 @@ 
                 $FTSqry[] = 'ALTER FULLTEXT INDEX ON fts_wakeup START FULL POPULATION';
                 $FTSqry[] = 'ALTER FULLTEXT INDEX ON fts_wakeup SET CHANGE_TRACKING AUTO';
 
-                foreach($FTSqry as $q){
+                foreach ($FTSqry as $q) {
                     sleep(3);
                     $this->query($q);
                 }
@@ -1172,12 +1172,12 @@ 
     {
         // convert the parameters array into a comma delimited string
         if (!empty($additional_parameters)) {
-            $additional_parameters_string = ','.implode(',',$additional_parameters);
+            $additional_parameters_string = ','.implode(',', $additional_parameters);
         } else {
             $additional_parameters_string = '';
         }
         $all_parameters = $additional_parameters;
-        if(is_array($string)) {
+        if (is_array($string)) {
             $all_parameters = array_merge($string, $all_parameters);
         } elseif (!is_null($string)) {
             array_unshift($all_parameters, $string);
@@ -1189,22 +1189,22 @@ 
             case 'left':
                 return "LEFT($string$additional_parameters_string)";
             case 'date_format':
-                if(!empty($additional_parameters[0]) && $additional_parameters[0][0] == "'") {
+                if (!empty($additional_parameters[0]) && $additional_parameters[0][0] == "'") {
                     $additional_parameters[0] = trim($additional_parameters[0], "'");
                 }
-                if(!empty($additional_parameters) && isset($this->date_formats[$additional_parameters[0]])) {
+                if (!empty($additional_parameters) && isset($this->date_formats[$additional_parameters[0]])) {
                     $len = $this->date_formats[$additional_parameters[0]];
-                    return "LEFT(CONVERT(varchar($len),". $string . ",120),$len)";
+                    return "LEFT(CONVERT(varchar($len),".$string.",120),$len)";
                 } else {
-                   return "LEFT(CONVERT(varchar(10),". $string . ",120),10)";
+                   return "LEFT(CONVERT(varchar(10),".$string.",120),10)";
                 }
             case 'ifnull':
-                if(empty($additional_parameters_string)) {
+                if (empty($additional_parameters_string)) {
                     $additional_parameters_string = ",''";
                 }
                 return "ISNULL($string$additional_parameters_string)";
             case 'concat':
-                return implode("+",$all_parameters);
+                return implode("+", $all_parameters);
             case 'text2char':
                 return "CAST($string AS varchar(8000))";
             case 'quarter':
@@ -1220,7 +1220,7 @@ 
             case 'add_tz_offset' :
                 $getUserUTCOffset = $GLOBALS['timedate']->getUserUTCOffset();
                 $operation = $getUserUTCOffset < 0 ? '-' : '+';
-                return 'DATEADD(minute, ' . $operation . abs($getUserUTCOffset) . ', ' . $string. ')';
+                return 'DATEADD(minute, '.$operation.abs($getUserUTCOffset).', '.$string.')';
             case 'avg':
                 return "avg($string)";
         }
@@ -1233,9 +1233,9 @@ 
      */
     public function fromConvert($string, $type)
     {
-        switch($type) {
+        switch ($type) {
             case 'datetimecombo':
-            case 'datetime': return substr($string, 0,19);
+            case 'datetime': return substr($string, 0, 19);
             case 'date': return substr($string, 0, 10);
             case 'time': return substr($string, 11);
 		}
@@ -1264,8 +1264,8 @@ 
     public function isTextType($type)
     {
         $type = strtolower($type);
-        if(!isset($this->type_map[$type])) return false;
-        return in_array($this->type_map[$type], array('ntext','text','image', 'nvarchar(max)'));
+        if (!isset($this->type_map[$type])) return false;
+        return in_array($this->type_map[$type], array('ntext', 'text', 'image', 'nvarchar(max)'));
     }
 
     /**
@@ -1275,13 +1275,13 @@ 
     public function emptyValue($type)
     {
         $ctype = $this->getColumnType($type);
-        if($ctype == "datetime") {
+        if ($ctype == "datetime") {
             return $this->convert($this->quoted("1970-01-01 00:00:00"), "datetime");
         }
-        if($ctype == "date") {
+        if ($ctype == "date") {
             return $this->convert($this->quoted("1970-01-01"), "datetime");
         }
-        if($ctype == "time") {
+        if ($ctype == "time") {
             return $this->convert($this->quoted("00:00:00"), "time");
         }
         return parent::emptyValue($type);
@@ -1304,21 +1304,21 @@ 
      */
     protected function alterSQLRep($action, array $def, $ignoreRequired, $tablename)
     {
-        switch($action){
+        switch ($action) {
         case 'add':
-             $f_def=$this->oneColumnSQLRep($def, $ignoreRequired,$tablename,false);
-            return "ADD " . $f_def;
+             $f_def = $this->oneColumnSQLRep($def, $ignoreRequired, $tablename, false);
+            return "ADD ".$f_def;
             break;
         case 'drop':
-            return "DROP COLUMN " . $def['name'];
+            return "DROP COLUMN ".$def['name'];
             break;
         case 'modify':
             //You cannot specify a default value for a column for MSSQL
-            $f_def  = $this->oneColumnSQLRep($def, $ignoreRequired,$tablename, true);
+            $f_def  = $this->oneColumnSQLRep($def, $ignoreRequired, $tablename, true);
             $f_stmt = "ALTER COLUMN ".$f_def['name'].' '.$f_def['colType'].' '.
                         $f_def['required'].' '.$f_def['auto_increment']."\n";
-            if (!empty( $f_def['default']))
-                $f_stmt .= " ALTER TABLE " . $tablename .  " ADD  ". $f_def['default'] . " FOR " . $def['name'];
+            if (!empty($f_def['default']))
+                $f_stmt .= " ALTER TABLE ".$tablename." ADD  ".$f_def['default']." FOR ".$def['name'];
             return $f_stmt;
             break;
         default:
@@ -1334,7 +1334,7 @@ 
      */
     protected function changeColumnSQL($tablename, $fieldDefs, $action, $ignoreRequired = false)
     {
-        $sql=$sql2='';
+        $sql = $sql2 = '';
         $constraints = $this->get_field_default_constraint_name($tablename);
         $columns = array();
         if ($this->isFieldArray($fieldDefs)) {
@@ -1343,41 +1343,41 @@ 
           		//if the column is being modified drop the default value
           		//constraint if it exists. alterSQLRep will add the constraint back
           		if (!empty($constraints[$def['name']])) {
-          			$sql.=" ALTER TABLE " . $tablename . " DROP CONSTRAINT " . $constraints[$def['name']];
+          			$sql .= " ALTER TABLE ".$tablename." DROP CONSTRAINT ".$constraints[$def['name']];
           		}
           		//check to see if we need to drop related indexes before the alter
           		$indices = $this->get_indices($tablename);
-                foreach ( $indices as $index ) {
-                    if ( in_array($def['name'],$index['fields']) ) {
-                        $sql  .= ' ' . $this->add_drop_constraint($tablename,$index,true).' ';
-                        $sql2 .= ' ' . $this->add_drop_constraint($tablename,$index,false).' ';
+                foreach ($indices as $index) {
+                    if (in_array($def['name'], $index['fields'])) {
+                        $sql  .= ' '.$this->add_drop_constraint($tablename, $index, true).' ';
+                        $sql2 .= ' '.$this->add_drop_constraint($tablename, $index, false).' ';
                     }
                 }
 
-          		$columns[] = $this->alterSQLRep($action, $def, $ignoreRequired,$tablename);
+          		$columns[] = $this->alterSQLRep($action, $def, $ignoreRequired, $tablename);
       		}
         }
         else {
             //if the column is being modified drop the default value
       		//constraint if it exists. alterSQLRep will add the constraint back
       		if (!empty($constraints[$fieldDefs['name']])) {
-      			$sql.=" ALTER TABLE " . $tablename . " DROP CONSTRAINT " . $constraints[$fieldDefs['name']];
+      			$sql .= " ALTER TABLE ".$tablename." DROP CONSTRAINT ".$constraints[$fieldDefs['name']];
       		}
       		//check to see if we need to drop related indexes before the alter
             $indices = $this->get_indices($tablename);
-            foreach ( $indices as $index ) {
-                if ( in_array($fieldDefs['name'],$index['fields']) ) {
-                    $sql  .= ' ' . $this->add_drop_constraint($tablename,$index,true).' ';
-                    $sql2 .= ' ' . $this->add_drop_constraint($tablename,$index,false).' ';
+            foreach ($indices as $index) {
+                if (in_array($fieldDefs['name'], $index['fields'])) {
+                    $sql  .= ' '.$this->add_drop_constraint($tablename, $index, true).' ';
+                    $sql2 .= ' '.$this->add_drop_constraint($tablename, $index, false).' ';
                 }
             }
 
 
-          	$columns[] = $this->alterSQLRep($action, $fieldDefs, $ignoreRequired,$tablename);
+          	$columns[] = $this->alterSQLRep($action, $fieldDefs, $ignoreRequired, $tablename);
         }
 
         $columns = implode(", ", $columns);
-        $sql .= " ALTER TABLE $tablename $columns " . $sql2;
+        $sql .= " ALTER TABLE $tablename $columns ".$sql2;
 
         return $sql;
     }
@@ -1392,7 +1392,7 @@ 
      */
     public function setAutoIncrementStart($table, $field_name, $start_value)
     {
-        if($start_value > 1)
+        if ($start_value > 1)
             $start_value -= 1;
 		$this->query("DBCC CHECKIDENT ('$table', RESEED, $start_value) WITH NO_INFOMSGS");
         return true;
@@ -1427,11 +1427,11 @@ 
         $result = $this->query($query);
 
         $indices = array();
-        while (($row=$this->fetchByAssoc($result)) != null) {
+        while (($row = $this->fetchByAssoc($result)) != null) {
             $index_type = 'index';
             if ($row['is_primary_key'] == '1')
                 $index_type = 'primary';
-            elseif ($row['is_unique'] == 1 )
+            elseif ($row['is_unique'] == 1)
                 $index_type = 'unique';
             $name = strtolower($row['index_name']);
             $indices[$name]['name']     = $name;
@@ -1450,36 +1450,36 @@ 
         $result = $this->query("sp_columns $tablename");
 
         $columns = array();
-        while (($row=$this->fetchByAssoc($result)) !=null) {
+        while (($row = $this->fetchByAssoc($result)) != null) {
             $column_name = strtolower($row['COLUMN_NAME']);
-            $columns[$column_name]['name']=$column_name;
-            $columns[$column_name]['type']=strtolower($row['TYPE_NAME']);
-            if ( $row['TYPE_NAME'] == 'decimal' ) {
-                $columns[$column_name]['len']=strtolower($row['PRECISION']);
-                $columns[$column_name]['len'].=','.strtolower($row['SCALE']);
+            $columns[$column_name]['name'] = $column_name;
+            $columns[$column_name]['type'] = strtolower($row['TYPE_NAME']);
+            if ($row['TYPE_NAME'] == 'decimal') {
+                $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']);
-            elseif ( !in_array($row['TYPE_NAME'],array('datetime','text')) )
-                $columns[$column_name]['len']=strtolower($row['LENGTH']);
-            if ( stristr($row['TYPE_NAME'],'identity') ) {
+			elseif (in_array($row['TYPE_NAME'], array('nchar', 'nvarchar')))
+				$columns[$column_name]['len'] = strtolower($row['PRECISION']);
+            elseif (!in_array($row['TYPE_NAME'], array('datetime', 'text')))
+                $columns[$column_name]['len'] = strtolower($row['LENGTH']);
+            if (stristr($row['TYPE_NAME'], 'identity')) {
                 $columns[$column_name]['auto_increment'] = '1';
-                $columns[$column_name]['type']=str_replace(' identity','',strtolower($row['TYPE_NAME']));
+                $columns[$column_name]['type'] = str_replace(' identity', '', strtolower($row['TYPE_NAME']));
             }
 
-            if (!empty($row['IS_NULLABLE']) && $row['IS_NULLABLE'] == 'NO' && (empty($row['KEY']) || !stristr($row['KEY'],'PRI')))
+            if (!empty($row['IS_NULLABLE']) && $row['IS_NULLABLE'] == 'NO' && (empty($row['KEY']) || !stristr($row['KEY'], 'PRI')))
                 $columns[strtolower($row['COLUMN_NAME'])]['required'] = 'true';
 
             $column_def = 1;
-            if ( strtolower($tablename) == 'relationships' ) {
+            if (strtolower($tablename) == 'relationships') {
                 $column_def = $this->getOne("select cdefault from syscolumns where id = object_id('relationships') and name = '$column_name'");
             }
-            if ( $column_def != 0 && ($row['COLUMN_DEF'] != null)) {	// NOTE Not using !empty as an empty string may be a viable default value.
+            if ($column_def != 0 && ($row['COLUMN_DEF'] != null)) {	// NOTE Not using !empty as an empty string may be a viable default value.
                 $matches = array();
-                $row['COLUMN_DEF'] = html_entity_decode($row['COLUMN_DEF'],ENT_QUOTES);
-                if ( preg_match('/\([\(|\'](.*)[\)|\']\)/i',$row['COLUMN_DEF'],$matches) )
+                $row['COLUMN_DEF'] = html_entity_decode($row['COLUMN_DEF'], ENT_QUOTES);
+                if (preg_match('/\([\(|\'](.*)[\)|\']\)/i', $row['COLUMN_DEF'], $matches))
                     $columns[$column_name]['default'] = $matches[1];
-                elseif ( preg_match('/\(N\'(.*)\'\)/i',$row['COLUMN_DEF'],$matches) )
+                elseif (preg_match('/\(N\'(.*)\'\)/i', $row['COLUMN_DEF'], $matches))
                     $columns[$column_name]['default'] = $matches[1];
                 else
                     $columns[$column_name]['default'] = $row['COLUMN_DEF'];
@@ -1494,7 +1494,7 @@ 
      */
     protected function ftsCatalogName()
     {
-        if(isset($this->connectOptions['db_name'])) {
+        if (isset($this->connectOptions['db_name'])) {
             return $this->connectOptions['db_name']."_fts_catalog";
         }
         return 'sugar_fts_catalog';
@@ -1506,11 +1506,11 @@ 
     public function add_drop_constraint($table, $definition, $drop = false)
     {
         $type         = $definition['type'];
-        $fields       = is_array($definition['fields'])?implode(',',$definition['fields']):$definition['fields'];
+        $fields       = is_array($definition['fields']) ? implode(',', $definition['fields']) : $definition['fields'];
         $name         = $definition['name'];
         $sql          = '';
 
-        switch ($type){
+        switch ($type) {
         // generic indices
         case 'index':
         case 'alternate_key':
@@ -1548,13 +1548,13 @@ 
             if ($this->full_text_indexing_enabled() && $drop) {
                 $sql = "DROP FULLTEXT INDEX ON {$table}";
             } elseif ($this->full_text_indexing_enabled()) {
-                $catalog_name=$this->ftsCatalogName();
-                if ( isset($definition['catalog_name']) && $definition['catalog_name'] != 'default')
+                $catalog_name = $this->ftsCatalogName();
+                if (isset($definition['catalog_name']) && $definition['catalog_name'] != 'default')
                     $catalog_name = $definition['catalog_name'];
 
                 $language = "Language 1033";
                 if (isset($definition['language']) && !empty($definition['language']))
-                    $language = "Language " . $definition['language'];
+                    $language = "Language ".$definition['language'];
 
                 $key_index = $definition['key_index'];
 
@@ -1562,7 +1562,7 @@ 
                 if (isset($definition['change_tracking']) && !empty($definition['change_tracking']))
                     $change_tracking = $definition['change_tracking'];
 
-                $sql = " CREATE FULLTEXT INDEX ON $table ($fields $language) KEY INDEX $key_index ON $catalog_name WITH CHANGE_TRACKING $change_tracking" ;
+                $sql = " CREATE FULLTEXT INDEX ON $table ($fields $language) KEY INDEX $key_index ON $catalog_name WITH CHANGE_TRACKING $change_tracking";
             }
             break;
         }
@@ -1586,11 +1586,11 @@ 
     protected function full_text_indexing_enabled($dbname = null)
     {
         // check to see if we already have install setting in session
-    	if(!isset($_SESSION['IsFulltextInstalled']))
+    	if (!isset($_SESSION['IsFulltextInstalled']))
             $_SESSION['IsFulltextInstalled'] = $this->full_text_indexing_installed();
 
         // check to see if FTS Indexing service is installed
-        if(empty($_SESSION['IsFulltextInstalled']))
+        if (empty($_SESSION['IsFulltextInstalled']))
             return false;
 
         // grab the dbname if it was not passed through
@@ -1640,7 +1640,7 @@ 
     {
         static $results = array();
 
-        if ( empty($column) && isset($results[$table]) )
+        if (empty($column) && isset($results[$table]))
             return $results[$table];
 
         $query = <<<EOQ
@@ -1654,17 +1654,17 @@ 
             on s.schema_id = o.schema_id
     where o.name = '$table'
 EOQ;
-        if ( !empty($column) )
+        if (!empty($column))
             $query .= " and c.name = '$column'";
         $res = $this->query($query);
-        if ( !empty($column) ) {
+        if (!empty($column)) {
             $row = $this->fetchByAssoc($res);
             if (!empty($row))
                 return $row['ctrt'];
         }
         else {
             $returnResult = array();
-            while ( $row = $this->fetchByAssoc($res) )
+            while ($row = $this->fetchByAssoc($res))
                 $returnResult[$row['dtrt']] = $row['ctrt'];
             $results[$table] = $returnResult;
             return $returnResult;
@@ -1678,14 +1678,14 @@ 
      */
     public function massageFieldDef(&$fieldDef, $tablename)
     {
-        parent::massageFieldDef($fieldDef,$tablename);
+        parent::massageFieldDef($fieldDef, $tablename);
 
         if ($fieldDef['type'] == 'int')
             $fieldDef['len'] = '4';
 
-        if(empty($fieldDef['len']))
+        if (empty($fieldDef['len']))
         {
-            switch($fieldDef['type']) {
+            switch ($fieldDef['type']) {
                 case 'bit'      :
                 case 'bool'     : $fieldDef['len'] = '1'; break;
                 case 'smallint' : $fieldDef['len'] = '2'; break;
@@ -1695,22 +1695,22 @@ 
                                   $fieldDef['len'] = $this->isTextType($fieldDef['dbType']) ? 'max' : '255';
                                   break;
                 case 'image'    : $fieldDef['len'] = '2147483647'; break;
-                case 'ntext'    : $fieldDef['len'] = '2147483646'; break;   // Note: this is from legacy code, don't know if this is correct
+                case 'ntext'    : $fieldDef['len'] = '2147483646'; break; // Note: this is from legacy code, don't know if this is correct
             }
         }
-        if($fieldDef['type'] == 'decimal'
+        if ($fieldDef['type'] == 'decimal'
            && empty($fieldDef['precision'])
            && !strpos($fieldDef['len'], ','))
         {
              $fieldDef['len'] .= ',0'; // Adding 0 precision if it is not specified
         }
 
-        if(empty($fieldDef['default'])
-            && in_array($fieldDef['type'],array('bit','bool')))
+        if (empty($fieldDef['default'])
+            && in_array($fieldDef['type'], array('bit', 'bool')))
         {
             $fieldDef['default'] = '0';
         }
-		if (isset($fieldDef['required']) && $fieldDef['required'] && !isset($fieldDef['default']) )
+		if (isset($fieldDef['required']) && $fieldDef['required'] && !isset($fieldDef['default']))
 			$fieldDef['default'] = '';
 //        if ($fieldDef['type'] == 'bit' && empty($fieldDef['len']) )
 //            $fieldDef['len'] = '1';
@@ -1741,13 +1741,13 @@ 
     protected function oneColumnSQLRep($fieldDef, $ignoreRequired = false, $table = '', $return_as_array = false)
     {
     	//Bug 25814
-		if(isset($fieldDef['name'])){
+		if (isset($fieldDef['name'])) {
 		    $colType = $this->getFieldType($fieldDef);
-        	if(stristr($this->getFieldType($fieldDef), 'decimal') && isset($fieldDef['len'])){
-				$fieldDef['len'] = min($fieldDef['len'],38);
+        	if (stristr($this->getFieldType($fieldDef), 'decimal') && isset($fieldDef['len'])) {
+				$fieldDef['len'] = min($fieldDef['len'], 38);
 			}
 		    //bug: 39690 float(8) is interpreted as real and this generates a diff when doing repair
-			if(stristr($colType, 'float') && isset($fieldDef['len']) && $fieldDef['len'] == 8){
+			if (stristr($colType, 'float') && isset($fieldDef['len']) && $fieldDef['len'] == 8) {
 				unset($fieldDef['len']);
 			}
 		}
@@ -1756,10 +1756,10 @@ 
 		$ref = parent::oneColumnSQLRep($fieldDef, $ignoreRequired, $table, true);
 
 		// Bug 24307 - Don't add precision for float fields.
-		if ( stristr($ref['colType'],'float') )
-			$ref['colType'] = preg_replace('/(,\d+)/','',$ref['colType']);
+		if (stristr($ref['colType'], 'float'))
+			$ref['colType'] = preg_replace('/(,\d+)/', '', $ref['colType']);
 
-        if ( $return_as_array )
+        if ($return_as_array)
             return $ref;
         else
             return "{$ref['name']} {$ref['colType']} {$ref['default']} {$ref['required']} {$ref['auto_increment']}";
@@ -1774,10 +1774,10 @@ 
     public function save_audit_records(SugarBean $bean, $changes)
 	{
 		//Bug 25078 fixed by Martin Hu: sqlserver haven't 'date' type, trim extra "00:00:00"
-		if($changes['data_type'] == 'date'){
-			$changes['before'] = str_replace(' 00:00:00','',$changes['before']);
+		if ($changes['data_type'] == 'date') {
+			$changes['before'] = str_replace(' 00:00:00', '', $changes['before']);
 		}
-		parent::save_audit_records($bean,$changes);
+		parent::save_audit_records($bean, $changes);
 	}
 
     /**
@@ -1788,7 +1788,7 @@ 
     public function disconnect()
     {
     	$GLOBALS['log']->debug('Calling Mssql::disconnect()');
-        if(!empty($this->database)){
+        if (!empty($this->database)) {
             $this->freeResult();
             mssql_close($this->database);
             $this->database = null;
@@ -1800,7 +1800,7 @@ 
      */
     protected function freeDbResult($dbResult)
     {
-        if(!empty($dbResult))
+        if (!empty($dbResult))
             mssql_free_result($dbResult);
     }
 
@@ -1811,11 +1811,11 @@ 
     public function lastDbError()
     {
         $sqlmsg = mssql_get_last_message();
-        if(empty($sqlmsg)) return false;
+        if (empty($sqlmsg)) 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_WARNING'])) {
         //ignore the message from sql-server if $app_strings array is empty. This will happen
         //only if connection if made before language is set.
 		    return false;
@@ -1824,7 +1824,7 @@ 
         $sqlpos = strpos($sqlmsg, 'Changed database context to');
         $sqlpos2 = strpos($sqlmsg, 'Warning:');
         $sqlpos3 = strpos($sqlmsg, 'Checking identity information:');
-        if ( $sqlpos !== false || $sqlpos2 !== false || $sqlpos3 !== false ) {
+        if ($sqlpos !== false || $sqlpos2 !== false || $sqlpos3 !== false) {
             return false;
         } else {
         	global $app_strings;
@@ -1832,18 +1832,18 @@ 
             if (empty($app_strings) or !isset($app_strings['ERR_MSSQL_DB_CONTEXT'])) {
                 //ignore the message from sql-server if $app_strings array is empty. This will happen
                 //only if connection if made before languge is set.
-                $GLOBALS['log']->debug("Ignoring this database message: " . $sqlmsg);
+                $GLOBALS['log']->debug("Ignoring this database message: ".$sqlmsg);
                 return false;
             }
             else {
                 $sqlpos = strpos($sqlmsg, $app_strings['ERR_MSSQL_DB_CONTEXT']);
-                if ( $sqlpos !== false )
+                if ($sqlpos !== false)
                     return false;
             }
         }
 
-        if ( strlen($sqlmsg) > 2 ) {
-        	return "SQL Server error: " . $sqlmsg;
+        if (strlen($sqlmsg) > 2) {
+        	return "SQL Server error: ".$sqlmsg;
         }
 
         return false;
@@ -1864,7 +1864,7 @@ 
      */
     public function validateQuery($query)
     {
-        if(!$this->isSelect($query)) {
+        if (!$this->isSelect($query)) {
             return false;
         }
         $this->query("SET SHOWPLAN_TEXT ON");
@@ -1888,7 +1888,7 @@ 
 
         // Flag if there are odd number of single quotes, just continue without trying to append N
         if ((substr_count($sql, "'") & 1)) {
-            $GLOBALS['log']->error("SQL statement[" . $sql . "] has odd number of single quotes.");
+            $GLOBALS['log']->error("SQL statement[".$sql."] has odd number of single quotes.");
             return $sql;
         }
 
@@ -1918,7 +1918,7 @@ 
                 // We are assuming that all nvarchar columns are no more than 200 characters in length
                 // One problem we face is the image column type in reports which cannot accept nvarchar data
                 if (!empty($value) && !is_numeric(trim(str_replace(array("'", ","), "", $value))) && !preg_match('/^\'[\,]\'$/', $value)) {
-                    $replace[$value] = 'N' . trim($value, "N");
+                    $replace[$value] = 'N'.trim($value, "N");
                 }
             }
         }
@@ -1929,7 +1929,7 @@ 
         if (!empty($pairs))
             $sql = str_replace(array_keys($pairs), $pairs, $sql);
 
-        if(strpos($sql, "<@#@#@PAIR@#@#@>"))
+        if (strpos($sql, "<@#@#@PAIR@#@#@>"))
             $sql = str_replace(array('<@#@#@PAIR@#@#@>'), array("''"), $sql);
 
         return $sql;
@@ -1956,22 +1956,22 @@ 
     public function getFulltextQuery($field, $terms, $must_terms = array(), $exclude_terms = array())
     {
         $condition = $or_condition = array();
-        foreach($must_terms as $term) {
+        foreach ($must_terms as $term) {
             $condition[] = $this->quoteTerm($term);
         }
 
-        foreach($terms as $term) {
+        foreach ($terms as $term) {
             $or_condition[] = $this->quoteTerm($term);
         }
 
-        if(!empty($or_condition)) {
+        if (!empty($or_condition)) {
             $condition[] = "(".join(" | ", $or_condition).")";
         }
 
-        foreach($exclude_terms as $term) {
+        foreach ($exclude_terms as $term) {
             $condition[] = " NOT ".$this->quoteTerm($term);
         }
-        $condition = $this->quoted(join(" AND ",$condition));
+        $condition = $this->quoted(join(" AND ", $condition));
         return "CONTAINS($field, $condition)";
     }
 
@@ -2060,7 +2060,7 @@ 
     public function isDatabaseNameValid($name)
     {
         // No funny chars, does not begin with number
-        return preg_match('/^[0-9#@]+|[\"\'\*\/\\?\:\\<\>\-\ \&\!\(\)\[\]\{\}\;\,\.\`\~\|\\\\]+/', $name)==0;
+        return preg_match('/^[0-9#@]+|[\"\'\*\/\\?\:\\<\>\-\ \&\!\(\)\[\]\{\}\;\,\.\`\~\|\\\\]+/', $name) == 0;
     }
 
     public function installConfig()

include/database/MysqlManager.php

Indentation +1344 added lines, -1344 removed lines

@@ -96,368 +96,368 @@ 
  */
 class MysqlManager extends DBManager
 {
-	/**
-	 * @see DBManager::$dbType
-	 */
-	public $dbType = 'mysql';
-	public $variant = 'mysql';
-	public $dbName = 'MySQL';
-	public $label = 'LBL_MYSQL';
-
-	protected $maxNameLengths = array(
-		'table' => 64,
-		'column' => 64,
-		'index' => 64,
-		'alias' => 256
-	);
-
-	protected $type_map = array(
-			'int'      => 'int',
-			'double'   => 'double',
-			'float'    => 'float',
-			'uint'     => 'int unsigned',
-			'ulong'    => 'bigint unsigned',
-			'long'     => 'bigint',
-			'short'    => 'smallint',
-			'varchar'  => 'varchar',
-			'text'     => 'text',
-			'longtext' => 'longtext',
-			'date'     => 'date',
-			'enum'     => 'varchar',
-			'relate'   => 'varchar',
-			'multienum'=> 'text',
-			'html'     => 'text',
-			'longhtml' => 'longtext',
-			'datetime' => 'datetime',
-			'datetimecombo' => 'datetime',
-			'time'     => 'time',
-			'bool'     => 'bool',
-			'tinyint'  => 'tinyint',
-			'char'     => 'char',
-			'blob'     => 'blob',
-			'longblob' => 'longblob',
-			'currency' => 'decimal(26,6)',
-			'decimal'  => 'decimal',
-			'decimal2' => 'decimal',
-			'id'       => 'char(36)',
-			'url'      => 'varchar',
-			'encrypt'  => 'varchar',
-			'file'     => 'varchar',
-			'decimal_tpl' => 'decimal(%d, %d)',
-
-	);
-
-	protected $capabilities = array(
-		"affected_rows" => true,
-		"select_rows" => true,
-		"inline_keys" => true,
-		"create_user" => true,
-		"fulltext" => true,
-	    "collation" => true,
-	    "create_db" => true,
-	    "disable_keys" => true,
-	);
-
-	/**
-	 * Parses and runs queries
-	 *
-	 * @param  string   $sql        SQL Statement to execute
-	 * @param  bool     $dieOnError True if we want to call die if the query returns errors
-	 * @param  string   $msg        Message to log if error occurs
-	 * @param  bool     $suppress   Flag to suppress all error output unless in debug logging mode.
-	 * @param  bool     $keepResult True if we want to push this result into the $lastResult array.
-	 * @return resource result set
-	 */
-	public function query($sql, $dieOnError = false, $msg = '', $suppress = false, $keepResult = false)
-	{
-		if(is_array($sql)) {
-			return $this->queryArray($sql, $dieOnError, $msg, $suppress);
-		}
-
-		parent::countQuery($sql);
-		$GLOBALS['log']->info('Query:' . $sql);
-		$this->checkConnection();
-		$this->query_time = microtime(true);
-		$this->lastsql = $sql;
-		$result = $suppress?@mysql_query($sql, $this->database):mysql_query($sql, $this->database);
-
-		$this->query_time = microtime(true) - $this->query_time;
-		$GLOBALS['log']->info('Query Execution Time:'.$this->query_time);
-
-
-		if($keepResult)
-			$this->lastResult = $result;
-
-		$this->checkError($msg.' Query Failed:' . $sql . '::', $dieOnError);
-		return $result;
-	}
+    /**
+     * @see DBManager::$dbType
+     */
+    public $dbType = 'mysql';
+    public $variant = 'mysql';
+    public $dbName = 'MySQL';
+    public $label = 'LBL_MYSQL';
+
+    protected $maxNameLengths = array(
+        'table' => 64,
+        'column' => 64,
+        'index' => 64,
+        'alias' => 256
+    );
+
+    protected $type_map = array(
+            'int'      => 'int',
+            'double'   => 'double',
+            'float'    => 'float',
+            'uint'     => 'int unsigned',
+            'ulong'    => 'bigint unsigned',
+            'long'     => 'bigint',
+            'short'    => 'smallint',
+            'varchar'  => 'varchar',
+            'text'     => 'text',
+            'longtext' => 'longtext',
+            'date'     => 'date',
+            'enum'     => 'varchar',
+            'relate'   => 'varchar',
+            'multienum'=> 'text',
+            'html'     => 'text',
+            'longhtml' => 'longtext',
+            'datetime' => 'datetime',
+            'datetimecombo' => 'datetime',
+            'time'     => 'time',
+            'bool'     => 'bool',
+            'tinyint'  => 'tinyint',
+            'char'     => 'char',
+            'blob'     => 'blob',
+            'longblob' => 'longblob',
+            'currency' => 'decimal(26,6)',
+            'decimal'  => 'decimal',
+            'decimal2' => 'decimal',
+            'id'       => 'char(36)',
+            'url'      => 'varchar',
+            'encrypt'  => 'varchar',
+            'file'     => 'varchar',
+            'decimal_tpl' => 'decimal(%d, %d)',
+
+    );
+
+    protected $capabilities = array(
+        "affected_rows" => true,
+        "select_rows" => true,
+        "inline_keys" => true,
+        "create_user" => true,
+        "fulltext" => true,
+        "collation" => true,
+        "create_db" => true,
+        "disable_keys" => true,
+    );
+
+    /**
+     * Parses and runs queries
+     *
+     * @param  string   $sql        SQL Statement to execute
+     * @param  bool     $dieOnError True if we want to call die if the query returns errors
+     * @param  string   $msg        Message to log if error occurs
+     * @param  bool     $suppress   Flag to suppress all error output unless in debug logging mode.
+     * @param  bool     $keepResult True if we want to push this result into the $lastResult array.
+     * @return resource result set
+     */
+    public function query($sql, $dieOnError = false, $msg = '', $suppress = false, $keepResult = false)
+    {
+        if(is_array($sql)) {
+            return $this->queryArray($sql, $dieOnError, $msg, $suppress);
+        }
+
+        parent::countQuery($sql);
+        $GLOBALS['log']->info('Query:' . $sql);
+        $this->checkConnection();
+        $this->query_time = microtime(true);
+        $this->lastsql = $sql;
+        $result = $suppress?@mysql_query($sql, $this->database):mysql_query($sql, $this->database);
+
+        $this->query_time = microtime(true) - $this->query_time;
+        $GLOBALS['log']->info('Query Execution Time:'.$this->query_time);
+
+
+        if($keepResult)
+            $this->lastResult = $result;
+
+        $this->checkError($msg.' Query Failed:' . $sql . '::', $dieOnError);
+        return $result;
+    }
 
     /**
      * Returns the number of rows affected by the last query
      * @param $result
      * @return int
      */
-	public function getAffectedRowCount($result)
-	{
-		return mysql_affected_rows($this->getDatabase());
-	}
-
-	/**
-	 * Returns the number of rows returned by the result
-	 *
-	 * This function can't be reliably implemented on most DB, do not use it.
-	 * @abstract
-	 * @deprecated
-	 * @param  resource $result
-	 * @return int
-	 */
-	public function getRowCount($result)
-	{
-	    return mysql_num_rows($result);
-	}
-
-	/**
-	 * Disconnects from the database
-	 *
-	 * Also handles any cleanup needed
-	 */
-	public function disconnect()
-	{
-		$GLOBALS['log']->debug('Calling MySQL::disconnect()');
-		if(!empty($this->database)){
-			$this->freeResult();
-			mysql_close($this->database);
-			$this->database = null;
-		}
-	}
-
-	/**
-	 * @see DBManager::freeDbResult()
-	 */
-	protected function freeDbResult($dbResult)
-	{
-		if(!empty($dbResult))
-			mysql_free_result($dbResult);
-	}
-
-
-	/**
-	 * @abstract
-	 * Check if query has LIMIT clause
-	 * Relevant for now only for Mysql
-	 * @param string $sql
-	 * @return bool
-	 */
-	protected function hasLimit($sql)
-	{
-	    return stripos($sql, " limit ") !== false;
-	}
-
-	/**
-	 * @see DBManager::limitQuery()
-	 */
-	public function limitQuery($sql, $start, $count, $dieOnError = false, $msg = '', $execute = true)
-	{
+    public function getAffectedRowCount($result)
+    {
+        return mysql_affected_rows($this->getDatabase());
+    }
+
+    /**
+     * Returns the number of rows returned by the result
+     *
+     * This function can't be reliably implemented on most DB, do not use it.
+     * @abstract
+     * @deprecated
+     * @param  resource $result
+     * @return int
+     */
+    public function getRowCount($result)
+    {
+        return mysql_num_rows($result);
+    }
+
+    /**
+     * Disconnects from the database
+     *
+     * Also handles any cleanup needed
+     */
+    public function disconnect()
+    {
+        $GLOBALS['log']->debug('Calling MySQL::disconnect()');
+        if(!empty($this->database)){
+            $this->freeResult();
+            mysql_close($this->database);
+            $this->database = null;
+        }
+    }
+
+    /**
+     * @see DBManager::freeDbResult()
+     */
+    protected function freeDbResult($dbResult)
+    {
+        if(!empty($dbResult))
+            mysql_free_result($dbResult);
+    }
+
+
+    /**
+     * @abstract
+     * Check if query has LIMIT clause
+     * Relevant for now only for Mysql
+     * @param string $sql
+     * @return bool
+     */
+    protected function hasLimit($sql)
+    {
+        return stripos($sql, " limit ") !== false;
+    }
+
+    /**
+     * @see DBManager::limitQuery()
+     */
+    public function limitQuery($sql, $start, $count, $dieOnError = false, $msg = '', $execute = true)
+    {
         $start = (int)$start;
         $count = (int)$count;
-	    if ($start < 0)
-			$start = 0;
-		$GLOBALS['log']->debug('Limit Query:' . $sql. ' Start: ' .$start . ' count: ' . $count);
-
-	    $sql = "$sql LIMIT $start,$count";
-		$this->lastsql = $sql;
-
-		if(!empty($GLOBALS['sugar_config']['check_query'])){
-			$this->checkQuery($sql);
-		}
-		if(!$execute) {
-			return $sql;
-		}
-
-		return $this->query($sql, $dieOnError, $msg);
-	}
-
-
-	/**
-	 * @see DBManager::checkQuery()
-	 */
-	protected function checkQuery($sql, $object_name = false)
-	{
-		$result   = $this->query('EXPLAIN ' . $sql);
-		$badQuery = array();
-		while ($row = $this->fetchByAssoc($result)) {
-			if (empty($row['table']))
-				continue;
-			$badQuery[$row['table']] = '';
-			if (strtoupper($row['type']) == 'ALL')
-				$badQuery[$row['table']]  .=  ' Full Table Scan;';
-			if (empty($row['key']))
-				$badQuery[$row['table']] .= ' No Index Key Used;';
-			if (!empty($row['Extra']) && substr_count($row['Extra'], 'Using filesort') > 0)
-				$badQuery[$row['table']] .= ' Using FileSort;';
-			if (!empty($row['Extra']) && substr_count($row['Extra'], 'Using temporary') > 0)
-				$badQuery[$row['table']] .= ' Using Temporary Table;';
-		}
-
-		if ( empty($badQuery) )
-			return true;
-
-		foreach($badQuery as $table=>$data ){
-			if(!empty($data)){
-				$warning = ' Table:' . $table . ' Data:' . $data;
-				if(!empty($GLOBALS['sugar_config']['check_query_log'])){
-					$GLOBALS['log']->fatal($sql);
-					$GLOBALS['log']->fatal('CHECK QUERY:' .$warning);
-				}
-				else{
-					$GLOBALS['log']->warn('CHECK QUERY:' .$warning);
-				}
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * @see DBManager::get_columns()
-	 */
-	public function get_columns($tablename)
-	{
-		//find all unique indexes and primary keys.
-		$result = $this->query("DESCRIBE $tablename");
-
-		$columns = array();
-		while (($row=$this->fetchByAssoc($result)) !=null) {
-			$name = strtolower($row['Field']);
-			$columns[$name]['name']=$name;
-			$matches = array();
-			preg_match_all('/(\w+)(?:\(([0-9]+,?[0-9]*)\)|)( unsigned)?/i', $row['Type'], $matches);
-			$columns[$name]['type']=strtolower($matches[1][0]);
-			if ( isset($matches[2][0]) && in_array(strtolower($matches[1][0]),array('varchar','char','varchar2','int','decimal','float')) )
-				$columns[$name]['len']=strtolower($matches[2][0]);
-			if ( stristr($row['Extra'],'auto_increment') )
-				$columns[$name]['auto_increment'] = '1';
-			if ($row['Null'] == 'NO' && !stristr($row['Key'],'PRI'))
-				$columns[$name]['required'] = 'true';
-			if (!empty($row['Default']) )
-				$columns[$name]['default'] = $row['Default'];
-		}
-		return $columns;
-	}
-
-	/**
-	 * @see DBManager::getFieldsArray()
-	 */
-	public function getFieldsArray($result, $make_lower_case=false)
-	{
-		$field_array = array();
-
-		if(empty($result))
-			return 0;
-
-		$fields = mysql_num_fields($result);
-		for ($i=0; $i < $fields; $i++) {
-			$meta = mysql_fetch_field($result, $i);
-			if (!$meta)
-				return array();
-
-			if($make_lower_case == true)
-				$meta->name = strtolower($meta->name);
-
-			$field_array[] = $meta->name;
-		}
-
-		return $field_array;
-	}
-
-	/**
-	 * @see DBManager::fetchRow()
-	 */
-	public function fetchRow($result)
-	{
-		if (empty($result))	return false;
-
-		return mysql_fetch_assoc($result);
-	}
-
-	/**
-	 * @see DBManager::getTablesArray()
-	 */
-	public function getTablesArray()
-	{
-		$this->log->debug('Fetching table list');
-
-		if ($this->getDatabase()) {
-			$tables = array();
-			$r = $this->query('SHOW TABLES');
-			if (!empty($r)) {
-				while ($a = $this->fetchByAssoc($r)) {
-					$row = array_values($a);
-					$tables[]=$row[0];
-				}
-				return $tables;
-			}
-		}
-
-		return false; // no database available
-	}
-
-	/**
-	 * @see DBManager::version()
-	 */
-	public function version()
-	{
-		return $this->getOne("SELECT version() version");
-	}
-
-	/**
-	 * @see DBManager::tableExists()
-	 */
-	public function tableExists($tableName)
-	{
-		$this->log->info("tableExists: $tableName");
-
-		if ($this->getDatabase()) {
-			$result = $this->query("SHOW TABLES LIKE ".$this->quoted($tableName));
-			if(empty($result)) return false;
-			$row = $this->fetchByAssoc($result);
-			return !empty($row);
-		}
-
-		return false;
-	}
-
-	/**
-	 * Get tables like expression
-	 * @param $like string
-	 * @return array
-	 */
-	public function tablesLike($like)
-	{
-		if ($this->getDatabase()) {
-			$tables = array();
-			$r = $this->query('SHOW TABLES LIKE '.$this->quoted($like));
-			if (!empty($r)) {
-				while ($a = $this->fetchByAssoc($r)) {
-					$row = array_values($a);
-					$tables[]=$row[0];
-				}
-				return $tables;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * @see DBManager::quote()
-	 */
-	public function quote($string)
-	{
-		if(is_array($string)) {
-			return $this->arrayQuote($string);
-		}
-		return mysql_real_escape_string($this->quoteInternal($string), $this->getDatabase());
-	}
+        if ($start < 0)
+            $start = 0;
+        $GLOBALS['log']->debug('Limit Query:' . $sql. ' Start: ' .$start . ' count: ' . $count);
+
+        $sql = "$sql LIMIT $start,$count";
+        $this->lastsql = $sql;
+
+        if(!empty($GLOBALS['sugar_config']['check_query'])){
+            $this->checkQuery($sql);
+        }
+        if(!$execute) {
+            return $sql;
+        }
+
+        return $this->query($sql, $dieOnError, $msg);
+    }
+
+
+    /**
+     * @see DBManager::checkQuery()
+     */
+    protected function checkQuery($sql, $object_name = false)
+    {
+        $result   = $this->query('EXPLAIN ' . $sql);
+        $badQuery = array();
+        while ($row = $this->fetchByAssoc($result)) {
+            if (empty($row['table']))
+                continue;
+            $badQuery[$row['table']] = '';
+            if (strtoupper($row['type']) == 'ALL')
+                $badQuery[$row['table']]  .=  ' Full Table Scan;';
+            if (empty($row['key']))
+                $badQuery[$row['table']] .= ' No Index Key Used;';
+            if (!empty($row['Extra']) && substr_count($row['Extra'], 'Using filesort') > 0)
+                $badQuery[$row['table']] .= ' Using FileSort;';
+            if (!empty($row['Extra']) && substr_count($row['Extra'], 'Using temporary') > 0)
+                $badQuery[$row['table']] .= ' Using Temporary Table;';
+        }
+
+        if ( empty($badQuery) )
+            return true;
+
+        foreach($badQuery as $table=>$data ){
+            if(!empty($data)){
+                $warning = ' Table:' . $table . ' Data:' . $data;
+                if(!empty($GLOBALS['sugar_config']['check_query_log'])){
+                    $GLOBALS['log']->fatal($sql);
+                    $GLOBALS['log']->fatal('CHECK QUERY:' .$warning);
+                }
+                else{
+                    $GLOBALS['log']->warn('CHECK QUERY:' .$warning);
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @see DBManager::get_columns()
+     */
+    public function get_columns($tablename)
+    {
+        //find all unique indexes and primary keys.
+        $result = $this->query("DESCRIBE $tablename");
+
+        $columns = array();
+        while (($row=$this->fetchByAssoc($result)) !=null) {
+            $name = strtolower($row['Field']);
+            $columns[$name]['name']=$name;
+            $matches = array();
+            preg_match_all('/(\w+)(?:\(([0-9]+,?[0-9]*)\)|)( unsigned)?/i', $row['Type'], $matches);
+            $columns[$name]['type']=strtolower($matches[1][0]);
+            if ( isset($matches[2][0]) && in_array(strtolower($matches[1][0]),array('varchar','char','varchar2','int','decimal','float')) )
+                $columns[$name]['len']=strtolower($matches[2][0]);
+            if ( stristr($row['Extra'],'auto_increment') )
+                $columns[$name]['auto_increment'] = '1';
+            if ($row['Null'] == 'NO' && !stristr($row['Key'],'PRI'))
+                $columns[$name]['required'] = 'true';
+            if (!empty($row['Default']) )
+                $columns[$name]['default'] = $row['Default'];
+        }
+        return $columns;
+    }
+
+    /**
+     * @see DBManager::getFieldsArray()
+     */
+    public function getFieldsArray($result, $make_lower_case=false)
+    {
+        $field_array = array();
+
+        if(empty($result))
+            return 0;
+
+        $fields = mysql_num_fields($result);
+        for ($i=0; $i < $fields; $i++) {
+            $meta = mysql_fetch_field($result, $i);
+            if (!$meta)
+                return array();
+
+            if($make_lower_case == true)
+                $meta->name = strtolower($meta->name);
+
+            $field_array[] = $meta->name;
+        }
+
+        return $field_array;
+    }
+
+    /**
+     * @see DBManager::fetchRow()
+     */
+    public function fetchRow($result)
+    {
+        if (empty($result))	return false;
+
+        return mysql_fetch_assoc($result);
+    }
+
+    /**
+     * @see DBManager::getTablesArray()
+     */
+    public function getTablesArray()
+    {
+        $this->log->debug('Fetching table list');
+
+        if ($this->getDatabase()) {
+            $tables = array();
+            $r = $this->query('SHOW TABLES');
+            if (!empty($r)) {
+                while ($a = $this->fetchByAssoc($r)) {
+                    $row = array_values($a);
+                    $tables[]=$row[0];
+                }
+                return $tables;
+            }
+        }
+
+        return false; // no database available
+    }
+
+    /**
+     * @see DBManager::version()
+     */
+    public function version()
+    {
+        return $this->getOne("SELECT version() version");
+    }
+
+    /**
+     * @see DBManager::tableExists()
+     */
+    public function tableExists($tableName)
+    {
+        $this->log->info("tableExists: $tableName");
+
+        if ($this->getDatabase()) {
+            $result = $this->query("SHOW TABLES LIKE ".$this->quoted($tableName));
+            if(empty($result)) return false;
+            $row = $this->fetchByAssoc($result);
+            return !empty($row);
+        }
+
+        return false;
+    }
+
+    /**
+     * Get tables like expression
+     * @param $like string
+     * @return array
+     */
+    public function tablesLike($like)
+    {
+        if ($this->getDatabase()) {
+            $tables = array();
+            $r = $this->query('SHOW TABLES LIKE '.$this->quoted($like));
+            if (!empty($r)) {
+                while ($a = $this->fetchByAssoc($r)) {
+                    $row = array_values($a);
+                    $tables[]=$row[0];
+                }
+                return $tables;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @see DBManager::quote()
+     */
+    public function quote($string)
+    {
+        if(is_array($string)) {
+            return $this->arrayQuote($string);
+        }
+        return mysql_real_escape_string($this->quoteInternal($string), $this->getDatabase());
+    }
 
     /**
      * @see DBManager::quoteIdentifier()
@@ -467,272 +467,272 @@ 
         return '`'.$string.'`';
     }
 
-	/**
-	 * @see DBManager::connect()
-	 */
-	public function connect(array $configOptions = null, $dieOnError = false)
-	{
-		global $sugar_config;
-
-		if(is_null($configOptions))
-			$configOptions = $sugar_config['dbconfig'];
-
-		if ($this->getOption('persistent')) {
-			$this->database = @mysql_pconnect(
-				$configOptions['db_host_name'],
-				$configOptions['db_user_name'],
-				$configOptions['db_password']
-				);
-		}
-
-		if (!$this->database) {
-			$this->database = mysql_connect(
-					$configOptions['db_host_name'],
-					$configOptions['db_user_name'],
-					$configOptions['db_password']
-					);
-			if(empty($this->database)) {
-				$GLOBALS['log']->fatal("Could not connect to server ".$configOptions['db_host_name']." as ".$configOptions['db_user_name'].":".mysql_error());
-				if($dieOnError) {
-					if(isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
-						sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
-					} else {
-						sugar_die("Could not connect to the database. Please refer to suitecrm.log for details.");
-					}
-				} else {
-					return false;
-				}
-			}
-			// Do not pass connection information because we have not connected yet
-			if($this->database  && $this->getOption('persistent')){
-				$_SESSION['administrator_error'] = "<b>Severe Performance Degradation: Persistent Database Connections "
-					. "not working.  Please set \$sugar_config['dbconfigoption']['persistent'] to false "
-					. "in your config.php file</b>";
-			}
-		}
-		if(!empty($configOptions['db_name']) && !@mysql_select_db($configOptions['db_name'])) {
-			$GLOBALS['log']->fatal( "Unable to select database {$configOptions['db_name']}: " . mysql_error($this->database));
-			if($dieOnError) {
-				sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
-			} else {
-				return false;
-			}
-		}
-
-		// cn: using direct calls to prevent this from spamming the Logs
-	    mysql_query("SET CHARACTER SET utf8", $this->database);
-	    $names = "SET NAMES 'utf8'";
-	    $collation = $this->getOption('collation');
-	    if(!empty($collation)) {
-	        $names .= " COLLATE '$collation'";
-		}
-	    mysql_query($names, $this->database);
-
-		if(!$this->checkError('Could Not Connect:', $dieOnError))
-			$GLOBALS['log']->info("connected to db");
-		$this->connectOptions = $configOptions;
-
-		$GLOBALS['log']->info("Connect:".$this->database);
-		return true;
-	}
-
-	/**
-	 * @see DBManager::repairTableParams()
-	 *
-	 * For MySQL, we can write the ALTER TABLE statement all in one line, which speeds things
-	 * up quite a bit. So here, we'll parse the returned SQL into a single ALTER TABLE command.
-	 */
-	public function repairTableParams($tablename, $fielddefs, $indices, $execute = true, $engine = null)
-	{
-		$sql = parent::repairTableParams($tablename,$fielddefs,$indices,false,$engine);
-
-		if ( $sql == '' )
-			return '';
-
-		if ( stristr($sql,'create table') )
-		{
-			if ($execute) {
-				$msg = "Error creating table: ".$tablename. ":";
-				$this->query($sql,true,$msg);
-			}
-			return $sql;
-		}
-
-		// first, parse out all the comments
-		$match = array();
-		preg_match_all('!/\*.*?\*/!is', $sql, $match);
-		$commentBlocks = $match[0];
-		$sql = preg_replace('!/\*.*?\*/!is','', $sql);
-
-		// now, we should only have alter table statements
-		// let's replace the 'alter table name' part with a comma
-		$sql = preg_replace("!alter table $tablename!is",', ', $sql);
-
-		// re-add it at the beginning
-		$sql = substr_replace($sql,'',strpos($sql,','),1);
-		$sql = str_replace(";","",$sql);
-		$sql = str_replace("\n","",$sql);
-		$sql = "ALTER TABLE $tablename $sql";
-
-		if ( $execute )
-			$this->query($sql,'Error with MySQL repair table');
-
-		// and re-add the comments at the beginning
-		$sql = implode("\n",$commentBlocks) . "\n". $sql . "\n";
-
-		return $sql;
-	}
-
-	/**
-	 * @see DBManager::convert()
-	 */
-	public function convert($string, $type, array $additional_parameters = array())
-	{
-		$all_parameters = $additional_parameters;
-		if(is_array($string)) {
-			$all_parameters = array_merge($string, $all_parameters);
-		} elseif (!is_null($string)) {
-			array_unshift($all_parameters, $string);
-		}
-		$all_strings = implode(',', $all_parameters);
-
-		switch (strtolower($type)) {
-			case 'today':
-				return "CURDATE()";
-			case 'left':
-				return "LEFT($all_strings)";
-			case 'date_format':
-				if(empty($additional_parameters)) {
-					return "DATE_FORMAT($string,'%Y-%m-%d')";
-				} else {
-					$format = $additional_parameters[0];
-					if($format[0] != "'") {
-						$format = $this->quoted($format);
-					}
-					return "DATE_FORMAT($string,$format)";
-				}
-			case 'ifnull':
-				if(empty($additional_parameters) && !strstr($all_strings, ",")) {
-					$all_strings .= ",''";
-				}
-				return "IFNULL($all_strings)";
-			case 'concat':
-				return "CONCAT($all_strings)";
-			case 'quarter':
-					return "QUARTER($string)";
-			case "length":
-					return "LENGTH($string)";
-			case 'month':
-					return "MONTH($string)";
-			case 'add_date':
-					return "DATE_ADD($string, INTERVAL {$additional_parameters[0]} {$additional_parameters[1]})";
-			case 'add_time':
-					return "DATE_ADD($string, INTERVAL + CONCAT({$additional_parameters[0]}, ':', {$additional_parameters[1]}) HOUR_MINUTE)";
+    /**
+     * @see DBManager::connect()
+     */
+    public function connect(array $configOptions = null, $dieOnError = false)
+    {
+        global $sugar_config;
+
+        if(is_null($configOptions))
+            $configOptions = $sugar_config['dbconfig'];
+
+        if ($this->getOption('persistent')) {
+            $this->database = @mysql_pconnect(
+                $configOptions['db_host_name'],
+                $configOptions['db_user_name'],
+                $configOptions['db_password']
+                );
+        }
+
+        if (!$this->database) {
+            $this->database = mysql_connect(
+                    $configOptions['db_host_name'],
+                    $configOptions['db_user_name'],
+                    $configOptions['db_password']
+                    );
+            if(empty($this->database)) {
+                $GLOBALS['log']->fatal("Could not connect to server ".$configOptions['db_host_name']." as ".$configOptions['db_user_name'].":".mysql_error());
+                if($dieOnError) {
+                    if(isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
+                        sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
+                    } else {
+                        sugar_die("Could not connect to the database. Please refer to suitecrm.log for details.");
+                    }
+                } else {
+                    return false;
+                }
+            }
+            // Do not pass connection information because we have not connected yet
+            if($this->database  && $this->getOption('persistent')){
+                $_SESSION['administrator_error'] = "<b>Severe Performance Degradation: Persistent Database Connections "
+                    . "not working.  Please set \$sugar_config['dbconfigoption']['persistent'] to false "
+                    . "in your config.php file</b>";
+            }
+        }
+        if(!empty($configOptions['db_name']) && !@mysql_select_db($configOptions['db_name'])) {
+            $GLOBALS['log']->fatal( "Unable to select database {$configOptions['db_name']}: " . mysql_error($this->database));
+            if($dieOnError) {
+                sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
+            } else {
+                return false;
+            }
+        }
+
+        // cn: using direct calls to prevent this from spamming the Logs
+        mysql_query("SET CHARACTER SET utf8", $this->database);
+        $names = "SET NAMES 'utf8'";
+        $collation = $this->getOption('collation');
+        if(!empty($collation)) {
+            $names .= " COLLATE '$collation'";
+        }
+        mysql_query($names, $this->database);
+
+        if(!$this->checkError('Could Not Connect:', $dieOnError))
+            $GLOBALS['log']->info("connected to db");
+        $this->connectOptions = $configOptions;
+
+        $GLOBALS['log']->info("Connect:".$this->database);
+        return true;
+    }
+
+    /**
+     * @see DBManager::repairTableParams()
+     *
+     * For MySQL, we can write the ALTER TABLE statement all in one line, which speeds things
+     * up quite a bit. So here, we'll parse the returned SQL into a single ALTER TABLE command.
+     */
+    public function repairTableParams($tablename, $fielddefs, $indices, $execute = true, $engine = null)
+    {
+        $sql = parent::repairTableParams($tablename,$fielddefs,$indices,false,$engine);
+
+        if ( $sql == '' )
+            return '';
+
+        if ( stristr($sql,'create table') )
+        {
+            if ($execute) {
+                $msg = "Error creating table: ".$tablename. ":";
+                $this->query($sql,true,$msg);
+            }
+            return $sql;
+        }
+
+        // first, parse out all the comments
+        $match = array();
+        preg_match_all('!/\*.*?\*/!is', $sql, $match);
+        $commentBlocks = $match[0];
+        $sql = preg_replace('!/\*.*?\*/!is','', $sql);
+
+        // now, we should only have alter table statements
+        // let's replace the 'alter table name' part with a comma
+        $sql = preg_replace("!alter table $tablename!is",', ', $sql);
+
+        // re-add it at the beginning
+        $sql = substr_replace($sql,'',strpos($sql,','),1);
+        $sql = str_replace(";","",$sql);
+        $sql = str_replace("\n","",$sql);
+        $sql = "ALTER TABLE $tablename $sql";
+
+        if ( $execute )
+            $this->query($sql,'Error with MySQL repair table');
+
+        // and re-add the comments at the beginning
+        $sql = implode("\n",$commentBlocks) . "\n". $sql . "\n";
+
+        return $sql;
+    }
+
+    /**
+     * @see DBManager::convert()
+     */
+    public function convert($string, $type, array $additional_parameters = array())
+    {
+        $all_parameters = $additional_parameters;
+        if(is_array($string)) {
+            $all_parameters = array_merge($string, $all_parameters);
+        } elseif (!is_null($string)) {
+            array_unshift($all_parameters, $string);
+        }
+        $all_strings = implode(',', $all_parameters);
+
+        switch (strtolower($type)) {
+            case 'today':
+                return "CURDATE()";
+            case 'left':
+                return "LEFT($all_strings)";
+            case 'date_format':
+                if(empty($additional_parameters)) {
+                    return "DATE_FORMAT($string,'%Y-%m-%d')";
+                } else {
+                    $format = $additional_parameters[0];
+                    if($format[0] != "'") {
+                        $format = $this->quoted($format);
+                    }
+                    return "DATE_FORMAT($string,$format)";
+                }
+            case 'ifnull':
+                if(empty($additional_parameters) && !strstr($all_strings, ",")) {
+                    $all_strings .= ",''";
+                }
+                return "IFNULL($all_strings)";
+            case 'concat':
+                return "CONCAT($all_strings)";
+            case 'quarter':
+                    return "QUARTER($string)";
+            case "length":
+                    return "LENGTH($string)";
+            case 'month':
+                    return "MONTH($string)";
+            case 'add_date':
+                    return "DATE_ADD($string, INTERVAL {$additional_parameters[0]} {$additional_parameters[1]})";
+            case 'add_time':
+                    return "DATE_ADD($string, INTERVAL + CONCAT({$additional_parameters[0]}, ':', {$additional_parameters[1]}) HOUR_MINUTE)";
             case 'add_tz_offset' :
                 $getUserUTCOffset = $GLOBALS['timedate']->getUserUTCOffset();
                 $operation = $getUserUTCOffset < 0 ? '-' : '+';
                 return $string . ' ' . $operation . ' INTERVAL ' . abs($getUserUTCOffset) . ' MINUTE';
             case 'avg':
                 return "avg($string)";
-		}
-
-		return $string;
-	}
-
-	/**
-	 * (non-PHPdoc)
-	 * @see DBManager::fromConvert()
-	 */
-	public function fromConvert($string, $type)
-	{
-		return $string;
-	}
-
-	/**
-	 * Returns the name of the engine to use or null if we are to use the default
-	 *
-	 * @param  object $bean SugarBean instance
-	 * @return string
-	 */
-	protected function getEngine($bean)
-	{
-		global $dictionary;
-		$engine = null;
-		if (isset($dictionary[$bean->getObjectName()]['engine'])) {
-			$engine = $dictionary[$bean->getObjectName()]['engine'];
-		}
-		return $engine;
-	}
-
-	/**
-	 * Returns true if the engine given is enabled in the backend
-	 *
-	 * @param  string $engine
-	 * @return bool
-	 */
-	protected function isEngineEnabled($engine)
-	{
-		if(!is_string($engine)) return false;
-
-		$engine = strtoupper($engine);
-
-		$r = $this->query("SHOW ENGINES");
-
-		while ( $row = $this->fetchByAssoc($r) )
-			if ( strtoupper($row['Engine']) == $engine )
-				return ($row['Support']=='YES' || $row['Support']=='DEFAULT');
-
-		return false;
-	}
-
-	/**
-	 * @see DBManager::createTableSQL()
-	 */
-	public function createTableSQL(SugarBean $bean)
-	{
-		$tablename = $bean->getTableName();
-		$fieldDefs = $bean->getFieldDefinitions();
-		$indices   = $bean->getIndices();
-		$engine    = $this->getEngine($bean);
-		return $this->createTableSQLParams($tablename, $fieldDefs, $indices, $engine);
-	}
-
-	/**
-	 * Generates sql for create table statement for a bean.
-	 *
-	 * @param  string $tablename
-	 * @param  array  $fieldDefs
-	 * @param  array  $indices
-	 * @param  string $engine optional, MySQL engine to use
-	 * @return string SQL Create Table statement
-	*/
-	public function createTableSQLParams($tablename, $fieldDefs, $indices, $engine = null)
-	{
-		if ( empty($engine) && isset($fieldDefs['engine']))
-			$engine = $fieldDefs['engine'];
-		if ( !$this->isEngineEnabled($engine) )
-			$engine = '';
-
-		$columns = $this->columnSQLRep($fieldDefs, false, $tablename);
-		if (empty($columns))
-			return false;
-
-		$keys = $this->keysSQL($indices);
-		if (!empty($keys))
-			$keys = ",$keys";
-
-		// cn: bug 9873 - module tables do not get created in utf8 with assoc collation
-		$collation = $this->getOption('collation');
-		if(empty($collation)) {
-		    $collation = 'utf8_general_ci';
-		}
-		$sql = "CREATE TABLE $tablename ($columns $keys) CHARACTER SET utf8 COLLATE $collation";
-
-		if (!empty($engine))
-			$sql.= " ENGINE=$engine";
-
-		return $sql;
-	}
+        }
+
+        return $string;
+    }
+
+    /**
+     * (non-PHPdoc)
+     * @see DBManager::fromConvert()
+     */
+    public function fromConvert($string, $type)
+    {
+        return $string;
+    }
+
+    /**
+     * Returns the name of the engine to use or null if we are to use the default
+     *
+     * @param  object $bean SugarBean instance
+     * @return string
+     */
+    protected function getEngine($bean)
+    {
+        global $dictionary;
+        $engine = null;
+        if (isset($dictionary[$bean->getObjectName()]['engine'])) {
+            $engine = $dictionary[$bean->getObjectName()]['engine'];
+        }
+        return $engine;
+    }
+
+    /**
+     * Returns true if the engine given is enabled in the backend
+     *
+     * @param  string $engine
+     * @return bool
+     */
+    protected function isEngineEnabled($engine)
+    {
+        if(!is_string($engine)) return false;
+
+        $engine = strtoupper($engine);
+
+        $r = $this->query("SHOW ENGINES");
+
+        while ( $row = $this->fetchByAssoc($r) )
+            if ( strtoupper($row['Engine']) == $engine )
+                return ($row['Support']=='YES' || $row['Support']=='DEFAULT');
+
+        return false;
+    }
+
+    /**
+     * @see DBManager::createTableSQL()
+     */
+    public function createTableSQL(SugarBean $bean)
+    {
+        $tablename = $bean->getTableName();
+        $fieldDefs = $bean->getFieldDefinitions();
+        $indices   = $bean->getIndices();
+        $engine    = $this->getEngine($bean);
+        return $this->createTableSQLParams($tablename, $fieldDefs, $indices, $engine);
+    }
+
+    /**
+     * Generates sql for create table statement for a bean.
+     *
+     * @param  string $tablename
+     * @param  array  $fieldDefs
+     * @param  array  $indices
+     * @param  string $engine optional, MySQL engine to use
+     * @return string SQL Create Table statement
+     */
+    public function createTableSQLParams($tablename, $fieldDefs, $indices, $engine = null)
+    {
+        if ( empty($engine) && isset($fieldDefs['engine']))
+            $engine = $fieldDefs['engine'];
+        if ( !$this->isEngineEnabled($engine) )
+            $engine = '';
+
+        $columns = $this->columnSQLRep($fieldDefs, false, $tablename);
+        if (empty($columns))
+            return false;
+
+        $keys = $this->keysSQL($indices);
+        if (!empty($keys))
+            $keys = ",$keys";
+
+        // cn: bug 9873 - module tables do not get created in utf8 with assoc collation
+        $collation = $this->getOption('collation');
+        if(empty($collation)) {
+            $collation = 'utf8_general_ci';
+        }
+        $sql = "CREATE TABLE $tablename ($columns $keys) CHARACTER SET utf8 COLLATE $collation";
+
+        if (!empty($engine))
+            $sql.= " ENGINE=$engine";
+
+        return $sql;
+    }
 
     /**
      * Does this type represent text (i.e., non-varchar) value?
@@ -744,745 +744,745 @@ 
         return in_array($type, array('blob','text','longblob', 'longtext'));
     }
 
-	/**
-	 * @see DBManager::oneColumnSQLRep()
-	 */
-	protected function oneColumnSQLRep($fieldDef, $ignoreRequired = false, $table = '', $return_as_array = false)
-	{
-		// always return as array for post-processing
-		$ref = parent::oneColumnSQLRep($fieldDef, $ignoreRequired, $table, true);
+    /**
+     * @see DBManager::oneColumnSQLRep()
+     */
+    protected function oneColumnSQLRep($fieldDef, $ignoreRequired = false, $table = '', $return_as_array = false)
+    {
+        // always return as array for post-processing
+        $ref = parent::oneColumnSQLRep($fieldDef, $ignoreRequired, $table, true);
 
-		if ( $ref['colType'] == 'int' && !empty($fieldDef['len']) ) {
-			$ref['colType'] .= "(".$fieldDef['len'].")";
-		}
+        if ( $ref['colType'] == 'int' && !empty($fieldDef['len']) ) {
+            $ref['colType'] .= "(".$fieldDef['len'].")";
+        }
 
-		// bug 22338 - don't set a default value on text or blob fields
-		if ( isset($ref['default']) &&
+        // bug 22338 - don't set a default value on text or blob fields
+        if ( isset($ref['default']) &&
             in_array($ref['colBaseType'], array('text', 'blob', 'longtext', 'longblob')))
-			    $ref['default'] = '';
-
-		if ( $return_as_array )
-			return $ref;
-		else
-			return "{$ref['name']} {$ref['colType']} {$ref['default']} {$ref['required']} {$ref['auto_increment']}";
-	}
-
-	/**
-	 * @see DBManager::changeColumnSQL()
-	 */
-	protected function changeColumnSQL($tablename, $fieldDefs, $action, $ignoreRequired = false)
-	{
-		$columns = array();
-		if ($this->isFieldArray($fieldDefs)){
-			foreach ($fieldDefs as $def){
-				if ($action == 'drop')
-					$columns[] = $def['name'];
-				else
-					$columns[] = $this->oneColumnSQLRep($def, $ignoreRequired);
-			}
-		} else {
-			if ($action == 'drop')
-				$columns[] = $fieldDefs['name'];
-		else
-			$columns[] = $this->oneColumnSQLRep($fieldDefs);
-		}
-
-		return "ALTER TABLE $tablename $action COLUMN ".implode(",$action column ", $columns);
-	}
-
-	/**
-	 * Generates SQL for key specification inside CREATE TABLE statement
-	 *
-	 * The passes array is an array of field definitions or a field definition
-	 * itself. The keys generated will be either primary, foreign, unique, index
-	 * or none at all depending on the setting of the "key" parameter of a field definition
-	 *
-	 * @param  array  $indices
-	 * @param  bool   $alter_table
-	 * @param  string $alter_action
-	 * @return string SQL Statement
-	 */
-	protected function keysSQL($indices, $alter_table = false, $alter_action = '')
-	{
-	// check if the passed value is an array of fields.
-	// if not, convert it into an array
-	if (!$this->isFieldArray($indices))
-		$indices[] = $indices;
-
-	$columns = array();
-	foreach ($indices as $index) {
-		if(!empty($index['db']) && $index['db'] != $this->dbType)
-			continue;
-		if (isset($index['source']) && $index['source'] != 'db')
-			continue;
-
-		$type = $index['type'];
-		$name = $index['name'];
-
-		if (is_array($index['fields']))
-			$fields = implode(", ", $index['fields']);
-		else
-			$fields = $index['fields'];
-
-		switch ($type) {
-		case 'unique':
-			$columns[] = " UNIQUE $name ($fields)";
-			break;
-		case 'primary':
-			$columns[] = " PRIMARY KEY ($fields)";
-			break;
-		case 'index':
-		case 'foreign':
-		case 'clustered':
-		case 'alternate_key':
-			/**
-				* @todo here it is assumed that the primary key of the foreign
-				* table will always be named 'id'. It must be noted though
-				* that this can easily be fixed by referring to db dictionary
-				* to find the correct primary field name
-				*/
-			if ( $alter_table )
-				$columns[] = " INDEX $name ($fields)";
-			else
-				$columns[] = " KEY $name ($fields)";
-			break;
-		case 'fulltext':
-			if ($this->full_text_indexing_installed())
-				$columns[] = " FULLTEXT ($fields)";
-			else
-				$GLOBALS['log']->debug('MYISAM engine is not available/enabled, full-text indexes will be skipped. Skipping:',$name);
-			break;
-		}
-	}
-	$columns = implode(", $alter_action ", $columns);
-	if(!empty($alter_action)){
-		$columns = $alter_action . ' '. $columns;
-	}
-	return $columns;
-	}
-
-	/**
-	 * @see DBManager::setAutoIncrement()
-	 */
-	protected function setAutoIncrement($table, $field_name)
-	{
-		return "auto_increment";
-	}
-
-	/**
-	 * Sets the next auto-increment value of a column to a specific value.
-	 *
-	 * @param  string $table tablename
-	 * @param  string $field_name
-	 */
-	public function setAutoIncrementStart($table, $field_name, $start_value)
-	{
-		$start_value = (int)$start_value;
-		return $this->query( "ALTER TABLE $table AUTO_INCREMENT = $start_value;");
-	}
-
-	/**
-	 * Returns the next value for an auto increment
-	 *
-	 * @param  string $table tablename
-	 * @param  string $field_name
-	 * @return string
-	 */
-	public function getAutoIncrement($table, $field_name)
-	{
-		$result = $this->query("SHOW TABLE STATUS LIKE '$table'");
-		$row = $this->fetchByAssoc($result);
-		if (!empty($row['Auto_increment']))
-			return $row['Auto_increment'];
-
-		return "";
-	}
-
-	/**
-	 * @see DBManager::get_indices()
-	 */
-	public function get_indices($tablename)
-	{
-		//find all unique indexes and primary keys.
-		$result = $this->query("SHOW INDEX FROM $tablename");
-
-		$indices = array();
-		while (($row=$this->fetchByAssoc($result)) !=null) {
-			$index_type='index';
-			if ($row['Key_name'] =='PRIMARY') {
-				$index_type='primary';
-			}
-			elseif ( $row['Non_unique'] == '0' ) {
-				$index_type='unique';
-			}
-			$name = strtolower($row['Key_name']);
-			$indices[$name]['name']=$name;
-			$indices[$name]['type']=$index_type;
-			$indices[$name]['fields'][]=strtolower($row['Column_name']);
-		}
-		return $indices;
-	}
-
-	/**
-	 * @see DBManager::add_drop_constraint()
-	 */
-	public function add_drop_constraint($table, $definition, $drop = false)
-	{
-		$type         = $definition['type'];
-		$fields       = implode(',',$definition['fields']);
-		$name         = $definition['name'];
-		$sql          = '';
-
-		switch ($type){
-		// generic indices
-		case 'index':
-		case 'alternate_key':
-		case 'clustered':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP INDEX {$name} ";
-			else
-				$sql = "ALTER TABLE {$table} ADD INDEX {$name} ({$fields})";
-			break;
-		// constraints as indices
-		case 'unique':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP INDEX $name";
-			else
-				$sql = "ALTER TABLE {$table} ADD CONSTRAINT UNIQUE {$name} ({$fields})";
-			break;
-		case 'primary':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP PRIMARY KEY";
-			else
-				$sql = "ALTER TABLE {$table} ADD CONSTRAINT PRIMARY KEY ({$fields})";
-			break;
-		case 'foreign':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP FOREIGN KEY ({$fields})";
-			else
-				$sql = "ALTER TABLE {$table} ADD CONSTRAINT FOREIGN KEY {$name} ({$fields}) REFERENCES {$definition['foreignTable']}({$definition['foreignField']})";
-			break;
-		}
-		return $sql;
-	}
-
-	/**
-	 * Runs a query and returns a single row
-	 *
-	 * @param  string   $sql        SQL Statement to execute
-	 * @param  bool     $dieOnError True if we want to call die if the query returns errors
-	 * @param  string   $msg        Message to log if error occurs
-	 * @param  bool     $suppress   Message to log if error occurs
-	 * @return array    single row from the query
-	 */
-	public function fetchOne($sql, $dieOnError = false, $msg = '', $suppress = false)
-	{
-		if(stripos($sql, ' LIMIT ') === false) {
-			// little optimization to just fetch one row
-			$sql .= " LIMIT 0,1";
-		}
-		return parent::fetchOne($sql, $dieOnError, $msg, $suppress);
-	}
-
-	/**
-	 * @see DBManager::full_text_indexing_installed()
-	 */
-	public function full_text_indexing_installed($dbname = null)
-	{
-		return $this->isEngineEnabled('MyISAM');
-	}
-
-	/**
-	 * @see DBManager::massageFieldDef()
-	 */
-	public function massageFieldDef(&$fieldDef, $tablename)
-	{
-		parent::massageFieldDef($fieldDef,$tablename);
-
-		if ( isset($fieldDef['default']) &&
-			($fieldDef['dbType'] == 'text'
-				|| $fieldDef['dbType'] == 'blob'
-				|| $fieldDef['dbType'] == 'longtext'
-				|| $fieldDef['dbType'] == 'longblob' ))
-			unset($fieldDef['default']);
-		if ($fieldDef['dbType'] == 'uint')
-			$fieldDef['len'] = '10';
-		if ($fieldDef['dbType'] == 'ulong')
-			$fieldDef['len'] = '20';
-		if ($fieldDef['dbType'] == 'bool')
-			$fieldDef['type'] = 'tinyint';
-		if ($fieldDef['dbType'] == 'bool' && empty($fieldDef['default']) )
-			$fieldDef['default'] = '0';
-		if (($fieldDef['dbType'] == 'varchar' || $fieldDef['dbType'] == 'enum') && empty($fieldDef['len']) )
-			$fieldDef['len'] = '255';
-		if ($fieldDef['dbType'] == 'uint')
-			$fieldDef['len'] = '10';
-		if ($fieldDef['dbType'] == 'int' && empty($fieldDef['len']) )
-			$fieldDef['len'] = '11';
-
-		if($fieldDef['dbType'] == 'decimal') {
-			if(isset($fieldDef['len'])) {
-				if(strstr($fieldDef['len'], ",") === false) {
-					$fieldDef['len'] .= ",0";
-				}
-			} else {
-				$fieldDef['len']  = '10,0';
-			}
-		}
-	}
-
-	/**
-	 * Generates SQL for dropping a table.
-	 *
-	 * @param  string $name table name
-	 * @return string SQL statement
-	 */
-	public function dropTableNameSQL($name)
-	{
-		return "DROP TABLE IF EXISTS ".$name;
-	}
-
-	public function dropIndexes($tablename, $indexes, $execute = true)
-	{
-		$sql = array();
-		foreach ($indexes as $index) {
-			$name =$index['name'];
-			if($execute) {
-			unset(self::$index_descriptions[$tablename][$name]);
-			}
-			if ($index['type'] == 'primary') {
-				$sql[] = 'DROP PRIMARY KEY';
-			} else {
-				$sql[] = "DROP INDEX $name";
-			}
-		}
-		if (!empty($sql)) {
+                $ref['default'] = '';
+
+        if ( $return_as_array )
+            return $ref;
+        else
+            return "{$ref['name']} {$ref['colType']} {$ref['default']} {$ref['required']} {$ref['auto_increment']}";
+    }
+
+    /**
+     * @see DBManager::changeColumnSQL()
+     */
+    protected function changeColumnSQL($tablename, $fieldDefs, $action, $ignoreRequired = false)
+    {
+        $columns = array();
+        if ($this->isFieldArray($fieldDefs)){
+            foreach ($fieldDefs as $def){
+                if ($action == 'drop')
+                    $columns[] = $def['name'];
+                else
+                    $columns[] = $this->oneColumnSQLRep($def, $ignoreRequired);
+            }
+        } else {
+            if ($action == 'drop')
+                $columns[] = $fieldDefs['name'];
+        else
+            $columns[] = $this->oneColumnSQLRep($fieldDefs);
+        }
+
+        return "ALTER TABLE $tablename $action COLUMN ".implode(",$action column ", $columns);
+    }
+
+    /**
+     * Generates SQL for key specification inside CREATE TABLE statement
+     *
+     * The passes array is an array of field definitions or a field definition
+     * itself. The keys generated will be either primary, foreign, unique, index
+     * or none at all depending on the setting of the "key" parameter of a field definition
+     *
+     * @param  array  $indices
+     * @param  bool   $alter_table
+     * @param  string $alter_action
+     * @return string SQL Statement
+     */
+    protected function keysSQL($indices, $alter_table = false, $alter_action = '')
+    {
+    // check if the passed value is an array of fields.
+    // if not, convert it into an array
+    if (!$this->isFieldArray($indices))
+        $indices[] = $indices;
+
+    $columns = array();
+    foreach ($indices as $index) {
+        if(!empty($index['db']) && $index['db'] != $this->dbType)
+            continue;
+        if (isset($index['source']) && $index['source'] != 'db')
+            continue;
+
+        $type = $index['type'];
+        $name = $index['name'];
+
+        if (is_array($index['fields']))
+            $fields = implode(", ", $index['fields']);
+        else
+            $fields = $index['fields'];
+
+        switch ($type) {
+        case 'unique':
+            $columns[] = " UNIQUE $name ($fields)";
+            break;
+        case 'primary':
+            $columns[] = " PRIMARY KEY ($fields)";
+            break;
+        case 'index':
+        case 'foreign':
+        case 'clustered':
+        case 'alternate_key':
+            /**
+             * @todo here it is assumed that the primary key of the foreign
+             * table will always be named 'id'. It must be noted though
+             * that this can easily be fixed by referring to db dictionary
+             * to find the correct primary field name
+             */
+            if ( $alter_table )
+                $columns[] = " INDEX $name ($fields)";
+            else
+                $columns[] = " KEY $name ($fields)";
+            break;
+        case 'fulltext':
+            if ($this->full_text_indexing_installed())
+                $columns[] = " FULLTEXT ($fields)";
+            else
+                $GLOBALS['log']->debug('MYISAM engine is not available/enabled, full-text indexes will be skipped. Skipping:',$name);
+            break;
+        }
+    }
+    $columns = implode(", $alter_action ", $columns);
+    if(!empty($alter_action)){
+        $columns = $alter_action . ' '. $columns;
+    }
+    return $columns;
+    }
+
+    /**
+     * @see DBManager::setAutoIncrement()
+     */
+    protected function setAutoIncrement($table, $field_name)
+    {
+        return "auto_increment";
+    }
+
+    /**
+     * Sets the next auto-increment value of a column to a specific value.
+     *
+     * @param  string $table tablename
+     * @param  string $field_name
+     */
+    public function setAutoIncrementStart($table, $field_name, $start_value)
+    {
+        $start_value = (int)$start_value;
+        return $this->query( "ALTER TABLE $table AUTO_INCREMENT = $start_value;");
+    }
+
+    /**
+     * Returns the next value for an auto increment
+     *
+     * @param  string $table tablename
+     * @param  string $field_name
+     * @return string
+     */
+    public function getAutoIncrement($table, $field_name)
+    {
+        $result = $this->query("SHOW TABLE STATUS LIKE '$table'");
+        $row = $this->fetchByAssoc($result);
+        if (!empty($row['Auto_increment']))
+            return $row['Auto_increment'];
+
+        return "";
+    }
+
+    /**
+     * @see DBManager::get_indices()
+     */
+    public function get_indices($tablename)
+    {
+        //find all unique indexes and primary keys.
+        $result = $this->query("SHOW INDEX FROM $tablename");
+
+        $indices = array();
+        while (($row=$this->fetchByAssoc($result)) !=null) {
+            $index_type='index';
+            if ($row['Key_name'] =='PRIMARY') {
+                $index_type='primary';
+            }
+            elseif ( $row['Non_unique'] == '0' ) {
+                $index_type='unique';
+            }
+            $name = strtolower($row['Key_name']);
+            $indices[$name]['name']=$name;
+            $indices[$name]['type']=$index_type;
+            $indices[$name]['fields'][]=strtolower($row['Column_name']);
+        }
+        return $indices;
+    }
+
+    /**
+     * @see DBManager::add_drop_constraint()
+     */
+    public function add_drop_constraint($table, $definition, $drop = false)
+    {
+        $type         = $definition['type'];
+        $fields       = implode(',',$definition['fields']);
+        $name         = $definition['name'];
+        $sql          = '';
+
+        switch ($type){
+        // generic indices
+        case 'index':
+        case 'alternate_key':
+        case 'clustered':
+            if ($drop)
+                $sql = "ALTER TABLE {$table} DROP INDEX {$name} ";
+            else
+                $sql = "ALTER TABLE {$table} ADD INDEX {$name} ({$fields})";
+            break;
+        // constraints as indices
+        case 'unique':
+            if ($drop)
+                $sql = "ALTER TABLE {$table} DROP INDEX $name";
+            else
+                $sql = "ALTER TABLE {$table} ADD CONSTRAINT UNIQUE {$name} ({$fields})";
+            break;
+        case 'primary':
+            if ($drop)
+                $sql = "ALTER TABLE {$table} DROP PRIMARY KEY";
+            else
+                $sql = "ALTER TABLE {$table} ADD CONSTRAINT PRIMARY KEY ({$fields})";
+            break;
+        case 'foreign':
+            if ($drop)
+                $sql = "ALTER TABLE {$table} DROP FOREIGN KEY ({$fields})";
+            else
+                $sql = "ALTER TABLE {$table} ADD CONSTRAINT FOREIGN KEY {$name} ({$fields}) REFERENCES {$definition['foreignTable']}({$definition['foreignField']})";
+            break;
+        }
+        return $sql;
+    }
+
+    /**
+     * Runs a query and returns a single row
+     *
+     * @param  string   $sql        SQL Statement to execute
+     * @param  bool     $dieOnError True if we want to call die if the query returns errors
+     * @param  string   $msg        Message to log if error occurs
+     * @param  bool     $suppress   Message to log if error occurs
+     * @return array    single row from the query
+     */
+    public function fetchOne($sql, $dieOnError = false, $msg = '', $suppress = false)
+    {
+        if(stripos($sql, ' LIMIT ') === false) {
+            // little optimization to just fetch one row
+            $sql .= " LIMIT 0,1";
+        }
+        return parent::fetchOne($sql, $dieOnError, $msg, $suppress);
+    }
+
+    /**
+     * @see DBManager::full_text_indexing_installed()
+     */
+    public function full_text_indexing_installed($dbname = null)
+    {
+        return $this->isEngineEnabled('MyISAM');
+    }
+
+    /**
+     * @see DBManager::massageFieldDef()
+     */
+    public function massageFieldDef(&$fieldDef, $tablename)
+    {
+        parent::massageFieldDef($fieldDef,$tablename);
+
+        if ( isset($fieldDef['default']) &&
+            ($fieldDef['dbType'] == 'text'
+                || $fieldDef['dbType'] == 'blob'
+                || $fieldDef['dbType'] == 'longtext'
+                || $fieldDef['dbType'] == 'longblob' ))
+            unset($fieldDef['default']);
+        if ($fieldDef['dbType'] == 'uint')
+            $fieldDef['len'] = '10';
+        if ($fieldDef['dbType'] == 'ulong')
+            $fieldDef['len'] = '20';
+        if ($fieldDef['dbType'] == 'bool')
+            $fieldDef['type'] = 'tinyint';
+        if ($fieldDef['dbType'] == 'bool' && empty($fieldDef['default']) )
+            $fieldDef['default'] = '0';
+        if (($fieldDef['dbType'] == 'varchar' || $fieldDef['dbType'] == 'enum') && empty($fieldDef['len']) )
+            $fieldDef['len'] = '255';
+        if ($fieldDef['dbType'] == 'uint')
+            $fieldDef['len'] = '10';
+        if ($fieldDef['dbType'] == 'int' && empty($fieldDef['len']) )
+            $fieldDef['len'] = '11';
+
+        if($fieldDef['dbType'] == 'decimal') {
+            if(isset($fieldDef['len'])) {
+                if(strstr($fieldDef['len'], ",") === false) {
+                    $fieldDef['len'] .= ",0";
+                }
+            } else {
+                $fieldDef['len']  = '10,0';
+            }
+        }
+    }
+
+    /**
+     * Generates SQL for dropping a table.
+     *
+     * @param  string $name table name
+     * @return string SQL statement
+     */
+    public function dropTableNameSQL($name)
+    {
+        return "DROP TABLE IF EXISTS ".$name;
+    }
+
+    public function dropIndexes($tablename, $indexes, $execute = true)
+    {
+        $sql = array();
+        foreach ($indexes as $index) {
+            $name =$index['name'];
+            if($execute) {
+            unset(self::$index_descriptions[$tablename][$name]);
+            }
+            if ($index['type'] == 'primary') {
+                $sql[] = 'DROP PRIMARY KEY';
+            } else {
+                $sql[] = "DROP INDEX $name";
+            }
+        }
+        if (!empty($sql)) {
             $sql = "ALTER TABLE $tablename " . join(",", $sql) . ";";
-			if($execute)
-				$this->query($sql);
-		} else {
-			$sql = '';
-		}
-		return $sql;
-	}
-
-	/**
-	 * List of available collation settings
-	 * @return string
-	 */
-	public function getDefaultCollation()
-	{
-		return "utf8_general_ci";
-	}
-
-	/**
-	 * List of available collation settings
-	 * @return array
-	 */
-	public function getCollationList()
-	{
-		$q = "SHOW COLLATION LIKE 'utf8%'";
-		$r = $this->query($q);
-		$res = array();
-		while($a = $this->fetchByAssoc($r)) {
-			$res[] = $a['Collation'];
-		}
-		return $res;
-	}
-
-	/**
-	 * (non-PHPdoc)
-	 * @see DBManager::renameColumnSQL()
-	 */
-	public function renameColumnSQL($tablename, $column, $newname)
-	{
-		$field = $this->describeField($column, $tablename);
-		$field['name'] = $newname;
-		return "ALTER TABLE $tablename CHANGE COLUMN $column ".$this->oneColumnSQLRep($field);
-	}
-
-	public function emptyValue($type)
-	{
-		$ctype = $this->getColumnType($type);
-		if($ctype == "datetime") {
-			return $this->convert($this->quoted("0000-00-00 00:00:00"), "datetime");
-		}
-		if($ctype == "date") {
-			return $this->convert($this->quoted("0000-00-00"), "date");
-		}
-		if($ctype == "time") {
-			return $this->convert($this->quoted("00:00:00"), "time");
-		}
-		return parent::emptyValue($type);
-	}
-
-	/**
-	 * (non-PHPdoc)
-	 * @see DBManager::lastDbError()
-	 */
-	public function lastDbError()
-	{
-		if($this->database) {
-		    if(mysql_errno($this->database)) {
-			    return "MySQL error ".mysql_errno($this->database).": ".mysql_error($this->database);
-		    }
-		} else {
-			$err =  mysql_error();
-			if($err) {
-			    return $err;
-			}
-		}
+            if($execute)
+                $this->query($sql);
+        } else {
+            $sql = '';
+        }
+        return $sql;
+    }
+
+    /**
+     * List of available collation settings
+     * @return string
+     */
+    public function getDefaultCollation()
+    {
+        return "utf8_general_ci";
+    }
+
+    /**
+     * List of available collation settings
+     * @return array
+     */
+    public function getCollationList()
+    {
+        $q = "SHOW COLLATION LIKE 'utf8%'";
+        $r = $this->query($q);
+        $res = array();
+        while($a = $this->fetchByAssoc($r)) {
+            $res[] = $a['Collation'];
+        }
+        return $res;
+    }
+
+    /**
+     * (non-PHPdoc)
+     * @see DBManager::renameColumnSQL()
+     */
+    public function renameColumnSQL($tablename, $column, $newname)
+    {
+        $field = $this->describeField($column, $tablename);
+        $field['name'] = $newname;
+        return "ALTER TABLE $tablename CHANGE COLUMN $column ".$this->oneColumnSQLRep($field);
+    }
+
+    public function emptyValue($type)
+    {
+        $ctype = $this->getColumnType($type);
+        if($ctype == "datetime") {
+            return $this->convert($this->quoted("0000-00-00 00:00:00"), "datetime");
+        }
+        if($ctype == "date") {
+            return $this->convert($this->quoted("0000-00-00"), "date");
+        }
+        if($ctype == "time") {
+            return $this->convert($this->quoted("00:00:00"), "time");
+        }
+        return parent::emptyValue($type);
+    }
+
+    /**
+     * (non-PHPdoc)
+     * @see DBManager::lastDbError()
+     */
+    public function lastDbError()
+    {
+        if($this->database) {
+            if(mysql_errno($this->database)) {
+                return "MySQL error ".mysql_errno($this->database).": ".mysql_error($this->database);
+            }
+        } else {
+            $err =  mysql_error();
+            if($err) {
+                return $err;
+            }
+        }
         return false;
     }
 
-	/**
-	 * Quote MySQL search term
-	 * @param unknown_type $term
-	 */
-	protected function quoteTerm($term)
-	{
-		if(strpos($term, ' ') !== false) {
-			return '"'.$term.'"';
-		}
-		return $term;
-	}
-
-	/**
-	 * Generate fulltext query from set of terms
-	 * @param string $fields Field to search against
-	 * @param array $terms Search terms that may be or not be in the result
-	 * @param array $must_terms Search terms that have to be in the result
-	 * @param array $exclude_terms Search terms that have to be not in the result
-	 */
-	public function getFulltextQuery($field, $terms, $must_terms = array(), $exclude_terms = array())
-	{
-		$condition = array();
-		foreach($terms as $term) {
-			$condition[] = $this->quoteTerm($term);
-		}
-		foreach($must_terms as $term) {
-			$condition[] = "+".$this->quoteTerm($term);
-		}
-		foreach($exclude_terms as $term) {
-			$condition[] = "-".$this->quoteTerm($term);
-		}
-		$condition = $this->quoted(join(" ",$condition));
-		return "MATCH($field) AGAINST($condition IN BOOLEAN MODE)";
-	}
-
-	/**
-	 * Get list of all defined charsets
-	 * @return array
-	 */
-	protected function getCharsetInfo()
-	{
-		$charsets = array();
-		$res = $this->query("show variables like 'character\\_set\\_%'");
-		while($row = $this->fetchByAssoc($res)) {
-			$charsets[$row['Variable_name']] = $row['Value'];
-		}
-		return $charsets;
-	}
-
-	public function getDbInfo()
-	{
-		$charsets = $this->getCharsetInfo();
-		$charset_str = array();
-		foreach($charsets as $name => $value) {
-			$charset_str[] = "$name = $value";
-		}
-		return array(
-			"MySQL Version" => @mysql_get_client_info(),
-			"MySQL Host Info" => @mysql_get_host_info($this->database),
-			"MySQL Server Info" => @mysql_get_server_info($this->database),
-			"MySQL Client Encoding" =>  @mysql_client_encoding($this->database),
-			"MySQL Character Set Settings" => join(", ", $charset_str),
-		);
-	}
-
-	public function validateQuery($query)
-	{
-		$res = $this->query("EXPLAIN $query");
-		return !empty($res);
-	}
-
-	protected function makeTempTableCopy($table)
-	{
-		$this->log->debug("creating temp table for [$table]...");
-		$result = $this->query("SHOW CREATE TABLE {$table}");
-		if(empty($result)) {
-			return false;
-		}
-		$row = $this->fetchByAssoc($result);
-		if(empty($row) || empty($row['Create Table'])) {
-		    return false;
-		}
-		$create = $row['Create Table'];
-		// rewrite DDL with _temp name
-		$tempTableQuery = str_replace("CREATE TABLE `{$table}`", "CREATE TABLE `{$table}__uw_temp`", $create);
-		$r2 = $this->query($tempTableQuery);
-		if(empty($r2)) {
-			return false;
-		}
-
-		// get sample data into the temp table to test for data/constraint conflicts
-		$this->log->debug('inserting temp dataset...');
-		$q3 = "INSERT INTO `{$table}__uw_temp` SELECT * FROM `{$table}` LIMIT 10";
-		$this->query($q3, false, "Preflight Failed for: {$q3}");
-		return true;
-	}
-
-	/**
-	 * Tests an ALTER TABLE query
-	 * @param string table The table name to get DDL
-	 * @param string query The query to test.
-	 * @return string Non-empty if error found
-	 */
-	protected function verifyAlterTable($table, $query)
-	{
-		$this->log->debug("verifying ALTER TABLE");
-		// Skipping ALTER TABLE [table] DROP PRIMARY KEY because primary keys are not being copied
-		// over to the temp tables
-		if(strpos(strtoupper($query), 'DROP PRIMARY KEY') !== false) {
-			$this->log->debug("Skipping DROP PRIMARY KEY");
-			return '';
-		}
-		if(!$this->makeTempTableCopy($table)) {
-			return 'Could not create temp table copy';
-		}
-
-		// test the query on the test table
-		$this->log->debug('testing query: ['.$query.']');
-		$tempTableTestQuery = str_replace("ALTER TABLE `{$table}`", "ALTER TABLE `{$table}__uw_temp`", $query);
-		if (strpos($tempTableTestQuery, 'idx') === false) {
-			if(strpos($tempTableTestQuery, '__uw_temp') === false) {
-				return 'Could not use a temp table to test query!';
-			}
-
-			$this->log->debug('testing query on temp table: ['.$tempTableTestQuery.']');
-			$this->query($tempTableTestQuery, false, "Preflight Failed for: {$query}");
-		} else {
-			// test insertion of an index on a table
-			$tempTableTestQuery_idx = str_replace("ADD INDEX `idx_", "ADD INDEX `temp_idx_", $tempTableTestQuery);
-			$this->log->debug('testing query on temp table: ['.$tempTableTestQuery_idx.']');
-			$this->query($tempTableTestQuery_idx, false, "Preflight Failed for: {$query}");
-		}
-		$mysqlError = $this->getL();
-		if(!empty($mysqlError)) {
-			return $mysqlError;
-		}
-		$this->dropTableName("{$table}__uw_temp");
-
-		return '';
-	}
-
-	protected function verifyGenericReplaceQuery($querytype, $table, $query)
-	{
-		$this->log->debug("verifying $querytype statement");
-
-		if(!$this->makeTempTableCopy($table)) {
-			return 'Could not create temp table copy';
-		}
-		// test the query on the test table
-		$this->log->debug('testing query: ['.$query.']');
-		$tempTableTestQuery = str_replace("$querytype `{$table}`", "$querytype `{$table}__uw_temp`", $query);
-		if(strpos($tempTableTestQuery, '__uw_temp') === false) {
-			return 'Could not use a temp table to test query!';
-		}
-
-		$this->query($tempTableTestQuery, false, "Preflight Failed for: {$query}");
-		$error = $this->lastError(); // empty on no-errors
-		$this->dropTableName("{$table}__uw_temp"); // just in case
-		return $error;
-	}
-
-	/**
-	 * Tests a DROP TABLE query
-	 * @param string table The table name to get DDL
-	 * @param string query The query to test.
-	 * @return string Non-empty if error found
-	 */
-	public function verifyDropTable($table, $query)
-	{
-		return $this->verifyGenericReplaceQuery("DROP TABLE", $table, $query);
-	}
-
-	/**
-	 * Tests an INSERT INTO query
-	 * @param string table The table name to get DDL
-	 * @param string query The query to test.
-	 * @return string Non-empty if error found
-	 */
-	public function verifyInsertInto($table, $query)
-	{
-		return $this->verifyGenericReplaceQuery("INSERT INTO", $table, $query);
-	}
-
-	/**
-	 * Tests an UPDATE query
-	 * @param string table The table name to get DDL
-	 * @param string query The query to test.
-	 * @return string Non-empty if error found
-	 */
-	public function verifyUpdate($table, $query)
-	{
-		return $this->verifyGenericReplaceQuery("UPDATE", $table, $query);
-	}
-
-	/**
-	 * Tests an DELETE FROM query
-	 * @param string table The table name to get DDL
-	 * @param string query The query to test.
-	 * @return string Non-empty if error found
-	 */
-	public function verifyDeleteFrom($table, $query)
-	{
-		return $this->verifyGenericReplaceQuery("DELETE FROM", $table, $query);
-	}
-
-	/**
-	 * Check if certain database exists
-	 * @param string $dbname
-	 */
-	public function dbExists($dbname)
-	{
-		$db = $this->getOne("SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = ".$this->quoted($dbname));
-		return !empty($db);
-	}
-
-	/**
-	 * Select database
-	 * @param string $dbname
-	 */
-	protected function selectDb($dbname)
-	{
-		return mysql_select_db($dbname);
-	}
-
-	/**
-	 * Check if certain DB user exists
-	 * @param string $username
-	 */
-	public function userExists($username)
-	{
-		$db = $this->getOne("SELECT DATABASE()");
-		if(!$this->selectDb("mysql")) {
-			return false;
-		}
-		$user = $this->getOne("select count(*) from user where user = ".$this->quoted($username));
-		if(!$this->selectDb($db)) {
-			$this->checkError("Cannot select database $db", true);
-		}
-		return !empty($user);
-	}
-
-	/**
-	 * Create DB user
-	 * @param string $database_name
-	 * @param string $host_name
-	 * @param string $user
-	 * @param string $password
-	 */
-	public function createDbUser($database_name, $host_name, $user, $password)
-	{
-		$qpassword = $this->quote($password);
-		$this->query("GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, ALTER, DROP, INDEX
+    /**
+     * Quote MySQL search term
+     * @param unknown_type $term
+     */
+    protected function quoteTerm($term)
+    {
+        if(strpos($term, ' ') !== false) {
+            return '"'.$term.'"';
+        }
+        return $term;
+    }
+
+    /**
+     * Generate fulltext query from set of terms
+     * @param string $fields Field to search against
+     * @param array $terms Search terms that may be or not be in the result
+     * @param array $must_terms Search terms that have to be in the result
+     * @param array $exclude_terms Search terms that have to be not in the result
+     */
+    public function getFulltextQuery($field, $terms, $must_terms = array(), $exclude_terms = array())
+    {
+        $condition = array();
+        foreach($terms as $term) {
+            $condition[] = $this->quoteTerm($term);
+        }
+        foreach($must_terms as $term) {
+            $condition[] = "+".$this->quoteTerm($term);
+        }
+        foreach($exclude_terms as $term) {
+            $condition[] = "-".$this->quoteTerm($term);
+        }
+        $condition = $this->quoted(join(" ",$condition));
+        return "MATCH($field) AGAINST($condition IN BOOLEAN MODE)";
+    }
+
+    /**
+     * Get list of all defined charsets
+     * @return array
+     */
+    protected function getCharsetInfo()
+    {
+        $charsets = array();
+        $res = $this->query("show variables like 'character\\_set\\_%'");
+        while($row = $this->fetchByAssoc($res)) {
+            $charsets[$row['Variable_name']] = $row['Value'];
+        }
+        return $charsets;
+    }
+
+    public function getDbInfo()
+    {
+        $charsets = $this->getCharsetInfo();
+        $charset_str = array();
+        foreach($charsets as $name => $value) {
+            $charset_str[] = "$name = $value";
+        }
+        return array(
+            "MySQL Version" => @mysql_get_client_info(),
+            "MySQL Host Info" => @mysql_get_host_info($this->database),
+            "MySQL Server Info" => @mysql_get_server_info($this->database),
+            "MySQL Client Encoding" =>  @mysql_client_encoding($this->database),
+            "MySQL Character Set Settings" => join(", ", $charset_str),
+        );
+    }
+
+    public function validateQuery($query)
+    {
+        $res = $this->query("EXPLAIN $query");
+        return !empty($res);
+    }
+
+    protected function makeTempTableCopy($table)
+    {
+        $this->log->debug("creating temp table for [$table]...");
+        $result = $this->query("SHOW CREATE TABLE {$table}");
+        if(empty($result)) {
+            return false;
+        }
+        $row = $this->fetchByAssoc($result);
+        if(empty($row) || empty($row['Create Table'])) {
+            return false;
+        }
+        $create = $row['Create Table'];
+        // rewrite DDL with _temp name
+        $tempTableQuery = str_replace("CREATE TABLE `{$table}`", "CREATE TABLE `{$table}__uw_temp`", $create);
+        $r2 = $this->query($tempTableQuery);
+        if(empty($r2)) {
+            return false;
+        }
+
+        // get sample data into the temp table to test for data/constraint conflicts
+        $this->log->debug('inserting temp dataset...');
+        $q3 = "INSERT INTO `{$table}__uw_temp` SELECT * FROM `{$table}` LIMIT 10";
+        $this->query($q3, false, "Preflight Failed for: {$q3}");
+        return true;
+    }
+
+    /**
+     * Tests an ALTER TABLE query
+     * @param string table The table name to get DDL
+     * @param string query The query to test.
+     * @return string Non-empty if error found
+     */
+    protected function verifyAlterTable($table, $query)
+    {
+        $this->log->debug("verifying ALTER TABLE");
+        // Skipping ALTER TABLE [table] DROP PRIMARY KEY because primary keys are not being copied
+        // over to the temp tables
+        if(strpos(strtoupper($query), 'DROP PRIMARY KEY') !== false) {
+            $this->log->debug("Skipping DROP PRIMARY KEY");
+            return '';
+        }
+        if(!$this->makeTempTableCopy($table)) {
+            return 'Could not create temp table copy';
+        }
+
+        // test the query on the test table
+        $this->log->debug('testing query: ['.$query.']');
+        $tempTableTestQuery = str_replace("ALTER TABLE `{$table}`", "ALTER TABLE `{$table}__uw_temp`", $query);
+        if (strpos($tempTableTestQuery, 'idx') === false) {
+            if(strpos($tempTableTestQuery, '__uw_temp') === false) {
+                return 'Could not use a temp table to test query!';
+            }
+
+            $this->log->debug('testing query on temp table: ['.$tempTableTestQuery.']');
+            $this->query($tempTableTestQuery, false, "Preflight Failed for: {$query}");
+        } else {
+            // test insertion of an index on a table
+            $tempTableTestQuery_idx = str_replace("ADD INDEX `idx_", "ADD INDEX `temp_idx_", $tempTableTestQuery);
+            $this->log->debug('testing query on temp table: ['.$tempTableTestQuery_idx.']');
+            $this->query($tempTableTestQuery_idx, false, "Preflight Failed for: {$query}");
+        }
+        $mysqlError = $this->getL();
+        if(!empty($mysqlError)) {
+            return $mysqlError;
+        }
+        $this->dropTableName("{$table}__uw_temp");
+
+        return '';
+    }
+
+    protected function verifyGenericReplaceQuery($querytype, $table, $query)
+    {
+        $this->log->debug("verifying $querytype statement");
+
+        if(!$this->makeTempTableCopy($table)) {
+            return 'Could not create temp table copy';
+        }
+        // test the query on the test table
+        $this->log->debug('testing query: ['.$query.']');
+        $tempTableTestQuery = str_replace("$querytype `{$table}`", "$querytype `{$table}__uw_temp`", $query);
+        if(strpos($tempTableTestQuery, '__uw_temp') === false) {
+            return 'Could not use a temp table to test query!';
+        }
+
+        $this->query($tempTableTestQuery, false, "Preflight Failed for: {$query}");
+        $error = $this->lastError(); // empty on no-errors
+        $this->dropTableName("{$table}__uw_temp"); // just in case
+        return $error;
+    }
+
+    /**
+     * Tests a DROP TABLE query
+     * @param string table The table name to get DDL
+     * @param string query The query to test.
+     * @return string Non-empty if error found
+     */
+    public function verifyDropTable($table, $query)
+    {
+        return $this->verifyGenericReplaceQuery("DROP TABLE", $table, $query);
+    }
+
+    /**
+     * Tests an INSERT INTO query
+     * @param string table The table name to get DDL
+     * @param string query The query to test.
+     * @return string Non-empty if error found
+     */
+    public function verifyInsertInto($table, $query)
+    {
+        return $this->verifyGenericReplaceQuery("INSERT INTO", $table, $query);
+    }
+
+    /**
+     * Tests an UPDATE query
+     * @param string table The table name to get DDL
+     * @param string query The query to test.
+     * @return string Non-empty if error found
+     */
+    public function verifyUpdate($table, $query)
+    {
+        return $this->verifyGenericReplaceQuery("UPDATE", $table, $query);
+    }
+
+    /**
+     * Tests an DELETE FROM query
+     * @param string table The table name to get DDL
+     * @param string query The query to test.
+     * @return string Non-empty if error found
+     */
+    public function verifyDeleteFrom($table, $query)
+    {
+        return $this->verifyGenericReplaceQuery("DELETE FROM", $table, $query);
+    }
+
+    /**
+     * Check if certain database exists
+     * @param string $dbname
+     */
+    public function dbExists($dbname)
+    {
+        $db = $this->getOne("SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = ".$this->quoted($dbname));
+        return !empty($db);
+    }
+
+    /**
+     * Select database
+     * @param string $dbname
+     */
+    protected function selectDb($dbname)
+    {
+        return mysql_select_db($dbname);
+    }
+
+    /**
+     * Check if certain DB user exists
+     * @param string $username
+     */
+    public function userExists($username)
+    {
+        $db = $this->getOne("SELECT DATABASE()");
+        if(!$this->selectDb("mysql")) {
+            return false;
+        }
+        $user = $this->getOne("select count(*) from user where user = ".$this->quoted($username));
+        if(!$this->selectDb($db)) {
+            $this->checkError("Cannot select database $db", true);
+        }
+        return !empty($user);
+    }
+
+    /**
+     * Create DB user
+     * @param string $database_name
+     * @param string $host_name
+     * @param string $user
+     * @param string $password
+     */
+    public function createDbUser($database_name, $host_name, $user, $password)
+    {
+        $qpassword = $this->quote($password);
+        $this->query("GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, ALTER, DROP, INDEX
 							ON `$database_name`.*
 							TO \"$user\"@\"$host_name\"
 							IDENTIFIED BY '{$qpassword}';", true);
 
-		$this->query("SET PASSWORD FOR \"{$user}\"@\"{$host_name}\" = password('{$qpassword}');", true);
-		if($host_name != 'localhost') {
-			$this->createDbUser($database_name, "localhost", $user, $password);
-		}
-	}
-
-	/**
-	 * Create a database
-	 * @param string $dbname
-	 */
-	public function createDatabase($dbname)
-	{
-		$this->query("CREATE DATABASE `$dbname` CHARACTER SET utf8 COLLATE utf8_general_ci", true);
-	}
-
-	public function preInstall()
-	{
-		$db->query("ALTER DATABASE `{$setup_db_database_name}` DEFAULT CHARACTER SET utf8", true);
-		$db->query("ALTER DATABASE `{$setup_db_database_name}` DEFAULT COLLATE utf8_general_ci", true);
-
-	}
-
-	/**
-	 * Drop a database
-	 * @param string $dbname
-	 */
-	public function dropDatabase($dbname)
-	{
-		return $this->query("DROP DATABASE IF EXISTS `$dbname`", true);
-	}
-
-	/**
-	 * Check if this driver can be used
-	 * @return bool
-	 */
-	public function valid()
-	{
-		return function_exists("mysql_connect");
-	}
-
-	/**
-	 * Check DB version
-	 * @see DBManager::canInstall()
-	 */
-	public function canInstall()
-	{
-		$db_version = $this->version();
-		if(empty($db_version)) {
-			return array('ERR_DB_VERSION_FAILURE');
-		}
-		if(version_compare($db_version, '4.1.2') < 0) {
-			return array('ERR_DB_MYSQL_VERSION', $db_version);
-		}
-		return true;
-	}
-
-	public function installConfig()
-	{
-		return array(
-			'LBL_DBCONFIG_MSG3' =>  array(
-				"setup_db_database_name" => array("label" => 'LBL_DBCONF_DB_NAME', "required" => true),
-			),
-			'LBL_DBCONFIG_MSG2' =>  array(
-				"setup_db_host_name" => array("label" => 'LBL_DBCONF_HOST_NAME', "required" => true),
-			),
-			'LBL_DBCONF_TITLE_USER_INFO' => array(),
-			'LBL_DBCONFIG_B_MSG1' => array(
-				"setup_db_admin_user_name" => array("label" => 'LBL_DBCONF_DB_ADMIN_USER', "required" => true),
-				"setup_db_admin_password" => array("label" => 'LBL_DBCONF_DB_ADMIN_PASSWORD', "type" => "password"),
-			)
-		);
-	}
-
-	/**
-	 * Disable keys on the table
-	 * @abstract
-	 * @param string $tableName
-	 */
-	public function disableKeys($tableName)
-	{
-	    return $this->query('ALTER TABLE '.$tableName.' DISABLE KEYS');
-	}
-
-	/**
-	 * Re-enable keys on the table
-	 * @abstract
-	 * @param string $tableName
-	 */
-	public function enableKeys($tableName)
-	{
-	    return $this->query('ALTER TABLE '.$tableName.' ENABLE KEYS');
-	}
+        $this->query("SET PASSWORD FOR \"{$user}\"@\"{$host_name}\" = password('{$qpassword}');", true);
+        if($host_name != 'localhost') {
+            $this->createDbUser($database_name, "localhost", $user, $password);
+        }
+    }
+
+    /**
+     * Create a database
+     * @param string $dbname
+     */
+    public function createDatabase($dbname)
+    {
+        $this->query("CREATE DATABASE `$dbname` CHARACTER SET utf8 COLLATE utf8_general_ci", true);
+    }
+
+    public function preInstall()
+    {
+        $db->query("ALTER DATABASE `{$setup_db_database_name}` DEFAULT CHARACTER SET utf8", true);
+        $db->query("ALTER DATABASE `{$setup_db_database_name}` DEFAULT COLLATE utf8_general_ci", true);
+
+    }
+
+    /**
+     * Drop a database
+     * @param string $dbname
+     */
+    public function dropDatabase($dbname)
+    {
+        return $this->query("DROP DATABASE IF EXISTS `$dbname`", true);
+    }
+
+    /**
+     * Check if this driver can be used
+     * @return bool
+     */
+    public function valid()
+    {
+        return function_exists("mysql_connect");
+    }
+
+    /**
+     * Check DB version
+     * @see DBManager::canInstall()
+     */
+    public function canInstall()
+    {
+        $db_version = $this->version();
+        if(empty($db_version)) {
+            return array('ERR_DB_VERSION_FAILURE');
+        }
+        if(version_compare($db_version, '4.1.2') < 0) {
+            return array('ERR_DB_MYSQL_VERSION', $db_version);
+        }
+        return true;
+    }
+
+    public function installConfig()
+    {
+        return array(
+            'LBL_DBCONFIG_MSG3' =>  array(
+                "setup_db_database_name" => array("label" => 'LBL_DBCONF_DB_NAME', "required" => true),
+            ),
+            'LBL_DBCONFIG_MSG2' =>  array(
+                "setup_db_host_name" => array("label" => 'LBL_DBCONF_HOST_NAME', "required" => true),
+            ),
+            'LBL_DBCONF_TITLE_USER_INFO' => array(),
+            'LBL_DBCONFIG_B_MSG1' => array(
+                "setup_db_admin_user_name" => array("label" => 'LBL_DBCONF_DB_ADMIN_USER', "required" => true),
+                "setup_db_admin_password" => array("label" => 'LBL_DBCONF_DB_ADMIN_PASSWORD', "type" => "password"),
+            )
+        );
+    }
+
+    /**
+     * Disable keys on the table
+     * @abstract
+     * @param string $tableName
+     */
+    public function disableKeys($tableName)
+    {
+        return $this->query('ALTER TABLE '.$tableName.' DISABLE KEYS');
+    }
+
+    /**
+     * Re-enable keys on the table
+     * @abstract
+     * @param string $tableName
+     */
+    public function enableKeys($tableName)
+    {
+        return $this->query('ALTER TABLE '.$tableName.' ENABLE KEYS');
+    }
 
     /**
      * Returns a DB specific FROM clause which can be used to select against functions.
@@ -1501,8 +1501,8 @@ 
      * @return string
      */
 
-	public function getGuidSQL()
+    public function getGuidSQL()
     {
-      	return 'UUID()';
+            return 'UUID()';
     }
 }

Switch Indentation +49 added lines, -49 removed lines

@@ -825,33 +825,33 @@ 
 			$fields = $index['fields'];
 
 		switch ($type) {
-		case 'unique':
-			$columns[] = " UNIQUE $name ($fields)";
-			break;
-		case 'primary':
-			$columns[] = " PRIMARY KEY ($fields)";
-			break;
-		case 'index':
-		case 'foreign':
-		case 'clustered':
-		case 'alternate_key':
-			/**
+		    case 'unique':
+			    $columns[] = " UNIQUE $name ($fields)";
+			    break;
+		    case 'primary':
+			    $columns[] = " PRIMARY KEY ($fields)";
+			    break;
+		    case 'index':
+		    case 'foreign':
+		    case 'clustered':
+		    case 'alternate_key':
+			    /**
 				* @todo here it is assumed that the primary key of the foreign
 				* table will always be named 'id'. It must be noted though
 				* that this can easily be fixed by referring to db dictionary
 				* to find the correct primary field name
 				*/
-			if ( $alter_table )
-				$columns[] = " INDEX $name ($fields)";
-			else
-				$columns[] = " KEY $name ($fields)";
-			break;
-		case 'fulltext':
-			if ($this->full_text_indexing_installed())
-				$columns[] = " FULLTEXT ($fields)";
-			else
-				$GLOBALS['log']->debug('MYISAM engine is not available/enabled, full-text indexes will be skipped. Skipping:',$name);
-			break;
+			    if ( $alter_table )
+				    $columns[] = " INDEX $name ($fields)";
+			    else
+				    $columns[] = " KEY $name ($fields)";
+			    break;
+		    case 'fulltext':
+			    if ($this->full_text_indexing_installed())
+				    $columns[] = " FULLTEXT ($fields)";
+			    else
+				    $GLOBALS['log']->debug('MYISAM engine is not available/enabled, full-text indexes will be skipped. Skipping:',$name);
+			    break;
 		}
 	}
 	$columns = implode(", $alter_action ", $columns);
@@ -935,33 +935,33 @@ 
 
 		switch ($type){
 		// generic indices
-		case 'index':
-		case 'alternate_key':
-		case 'clustered':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP INDEX {$name} ";
-			else
-				$sql = "ALTER TABLE {$table} ADD INDEX {$name} ({$fields})";
-			break;
-		// constraints as indices
-		case 'unique':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP INDEX $name";
-			else
-				$sql = "ALTER TABLE {$table} ADD CONSTRAINT UNIQUE {$name} ({$fields})";
-			break;
-		case 'primary':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP PRIMARY KEY";
-			else
-				$sql = "ALTER TABLE {$table} ADD CONSTRAINT PRIMARY KEY ({$fields})";
-			break;
-		case 'foreign':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP FOREIGN KEY ({$fields})";
-			else
-				$sql = "ALTER TABLE {$table} ADD CONSTRAINT FOREIGN KEY {$name} ({$fields}) REFERENCES {$definition['foreignTable']}({$definition['foreignField']})";
-			break;
+		    case 'index':
+		    case 'alternate_key':
+		    case 'clustered':
+			    if ($drop)
+				    $sql = "ALTER TABLE {$table} DROP INDEX {$name} ";
+			    else
+				    $sql = "ALTER TABLE {$table} ADD INDEX {$name} ({$fields})";
+			    break;
+		    // constraints as indices
+		    case 'unique':
+			    if ($drop)
+				    $sql = "ALTER TABLE {$table} DROP INDEX $name";
+			    else
+				    $sql = "ALTER TABLE {$table} ADD CONSTRAINT UNIQUE {$name} ({$fields})";
+			    break;
+		    case 'primary':
+			    if ($drop)
+				    $sql = "ALTER TABLE {$table} DROP PRIMARY KEY";
+			    else
+				    $sql = "ALTER TABLE {$table} ADD CONSTRAINT PRIMARY KEY ({$fields})";
+			    break;
+		    case 'foreign':
+			    if ($drop)
+				    $sql = "ALTER TABLE {$table} DROP FOREIGN KEY ({$fields})";
+			    else
+				    $sql = "ALTER TABLE {$table} ADD CONSTRAINT FOREIGN KEY {$name} ({$fields}) REFERENCES {$definition['foreignTable']}({$definition['foreignField']})";
+			    break;
 		}
 		return $sql;
 	}

Spacing +140 added lines, -140 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -170,25 +170,25 @@ 
 	 */
 	public function query($sql, $dieOnError = false, $msg = '', $suppress = false, $keepResult = false)
 	{
-		if(is_array($sql)) {
+		if (is_array($sql)) {
 			return $this->queryArray($sql, $dieOnError, $msg, $suppress);
 		}
 
 		parent::countQuery($sql);
-		$GLOBALS['log']->info('Query:' . $sql);
+		$GLOBALS['log']->info('Query:'.$sql);
 		$this->checkConnection();
 		$this->query_time = microtime(true);
 		$this->lastsql = $sql;
-		$result = $suppress?@mysql_query($sql, $this->database):mysql_query($sql, $this->database);
+		$result = $suppress ? @mysql_query($sql, $this->database) : mysql_query($sql, $this->database);
 
 		$this->query_time = microtime(true) - $this->query_time;
 		$GLOBALS['log']->info('Query Execution Time:'.$this->query_time);
 
 
-		if($keepResult)
+		if ($keepResult)
 			$this->lastResult = $result;
 
-		$this->checkError($msg.' Query Failed:' . $sql . '::', $dieOnError);
+		$this->checkError($msg.' Query Failed:'.$sql.'::', $dieOnError);
 		return $result;
 	}
 
@@ -224,7 +224,7 @@ 
 	public function disconnect()
 	{
 		$GLOBALS['log']->debug('Calling MySQL::disconnect()');
-		if(!empty($this->database)){
+		if (!empty($this->database)) {
 			$this->freeResult();
 			mysql_close($this->database);
 			$this->database = null;
@@ -236,7 +236,7 @@ 
 	 */
 	protected function freeDbResult($dbResult)
 	{
-		if(!empty($dbResult))
+		if (!empty($dbResult))
 			mysql_free_result($dbResult);
 	}
 
@@ -262,15 +262,15 @@ 
         $count = (int)$count;
 	    if ($start < 0)
 			$start = 0;
-		$GLOBALS['log']->debug('Limit Query:' . $sql. ' Start: ' .$start . ' count: ' . $count);
+		$GLOBALS['log']->debug('Limit Query:'.$sql.' Start: '.$start.' count: '.$count);
 
 	    $sql = "$sql LIMIT $start,$count";
 		$this->lastsql = $sql;
 
-		if(!empty($GLOBALS['sugar_config']['check_query'])){
+		if (!empty($GLOBALS['sugar_config']['check_query'])) {
 			$this->checkQuery($sql);
 		}
-		if(!$execute) {
+		if (!$execute) {
 			return $sql;
 		}
 
@@ -283,14 +283,14 @@ 
 	 */
 	protected function checkQuery($sql, $object_name = false)
 	{
-		$result   = $this->query('EXPLAIN ' . $sql);
+		$result   = $this->query('EXPLAIN '.$sql);
 		$badQuery = array();
 		while ($row = $this->fetchByAssoc($result)) {
 			if (empty($row['table']))
 				continue;
 			$badQuery[$row['table']] = '';
 			if (strtoupper($row['type']) == 'ALL')
-				$badQuery[$row['table']]  .=  ' Full Table Scan;';
+				$badQuery[$row['table']] .= ' Full Table Scan;';
 			if (empty($row['key']))
 				$badQuery[$row['table']] .= ' No Index Key Used;';
 			if (!empty($row['Extra']) && substr_count($row['Extra'], 'Using filesort') > 0)
@@ -299,18 +299,18 @@ 
 				$badQuery[$row['table']] .= ' Using Temporary Table;';
 		}
 
-		if ( empty($badQuery) )
+		if (empty($badQuery))
 			return true;
 
-		foreach($badQuery as $table=>$data ){
-			if(!empty($data)){
-				$warning = ' Table:' . $table . ' Data:' . $data;
-				if(!empty($GLOBALS['sugar_config']['check_query_log'])){
+		foreach ($badQuery as $table=>$data) {
+			if (!empty($data)) {
+				$warning = ' Table:'.$table.' Data:'.$data;
+				if (!empty($GLOBALS['sugar_config']['check_query_log'])) {
 					$GLOBALS['log']->fatal($sql);
-					$GLOBALS['log']->fatal('CHECK QUERY:' .$warning);
+					$GLOBALS['log']->fatal('CHECK QUERY:'.$warning);
 				}
-				else{
-					$GLOBALS['log']->warn('CHECK QUERY:' .$warning);
+				else {
+					$GLOBALS['log']->warn('CHECK QUERY:'.$warning);
 				}
 			}
 		}
@@ -327,19 +327,19 @@ 
 		$result = $this->query("DESCRIBE $tablename");
 
 		$columns = array();
-		while (($row=$this->fetchByAssoc($result)) !=null) {
+		while (($row = $this->fetchByAssoc($result)) != null) {
 			$name = strtolower($row['Field']);
-			$columns[$name]['name']=$name;
+			$columns[$name]['name'] = $name;
 			$matches = array();
 			preg_match_all('/(\w+)(?:\(([0-9]+,?[0-9]*)\)|)( unsigned)?/i', $row['Type'], $matches);
-			$columns[$name]['type']=strtolower($matches[1][0]);
-			if ( isset($matches[2][0]) && in_array(strtolower($matches[1][0]),array('varchar','char','varchar2','int','decimal','float')) )
-				$columns[$name]['len']=strtolower($matches[2][0]);
-			if ( stristr($row['Extra'],'auto_increment') )
+			$columns[$name]['type'] = strtolower($matches[1][0]);
+			if (isset($matches[2][0]) && in_array(strtolower($matches[1][0]), array('varchar', 'char', 'varchar2', 'int', 'decimal', 'float')))
+				$columns[$name]['len'] = strtolower($matches[2][0]);
+			if (stristr($row['Extra'], 'auto_increment'))
 				$columns[$name]['auto_increment'] = '1';
-			if ($row['Null'] == 'NO' && !stristr($row['Key'],'PRI'))
+			if ($row['Null'] == 'NO' && !stristr($row['Key'], 'PRI'))
 				$columns[$name]['required'] = 'true';
-			if (!empty($row['Default']) )
+			if (!empty($row['Default']))
 				$columns[$name]['default'] = $row['Default'];
 		}
 		return $columns;
@@ -348,20 +348,20 @@ 
 	/**
 	 * @see DBManager::getFieldsArray()
 	 */
-	public function getFieldsArray($result, $make_lower_case=false)
+	public function getFieldsArray($result, $make_lower_case = false)
 	{
 		$field_array = array();
 
-		if(empty($result))
+		if (empty($result))
 			return 0;
 
 		$fields = mysql_num_fields($result);
-		for ($i=0; $i < $fields; $i++) {
+		for ($i = 0; $i < $fields; $i++) {
 			$meta = mysql_fetch_field($result, $i);
 			if (!$meta)
 				return array();
 
-			if($make_lower_case == true)
+			if ($make_lower_case == true)
 				$meta->name = strtolower($meta->name);
 
 			$field_array[] = $meta->name;
@@ -393,7 +393,7 @@ 
 			if (!empty($r)) {
 				while ($a = $this->fetchByAssoc($r)) {
 					$row = array_values($a);
-					$tables[]=$row[0];
+					$tables[] = $row[0];
 				}
 				return $tables;
 			}
@@ -419,7 +419,7 @@ 
 
 		if ($this->getDatabase()) {
 			$result = $this->query("SHOW TABLES LIKE ".$this->quoted($tableName));
-			if(empty($result)) return false;
+			if (empty($result)) return false;
 			$row = $this->fetchByAssoc($result);
 			return !empty($row);
 		}
@@ -440,7 +440,7 @@ 
 			if (!empty($r)) {
 				while ($a = $this->fetchByAssoc($r)) {
 					$row = array_values($a);
-					$tables[]=$row[0];
+					$tables[] = $row[0];
 				}
 				return $tables;
 			}
@@ -453,7 +453,7 @@ 
 	 */
 	public function quote($string)
 	{
-		if(is_array($string)) {
+		if (is_array($string)) {
 			return $this->arrayQuote($string);
 		}
 		return mysql_real_escape_string($this->quoteInternal($string), $this->getDatabase());
@@ -474,7 +474,7 @@ 
 	{
 		global $sugar_config;
 
-		if(is_null($configOptions))
+		if (is_null($configOptions))
 			$configOptions = $sugar_config['dbconfig'];
 
 		if ($this->getOption('persistent')) {
@@ -491,10 +491,10 @@ 
 					$configOptions['db_user_name'],
 					$configOptions['db_password']
 					);
-			if(empty($this->database)) {
+			if (empty($this->database)) {
 				$GLOBALS['log']->fatal("Could not connect to server ".$configOptions['db_host_name']." as ".$configOptions['db_user_name'].":".mysql_error());
-				if($dieOnError) {
-					if(isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
+				if ($dieOnError) {
+					if (isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
 						sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
 					} else {
 						sugar_die("Could not connect to the database. Please refer to suitecrm.log for details.");
@@ -504,15 +504,15 @@ 
 				}
 			}
 			// Do not pass connection information because we have not connected yet
-			if($this->database  && $this->getOption('persistent')){
+			if ($this->database && $this->getOption('persistent')) {
 				$_SESSION['administrator_error'] = "<b>Severe Performance Degradation: Persistent Database Connections "
 					. "not working.  Please set \$sugar_config['dbconfigoption']['persistent'] to false "
 					. "in your config.php file</b>";
 			}
 		}
-		if(!empty($configOptions['db_name']) && !@mysql_select_db($configOptions['db_name'])) {
-			$GLOBALS['log']->fatal( "Unable to select database {$configOptions['db_name']}: " . mysql_error($this->database));
-			if($dieOnError) {
+		if (!empty($configOptions['db_name']) && !@mysql_select_db($configOptions['db_name'])) {
+			$GLOBALS['log']->fatal("Unable to select database {$configOptions['db_name']}: ".mysql_error($this->database));
+			if ($dieOnError) {
 				sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
 			} else {
 				return false;
@@ -523,12 +523,12 @@ 
 	    mysql_query("SET CHARACTER SET utf8", $this->database);
 	    $names = "SET NAMES 'utf8'";
 	    $collation = $this->getOption('collation');
-	    if(!empty($collation)) {
+	    if (!empty($collation)) {
 	        $names .= " COLLATE '$collation'";
 		}
 	    mysql_query($names, $this->database);
 
-		if(!$this->checkError('Could Not Connect:', $dieOnError))
+		if (!$this->checkError('Could Not Connect:', $dieOnError))
 			$GLOBALS['log']->info("connected to db");
 		$this->connectOptions = $configOptions;
 
@@ -544,16 +544,16 @@ 
 	 */
 	public function repairTableParams($tablename, $fielddefs, $indices, $execute = true, $engine = null)
 	{
-		$sql = parent::repairTableParams($tablename,$fielddefs,$indices,false,$engine);
+		$sql = parent::repairTableParams($tablename, $fielddefs, $indices, false, $engine);
 
-		if ( $sql == '' )
+		if ($sql == '')
 			return '';
 
-		if ( stristr($sql,'create table') )
+		if (stristr($sql, 'create table'))
 		{
 			if ($execute) {
-				$msg = "Error creating table: ".$tablename. ":";
-				$this->query($sql,true,$msg);
+				$msg = "Error creating table: ".$tablename.":";
+				$this->query($sql, true, $msg);
 			}
 			return $sql;
 		}
@@ -562,23 +562,23 @@ 
 		$match = array();
 		preg_match_all('!/\*.*?\*/!is', $sql, $match);
 		$commentBlocks = $match[0];
-		$sql = preg_replace('!/\*.*?\*/!is','', $sql);
+		$sql = preg_replace('!/\*.*?\*/!is', '', $sql);
 
 		// now, we should only have alter table statements
 		// let's replace the 'alter table name' part with a comma
-		$sql = preg_replace("!alter table $tablename!is",', ', $sql);
+		$sql = preg_replace("!alter table $tablename!is", ', ', $sql);
 
 		// re-add it at the beginning
-		$sql = substr_replace($sql,'',strpos($sql,','),1);
-		$sql = str_replace(";","",$sql);
-		$sql = str_replace("\n","",$sql);
+		$sql = substr_replace($sql, '', strpos($sql, ','), 1);
+		$sql = str_replace(";", "", $sql);
+		$sql = str_replace("\n", "", $sql);
 		$sql = "ALTER TABLE $tablename $sql";
 
-		if ( $execute )
-			$this->query($sql,'Error with MySQL repair table');
+		if ($execute)
+			$this->query($sql, 'Error with MySQL repair table');
 
 		// and re-add the comments at the beginning
-		$sql = implode("\n",$commentBlocks) . "\n". $sql . "\n";
+		$sql = implode("\n", $commentBlocks)."\n".$sql."\n";
 
 		return $sql;
 	}
@@ -589,7 +589,7 @@ 
 	public function convert($string, $type, array $additional_parameters = array())
 	{
 		$all_parameters = $additional_parameters;
-		if(is_array($string)) {
+		if (is_array($string)) {
 			$all_parameters = array_merge($string, $all_parameters);
 		} elseif (!is_null($string)) {
 			array_unshift($all_parameters, $string);
@@ -602,17 +602,17 @@ 
 			case 'left':
 				return "LEFT($all_strings)";
 			case 'date_format':
-				if(empty($additional_parameters)) {
+				if (empty($additional_parameters)) {
 					return "DATE_FORMAT($string,'%Y-%m-%d')";
 				} else {
 					$format = $additional_parameters[0];
-					if($format[0] != "'") {
+					if ($format[0] != "'") {
 						$format = $this->quoted($format);
 					}
 					return "DATE_FORMAT($string,$format)";
 				}
 			case 'ifnull':
-				if(empty($additional_parameters) && !strstr($all_strings, ",")) {
+				if (empty($additional_parameters) && !strstr($all_strings, ",")) {
 					$all_strings .= ",''";
 				}
 				return "IFNULL($all_strings)";
@@ -631,7 +631,7 @@ 
             case 'add_tz_offset' :
                 $getUserUTCOffset = $GLOBALS['timedate']->getUserUTCOffset();
                 $operation = $getUserUTCOffset < 0 ? '-' : '+';
-                return $string . ' ' . $operation . ' INTERVAL ' . abs($getUserUTCOffset) . ' MINUTE';
+                return $string.' '.$operation.' INTERVAL '.abs($getUserUTCOffset).' MINUTE';
             case 'avg':
                 return "avg($string)";
 		}
@@ -672,15 +672,15 @@ 
 	 */
 	protected function isEngineEnabled($engine)
 	{
-		if(!is_string($engine)) return false;
+		if (!is_string($engine)) return false;
 
 		$engine = strtoupper($engine);
 
 		$r = $this->query("SHOW ENGINES");
 
-		while ( $row = $this->fetchByAssoc($r) )
-			if ( strtoupper($row['Engine']) == $engine )
-				return ($row['Support']=='YES' || $row['Support']=='DEFAULT');
+		while ($row = $this->fetchByAssoc($r))
+			if (strtoupper($row['Engine']) == $engine)
+				return ($row['Support'] == 'YES' || $row['Support'] == 'DEFAULT');
 
 		return false;
 	}
@@ -708,9 +708,9 @@ 
 	*/
 	public function createTableSQLParams($tablename, $fieldDefs, $indices, $engine = null)
 	{
-		if ( empty($engine) && isset($fieldDefs['engine']))
+		if (empty($engine) && isset($fieldDefs['engine']))
 			$engine = $fieldDefs['engine'];
-		if ( !$this->isEngineEnabled($engine) )
+		if (!$this->isEngineEnabled($engine))
 			$engine = '';
 
 		$columns = $this->columnSQLRep($fieldDefs, false, $tablename);
@@ -723,13 +723,13 @@ 
 
 		// cn: bug 9873 - module tables do not get created in utf8 with assoc collation
 		$collation = $this->getOption('collation');
-		if(empty($collation)) {
+		if (empty($collation)) {
 		    $collation = 'utf8_general_ci';
 		}
 		$sql = "CREATE TABLE $tablename ($columns $keys) CHARACTER SET utf8 COLLATE $collation";
 
 		if (!empty($engine))
-			$sql.= " ENGINE=$engine";
+			$sql .= " ENGINE=$engine";
 
 		return $sql;
 	}
@@ -741,7 +741,7 @@ 
     public function isTextType($type)
     {
         $type = $this->getColumnType(strtolower($type));
-        return in_array($type, array('blob','text','longblob', 'longtext'));
+        return in_array($type, array('blob', 'text', 'longblob', 'longtext'));
     }
 
 	/**
@@ -752,16 +752,16 @@ 
 		// always return as array for post-processing
 		$ref = parent::oneColumnSQLRep($fieldDef, $ignoreRequired, $table, true);
 
-		if ( $ref['colType'] == 'int' && !empty($fieldDef['len']) ) {
+		if ($ref['colType'] == 'int' && !empty($fieldDef['len'])) {
 			$ref['colType'] .= "(".$fieldDef['len'].")";
 		}
 
 		// bug 22338 - don't set a default value on text or blob fields
-		if ( isset($ref['default']) &&
+		if (isset($ref['default']) &&
             in_array($ref['colBaseType'], array('text', 'blob', 'longtext', 'longblob')))
 			    $ref['default'] = '';
 
-		if ( $return_as_array )
+		if ($return_as_array)
 			return $ref;
 		else
 			return "{$ref['name']} {$ref['colType']} {$ref['default']} {$ref['required']} {$ref['auto_increment']}";
@@ -773,8 +773,8 @@ 
 	protected function changeColumnSQL($tablename, $fieldDefs, $action, $ignoreRequired = false)
 	{
 		$columns = array();
-		if ($this->isFieldArray($fieldDefs)){
-			foreach ($fieldDefs as $def){
+		if ($this->isFieldArray($fieldDefs)) {
+			foreach ($fieldDefs as $def) {
 				if ($action == 'drop')
 					$columns[] = $def['name'];
 				else
@@ -811,7 +811,7 @@ 
 
 	$columns = array();
 	foreach ($indices as $index) {
-		if(!empty($index['db']) && $index['db'] != $this->dbType)
+		if (!empty($index['db']) && $index['db'] != $this->dbType)
 			continue;
 		if (isset($index['source']) && $index['source'] != 'db')
 			continue;
@@ -841,7 +841,7 @@ 
 				* that this can easily be fixed by referring to db dictionary
 				* to find the correct primary field name
 				*/
-			if ( $alter_table )
+			if ($alter_table)
 				$columns[] = " INDEX $name ($fields)";
 			else
 				$columns[] = " KEY $name ($fields)";
@@ -850,13 +850,13 @@ 
 			if ($this->full_text_indexing_installed())
 				$columns[] = " FULLTEXT ($fields)";
 			else
-				$GLOBALS['log']->debug('MYISAM engine is not available/enabled, full-text indexes will be skipped. Skipping:',$name);
+				$GLOBALS['log']->debug('MYISAM engine is not available/enabled, full-text indexes will be skipped. Skipping:', $name);
 			break;
 		}
 	}
 	$columns = implode(", $alter_action ", $columns);
-	if(!empty($alter_action)){
-		$columns = $alter_action . ' '. $columns;
+	if (!empty($alter_action)) {
+		$columns = $alter_action.' '.$columns;
 	}
 	return $columns;
 	}
@@ -878,7 +878,7 @@ 
 	public function setAutoIncrementStart($table, $field_name, $start_value)
 	{
 		$start_value = (int)$start_value;
-		return $this->query( "ALTER TABLE $table AUTO_INCREMENT = $start_value;");
+		return $this->query("ALTER TABLE $table AUTO_INCREMENT = $start_value;");
 	}
 
 	/**
@@ -907,18 +907,18 @@ 
 		$result = $this->query("SHOW INDEX FROM $tablename");
 
 		$indices = array();
-		while (($row=$this->fetchByAssoc($result)) !=null) {
-			$index_type='index';
-			if ($row['Key_name'] =='PRIMARY') {
-				$index_type='primary';
+		while (($row = $this->fetchByAssoc($result)) != null) {
+			$index_type = 'index';
+			if ($row['Key_name'] == 'PRIMARY') {
+				$index_type = 'primary';
 			}
-			elseif ( $row['Non_unique'] == '0' ) {
-				$index_type='unique';
+			elseif ($row['Non_unique'] == '0') {
+				$index_type = 'unique';
 			}
 			$name = strtolower($row['Key_name']);
-			$indices[$name]['name']=$name;
-			$indices[$name]['type']=$index_type;
-			$indices[$name]['fields'][]=strtolower($row['Column_name']);
+			$indices[$name]['name'] = $name;
+			$indices[$name]['type'] = $index_type;
+			$indices[$name]['fields'][] = strtolower($row['Column_name']);
 		}
 		return $indices;
 	}
@@ -929,11 +929,11 @@ 
 	public function add_drop_constraint($table, $definition, $drop = false)
 	{
 		$type         = $definition['type'];
-		$fields       = implode(',',$definition['fields']);
+		$fields       = implode(',', $definition['fields']);
 		$name         = $definition['name'];
 		$sql          = '';
 
-		switch ($type){
+		switch ($type) {
 		// generic indices
 		case 'index':
 		case 'alternate_key':
@@ -977,7 +977,7 @@ 
 	 */
 	public function fetchOne($sql, $dieOnError = false, $msg = '', $suppress = false)
 	{
-		if(stripos($sql, ' LIMIT ') === false) {
+		if (stripos($sql, ' LIMIT ') === false) {
 			// little optimization to just fetch one row
 			$sql .= " LIMIT 0,1";
 		}
@@ -997,13 +997,13 @@ 
 	 */
 	public function massageFieldDef(&$fieldDef, $tablename)
 	{
-		parent::massageFieldDef($fieldDef,$tablename);
+		parent::massageFieldDef($fieldDef, $tablename);
 
-		if ( isset($fieldDef['default']) &&
+		if (isset($fieldDef['default']) &&
 			($fieldDef['dbType'] == 'text'
 				|| $fieldDef['dbType'] == 'blob'
 				|| $fieldDef['dbType'] == 'longtext'
-				|| $fieldDef['dbType'] == 'longblob' ))
+				|| $fieldDef['dbType'] == 'longblob'))
 			unset($fieldDef['default']);
 		if ($fieldDef['dbType'] == 'uint')
 			$fieldDef['len'] = '10';
@@ -1011,22 +1011,22 @@ 
 			$fieldDef['len'] = '20';
 		if ($fieldDef['dbType'] == 'bool')
 			$fieldDef['type'] = 'tinyint';
-		if ($fieldDef['dbType'] == 'bool' && empty($fieldDef['default']) )
+		if ($fieldDef['dbType'] == 'bool' && empty($fieldDef['default']))
 			$fieldDef['default'] = '0';
-		if (($fieldDef['dbType'] == 'varchar' || $fieldDef['dbType'] == 'enum') && empty($fieldDef['len']) )
+		if (($fieldDef['dbType'] == 'varchar' || $fieldDef['dbType'] == 'enum') && empty($fieldDef['len']))
 			$fieldDef['len'] = '255';
 		if ($fieldDef['dbType'] == 'uint')
 			$fieldDef['len'] = '10';
-		if ($fieldDef['dbType'] == 'int' && empty($fieldDef['len']) )
+		if ($fieldDef['dbType'] == 'int' && empty($fieldDef['len']))
 			$fieldDef['len'] = '11';
 
-		if($fieldDef['dbType'] == 'decimal') {
-			if(isset($fieldDef['len'])) {
-				if(strstr($fieldDef['len'], ",") === false) {
+		if ($fieldDef['dbType'] == 'decimal') {
+			if (isset($fieldDef['len'])) {
+				if (strstr($fieldDef['len'], ",") === false) {
 					$fieldDef['len'] .= ",0";
 				}
 			} else {
-				$fieldDef['len']  = '10,0';
+				$fieldDef['len'] = '10,0';
 			}
 		}
 	}
@@ -1046,8 +1046,8 @@ 
 	{
 		$sql = array();
 		foreach ($indexes as $index) {
-			$name =$index['name'];
-			if($execute) {
+			$name = $index['name'];
+			if ($execute) {
 			unset(self::$index_descriptions[$tablename][$name]);
 			}
 			if ($index['type'] == 'primary') {
@@ -1057,8 +1057,8 @@ 
 			}
 		}
 		if (!empty($sql)) {
-            $sql = "ALTER TABLE $tablename " . join(",", $sql) . ";";
-			if($execute)
+            $sql = "ALTER TABLE $tablename ".join(",", $sql).";";
+			if ($execute)
 				$this->query($sql);
 		} else {
 			$sql = '';
@@ -1084,7 +1084,7 @@ 
 		$q = "SHOW COLLATION LIKE 'utf8%'";
 		$r = $this->query($q);
 		$res = array();
-		while($a = $this->fetchByAssoc($r)) {
+		while ($a = $this->fetchByAssoc($r)) {
 			$res[] = $a['Collation'];
 		}
 		return $res;
@@ -1104,13 +1104,13 @@ 
 	public function emptyValue($type)
 	{
 		$ctype = $this->getColumnType($type);
-		if($ctype == "datetime") {
+		if ($ctype == "datetime") {
 			return $this->convert($this->quoted("0000-00-00 00:00:00"), "datetime");
 		}
-		if($ctype == "date") {
+		if ($ctype == "date") {
 			return $this->convert($this->quoted("0000-00-00"), "date");
 		}
-		if($ctype == "time") {
+		if ($ctype == "time") {
 			return $this->convert($this->quoted("00:00:00"), "time");
 		}
 		return parent::emptyValue($type);
@@ -1122,13 +1122,13 @@ 
 	 */
 	public function lastDbError()
 	{
-		if($this->database) {
-		    if(mysql_errno($this->database)) {
+		if ($this->database) {
+		    if (mysql_errno($this->database)) {
 			    return "MySQL error ".mysql_errno($this->database).": ".mysql_error($this->database);
 		    }
 		} else {
-			$err =  mysql_error();
-			if($err) {
+			$err = mysql_error();
+			if ($err) {
 			    return $err;
 			}
 		}
@@ -1141,7 +1141,7 @@ 
 	 */
 	protected function quoteTerm($term)
 	{
-		if(strpos($term, ' ') !== false) {
+		if (strpos($term, ' ') !== false) {
 			return '"'.$term.'"';
 		}
 		return $term;
@@ -1157,16 +1157,16 @@ 
 	public function getFulltextQuery($field, $terms, $must_terms = array(), $exclude_terms = array())
 	{
 		$condition = array();
-		foreach($terms as $term) {
+		foreach ($terms as $term) {
 			$condition[] = $this->quoteTerm($term);
 		}
-		foreach($must_terms as $term) {
+		foreach ($must_terms as $term) {
 			$condition[] = "+".$this->quoteTerm($term);
 		}
-		foreach($exclude_terms as $term) {
+		foreach ($exclude_terms as $term) {
 			$condition[] = "-".$this->quoteTerm($term);
 		}
-		$condition = $this->quoted(join(" ",$condition));
+		$condition = $this->quoted(join(" ", $condition));
 		return "MATCH($field) AGAINST($condition IN BOOLEAN MODE)";
 	}
 
@@ -1178,7 +1178,7 @@ 
 	{
 		$charsets = array();
 		$res = $this->query("show variables like 'character\\_set\\_%'");
-		while($row = $this->fetchByAssoc($res)) {
+		while ($row = $this->fetchByAssoc($res)) {
 			$charsets[$row['Variable_name']] = $row['Value'];
 		}
 		return $charsets;
@@ -1188,7 +1188,7 @@ 
 	{
 		$charsets = $this->getCharsetInfo();
 		$charset_str = array();
-		foreach($charsets as $name => $value) {
+		foreach ($charsets as $name => $value) {
 			$charset_str[] = "$name = $value";
 		}
 		return array(
@@ -1210,18 +1210,18 @@ 
 	{
 		$this->log->debug("creating temp table for [$table]...");
 		$result = $this->query("SHOW CREATE TABLE {$table}");
-		if(empty($result)) {
+		if (empty($result)) {
 			return false;
 		}
 		$row = $this->fetchByAssoc($result);
-		if(empty($row) || empty($row['Create Table'])) {
+		if (empty($row) || empty($row['Create Table'])) {
 		    return false;
 		}
 		$create = $row['Create Table'];
 		// rewrite DDL with _temp name
 		$tempTableQuery = str_replace("CREATE TABLE `{$table}`", "CREATE TABLE `{$table}__uw_temp`", $create);
 		$r2 = $this->query($tempTableQuery);
-		if(empty($r2)) {
+		if (empty($r2)) {
 			return false;
 		}
 
@@ -1243,11 +1243,11 @@ 
 		$this->log->debug("verifying ALTER TABLE");
 		// Skipping ALTER TABLE [table] DROP PRIMARY KEY because primary keys are not being copied
 		// over to the temp tables
-		if(strpos(strtoupper($query), 'DROP PRIMARY KEY') !== false) {
+		if (strpos(strtoupper($query), 'DROP PRIMARY KEY') !== false) {
 			$this->log->debug("Skipping DROP PRIMARY KEY");
 			return '';
 		}
-		if(!$this->makeTempTableCopy($table)) {
+		if (!$this->makeTempTableCopy($table)) {
 			return 'Could not create temp table copy';
 		}
 
@@ -1255,7 +1255,7 @@ 
 		$this->log->debug('testing query: ['.$query.']');
 		$tempTableTestQuery = str_replace("ALTER TABLE `{$table}`", "ALTER TABLE `{$table}__uw_temp`", $query);
 		if (strpos($tempTableTestQuery, 'idx') === false) {
-			if(strpos($tempTableTestQuery, '__uw_temp') === false) {
+			if (strpos($tempTableTestQuery, '__uw_temp') === false) {
 				return 'Could not use a temp table to test query!';
 			}
 
@@ -1268,7 +1268,7 @@ 
 			$this->query($tempTableTestQuery_idx, false, "Preflight Failed for: {$query}");
 		}
 		$mysqlError = $this->getL();
-		if(!empty($mysqlError)) {
+		if (!empty($mysqlError)) {
 			return $mysqlError;
 		}
 		$this->dropTableName("{$table}__uw_temp");
@@ -1280,13 +1280,13 @@ 
 	{
 		$this->log->debug("verifying $querytype statement");
 
-		if(!$this->makeTempTableCopy($table)) {
+		if (!$this->makeTempTableCopy($table)) {
 			return 'Could not create temp table copy';
 		}
 		// test the query on the test table
 		$this->log->debug('testing query: ['.$query.']');
 		$tempTableTestQuery = str_replace("$querytype `{$table}`", "$querytype `{$table}__uw_temp`", $query);
-		if(strpos($tempTableTestQuery, '__uw_temp') === false) {
+		if (strpos($tempTableTestQuery, '__uw_temp') === false) {
 			return 'Could not use a temp table to test query!';
 		}
 
@@ -1366,11 +1366,11 @@ 
 	public function userExists($username)
 	{
 		$db = $this->getOne("SELECT DATABASE()");
-		if(!$this->selectDb("mysql")) {
+		if (!$this->selectDb("mysql")) {
 			return false;
 		}
 		$user = $this->getOne("select count(*) from user where user = ".$this->quoted($username));
-		if(!$this->selectDb($db)) {
+		if (!$this->selectDb($db)) {
 			$this->checkError("Cannot select database $db", true);
 		}
 		return !empty($user);
@@ -1392,7 +1392,7 @@ 
 							IDENTIFIED BY '{$qpassword}';", true);
 
 		$this->query("SET PASSWORD FOR \"{$user}\"@\"{$host_name}\" = password('{$qpassword}');", true);
-		if($host_name != 'localhost') {
+		if ($host_name != 'localhost') {
 			$this->createDbUser($database_name, "localhost", $user, $password);
 		}
 	}
@@ -1438,10 +1438,10 @@ 
 	public function canInstall()
 	{
 		$db_version = $this->version();
-		if(empty($db_version)) {
+		if (empty($db_version)) {
 			return array('ERR_DB_VERSION_FAILURE');
 		}
-		if(version_compare($db_version, '4.1.2') < 0) {
+		if (version_compare($db_version, '4.1.2') < 0) {
 			return array('ERR_DB_MYSQL_VERSION', $db_version);
 		}
 		return true;

Braces +184 added lines, -128 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -185,8 +187,9 @@ 
 		$GLOBALS['log']->info('Query Execution Time:'.$this->query_time);
 
 
-		if($keepResult)
-			$this->lastResult = $result;
+		if($keepResult) {
+					$this->lastResult = $result;
+		}
 
 		$this->checkError($msg.' Query Failed:' . $sql . '::', $dieOnError);
 		return $result;
@@ -236,8 +239,9 @@ 
 	 */
 	protected function freeDbResult($dbResult)
 	{
-		if(!empty($dbResult))
-			mysql_free_result($dbResult);
+		if(!empty($dbResult)) {
+					mysql_free_result($dbResult);
+		}
 	}
 
 
@@ -260,8 +264,9 @@ 
 	{
         $start = (int)$start;
         $count = (int)$count;
-	    if ($start < 0)
-			$start = 0;
+	    if ($start < 0) {
+	    			$start = 0;
+	    }
 		$GLOBALS['log']->debug('Limit Query:' . $sql. ' Start: ' .$start . ' count: ' . $count);
 
 	    $sql = "$sql LIMIT $start,$count";
@@ -286,21 +291,27 @@ 
 		$result   = $this->query('EXPLAIN ' . $sql);
 		$badQuery = array();
 		while ($row = $this->fetchByAssoc($result)) {
-			if (empty($row['table']))
-				continue;
+			if (empty($row['table'])) {
+							continue;
+			}
 			$badQuery[$row['table']] = '';
-			if (strtoupper($row['type']) == 'ALL')
-				$badQuery[$row['table']]  .=  ' Full Table Scan;';
-			if (empty($row['key']))
-				$badQuery[$row['table']] .= ' No Index Key Used;';
-			if (!empty($row['Extra']) && substr_count($row['Extra'], 'Using filesort') > 0)
-				$badQuery[$row['table']] .= ' Using FileSort;';
-			if (!empty($row['Extra']) && substr_count($row['Extra'], 'Using temporary') > 0)
-				$badQuery[$row['table']] .= ' Using Temporary Table;';
+			if (strtoupper($row['type']) == 'ALL') {
+							$badQuery[$row['table']]  .=  ' Full Table Scan;';
+			}
+			if (empty($row['key'])) {
+							$badQuery[$row['table']] .= ' No Index Key Used;';
+			}
+			if (!empty($row['Extra']) && substr_count($row['Extra'], 'Using filesort') > 0) {
+							$badQuery[$row['table']] .= ' Using FileSort;';
+			}
+			if (!empty($row['Extra']) && substr_count($row['Extra'], 'Using temporary') > 0) {
+							$badQuery[$row['table']] .= ' Using Temporary Table;';
+			}
 		}
 
-		if ( empty($badQuery) )
-			return true;
+		if ( empty($badQuery) ) {
+					return true;
+		}
 
 		foreach($badQuery as $table=>$data ){
 			if(!empty($data)){
@@ -308,8 +319,7 @@ 
 				if(!empty($GLOBALS['sugar_config']['check_query_log'])){
 					$GLOBALS['log']->fatal($sql);
 					$GLOBALS['log']->fatal('CHECK QUERY:' .$warning);
-				}
-				else{
+				} else{
 					$GLOBALS['log']->warn('CHECK QUERY:' .$warning);
 				}
 			}
@@ -333,14 +343,18 @@ 
 			$matches = array();
 			preg_match_all('/(\w+)(?:\(([0-9]+,?[0-9]*)\)|)( unsigned)?/i', $row['Type'], $matches);
 			$columns[$name]['type']=strtolower($matches[1][0]);
-			if ( isset($matches[2][0]) && in_array(strtolower($matches[1][0]),array('varchar','char','varchar2','int','decimal','float')) )
-				$columns[$name]['len']=strtolower($matches[2][0]);
-			if ( stristr($row['Extra'],'auto_increment') )
-				$columns[$name]['auto_increment'] = '1';
-			if ($row['Null'] == 'NO' && !stristr($row['Key'],'PRI'))
-				$columns[$name]['required'] = 'true';
-			if (!empty($row['Default']) )
-				$columns[$name]['default'] = $row['Default'];
+			if ( isset($matches[2][0]) && in_array(strtolower($matches[1][0]),array('varchar','char','varchar2','int','decimal','float')) ) {
+							$columns[$name]['len']=strtolower($matches[2][0]);
+			}
+			if ( stristr($row['Extra'],'auto_increment') ) {
+							$columns[$name]['auto_increment'] = '1';
+			}
+			if ($row['Null'] == 'NO' && !stristr($row['Key'],'PRI')) {
+							$columns[$name]['required'] = 'true';
+			}
+			if (!empty($row['Default']) ) {
+							$columns[$name]['default'] = $row['Default'];
+			}
 		}
 		return $columns;
 	}
@@ -352,17 +366,20 @@ 
 	{
 		$field_array = array();
 
-		if(empty($result))
-			return 0;
+		if(empty($result)) {
+					return 0;
+		}
 
 		$fields = mysql_num_fields($result);
 		for ($i=0; $i < $fields; $i++) {
 			$meta = mysql_fetch_field($result, $i);
-			if (!$meta)
-				return array();
+			if (!$meta) {
+							return array();
+			}
 
-			if($make_lower_case == true)
-				$meta->name = strtolower($meta->name);
+			if($make_lower_case == true) {
+							$meta->name = strtolower($meta->name);
+			}
 
 			$field_array[] = $meta->name;
 		}
@@ -375,7 +392,9 @@ 
 	 */
 	public function fetchRow($result)
 	{
-		if (empty($result))	return false;
+		if (empty($result)) {
+		    return false;
+		}
 
 		return mysql_fetch_assoc($result);
 	}
@@ -419,7 +438,9 @@ 
 
 		if ($this->getDatabase()) {
 			$result = $this->query("SHOW TABLES LIKE ".$this->quoted($tableName));
-			if(empty($result)) return false;
+			if(empty($result)) {
+			    return false;
+			}
 			$row = $this->fetchByAssoc($result);
 			return !empty($row);
 		}
@@ -474,8 +495,9 @@ 
 	{
 		global $sugar_config;
 
-		if(is_null($configOptions))
-			$configOptions = $sugar_config['dbconfig'];
+		if(is_null($configOptions)) {
+					$configOptions = $sugar_config['dbconfig'];
+		}
 
 		if ($this->getOption('persistent')) {
 			$this->database = @mysql_pconnect(
@@ -528,8 +550,9 @@ 
 		}
 	    mysql_query($names, $this->database);
 
-		if(!$this->checkError('Could Not Connect:', $dieOnError))
-			$GLOBALS['log']->info("connected to db");
+		if(!$this->checkError('Could Not Connect:', $dieOnError)) {
+					$GLOBALS['log']->info("connected to db");
+		}
 		$this->connectOptions = $configOptions;
 
 		$GLOBALS['log']->info("Connect:".$this->database);
@@ -546,8 +569,9 @@ 
 	{
 		$sql = parent::repairTableParams($tablename,$fielddefs,$indices,false,$engine);
 
-		if ( $sql == '' )
-			return '';
+		if ( $sql == '' ) {
+					return '';
+		}
 
 		if ( stristr($sql,'create table') )
 		{
@@ -574,8 +598,9 @@ 
 		$sql = str_replace("\n","",$sql);
 		$sql = "ALTER TABLE $tablename $sql";
 
-		if ( $execute )
-			$this->query($sql,'Error with MySQL repair table');
+		if ( $execute ) {
+					$this->query($sql,'Error with MySQL repair table');
+		}
 
 		// and re-add the comments at the beginning
 		$sql = implode("\n",$commentBlocks) . "\n". $sql . "\n";
@@ -672,15 +697,18 @@ 
 	 */
 	protected function isEngineEnabled($engine)
 	{
-		if(!is_string($engine)) return false;
+		if(!is_string($engine)) {
+		    return false;
+		}
 
 		$engine = strtoupper($engine);
 
 		$r = $this->query("SHOW ENGINES");
 
-		while ( $row = $this->fetchByAssoc($r) )
-			if ( strtoupper($row['Engine']) == $engine )
+		while ( $row = $this->fetchByAssoc($r) ) {
+					if ( strtoupper($row['Engine']) == $engine )
 				return ($row['Support']=='YES' || $row['Support']=='DEFAULT');
+		}
 
 		return false;
 	}
@@ -708,18 +736,22 @@ 
 	*/
 	public function createTableSQLParams($tablename, $fieldDefs, $indices, $engine = null)
 	{
-		if ( empty($engine) && isset($fieldDefs['engine']))
-			$engine = $fieldDefs['engine'];
-		if ( !$this->isEngineEnabled($engine) )
-			$engine = '';
+		if ( empty($engine) && isset($fieldDefs['engine'])) {
+					$engine = $fieldDefs['engine'];
+		}
+		if ( !$this->isEngineEnabled($engine) ) {
+					$engine = '';
+		}
 
 		$columns = $this->columnSQLRep($fieldDefs, false, $tablename);
-		if (empty($columns))
-			return false;
+		if (empty($columns)) {
+					return false;
+		}
 
 		$keys = $this->keysSQL($indices);
-		if (!empty($keys))
-			$keys = ",$keys";
+		if (!empty($keys)) {
+					$keys = ",$keys";
+		}
 
 		// cn: bug 9873 - module tables do not get created in utf8 with assoc collation
 		$collation = $this->getOption('collation');
@@ -728,8 +760,9 @@ 
 		}
 		$sql = "CREATE TABLE $tablename ($columns $keys) CHARACTER SET utf8 COLLATE $collation";
 
-		if (!empty($engine))
-			$sql.= " ENGINE=$engine";
+		if (!empty($engine)) {
+					$sql.= " ENGINE=$engine";
+		}
 
 		return $sql;
 	}
@@ -758,13 +791,15 @@ 
 
 		// bug 22338 - don't set a default value on text or blob fields
 		if ( isset($ref['default']) &&
-            in_array($ref['colBaseType'], array('text', 'blob', 'longtext', 'longblob')))
-			    $ref['default'] = '';
+            in_array($ref['colBaseType'], array('text', 'blob', 'longtext', 'longblob'))) {
+					    $ref['default'] = '';
+		}
 
-		if ( $return_as_array )
-			return $ref;
-		else
-			return "{$ref['name']} {$ref['colType']} {$ref['default']} {$ref['required']} {$ref['auto_increment']}";
+		if ( $return_as_array ) {
+					return $ref;
+		} else {
+					return "{$ref['name']} {$ref['colType']} {$ref['default']} {$ref['required']} {$ref['auto_increment']}";
+		}
 	}
 
 	/**
@@ -775,16 +810,18 @@ 
 		$columns = array();
 		if ($this->isFieldArray($fieldDefs)){
 			foreach ($fieldDefs as $def){
-				if ($action == 'drop')
-					$columns[] = $def['name'];
-				else
-					$columns[] = $this->oneColumnSQLRep($def, $ignoreRequired);
+				if ($action == 'drop') {
+									$columns[] = $def['name'];
+				} else {
+									$columns[] = $this->oneColumnSQLRep($def, $ignoreRequired);
+				}
 			}
 		} else {
-			if ($action == 'drop')
-				$columns[] = $fieldDefs['name'];
-		else
-			$columns[] = $this->oneColumnSQLRep($fieldDefs);
+			if ($action == 'drop') {
+							$columns[] = $fieldDefs['name'];
+			} else {
+					$columns[] = $this->oneColumnSQLRep($fieldDefs);
+		}
 		}
 
 		return "ALTER TABLE $tablename $action COLUMN ".implode(",$action column ", $columns);
@@ -806,23 +843,27 @@ 
 	{
 	// check if the passed value is an array of fields.
 	// if not, convert it into an array
-	if (!$this->isFieldArray($indices))
-		$indices[] = $indices;
+	if (!$this->isFieldArray($indices)) {
+			$indices[] = $indices;
+	}
 
 	$columns = array();
 	foreach ($indices as $index) {
-		if(!empty($index['db']) && $index['db'] != $this->dbType)
-			continue;
-		if (isset($index['source']) && $index['source'] != 'db')
-			continue;
+		if(!empty($index['db']) && $index['db'] != $this->dbType) {
+					continue;
+		}
+		if (isset($index['source']) && $index['source'] != 'db') {
+					continue;
+		}
 
 		$type = $index['type'];
 		$name = $index['name'];
 
-		if (is_array($index['fields']))
-			$fields = implode(", ", $index['fields']);
-		else
-			$fields = $index['fields'];
+		if (is_array($index['fields'])) {
+					$fields = implode(", ", $index['fields']);
+		} else {
+					$fields = $index['fields'];
+		}
 
 		switch ($type) {
 		case 'unique':
@@ -841,16 +882,18 @@ 
 				* that this can easily be fixed by referring to db dictionary
 				* to find the correct primary field name
 				*/
-			if ( $alter_table )
-				$columns[] = " INDEX $name ($fields)";
-			else
-				$columns[] = " KEY $name ($fields)";
+			if ( $alter_table ) {
+							$columns[] = " INDEX $name ($fields)";
+			} else {
+							$columns[] = " KEY $name ($fields)";
+			}
 			break;
 		case 'fulltext':
-			if ($this->full_text_indexing_installed())
-				$columns[] = " FULLTEXT ($fields)";
-			else
-				$GLOBALS['log']->debug('MYISAM engine is not available/enabled, full-text indexes will be skipped. Skipping:',$name);
+			if ($this->full_text_indexing_installed()) {
+							$columns[] = " FULLTEXT ($fields)";
+			} else {
+							$GLOBALS['log']->debug('MYISAM engine is not available/enabled, full-text indexes will be skipped. Skipping:',$name);
+			}
 			break;
 		}
 	}
@@ -892,8 +935,9 @@ 
 	{
 		$result = $this->query("SHOW TABLE STATUS LIKE '$table'");
 		$row = $this->fetchByAssoc($result);
-		if (!empty($row['Auto_increment']))
-			return $row['Auto_increment'];
+		if (!empty($row['Auto_increment'])) {
+					return $row['Auto_increment'];
+		}
 
 		return "";
 	}
@@ -911,8 +955,7 @@ 
 			$index_type='index';
 			if ($row['Key_name'] =='PRIMARY') {
 				$index_type='primary';
-			}
-			elseif ( $row['Non_unique'] == '0' ) {
+			} elseif ( $row['Non_unique'] == '0' ) {
 				$index_type='unique';
 			}
 			$name = strtolower($row['Key_name']);
@@ -938,29 +981,33 @@ 
 		case 'index':
 		case 'alternate_key':
 		case 'clustered':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP INDEX {$name} ";
-			else
-				$sql = "ALTER TABLE {$table} ADD INDEX {$name} ({$fields})";
+			if ($drop) {
+							$sql = "ALTER TABLE {$table} DROP INDEX {$name} ";
+			} else {
+							$sql = "ALTER TABLE {$table} ADD INDEX {$name} ({$fields})";
+			}
 			break;
 		// constraints as indices
 		case 'unique':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP INDEX $name";
-			else
-				$sql = "ALTER TABLE {$table} ADD CONSTRAINT UNIQUE {$name} ({$fields})";
+			if ($drop) {
+							$sql = "ALTER TABLE {$table} DROP INDEX $name";
+			} else {
+							$sql = "ALTER TABLE {$table} ADD CONSTRAINT UNIQUE {$name} ({$fields})";
+			}
 			break;
 		case 'primary':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP PRIMARY KEY";
-			else
-				$sql = "ALTER TABLE {$table} ADD CONSTRAINT PRIMARY KEY ({$fields})";
+			if ($drop) {
+							$sql = "ALTER TABLE {$table} DROP PRIMARY KEY";
+			} else {
+							$sql = "ALTER TABLE {$table} ADD CONSTRAINT PRIMARY KEY ({$fields})";
+			}
 			break;
 		case 'foreign':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP FOREIGN KEY ({$fields})";
-			else
-				$sql = "ALTER TABLE {$table} ADD CONSTRAINT FOREIGN KEY {$name} ({$fields}) REFERENCES {$definition['foreignTable']}({$definition['foreignField']})";
+			if ($drop) {
+							$sql = "ALTER TABLE {$table} DROP FOREIGN KEY ({$fields})";
+			} else {
+							$sql = "ALTER TABLE {$table} ADD CONSTRAINT FOREIGN KEY {$name} ({$fields}) REFERENCES {$definition['foreignTable']}({$definition['foreignField']})";
+			}
 			break;
 		}
 		return $sql;
@@ -1003,22 +1050,30 @@ 
 			($fieldDef['dbType'] == 'text'
 				|| $fieldDef['dbType'] == 'blob'
 				|| $fieldDef['dbType'] == 'longtext'
-				|| $fieldDef['dbType'] == 'longblob' ))
-			unset($fieldDef['default']);
-		if ($fieldDef['dbType'] == 'uint')
-			$fieldDef['len'] = '10';
-		if ($fieldDef['dbType'] == 'ulong')
-			$fieldDef['len'] = '20';
-		if ($fieldDef['dbType'] == 'bool')
-			$fieldDef['type'] = 'tinyint';
-		if ($fieldDef['dbType'] == 'bool' && empty($fieldDef['default']) )
-			$fieldDef['default'] = '0';
-		if (($fieldDef['dbType'] == 'varchar' || $fieldDef['dbType'] == 'enum') && empty($fieldDef['len']) )
-			$fieldDef['len'] = '255';
-		if ($fieldDef['dbType'] == 'uint')
-			$fieldDef['len'] = '10';
-		if ($fieldDef['dbType'] == 'int' && empty($fieldDef['len']) )
-			$fieldDef['len'] = '11';
+				|| $fieldDef['dbType'] == 'longblob' )) {
+					unset($fieldDef['default']);
+		}
+		if ($fieldDef['dbType'] == 'uint') {
+					$fieldDef['len'] = '10';
+		}
+		if ($fieldDef['dbType'] == 'ulong') {
+					$fieldDef['len'] = '20';
+		}
+		if ($fieldDef['dbType'] == 'bool') {
+					$fieldDef['type'] = 'tinyint';
+		}
+		if ($fieldDef['dbType'] == 'bool' && empty($fieldDef['default']) ) {
+					$fieldDef['default'] = '0';
+		}
+		if (($fieldDef['dbType'] == 'varchar' || $fieldDef['dbType'] == 'enum') && empty($fieldDef['len']) ) {
+					$fieldDef['len'] = '255';
+		}
+		if ($fieldDef['dbType'] == 'uint') {
+					$fieldDef['len'] = '10';
+		}
+		if ($fieldDef['dbType'] == 'int' && empty($fieldDef['len']) ) {
+					$fieldDef['len'] = '11';
+		}
 
 		if($fieldDef['dbType'] == 'decimal') {
 			if(isset($fieldDef['len'])) {
@@ -1058,8 +1113,9 @@ 
 		}
 		if (!empty($sql)) {
             $sql = "ALTER TABLE $tablename " . join(",", $sql) . ";";
-			if($execute)
-				$this->query($sql);
+			if($execute) {
+							$this->query($sql);
+			}
 		} else {
 			$sql = '';
 		}

Doc Comments +5 added lines, -2 removed lines

@@ -651,7 +651,7 @@ 
 	/**
 	 * Returns the name of the engine to use or null if we are to use the default
 	 *
-	 * @param  object $bean SugarBean instance
+	 * @param  SugarBean $bean SugarBean instance
 	 * @return string
 	 */
 	protected function getEngine($bean)
@@ -1149,7 +1149,7 @@ 
 
 	/**
 	 * Generate fulltext query from set of terms
-	 * @param string $fields Field to search against
+	 * @param string $field Field to search against
 	 * @param array $terms Search terms that may be or not be in the result
 	 * @param array $must_terms Search terms that have to be in the result
 	 * @param array $exclude_terms Search terms that have to be not in the result
@@ -1276,6 +1276,9 @@ 
 		return '';
 	}
 
+	/**
+	 * @param string $querytype
+	 */
 	protected function verifyGenericReplaceQuery($querytype, $table, $query)
 	{
 		$this->log->debug("verifying $querytype statement");

include/database/MysqliManager.php

Braces +34 added lines, -19 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -135,8 +137,9 @@ 
 		$result = $suppress?@mysqli_query($this->database,$sql):mysqli_query($this->database,$sql);
 		$md5 = md5($sql);
 
-		if (empty($queryMD5[$md5]))
-			$queryMD5[$md5] = true;
+		if (empty($queryMD5[$md5])) {
+					$queryMD5[$md5] = true;
+		}
 
 		$this->query_time = microtime(true) - $this->query_time;
 		$GLOBALS['log']->info('Query Execution Time:'.$this->query_time);
@@ -154,8 +157,9 @@ 
 		*/
 
 
-		if($keepResult)
-			$this->lastResult = $result;
+		if($keepResult) {
+					$this->lastResult = $result;
+		}
 		$this->checkError($msg.' Query Failed: ' . $sql, $dieOnError);
 
 		return $result;
@@ -208,8 +212,9 @@ 
 	 */
 	protected function freeDbResult($dbResult)
 	{
-		if(!empty($dbResult))
-			mysqli_free_result($dbResult);
+		if(!empty($dbResult)) {
+					mysqli_free_result($dbResult);
+		}
 	}
 
 	/**
@@ -219,17 +224,20 @@ 
 	{
 		$field_array = array();
 
-		if (!isset($result) || empty($result))
-			return 0;
+		if (!isset($result) || empty($result)) {
+					return 0;
+		}
 
 		$i = 0;
 		while ($i < mysqli_num_fields($result)) {
 			$meta = mysqli_fetch_field_direct($result, $i);
-			if (!$meta)
-				return 0;
+			if (!$meta) {
+							return 0;
+			}
 
-			if($make_lower_case == true)
-				$meta->name = strtolower($meta->name);
+			if($make_lower_case == true) {
+							$meta->name = strtolower($meta->name);
+			}
 
 			$field_array[] = $meta->name;
 
@@ -244,10 +252,15 @@ 
 	 */
 	public function fetchRow($result)
 	{
-		if (empty($result))	return false;
+		if (empty($result)) {
+		    return false;
+		}
 
 		$row = mysqli_fetch_assoc($result);
-		if($row == null) $row = false; //Make sure MySQLi driver results are consistent with other database drivers
+		if($row == null) {
+		    $row = false;
+		}
+		//Make sure MySQLi driver results are consistent with other database drivers
 		return $row;
 	}
 
@@ -266,8 +279,9 @@ 
 	{
 		global $sugar_config;
 
-		if (is_null($configOptions))
-			$configOptions = $sugar_config['dbconfig'];
+		if (is_null($configOptions)) {
+					$configOptions = $sugar_config['dbconfig'];
+		}
 
 		if(!isset($this->database)) {
 
@@ -318,8 +332,9 @@ 
 		}
 	    mysqli_query($this->database,$names);
 
-		if($this->checkError('Could Not Connect', $dieOnError))
-			$GLOBALS['log']->info("connected to db");
+		if($this->checkError('Could Not Connect', $dieOnError)) {
+					$GLOBALS['log']->info("connected to db");
+		}
 
 		$this->connectOptions = $configOptions;
 		return true;

Spacing +36 added lines, -36 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -121,18 +121,18 @@ 
 	 */
 	public function query($sql, $dieOnError = false, $msg = '', $suppress = false, $keepResult = false)
 	{
-		if(is_array($sql)) {
+		if (is_array($sql)) {
 			return $this->queryArray($sql, $dieOnError, $msg, $suppress);
         }
 
 		static $queryMD5 = array();
 
 		parent::countQuery($sql);
-		$GLOBALS['log']->info('Query:' . $sql);
+		$GLOBALS['log']->info('Query:'.$sql);
 		$this->checkConnection();
 		$this->query_time = microtime(true);
 		$this->lastsql = $sql;
-		$result = $suppress?@mysqli_query($this->database,$sql):mysqli_query($this->database,$sql);
+		$result = $suppress ? @mysqli_query($this->database, $sql) : mysqli_query($this->database, $sql);
 		$md5 = md5($sql);
 
 		if (empty($queryMD5[$md5]))
@@ -154,9 +154,9 @@ 
 		*/
 
 
-		if($keepResult)
+		if ($keepResult)
 			$this->lastResult = $result;
-		$this->checkError($msg.' Query Failed: ' . $sql, $dieOnError);
+		$this->checkError($msg.' Query Failed: '.$sql, $dieOnError);
 
 		return $result;
 	}
@@ -193,10 +193,10 @@ 
 	 */
 	public function disconnect()
 	{
-		if(isset($GLOBALS['log']) && !is_null($GLOBALS['log'])) {
+		if (isset($GLOBALS['log']) && !is_null($GLOBALS['log'])) {
 			$GLOBALS['log']->debug('Calling MySQLi::disconnect()');
 		}
-		if(!empty($this->database)){
+		if (!empty($this->database)) {
 			$this->freeResult();
 			mysqli_close($this->database);
 			$this->database = null;
@@ -208,7 +208,7 @@ 
 	 */
 	protected function freeDbResult($dbResult)
 	{
-		if(!empty($dbResult))
+		if (!empty($dbResult))
 			mysqli_free_result($dbResult);
 	}
 
@@ -228,7 +228,7 @@ 
 			if (!$meta)
 				return 0;
 
-			if($make_lower_case == true)
+			if ($make_lower_case == true)
 				$meta->name = strtolower($meta->name);
 
 			$field_array[] = $meta->name;
@@ -247,7 +247,7 @@ 
 		if (empty($result))	return false;
 
 		$row = mysqli_fetch_assoc($result);
-		if($row == null) $row = false; //Make sure MySQLi driver results are consistent with other database drivers
+		if ($row == null) $row = false; //Make sure MySQLi driver results are consistent with other database drivers
 		return $row;
 	}
 
@@ -256,7 +256,7 @@ 
 	 */
 	public function quote($string)
 	{
-		return mysqli_real_escape_string($this->getDatabase(),$this->quoteInternal($string));
+		return mysqli_real_escape_string($this->getDatabase(), $this->quoteInternal($string));
 	}
 
 	/**
@@ -269,23 +269,23 @@ 
 		if (is_null($configOptions))
 			$configOptions = $sugar_config['dbconfig'];
 
-		if(!isset($this->database)) {
+		if (!isset($this->database)) {
 
 			//mysqli connector has a separate parameter for port.. We need to separate it out from the host name
-			$dbhost=$configOptions['db_host_name'];
-            $dbport=isset($configOptions['db_port']) ? ($configOptions['db_port'] == '' ? null : $configOptions['db_port']) : null;
+			$dbhost = $configOptions['db_host_name'];
+            $dbport = isset($configOptions['db_port']) ? ($configOptions['db_port'] == '' ? null : $configOptions['db_port']) : null;
 			
-			$pos=strpos($configOptions['db_host_name'],':');
+			$pos = strpos($configOptions['db_host_name'], ':');
 			if ($pos !== false) {
-				$dbhost=substr($configOptions['db_host_name'],0,$pos);
-				$dbport=substr($configOptions['db_host_name'],$pos+1);
+				$dbhost = substr($configOptions['db_host_name'], 0, $pos);
+				$dbport = substr($configOptions['db_host_name'], $pos + 1);
 			}
 
-			$this->database = @mysqli_connect($dbhost,$configOptions['db_user_name'],$configOptions['db_password'],isset($configOptions['db_name'])?$configOptions['db_name']:'',$dbport);
-			if(empty($this->database)) {
-				$GLOBALS['log']->fatal("Could not connect to DB server ".$dbhost." as ".$configOptions['db_user_name'].". port " .$dbport . ": " . mysqli_connect_error());
-				if($dieOnError) {
-					if(isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
+			$this->database = @mysqli_connect($dbhost, $configOptions['db_user_name'], $configOptions['db_password'], isset($configOptions['db_name']) ? $configOptions['db_name'] : '', $dbport);
+			if (empty($this->database)) {
+				$GLOBALS['log']->fatal("Could not connect to DB server ".$dbhost." as ".$configOptions['db_user_name'].". port ".$dbport.": ".mysqli_connect_error());
+				if ($dieOnError) {
+					if (isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
 						sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
 					} else {
 						sugar_die("Could not connect to the database. Please refer to suitecrm.log for details.");
@@ -296,10 +296,10 @@ 
 			}
 		}
 
-		if(!empty($configOptions['db_name']) && !@mysqli_select_db($this->database,$configOptions['db_name'])) {
-			$GLOBALS['log']->fatal( "Unable to select database {$configOptions['db_name']}: " . mysqli_connect_error());
-			if($dieOnError) {
-					if(isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
+		if (!empty($configOptions['db_name']) && !@mysqli_select_db($this->database, $configOptions['db_name'])) {
+			$GLOBALS['log']->fatal("Unable to select database {$configOptions['db_name']}: ".mysqli_connect_error());
+			if ($dieOnError) {
+					if (isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
 						sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
 					} else {
 						sugar_die("Could not connect to the database. Please refer to suitecrm.log for details.");
@@ -312,13 +312,13 @@ 
 		// cn: using direct calls to prevent this from spamming the Logs
 	    
 	    $collation = $this->getOption('collation');
-	    if(!empty($collation)) {
+	    if (!empty($collation)) {
 	    	$names = "SET NAMES 'utf8' COLLATE '$collation'";
-	    	mysqli_query($this->database,$names);
+	    	mysqli_query($this->database, $names);
 		}
-	    mysqli_set_charset ($this->database , "utf8" );
+	    mysqli_set_charset($this->database, "utf8");
 
-		if($this->checkError('Could Not Connect', $dieOnError))
+		if ($this->checkError('Could Not Connect', $dieOnError))
 			$GLOBALS['log']->info("connected to db");
 
 		$this->connectOptions = $configOptions;
@@ -331,13 +331,13 @@ 
 	 */
 	public function lastDbError()
 	{
-		if($this->database) {
-		    if(mysqli_errno($this->database)) {
+		if ($this->database) {
+		    if (mysqli_errno($this->database)) {
 			    return "MySQL error ".mysqli_errno($this->database).": ".mysqli_error($this->database);
 		    }
 		} else {
-			$err =  mysqli_connect_error();
-			if($err) {
+			$err = mysqli_connect_error();
+			if ($err) {
 			    return $err;
 			}
 		}
@@ -349,7 +349,7 @@ 
 	{
 		$charsets = $this->getCharsetInfo();
 		$charset_str = array();
-		foreach($charsets as $name => $value) {
+		foreach ($charsets as $name => $value) {
 			$charset_str[] = "$name = $value";
 		}
 		return array(

Indentation +252 added lines, -252 removed lines

@@ -98,51 +98,51 @@ 
  */
 class MysqliManager extends MysqlManager
 {
-	/**
-	 * @see DBManager::$dbType
-	 */
-	public $dbType = 'mysql';
-	public $variant = 'mysqli';
-	public $priority = 10;
-	public $label = 'LBL_MYSQLI';
-
-	/**
-	 * @see DBManager::$backendFunctions
-	 */
-	protected $backendFunctions = array(
-		'free_result'        => 'mysqli_free_result',
-		'close'              => 'mysqli_close',
-		'row_count'          => 'mysqli_num_rows',
-		'affected_row_count' => 'mysqli_affected_rows',
-		);
-
-	/**
-	 * @see MysqlManager::query()
-	 */
-	public function query($sql, $dieOnError = false, $msg = '', $suppress = false, $keepResult = false)
-	{
-		if(is_array($sql)) {
-			return $this->queryArray($sql, $dieOnError, $msg, $suppress);
+    /**
+     * @see DBManager::$dbType
+     */
+    public $dbType = 'mysql';
+    public $variant = 'mysqli';
+    public $priority = 10;
+    public $label = 'LBL_MYSQLI';
+
+    /**
+     * @see DBManager::$backendFunctions
+     */
+    protected $backendFunctions = array(
+        'free_result'        => 'mysqli_free_result',
+        'close'              => 'mysqli_close',
+        'row_count'          => 'mysqli_num_rows',
+        'affected_row_count' => 'mysqli_affected_rows',
+        );
+
+    /**
+     * @see MysqlManager::query()
+     */
+    public function query($sql, $dieOnError = false, $msg = '', $suppress = false, $keepResult = false)
+    {
+        if(is_array($sql)) {
+            return $this->queryArray($sql, $dieOnError, $msg, $suppress);
         }
 
-		static $queryMD5 = array();
+        static $queryMD5 = array();
 
-		parent::countQuery($sql);
-		$GLOBALS['log']->info('Query:' . $sql);
-		$this->checkConnection();
-		$this->query_time = microtime(true);
-		$this->lastsql = $sql;
-		$result = $suppress?@mysqli_query($this->database,$sql):mysqli_query($this->database,$sql);
-		$md5 = md5($sql);
+        parent::countQuery($sql);
+        $GLOBALS['log']->info('Query:' . $sql);
+        $this->checkConnection();
+        $this->query_time = microtime(true);
+        $this->lastsql = $sql;
+        $result = $suppress?@mysqli_query($this->database,$sql):mysqli_query($this->database,$sql);
+        $md5 = md5($sql);
 
-		if (empty($queryMD5[$md5]))
-			$queryMD5[$md5] = true;
+        if (empty($queryMD5[$md5]))
+            $queryMD5[$md5] = true;
 
-		$this->query_time = microtime(true) - $this->query_time;
-		$GLOBALS['log']->info('Query Execution Time:'.$this->query_time);
+        $this->query_time = microtime(true) - $this->query_time;
+        $GLOBALS['log']->info('Query Execution Time:'.$this->query_time);
 
-		// This is some heavy duty debugging, leave commented out unless you need this:
-		/*
+        // This is some heavy duty debugging, leave commented out unless you need this:
+        /*
 		$bt = debug_backtrace();
 		for ( $i = count($bt) ; $i-- ; $i > 0 ) {
 			if ( strpos('MysqliManager.php',$bt[$i]['file']) === false ) {
@@ -154,228 +154,228 @@ 
 		*/
 
 
-		if($keepResult)
-			$this->lastResult = $result;
-		$this->checkError($msg.' Query Failed: ' . $sql, $dieOnError);
-
-		return $result;
-	}
-
-	/**
-	 * Returns the number of rows affected by the last query
-	 *
-	 * @return int
-	 */
-	public function getAffectedRowCount($result)
-	{
-		return mysqli_affected_rows($this->getDatabase());
-	}
-
-	/**
-	 * Returns the number of rows returned by the result
-	 *
-	 * This function can't be reliably implemented on most DB, do not use it.
-	 * @abstract
-	 * @deprecated
-	 * @param  resource $result
-	 * @return int
-	 */
-	public function getRowCount($result)
-	{
-	    return mysqli_num_rows($result);
-	}
+        if($keepResult)
+            $this->lastResult = $result;
+        $this->checkError($msg.' Query Failed: ' . $sql, $dieOnError);
 
+        return $result;
+    }
 
     /**
-	 * Disconnects from the database
-	 *
-	 * Also handles any cleanup needed
-	 */
-	public function disconnect()
-	{
-		if(isset($GLOBALS['log']) && !is_null($GLOBALS['log'])) {
-			$GLOBALS['log']->debug('Calling MySQLi::disconnect()');
-		}
-		if(!empty($this->database)){
-			$this->freeResult();
-			mysqli_close($this->database);
-			$this->database = null;
-		}
-	}
-
-	/**
-	 * @see DBManager::freeDbResult()
-	 */
-	protected function freeDbResult($dbResult)
-	{
-		if(!empty($dbResult))
-			mysqli_free_result($dbResult);
-	}
-
-	/**
-	 * @see DBManager::getFieldsArray()
-	 */
-	public function getFieldsArray($result, $make_lower_case = false)
-	{
-		$field_array = array();
-
-		if (!isset($result) || empty($result))
-			return 0;
-
-		$i = 0;
-		while ($i < mysqli_num_fields($result)) {
-			$meta = mysqli_fetch_field_direct($result, $i);
-			if (!$meta)
-				return 0;
-
-			if($make_lower_case == true)
-				$meta->name = strtolower($meta->name);
-
-			$field_array[] = $meta->name;
-
-			$i++;
-		}
+     * Returns the number of rows affected by the last query
+     *
+     * @return int
+     */
+    public function getAffectedRowCount($result)
+    {
+        return mysqli_affected_rows($this->getDatabase());
+    }
+
+    /**
+     * Returns the number of rows returned by the result
+     *
+     * This function can't be reliably implemented on most DB, do not use it.
+     * @abstract
+     * @deprecated
+     * @param  resource $result
+     * @return int
+     */
+    public function getRowCount($result)
+    {
+        return mysqli_num_rows($result);
+    }
+
+
+    /**
+     * Disconnects from the database
+     *
+     * Also handles any cleanup needed
+     */
+    public function disconnect()
+    {
+        if(isset($GLOBALS['log']) && !is_null($GLOBALS['log'])) {
+            $GLOBALS['log']->debug('Calling MySQLi::disconnect()');
+        }
+        if(!empty($this->database)){
+            $this->freeResult();
+            mysqli_close($this->database);
+            $this->database = null;
+        }
+    }
+
+    /**
+     * @see DBManager::freeDbResult()
+     */
+    protected function freeDbResult($dbResult)
+    {
+        if(!empty($dbResult))
+            mysqli_free_result($dbResult);
+    }
+
+    /**
+     * @see DBManager::getFieldsArray()
+     */
+    public function getFieldsArray($result, $make_lower_case = false)
+    {
+        $field_array = array();
+
+        if (!isset($result) || empty($result))
+            return 0;
+
+        $i = 0;
+        while ($i < mysqli_num_fields($result)) {
+            $meta = mysqli_fetch_field_direct($result, $i);
+            if (!$meta)
+                return 0;
+
+            if($make_lower_case == true)
+                $meta->name = strtolower($meta->name);
+
+            $field_array[] = $meta->name;
+
+            $i++;
+        }
+
+        return $field_array;
+    }
+
+    /**
+     * @see DBManager::fetchRow()
+     */
+    public function fetchRow($result)
+    {
+        if (empty($result))	return false;
+
+        $row = mysqli_fetch_assoc($result);
+        if($row == null) $row = false; //Make sure MySQLi driver results are consistent with other database drivers
+        return $row;
+    }
 
-		return $field_array;
-	}
-
-	/**
-	 * @see DBManager::fetchRow()
-	 */
-	public function fetchRow($result)
-	{
-		if (empty($result))	return false;
-
-		$row = mysqli_fetch_assoc($result);
-		if($row == null) $row = false; //Make sure MySQLi driver results are consistent with other database drivers
-		return $row;
-	}
-
-	/**
-	 * @see DBManager::quote()
-	 */
-	public function quote($string)
-	{
-		return mysqli_real_escape_string($this->getDatabase(),$this->quoteInternal($string));
-	}
-
-	/**
-	 * @see DBManager::connect()
-	 */
-	public function connect(array $configOptions = null, $dieOnError = false)
-	{
-		global $sugar_config;
-
-		if (is_null($configOptions))
-			$configOptions = $sugar_config['dbconfig'];
-
-		if(!isset($this->database)) {
-
-			//mysqli connector has a separate parameter for port.. We need to separate it out from the host name
-			$dbhost=$configOptions['db_host_name'];
+    /**
+     * @see DBManager::quote()
+     */
+    public function quote($string)
+    {
+        return mysqli_real_escape_string($this->getDatabase(),$this->quoteInternal($string));
+    }
+
+    /**
+     * @see DBManager::connect()
+     */
+    public function connect(array $configOptions = null, $dieOnError = false)
+    {
+        global $sugar_config;
+
+        if (is_null($configOptions))
+            $configOptions = $sugar_config['dbconfig'];
+
+        if(!isset($this->database)) {
+
+            //mysqli connector has a separate parameter for port.. We need to separate it out from the host name
+            $dbhost=$configOptions['db_host_name'];
             $dbport=isset($configOptions['db_port']) ? ($configOptions['db_port'] == '' ? null : $configOptions['db_port']) : null;
 			
-			$pos=strpos($configOptions['db_host_name'],':');
-			if ($pos !== false) {
-				$dbhost=substr($configOptions['db_host_name'],0,$pos);
-				$dbport=substr($configOptions['db_host_name'],$pos+1);
-			}
-
-			$this->database = @mysqli_connect($dbhost,$configOptions['db_user_name'],$configOptions['db_password'],isset($configOptions['db_name'])?$configOptions['db_name']:'',$dbport);
-			if(empty($this->database)) {
-				$GLOBALS['log']->fatal("Could not connect to DB server ".$dbhost." as ".$configOptions['db_user_name'].". port " .$dbport . ": " . mysqli_connect_error());
-				if($dieOnError) {
-					if(isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
-						sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
-					} else {
-						sugar_die("Could not connect to the database. Please refer to suitecrm.log for details.");
-					}
-				} else {
-					return false;
-				}
-			}
-		}
+            $pos=strpos($configOptions['db_host_name'],':');
+            if ($pos !== false) {
+                $dbhost=substr($configOptions['db_host_name'],0,$pos);
+                $dbport=substr($configOptions['db_host_name'],$pos+1);
+            }
+
+            $this->database = @mysqli_connect($dbhost,$configOptions['db_user_name'],$configOptions['db_password'],isset($configOptions['db_name'])?$configOptions['db_name']:'',$dbport);
+            if(empty($this->database)) {
+                $GLOBALS['log']->fatal("Could not connect to DB server ".$dbhost." as ".$configOptions['db_user_name'].". port " .$dbport . ": " . mysqli_connect_error());
+                if($dieOnError) {
+                    if(isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
+                        sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
+                    } else {
+                        sugar_die("Could not connect to the database. Please refer to suitecrm.log for details.");
+                    }
+                } else {
+                    return false;
+                }
+            }
+        }
 
-		if(!empty($configOptions['db_name']) && !@mysqli_select_db($this->database,$configOptions['db_name'])) {
-			$GLOBALS['log']->fatal( "Unable to select database {$configOptions['db_name']}: " . mysqli_connect_error());
-			if($dieOnError) {
-					if(isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
-						sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
-					} else {
-						sugar_die("Could not connect to the database. Please refer to suitecrm.log for details.");
-					}
-			} else {
-				return false;
-			}
-	    }
+        if(!empty($configOptions['db_name']) && !@mysqli_select_db($this->database,$configOptions['db_name'])) {
+            $GLOBALS['log']->fatal( "Unable to select database {$configOptions['db_name']}: " . mysqli_connect_error());
+            if($dieOnError) {
+                    if(isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
+                        sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
+                    } else {
+                        sugar_die("Could not connect to the database. Please refer to suitecrm.log for details.");
+                    }
+            } else {
+                return false;
+            }
+        }
 
-		// cn: using direct calls to prevent this from spamming the Logs
+        // cn: using direct calls to prevent this from spamming the Logs
 	    
-	    $collation = $this->getOption('collation');
-	    if(!empty($collation)) {
-	    	$names = "SET NAMES 'utf8' COLLATE '$collation'";
-	    	mysqli_query($this->database,$names);
-		}
-	    mysqli_set_charset ($this->database , "utf8" );
-
-		if($this->checkError('Could Not Connect', $dieOnError))
-			$GLOBALS['log']->info("connected to db");
-
-		$this->connectOptions = $configOptions;
-		return true;
-	}
-
-	/**
-	 * (non-PHPdoc)
-	 * @see MysqlManager::lastDbError()
-	 */
-	public function lastDbError()
-	{
-		if($this->database) {
-		    if(mysqli_errno($this->database)) {
-			    return "MySQL error ".mysqli_errno($this->database).": ".mysqli_error($this->database);
-		    }
-		} else {
-			$err =  mysqli_connect_error();
-			if($err) {
-			    return $err;
-			}
-		}
+        $collation = $this->getOption('collation');
+        if(!empty($collation)) {
+            $names = "SET NAMES 'utf8' COLLATE '$collation'";
+            mysqli_query($this->database,$names);
+        }
+        mysqli_set_charset ($this->database , "utf8" );
 
-		return false;
-	}
+        if($this->checkError('Could Not Connect', $dieOnError))
+            $GLOBALS['log']->info("connected to db");
 
-	public function getDbInfo()
-	{
-		$charsets = $this->getCharsetInfo();
-		$charset_str = array();
-		foreach($charsets as $name => $value) {
-			$charset_str[] = "$name = $value";
-		}
-		return array(
-			"MySQLi Version" => @mysqli_get_client_info(),
-			"MySQLi Host Info" => @mysqli_get_host_info($this->database),
-			"MySQLi Server Info" => @mysqli_get_server_info($this->database),
-			"MySQLi Client Encoding" =>  @mysqli_character_set_name($this->database),
-			"MySQL Character Set Settings" => join(", ", $charset_str),
-		);
-	}
-
-	/**
-	 * Select database
-	 * @param string $dbname
-	 */
-	protected function selectDb($dbname)
-	{
-		return mysqli_select_db($this->getDatabase(), $dbname);
-	}
-
-	/**
-	 * Check if this driver can be used
-	 * @return bool
-	 */
-	public function valid()
-	{
-		return function_exists("mysqli_connect") && empty($GLOBALS['sugar_config']['mysqli_disabled']);
-	}
+        $this->connectOptions = $configOptions;
+        return true;
+    }
+
+    /**
+     * (non-PHPdoc)
+     * @see MysqlManager::lastDbError()
+     */
+    public function lastDbError()
+    {
+        if($this->database) {
+            if(mysqli_errno($this->database)) {
+                return "MySQL error ".mysqli_errno($this->database).": ".mysqli_error($this->database);
+            }
+        } else {
+            $err =  mysqli_connect_error();
+            if($err) {
+                return $err;
+            }
+        }
+
+        return false;
+    }
+
+    public function getDbInfo()
+    {
+        $charsets = $this->getCharsetInfo();
+        $charset_str = array();
+        foreach($charsets as $name => $value) {
+            $charset_str[] = "$name = $value";
+        }
+        return array(
+            "MySQLi Version" => @mysqli_get_client_info(),
+            "MySQLi Host Info" => @mysqli_get_host_info($this->database),
+            "MySQLi Server Info" => @mysqli_get_server_info($this->database),
+            "MySQLi Client Encoding" =>  @mysqli_character_set_name($this->database),
+            "MySQL Character Set Settings" => join(", ", $charset_str),
+        );
+    }
+
+    /**
+     * Select database
+     * @param string $dbname
+     */
+    protected function selectDb($dbname)
+    {
+        return mysqli_select_db($this->getDatabase(), $dbname);
+    }
+
+    /**
+     * Check if this driver can be used
+     * @return bool
+     */
+    public function valid()
+    {
+        return function_exists("mysqli_connect") && empty($GLOBALS['sugar_config']['mysqli_disabled']);
+    }
 }