adamjakab / SuiteCRM

modules/Administration/UpgradeFields.php

Indentation +58 added lines, -58 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if(!defined('sugarEntry') || !sugarEntry)
-	die('Not A Valid Entry Point');
+    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.
@@ -44,7 +44,7 @@ 
 global $db;
 
 if (!isset ($db)) {
-	$db = DBManagerFactory:: getInstance();
+    $db = DBManagerFactory:: getInstance();
 }
 
 $result = $db->query('SELECT * FROM fields_meta_data WHERE deleted = 0 ORDER BY custom_module');
@@ -53,82 +53,82 @@ 
  * get the real field_meta_data
  */
 while ($row = $db->fetchByAssoc($result)) {
-	$the_modules = $row['custom_module'];
-	if (!isset ($modules[$the_modules])) {
-		$modules[$the_modules] = array ();
-	}
-	$modules[$the_modules][$row['name']] = $row['name'];
+    $the_modules = $row['custom_module'];
+    if (!isset ($modules[$the_modules])) {
+        $modules[$the_modules] = array ();
+    }
+    $modules[$the_modules][$row['name']] = $row['name'];
 }
 
 $simulate = false;
 if (!isset ($_REQUEST['run'])) {
-	$simulate = true;
-	echo "SIMULATION MODE - NO CHANGES WILL BE MADE EXCEPT CLEARING CACHE";
+    $simulate = true;
+    echo "SIMULATION MODE - NO CHANGES WILL BE MADE EXCEPT CLEARING CACHE";
 }
 
 foreach ($modules as $the_module => $fields) {
-	$class_name = $beanList[$the_module];
-	echo "<br><br>Scanning $the_module <br>";
+    $class_name = $beanList[$the_module];
+    echo "<br><br>Scanning $the_module <br>";
 
-	require_once ($beanFiles[$class_name]);
-	$mod = new $class_name ();
-	if (!$db->tableExists($mod->table_name."_cstm")) {
-		$mod->custom_fields = new DynamicField();
-		$mod->custom_fields->setup($mod);
-		$mod->custom_fields->createCustomTable();
-	}
+    require_once ($beanFiles[$class_name]);
+    $mod = new $class_name ();
+    if (!$db->tableExists($mod->table_name."_cstm")) {
+        $mod->custom_fields = new DynamicField();
+        $mod->custom_fields->setup($mod);
+        $mod->custom_fields->createCustomTable();
+    }
 
-	$table = $db->getTableDescription($mod->table_name."_cstm");
-	foreach($table as $row) {
-		$col = strtolower(empty ($row['Field']) ? $row['field'] : $row['Field']);
-		$the_field = $mod->custom_fields->getField($col);
-		$type = strtolower(empty ($row['Type']) ? $row['type'] : $row['Type']);
-		if (!empty($row['data_precision']) && !empty($row['data_scale'])) {
-			$type.='(' . $row['data_precision'];
-			if (!empty($row['data_scale'])) {
-				$type.=',' . $row['data_scale'];
-			}
-			$type.=')';
-		} elseif(!empty($row['data_length']) && (strtolower($row['type'])=='varchar' or strtolower($row['type'])=='varchar2')) {
-			$type.='(' . $row['data_length'] . ')';
-		}
-		if (!isset ($fields[$col]) && $col != 'id_c') {
-			if (!$simulate) {
-				$db->query("ALTER TABLE $mod->table_name"."_cstm DROP COLUMN $col");
-			}
-			unset ($fields[$col]);
-			echo "Dropping Column $col from $mod->table_name"."_cstm for module $the_module<br>";
-		} else {
-			if ($col != 'id_c') {
-				$db_data_type = strtolower(str_replace(' ' , '', $the_field->get_db_type()));
+    $table = $db->getTableDescription($mod->table_name."_cstm");
+    foreach($table as $row) {
+        $col = strtolower(empty ($row['Field']) ? $row['field'] : $row['Field']);
+        $the_field = $mod->custom_fields->getField($col);
+        $type = strtolower(empty ($row['Type']) ? $row['type'] : $row['Type']);
+        if (!empty($row['data_precision']) && !empty($row['data_scale'])) {
+            $type.='(' . $row['data_precision'];
+            if (!empty($row['data_scale'])) {
+                $type.=',' . $row['data_scale'];
+            }
+            $type.=')';
+        } elseif(!empty($row['data_length']) && (strtolower($row['type'])=='varchar' or strtolower($row['type'])=='varchar2')) {
+            $type.='(' . $row['data_length'] . ')';
+        }
+        if (!isset ($fields[$col]) && $col != 'id_c') {
+            if (!$simulate) {
+                $db->query("ALTER TABLE $mod->table_name"."_cstm DROP COLUMN $col");
+            }
+            unset ($fields[$col]);
+            echo "Dropping Column $col from $mod->table_name"."_cstm for module $the_module<br>";
+        } else {
+            if ($col != 'id_c') {
+                $db_data_type = strtolower(str_replace(' ' , '', $the_field->get_db_type()));
 
-				$type = strtolower(str_replace(' ' , '', $type));
-				if (strcmp($db_data_type,$type) != 0) {
+                $type = strtolower(str_replace(' ' , '', $type));
+                if (strcmp($db_data_type,$type) != 0) {
 
-					echo "Fixing Column Type for $col changing $type to ".$db_data_type."<br>";
-					if (!$simulate) {
-						$db->query($the_field->get_db_modify_alter_table($mod->table_name.'_cstm'));
+                    echo "Fixing Column Type for $col changing $type to ".$db_data_type."<br>";
+                    if (!$simulate) {
+                        $db->query($the_field->get_db_modify_alter_table($mod->table_name.'_cstm'));
                     }
-				}
-			}
+                }
+            }
 
-			unset ($fields[$col]);
-		}
+            unset ($fields[$col]);
+        }
 
-	}
+    }
 
-	echo sizeof($fields)." field(s) missing from $mod->table_name"."_cstm<br>";
-	foreach ($fields as $field) {
-		echo "Adding Column $field to $mod->table_name"."_cstm<br>";
-		if (!$simulate)
-			$mod->custom_fields->add_existing_custom_field($field);
-	}
+    echo sizeof($fields)." field(s) missing from $mod->table_name"."_cstm<br>";
+    foreach ($fields as $field) {
+        echo "Adding Column $field to $mod->table_name"."_cstm<br>";
+        if (!$simulate)
+            $mod->custom_fields->add_existing_custom_field($field);
+    }
 
 }
 
 DynamicField :: deleteCache();
 echo '<br>Done<br>';
 if ($simulate) {
-	echo '<a href="index.php?module=Administration&action=UpgradeFields&run=true">Execute non-simulation mode</a>';
+    echo '<a href="index.php?module=Administration&action=UpgradeFields&run=true">Execute non-simulation mode</a>';
 }
 ?>
\ No newline at end of file

modules/Administration/callJSRepair.php

Indentation +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
                 ConcatenateFiles("$from");
     
             }elseif($_REQUEST['js_admin_repair'] == 'repair'){
-             //should compress existing javascript (including changes done) without overwriting original source files
+                //should compress existing javascript (including changes done) without overwriting original source files
                 BackUpAndCompressScriptFiles("$from","",false);
                 ConcatenateFiles("$from");        
             }

modules/Administration/RebuildDashlets.php

Indentation +3 added lines, -3 removed lines

@@ -42,7 +42,7 @@ 
 $silent = isset($_REQUEST['silent']) ? true : false;
 if(is_admin($current_user)){
     global $mod_strings;
-	if (!$silent) { echo $mod_strings['LBL_REBUILD_DASHLETS_DESC']; }
+    if (!$silent) { echo $mod_strings['LBL_REBUILD_DASHLETS_DESC']; }
     if(is_file($cachedfile = sugar_cached('dashlets/dashlets.php'))) {
         unlink($cachedfile);
     }
@@ -50,9 +50,9 @@ 
 
     $dc = new DashletCacheBuilder();
     $dc->buildCache();
-   if( !$silent ) echo '<br><br><br><br>' . $mod_strings['LBL_REBUILD_DASHLETS_DESC_SUCCESS'];
+    if( !$silent ) echo '<br><br><br><br>' . $mod_strings['LBL_REBUILD_DASHLETS_DESC_SUCCESS'];
 }
 else{
-	sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']);
+    sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']);
 }
 ?>
\ No newline at end of file

modules/Administration/updateclass.php

Indentation +14 added lines, -14 removed lines

@@ -43,21 +43,21 @@ 
 require_once("include/utils/sugar_file_utils.php");
 
 foreach ($beanFiles as $classname => $filename){ 
-	if (file_exists($filename)){
-		// Rename the class and its constructor adding SugarCore at the beginning  (Ex: class SugarCoreCall)
-		$handle = file_get_contents($filename);
+    if (file_exists($filename)){
+        // Rename the class and its constructor adding SugarCore at the beginning  (Ex: class SugarCoreCall)
+        $handle = file_get_contents($filename);
         $patterns = array ('/class '.$classname.'/','/function '.$classname.'/');
         $replace = array ('class SugarCore'.$classname,'function SugarCore'.$classname);
-		$data = preg_replace($patterns,$replace, $handle);
-		sugar_file_put_contents($filename,$data);
+        $data = preg_replace($patterns,$replace, $handle);
+        sugar_file_put_contents($filename,$data);
 		
-		// Rename the SugarBean file into SugarCore.SugarBean (Ex: SugarCore.Call.php)
-		$pos=strrpos($filename,"/");
-		$newfilename=substr_replace($filename, 'SugarCore.', $pos+1, 0);
-		sugar_rename($filename,$newfilename);
+        // Rename the SugarBean file into SugarCore.SugarBean (Ex: SugarCore.Call.php)
+        $pos=strrpos($filename,"/");
+        $newfilename=substr_replace($filename, 'SugarCore.', $pos+1, 0);
+        sugar_rename($filename,$newfilename);
 		
-		//Create a new SugarBean that extends CoreBean
-		$fileHandle = sugar_fopen($filename, 'w') ;
+        //Create a new SugarBean that extends CoreBean
+        $fileHandle = sugar_fopen($filename, 'w') ;
 $newclass = <<<FABRICE
 <?php
 if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
@@ -110,8 +110,8 @@ 
 }
 ?>
 FABRICE;
-		fwrite($fileHandle, $newclass);
-		fclose($fileHandle);
-	}
+        fwrite($fileHandle, $newclass);
+        fclose($fileHandle);
+    }
 }
 ?>
\ No newline at end of file

modules/Administration/ImportCustomFieldStructure.php

Indentation +8 added lines, -8 removed lines

@@ -43,8 +43,8 @@ 
 }
 
 if (empty($_FILES)) {
-	echo $mod_strings['LBL_IMPORT_CUSTOM_FIELDS_DESC'];
-	echo <<<EOQ
+    echo $mod_strings['LBL_IMPORT_CUSTOM_FIELDS_DESC'];
+    echo <<<EOQ
 <br>
 <br>
 <form enctype="multipart/form-data" action="index.php" method="POST">
@@ -64,7 +64,7 @@ 
         if (trim($line) == 'DONE') {
             $fmd->new_with_id = true;
             echo $mod_strings['LBL_IMPORT_CUSTOM_FIELDS_ADDING'] . ':' . $fmd->custom_module . '-' .
-                 $fmd->name . '<br>';
+                    $fmd->name . '<br>';
             $fmd->db->query("DELETE FROM $fmd->table_name WHERE id=".$fmd->db->quoted($fmd->id));
             $fmd->save(false);
             $fmd = BeanFactory::getBean('EditCustomFields');
@@ -80,9 +80,9 @@ 
             }
         }
     }
-	$_REQUEST['run'] = true;
-	$result = $fmd->db->query("SELECT count(*) field_count FROM $fmd->table_name");
-	$row = $fmd->db->fetchByAssoc($result);
-	echo 'Total Custom Fields :' . $row['field_count'] . '<br>';
-	include('modules/Administration/UpgradeFields.php');
+    $_REQUEST['run'] = true;
+    $result = $fmd->db->query("SELECT count(*) field_count FROM $fmd->table_name");
+    $row = $fmd->db->fetchByAssoc($result);
+    echo 'Total Custom Fields :' . $row['field_count'] . '<br>';
+    include('modules/Administration/UpgradeFields.php');
 }

modules/Administration/SugarSpriteBuilder.php

Indentation +355 added lines, -355 removed lines

@@ -43,49 +43,49 @@ 
 
 class SugarSpriteBuilder
 {
-	var $isAvailable = false;
-	var $silentRun = false;
+    var $isAvailable = false;
+    var $silentRun = false;
     var $fromSilentUpgrade = false;
     var $writeToUpgradeLog = false;
 
-	var $debug = false;
-	var $fileName = 'sprites';
-	var $cssMinify = true;
+    var $debug = false;
+    var $fileName = 'sprites';
+    var $cssMinify = true;
 
-	// class supported image types
-	var $supportedTypeMap = array(
-		IMG_GIF => IMAGETYPE_GIF,
-		IMG_JPG => IMAGETYPE_JPEG,
-		IMG_PNG => IMAGETYPE_PNG,
-	);
+    // class supported image types
+    var $supportedTypeMap = array(
+        IMG_GIF => IMAGETYPE_GIF,
+        IMG_JPG => IMAGETYPE_JPEG,
+        IMG_PNG => IMAGETYPE_PNG,
+    );
 
-	// sprite settings
-	var $pngCompression = 9;
-	var $pngFilter = PNG_NO_FILTER;
-	var $maxWidth = 75;
-	var $maxHeight = 75;
-	var $rowCnt = 30;
+    // sprite settings
+    var $pngCompression = 9;
+    var $pngFilter = PNG_NO_FILTER;
+    var $maxWidth = 75;
+    var $maxHeight = 75;
+    var $rowCnt = 30;
 
-	// processed image types
-	var $imageTypes = array();
+    // processed image types
+    var $imageTypes = array();
 
-	// source files
-	var $spriteSrc = array();
-	var $spriteRepeat = array();
+    // source files
+    var $spriteSrc = array();
+    var $spriteRepeat = array();
 
-	// sprite resource images
-	var $spriteImg;
+    // sprite resource images
+    var $spriteImg;
 
-	// sprite_config collection
-	var $sprites_config = array();
+    // sprite_config collection
+    var $sprites_config = array();
 
 
     public function __construct()
     {
-		// check if we have gd installed
-		if(function_exists('imagecreatetruecolor'))
+        // check if we have gd installed
+        if(function_exists('imagecreatetruecolor'))
         {
-			$this->isAvailable = true;
+            $this->isAvailable = true;
             foreach($this->supportedTypeMap as $gd_bit => $imagetype)
             {
                 if(imagetypes() & $gd_bit) {
@@ -93,13 +93,13 @@ 
                     $this->imageTypes[$imagetype] = $gd_bit;
                 }
             }
-		}
+        }
 
         if(function_exists('logThis') && isset($GLOBALS['path']))
         {
             $this->writeToUpgradeLog = true;
         }
-	}
+    }
 
 
     /**
@@ -109,80 +109,80 @@ 
      * @param $name String value of the sprite name
      * @param $dir String value of the directory associated with the sprite entry
      */
-	public function addDirectory($name, $dir) {
+    public function addDirectory($name, $dir) {
 
-		// sprite namespace
-		if(!array_key_exists($name, $this->spriteSrc))
+        // sprite namespace
+        if(!array_key_exists($name, $this->spriteSrc))
         {
-			$this->spriteSrc[$name] = array();
-		}
+            $this->spriteSrc[$name] = array();
+        }
 
-		// add files from directory
-		$this->spriteSrc[$name][$dir] = $this->getFileList($dir);
-	}
+        // add files from directory
+        $this->spriteSrc[$name][$dir] = $this->getFileList($dir);
+    }
 
-	/**
+    /**
      * getFileList
      *
      * This method processes files in a directory and adds them to the sprites array
      * @param $dir String value of the directory to scan for image files in
      */
-	private function getFileList($dir) {
-		$list = array();
-		if(is_dir($dir)) {
-			if($dh = opendir($dir)) {
+    private function getFileList($dir) {
+        $list = array();
+        if(is_dir($dir)) {
+            if($dh = opendir($dir)) {
 
-				// optional sprites_config.php file
-				$this->loadSpritesConfig($dir);
+                // optional sprites_config.php file
+                $this->loadSpritesConfig($dir);
 
-			    while (($file = readdir($dh)) !== false)
+                while (($file = readdir($dh)) !== false)
                 {
-					if ($file != "." && $file != ".." && $file != "sprites_config.php")
+                    if ($file != "." && $file != ".." && $file != "sprites_config.php")
                     {
 
-						// file info & check supported image format
-						if($info = $this->getFileInfo($dir, $file)) {
+                        // file info & check supported image format
+                        if($info = $this->getFileInfo($dir, $file)) {
 
-							// skip excluded files
-							if(isset($this->sprites_config[$dir]['exclude']) && array_search($file, $this->sprites_config[$dir]['exclude']) !== false)
+                            // skip excluded files
+                            if(isset($this->sprites_config[$dir]['exclude']) && array_search($file, $this->sprites_config[$dir]['exclude']) !== false)
                             {
                                 global $mod_strings;
                                 $msg = string_format($mod_strings['LBL_SPRITES_EXCLUDING_FILE'], array("{$dir}/{$file}"));
-								$GLOBALS['log']->debug($msg);
+                                $GLOBALS['log']->debug($msg);
                                 $this->logMessage($msg);
-							} else {
-								// repeatable sprite ?
-								$isRepeat = false;
+                            } else {
+                                // repeatable sprite ?
+                                $isRepeat = false;
 
-								if(isset($this->sprites_config[$dir]['repeat']))
+                                if(isset($this->sprites_config[$dir]['repeat']))
                                 {
-									foreach($this->sprites_config[$dir]['repeat'] as $repeat)
+                                    foreach($this->sprites_config[$dir]['repeat'] as $repeat)
                                     {
-										if($info['x'] == $repeat['width'] && $info['y'] == $repeat['height'])
+                                        if($info['x'] == $repeat['width'] && $info['y'] == $repeat['height'])
                                         {
-											$id = md5($repeat['width'].$repeat['height'].$repeat['direction']);
-											$isRepeat = true;
-											$this->spriteRepeat['repeat_'.$repeat['direction'].'_'.$id][$dir][$file] = $info;
-										}
-									}
-								}
-
-								if(!$isRepeat)
+                                            $id = md5($repeat['width'].$repeat['height'].$repeat['direction']);
+                                            $isRepeat = true;
+                                            $this->spriteRepeat['repeat_'.$repeat['direction'].'_'.$id][$dir][$file] = $info;
+                                        }
+                                    }
+                                }
+
+                                if(!$isRepeat)
                                 {
-									$list[$file] = $info;
+                                    $list[$file] = $info;
                                 }
-							}
-						} else if(preg_match('/\.(jpg|jpeg|gif|png|bmp|ico)$/i', $file)) {
+                            }
+                        } else if(preg_match('/\.(jpg|jpeg|gif|png|bmp|ico)$/i', $file)) {
                             $GLOBALS['log']->error('Unable to process image file ' . $file);
                             //$this->logMessage('Unable to process image file ' . $file);
                         }
-	   	     		}
-   		 		}
-			}
-		    closedir($dh);
-		}
-		return $list;
-	}
+                        }
+                    }
+            }
+            closedir($dh);
+        }
+        return $list;
+    }
 
 
     /**
@@ -194,19 +194,19 @@ 
      *
      * @param $dir String value of the directory containing the custom sprites_config.php file
      */
-	private function loadSpritesConfig($dir) {
-		$sprites_config = array();
-		if(file_exists("$dir/sprites_config.php"))
+    private function loadSpritesConfig($dir) {
+        $sprites_config = array();
+        if(file_exists("$dir/sprites_config.php"))
         {
-			include("$dir/sprites_config.php");
-			if(count($sprites_config)) {
-				$this->sprites_config = array_merge($this->sprites_config, $sprites_config);
-			}
-		}
-	}
+            include("$dir/sprites_config.php");
+            if(count($sprites_config)) {
+                $this->sprites_config = array_merge($this->sprites_config, $sprites_config);
+            }
+        }
+    }
 
 
-	/**
+    /**
      * getFileInfo
      *
      * This is a private helper function to return attributes about an image.  If the width, height or type of the
@@ -214,44 +214,44 @@ 
      *
      * @return array of file info entries containing file information (x, y, type) if image type is supported
      */
-	private function getFileInfo($dir, $file) {
-		$result = false;
-		$info = @getimagesize($dir.'/'.$file);
-		if($info) {
+    private function getFileInfo($dir, $file) {
+        $result = false;
+        $info = @getimagesize($dir.'/'.$file);
+        if($info) {
 
-			// supported image type ?
-			if(isset($this->imageTypes[$info[2]]))
+            // supported image type ?
+            if(isset($this->imageTypes[$info[2]]))
             {
-				$w = $info[0];
-				$h = $info[1];
-				$surface = $w * $h;
+                $w = $info[0];
+                $h = $info[1];
+                $surface = $w * $h;
 
-				// be sure we have an image size
-				$addSprite = false;
-				if($surface)
+                // be sure we have an image size
+                $addSprite = false;
+                if($surface)
                 {
-					// sprite dimensions
-					if($w <= $this->maxWidth && $h <= $this->maxHeight)
+                    // sprite dimensions
+                    if($w <= $this->maxWidth && $h <= $this->maxHeight)
                     {
-						$addSprite = true;
-					}
-				}
+                        $addSprite = true;
+                    }
+                }
 
-				if($addSprite)
+                if($addSprite)
                 {
-					$result = array();
-					$result['x'] = $w;
-					$result['y'] = $h;
-					$result['type'] = $info[2];
-				}
-			} else {
+                    $result = array();
+                    $result['x'] = $w;
+                    $result['y'] = $h;
+                    $result['type'] = $info[2];
+                }
+            } else {
                 $msg = "Skipping unsupported image file type ({$info[2]}) for file {$file}";
                 $GLOBALS['log']->error($msg);
                 $this->logMessage($msg."\n");
             }
-		}
-		return $result;
-	}
+        }
+        return $result;
+    }
 
 
     /**
@@ -261,220 +261,220 @@ 
      *
      * @return $result boolean value indicating whether or not sprites were created
      */
-	public function createSprites() {
+    public function createSprites() {
 
         global $mod_strings;
 
-		if(!$this->isAvailable)
+        if(!$this->isAvailable)
         {
-			if(!$this->silentRun)
+            if(!$this->silentRun)
             {
                 $msg = $mod_strings['LBL_SPRITES_NOT_SUPPORTED'];
                 $GLOBALS['log']->warn($msg);
                 $this->logMessage($msg);
             }
-			return false;
-		}
+            return false;
+        }
 
-		// add repeatable sprites
-		if(count($this->spriteRepeat))
+        // add repeatable sprites
+        if(count($this->spriteRepeat))
         {
-			$this->spriteSrc = array_merge($this->spriteSrc, $this->spriteRepeat);
+            $this->spriteSrc = array_merge($this->spriteSrc, $this->spriteRepeat);
         }
 
-		foreach($this->spriteSrc as $name => $dirs)
+        foreach($this->spriteSrc as $name => $dirs)
         {
-			if(!$this->silentRun)
+            if(!$this->silentRun)
             {
                 $msg = string_format($mod_strings['LBL_SPRITES_CREATING_NAMESPACE'], array($name));
                 $GLOBALS['log']->debug($msg);
-				$this->logMessage($msg);
+                $this->logMessage($msg);
             }
 
-			// setup config for sprite placement algorithm
-			if(substr($name, 0, 6) == 'repeat')
+            // setup config for sprite placement algorithm
+            if(substr($name, 0, 6) == 'repeat')
             {
-				$isRepeat = true;
+                $isRepeat = true;
                 $type = substr($name, 7, 10) == 'horizontal' ? 'horizontal' : 'vertical';
-				$config = array(
-					'type' => $type,
-				);
-			} else {
-				$isRepeat = false;
-				$config = array(
-					'type' => 'boxed',
-					'width' => $this->maxWidth,
-					'height' => $this->maxHeight,
-					'rowcnt' => $this->rowCnt,
-				);
-			}
-
-			// use separate class to arrange the images
-			$sp = new SpritePlacement($dirs, $config);
-			$sp->processSprites();
-
-			//if(! $this->silentRun)
-			//	echo " (size {$sp->width()}x{$sp->height()})<br />";
-
-			// we need a target image size
-			if($sp->width() && $sp->height())
+                $config = array(
+                    'type' => $type,
+                );
+            } else {
+                $isRepeat = false;
+                $config = array(
+                    'type' => 'boxed',
+                    'width' => $this->maxWidth,
+                    'height' => $this->maxHeight,
+                    'rowcnt' => $this->rowCnt,
+                );
+            }
+
+            // use separate class to arrange the images
+            $sp = new SpritePlacement($dirs, $config);
+            $sp->processSprites();
+
+            //if(! $this->silentRun)
+            //	echo " (size {$sp->width()}x{$sp->height()})<br />";
+
+            // we need a target image size
+            if($sp->width() && $sp->height())
             {
-				// init sprite image
-				$this->initSpriteImg($sp->width(), $sp->height());
+                // init sprite image
+                $this->initSpriteImg($sp->width(), $sp->height());
 
-				// add sprites based upon determined coordinates
-				foreach($dirs as $dir => $files)
+                // add sprites based upon determined coordinates
+                foreach($dirs as $dir => $files)
                 {
-					if(!$this->silentRun)
+                    if(!$this->silentRun)
                     {
                         $msg = string_format($mod_strings['LBL_SPRITES_PROCESSING_DIR'], array($dir));
                         $GLOBALS['log']->debug($msg);
                         $this->logMessage($msg);
                     }
 
-					foreach($files as $file => $info)
+                    foreach($files as $file => $info)
                     {
-						if($im = $this->loadImage($dir, $file, $info['type']))
+                        if($im = $this->loadImage($dir, $file, $info['type']))
                         {
-							// coordinates
-							$dst_x = $sp->spriteMatrix[$dir.'/'.$file]['x'];
-							$dst_y = $sp->spriteMatrix[$dir.'/'.$file]['y'];
+                            // coordinates
+                            $dst_x = $sp->spriteMatrix[$dir.'/'.$file]['x'];
+                            $dst_y = $sp->spriteMatrix[$dir.'/'.$file]['y'];
 
-							imagecopy($this->spriteImg, $im, $dst_x, $dst_y, 0, 0, $info['x'], $info['y']);
-							imagedestroy($im);
+                            imagecopy($this->spriteImg, $im, $dst_x, $dst_y, 0, 0, $info['x'], $info['y']);
+                            imagedestroy($im);
 
-							if(!$this->silentRun)
+                            if(!$this->silentRun)
                             {
                                 $msg = string_format($mod_strings['LBL_SPRITES_ADDED'], array("{$dir}/{$file}"));
                                 $GLOBALS['log']->debug($msg);
                                 $this->logMessage($msg);
                             }
-						}
-					}
-				}
+                        }
+                    }
+                }
 
-				// dir & filenames
-				if($isRepeat)
+                // dir & filenames
+                if($isRepeat)
                 {
-					$outputDir = sugar_cached("sprites/Repeatable");
-					$spriteFileName = "{$name}.png";
-					$cssFileName = "{$this->fileName}.css";
-					$metaFileName = "{$this->fileName}.meta.php";
-					$nameSpace = "Repeatable";
-				} else {
-					$outputDir = sugar_cached("sprites/$name");
-					$spriteFileName = "{$this->fileName}.png";
-					$cssFileName = "{$this->fileName}.css";
-					$metaFileName = "{$this->fileName}.meta.php";
-					$nameSpace = "{$name}";
-				}
-
-				// directory structure
-				if(!is_dir(sugar_cached("sprites/$nameSpace")))
+                    $outputDir = sugar_cached("sprites/Repeatable");
+                    $spriteFileName = "{$name}.png";
+                    $cssFileName = "{$this->fileName}.css";
+                    $metaFileName = "{$this->fileName}.meta.php";
+                    $nameSpace = "Repeatable";
+                } else {
+                    $outputDir = sugar_cached("sprites/$name");
+                    $spriteFileName = "{$this->fileName}.png";
+                    $cssFileName = "{$this->fileName}.css";
+                    $metaFileName = "{$this->fileName}.meta.php";
+                    $nameSpace = "{$name}";
+                }
+
+                // directory structure
+                if(!is_dir(sugar_cached("sprites/$nameSpace")))
                 {
-					sugar_mkdir(sugar_cached("sprites/$nameSpace"), 0775, true);
+                    sugar_mkdir(sugar_cached("sprites/$nameSpace"), 0775, true);
                 }
 
-				// save sprite image
-				imagepng($this->spriteImg, "$outputDir/$spriteFileName", $this->pngCompression, $this->pngFilter);
-				imagedestroy($this->spriteImg);
+                // save sprite image
+                imagepng($this->spriteImg, "$outputDir/$spriteFileName", $this->pngCompression, $this->pngFilter);
+                imagedestroy($this->spriteImg);
 
-				/* generate css & metadata */
+                /* generate css & metadata */
 
-				$head = '';
-				$body = '';
-				$metadata = '';
+                $head = '';
+                $body = '';
+                $metadata = '';
 
-				foreach($sp->spriteSrc as $id => $info)
+                foreach($sp->spriteSrc as $id => $info)
                 {
-					// sprite id
-					$hash_id = md5($id);
+                    // sprite id
+                    $hash_id = md5($id);
 
-					// header
-					$head .= "span.spr_{$hash_id},\n";
+                    // header
+                    $head .= "span.spr_{$hash_id},\n";
 
-					// image size
-					$w = $info['x'];
-					$h = $info['y'];
+                    // image size
+                    $w = $info['x'];
+                    $h = $info['y'];
 
-					// image offset
-					$offset_x = $sp->spriteMatrix[$id]['x'];
-					$offset_y = $sp->spriteMatrix[$id]['y'];
+                    // image offset
+                    $offset_x = $sp->spriteMatrix[$id]['x'];
+                    $offset_y = $sp->spriteMatrix[$id]['y'];
 
-					// sprite css
-					$body .= "/* {$id} */
+                    // sprite css
+                    $body .= "/* {$id} */
 span.spr_{$hash_id} {
 width: {$w}px;
 height: {$h}px;
 background-position: -{$offset_x}px -{$offset_y}px;
 }\n";
 
-					$metadata .= '$sprites["'.$id.'"] = array ("class"=>"'.$hash_id.'","width"=>"'.$w.'","height"=>"'.$h.'");'."\n";
-				}
+                    $metadata .= '$sprites["'.$id.'"] = array ("class"=>"'.$hash_id.'","width"=>"'.$w.'","height"=>"'.$h.'");'."\n";
+                }
 
-				// common css header
+                // common css header
                 require_once('include/utils.php');
                 $bg_path = getVersionedPath('index.php').'&entryPoint=getImage&imageName='.$spriteFileName.'&spriteNamespace='.$nameSpace;
-				$head = rtrim($head, "\n,")." {background: url('../../../{$bg_path}'); no-repeat;display:inline-block;}\n";
+                $head = rtrim($head, "\n,")." {background: url('../../../{$bg_path}'); no-repeat;display:inline-block;}\n";
 
-				// append mode for repeatable sprites
+                // append mode for repeatable sprites
                 $fileMode = $isRepeat ? 'a' : 'w';
 
-				// save css
-				$css_content = "\n/* autogenerated sprites - $name */\n".$head.$body;
-				if($this->cssMinify)
+                // save css
+                $css_content = "\n/* autogenerated sprites - $name */\n".$head.$body;
+                if($this->cssMinify)
                 {
-					$css_content = cssmin::minify($css_content);
+                    $css_content = cssmin::minify($css_content);
                 }
-				$fh = fopen("$outputDir/$cssFileName", $fileMode);
-				fwrite($fh, $css_content);
-				fclose($fh);
-
-				/* save metadata */
-				$add_php_tag = (file_exists("$outputDir/$metaFileName") && $isRepeat) ? false : true;
-				$fh = fopen("$outputDir/$metaFileName", $fileMode);
-				if($add_php_tag)
+                $fh = fopen("$outputDir/$cssFileName", $fileMode);
+                fwrite($fh, $css_content);
+                fclose($fh);
+
+                /* save metadata */
+                $add_php_tag = (file_exists("$outputDir/$metaFileName") && $isRepeat) ? false : true;
+                $fh = fopen("$outputDir/$metaFileName", $fileMode);
+                if($add_php_tag)
                 {
-					fwrite($fh, '<?php');
+                    fwrite($fh, '<?php');
                 }
-				fwrite($fh, "\n/* sprites metadata - $name */\n");
-				fwrite($fh, $metadata."\n");
-				fclose($fh);
+                fwrite($fh, "\n/* sprites metadata - $name */\n");
+                fwrite($fh, $metadata."\n");
+                fclose($fh);
 
-			// if width & height
-			} else {
+            // if width & height
+            } else {
 
-				if(!$this->silentRun)
+                if(!$this->silentRun)
                 {
                     $msg = string_format($mod_strings['LBL_SPRITES_ADDED'], array($name));
                     $GLOBALS['log']->debug($msg);
                     $this->logMessage($msg);
                 }
 
-			}
+            }
 
-		}
-		return true;
-	}
+        }
+        return true;
+    }
 
 
-	/**
+    /**
      * initSpriteImg
      *
      * @param w int value representing width of sprite
      * @param h int value representing height of sprite
      * Private function to initialize creating the sprite canvas image
      */
-	private function initSpriteImg($w, $h) {
-		$this->spriteImg = imagecreatetruecolor($w,$h);
-		$transparent = imagecolorallocatealpha($this->spriteImg, 0, 0, 0, 127);
-		imagefill($this->spriteImg, 0, 0, $transparent);
-		imagealphablending($this->spriteImg, false);
-		imagesavealpha($this->spriteImg, true);
-	}
+    private function initSpriteImg($w, $h) {
+        $this->spriteImg = imagecreatetruecolor($w,$h);
+        $transparent = imagecolorallocatealpha($this->spriteImg, 0, 0, 0, 127);
+        imagefill($this->spriteImg, 0, 0, $transparent);
+        imagealphablending($this->spriteImg, false);
+        imagesavealpha($this->spriteImg, true);
+    }
 
 
-	/**
+    /**
      * loadImage
      *
      * private function to load image resources
@@ -484,19 +484,19 @@ 
      * @param $type String value of the file type (IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG)
      *
      */
-	private function loadImage($dir, $file, $type) {
-		$path_file = $dir.'/'.$file;
-		switch($type) {
-			case IMAGETYPE_GIF:
-				return imagecreatefromgif($path_file);
-			case IMAGETYPE_JPEG:
-				return imagecreatefromjpeg($path_file);
-			case IMAGETYPE_PNG:
-				return imagecreatefrompng($path_file);
-			default:
-				return false;
-		}
-	}
+    private function loadImage($dir, $file, $type) {
+        $path_file = $dir.'/'.$file;
+        switch($type) {
+            case IMAGETYPE_GIF:
+                return imagecreatefromgif($path_file);
+            case IMAGETYPE_JPEG:
+                return imagecreatefromjpeg($path_file);
+            case IMAGETYPE_PNG:
+                return imagecreatefrompng($path_file);
+            default:
+                return false;
+        }
+    }
 
     /**
      * private logMessage
@@ -527,17 +527,17 @@ 
 class SpritePlacement
 {
 
-	// occupied space
-	var $spriteMatrix = array();
+    // occupied space
+    var $spriteMatrix = array();
 
-	// minimum surface
-	var $minSurface = 0;
+    // minimum surface
+    var $minSurface = 0;
 
-	// sprite src (flattened array)
-	var $spriteSrc = array();
+    // sprite src (flattened array)
+    var $spriteSrc = array();
 
-	// placement config array
-	/*
+    // placement config array
+    /*
 		type = 	boxed
 				horizontal
 				vertical
@@ -548,99 +548,99 @@ 
 				-> rowcnt
 
 	*/
-	var $config = array();
-
-	function __construct($spriteSrc, $config) {
-
-		// convert spriteSrc to flat array
-		foreach($spriteSrc as $dir => $files) {
-			foreach($files as $file => $info) {
-				// use full path as identifier
-				$full_path = $dir.'/'.$file;
-				$this->spriteSrc[$full_path] = $info;
-			}
-		}
-
-		$this->config = $config;
-	}
-
-	function processSprites() {
-
-		foreach($this->spriteSrc as $id => $info) {
-
-			// dimensions
-			$x = $info['x'];
-			$y = $info['y'];
-
-			// update min surface
-			$this->minSurface += $x * $y;
-
-			// get coordinates where to add this sprite
-			if($coor = $this->addSprite($x, $y)) {
-				$this->spriteMatrix[$id] = $coor;
-			}
-		}
-	}
-
-	// returns x/y coordinates to fit the sprite
-	function addSprite($w, $h) {
-		$result = false;
-
-		switch($this->config['type']) {
-
-			// boxed
-			case 'boxed':
-
-				$spriteX = $this->config['width'];
-				$spriteY = $this->config['height'];
-				$spriteCnt = count($this->spriteMatrix) + 1;
-				$y = ceil($spriteCnt / $this->config['rowcnt']);
-				$x = $spriteCnt - (($y - 1) * $this->config['rowcnt']);
-				$result = array(
-					'x' => ($x * $spriteX) + 1 - $spriteX,
-					'y' => ($y * $spriteY) + 1 - $spriteY);
-
-				break;
-
-			// horizontal -> align vertically
-			case 'horizontal':
-				$result = array('x' => 1, 'y' => $this->height() + 1);
-				break;
-
-			// vertical -> align horizontally
-			case 'vertical':
-				$result = array('x' => $this->width() + 1, 'y' => 1);
-				break;
-
-			default:
-				$GLOBALS['log']->warn(__CLASS__.": Unknown sprite placement algorithm -> {$this->config['type']}");
-				break;
-		}
-
-		return $result;
-	}
-
-	// calculate total width
-	function width() {
-		return $this->getMaxAxis('x');
-	}
-
-	// calculate total height
-	function height() {
-		return $this->getMaxAxis('y');
-	}
-
-	// helper function to get highest axis value
-	function getMaxAxis($axis) {
-		$val = 0;
-		foreach($this->spriteMatrix as $id => $coor) {
-			$new_val = $coor[$axis] + $this->spriteSrc[$id][$axis] - 1;
-			if($new_val > $val) {
-				$val = $new_val;
-			}
-		}
-		return $val;
-	}
+    var $config = array();
+
+    function __construct($spriteSrc, $config) {
+
+        // convert spriteSrc to flat array
+        foreach($spriteSrc as $dir => $files) {
+            foreach($files as $file => $info) {
+                // use full path as identifier
+                $full_path = $dir.'/'.$file;
+                $this->spriteSrc[$full_path] = $info;
+            }
+        }
+
+        $this->config = $config;
+    }
+
+    function processSprites() {
+
+        foreach($this->spriteSrc as $id => $info) {
+
+            // dimensions
+            $x = $info['x'];
+            $y = $info['y'];
+
+            // update min surface
+            $this->minSurface += $x * $y;
+
+            // get coordinates where to add this sprite
+            if($coor = $this->addSprite($x, $y)) {
+                $this->spriteMatrix[$id] = $coor;
+            }
+        }
+    }
+
+    // returns x/y coordinates to fit the sprite
+    function addSprite($w, $h) {
+        $result = false;
+
+        switch($this->config['type']) {
+
+            // boxed
+            case 'boxed':
+
+                $spriteX = $this->config['width'];
+                $spriteY = $this->config['height'];
+                $spriteCnt = count($this->spriteMatrix) + 1;
+                $y = ceil($spriteCnt / $this->config['rowcnt']);
+                $x = $spriteCnt - (($y - 1) * $this->config['rowcnt']);
+                $result = array(
+                    'x' => ($x * $spriteX) + 1 - $spriteX,
+                    'y' => ($y * $spriteY) + 1 - $spriteY);
+
+                break;
+
+            // horizontal -> align vertically
+            case 'horizontal':
+                $result = array('x' => 1, 'y' => $this->height() + 1);
+                break;
+
+            // vertical -> align horizontally
+            case 'vertical':
+                $result = array('x' => $this->width() + 1, 'y' => 1);
+                break;
+
+            default:
+                $GLOBALS['log']->warn(__CLASS__.": Unknown sprite placement algorithm -> {$this->config['type']}");
+                break;
+        }
+
+        return $result;
+    }
+
+    // calculate total width
+    function width() {
+        return $this->getMaxAxis('x');
+    }
+
+    // calculate total height
+    function height() {
+        return $this->getMaxAxis('y');
+    }
+
+    // helper function to get highest axis value
+    function getMaxAxis($axis) {
+        $val = 0;
+        foreach($this->spriteMatrix as $id => $coor) {
+            $new_val = $coor[$axis] + $this->spriteSrc[$id][$axis] - 1;
+            if($new_val > $val) {
+                $val = $new_val;
+            }
+        }
+        return $val;
+    }
 }
 
 ?>

modules/Administration/UpgradeWizardCommon.php

Indentation +51 added lines, -51 removed lines

@@ -69,24 +69,24 @@ 
 
 if(!defined('SUGARCRM_PRE_INSTALL_FILE'))
 {
-	define('SUGARCRM_PRE_INSTALL_FILE', 'scripts/pre_install.php');
-	define('SUGARCRM_POST_INSTALL_FILE', 'scripts/post_install.php');
-	define('SUGARCRM_PRE_UNINSTALL_FILE', 'scripts/pre_uninstall.php');
-	define('SUGARCRM_POST_UNINSTALL_FILE', 'scripts/post_uninstall.php');
+    define('SUGARCRM_PRE_INSTALL_FILE', 'scripts/pre_install.php');
+    define('SUGARCRM_POST_INSTALL_FILE', 'scripts/post_install.php');
+    define('SUGARCRM_PRE_UNINSTALL_FILE', 'scripts/pre_uninstall.php');
+    define('SUGARCRM_POST_UNINSTALL_FILE', 'scripts/post_uninstall.php');
 }
 $script_files = array(
-	"pre-install" => constant('SUGARCRM_PRE_INSTALL_FILE'),
-	"post-install" => constant('SUGARCRM_POST_INSTALL_FILE'),
-	"pre-uninstall" => constant('SUGARCRM_PRE_UNINSTALL_FILE'),
-	"post-uninstall" => constant('SUGARCRM_POST_UNINSTALL_FILE'),
+    "pre-install" => constant('SUGARCRM_PRE_INSTALL_FILE'),
+    "post-install" => constant('SUGARCRM_POST_INSTALL_FILE'),
+    "pre-uninstall" => constant('SUGARCRM_PRE_UNINSTALL_FILE'),
+    "post-uninstall" => constant('SUGARCRM_POST_UNINSTALL_FILE'),
 );
 
 
 
 function extractFile( $zip_file, $file_in_zip ){
     global $base_tmp_upgrade_dir;
-	if(empty($base_tmp_upgrade_dir)){
-    	$base_tmp_upgrade_dir   = sugar_cached("upgrades/temp");
+    if(empty($base_tmp_upgrade_dir)){
+        $base_tmp_upgrade_dir   = sugar_cached("upgrades/temp");
     }
     $my_zip_dir = mk_temp_dir( $base_tmp_upgrade_dir );
     register_shutdown_function('rmdir_recursive', $my_zip_dir);
@@ -146,9 +146,9 @@ 
 }
 
 function getUITextForType( $type ){
-	$type = 'LBL_UW_TYPE_'.strtoupper($type);
-	global $mod_strings;
-	return $mod_strings[$type];
+    $type = 'LBL_UW_TYPE_'.strtoupper($type);
+    global $mod_strings;
+    return $mod_strings[$type];
 }
 
 function getUITextForMode( $mode ){
@@ -162,7 +162,7 @@ 
     global $subdirs;
     global $sugar_version;
     global $sugar_flavor;
-	global $mod_strings;
+    global $mod_strings;
 
     if( !isset($manifest['type']) ){
         die($mod_strings['ERROR_MANIFEST_TYPE']);
@@ -211,41 +211,41 @@ 
 }
 
 function getDiffFiles($unzip_dir, $install_file, $is_install = true, $previous_version = ''){
-	//require_once($unzip_dir . '/manifest.php');
-	global $installdefs;
-	if(!empty($previous_version)){
-		//check if the upgrade path exists
-		if(!empty($upgrade_manifest)){
-			if(!empty($upgrade_manifest['upgrade_paths'])){
-				if(!empty($upgrade_manifest['upgrade_paths'][$previous_version])){
-					$installdefs = 	$upgrade_manifest['upgrade_paths'][$previous_version];
-				}
-			}//fi
-		}//fi
-	}//fi
-	$modified_files = array();
-	if(!empty($installdefs['copy'])){
-		foreach($installdefs['copy'] as $cp){
-			$cp['to'] = clean_path(str_replace('<basepath>', $unzip_dir, $cp['to']));
-			$restore_path = remove_file_extension(urldecode($install_file))."-restore/";
-			$backup_path = clean_path($restore_path.$cp['to'] );
-			//check if this file exists in the -restore directory
-			if(file_exists($backup_path)){
-				//since the file exists, then we want do an md5 of the install version and the file system version
-				$from = $backup_path;
-				$needle = $restore_path;
-				if(!$is_install){
-					$from = str_replace('<basepath>', $unzip_dir, $cp['from']);
-					$needle = $unzip_dir;
-				}
-				$files_found = md5DirCompare($from.'/', $cp['to'].'/', array('.svn'), false);
-				if(count($files_found > 0)){
-					foreach($files_found as $key=>$value){
-						$modified_files[] = str_replace($needle, '', $key);
-					}
-				}
-			}//fi
-		}//rof
-	}//fi
-	return $modified_files;
+    //require_once($unzip_dir . '/manifest.php');
+    global $installdefs;
+    if(!empty($previous_version)){
+        //check if the upgrade path exists
+        if(!empty($upgrade_manifest)){
+            if(!empty($upgrade_manifest['upgrade_paths'])){
+                if(!empty($upgrade_manifest['upgrade_paths'][$previous_version])){
+                    $installdefs = 	$upgrade_manifest['upgrade_paths'][$previous_version];
+                }
+            }//fi
+        }//fi
+    }//fi
+    $modified_files = array();
+    if(!empty($installdefs['copy'])){
+        foreach($installdefs['copy'] as $cp){
+            $cp['to'] = clean_path(str_replace('<basepath>', $unzip_dir, $cp['to']));
+            $restore_path = remove_file_extension(urldecode($install_file))."-restore/";
+            $backup_path = clean_path($restore_path.$cp['to'] );
+            //check if this file exists in the -restore directory
+            if(file_exists($backup_path)){
+                //since the file exists, then we want do an md5 of the install version and the file system version
+                $from = $backup_path;
+                $needle = $restore_path;
+                if(!$is_install){
+                    $from = str_replace('<basepath>', $unzip_dir, $cp['from']);
+                    $needle = $unzip_dir;
+                }
+                $files_found = md5DirCompare($from.'/', $cp['to'].'/', array('.svn'), false);
+                if(count($files_found > 0)){
+                    foreach($files_found as $key=>$value){
+                        $modified_files[] = str_replace($needle, '', $key);
+                    }
+                }
+            }//fi
+        }//rof
+    }//fi
+    return $modified_files;
 }

modules/Administration/updateTimezonePrefs.php

Indentation +77 added lines, -77 removed lines

@@ -47,7 +47,7 @@ 
 if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 $prompt_users = 'checked';
 if(isset($_POST['preview']) && !isset($_POST['prompt_users'])){
-	$prompt_users = '';
+    $prompt_users = '';
 }
 
 
@@ -55,18 +55,18 @@ 
 $execute = false;
 // loop through user preferences and check for "bad" elements; rebuild preferences array and update database
 if(isset($_POST['execute'])){
-	$execute = true;
+    $execute = true;
 }
 $serverTimeZone = lookupTimezone(0);
 while ($row = $db->fetchByAssoc($result)) {
-	$adjustment = 'none';
+    $adjustment = 'none';
 
-	if(isset($_POST[$row['id'].'adjust'])){
-		$adjustment = $_POST[$row['id'].'adjust'];
-	}
+    if(isset($_POST[$row['id'].'adjust'])){
+        $adjustment = $_POST[$row['id'].'adjust'];
+    }
 	
-		$string = "Preview";
-		if($execute)$string = "Updating";
+        $string = "Preview";
+        if($execute)$string = "Updating";
         echo "<tr><td> $string timezone preferences for user <b>{$row['user_name']}</b>...</td><td>";
 		
         
@@ -76,84 +76,84 @@ 
         $prefs = unserialize(base64_decode($row['user_preferences']));
         $setTo = '';
         $alreadySet = '';
-		if(!empty($prefs)){
+        if(!empty($prefs)){
 			
-	        foreach ($prefs as $key => $val) {
-	               if ($key == 'timez') {
-	                	if(empty($prefs['timezone']) && $val != ''){
-		                	$hourAdjust = $adjustment;
-		                	if($hourAdjust == 'none'){
-								$hourAdjust = 0;
-							}
-	                		$selectedZone = lookupTimezone($prefs['timez'] + $hourAdjust);
+            foreach ($prefs as $key => $val) {
+                    if ($key == 'timez') {
+                        if(empty($prefs['timezone']) && $val != ''){
+                            $hourAdjust = $adjustment;
+                            if($hourAdjust == 'none'){
+                                $hourAdjust = 0;
+                            }
+                            $selectedZone = lookupTimezone($prefs['timez'] + $hourAdjust);
 	                	
-	                	if(!empty($selectedZone)){
-	                   	 	$newprefs['timezone'] = $selectedZone;   
-	                   	 	$newprefs['timez']  = $val;
-	                   	 	$setTo = $selectedZone;
-	                   	 	if(empty($prompt_users)){
-	                   			$newprefs['ut']=1;
-	                   	 	}else{
-	                   	 		$newprefs['ut']=0;
-	                   	 	}
-	                	}else{
-	                		$newprefs['timezone'] = $serverTimeZone;   
-	                   	 	$newprefs['timez']  = $val;
-	                   	 	$setTo = $serverTimeZone;
-	                   	 	if(empty($prompt_users)){
-	                   			$newprefs['ut']=1;
-	                   	 	}else{
-	                   	 		$newprefs['ut']=0;
-	                   	 	}
-	                	}
-	                }else{
-	                	$newprefs[$key] = $val;
-	                	if(!empty($prefs['timezone'])){
-	                		$alreadySet = 'Previously Set - '. $prefs['timezone'];	
-	                	}
-	                }
+                        if(!empty($selectedZone)){
+                                $newprefs['timezone'] = $selectedZone;   
+                                $newprefs['timez']  = $val;
+                                $setTo = $selectedZone;
+                                if(empty($prompt_users)){
+                                    $newprefs['ut']=1;
+                                }else{
+                                    $newprefs['ut']=0;
+                                }
+                        }else{
+                            $newprefs['timezone'] = $serverTimeZone;   
+                                $newprefs['timez']  = $val;
+                                $setTo = $serverTimeZone;
+                                if(empty($prompt_users)){
+                                    $newprefs['ut']=1;
+                                }else{
+                                    $newprefs['ut']=0;
+                                }
+                        }
+                    }else{
+                        $newprefs[$key] = $val;
+                        if(!empty($prefs['timezone'])){
+                            $alreadySet = 'Previously Set - '. $prefs['timezone'];	
+                        }
+                    }
 	                
 	         
-	                }else{
-	                	$newprefs[$key] = $val;
-	                }
-	        }
-	        	if($execute){
-        			$newstr = mysql_real_escape_string(base64_encode(serialize($newprefs)));
-       				$db->query("UPDATE users SET user_preferences = '{$newstr}' WHERE id = '{$row['id']}'");
-	        	}
-	        }
-		if(!empty($setTo)){
-			echo $setTo;
-		}else{
-			if(!empty($alreadySet)){
-				echo $alreadySet;
-			}else{
-				echo $serverTimeZone;
-				$prefs['timezone'] = $serverTimeZone;
-			}
-		}
+                    }else{
+                        $newprefs[$key] = $val;
+                    }
+            }
+                if($execute){
+                    $newstr = mysql_real_escape_string(base64_encode(serialize($newprefs)));
+                        $db->query("UPDATE users SET user_preferences = '{$newstr}' WHERE id = '{$row['id']}'");
+                }
+            }
+        if(!empty($setTo)){
+            echo $setTo;
+        }else{
+            if(!empty($alreadySet)){
+                echo $alreadySet;
+            }else{
+                echo $serverTimeZone;
+                $prefs['timezone'] = $serverTimeZone;
+            }
+        }
         echo "</td><td>";
         if(!empty($setTo)){
-        	echo "Adjust: ";
+            echo "Adjust: ";
         if($execute){
-			if(isset($_POST[$row['id'].'adjust'])){
-				echo  $adjustment;
-			}
-		}else{
-			echo "<select name='{$row['id']}adjust'>";
+            if(isset($_POST[$row['id'].'adjust'])){
+                echo  $adjustment;
+            }
+        }else{
+            echo "<select name='{$row['id']}adjust'>";
 			
-			echo get_select_options_with_id(array('-1'=>'-1', 'none'=>'0', '1'=>'+1'), $adjustment.'');
-			echo '</select>';
+            echo get_select_options_with_id(array('-1'=>'-1', 'none'=>'0', '1'=>'+1'), $adjustment.'');
+            echo '</select>';
 
-		}
-		echo ' hour';
         }
-		echo ' </td><td>';
+        echo ' hour';
+        }
+        echo ' </td><td>';
         echo "</tr>";
 
-		$the_old_prefs[] = $prefs;
-		$the_new_prefs[] = $newprefs;
+        $the_old_prefs[] = $prefs;
+        $the_new_prefs[] = $newprefs;
 
         unset($prefs);
         unset($newprefs);
@@ -163,11 +163,11 @@ 
 echo "</table>";
 
 if($execute){
-	echo "<br>All timezone preferences updated!<br><br>";
+    echo "<br>All timezone preferences updated!<br><br>";
 	
 }else{
-	echo "Prompt users on login to confirm:<input type='checkbox' name='prompt_users' value='1' $prompt_users><br>";
-	echo "<input class='button' type='submit' name='execute' value='Execute'>&nbsp; <input class='button' type='submit' name='preview' value='Preview'>";
+    echo "Prompt users on login to confirm:<input type='checkbox' name='prompt_users' value='1' $prompt_users><br>";
+    echo "<input class='button' type='submit' name='execute' value='Execute'>&nbsp; <input class='button' type='submit' name='preview' value='Preview'>";
 	
 }
 echo "&nbsp;<input class='button' type='button' name='Done' value='Done' onclick='document.location.href=\"index.php?action=DstFix&module=Administration\"'>";

modules/InboundEmail/AOPInboundEmail.php

Indentation +23 added lines, -23 removed lines

@@ -1,27 +1,27 @@
 <?php
- /**
- * 
- * 
- * @package 
- * @copyright SalesAgility Ltd http://www.salesagility.com
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
- * along with this program; if not, see http://www.gnu.org/licenses
- * or write to the Free Software Foundation,Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301  USA
- *
- * @author Salesagility Ltd <support@salesagility.com>
- */
+    /**
+     * 
+     * 
+     * @package 
+     * @copyright SalesAgility Ltd http://www.salesagility.com
+     * 
+     * This program is free software; you can redistribute it and/or modify
+     * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+     * the Free Software Foundation; either version 3 of the License, or
+     * (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+     * along with this program; if not, see http://www.gnu.org/licenses
+     * or write to the Free Software Foundation,Inc., 51 Franklin Street,
+     * Fifth Floor, Boston, MA 02110-1301  USA
+     *
+     * @author Salesagility Ltd <support@salesagility.com>
+     */
 require_once 'modules/InboundEmail/InboundEmail.php';
 require_once 'include/clean.php';
 class AOPInboundEmail extends InboundEmail {