mambax7 / smartobject

class/smartuploader.php

Doc Comments +1 added lines, -2 removed lines

@@ -99,11 +99,10 @@
      * Constructor
      *
      * @param string $uploadDir
-     * @param array $allowedMimeTypes
+     * @param integer $allowedMimeTypes
      * @param int $maxFileSize
      * @param int $maxWidth
      * @param int $maxHeight
-     * @param int $cmodvalue
      */
     function SmartUploader($uploadDir, $allowedMimeTypes = 0, $maxFileSize, $maxWidth = 0, $maxHeight = 0)
     {

Indentation +62 added lines, -62 removed lines

@@ -29,27 +29,27 @@ 
 // Project: The XOOPS Project                                                //
 // ------------------------------------------------------------------------- //
 /**
- * !
- * Example
- *
- * include_once 'uploader.php';
- * $allowed_mimetypes = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png');
- * $maxfilesize = 50000;
- * $maxfilewidth = 120;
- * $maxfileheight = 120;
- * $uploader = new SmartUploader('/home/xoops/uploads', $allowed_mimetypes, $maxfilesize, $maxfilewidth, $maxfileheight);
- * if ($uploader->fetchMedia($HTTP_POST_VARS['uploade_file_name'])) {
- * if (!$uploader->upload()) {
- * echo $uploader->getErrors();
- * } else {
- * echo '<h4>File uploaded successfully!</h4>'
- * echo 'Saved as: ' . $uploader->getSavedFileName() . '<br />';
- * echo 'Full path: ' . $uploader->getSavedDestination();
- * }
- * } else {
- * echo $uploader->getErrors();
- * }
- */
+	 * !
+	 * Example
+	 *
+	 * include_once 'uploader.php';
+	 * $allowed_mimetypes = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png');
+	 * $maxfilesize = 50000;
+	 * $maxfilewidth = 120;
+	 * $maxfileheight = 120;
+	 * $uploader = new SmartUploader('/home/xoops/uploads', $allowed_mimetypes, $maxfilesize, $maxfilewidth, $maxfileheight);
+	 * if ($uploader->fetchMedia($HTTP_POST_VARS['uploade_file_name'])) {
+	 * if (!$uploader->upload()) {
+	 * echo $uploader->getErrors();
+	 * } else {
+	 * echo '<h4>File uploaded successfully!</h4>'
+	 * echo 'Saved as: ' . $uploader->getSavedFileName() . '<br />';
+	 * echo 'Full path: ' . $uploader->getSavedDestination();
+	 * }
+	 * } else {
+	 * echo $uploader->getErrors();
+	 * }
+	 */
 
 /**
  * Upload Media files
@@ -88,49 +88,49 @@ 
 class SmartUploader extends XoopsMediaUploader
 {
 
-    var $ext;
-    var $dimension;
+	var $ext;
+	var $dimension;
 
-    /**
-     * No admin check for uploads
-     */
-    var $noadmin_sizecheck;
-    /**
-     * Constructor
-     *
-     * @param string $uploadDir
-     * @param array $allowedMimeTypes
-     * @param int $maxFileSize
-     * @param int $maxWidth
-     * @param int $maxHeight
-     * @param int $cmodvalue
-     */
-    function SmartUploader($uploadDir, $allowedMimeTypes = 0, $maxFileSize, $maxWidth = 0, $maxHeight = 0)
-    {
-        $this->XoopsMediaUploader($uploadDir, $allowedMimeTypes, $maxFileSize, $maxWidth, $maxHeight);
-    }
+	/**
+	 * No admin check for uploads
+	 */
+	var $noadmin_sizecheck;
+	/**
+	 * Constructor
+	 *
+	 * @param string $uploadDir
+	 * @param array $allowedMimeTypes
+	 * @param int $maxFileSize
+	 * @param int $maxWidth
+	 * @param int $maxHeight
+	 * @param int $cmodvalue
+	 */
+	function SmartUploader($uploadDir, $allowedMimeTypes = 0, $maxFileSize, $maxWidth = 0, $maxHeight = 0)
+	{
+		$this->XoopsMediaUploader($uploadDir, $allowedMimeTypes, $maxFileSize, $maxWidth, $maxHeight);
+	}
 
-    function noAdminSizeCheck($value)
-    {
-        $this->noadmin_sizecheck = $value;
-    }
+	function noAdminSizeCheck($value)
+	{
+		$this->noadmin_sizecheck = $value;
+	}
 
-    /**
-     * Is the file the right size?
-     *
-     * @return bool
-     */
-    function checkMaxFileSize()
-    {
-        if ($this->noadmin_sizecheck)
-        {
-            return true;
-        }
-        if ($this->mediaSize > $this->maxFileSize)
-        {
-            return false;
-        }
-        return true;
-    }
+	/**
+	 * Is the file the right size?
+	 *
+	 * @return bool
+	 */
+	function checkMaxFileSize()
+	{
+		if ($this->noadmin_sizecheck)
+		{
+			return true;
+		}
+		if ($this->mediaSize > $this->maxFileSize)
+		{
+			return false;
+		}
+		return true;
+	}
 }
 ?>
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
  */
 mt_srand((double) microtime() * 1000000);
 
-include_once XOOPS_ROOT_PATH."/class/uploader.php";
+include_once XOOPS_ROOT_PATH . "/class/uploader.php";
 
 class SmartUploader extends XoopsMediaUploader
 {

include/captcha/captcha.php

Doc Comments +6 added lines

@@ -81,6 +81,12 @@
 
     /**
      * Initializing the CAPTCHA class
+     * @param boolean $skipmember
+     * @param integer $num_chars
+     * @param integer $fontsize_min
+     * @param integer $fontsize_max
+     * @param integer $background_type
+     * @param integer $background_num
      */
     function init($name = 'xoopscaptcha', $skipmember = null, $num_chars = null, $fontsize_min = null, $fontsize_max = null, $background_type = null, $background_num = null)
     {

Indentation +195 added lines, -195 removed lines

@@ -12,205 +12,205 @@
  */
 
 class XoopsCaptcha {
-    var $active	= true;
-    var $mode 	= "text";	// potential values: image, text
-    var $config	= array();
-
-    var $message = array(); // Logging error messages
-
-    function XoopsCaptcha()
-    {
-        // Loading default preferences
-        $this->config = @include dirname(__FILE__)."/config.php";
-
-        $this->setMode($this->config["mode"]);
-    }
-
-    function &instance()
-    {
-        static $instance;
-        if(!isset($instance)) {
-            $instance = new XoopsCaptcha();
-        }
-        return $instance;
-    }
-
-    function setConfig($name, $val)
-    {
-        if($name == "mode") {
-            $this->setMode($val);
-        }elseif(isset($this->$name)) {
-            $this->$name = $val;
-        }else {
-            $this->config[$name] = $val;
-        }
-        return true;
-    }
-
-    /**
-     * Set CAPTCHA mode
-     *
-     * For future possible modes, right now force to use text or image
-     *
-     * @param string	$mode	if no mode is set, just verify current mode
-     */
-    function setMode($mode = null)
-    {
-        if( !empty($mode) && in_array($mode, array("text", "image")) ) {
-            $this->mode = $mode;
-
-            if($this->mode != "image") {
-                return;
-            }
-        }
-
-        // Disable image mode
-        if(!extension_loaded('gd')) {
-            $this->mode = "text";
-        }else{
-            $required_functions = array("imagecreatetruecolor", "imagecolorallocate", "imagefilledrectangle", "imagejpeg", "imagedestroy", "imageftbbox");
-            foreach($required_functions as $func) {
-                if(!function_exists($func)) {
-                    $this->mode = "text";
-                    break;
-                }
-            }
-        }
-
-    }
-
-    /**
-     * Initializing the CAPTCHA class
-     */
-    function init($name = 'xoopscaptcha', $skipmember = null, $num_chars = null, $fontsize_min = null, $fontsize_max = null, $background_type = null, $background_num = null)
-    {
-        // Loading RUN-TIME settings
-        foreach(array_keys($this->config) as $key) {
-            if(isset(${$key}) && ${$key} !== null) {
-                $this->config[$key] = ${$key};
-            }
-        }
-        $this->config["name"] = $name;
-
-        // Skip CAPTCHA for member if set
-        if($this->config["skipmember"] && is_object($GLOBALS["xoopsUser"])) {
-            $this->active = false;
-        }
-    }
-
-    /**
-     * Verify user submission
-     */
-    function verify($skipMember = null)
-    {
-        $sessionName	= @$_SESSION['XoopsCaptcha_name'];
-        $skipMember		= ($skipMember === null) ? @$_SESSION['XoopsCaptcha_skipmember'] : $skipMember;
-        $maxAttempts	= intval( @$_SESSION['XoopsCaptcha_maxattempts'] );
-
-        $is_valid = false;
-
-        // Skip CAPTCHA for member if set
-        if( is_object($GLOBALS["xoopsUser"]) && !empty($skipMember) ) {
-            $is_valid = true;
-            // Kill too many attempts
-        }elseif(!empty($maxAttempts) && $_SESSION['XoopsCaptcha_attempt_'.$sessionName] > $maxAttempts) {
-            $this->message[] = XOOPS_CAPTCHA_TOOMANYATTEMPTS;
-
-            // Verify the code
-        }elseif(!empty($_SESSION['XoopsCaptcha_sessioncode'])){
-            $func = ($this->config["casesensitive"]) ? "strcmp" : "strcasecmp";
-            $is_valid = ! $func( trim(@$_POST[$sessionName]), $_SESSION['XoopsCaptcha_sessioncode']);
-        }
-
-        if(!empty($maxAttempts)) {
-            if(!$is_valid) {
-                // Increase the attempt records on failure
-                $_SESSION['XoopsCaptcha_attempt_'.$sessionName]++;
-                // Log the error message
-                $this->message[] = XOOPS_CAPTCHA_INVALID_CODE;
-
-            }else{
-
-                // reset attempt records on success
-                $_SESSION['XoopsCaptcha_attempt_'.$sessionName] = null;
-            }
-        }
-        $this->destroyGarbage(true);
-
-        return $is_valid;
-    }
-
-    function getCaption()
-    {
-        return defined("XOOPS_CAPTCHA_CAPTION") ? constant("XOOPS_CAPTCHA_CAPTION") : "";
-    }
-
-    function getMessage()
-    {
-        return implode("<br />", $this->message);
-    }
-
-    /**
-     * Destory historical stuff
-     */
-    function destroyGarbage($clearSession = false)
-    {
-        require_once dirname(__FILE__)."/".$this->mode.".php";
-        $class = "XoopsCaptcha".ucfirst($this->mode);
-        $captcha_handler = new $class();
-        if(method_exists($captcha_handler, "destroyGarbage")) {
-            $captcha_handler->loadConfig($this->config);
-            $captcha_handler->destroyGarbage();
-        }
-
-        if($clearSession) {
-            $_SESSION['XoopsCaptcha_name'] = null;
-            $_SESSION['XoopsCaptcha_skipmember'] = null;
-            $_SESSION['XoopsCaptcha_sessioncode'] = null;
-            $_SESSION['XoopsCaptcha_maxattempts'] = null;
-        }
-
-        return true;
-    }
-
-    function render()
-    {
-        $form = "";
-
-        if( !$this->active || empty($this->config["name"]) ) {
-            return $form;
-        }
-
-        $_SESSION['XoopsCaptcha_name'] = $this->config["name"];
-        $_SESSION['XoopsCaptcha_skipmember'] = $this->config["skipmember"];
-        $maxAttempts = $this->config["maxattempt"];
-        $_SESSION['XoopsCaptcha_maxattempts'] = $maxAttempts;
-        /*
+	var $active	= true;
+	var $mode 	= "text";	// potential values: image, text
+	var $config	= array();
+
+	var $message = array(); // Logging error messages
+
+	function XoopsCaptcha()
+	{
+		// Loading default preferences
+		$this->config = @include dirname(__FILE__)."/config.php";
+
+		$this->setMode($this->config["mode"]);
+	}
+
+	function &instance()
+	{
+		static $instance;
+		if(!isset($instance)) {
+			$instance = new XoopsCaptcha();
+		}
+		return $instance;
+	}
+
+	function setConfig($name, $val)
+	{
+		if($name == "mode") {
+			$this->setMode($val);
+		}elseif(isset($this->$name)) {
+			$this->$name = $val;
+		}else {
+			$this->config[$name] = $val;
+		}
+		return true;
+	}
+
+	/**
+	 * Set CAPTCHA mode
+	 *
+	 * For future possible modes, right now force to use text or image
+	 *
+	 * @param string	$mode	if no mode is set, just verify current mode
+	 */
+	function setMode($mode = null)
+	{
+		if( !empty($mode) && in_array($mode, array("text", "image")) ) {
+			$this->mode = $mode;
+
+			if($this->mode != "image") {
+				return;
+			}
+		}
+
+		// Disable image mode
+		if(!extension_loaded('gd')) {
+			$this->mode = "text";
+		}else{
+			$required_functions = array("imagecreatetruecolor", "imagecolorallocate", "imagefilledrectangle", "imagejpeg", "imagedestroy", "imageftbbox");
+			foreach($required_functions as $func) {
+				if(!function_exists($func)) {
+					$this->mode = "text";
+					break;
+				}
+			}
+		}
+
+	}
+
+	/**
+	 * Initializing the CAPTCHA class
+	 */
+	function init($name = 'xoopscaptcha', $skipmember = null, $num_chars = null, $fontsize_min = null, $fontsize_max = null, $background_type = null, $background_num = null)
+	{
+		// Loading RUN-TIME settings
+		foreach(array_keys($this->config) as $key) {
+			if(isset(${$key}) && ${$key} !== null) {
+				$this->config[$key] = ${$key};
+			}
+		}
+		$this->config["name"] = $name;
+
+		// Skip CAPTCHA for member if set
+		if($this->config["skipmember"] && is_object($GLOBALS["xoopsUser"])) {
+			$this->active = false;
+		}
+	}
+
+	/**
+	 * Verify user submission
+	 */
+	function verify($skipMember = null)
+	{
+		$sessionName	= @$_SESSION['XoopsCaptcha_name'];
+		$skipMember		= ($skipMember === null) ? @$_SESSION['XoopsCaptcha_skipmember'] : $skipMember;
+		$maxAttempts	= intval( @$_SESSION['XoopsCaptcha_maxattempts'] );
+
+		$is_valid = false;
+
+		// Skip CAPTCHA for member if set
+		if( is_object($GLOBALS["xoopsUser"]) && !empty($skipMember) ) {
+			$is_valid = true;
+			// Kill too many attempts
+		}elseif(!empty($maxAttempts) && $_SESSION['XoopsCaptcha_attempt_'.$sessionName] > $maxAttempts) {
+			$this->message[] = XOOPS_CAPTCHA_TOOMANYATTEMPTS;
+
+			// Verify the code
+		}elseif(!empty($_SESSION['XoopsCaptcha_sessioncode'])){
+			$func = ($this->config["casesensitive"]) ? "strcmp" : "strcasecmp";
+			$is_valid = ! $func( trim(@$_POST[$sessionName]), $_SESSION['XoopsCaptcha_sessioncode']);
+		}
+
+		if(!empty($maxAttempts)) {
+			if(!$is_valid) {
+				// Increase the attempt records on failure
+				$_SESSION['XoopsCaptcha_attempt_'.$sessionName]++;
+				// Log the error message
+				$this->message[] = XOOPS_CAPTCHA_INVALID_CODE;
+
+			}else{
+
+				// reset attempt records on success
+				$_SESSION['XoopsCaptcha_attempt_'.$sessionName] = null;
+			}
+		}
+		$this->destroyGarbage(true);
+
+		return $is_valid;
+	}
+
+	function getCaption()
+	{
+		return defined("XOOPS_CAPTCHA_CAPTION") ? constant("XOOPS_CAPTCHA_CAPTION") : "";
+	}
+
+	function getMessage()
+	{
+		return implode("<br />", $this->message);
+	}
+
+	/**
+	 * Destory historical stuff
+	 */
+	function destroyGarbage($clearSession = false)
+	{
+		require_once dirname(__FILE__)."/".$this->mode.".php";
+		$class = "XoopsCaptcha".ucfirst($this->mode);
+		$captcha_handler = new $class();
+		if(method_exists($captcha_handler, "destroyGarbage")) {
+			$captcha_handler->loadConfig($this->config);
+			$captcha_handler->destroyGarbage();
+		}
+
+		if($clearSession) {
+			$_SESSION['XoopsCaptcha_name'] = null;
+			$_SESSION['XoopsCaptcha_skipmember'] = null;
+			$_SESSION['XoopsCaptcha_sessioncode'] = null;
+			$_SESSION['XoopsCaptcha_maxattempts'] = null;
+		}
+
+		return true;
+	}
+
+	function render()
+	{
+		$form = "";
+
+		if( !$this->active || empty($this->config["name"]) ) {
+			return $form;
+		}
+
+		$_SESSION['XoopsCaptcha_name'] = $this->config["name"];
+		$_SESSION['XoopsCaptcha_skipmember'] = $this->config["skipmember"];
+		$maxAttempts = $this->config["maxattempt"];
+		$_SESSION['XoopsCaptcha_maxattempts'] = $maxAttempts;
+		/*
          if(!empty($maxAttempts)) {
          $_SESSION['XoopsCaptcha_maxattempts_'.$_SESSION['XoopsCaptcha_name']] = $maxAttempts;
          }
          */
 
-        // Fail on too many attempts
-        if(!empty($maxAttempts) && @$_SESSION['XoopsCaptcha_attempt_'.$this->config["name"]] > $maxAttempts) {
-            $form = XOOPS_CAPTCHA_TOOMANYATTEMPTS;
-            // Load the form element
-        }else{
-            $form = $this->loadForm();
-        }
-
-        return $form;
-    }
-
-    function loadForm()
-    {
-        require_once dirname(__FILE__)."/".$this->mode.".php";
-        $class = "XoopsCaptcha".ucfirst($this->mode);
-        $captcha_handler = new $class();
-        $captcha_handler->loadConfig($this->config);
-
-        $form = $captcha_handler->render();
-        return $form;
-    }
+		// Fail on too many attempts
+		if(!empty($maxAttempts) && @$_SESSION['XoopsCaptcha_attempt_'.$this->config["name"]] > $maxAttempts) {
+			$form = XOOPS_CAPTCHA_TOOMANYATTEMPTS;
+			// Load the form element
+		}else{
+			$form = $this->loadForm();
+		}
+
+		return $form;
+	}
+
+	function loadForm()
+	{
+		require_once dirname(__FILE__)."/".$this->mode.".php";
+		$class = "XoopsCaptcha".ucfirst($this->mode);
+		$captcha_handler = new $class();
+		$captcha_handler->loadConfig($this->config);
+
+		$form = $captcha_handler->render();
+		return $form;
+	}
 }
 ?>
\ No newline at end of file

Spacing +34 added lines, -34 removed lines

@@ -13,7 +13,7 @@ 
 
 class XoopsCaptcha {
     var $active	= true;
-    var $mode 	= "text";	// potential values: image, text
+    var $mode = "text"; // potential values: image, text
     var $config	= array();
 
     var $message = array(); // Logging error messages
@@ -21,7 +21,7 @@ 
     function XoopsCaptcha()
     {
         // Loading default preferences
-        $this->config = @include dirname(__FILE__)."/config.php";
+        $this->config = @include dirname(__FILE__) . "/config.php";
 
         $this->setMode($this->config["mode"]);
     }
@@ -29,7 +29,7 @@ 
     function &instance()
     {
         static $instance;
-        if(!isset($instance)) {
+        if (!isset($instance)) {
             $instance = new XoopsCaptcha();
         }
         return $instance;
@@ -37,11 +37,11 @@ 
 
     function setConfig($name, $val)
     {
-        if($name == "mode") {
+        if ($name == "mode") {
             $this->setMode($val);
-        }elseif(isset($this->$name)) {
+        }elseif (isset($this->$name)) {
             $this->$name = $val;
-        }else {
+        } else {
             $this->config[$name] = $val;
         }
         return true;
@@ -56,21 +56,21 @@ 
      */
     function setMode($mode = null)
     {
-        if( !empty($mode) && in_array($mode, array("text", "image")) ) {
+        if (!empty($mode) && in_array($mode, array("text", "image"))) {
             $this->mode = $mode;
 
-            if($this->mode != "image") {
+            if ($this->mode != "image") {
                 return;
             }
         }
 
         // Disable image mode
-        if(!extension_loaded('gd')) {
+        if (!extension_loaded('gd')) {
             $this->mode = "text";
-        }else{
+        } else {
             $required_functions = array("imagecreatetruecolor", "imagecolorallocate", "imagefilledrectangle", "imagejpeg", "imagedestroy", "imageftbbox");
-            foreach($required_functions as $func) {
-                if(!function_exists($func)) {
+            foreach ($required_functions as $func) {
+                if (!function_exists($func)) {
                     $this->mode = "text";
                     break;
                 }
@@ -85,15 +85,15 @@ 
     function init($name = 'xoopscaptcha', $skipmember = null, $num_chars = null, $fontsize_min = null, $fontsize_max = null, $background_type = null, $background_num = null)
     {
         // Loading RUN-TIME settings
-        foreach(array_keys($this->config) as $key) {
-            if(isset(${$key}) && ${$key} !== null) {
+        foreach (array_keys($this->config) as $key) {
+            if (isset(${$key}) && ${$key} !== null) {
                 $this->config[$key] = ${$key};
             }
         }
         $this->config["name"] = $name;
 
         // Skip CAPTCHA for member if set
-        if($this->config["skipmember"] && is_object($GLOBALS["xoopsUser"])) {
+        if ($this->config["skipmember"] && is_object($GLOBALS["xoopsUser"])) {
             $this->active = false;
         }
     }
@@ -105,34 +105,34 @@ 
     {
         $sessionName	= @$_SESSION['XoopsCaptcha_name'];
         $skipMember		= ($skipMember === null) ? @$_SESSION['XoopsCaptcha_skipmember'] : $skipMember;
-        $maxAttempts	= intval( @$_SESSION['XoopsCaptcha_maxattempts'] );
+        $maxAttempts	= intval(@$_SESSION['XoopsCaptcha_maxattempts']);
 
         $is_valid = false;
 
         // Skip CAPTCHA for member if set
-        if( is_object($GLOBALS["xoopsUser"]) && !empty($skipMember) ) {
+        if (is_object($GLOBALS["xoopsUser"]) && !empty($skipMember)) {
             $is_valid = true;
             // Kill too many attempts
-        }elseif(!empty($maxAttempts) && $_SESSION['XoopsCaptcha_attempt_'.$sessionName] > $maxAttempts) {
+        }elseif (!empty($maxAttempts) && $_SESSION['XoopsCaptcha_attempt_' . $sessionName] > $maxAttempts) {
             $this->message[] = XOOPS_CAPTCHA_TOOMANYATTEMPTS;
 
             // Verify the code
-        }elseif(!empty($_SESSION['XoopsCaptcha_sessioncode'])){
+        }elseif (!empty($_SESSION['XoopsCaptcha_sessioncode'])) {
             $func = ($this->config["casesensitive"]) ? "strcmp" : "strcasecmp";
-            $is_valid = ! $func( trim(@$_POST[$sessionName]), $_SESSION['XoopsCaptcha_sessioncode']);
+            $is_valid = !$func(trim(@$_POST[$sessionName]), $_SESSION['XoopsCaptcha_sessioncode']);
         }
 
-        if(!empty($maxAttempts)) {
-            if(!$is_valid) {
+        if (!empty($maxAttempts)) {
+            if (!$is_valid) {
                 // Increase the attempt records on failure
-                $_SESSION['XoopsCaptcha_attempt_'.$sessionName]++;
+                $_SESSION['XoopsCaptcha_attempt_' . $sessionName]++;
                 // Log the error message
                 $this->message[] = XOOPS_CAPTCHA_INVALID_CODE;
 
-            }else{
+            } else {
 
                 // reset attempt records on success
-                $_SESSION['XoopsCaptcha_attempt_'.$sessionName] = null;
+                $_SESSION['XoopsCaptcha_attempt_' . $sessionName] = null;
             }
         }
         $this->destroyGarbage(true);
@@ -155,15 +155,15 @@ 
      */
     function destroyGarbage($clearSession = false)
     {
-        require_once dirname(__FILE__)."/".$this->mode.".php";
-        $class = "XoopsCaptcha".ucfirst($this->mode);
+        require_once dirname(__FILE__) . "/" . $this->mode . ".php";
+        $class = "XoopsCaptcha" . ucfirst($this->mode);
         $captcha_handler = new $class();
-        if(method_exists($captcha_handler, "destroyGarbage")) {
+        if (method_exists($captcha_handler, "destroyGarbage")) {
             $captcha_handler->loadConfig($this->config);
             $captcha_handler->destroyGarbage();
         }
 
-        if($clearSession) {
+        if ($clearSession) {
             $_SESSION['XoopsCaptcha_name'] = null;
             $_SESSION['XoopsCaptcha_skipmember'] = null;
             $_SESSION['XoopsCaptcha_sessioncode'] = null;
@@ -177,7 +177,7 @@ 
     {
         $form = "";
 
-        if( !$this->active || empty($this->config["name"]) ) {
+        if (!$this->active || empty($this->config["name"])) {
             return $form;
         }
 
@@ -192,10 +192,10 @@ 
          */
 
         // Fail on too many attempts
-        if(!empty($maxAttempts) && @$_SESSION['XoopsCaptcha_attempt_'.$this->config["name"]] > $maxAttempts) {
+        if (!empty($maxAttempts) && @$_SESSION['XoopsCaptcha_attempt_' . $this->config["name"]] > $maxAttempts) {
             $form = XOOPS_CAPTCHA_TOOMANYATTEMPTS;
             // Load the form element
-        }else{
+        } else {
             $form = $this->loadForm();
         }
 
@@ -204,8 +204,8 @@ 
 
     function loadForm()
     {
-        require_once dirname(__FILE__)."/".$this->mode.".php";
-        $class = "XoopsCaptcha".ucfirst($this->mode);
+        require_once dirname(__FILE__) . "/" . $this->mode . ".php";
+        $class = "XoopsCaptcha" . ucfirst($this->mode);
         $captcha_handler = new $class();
         $captcha_handler->loadConfig($this->config);
 

Braces +7 added lines, -7 removed lines

@@ -39,9 +39,9 @@ 
     {
         if($name == "mode") {
             $this->setMode($val);
-        }elseif(isset($this->$name)) {
+        } elseif(isset($this->$name)) {
             $this->$name = $val;
-        }else {
+        } else {
             $this->config[$name] = $val;
         }
         return true;
@@ -67,7 +67,7 @@ 
         // Disable image mode
         if(!extension_loaded('gd')) {
             $this->mode = "text";
-        }else{
+        } else{
             $required_functions = array("imagecreatetruecolor", "imagecolorallocate", "imagefilledrectangle", "imagejpeg", "imagedestroy", "imageftbbox");
             foreach($required_functions as $func) {
                 if(!function_exists($func)) {
@@ -113,11 +113,11 @@ 
         if( is_object($GLOBALS["xoopsUser"]) && !empty($skipMember) ) {
             $is_valid = true;
             // Kill too many attempts
-        }elseif(!empty($maxAttempts) && $_SESSION['XoopsCaptcha_attempt_'.$sessionName] > $maxAttempts) {
+        } elseif(!empty($maxAttempts) && $_SESSION['XoopsCaptcha_attempt_'.$sessionName] > $maxAttempts) {
             $this->message[] = XOOPS_CAPTCHA_TOOMANYATTEMPTS;
 
             // Verify the code
-        }elseif(!empty($_SESSION['XoopsCaptcha_sessioncode'])){
+        } elseif(!empty($_SESSION['XoopsCaptcha_sessioncode'])){
             $func = ($this->config["casesensitive"]) ? "strcmp" : "strcasecmp";
             $is_valid = ! $func( trim(@$_POST[$sessionName]), $_SESSION['XoopsCaptcha_sessioncode']);
         }
@@ -129,7 +129,7 @@ 
                 // Log the error message
                 $this->message[] = XOOPS_CAPTCHA_INVALID_CODE;
 
-            }else{
+            } else{
 
                 // reset attempt records on success
                 $_SESSION['XoopsCaptcha_attempt_'.$sessionName] = null;
@@ -195,7 +195,7 @@ 
         if(!empty($maxAttempts) && @$_SESSION['XoopsCaptcha_attempt_'.$this->config["name"]] > $maxAttempts) {
             $form = XOOPS_CAPTCHA_TOOMANYATTEMPTS;
             // Load the form element
-        }else{
+        } else{
             $form = $this->loadForm();
         }
 

include/captcha/scripts/img.php

Doc Comments +4 added lines, -1 removed lines

@@ -174,6 +174,9 @@ 
         imagedestroy($this->oImage);
     }
 
+    /**
+     * @param string $name
+     */
     function _getList($name, $extension = "")
     {
         $items = array();
@@ -235,7 +238,7 @@ 
     /**
      * Return random background
      *
-     * @return array
+     * @return string|null
      */
     function loadBackground()
     {

Indentation +386 added lines, -386 removed lines

@@ -10,174 +10,174 @@ 
 $xoopsLogger->activated = false;
 
 if(empty($_SERVER['HTTP_REFERER']) || !preg_match("/^".preg_quote(XOOPS_URL, '/')."/", $_SERVER['HTTP_REFERER'])) {
-    exit();
+	exit();
 }
 
 class XoopsCaptchaImageHandler {
-    var $config	= array();
-    //var $mode = "gd"; // GD or bmp
-    var $code;
-    var $invalid = false;
-
-    var $font;
-    var $spacing;
-    var $width;
-    var $height;
-
-    function XoopsCaptchaImageHandler()
-    {
-        if(empty($_SESSION['XoopsCaptcha_name'])) {
-            $this->invalid = true;
-        }
-
-        if(!extension_loaded('gd')) {
-            $this->mode = "bmp";
-        }else{
-            $required_functions = array("imagecreatetruecolor", "imagecolorallocate", "imagefilledrectangle", "imagejpeg", "imagedestroy", "imageftbbox");
-            foreach($required_functions as $func) {
-                if(!function_exists($func)) {
-                    $this->mode = "bmp";
-                    break;
-                }
-            }
-        }
-    }
-
-    /**
-     * Loading configs from CAPTCHA class
-     */
-    function setConfig($config = array())
-    {
-        // Loading default preferences
-        $this->config =& $config;
-    }
-
-    function loadImage()
-    {
-        $this->createCode();
-        $this->setCode();
-        $this->createImage();
-    }
-
-    /**
-     * Create Code
-     */
-    function createCode()
-    {
-        if($this->invalid) {
-            return;
-        }
-
-        if($this->mode == "bmp") {
-            $this->config["num_chars"] = 4;
-            $this->code = rand( pow(10, $this->config["num_chars"] - 1), intval( str_pad("9", $this->config["num_chars"], "9") ) );
-        }else{
-            $this->code = substr(md5(uniqid(mt_rand(), 1)), 0, $this->config["num_chars"] );
-            if (!$this->config["casesensitive"]) {
-                $this->code = strtoupper( $this->code );
-            }
-        }
-    }
-
-    function setCode()
-    {
-        if($this->invalid) {
-            return;
-        }
-
-        $_SESSION['XoopsCaptcha_sessioncode'] = strval( $this->code );
-        $maxAttempts = intval( @$_SESSION['XoopsCaptcha_maxattempts'] );
-
-        // Increase the attempt records on refresh
-        if(!empty($maxAttempts)) {
-            $_SESSION['XoopsCaptcha_attempt_'.$_SESSION['XoopsCaptcha_name']]++;
-            if($_SESSION['XoopsCaptcha_attempt_'.$_SESSION['XoopsCaptcha_name']] > $maxAttempts) {
-                $this->invalid = true;
-            }
-        }
-    }
-
-    function createImage($file = "")
-    {
-        if($this->invalid) {
-            header("Content-type: image/gif");
-            readfile(XOOPS_ROOT_PATH."/images/subject/icon2.gif");
-            return;
-        }
-
-        if($this->mode == "bmp") {
-            return $this->createImageBmp();
-        }else{
-            return $this->createImageGd();
-        }
-    }
-
-    /**
-     *  Create CAPTCHA iamge with GD
-     *  Originated from DuGris' SecurityImage
-     */
-    //  --------------------------------------------------------------------------- //
-    // Class : SecurityImage 1.5													//
-    // Author: DuGris aka L. Jen <http://www.dugris.info>							//
-    // Email : DuGris@wanadoo.fr													//
-    // Licence: GNU																	//
-    // Project: The XOOPS Project													//
-    //  --------------------------------------------------------------------------- //
-    function createImageGd($file = "")
-    {
-        $this->loadFont();
-        $this->setImageSize();
-
-        $this->oImage = imagecreatetruecolor($this->width, $this->height);
-        $background = imagecolorallocate($this->oImage, 255, 255, 255);
-        imagefilledrectangle($this->oImage, 0, 0, $this->width, $this->height, $background);
-
-        switch ($this->config["background_type"]) {
-            default:
-            case 0:
-                $this->drawBars();
-                break;
-
-            case 1:
-                $this->drawCircles();
-                break;
-
-            case 2:
-                $this->drawLines();
-                break;
-
-            case 3:
-                $this->drawRectangles();
-                break;
-
-            case 4:
-                $this->drawEllipses();
-                break;
-
-            case 5:
-                $this->drawPolygons();
-                break;
-
-            case 100:
-                $this->createFromFile();
-                break;
-        }
-        $this->drawBorder();
-        $this->drawCode();
-
-        if(empty($file)) {
-            header("Content-type: image/jpeg");
-            imagejpeg ($this->oImage);
-        }else{
-            imagejpeg ($this->oImage, XOOPS_ROOT_PATH. "/". $this->config["imagepath"]. "/". $file . ".jpg");
-        }
-        imagedestroy($this->oImage);
-    }
-
-    function _getList($name, $extension = "")
-    {
-        $items = array();
-        /*
+	var $config	= array();
+	//var $mode = "gd"; // GD or bmp
+	var $code;
+	var $invalid = false;
+
+	var $font;
+	var $spacing;
+	var $width;
+	var $height;
+
+	function XoopsCaptchaImageHandler()
+	{
+		if(empty($_SESSION['XoopsCaptcha_name'])) {
+			$this->invalid = true;
+		}
+
+		if(!extension_loaded('gd')) {
+			$this->mode = "bmp";
+		}else{
+			$required_functions = array("imagecreatetruecolor", "imagecolorallocate", "imagefilledrectangle", "imagejpeg", "imagedestroy", "imageftbbox");
+			foreach($required_functions as $func) {
+				if(!function_exists($func)) {
+					$this->mode = "bmp";
+					break;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Loading configs from CAPTCHA class
+	 */
+	function setConfig($config = array())
+	{
+		// Loading default preferences
+		$this->config =& $config;
+	}
+
+	function loadImage()
+	{
+		$this->createCode();
+		$this->setCode();
+		$this->createImage();
+	}
+
+	/**
+	 * Create Code
+	 */
+	function createCode()
+	{
+		if($this->invalid) {
+			return;
+		}
+
+		if($this->mode == "bmp") {
+			$this->config["num_chars"] = 4;
+			$this->code = rand( pow(10, $this->config["num_chars"] - 1), intval( str_pad("9", $this->config["num_chars"], "9") ) );
+		}else{
+			$this->code = substr(md5(uniqid(mt_rand(), 1)), 0, $this->config["num_chars"] );
+			if (!$this->config["casesensitive"]) {
+				$this->code = strtoupper( $this->code );
+			}
+		}
+	}
+
+	function setCode()
+	{
+		if($this->invalid) {
+			return;
+		}
+
+		$_SESSION['XoopsCaptcha_sessioncode'] = strval( $this->code );
+		$maxAttempts = intval( @$_SESSION['XoopsCaptcha_maxattempts'] );
+
+		// Increase the attempt records on refresh
+		if(!empty($maxAttempts)) {
+			$_SESSION['XoopsCaptcha_attempt_'.$_SESSION['XoopsCaptcha_name']]++;
+			if($_SESSION['XoopsCaptcha_attempt_'.$_SESSION['XoopsCaptcha_name']] > $maxAttempts) {
+				$this->invalid = true;
+			}
+		}
+	}
+
+	function createImage($file = "")
+	{
+		if($this->invalid) {
+			header("Content-type: image/gif");
+			readfile(XOOPS_ROOT_PATH."/images/subject/icon2.gif");
+			return;
+		}
+
+		if($this->mode == "bmp") {
+			return $this->createImageBmp();
+		}else{
+			return $this->createImageGd();
+		}
+	}
+
+	/**
+	 *  Create CAPTCHA iamge with GD
+	 *  Originated from DuGris' SecurityImage
+	 */
+	//  --------------------------------------------------------------------------- //
+	// Class : SecurityImage 1.5													//
+	// Author: DuGris aka L. Jen <http://www.dugris.info>							//
+	// Email : DuGris@wanadoo.fr													//
+	// Licence: GNU																	//
+	// Project: The XOOPS Project													//
+	//  --------------------------------------------------------------------------- //
+	function createImageGd($file = "")
+	{
+		$this->loadFont();
+		$this->setImageSize();
+
+		$this->oImage = imagecreatetruecolor($this->width, $this->height);
+		$background = imagecolorallocate($this->oImage, 255, 255, 255);
+		imagefilledrectangle($this->oImage, 0, 0, $this->width, $this->height, $background);
+
+		switch ($this->config["background_type"]) {
+			default:
+			case 0:
+				$this->drawBars();
+				break;
+
+			case 1:
+				$this->drawCircles();
+				break;
+
+			case 2:
+				$this->drawLines();
+				break;
+
+			case 3:
+				$this->drawRectangles();
+				break;
+
+			case 4:
+				$this->drawEllipses();
+				break;
+
+			case 5:
+				$this->drawPolygons();
+				break;
+
+			case 100:
+				$this->createFromFile();
+				break;
+		}
+		$this->drawBorder();
+		$this->drawCode();
+
+		if(empty($file)) {
+			header("Content-type: image/jpeg");
+			imagejpeg ($this->oImage);
+		}else{
+			imagejpeg ($this->oImage, XOOPS_ROOT_PATH. "/". $this->config["imagepath"]. "/". $file . ".jpg");
+		}
+		imagedestroy($this->oImage);
+	}
+
+	function _getList($name, $extension = "")
+	{
+		$items = array();
+		/*
          if(@ include_once XOOPS_ROOT_PATH."/Frameworks/art/functions.ini.php") {
          load_functions("cache");
          if($items = mod_loadCacheFile("captcha_{$name}", "captcha")) {
@@ -185,227 +185,227 @@ 
          }
          }
          */
-        require_once XOOPS_ROOT_PATH."/class/xoopslists.php";
-        $file_path = $this->config["rootpath"]."/{$name}";
-        $files = XoopsLists::getFileListAsArray($file_path);
-        foreach( $files as $item) {
-            if ( empty($extension) || preg_match("/(\.{$extension})$/i",$item) ) {
-                $items[] = $item;
-            }
-        }
-        if(function_exists("mod_createCacheFile")) {
-            mod_createCacheFile($items, "captcha_{$name}", "captcha");
-        }
-        return $items;
-    }
-
-    function loadFont()
-    {
-        $fonts = $this->_getList("fonts", "ttf");
-        $this->font = $this->config["rootpath"]."/fonts/".$fonts[array_rand($fonts)];
-    }
-
-    function setImageSize()
-    {
-        $MaxCharWidth = 0;
-        $MaxCharHeight = 0;
-        $oImage = imagecreatetruecolor(100, 100);
-        $text_color = imagecolorallocate($oImage, mt_rand(0, 100), mt_rand(0, 100), mt_rand(0, 100));
-        $FontSize = $this->config["fontsize_max"];
-        for ($Angle = -30; $Angle <= 30; $Angle++) {
-            for ($i = 65; $i <= 90; $i++) {
-                $CharDetails = imageftbbox($FontSize, $Angle, $this->font, chr($i), array());
-                $_MaxCharWidth  = abs($CharDetails[0] + $CharDetails[2]);
-                if ($_MaxCharWidth > $MaxCharWidth ) {
-                    $MaxCharWidth = $_MaxCharWidth;
-                }
-                $_MaxCharHeight  = abs($CharDetails[1] + $CharDetails[5]);
-                if ($_MaxCharHeight > $MaxCharHeight ) {
-                    $MaxCharHeight = $_MaxCharHeight;
-                }
-            }
-        }
-        imagedestroy($oImage);
-
-        $this->height = $MaxCharHeight + 2;
-        $this->spacing = (int)( ($this->config["num_chars"] * $MaxCharWidth) / $this->config["num_chars"]);
-        $this->width = ($this->config["num_chars"] * $MaxCharWidth) + ($this->spacing/2);
-    }
-
-    /**
-     * Return random background
-     *
-     * @return array
-     */
-    function loadBackground()
-    {
-        $RandBackground = null;
-        if( $backgrounds = $this->_getList("backgrounds", "(gif|jpg|png)") ) {
-            $RandBackground = $this->config["rootpath"]."/backgrounds/".$backgrounds[array_rand($backgrounds)];
-        }
-        return $RandBackground;
-    }
-
-    /**
-     * Draw Image background
-     */
-    function createFromFile()
-    {
-        if ( $RandImage = $this->loadBackground() ) {
-            $ImageType = @getimagesize($RandImage);
-            switch ( @$ImageType[2] ) {
-                case 1:
-                    $BackgroundImage = imagecreatefromgif($RandImage);
-                    break;
-
-                case 2:
-                    $BackgroundImage = imagecreatefromjpeg($RandImage);
-                    break;
-
-                case 3:
-                    $BackgroundImage = imagecreatefrompng($RandImage);
-                    break;
-            }
-        }
-        if(!empty($BackgroundImage)){
-            imagecopyresized($this->oImage, $BackgroundImage, 0, 0, 0, 0, imagesx($this->oImage), imagesy($this->oImage), imagesx($BackgroundImage), imagesy($BackgroundImage));
-            imagedestroy($BackgroundImage);
-        } else {
-            $this->drawBars();
-        }
-    }
-
-    /**
-     * Draw Code
-     */
-    function drawCode()
-    {
-        for ($i = 0; $i < $this->config["num_chars"] ; $i++) {
-            // select random greyscale colour
-            $text_color = imagecolorallocate($this->oImage, mt_rand(0, 100), mt_rand(0, 100), mt_rand(0, 100));
-
-            // write text to image
-            $Angle = mt_rand(10, 30);
-            if (($i % 2)) {
-                $Angle = mt_rand(-10, -30);
-            }
-
-            // select random font size
-            $FontSize = mt_rand($this->config["fontsize_min"], $this->config["fontsize_max"]);
-
-            $CharDetails = imageftbbox($FontSize, $Angle, $this->font, $this->code[$i], array());
-            $CharHeight = abs( $CharDetails[1] + $CharDetails[5] );
-
-            // calculate character starting coordinates
-            $posX = ($this->spacing/2) + ($i * $this->spacing);
-            $posY = 2 + ($this->height / 2) + ($CharHeight / 4);
-
-            imagefttext($this->oImage, $FontSize, $Angle, $posX, $posY, $text_color, $this->font, $this->code[$i], array());
-        }
-    }
-
-    /**
-     * Draw Border
-     */
-    function drawBorder()
-    {
-        $rgb = rand(50, 150);
-        $border_color = imagecolorallocate ($this->oImage, $rgb, $rgb, $rgb);
-        imagerectangle($this->oImage, 0, 0, $this->width-1, $this->height-1, $border_color);
-    }
-
-    /**
-     * Draw Circles background
-     */
-    function drawCircles()
-    {
-        for($i = 1; $i <= $this->config["background_num"]; $i++){
-            $randomcolor = imagecolorallocate ($this->oImage , mt_rand(190,255), mt_rand(190,255), mt_rand(190,255));
-            imagefilledellipse($this->oImage, mt_rand(0,$this->width-10), mt_rand(0,$this->height-3), mt_rand(10,20), mt_rand(20,30),$randomcolor);
-        }
-    }
-
-    /**
-     * Draw Lines background
-     */
-    function drawLines()
-    {
-        for ($i = 0; $i < $this->config["background_num"]; $i++) {
-            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190,255), mt_rand(190,255), mt_rand(190,255));
-            imageline($this->oImage, mt_rand(0, $this->width), mt_rand(0, $this->height), mt_rand(0, $this->width), mt_rand(0, $this->height), $randomcolor);
-        }
-    }
-
-    /**
-     * Draw Rectangles background
-     */
-    function drawRectangles()
-    {
-        for ($i = 1; $i <= $this->config["background_num"]; $i++) {
-            $randomcolor = imagecolorallocate ($this->oImage , mt_rand(190,255), mt_rand(190,255), mt_rand(190,255));
-            imagefilledrectangle($this->oImage, mt_rand(0,$this->width), mt_rand(0,$this->height), mt_rand(0, $this->width), mt_rand(0,$this->height),  $randomcolor);
-        }
-    }
-
-    /**
-     * Draw Bars background
-     */
-    function drawBars()
-    {
-        for ($i= 0 ; $i <= $this->height;) {
-            $randomcolor = imagecolorallocate ($this->oImage , mt_rand(190,255), mt_rand(190,255), mt_rand(190,255));
-            imageline( $this->oImage, 0, $i, $this->width, $i, $randomcolor );
-            $i = $i + 2.5;
-        }
-        for ($i = 0;$i <= $this->width;) {
-            $randomcolor = imagecolorallocate ($this->oImage , mt_rand(190,255), mt_rand(190,255), mt_rand(190,255));
-            imageline( $this->oImage, $i, 0, $i, $this->height, $randomcolor );
-            $i = $i + 2.5;
-        }
-    }
-
-    /**
-     * Draw Ellipses background
-     */
-    function drawEllipses()
-    {
-        for($i = 1; $i <= $this->config["background_num"]; $i++){
-            $randomcolor = imagecolorallocate ($this->oImage , mt_rand(190,255), mt_rand(190,255), mt_rand(190,255));
-            imageellipse($this->oImage, mt_rand(0,$this->width), mt_rand(0,$this->height), mt_rand(0,$this->width), mt_rand(0,$this->height), $randomcolor);
-        }
-    }
-
-    /**
-     * Draw polygons background
-     */
-    function drawPolygons()
-    {
-        for($i = 1; $i <= $this->config["background_num"]; $i++){
-            $randomcolor = imagecolorallocate ($this->oImage , mt_rand(190,255), mt_rand(190,255), mt_rand(190,255));
-            $coords = array();
-            for ($j=1; $j <= $this->config["polygon_point"]; $j++) {
-                $coords[] = mt_rand(0,$this->width);
-                $coords[] = mt_rand(0,$this->height);
-            }
-            imagefilledpolygon($this->oImage, $coords, $this->config["polygon_point"], $randomcolor);
-        }
-    }
-
-    /**
-     *  Create CAPTCHA iamge with BMP
-     *  TODO
-     */
-    function createImageBmp($file = "")
-    {
-        $image = "";
-
-        if(empty($file)) {
-            header("Content-type: image/bmp");
-            echo $image;
-        }else{
-            return $image;
-        }
-    }
+		require_once XOOPS_ROOT_PATH."/class/xoopslists.php";
+		$file_path = $this->config["rootpath"]."/{$name}";
+		$files = XoopsLists::getFileListAsArray($file_path);
+		foreach( $files as $item) {
+			if ( empty($extension) || preg_match("/(\.{$extension})$/i",$item) ) {
+				$items[] = $item;
+			}
+		}
+		if(function_exists("mod_createCacheFile")) {
+			mod_createCacheFile($items, "captcha_{$name}", "captcha");
+		}
+		return $items;
+	}
+
+	function loadFont()
+	{
+		$fonts = $this->_getList("fonts", "ttf");
+		$this->font = $this->config["rootpath"]."/fonts/".$fonts[array_rand($fonts)];
+	}
+
+	function setImageSize()
+	{
+		$MaxCharWidth = 0;
+		$MaxCharHeight = 0;
+		$oImage = imagecreatetruecolor(100, 100);
+		$text_color = imagecolorallocate($oImage, mt_rand(0, 100), mt_rand(0, 100), mt_rand(0, 100));
+		$FontSize = $this->config["fontsize_max"];
+		for ($Angle = -30; $Angle <= 30; $Angle++) {
+			for ($i = 65; $i <= 90; $i++) {
+				$CharDetails = imageftbbox($FontSize, $Angle, $this->font, chr($i), array());
+				$_MaxCharWidth  = abs($CharDetails[0] + $CharDetails[2]);
+				if ($_MaxCharWidth > $MaxCharWidth ) {
+					$MaxCharWidth = $_MaxCharWidth;
+				}
+				$_MaxCharHeight  = abs($CharDetails[1] + $CharDetails[5]);
+				if ($_MaxCharHeight > $MaxCharHeight ) {
+					$MaxCharHeight = $_MaxCharHeight;
+				}
+			}
+		}
+		imagedestroy($oImage);
+
+		$this->height = $MaxCharHeight + 2;
+		$this->spacing = (int)( ($this->config["num_chars"] * $MaxCharWidth) / $this->config["num_chars"]);
+		$this->width = ($this->config["num_chars"] * $MaxCharWidth) + ($this->spacing/2);
+	}
+
+	/**
+	 * Return random background
+	 *
+	 * @return array
+	 */
+	function loadBackground()
+	{
+		$RandBackground = null;
+		if( $backgrounds = $this->_getList("backgrounds", "(gif|jpg|png)") ) {
+			$RandBackground = $this->config["rootpath"]."/backgrounds/".$backgrounds[array_rand($backgrounds)];
+		}
+		return $RandBackground;
+	}
+
+	/**
+	 * Draw Image background
+	 */
+	function createFromFile()
+	{
+		if ( $RandImage = $this->loadBackground() ) {
+			$ImageType = @getimagesize($RandImage);
+			switch ( @$ImageType[2] ) {
+				case 1:
+					$BackgroundImage = imagecreatefromgif($RandImage);
+					break;
+
+				case 2:
+					$BackgroundImage = imagecreatefromjpeg($RandImage);
+					break;
+
+				case 3:
+					$BackgroundImage = imagecreatefrompng($RandImage);
+					break;
+			}
+		}
+		if(!empty($BackgroundImage)){
+			imagecopyresized($this->oImage, $BackgroundImage, 0, 0, 0, 0, imagesx($this->oImage), imagesy($this->oImage), imagesx($BackgroundImage), imagesy($BackgroundImage));
+			imagedestroy($BackgroundImage);
+		} else {
+			$this->drawBars();
+		}
+	}
+
+	/**
+	 * Draw Code
+	 */
+	function drawCode()
+	{
+		for ($i = 0; $i < $this->config["num_chars"] ; $i++) {
+			// select random greyscale colour
+			$text_color = imagecolorallocate($this->oImage, mt_rand(0, 100), mt_rand(0, 100), mt_rand(0, 100));
+
+			// write text to image
+			$Angle = mt_rand(10, 30);
+			if (($i % 2)) {
+				$Angle = mt_rand(-10, -30);
+			}
+
+			// select random font size
+			$FontSize = mt_rand($this->config["fontsize_min"], $this->config["fontsize_max"]);
+
+			$CharDetails = imageftbbox($FontSize, $Angle, $this->font, $this->code[$i], array());
+			$CharHeight = abs( $CharDetails[1] + $CharDetails[5] );
+
+			// calculate character starting coordinates
+			$posX = ($this->spacing/2) + ($i * $this->spacing);
+			$posY = 2 + ($this->height / 2) + ($CharHeight / 4);
+
+			imagefttext($this->oImage, $FontSize, $Angle, $posX, $posY, $text_color, $this->font, $this->code[$i], array());
+		}
+	}
+
+	/**
+	 * Draw Border
+	 */
+	function drawBorder()
+	{
+		$rgb = rand(50, 150);
+		$border_color = imagecolorallocate ($this->oImage, $rgb, $rgb, $rgb);
+		imagerectangle($this->oImage, 0, 0, $this->width-1, $this->height-1, $border_color);
+	}
+
+	/**
+	 * Draw Circles background
+	 */
+	function drawCircles()
+	{
+		for($i = 1; $i <= $this->config["background_num"]; $i++){
+			$randomcolor = imagecolorallocate ($this->oImage , mt_rand(190,255), mt_rand(190,255), mt_rand(190,255));
+			imagefilledellipse($this->oImage, mt_rand(0,$this->width-10), mt_rand(0,$this->height-3), mt_rand(10,20), mt_rand(20,30),$randomcolor);
+		}
+	}
+
+	/**
+	 * Draw Lines background
+	 */
+	function drawLines()
+	{
+		for ($i = 0; $i < $this->config["background_num"]; $i++) {
+			$randomcolor = imagecolorallocate($this->oImage, mt_rand(190,255), mt_rand(190,255), mt_rand(190,255));
+			imageline($this->oImage, mt_rand(0, $this->width), mt_rand(0, $this->height), mt_rand(0, $this->width), mt_rand(0, $this->height), $randomcolor);
+		}
+	}
+
+	/**
+	 * Draw Rectangles background
+	 */
+	function drawRectangles()
+	{
+		for ($i = 1; $i <= $this->config["background_num"]; $i++) {
+			$randomcolor = imagecolorallocate ($this->oImage , mt_rand(190,255), mt_rand(190,255), mt_rand(190,255));
+			imagefilledrectangle($this->oImage, mt_rand(0,$this->width), mt_rand(0,$this->height), mt_rand(0, $this->width), mt_rand(0,$this->height),  $randomcolor);
+		}
+	}
+
+	/**
+	 * Draw Bars background
+	 */
+	function drawBars()
+	{
+		for ($i= 0 ; $i <= $this->height;) {
+			$randomcolor = imagecolorallocate ($this->oImage , mt_rand(190,255), mt_rand(190,255), mt_rand(190,255));
+			imageline( $this->oImage, 0, $i, $this->width, $i, $randomcolor );
+			$i = $i + 2.5;
+		}
+		for ($i = 0;$i <= $this->width;) {
+			$randomcolor = imagecolorallocate ($this->oImage , mt_rand(190,255), mt_rand(190,255), mt_rand(190,255));
+			imageline( $this->oImage, $i, 0, $i, $this->height, $randomcolor );
+			$i = $i + 2.5;
+		}
+	}
+
+	/**
+	 * Draw Ellipses background
+	 */
+	function drawEllipses()
+	{
+		for($i = 1; $i <= $this->config["background_num"]; $i++){
+			$randomcolor = imagecolorallocate ($this->oImage , mt_rand(190,255), mt_rand(190,255), mt_rand(190,255));
+			imageellipse($this->oImage, mt_rand(0,$this->width), mt_rand(0,$this->height), mt_rand(0,$this->width), mt_rand(0,$this->height), $randomcolor);
+		}
+	}
+
+	/**
+	 * Draw polygons background
+	 */
+	function drawPolygons()
+	{
+		for($i = 1; $i <= $this->config["background_num"]; $i++){
+			$randomcolor = imagecolorallocate ($this->oImage , mt_rand(190,255), mt_rand(190,255), mt_rand(190,255));
+			$coords = array();
+			for ($j=1; $j <= $this->config["polygon_point"]; $j++) {
+				$coords[] = mt_rand(0,$this->width);
+				$coords[] = mt_rand(0,$this->height);
+			}
+			imagefilledpolygon($this->oImage, $coords, $this->config["polygon_point"], $randomcolor);
+		}
+	}
+
+	/**
+	 *  Create CAPTCHA iamge with BMP
+	 *  TODO
+	 */
+	function createImageBmp($file = "")
+	{
+		$image = "";
+
+		if(empty($file)) {
+			header("Content-type: image/bmp");
+			echo $image;
+		}else{
+			return $image;
+		}
+	}
 }
 
 $config = @include "../config.php";

Spacing +72 added lines, -72 removed lines

@@ -9,12 +9,12 @@ 
 error_reporting(0);
 $xoopsLogger->activated = false;
 
-if(empty($_SERVER['HTTP_REFERER']) || !preg_match("/^".preg_quote(XOOPS_URL, '/')."/", $_SERVER['HTTP_REFERER'])) {
+if (empty($_SERVER['HTTP_REFERER']) || !preg_match("/^" . preg_quote(XOOPS_URL, '/') . "/", $_SERVER['HTTP_REFERER'])) {
     exit();
 }
 
 class XoopsCaptchaImageHandler {
-    var $config	= array();
+    var $config = array();
     //var $mode = "gd"; // GD or bmp
     var $code;
     var $invalid = false;
@@ -26,16 +26,16 @@ 
 
     function XoopsCaptchaImageHandler()
     {
-        if(empty($_SESSION['XoopsCaptcha_name'])) {
+        if (empty($_SESSION['XoopsCaptcha_name'])) {
             $this->invalid = true;
         }
 
-        if(!extension_loaded('gd')) {
+        if (!extension_loaded('gd')) {
             $this->mode = "bmp";
-        }else{
+        } else {
             $required_functions = array("imagecreatetruecolor", "imagecolorallocate", "imagefilledrectangle", "imagejpeg", "imagedestroy", "imageftbbox");
-            foreach($required_functions as $func) {
-                if(!function_exists($func)) {
+            foreach ($required_functions as $func) {
+                if (!function_exists($func)) {
                     $this->mode = "bmp";
                     break;
                 }
@@ -49,7 +49,7 @@ 
     function setConfig($config = array())
     {
         // Loading default preferences
-        $this->config =& $config;
+        $this->config = & $config;
     }
 
     function loadImage()
@@ -64,34 +64,34 @@ 
      */
     function createCode()
     {
-        if($this->invalid) {
+        if ($this->invalid) {
             return;
         }
 
-        if($this->mode == "bmp") {
+        if ($this->mode == "bmp") {
             $this->config["num_chars"] = 4;
-            $this->code = rand( pow(10, $this->config["num_chars"] - 1), intval( str_pad("9", $this->config["num_chars"], "9") ) );
-        }else{
-            $this->code = substr(md5(uniqid(mt_rand(), 1)), 0, $this->config["num_chars"] );
+            $this->code = rand(pow(10, $this->config["num_chars"] - 1), intval(str_pad("9", $this->config["num_chars"], "9")));
+        } else {
+            $this->code = substr(md5(uniqid(mt_rand(), 1)), 0, $this->config["num_chars"]);
             if (!$this->config["casesensitive"]) {
-                $this->code = strtoupper( $this->code );
+                $this->code = strtoupper($this->code);
             }
         }
     }
 
     function setCode()
     {
-        if($this->invalid) {
+        if ($this->invalid) {
             return;
         }
 
-        $_SESSION['XoopsCaptcha_sessioncode'] = strval( $this->code );
-        $maxAttempts = intval( @$_SESSION['XoopsCaptcha_maxattempts'] );
+        $_SESSION['XoopsCaptcha_sessioncode'] = strval($this->code);
+        $maxAttempts = intval(@$_SESSION['XoopsCaptcha_maxattempts']);
 
         // Increase the attempt records on refresh
-        if(!empty($maxAttempts)) {
-            $_SESSION['XoopsCaptcha_attempt_'.$_SESSION['XoopsCaptcha_name']]++;
-            if($_SESSION['XoopsCaptcha_attempt_'.$_SESSION['XoopsCaptcha_name']] > $maxAttempts) {
+        if (!empty($maxAttempts)) {
+            $_SESSION['XoopsCaptcha_attempt_' . $_SESSION['XoopsCaptcha_name']]++;
+            if ($_SESSION['XoopsCaptcha_attempt_' . $_SESSION['XoopsCaptcha_name']] > $maxAttempts) {
                 $this->invalid = true;
             }
         }
@@ -99,15 +99,15 @@ 
 
     function createImage($file = "")
     {
-        if($this->invalid) {
+        if ($this->invalid) {
             header("Content-type: image/gif");
-            readfile(XOOPS_ROOT_PATH."/images/subject/icon2.gif");
+            readfile(XOOPS_ROOT_PATH . "/images/subject/icon2.gif");
             return;
         }
 
-        if($this->mode == "bmp") {
+        if ($this->mode == "bmp") {
             return $this->createImageBmp();
-        }else{
+        } else {
             return $this->createImageGd();
         }
     }
@@ -165,11 +165,11 @@ 
         $this->drawBorder();
         $this->drawCode();
 
-        if(empty($file)) {
+        if (empty($file)) {
             header("Content-type: image/jpeg");
-            imagejpeg ($this->oImage);
-        }else{
-            imagejpeg ($this->oImage, XOOPS_ROOT_PATH. "/". $this->config["imagepath"]. "/". $file . ".jpg");
+            imagejpeg($this->oImage);
+        } else {
+            imagejpeg($this->oImage, XOOPS_ROOT_PATH . "/" . $this->config["imagepath"] . "/" . $file . ".jpg");
         }
         imagedestroy($this->oImage);
     }
@@ -185,15 +185,15 @@ 
          }
          }
          */
-        require_once XOOPS_ROOT_PATH."/class/xoopslists.php";
-        $file_path = $this->config["rootpath"]."/{$name}";
+        require_once XOOPS_ROOT_PATH . "/class/xoopslists.php";
+        $file_path = $this->config["rootpath"] . "/{$name}";
         $files = XoopsLists::getFileListAsArray($file_path);
-        foreach( $files as $item) {
-            if ( empty($extension) || preg_match("/(\.{$extension})$/i",$item) ) {
+        foreach ($files as $item) {
+            if (empty($extension) || preg_match("/(\.{$extension})$/i", $item)) {
                 $items[] = $item;
             }
         }
-        if(function_exists("mod_createCacheFile")) {
+        if (function_exists("mod_createCacheFile")) {
             mod_createCacheFile($items, "captcha_{$name}", "captcha");
         }
         return $items;
@@ -202,7 +202,7 @@ 
     function loadFont()
     {
         $fonts = $this->_getList("fonts", "ttf");
-        $this->font = $this->config["rootpath"]."/fonts/".$fonts[array_rand($fonts)];
+        $this->font = $this->config["rootpath"] . "/fonts/" . $fonts[array_rand($fonts)];
     }
 
     function setImageSize()
@@ -215,12 +215,12 @@ 
         for ($Angle = -30; $Angle <= 30; $Angle++) {
             for ($i = 65; $i <= 90; $i++) {
                 $CharDetails = imageftbbox($FontSize, $Angle, $this->font, chr($i), array());
-                $_MaxCharWidth  = abs($CharDetails[0] + $CharDetails[2]);
-                if ($_MaxCharWidth > $MaxCharWidth ) {
+                $_MaxCharWidth = abs($CharDetails[0] + $CharDetails[2]);
+                if ($_MaxCharWidth > $MaxCharWidth) {
                     $MaxCharWidth = $_MaxCharWidth;
                 }
-                $_MaxCharHeight  = abs($CharDetails[1] + $CharDetails[5]);
-                if ($_MaxCharHeight > $MaxCharHeight ) {
+                $_MaxCharHeight = abs($CharDetails[1] + $CharDetails[5]);
+                if ($_MaxCharHeight > $MaxCharHeight) {
                     $MaxCharHeight = $_MaxCharHeight;
                 }
             }
@@ -228,8 +228,8 @@ 
         imagedestroy($oImage);
 
         $this->height = $MaxCharHeight + 2;
-        $this->spacing = (int)( ($this->config["num_chars"] * $MaxCharWidth) / $this->config["num_chars"]);
-        $this->width = ($this->config["num_chars"] * $MaxCharWidth) + ($this->spacing/2);
+        $this->spacing = (int) (($this->config["num_chars"] * $MaxCharWidth) / $this->config["num_chars"]);
+        $this->width = ($this->config["num_chars"] * $MaxCharWidth) + ($this->spacing / 2);
     }
 
     /**
@@ -240,8 +240,8 @@ 
     function loadBackground()
     {
         $RandBackground = null;
-        if( $backgrounds = $this->_getList("backgrounds", "(gif|jpg|png)") ) {
-            $RandBackground = $this->config["rootpath"]."/backgrounds/".$backgrounds[array_rand($backgrounds)];
+        if ($backgrounds = $this->_getList("backgrounds", "(gif|jpg|png)")) {
+            $RandBackground = $this->config["rootpath"] . "/backgrounds/" . $backgrounds[array_rand($backgrounds)];
         }
         return $RandBackground;
     }
@@ -251,9 +251,9 @@ 
      */
     function createFromFile()
     {
-        if ( $RandImage = $this->loadBackground() ) {
+        if ($RandImage = $this->loadBackground()) {
             $ImageType = @getimagesize($RandImage);
-            switch ( @$ImageType[2] ) {
+            switch (@$ImageType[2]) {
                 case 1:
                     $BackgroundImage = imagecreatefromgif($RandImage);
                     break;
@@ -267,7 +267,7 @@ 
                     break;
             }
         }
-        if(!empty($BackgroundImage)){
+        if (!empty($BackgroundImage)) {
             imagecopyresized($this->oImage, $BackgroundImage, 0, 0, 0, 0, imagesx($this->oImage), imagesy($this->oImage), imagesx($BackgroundImage), imagesy($BackgroundImage));
             imagedestroy($BackgroundImage);
         } else {
@@ -280,7 +280,7 @@ 
      */
     function drawCode()
     {
-        for ($i = 0; $i < $this->config["num_chars"] ; $i++) {
+        for ($i = 0; $i < $this->config["num_chars"]; $i++) {
             // select random greyscale colour
             $text_color = imagecolorallocate($this->oImage, mt_rand(0, 100), mt_rand(0, 100), mt_rand(0, 100));
 
@@ -294,10 +294,10 @@ 
             $FontSize = mt_rand($this->config["fontsize_min"], $this->config["fontsize_max"]);
 
             $CharDetails = imageftbbox($FontSize, $Angle, $this->font, $this->code[$i], array());
-            $CharHeight = abs( $CharDetails[1] + $CharDetails[5] );
+            $CharHeight = abs($CharDetails[1] + $CharDetails[5]);
 
             // calculate character starting coordinates
-            $posX = ($this->spacing/2) + ($i * $this->spacing);
+            $posX = ($this->spacing / 2) + ($i * $this->spacing);
             $posY = 2 + ($this->height / 2) + ($CharHeight / 4);
 
             imagefttext($this->oImage, $FontSize, $Angle, $posX, $posY, $text_color, $this->font, $this->code[$i], array());
@@ -310,8 +310,8 @@ 
     function drawBorder()
     {
         $rgb = rand(50, 150);
-        $border_color = imagecolorallocate ($this->oImage, $rgb, $rgb, $rgb);
-        imagerectangle($this->oImage, 0, 0, $this->width-1, $this->height-1, $border_color);
+        $border_color = imagecolorallocate($this->oImage, $rgb, $rgb, $rgb);
+        imagerectangle($this->oImage, 0, 0, $this->width - 1, $this->height - 1, $border_color);
     }
 
     /**
@@ -319,9 +319,9 @@ 
      */
     function drawCircles()
     {
-        for($i = 1; $i <= $this->config["background_num"]; $i++){
-            $randomcolor = imagecolorallocate ($this->oImage , mt_rand(190,255), mt_rand(190,255), mt_rand(190,255));
-            imagefilledellipse($this->oImage, mt_rand(0,$this->width-10), mt_rand(0,$this->height-3), mt_rand(10,20), mt_rand(20,30),$randomcolor);
+        for ($i = 1; $i <= $this->config["background_num"]; $i++) {
+            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
+            imagefilledellipse($this->oImage, mt_rand(0, $this->width - 10), mt_rand(0, $this->height - 3), mt_rand(10, 20), mt_rand(20, 30), $randomcolor);
         }
     }
 
@@ -331,7 +331,7 @@ 
     function drawLines()
     {
         for ($i = 0; $i < $this->config["background_num"]; $i++) {
-            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190,255), mt_rand(190,255), mt_rand(190,255));
+            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
             imageline($this->oImage, mt_rand(0, $this->width), mt_rand(0, $this->height), mt_rand(0, $this->width), mt_rand(0, $this->height), $randomcolor);
         }
     }
@@ -342,8 +342,8 @@ 
     function drawRectangles()
     {
         for ($i = 1; $i <= $this->config["background_num"]; $i++) {
-            $randomcolor = imagecolorallocate ($this->oImage , mt_rand(190,255), mt_rand(190,255), mt_rand(190,255));
-            imagefilledrectangle($this->oImage, mt_rand(0,$this->width), mt_rand(0,$this->height), mt_rand(0, $this->width), mt_rand(0,$this->height),  $randomcolor);
+            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
+            imagefilledrectangle($this->oImage, mt_rand(0, $this->width), mt_rand(0, $this->height), mt_rand(0, $this->width), mt_rand(0, $this->height), $randomcolor);
         }
     }
 
@@ -352,14 +352,14 @@ 
      */
     function drawBars()
     {
-        for ($i= 0 ; $i <= $this->height;) {
-            $randomcolor = imagecolorallocate ($this->oImage , mt_rand(190,255), mt_rand(190,255), mt_rand(190,255));
-            imageline( $this->oImage, 0, $i, $this->width, $i, $randomcolor );
+        for ($i = 0; $i <= $this->height;) {
+            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
+            imageline($this->oImage, 0, $i, $this->width, $i, $randomcolor);
             $i = $i + 2.5;
         }
-        for ($i = 0;$i <= $this->width;) {
-            $randomcolor = imagecolorallocate ($this->oImage , mt_rand(190,255), mt_rand(190,255), mt_rand(190,255));
-            imageline( $this->oImage, $i, 0, $i, $this->height, $randomcolor );
+        for ($i = 0; $i <= $this->width;) {
+            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
+            imageline($this->oImage, $i, 0, $i, $this->height, $randomcolor);
             $i = $i + 2.5;
         }
     }
@@ -369,9 +369,9 @@ 
      */
     function drawEllipses()
     {
-        for($i = 1; $i <= $this->config["background_num"]; $i++){
-            $randomcolor = imagecolorallocate ($this->oImage , mt_rand(190,255), mt_rand(190,255), mt_rand(190,255));
-            imageellipse($this->oImage, mt_rand(0,$this->width), mt_rand(0,$this->height), mt_rand(0,$this->width), mt_rand(0,$this->height), $randomcolor);
+        for ($i = 1; $i <= $this->config["background_num"]; $i++) {
+            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
+            imageellipse($this->oImage, mt_rand(0, $this->width), mt_rand(0, $this->height), mt_rand(0, $this->width), mt_rand(0, $this->height), $randomcolor);
         }
     }
 
@@ -380,12 +380,12 @@ 
      */
     function drawPolygons()
     {
-        for($i = 1; $i <= $this->config["background_num"]; $i++){
-            $randomcolor = imagecolorallocate ($this->oImage , mt_rand(190,255), mt_rand(190,255), mt_rand(190,255));
+        for ($i = 1; $i <= $this->config["background_num"]; $i++) {
+            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
             $coords = array();
-            for ($j=1; $j <= $this->config["polygon_point"]; $j++) {
-                $coords[] = mt_rand(0,$this->width);
-                $coords[] = mt_rand(0,$this->height);
+            for ($j = 1; $j <= $this->config["polygon_point"]; $j++) {
+                $coords[] = mt_rand(0, $this->width);
+                $coords[] = mt_rand(0, $this->height);
             }
             imagefilledpolygon($this->oImage, $coords, $this->config["polygon_point"], $randomcolor);
         }
@@ -399,10 +399,10 @@ 
     {
         $image = "";
 
-        if(empty($file)) {
+        if (empty($file)) {
             header("Content-type: image/bmp");
             echo $image;
-        }else{
+        } else {
             return $image;
         }
     }

Braces +5 added lines, -5 removed lines

@@ -32,7 +32,7 @@ 
 
         if(!extension_loaded('gd')) {
             $this->mode = "bmp";
-        }else{
+        } else{
             $required_functions = array("imagecreatetruecolor", "imagecolorallocate", "imagefilledrectangle", "imagejpeg", "imagedestroy", "imageftbbox");
             foreach($required_functions as $func) {
                 if(!function_exists($func)) {
@@ -71,7 +71,7 @@ 
         if($this->mode == "bmp") {
             $this->config["num_chars"] = 4;
             $this->code = rand( pow(10, $this->config["num_chars"] - 1), intval( str_pad("9", $this->config["num_chars"], "9") ) );
-        }else{
+        } else{
             $this->code = substr(md5(uniqid(mt_rand(), 1)), 0, $this->config["num_chars"] );
             if (!$this->config["casesensitive"]) {
                 $this->code = strtoupper( $this->code );
@@ -107,7 +107,7 @@ 
 
         if($this->mode == "bmp") {
             return $this->createImageBmp();
-        }else{
+        } else{
             return $this->createImageGd();
         }
     }
@@ -168,7 +168,7 @@ 
         if(empty($file)) {
             header("Content-type: image/jpeg");
             imagejpeg ($this->oImage);
-        }else{
+        } else{
             imagejpeg ($this->oImage, XOOPS_ROOT_PATH. "/". $this->config["imagepath"]. "/". $file . ".jpg");
         }
         imagedestroy($this->oImage);
@@ -402,7 +402,7 @@ 
         if(empty($file)) {
             header("Content-type: image/bmp");
             echo $image;
-        }else{
+        } else{
             return $image;
         }
     }

include/functions.php

Doc Comments +26 added lines

@@ -53,6 +53,9 @@ 
     }
     return $xoops22;
 }
+/**
+ * @return string
+ */
 function smart_getModuleName($withLink = true, $forBreadCrumb = false, $moduleName = false) {
     if (!$moduleName) {
         global $xoopsModule;
@@ -189,6 +192,9 @@ 
     }
     return $value;
 }
+/**
+ * @return boolean|string
+ */
 function smart_getCurrentModuleName() {
     global $xoopsModule;
     if (is_object($xoopsModule)) {
@@ -240,6 +246,9 @@ 
     $truncated_string = xoops_substr($str, $start, $length - $position_of_space +strlen($trimmarker), $trimmarker);
     return $truncated_string;
 }
+/**
+ * @param string $key
+ */
 function smart_getConfig($key, $moduleName = false, $default = 'default_is_undefined') {
     if (!$moduleName) {
         $moduleName = smart_getCurrentModuleName();
@@ -293,6 +302,7 @@ 
 }
 /**
  * Thanks to the NewBB2 Development Team
+ * @param string $target
  */
 function smart_admin_mkdir($target) {
     // http://www.php.net/manual/en/function.mkdir.php
@@ -556,11 +566,17 @@ 
      }
      */
 }
+/**
+ * @param string $name
+ */
 function smart_close_collapsable($name) {
     echo "</div>";
     smart_openclose_collapsable($name);
     echo "<br />";
 }
+/**
+ * @param string $name
+ */
 function smart_setCookieVar($name, $value, $time = 0) {
     if ($time == 0) {
         $time = time() + 3600 * 24 * 365;
@@ -568,6 +584,9 @@ 
     }
     setcookie($name, $value, $time, '/');
 }
+/**
+ * @param string $name
+ */
 function smart_getCookieVar($name, $default = '') {
     $name = str_replace('.', '_', $name);
     if ((isset ($_COOKIE[$name])) && ($_COOKIE[$name] > '')) {
@@ -673,6 +692,9 @@ 
     $text = str_replace('{X_ADMINMAIL}', $xoopsConfig['adminmail'], $text);
     return $text;
 }
+/**
+ * @param string $src
+ */
 function smart_addScript($src) {
     echo '<script src="' . $src . '" type="text/javascript"></script>';
 }
@@ -791,6 +813,10 @@ 
     return $text;
 }
 
+/**
+ * @param string $module
+ * @param string $file
+ */
 function smart_loadLanguageFile($module, $file) {
     global $xoopsConfig;
 

Indentation +713 added lines, -713 removed lines

@@ -6,120 +6,120 @@ 
  * Licence: GNU
  */
 if (!defined("XOOPS_ROOT_PATH")) {
-    die("XOOPS root path not defined");
+	die("XOOPS root path not defined");
 }
 
 function smart_get_css_link($cssfile) {
-    $ret = '<link rel="stylesheet" type="text/css" href="' . $cssfile . '" />';
-    return $ret;
+	$ret = '<link rel="stylesheet" type="text/css" href="' . $cssfile . '" />';
+	return $ret;
 }
 function smart_get_page_before_form() {
-    global $smart_previous_page;
-    return isset ($_POST['smart_page_before_form']) ? $_POST['smart_page_before_form'] : $smart_previous_page;
+	global $smart_previous_page;
+	return isset ($_POST['smart_page_before_form']) ? $_POST['smart_page_before_form'] : $smart_previous_page;
 }
 /**
- * Checks if a user is admin of $module
- *
- * @return boolean : true if user is admin
- */
+	 * Checks if a user is admin of $module
+	 *
+	 * @return boolean : true if user is admin
+	 */
 function smart_userIsAdmin($module = false) {
-    global $xoopsUser;
-    static $smart_isAdmin;
-    if (!$module) {
-        global $xoopsModule;
-        $module = $xoopsModule->getVar('dirname');
-    }
-    if (isset ($smart_isAdmin[$module])) {
-        return $smart_isAdmin[$module];
-    }
-    if (!$xoopsUser) {
-        $smart_isAdmin[$module] = false;
-        return $smart_isAdmin[$module];
-    }
-    $smart_isAdmin[$module] = false;
-    $smartModule = smart_getModuleInfo($module);
-    if (!is_object($smartModule)) {
-        return false;
-    }
-    $module_id = $smartModule->getVar('mid');
-    $smart_isAdmin[$module] = $xoopsUser->isAdmin($module_id);
-    return $smart_isAdmin[$module];
+	global $xoopsUser;
+	static $smart_isAdmin;
+	if (!$module) {
+		global $xoopsModule;
+		$module = $xoopsModule->getVar('dirname');
+	}
+	if (isset ($smart_isAdmin[$module])) {
+		return $smart_isAdmin[$module];
+	}
+	if (!$xoopsUser) {
+		$smart_isAdmin[$module] = false;
+		return $smart_isAdmin[$module];
+	}
+	$smart_isAdmin[$module] = false;
+	$smartModule = smart_getModuleInfo($module);
+	if (!is_object($smartModule)) {
+		return false;
+	}
+	$module_id = $smartModule->getVar('mid');
+	$smart_isAdmin[$module] = $xoopsUser->isAdmin($module_id);
+	return $smart_isAdmin[$module];
 }
 function smart_isXoops22() {
-    $xoops22 = false;
-    $xv = str_replace('XOOPS ', '', XOOPS_VERSION);
-    if (substr($xv, 2, 1) == '2') {
-        $xoops22 = true;
-    }
-    return $xoops22;
+	$xoops22 = false;
+	$xv = str_replace('XOOPS ', '', XOOPS_VERSION);
+	if (substr($xv, 2, 1) == '2') {
+		$xoops22 = true;
+	}
+	return $xoops22;
 }
 function smart_getModuleName($withLink = true, $forBreadCrumb = false, $moduleName = false) {
-    if (!$moduleName) {
-        global $xoopsModule;
-        $moduleName = $xoopsModule->getVar('dirname');
-    }
-    $smartModule = & smart_getModuleInfo($moduleName);
-    $smartModuleConfig = & smart_getModuleConfig($moduleName);
-    if (!isset ($smartModule)) {
-        return '';
-    }
-
-    if ($forBreadCrumb && (isset ($smartModuleConfig['show_mod_name_breadcrumb']) && !$smartModuleConfig['show_mod_name_breadcrumb'])) {
-        return '';
-    }
-    if (!$withLink) {
-        return $smartModule->getVar('name');
-    } else {
-        $seoMode = smart_getModuleModeSEO($moduleName);
-        if ($seoMode == 'rewrite') {
-            $seoModuleName = smart_getModuleNameForSEO($moduleName);
-            $ret = XOOPS_URL . '/' . $seoModuleName . '/';
-        } elseif ($seoMode == 'pathinfo') {
-            $ret = XOOPS_URL . '/modules/' . $moduleName . '/seo.php/' . $seoModuleName . '/';
-        } else {
-            $ret = XOOPS_URL . '/modules/' . $moduleName . '/';
-        }
-
-        return '<a href="' . $ret . '">' . $smartModule->getVar('name') . '</a>';
-    }
+	if (!$moduleName) {
+		global $xoopsModule;
+		$moduleName = $xoopsModule->getVar('dirname');
+	}
+	$smartModule = & smart_getModuleInfo($moduleName);
+	$smartModuleConfig = & smart_getModuleConfig($moduleName);
+	if (!isset ($smartModule)) {
+		return '';
+	}
+
+	if ($forBreadCrumb && (isset ($smartModuleConfig['show_mod_name_breadcrumb']) && !$smartModuleConfig['show_mod_name_breadcrumb'])) {
+		return '';
+	}
+	if (!$withLink) {
+		return $smartModule->getVar('name');
+	} else {
+		$seoMode = smart_getModuleModeSEO($moduleName);
+		if ($seoMode == 'rewrite') {
+			$seoModuleName = smart_getModuleNameForSEO($moduleName);
+			$ret = XOOPS_URL . '/' . $seoModuleName . '/';
+		} elseif ($seoMode == 'pathinfo') {
+			$ret = XOOPS_URL . '/modules/' . $moduleName . '/seo.php/' . $seoModuleName . '/';
+		} else {
+			$ret = XOOPS_URL . '/modules/' . $moduleName . '/';
+		}
+
+		return '<a href="' . $ret . '">' . $smartModule->getVar('name') . '</a>';
+	}
 }
 function smart_getModuleNameForSEO($moduleName = false) {
-    $smartModule = & smart_getModuleInfo($moduleName);
-    $smartModuleConfig = & smart_getModuleConfig($moduleName);
-    if (isset ($smartModuleConfig['seo_module_name'])) {
-        return $smartModuleConfig['seo_module_name'];
-    }
-    $ret = smart_getModuleName(false, false, $moduleName);
-    return (strtolower($ret));
+	$smartModule = & smart_getModuleInfo($moduleName);
+	$smartModuleConfig = & smart_getModuleConfig($moduleName);
+	if (isset ($smartModuleConfig['seo_module_name'])) {
+		return $smartModuleConfig['seo_module_name'];
+	}
+	$ret = smart_getModuleName(false, false, $moduleName);
+	return (strtolower($ret));
 }
 function smart_getModuleModeSEO($moduleName = false) {
-    $smartModule = & smart_getModuleInfo($moduleName);
-    $smartModuleConfig = & smart_getModuleConfig($moduleName);
-    return isset ($smartModuleConfig['seo_mode']) ? $smartModuleConfig['seo_mode'] : false;
+	$smartModule = & smart_getModuleInfo($moduleName);
+	$smartModuleConfig = & smart_getModuleConfig($moduleName);
+	return isset ($smartModuleConfig['seo_mode']) ? $smartModuleConfig['seo_mode'] : false;
 }
 function smart_getModuleIncludeIdSEO($moduleName = false) {
-    $smartModule = & smart_getModuleInfo($moduleName);
-    $smartModuleConfig = & smart_getModuleConfig($moduleName);
-    return !empty ($smartModuleConfig['seo_inc_id']);
+	$smartModule = & smart_getModuleInfo($moduleName);
+	$smartModuleConfig = & smart_getModuleConfig($moduleName);
+	return !empty ($smartModuleConfig['seo_inc_id']);
 }
 function smart_getenv($key) {
-    $ret = '';
-    $ret = isset ($_SERVER[$key]) ? $_SERVER[$key] : (isset ($_ENV[$key]) ? $_ENV[$key] : '');
-    return $ret;
+	$ret = '';
+	$ret = isset ($_SERVER[$key]) ? $_SERVER[$key] : (isset ($_ENV[$key]) ? $_ENV[$key] : '');
+	return $ret;
 }
 function smart_xoops_cp_header() {
-    xoops_cp_header();
-    global $xoopsModule, $xoopsConfig;
-    /**
-     * include SmartObject admin language file
-     */
-    $fileName = XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php';
-    if (file_exists($fileName)) {
-        include_once $fileName;
-    } else {
-        include_once XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar('dirname') . '/language/english/admin.php';
-    }
-    ?>
+	xoops_cp_header();
+	global $xoopsModule, $xoopsConfig;
+	/**
+	 * include SmartObject admin language file
+	 */
+	$fileName = XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php';
+	if (file_exists($fileName)) {
+		include_once $fileName;
+	} else {
+		include_once XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar('dirname') . '/language/english/admin.php';
+	}
+	?>
 <script type='text/javascript'>
 	<!--
 	var smart_url='<?php echo SMARTOBJECT_URL ?>';
@@ -132,388 +132,388 @@ 
 	src='<?php echo SMARTOBJECT_URL ?>include/smart.js'></script>
     <?php
 
-    /**
-     * Include the admin language constants for the SmartObject Framework
-     */
-    $admin_file = SMARTOBJECT_ROOT_PATH . "language/" . $xoopsConfig['language'] . "/admin.php";
-    if (!file_exists($admin_file)) {
-        $admin_file = SMARTOBJECT_ROOT_PATH . "language/english/admin.php";
-    }
-    include_once ($admin_file);
+	/**
+	 * Include the admin language constants for the SmartObject Framework
+	 */
+	$admin_file = SMARTOBJECT_ROOT_PATH . "language/" . $xoopsConfig['language'] . "/admin.php";
+	if (!file_exists($admin_file)) {
+		$admin_file = SMARTOBJECT_ROOT_PATH . "language/english/admin.php";
+	}
+	include_once ($admin_file);
 }
 /**
- * Detemines if a table exists in the current db
- *
- * @param string $table the table name (without XOOPS prefix)
- * @return bool True if table exists, false if not
- *
- * @access public
- * @author xhelp development team
- */
+	 * Detemines if a table exists in the current db
+	 *
+	 * @param string $table the table name (without XOOPS prefix)
+	 * @return bool True if table exists, false if not
+	 *
+	 * @access public
+	 * @author xhelp development team
+	 */
 function smart_TableExists($table) {
-    $bRetVal = false;
-    //Verifies that a MySQL table exists
-    $xoopsDB = & XoopsDatabaseFactory::getDatabaseConnection();
-    $realname = $xoopsDB->prefix($table);
-    $sql = "SHOW TABLES FROM ".XOOPS_DB_NAME;
-    $ret = $xoopsDB->queryF($sql);
-    while (list ($m_table) = $xoopsDB->fetchRow($ret)) {
-        if ($m_table == $realname) {
-            $bRetVal = true;
-            break;
-        }
-    }
-    $xoopsDB->freeRecordSet($ret);
-    return ($bRetVal);
+	$bRetVal = false;
+	//Verifies that a MySQL table exists
+	$xoopsDB = & XoopsDatabaseFactory::getDatabaseConnection();
+	$realname = $xoopsDB->prefix($table);
+	$sql = "SHOW TABLES FROM ".XOOPS_DB_NAME;
+	$ret = $xoopsDB->queryF($sql);
+	while (list ($m_table) = $xoopsDB->fetchRow($ret)) {
+		if ($m_table == $realname) {
+			$bRetVal = true;
+			break;
+		}
+	}
+	$xoopsDB->freeRecordSet($ret);
+	return ($bRetVal);
 }
 /**
- * Gets a value from a key in the xhelp_meta table
- *
- * @param string $key
- * @return string $value
- *
- * @access public
- * @author xhelp development team
- */
+	 * Gets a value from a key in the xhelp_meta table
+	 *
+	 * @param string $key
+	 * @return string $value
+	 *
+	 * @access public
+	 * @author xhelp development team
+	 */
 function smart_GetMeta($key, $moduleName = false) {
-    if (!$moduleName) {
-        $moduleName = smart_getCurrentModuleName();
-    }
-    $xoopsDB = & XoopsDatabaseFactory::getDatabaseConnection();
-    $sql = sprintf("SELECT metavalue FROM %s WHERE metakey=%s", $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($key));
-    $ret = $xoopsDB->query($sql);
-    if (!$ret) {
-        $value = false;
-    } else {
-        list ($value) = $xoopsDB->fetchRow($ret);
-    }
-    return $value;
+	if (!$moduleName) {
+		$moduleName = smart_getCurrentModuleName();
+	}
+	$xoopsDB = & XoopsDatabaseFactory::getDatabaseConnection();
+	$sql = sprintf("SELECT metavalue FROM %s WHERE metakey=%s", $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($key));
+	$ret = $xoopsDB->query($sql);
+	if (!$ret) {
+		$value = false;
+	} else {
+		list ($value) = $xoopsDB->fetchRow($ret);
+	}
+	return $value;
 }
 function smart_getCurrentModuleName() {
-    global $xoopsModule;
-    if (is_object($xoopsModule)) {
-        return $xoopsModule->getVar('dirname');
-    } else {
-        return false;
-    }
+	global $xoopsModule;
+	if (is_object($xoopsModule)) {
+		return $xoopsModule->getVar('dirname');
+	} else {
+		return false;
+	}
 }
 /**
- * Sets a value for a key in the xhelp_meta table
- *
- * @param string $key
- * @param string $value
- * @return bool TRUE if success, FALSE if failure
- *
- * @access public
- * @author xhelp development team
- */
+	 * Sets a value for a key in the xhelp_meta table
+	 *
+	 * @param string $key
+	 * @param string $value
+	 * @return bool TRUE if success, FALSE if failure
+	 *
+	 * @access public
+	 * @author xhelp development team
+	 */
 function smart_SetMeta($key, $value, $moduleName = false) {
-    if (!$moduleName) {
-        $moduleName = smart_getCurrentModuleName();
-    }
-    $xoopsDB = & XoopsDatabaseFactory::getDatabaseConnection();
-    $ret = smart_GetMeta($key, $moduleName);
-    if ($ret === '0' || $ret > 0) {
-        $sql = sprintf("UPDATE %s SET metavalue = %s WHERE metakey = %s", $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($value), $xoopsDB->quoteString($key));
-    } else {
-        $sql = sprintf("INSERT INTO %s (metakey, metavalue) VALUES (%s, %s)", $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($key), $xoopsDB->quoteString($value));
-    }
-    $ret = $xoopsDB->queryF($sql);
-    if (!$ret) {
-        return false;
-    }
-    return true;
+	if (!$moduleName) {
+		$moduleName = smart_getCurrentModuleName();
+	}
+	$xoopsDB = & XoopsDatabaseFactory::getDatabaseConnection();
+	$ret = smart_GetMeta($key, $moduleName);
+	if ($ret === '0' || $ret > 0) {
+		$sql = sprintf("UPDATE %s SET metavalue = %s WHERE metakey = %s", $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($value), $xoopsDB->quoteString($key));
+	} else {
+		$sql = sprintf("INSERT INTO %s (metakey, metavalue) VALUES (%s, %s)", $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($key), $xoopsDB->quoteString($value));
+	}
+	$ret = $xoopsDB->queryF($sql);
+	if (!$ret) {
+		return false;
+	}
+	return true;
 }
 // Thanks to Mithrandir :-)
 function smart_substr($str, $start, $length, $trimmarker = '...') {
-    // if the string is empty, let's get out ;-)
-    if ($str == '') {
-        return $str;
-    }
-    // reverse a string that is shortened with '' as trimmarker
-    $reversed_string = strrev(xoops_substr($str, $start, $length, ''));
-    // find first space in reversed string
-    $position_of_space = strpos($reversed_string, " ", 0);
-    // truncate the original string to a length of $length
-    // minus the position of the last space
-    // plus the length of the $trimmarker
-    $truncated_string = xoops_substr($str, $start, $length - $position_of_space +strlen($trimmarker), $trimmarker);
-    return $truncated_string;
+	// if the string is empty, let's get out ;-)
+	if ($str == '') {
+		return $str;
+	}
+	// reverse a string that is shortened with '' as trimmarker
+	$reversed_string = strrev(xoops_substr($str, $start, $length, ''));
+	// find first space in reversed string
+	$position_of_space = strpos($reversed_string, " ", 0);
+	// truncate the original string to a length of $length
+	// minus the position of the last space
+	// plus the length of the $trimmarker
+	$truncated_string = xoops_substr($str, $start, $length - $position_of_space +strlen($trimmarker), $trimmarker);
+	return $truncated_string;
 }
 function smart_getConfig($key, $moduleName = false, $default = 'default_is_undefined') {
-    if (!$moduleName) {
-        $moduleName = smart_getCurrentModuleName();
-    }
-    $configs = smart_getModuleConfig($moduleName);
-    if (isset ($configs[$key])) {
-        return $configs[$key];
-    } else {
-        if ($default === 'default_is_undefined') {
-            return null;
-        } else {
-            return $default;
-        }
-    }
+	if (!$moduleName) {
+		$moduleName = smart_getCurrentModuleName();
+	}
+	$configs = smart_getModuleConfig($moduleName);
+	if (isset ($configs[$key])) {
+		return $configs[$key];
+	} else {
+		if ($default === 'default_is_undefined') {
+			return null;
+		} else {
+			return $default;
+		}
+	}
 }
 /**
- * Copy a file, or a folder and its contents
- *
- * @author      Aidan Lister <aidan@php.net>
- * @version     1.0.0
- * @param       string   $source    The source
- * @param       string   $dest      The destination
- * @return      bool     Returns true on success, false on failure
- */
+	 * Copy a file, or a folder and its contents
+	 *
+	 * @author      Aidan Lister <aidan@php.net>
+	 * @version     1.0.0
+	 * @param       string   $source    The source
+	 * @param       string   $dest      The destination
+	 * @return      bool     Returns true on success, false on failure
+	 */
 function smart_copyr($source, $dest) {
-    // Simple copy for a file
-    if (is_file($source)) {
-        return copy($source, $dest);
-    }
-    // Make destination directory
-    if (!is_dir($dest)) {
-        mkdir($dest);
-    }
-    // Loop through the folder
-    $dir = dir($source);
-    while (false !== $entry = $dir->read()) {
-        // Skip pointers
-        if ($entry == '.' || $entry == '..') {
-            continue;
-        }
-        // Deep copy directories
-        if (is_dir("$source/$entry") && ($dest !== "$source/$entry")) {
-            copyr("$source/$entry", "$dest/$entry");
-        } else {
-            copy("$source/$entry", "$dest/$entry");
-        }
-    }
-    // Clean up
-    $dir->close();
-    return true;
+	// Simple copy for a file
+	if (is_file($source)) {
+		return copy($source, $dest);
+	}
+	// Make destination directory
+	if (!is_dir($dest)) {
+		mkdir($dest);
+	}
+	// Loop through the folder
+	$dir = dir($source);
+	while (false !== $entry = $dir->read()) {
+		// Skip pointers
+		if ($entry == '.' || $entry == '..') {
+			continue;
+		}
+		// Deep copy directories
+		if (is_dir("$source/$entry") && ($dest !== "$source/$entry")) {
+			copyr("$source/$entry", "$dest/$entry");
+		} else {
+			copy("$source/$entry", "$dest/$entry");
+		}
+	}
+	// Clean up
+	$dir->close();
+	return true;
 }
 /**
- * Thanks to the NewBB2 Development Team
- */
+	 * Thanks to the NewBB2 Development Team
+	 */
 function smart_admin_mkdir($target) {
-    // http://www.php.net/manual/en/function.mkdir.php
-    // saint at corenova.com
-    // bart at cdasites dot com
-    if (is_dir($target) || empty ($target)) {
-        return true; // best case check first
-    }
-    if (file_exists($target) && !is_dir($target)) {
-        return false;
-    }
-    if (smart_admin_mkdir(substr($target, 0, strrpos($target, '/')))) {
-        if (!file_exists($target)) {
-            $res = mkdir($target, 0777); // crawl back up & create dir tree
-            smart_admin_chmod($target);
-            return $res;
-        }
-    }
-    $res = is_dir($target);
-    return $res;
+	// http://www.php.net/manual/en/function.mkdir.php
+	// saint at corenova.com
+	// bart at cdasites dot com
+	if (is_dir($target) || empty ($target)) {
+		return true; // best case check first
+	}
+	if (file_exists($target) && !is_dir($target)) {
+		return false;
+	}
+	if (smart_admin_mkdir(substr($target, 0, strrpos($target, '/')))) {
+		if (!file_exists($target)) {
+			$res = mkdir($target, 0777); // crawl back up & create dir tree
+			smart_admin_chmod($target);
+			return $res;
+		}
+	}
+	$res = is_dir($target);
+	return $res;
 }
 /**
- * Thanks to the NewBB2 Development Team
- */
+	 * Thanks to the NewBB2 Development Team
+	 */
 function smart_admin_chmod($target, $mode = 0777) {
-    return @ chmod($target, $mode);
+	return @ chmod($target, $mode);
 }
 function smart_imageResize($src, $maxWidth, $maxHeight) {
-    $width = '';
-    $height = '';
-    $type = '';
-    $attr = '';
-    if (file_exists($src)) {
-        list ($width, $height, $type, $attr) = getimagesize($src);
-        if ($width > $maxWidth) {
-            $originalWidth = $width;
-            $width = $maxWidth;
-            $height = $width * $height / $originalWidth;
-        }
-        if ($height > $maxHeight) {
-            $originalHeight = $height;
-            $height = $maxHeight;
-            $width = $height * $width / $originalHeight;
-        }
-        $attr = " width='$width' height='$height'";
-    }
-    return array (
-    $width,
-    $height,
-    $type,
-    $attr
-    );
+	$width = '';
+	$height = '';
+	$type = '';
+	$attr = '';
+	if (file_exists($src)) {
+		list ($width, $height, $type, $attr) = getimagesize($src);
+		if ($width > $maxWidth) {
+			$originalWidth = $width;
+			$width = $maxWidth;
+			$height = $width * $height / $originalWidth;
+		}
+		if ($height > $maxHeight) {
+			$originalHeight = $height;
+			$height = $maxHeight;
+			$width = $height * $width / $originalHeight;
+		}
+		$attr = " width='$width' height='$height'";
+	}
+	return array (
+	$width,
+	$height,
+	$type,
+	$attr
+	);
 }
 function &smart_getModuleInfo($moduleName = false) {
-    static $smartModules;
-    if (isset ($smartModules[$moduleName])) {
-        $ret =& $smartModules[$moduleName];
-        return $ret;
-    }
-    global $xoopsModule;
-    if (!$moduleName) {
-        if (isset ($xoopsModule) && is_object($xoopsModule)) {
-            $smartModules[$xoopsModule->getVar('dirname')] = & $xoopsModule;
-            return $smartModules[$xoopsModule->getVar('dirname')];
-        }
-    }
-    if (!isset ($smartModules[$moduleName])) {
-        if (isset ($xoopsModule) && is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $moduleName) {
-            $smartModules[$moduleName] = & $xoopsModule;
-        } else {
-            $hModule = & xoops_gethandler('module');
-            if ($moduleName != 'xoops') {
-                $smartModules[$moduleName] = & $hModule->getByDirname($moduleName);
-
-            } else {
-                $smartModules[$moduleName] = & $hModule->getByDirname('system');
-            }
-        }
-    }
-    return $smartModules[$moduleName];
+	static $smartModules;
+	if (isset ($smartModules[$moduleName])) {
+		$ret =& $smartModules[$moduleName];
+		return $ret;
+	}
+	global $xoopsModule;
+	if (!$moduleName) {
+		if (isset ($xoopsModule) && is_object($xoopsModule)) {
+			$smartModules[$xoopsModule->getVar('dirname')] = & $xoopsModule;
+			return $smartModules[$xoopsModule->getVar('dirname')];
+		}
+	}
+	if (!isset ($smartModules[$moduleName])) {
+		if (isset ($xoopsModule) && is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $moduleName) {
+			$smartModules[$moduleName] = & $xoopsModule;
+		} else {
+			$hModule = & xoops_gethandler('module');
+			if ($moduleName != 'xoops') {
+				$smartModules[$moduleName] = & $hModule->getByDirname($moduleName);
+
+			} else {
+				$smartModules[$moduleName] = & $hModule->getByDirname('system');
+			}
+		}
+	}
+	return $smartModules[$moduleName];
 }
 function &smart_getModuleConfig($moduleName = false) {
-    static $smartConfigs;
-    if (isset ($smartConfigs[$moduleName])) {
-        $ret = & $smartConfigs[$moduleName];
-        return $ret;
-    }
-    global $xoopsModule, $xoopsModuleConfig;
-    if (!$moduleName) {
-        if (isset ($xoopsModule) && is_object($xoopsModule)) {
-            $smartConfigs[$xoopsModule->getVar('dirname')] = & $xoopsModuleConfig;
-            return $smartConfigs[$xoopsModule->getVar('dirname')];
-        }
-    }
-    // if we still did not found the xoopsModule, this is because there is none
-    if (!$moduleName) {
-        $ret = false;
-        return $ret;
-    }
-    if (isset ($xoopsModule) && is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $moduleName) {
-        $smartConfigs[$moduleName] = & $xoopsModuleConfig;
-    } else {
-        $module = & smart_getModuleInfo($moduleName);
-        if (!is_object($module)) {
-            $ret = false;
-            return $ret;
-        }
-        $hModConfig = & xoops_gethandler('config');
-        $smartConfigs[$moduleName] = & $hModConfig->getConfigsByCat(0, $module->getVar('mid'));
-    }
-    return $smartConfigs[$moduleName];
+	static $smartConfigs;
+	if (isset ($smartConfigs[$moduleName])) {
+		$ret = & $smartConfigs[$moduleName];
+		return $ret;
+	}
+	global $xoopsModule, $xoopsModuleConfig;
+	if (!$moduleName) {
+		if (isset ($xoopsModule) && is_object($xoopsModule)) {
+			$smartConfigs[$xoopsModule->getVar('dirname')] = & $xoopsModuleConfig;
+			return $smartConfigs[$xoopsModule->getVar('dirname')];
+		}
+	}
+	// if we still did not found the xoopsModule, this is because there is none
+	if (!$moduleName) {
+		$ret = false;
+		return $ret;
+	}
+	if (isset ($xoopsModule) && is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $moduleName) {
+		$smartConfigs[$moduleName] = & $xoopsModuleConfig;
+	} else {
+		$module = & smart_getModuleInfo($moduleName);
+		if (!is_object($module)) {
+			$ret = false;
+			return $ret;
+		}
+		$hModConfig = & xoops_gethandler('config');
+		$smartConfigs[$moduleName] = & $hModConfig->getConfigsByCat(0, $module->getVar('mid'));
+	}
+	return $smartConfigs[$moduleName];
 }
 function smart_deleteFile($dirname) {
-    // Simple delete for a file
-    if (is_file($dirname)) {
-        return unlink($dirname);
-    }
+	// Simple delete for a file
+	if (is_file($dirname)) {
+		return unlink($dirname);
+	}
 }
 function smart_formatErrors($errors = array ()) {
-    $ret = '';
-    foreach ($errors as $key => $value) {
-        $ret .= "<br /> - " . $value;
-    }
-    return $ret;
+	$ret = '';
+	foreach ($errors as $key => $value) {
+		$ret .= "<br /> - " . $value;
+	}
+	return $ret;
 }
 /**
- * smart_getLinkedUnameFromId()
- *
- * @param integer $userid Userid of poster etc
- * @param integer $name :  0 Use Usenamer 1 Use realname
- * @return
- */
+	 * smart_getLinkedUnameFromId()
+	 *
+	 * @param integer $userid Userid of poster etc
+	 * @param integer $name :  0 Use Usenamer 1 Use realname
+	 * @return
+	 */
 function smart_getLinkedUnameFromId($userid = 0, $name = 0, $users = array (), $withContact = false) {
-    if (!is_numeric($userid)) {
-        return $userid;
-    }
-    $userid = intval($userid);
-    if ($userid > 0) {
-        if ($users == array ()) {
-            //fetching users
-            $member_handler = & xoops_gethandler('member');
-            $user = & $member_handler->getUser($userid);
-        } else {
-            if (!isset ($users[$userid])) {
-                return $GLOBALS['xoopsConfig']['anonymous'];
-            }
-            $user = & $users[$userid];
-        }
-        if (is_object($user)) {
-            $ts = & MyTextSanitizer :: getInstance();
-            $username = $user->getVar('uname');
-            $fullname = '';
-            $fullname2 = $user->getVar('name');
-            if (($name) && !empty ($fullname2)) {
-                $fullname = $user->getVar('name');
-            }
-            if (!empty ($fullname)) {
-                $linkeduser = "$fullname [<a href='" . XOOPS_URL . "/userinfo.php?uid=" . $userid . "'>" . $ts->htmlSpecialChars($username) . "</a>]";
-            } else {
-                $linkeduser = "<a href='" . XOOPS_URL . "/userinfo.php?uid=" . $userid . "'>" . ucwords($ts->htmlSpecialChars($username)) . "</a>";
-            }
-            // add contact info : email + PM
-            if ($withContact) {
-                $linkeduser .= ' <a href="mailto:' . $user->getVar('email') . '"><img style="vertical-align: middle;" src="' . XOOPS_URL . '/images/icons/email.gif' . '" alt="' . _CO_SOBJECT_SEND_EMAIL . '" title="' . _CO_SOBJECT_SEND_EMAIL . '"/></a>';
-                $js = "javascript:openWithSelfMain('" . XOOPS_URL . '/pmlite.php?send2=1&to_userid=' . $userid . "', 'pmlite',450,370);";
-                $linkeduser .= ' <a href="' . $js . '"><img style="vertical-align: middle;" src="' . XOOPS_URL . '/images/icons/pm.gif' . '" alt="' . _CO_SOBJECT_SEND_PM . '" title="' . _CO_SOBJECT_SEND_PM . '"/></a>';
-            }
-            return $linkeduser;
-        }
-    }
-    return $GLOBALS['xoopsConfig']['anonymous'];
+	if (!is_numeric($userid)) {
+		return $userid;
+	}
+	$userid = intval($userid);
+	if ($userid > 0) {
+		if ($users == array ()) {
+			//fetching users
+			$member_handler = & xoops_gethandler('member');
+			$user = & $member_handler->getUser($userid);
+		} else {
+			if (!isset ($users[$userid])) {
+				return $GLOBALS['xoopsConfig']['anonymous'];
+			}
+			$user = & $users[$userid];
+		}
+		if (is_object($user)) {
+			$ts = & MyTextSanitizer :: getInstance();
+			$username = $user->getVar('uname');
+			$fullname = '';
+			$fullname2 = $user->getVar('name');
+			if (($name) && !empty ($fullname2)) {
+				$fullname = $user->getVar('name');
+			}
+			if (!empty ($fullname)) {
+				$linkeduser = "$fullname [<a href='" . XOOPS_URL . "/userinfo.php?uid=" . $userid . "'>" . $ts->htmlSpecialChars($username) . "</a>]";
+			} else {
+				$linkeduser = "<a href='" . XOOPS_URL . "/userinfo.php?uid=" . $userid . "'>" . ucwords($ts->htmlSpecialChars($username)) . "</a>";
+			}
+			// add contact info : email + PM
+			if ($withContact) {
+				$linkeduser .= ' <a href="mailto:' . $user->getVar('email') . '"><img style="vertical-align: middle;" src="' . XOOPS_URL . '/images/icons/email.gif' . '" alt="' . _CO_SOBJECT_SEND_EMAIL . '" title="' . _CO_SOBJECT_SEND_EMAIL . '"/></a>';
+				$js = "javascript:openWithSelfMain('" . XOOPS_URL . '/pmlite.php?send2=1&to_userid=' . $userid . "', 'pmlite',450,370);";
+				$linkeduser .= ' <a href="' . $js . '"><img style="vertical-align: middle;" src="' . XOOPS_URL . '/images/icons/pm.gif' . '" alt="' . _CO_SOBJECT_SEND_PM . '" title="' . _CO_SOBJECT_SEND_PM . '"/></a>';
+			}
+			return $linkeduser;
+		}
+	}
+	return $GLOBALS['xoopsConfig']['anonymous'];
 }
 function smart_adminMenu($currentoption = 0, $breadcrumb = '', $submenus = false, $currentsub = -1) {
-    global $xoopsModule, $xoopsConfig;
-    include_once XOOPS_ROOT_PATH . '/class/template.php';
-    if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/modinfo.php')) {
-        include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/modinfo.php';
-    } else {
-        include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/modinfo.php';
-    }
-    if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php')) {
-        include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php';
-    } else {
-        include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/admin.php';
-    }
-    $headermenu = array();
-    $adminmenu = array();
-    include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/menu.php';
-    $tpl = new XoopsTpl();
-    $tpl->assign(array (
-        'headermenu' => $headermenu,
-        'adminmenu' => $adminmenu,
-        'current' => $currentoption,
-        'breadcrumb' => $breadcrumb,
-        'headermenucount' => count($headermenu
-    ), 'submenus' => $submenus, 'currentsub' => $currentsub, 'submenuscount' => count($submenus)));
-    $tpl->display('db:smartobject_admin_menu.html');
+	global $xoopsModule, $xoopsConfig;
+	include_once XOOPS_ROOT_PATH . '/class/template.php';
+	if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/modinfo.php')) {
+		include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/modinfo.php';
+	} else {
+		include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/modinfo.php';
+	}
+	if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php')) {
+		include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php';
+	} else {
+		include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/admin.php';
+	}
+	$headermenu = array();
+	$adminmenu = array();
+	include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/menu.php';
+	$tpl = new XoopsTpl();
+	$tpl->assign(array (
+		'headermenu' => $headermenu,
+		'adminmenu' => $adminmenu,
+		'current' => $currentoption,
+		'breadcrumb' => $breadcrumb,
+		'headermenucount' => count($headermenu
+	), 'submenus' => $submenus, 'currentsub' => $currentsub, 'submenuscount' => count($submenus)));
+	$tpl->display('db:smartobject_admin_menu.html');
 }
 function smart_collapsableBar($id = '', $title = '', $dsc = '') {
-    global $xoopsModule;
-    echo "<h3 style=\"color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; \"><a href='javascript:;' onclick=\"togglecollapse('" . $id . "'); toggleIcon('" . $id . "_icon')\";>";
-    echo "<img id='" . $id . "_icon' src=" . SMARTOBJECT_URL . "images/close12.gif alt='' /></a>&nbsp;" . $title . "</h3>";
-    echo "<div id='" . $id . "'>";
-    if ($dsc != '') {
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . $dsc . "</span>";
-    }
+	global $xoopsModule;
+	echo "<h3 style=\"color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; \"><a href='javascript:;' onclick=\"togglecollapse('" . $id . "'); toggleIcon('" . $id . "_icon')\";>";
+	echo "<img id='" . $id . "_icon' src=" . SMARTOBJECT_URL . "images/close12.gif alt='' /></a>&nbsp;" . $title . "</h3>";
+	echo "<div id='" . $id . "'>";
+	if ($dsc != '') {
+		echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . $dsc . "</span>";
+	}
 }
 function smart_ajaxCollapsableBar($id = '', $title = '', $dsc = '') {
-    global $xoopsModule;
-    $onClick = "ajaxtogglecollapse('$id')";
-    //$onClick = "togglecollapse('$id'); toggleIcon('" . $id . "_icon')";
-    echo '<h3 style="border: 1px solid; color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; " onclick="' . $onClick . '">';
-    echo "<img id='" . $id . "_icon' src=" . SMARTOBJECT_URL . "images/close12.gif alt='' /></a>&nbsp;" . $title . "</h3>";
-    echo "<div id='" . $id . "'>";
-    if ($dsc != '') {
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . $dsc . "</span>";
-    }
+	global $xoopsModule;
+	$onClick = "ajaxtogglecollapse('$id')";
+	//$onClick = "togglecollapse('$id'); toggleIcon('" . $id . "_icon')";
+	echo '<h3 style="border: 1px solid; color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; " onclick="' . $onClick . '">';
+	echo "<img id='" . $id . "_icon' src=" . SMARTOBJECT_URL . "images/close12.gif alt='' /></a>&nbsp;" . $title . "</h3>";
+	echo "<div id='" . $id . "'>";
+	if ($dsc != '') {
+		echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . $dsc . "</span>";
+	}
 }
 /**
- * Ajax testing......
- */
+	 * Ajax testing......
+	 */
 /*
  function smart_collapsableBar($id = '', $title = '', $dsc='')
  {
@@ -533,20 +533,20 @@ 
  }
  */
 function smart_openclose_collapsable($name) {
-    $urls = smart_getCurrentUrls();
-    $path = $urls['phpself'];
-    $cookie_name = $path . '_smart_collaps_' . $name;
-    $cookie_name = str_replace('.', '_', $cookie_name);
-    $cookie = smart_getCookieVar($cookie_name, '');
-    if ($cookie == 'none') {
-        echo '
+	$urls = smart_getCurrentUrls();
+	$path = $urls['phpself'];
+	$cookie_name = $path . '_smart_collaps_' . $name;
+	$cookie_name = str_replace('.', '_', $cookie_name);
+	$cookie = smart_getCookieVar($cookie_name, '');
+	if ($cookie == 'none') {
+		echo '
 				<script type="text/javascript"><!--
 				togglecollapse("' . $name . '"); toggleIcon("' . $name . '_icon");
 					//-->
 				</script>
 				';
-    }
-    /*	if ($cookie == 'none') {
+	}
+	/*	if ($cookie == 'none') {
      echo '
      <script type="text/javascript"><!--
      hideElement("' . $name . '");
@@ -557,63 +557,63 @@ 
      */
 }
 function smart_close_collapsable($name) {
-    echo "</div>";
-    smart_openclose_collapsable($name);
-    echo "<br />";
+	echo "</div>";
+	smart_openclose_collapsable($name);
+	echo "<br />";
 }
 function smart_setCookieVar($name, $value, $time = 0) {
-    if ($time == 0) {
-        $time = time() + 3600 * 24 * 365;
-        //$time = '';
-    }
-    setcookie($name, $value, $time, '/');
+	if ($time == 0) {
+		$time = time() + 3600 * 24 * 365;
+		//$time = '';
+	}
+	setcookie($name, $value, $time, '/');
 }
 function smart_getCookieVar($name, $default = '') {
-    $name = str_replace('.', '_', $name);
-    if ((isset ($_COOKIE[$name])) && ($_COOKIE[$name] > '')) {
-        return $_COOKIE[$name];
-    } else {
-        return $default;
-    }
+	$name = str_replace('.', '_', $name);
+	if ((isset ($_COOKIE[$name])) && ($_COOKIE[$name] > '')) {
+		return $_COOKIE[$name];
+	} else {
+		return $default;
+	}
 }
 
 function smart_getCurrentUrls() {
-    $urls = array();
-    $http = ((strpos(XOOPS_URL, "https://")) === false) ? ("http://") : ("https://");
-    $phpself = $_SERVER['PHP_SELF'];
-    $httphost = $_SERVER['HTTP_HOST'];
-    $querystring = $_SERVER['QUERY_STRING'];
-    if ($querystring != '') {
-        $querystring = '?' . $querystring;
-    }
-    $currenturl = $http . $httphost . $phpself . $querystring;
-    $urls = array ();
-    $urls['http'] = $http;
-    $urls['httphost'] = $httphost;
-    $urls['phpself'] = $phpself;
-    $urls['querystring'] = $querystring;
-    $urls['full_phpself'] = $http . $httphost . $phpself;
-    $urls['full'] = $currenturl;
-    $urls['isHomePage'] = (XOOPS_URL . "/index.php") == ($http . $httphost . $phpself);
-    return $urls;
+	$urls = array();
+	$http = ((strpos(XOOPS_URL, "https://")) === false) ? ("http://") : ("https://");
+	$phpself = $_SERVER['PHP_SELF'];
+	$httphost = $_SERVER['HTTP_HOST'];
+	$querystring = $_SERVER['QUERY_STRING'];
+	if ($querystring != '') {
+		$querystring = '?' . $querystring;
+	}
+	$currenturl = $http . $httphost . $phpself . $querystring;
+	$urls = array ();
+	$urls['http'] = $http;
+	$urls['httphost'] = $httphost;
+	$urls['phpself'] = $phpself;
+	$urls['querystring'] = $querystring;
+	$urls['full_phpself'] = $http . $httphost . $phpself;
+	$urls['full'] = $currenturl;
+	$urls['isHomePage'] = (XOOPS_URL . "/index.php") == ($http . $httphost . $phpself);
+	return $urls;
 }
 
 function smart_getCurrentPage() {
-    $urls = smart_getCurrentUrls();
-    return $urls['full'];
+	$urls = smart_getCurrentUrls();
+	return $urls['full'];
 }
 /**
- * Create a title for the short_url field of an article
- *
- * @credit psylove
- *
- * @var string $title title of the article
- * @var string $withExt do we add an html extension or not
- * @return string sort_url for the article
- */
+	 * Create a title for the short_url field of an article
+	 *
+	 * @credit psylove
+	 *
+	 * @var string $title title of the article
+	 * @var string $withExt do we add an html extension or not
+	 * @return string sort_url for the article
+	 */
 /**
- * Moved in SmartMetaGenClass
- */
+	 * Moved in SmartMetaGenClass
+	 */
 /*
  function smart_seo_title($title='', $withExt=true)
  {
@@ -645,210 +645,210 @@ 
  }
  */
 function smart_modFooter() {
-    global $xoopsConfig, $xoopsModule, $xoopsModuleConfig;
+	global $xoopsConfig, $xoopsModule, $xoopsModuleConfig;
 
-    include_once XOOPS_ROOT_PATH . '/class/template.php';
-    $tpl = new XoopsTpl();
+	include_once XOOPS_ROOT_PATH . '/class/template.php';
+	$tpl = new XoopsTpl();
 
-    $hModule = & xoops_gethandler('module');
-    $versioninfo = & $hModule->get($xoopsModule->getVar('mid'));
-    $modfootertxt = "Module " . $versioninfo->getInfo('name') . " - Version " . $versioninfo->getInfo('version') . "";
-    $modfooter = "<a href='" . $versioninfo->getInfo('support_site_url') . "' target='_blank'><img src='" . XOOPS_URL . "/modules/" . $xoopsModule->getVar('dirname') . "/images/cssbutton.gif' title='" . $modfootertxt . "' alt='" . $modfootertxt . "'/></a>";
-    $tpl->assign('modfooter', $modfooter);
+	$hModule = & xoops_gethandler('module');
+	$versioninfo = & $hModule->get($xoopsModule->getVar('mid'));
+	$modfootertxt = "Module " . $versioninfo->getInfo('name') . " - Version " . $versioninfo->getInfo('version') . "";
+	$modfooter = "<a href='" . $versioninfo->getInfo('support_site_url') . "' target='_blank'><img src='" . XOOPS_URL . "/modules/" . $xoopsModule->getVar('dirname') . "/images/cssbutton.gif' title='" . $modfootertxt . "' alt='" . $modfootertxt . "'/></a>";
+	$tpl->assign('modfooter', $modfooter);
 
-    if (!defined('_AM_SOBJECT_XOOPS_PRO')) {
-        define("_AM_SOBJECT_XOOPS_PRO", "Do you need help with this module ?<br />Do you need new features not yet available ?");
-    }
-    $smartobject_config = smart_getModuleConfig('smartobject');
-    $tpl->assign('smartobject_enable_admin_footer', $smartobject_config['enable_admin_footer']);
-    $tpl->display(SMARTOBJECT_ROOT_PATH . 'templates/smartobject_admin_footer.html');
+	if (!defined('_AM_SOBJECT_XOOPS_PRO')) {
+		define("_AM_SOBJECT_XOOPS_PRO", "Do you need help with this module ?<br />Do you need new features not yet available ?");
+	}
+	$smartobject_config = smart_getModuleConfig('smartobject');
+	$tpl->assign('smartobject_enable_admin_footer', $smartobject_config['enable_admin_footer']);
+	$tpl->display(SMARTOBJECT_ROOT_PATH . 'templates/smartobject_admin_footer.html');
 }
 function smart_xoops_cp_footer() {
-    smart_modFooter();
-    xoops_cp_footer();
+	smart_modFooter();
+	xoops_cp_footer();
 }
 function smart_sanitizeForCommonTags($text) {
-    global $xoopsConfig;
-    $text = str_replace('{X_SITENAME}', $xoopsConfig['sitename'], $text);
-    $text = str_replace('{X_ADMINMAIL}', $xoopsConfig['adminmail'], $text);
-    return $text;
+	global $xoopsConfig;
+	$text = str_replace('{X_SITENAME}', $xoopsConfig['sitename'], $text);
+	$text = str_replace('{X_ADMINMAIL}', $xoopsConfig['adminmail'], $text);
+	return $text;
 }
 function smart_addScript($src) {
-    echo '<script src="' . $src . '" type="text/javascript"></script>';
+	echo '<script src="' . $src . '" type="text/javascript"></script>';
 }
 function smart_addStyle($src) {
-    if ($src == 'smartobject') {
-        $src = SMARTOBJECT_URL . 'module.css';
-    }
-    echo smart_get_css_link($src);
+	if ($src == 'smartobject') {
+		$src = SMARTOBJECT_URL . 'module.css';
+	}
+	echo smart_get_css_link($src);
 }
 function smart_addAdminAjaxSupport() {
-    smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/lib/prototype.js');
-    smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/src/scriptaculous.js');
-    smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/src/smart.js');
+	smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/lib/prototype.js');
+	smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/src/scriptaculous.js');
+	smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/src/smart.js');
 }
 function smart_sanitizeForSmartpopupLink($text) {
-    $patterns[] = "/\[smartpopup=(['\"]?)([^\"'<>]*)\\1](.*)\[\/smartpopup\]/sU";
-    $replacements[] = "<a href=\"javascript:openWithSelfMain('\\2', 'smartpopup', 700, 519);\">\\3</a>";
-    $ret = preg_replace($patterns, $replacements, $text);
-    return $ret;
+	$patterns[] = "/\[smartpopup=(['\"]?)([^\"'<>]*)\\1](.*)\[\/smartpopup\]/sU";
+	$replacements[] = "<a href=\"javascript:openWithSelfMain('\\2', 'smartpopup', 700, 519);\">\\3</a>";
+	$ret = preg_replace($patterns, $replacements, $text);
+	return $ret;
 }
 /**
- * Finds the width and height of an image (can also be a flash file)
- *
- * @credit phppp
- *
- * @var string $url path of the image file
- * @var string $width reference to the width
- * @var string $height reference to the height
- * @return bool false if impossible to find dimension
- */
+	 * Finds the width and height of an image (can also be a flash file)
+	 *
+	 * @credit phppp
+	 *
+	 * @var string $url path of the image file
+	 * @var string $width reference to the width
+	 * @var string $height reference to the height
+	 * @return bool false if impossible to find dimension
+	 */
 function smart_getImageSize($url, & $width, & $height) {
-    if (empty ($width) || empty ($height)) {
-        if (!$dimension = @ getimagesize($url)) {
-            return false;
-        }
-        if (!empty ($width)) {
-            $height = $dimension[1] * $width / $dimension[0];
-        }
-        elseif (!empty ($height)) {
-            $width = $dimension[0] * $height / $dimension[1];
-        } else {
-            list ($width, $height) = array (
-            $dimension[0],
-            $dimension[1]
-            );
-        }
-        return true;
-    } else {
-        return true;
-    }
+	if (empty ($width) || empty ($height)) {
+		if (!$dimension = @ getimagesize($url)) {
+			return false;
+		}
+		if (!empty ($width)) {
+			$height = $dimension[1] * $width / $dimension[0];
+		}
+		elseif (!empty ($height)) {
+			$width = $dimension[0] * $height / $dimension[1];
+		} else {
+			list ($width, $height) = array (
+			$dimension[0],
+			$dimension[1]
+			);
+		}
+		return true;
+	} else {
+		return true;
+	}
 }
 /**
- * Convert characters to decimal values
- *
- * @author eric.wallet at yahoo.fr
- * @link http://ca.php.net/manual/en/function.htmlentities.php#69913
- */
+	 * Convert characters to decimal values
+	 *
+	 * @author eric.wallet at yahoo.fr
+	 * @link http://ca.php.net/manual/en/function.htmlentities.php#69913
+	 */
 function smart_htmlnumericentities($str) {
-    return preg_replace('/[^!-%\x27-;=?-~ ]/e', '"&#".ord("$0").chr(59)', $str);
+	return preg_replace('/[^!-%\x27-;=?-~ ]/e', '"&#".ord("$0").chr(59)', $str);
 }
 function & smart_getcorehandler($name, $optional = false) {
-    static $handlers;
-    $name = strtolower(trim($name));
-    if (!isset ($handlers[$name])) {
-        if (file_exists($hnd_file = XOOPS_ROOT_PATH . '/kernel/' . $name . '.php')) {
-            require_once $hnd_file;
-        }
-        $class = 'Xoops' . ucfirst($name) . 'Handler';
-        if (class_exists($class)) {
-            $handlers[$name] = new $class ($GLOBALS['xoopsDB'], 'xoops');
-        }
-    }
-    if (!isset ($handlers[$name]) && !$optional) {
-        trigger_error('Class <b>' . $class . '</b> does not exist<br />Handler Name: ' . $name, E_USER_ERROR);
-    }
-    if (isset ($handlers[$name])) {
-        return $handlers[$name];
-    }
-    $inst = false;
+	static $handlers;
+	$name = strtolower(trim($name));
+	if (!isset ($handlers[$name])) {
+		if (file_exists($hnd_file = XOOPS_ROOT_PATH . '/kernel/' . $name . '.php')) {
+			require_once $hnd_file;
+		}
+		$class = 'Xoops' . ucfirst($name) . 'Handler';
+		if (class_exists($class)) {
+			$handlers[$name] = new $class ($GLOBALS['xoopsDB'], 'xoops');
+		}
+	}
+	if (!isset ($handlers[$name]) && !$optional) {
+		trigger_error('Class <b>' . $class . '</b> does not exist<br />Handler Name: ' . $name, E_USER_ERROR);
+	}
+	if (isset ($handlers[$name])) {
+		return $handlers[$name];
+	}
+	$inst = false;
 }
 function smart_sanitizeAdsenses_callback($matches) {
-    global $smartobject_adsense_handler;
-    if (isset($smartobject_adsense_handler->objects[$matches[1]])){
-        $adsenseObj = $smartobject_adsense_handler->objects[$matches[1]];
-        $ret = $adsenseObj->render();
-        return $ret;
-    } else {
-        return '';
-    }
+	global $smartobject_adsense_handler;
+	if (isset($smartobject_adsense_handler->objects[$matches[1]])){
+		$adsenseObj = $smartobject_adsense_handler->objects[$matches[1]];
+		$ret = $adsenseObj->render();
+		return $ret;
+	} else {
+		return '';
+	}
 }
 function smart_sanitizeAdsenses($text) {
 
-    $patterns = array ();
-    $replacements = array ();
+	$patterns = array ();
+	$replacements = array ();
 
-    $patterns[] = "/\[adsense](.*)\[\/adsense\]/sU";
-    $text = preg_replace_callback($patterns, 'smart_sanitizeAdsenses_callback', $text);
-    return $text;
+	$patterns[] = "/\[adsense](.*)\[\/adsense\]/sU";
+	$text = preg_replace_callback($patterns, 'smart_sanitizeAdsenses_callback', $text);
+	return $text;
 }
 function smart_sanitizeCustomtags_callback($matches) {
-    global $smartobject_customtag_handler;
-    if (isset($smartobject_customtag_handler->objects[$matches[1]])){
-        $customObj = $smartobject_customtag_handler->objects[$matches[1]];
-        $ret = $customObj->renderWithPhp();
-        return $ret;
-    } else {
-        return '';
-    }
+	global $smartobject_customtag_handler;
+	if (isset($smartobject_customtag_handler->objects[$matches[1]])){
+		$customObj = $smartobject_customtag_handler->objects[$matches[1]];
+		$ret = $customObj->renderWithPhp();
+		return $ret;
+	} else {
+		return '';
+	}
 }
 function smart_sanitizeCustomtags($text) {
-    $patterns = array ();
-    $replacements = array ();
+	$patterns = array ();
+	$replacements = array ();
 
-    $patterns[] = "/\[customtag](.*)\[\/customtag\]/sU";
-    $text = preg_replace_callback($patterns, 'smart_sanitizeCustomtags_callback', $text);
-    return $text;
+	$patterns[] = "/\[customtag](.*)\[\/customtag\]/sU";
+	$text = preg_replace_callback($patterns, 'smart_sanitizeCustomtags_callback', $text);
+	return $text;
 }
 
 function smart_loadLanguageFile($module, $file) {
-    global $xoopsConfig;
+	global $xoopsConfig;
 
-    $filename = XOOPS_ROOT_PATH . '/modules/' . $module . '/language/' . $xoopsConfig['language'] . '/' . $file . '.php';
-    if (!file_exists($filename)) {
-        $filename = XOOPS_ROOT_PATH . '/modules/' . $module . '/language/english/' . $file . '.php';
-    }
-    if (file_exists($filename)) {
-        include_once($filename);
-    }
+	$filename = XOOPS_ROOT_PATH . '/modules/' . $module . '/language/' . $xoopsConfig['language'] . '/' . $file . '.php';
+	if (!file_exists($filename)) {
+		$filename = XOOPS_ROOT_PATH . '/modules/' . $module . '/language/english/' . $file . '.php';
+	}
+	if (file_exists($filename)) {
+		include_once($filename);
+	}
 }
 
 function smart_loadCommonLanguageFile() {
-    smart_loadLanguageFile('smartobject', 'common');
+	smart_loadLanguageFile('smartobject', 'common');
 }
 
 function smart_purifyText($text, $keyword = false)
 {
-    global $myts;
-    $text = str_replace('&nbsp;', ' ', $text);
-    $text = str_replace('<br />', ' ', $text);
-    $text = str_replace('<br/>', ' ', $text);
-    $text = str_replace('<br', ' ', $text);
-    $text = strip_tags($text);
-    $text = html_entity_decode($text);
-    $text = $myts->undoHtmlSpecialChars($text);
-    $text = str_replace(')', ' ', $text);
-    $text = str_replace('(', ' ', $text);
-    $text = str_replace(':', ' ', $text);
-    $text = str_replace('&euro', ' euro ', $text);
-    $text = str_replace('&hellip', '...', $text);
-    $text = str_replace('&rsquo', ' ', $text);
-    $text = str_replace('!', ' ', $text);
-    $text = str_replace('?', ' ', $text);
-    $text = str_replace('"', ' ', $text);
-    $text = str_replace('-', ' ', $text);
-    $text = str_replace('\n', ' ', $text);
-    $text = str_replace('&#8213;', ' ', $text);
-
-    if ($keyword){
-        $text = str_replace('.', ' ', $text);
-        $text = str_replace(',', ' ', $text);
-        $text = str_replace('\'', ' ', $text);
-    }
-    $text = str_replace(';', ' ', $text);
-
-    return $text;
+	global $myts;
+	$text = str_replace('&nbsp;', ' ', $text);
+	$text = str_replace('<br />', ' ', $text);
+	$text = str_replace('<br/>', ' ', $text);
+	$text = str_replace('<br', ' ', $text);
+	$text = strip_tags($text);
+	$text = html_entity_decode($text);
+	$text = $myts->undoHtmlSpecialChars($text);
+	$text = str_replace(')', ' ', $text);
+	$text = str_replace('(', ' ', $text);
+	$text = str_replace(':', ' ', $text);
+	$text = str_replace('&euro', ' euro ', $text);
+	$text = str_replace('&hellip', '...', $text);
+	$text = str_replace('&rsquo', ' ', $text);
+	$text = str_replace('!', ' ', $text);
+	$text = str_replace('?', ' ', $text);
+	$text = str_replace('"', ' ', $text);
+	$text = str_replace('-', ' ', $text);
+	$text = str_replace('\n', ' ', $text);
+	$text = str_replace('&#8213;', ' ', $text);
+
+	if ($keyword){
+		$text = str_replace('.', ' ', $text);
+		$text = str_replace(',', ' ', $text);
+		$text = str_replace('\'', ' ', $text);
+	}
+	$text = str_replace(';', ' ', $text);
+
+	return $text;
 }
 
 function smart_html2text($document)
 {
-    // PHP Manual:: function preg_replace
-    // $document should contain an HTML document.
-    // This will remove HTML tags, javascript sections
-    // and white space. It will also convert some
-    // common HTML entities to their text equivalent.
-    // Credits : newbb2
-    $search = array ("'<script[^>]*?>.*?</script>'si",  // Strip out javascript
+	// PHP Manual:: function preg_replace
+	// $document should contain an HTML document.
+	// This will remove HTML tags, javascript sections
+	// and white space. It will also convert some
+	// common HTML entities to their text equivalent.
+	// Credits : newbb2
+	$search = array ("'<script[^>]*?>.*?</script>'si",  // Strip out javascript
 	"'<img.*?/>'si",       // Strip out img tags
 	"'<[\/\!]*?[^<>]*?>'si",          // Strip out HTML tags
 	"'([\r\n])[\s]+'",                // Strip out white space
@@ -863,7 +863,7 @@ 
 	"'&(copy|#169);'i",
 	"'&#(\d+);'e");                    // evaluate as php
 
-    $replace = array ("",
+	$replace = array ("",
 	"",
 	"",
 	"\\1",
@@ -872,14 +872,14 @@ 
 	"<",
 	">",
 	" ",
-    chr(161),
-    chr(162),
-    chr(163),
-    chr(169),
+	chr(161),
+	chr(162),
+	chr(163),
+	chr(169),
 	"chr(\\1)");
 
-    $text = preg_replace($search, $replace, $document);
-    return $text;
+	$text = preg_replace($search, $replace, $document);
+	return $text;
 }
 
 /**
@@ -889,91 +889,91 @@ 
  * This function should be able to cover almost all floats that appear in an european environment.
  */
 function smart_getfloat($str, $set=FALSE){
-    if(preg_match("/([0-9\.,-]+)/", $str, $match)) {
-        // Found number in $str, so set $str that number
-        $str = $match[0];
-        if(strstr($str, ',')){
-            // A comma exists, that makes it easy, cos we assume it separates the decimal part.
-            $str = str_replace('.', '', $str);    // Erase thousand seps
-            $str = str_replace(',', '.', $str);    // Convert , to . for floatval command
-            return floatval($str);
-        }else{
-            // No comma exists, so we have to decide, how a single dot shall be treated
-            if(preg_match("/^[0-9\-]*[\.]{1}[0-9-]+$/", $str) == TRUE && $set['single_dot_as_decimal'] == TRUE){
-                // Treat single dot as decimal separator
-
-                return floatval($str);
-            } else {//echo "str: ".$str; echo "ret: ".str_replace('.', '', $str); echo "<br/><br/> ";
-                // Else, treat all dots as thousand seps
-                $str = str_replace('.', '', $str);    // Erase thousand seps
-                return floatval($str);
-            }
-        }
-    }else{
-        // No number found, return zero
-        return 0;
-    }
+	if(preg_match("/([0-9\.,-]+)/", $str, $match)) {
+		// Found number in $str, so set $str that number
+		$str = $match[0];
+		if(strstr($str, ',')){
+			// A comma exists, that makes it easy, cos we assume it separates the decimal part.
+			$str = str_replace('.', '', $str);    // Erase thousand seps
+			$str = str_replace(',', '.', $str);    // Convert , to . for floatval command
+			return floatval($str);
+		}else{
+			// No comma exists, so we have to decide, how a single dot shall be treated
+			if(preg_match("/^[0-9\-]*[\.]{1}[0-9-]+$/", $str) == TRUE && $set['single_dot_as_decimal'] == TRUE){
+				// Treat single dot as decimal separator
+
+				return floatval($str);
+			} else {//echo "str: ".$str; echo "ret: ".str_replace('.', '', $str); echo "<br/><br/> ";
+				// Else, treat all dots as thousand seps
+				$str = str_replace('.', '', $str);    // Erase thousand seps
+				return floatval($str);
+			}
+		}
+	}else{
+		// No number found, return zero
+		return 0;
+	}
 }
 
 function smart_currency($var, $currencyObj=false) {
-    $ret = smart_getfloat($var,  array('single_dot_as_decimal'=> TRUE));
-    $ret = round($ret, 2);
-    // make sur we have at least .00 in the $var
-    $decimal_section_original = strstr($ret, '.');
-    $decimal_section = $decimal_section_original;
-    if ($decimal_section) {
-        if (strlen($decimal_section) == 1) {
-            $decimal_section = '.00';
-        } elseif(strlen($decimal_section) == 2) {
-            $decimal_section = $decimal_section . '0';
-        }
-        $ret = str_replace($decimal_section_original, $decimal_section, $ret);
-    } else {
-        $ret = $ret . '.00';
-    }
-    if ($currencyObj) {
-        $ret = $ret . ' ' . $currencyObj->getCode();
-    }
+	$ret = smart_getfloat($var,  array('single_dot_as_decimal'=> TRUE));
+	$ret = round($ret, 2);
+	// make sur we have at least .00 in the $var
+	$decimal_section_original = strstr($ret, '.');
+	$decimal_section = $decimal_section_original;
+	if ($decimal_section) {
+		if (strlen($decimal_section) == 1) {
+			$decimal_section = '.00';
+		} elseif(strlen($decimal_section) == 2) {
+			$decimal_section = $decimal_section . '0';
+		}
+		$ret = str_replace($decimal_section_original, $decimal_section, $ret);
+	} else {
+		$ret = $ret . '.00';
+	}
+	if ($currencyObj) {
+		$ret = $ret . ' ' . $currencyObj->getCode();
+	}
    	return $ret;
 }
 
 function smart_float($var) {
-    return smart_currency($var);
+	return smart_currency($var);
 }
 
 function smart_getModuleAdminLink($moduleName=false) {
-    global $xoopsModule;
-    if (!$moduleName && (isset ($xoopsModule) && is_object($xoopsModule))) {
-        $moduleName = $xoopsModule->getVar('dirname');
-    }
-    $ret = '';
-    if ($moduleName) {
-        $ret = "<a href='" . XOOPS_URL . "/modules/$moduleName/admin/index.php'>" ._CO_SOBJECT_ADMIN_PAGE . "</a>";
-    }
-    return $ret;
+	global $xoopsModule;
+	if (!$moduleName && (isset ($xoopsModule) && is_object($xoopsModule))) {
+		$moduleName = $xoopsModule->getVar('dirname');
+	}
+	$ret = '';
+	if ($moduleName) {
+		$ret = "<a href='" . XOOPS_URL . "/modules/$moduleName/admin/index.php'>" ._CO_SOBJECT_ADMIN_PAGE . "</a>";
+	}
+	return $ret;
 }
 
 function smart_getEditors() {
-    $filename = XOOPS_ROOT_PATH . '/class/xoopseditor/xoopseditor.php';
-    if (!file_exists($filename)) {
-        return false;
-    }
-    include_once $filename;
-    $xoopseditor_handler = XoopsEditorHandler::getInstance();
-    $aList = $xoopseditor_handler->getList();
-    $ret = array();
-    foreach($aList as $k=>$v) {
-        $ret[$v] = $k;
-    }
-    return $ret;
+	$filename = XOOPS_ROOT_PATH . '/class/xoopseditor/xoopseditor.php';
+	if (!file_exists($filename)) {
+		return false;
+	}
+	include_once $filename;
+	$xoopseditor_handler = XoopsEditorHandler::getInstance();
+	$aList = $xoopseditor_handler->getList();
+	$ret = array();
+	foreach($aList as $k=>$v) {
+		$ret[$v] = $k;
+	}
+	return $ret;
 }
 
 function smart_getTablesArray($moduleName, $items) {
-    $ret = array();
-    foreach ($items as $item) {
-        $ret[] = $moduleName . '_' . $item;
-    }
-    $ret[] = $moduleName . '_meta';
-    return $ret;
+	$ret = array();
+	foreach ($items as $item) {
+		$ret[] = $moduleName . '_' . $item;
+	}
+	$ret[] = $moduleName . '_meta';
+	return $ret;
 }
 ?>
\ No newline at end of file

Spacing +40 added lines, -40 removed lines

@@ -155,7 +155,7 @@ 
     //Verifies that a MySQL table exists
     $xoopsDB = & XoopsDatabaseFactory::getDatabaseConnection();
     $realname = $xoopsDB->prefix($table);
-    $sql = "SHOW TABLES FROM ".XOOPS_DB_NAME;
+    $sql = "SHOW TABLES FROM " . XOOPS_DB_NAME;
     $ret = $xoopsDB->queryF($sql);
     while (list ($m_table) = $xoopsDB->fetchRow($ret)) {
         if ($m_table == $realname) {
@@ -237,7 +237,7 @@ 
     // truncate the original string to a length of $length
     // minus the position of the last space
     // plus the length of the $trimmarker
-    $truncated_string = xoops_substr($str, $start, $length - $position_of_space +strlen($trimmarker), $trimmarker);
+    $truncated_string = xoops_substr($str, $start, $length - $position_of_space + strlen($trimmarker), $trimmarker);
     return $truncated_string;
 }
 function smart_getConfig($key, $moduleName = false, $default = 'default_is_undefined') {
@@ -339,7 +339,7 @@ 
         }
         $attr = " width='$width' height='$height'";
     }
-    return array (
+    return array(
     $width,
     $height,
     $type,
@@ -349,7 +349,7 @@ 
 function &smart_getModuleInfo($moduleName = false) {
     static $smartModules;
     if (isset ($smartModules[$moduleName])) {
-        $ret =& $smartModules[$moduleName];
+        $ret = & $smartModules[$moduleName];
         return $ret;
     }
     global $xoopsModule;
@@ -411,7 +411,7 @@ 
         return unlink($dirname);
     }
 }
-function smart_formatErrors($errors = array ()) {
+function smart_formatErrors($errors = array()) {
     $ret = '';
     foreach ($errors as $key => $value) {
         $ret .= "<br /> - " . $value;
@@ -425,13 +425,13 @@ 
  * @param integer $name :  0 Use Usenamer 1 Use realname
  * @return
  */
-function smart_getLinkedUnameFromId($userid = 0, $name = 0, $users = array (), $withContact = false) {
+function smart_getLinkedUnameFromId($userid = 0, $name = 0, $users = array(), $withContact = false) {
     if (!is_numeric($userid)) {
         return $userid;
     }
     $userid = intval($userid);
     if ($userid > 0) {
-        if ($users == array ()) {
+        if ($users == array()) {
             //fetching users
             $member_handler = & xoops_gethandler('member');
             $user = & $member_handler->getUser($userid);
@@ -482,7 +482,7 @@ 
     $adminmenu = array();
     include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/menu.php';
     $tpl = new XoopsTpl();
-    $tpl->assign(array (
+    $tpl->assign(array(
         'headermenu' => $headermenu,
         'adminmenu' => $adminmenu,
         'current' => $currentoption,
@@ -587,7 +587,7 @@ 
         $querystring = '?' . $querystring;
     }
     $currenturl = $http . $httphost . $phpself . $querystring;
-    $urls = array ();
+    $urls = array();
     $urls['http'] = $http;
     $urls['httphost'] = $httphost;
     $urls['phpself'] = $phpself;
@@ -714,7 +714,7 @@ 
         elseif (!empty ($height)) {
             $width = $dimension[0] * $height / $dimension[1];
         } else {
-            list ($width, $height) = array (
+            list ($width, $height) = array(
             $dimension[0],
             $dimension[1]
             );
@@ -742,7 +742,7 @@ 
         }
         $class = 'Xoops' . ucfirst($name) . 'Handler';
         if (class_exists($class)) {
-            $handlers[$name] = new $class ($GLOBALS['xoopsDB'], 'xoops');
+            $handlers[$name] = new $class($GLOBALS['xoopsDB'], 'xoops');
         }
     }
     if (!isset ($handlers[$name]) && !$optional) {
@@ -755,7 +755,7 @@ 
 }
 function smart_sanitizeAdsenses_callback($matches) {
     global $smartobject_adsense_handler;
-    if (isset($smartobject_adsense_handler->objects[$matches[1]])){
+    if (isset($smartobject_adsense_handler->objects[$matches[1]])) {
         $adsenseObj = $smartobject_adsense_handler->objects[$matches[1]];
         $ret = $adsenseObj->render();
         return $ret;
@@ -765,8 +765,8 @@ 
 }
 function smart_sanitizeAdsenses($text) {
 
-    $patterns = array ();
-    $replacements = array ();
+    $patterns = array();
+    $replacements = array();
 
     $patterns[] = "/\[adsense](.*)\[\/adsense\]/sU";
     $text = preg_replace_callback($patterns, 'smart_sanitizeAdsenses_callback', $text);
@@ -774,7 +774,7 @@ 
 }
 function smart_sanitizeCustomtags_callback($matches) {
     global $smartobject_customtag_handler;
-    if (isset($smartobject_customtag_handler->objects[$matches[1]])){
+    if (isset($smartobject_customtag_handler->objects[$matches[1]])) {
         $customObj = $smartobject_customtag_handler->objects[$matches[1]];
         $ret = $customObj->renderWithPhp();
         return $ret;
@@ -783,8 +783,8 @@ 
     }
 }
 function smart_sanitizeCustomtags($text) {
-    $patterns = array ();
-    $replacements = array ();
+    $patterns = array();
+    $replacements = array();
 
     $patterns[] = "/\[customtag](.*)\[\/customtag\]/sU";
     $text = preg_replace_callback($patterns, 'smart_sanitizeCustomtags_callback', $text);
@@ -830,7 +830,7 @@ 
     $text = str_replace('\n', ' ', $text);
     $text = str_replace('&#8213;', ' ', $text);
 
-    if ($keyword){
+    if ($keyword) {
         $text = str_replace('.', ' ', $text);
         $text = str_replace(',', ' ', $text);
         $text = str_replace('\'', ' ', $text);
@@ -848,11 +848,11 @@ 
     // and white space. It will also convert some
     // common HTML entities to their text equivalent.
     // Credits : newbb2
-    $search = array ("'<script[^>]*?>.*?</script>'si",  // Strip out javascript
-	"'<img.*?/>'si",       // Strip out img tags
-	"'<[\/\!]*?[^<>]*?>'si",          // Strip out HTML tags
-	"'([\r\n])[\s]+'",                // Strip out white space
-	"'&(quot|#34);'i",                // Replace HTML entities
+    $search = array("'<script[^>]*?>.*?</script>'si", // Strip out javascript
+	"'<img.*?/>'si", // Strip out img tags
+	"'<[\/\!]*?[^<>]*?>'si", // Strip out HTML tags
+	"'([\r\n])[\s]+'", // Strip out white space
+	"'&(quot|#34);'i", // Replace HTML entities
 	"'&(amp|#38);'i",
 	"'&(lt|#60);'i",
 	"'&(gt|#62);'i",
@@ -861,9 +861,9 @@ 
 	"'&(cent|#162);'i",
 	"'&(pound|#163);'i",
 	"'&(copy|#169);'i",
-	"'&#(\d+);'e");                    // evaluate as php
+	"'&#(\d+);'e"); // evaluate as php
 
-    $replace = array ("",
+    $replace = array("",
 	"",
 	"",
 	"\\1",
@@ -888,35 +888,35 @@ 
  * Use this snippet to extract any float out of a string. You can choose how a single dot is treated with the (bool) 'single_dot_as_decimal' directive.
  * This function should be able to cover almost all floats that appear in an european environment.
  */
-function smart_getfloat($str, $set=FALSE){
-    if(preg_match("/([0-9\.,-]+)/", $str, $match)) {
+function smart_getfloat($str, $set = FALSE) {
+    if (preg_match("/([0-9\.,-]+)/", $str, $match)) {
         // Found number in $str, so set $str that number
         $str = $match[0];
-        if(strstr($str, ',')){
+        if (strstr($str, ',')) {
             // A comma exists, that makes it easy, cos we assume it separates the decimal part.
-            $str = str_replace('.', '', $str);    // Erase thousand seps
-            $str = str_replace(',', '.', $str);    // Convert , to . for floatval command
+            $str = str_replace('.', '', $str); // Erase thousand seps
+            $str = str_replace(',', '.', $str); // Convert , to . for floatval command
             return floatval($str);
-        }else{
+        } else {
             // No comma exists, so we have to decide, how a single dot shall be treated
-            if(preg_match("/^[0-9\-]*[\.]{1}[0-9-]+$/", $str) == TRUE && $set['single_dot_as_decimal'] == TRUE){
+            if (preg_match("/^[0-9\-]*[\.]{1}[0-9-]+$/", $str) == TRUE && $set['single_dot_as_decimal'] == TRUE) {
                 // Treat single dot as decimal separator
 
                 return floatval($str);
             } else {//echo "str: ".$str; echo "ret: ".str_replace('.', '', $str); echo "<br/><br/> ";
                 // Else, treat all dots as thousand seps
-                $str = str_replace('.', '', $str);    // Erase thousand seps
+                $str = str_replace('.', '', $str); // Erase thousand seps
                 return floatval($str);
             }
         }
-    }else{
+    } else {
         // No number found, return zero
         return 0;
     }
 }
 
-function smart_currency($var, $currencyObj=false) {
-    $ret = smart_getfloat($var,  array('single_dot_as_decimal'=> TRUE));
+function smart_currency($var, $currencyObj = false) {
+    $ret = smart_getfloat($var, array('single_dot_as_decimal'=> TRUE));
     $ret = round($ret, 2);
     // make sur we have at least .00 in the $var
     $decimal_section_original = strstr($ret, '.');
@@ -924,7 +924,7 @@ 
     if ($decimal_section) {
         if (strlen($decimal_section) == 1) {
             $decimal_section = '.00';
-        } elseif(strlen($decimal_section) == 2) {
+        } elseif (strlen($decimal_section) == 2) {
             $decimal_section = $decimal_section . '0';
         }
         $ret = str_replace($decimal_section_original, $decimal_section, $ret);
@@ -941,14 +941,14 @@ 
     return smart_currency($var);
 }
 
-function smart_getModuleAdminLink($moduleName=false) {
+function smart_getModuleAdminLink($moduleName = false) {
     global $xoopsModule;
     if (!$moduleName && (isset ($xoopsModule) && is_object($xoopsModule))) {
         $moduleName = $xoopsModule->getVar('dirname');
     }
     $ret = '';
     if ($moduleName) {
-        $ret = "<a href='" . XOOPS_URL . "/modules/$moduleName/admin/index.php'>" ._CO_SOBJECT_ADMIN_PAGE . "</a>";
+        $ret = "<a href='" . XOOPS_URL . "/modules/$moduleName/admin/index.php'>" . _CO_SOBJECT_ADMIN_PAGE . "</a>";
     }
     return $ret;
 }
@@ -962,7 +962,7 @@ 
     $xoopseditor_handler = XoopsEditorHandler::getInstance();
     $aList = $xoopseditor_handler->getList();
     $ret = array();
-    foreach($aList as $k=>$v) {
+    foreach ($aList as $k=>$v) {
         $ret[$v] = $k;
     }
     return $ret;

Braces +3 added lines, -4 removed lines

@@ -710,8 +710,7 @@ 
         }
         if (!empty ($width)) {
             $height = $dimension[1] * $width / $dimension[0];
-        }
-        elseif (!empty ($height)) {
+        } elseif (!empty ($height)) {
             $width = $dimension[0] * $height / $dimension[1];
         } else {
             list ($width, $height) = array (
@@ -897,7 +896,7 @@ 
             $str = str_replace('.', '', $str);    // Erase thousand seps
             $str = str_replace(',', '.', $str);    // Convert , to . for floatval command
             return floatval($str);
-        }else{
+        } else{
             // No comma exists, so we have to decide, how a single dot shall be treated
             if(preg_match("/^[0-9\-]*[\.]{1}[0-9-]+$/", $str) == TRUE && $set['single_dot_as_decimal'] == TRUE){
                 // Treat single dot as decimal separator
@@ -909,7 +908,7 @@ 
                 return floatval($str);
             }
         }
-    }else{
+    } else{
         // No number found, return zero
         return 0;
     }

admin/update.php

Indentation +96 added lines, -96 removed lines

@@ -23,18 +23,18 @@ 
 	$dbupdater = new WfdownloadsDbupdater();
 
 	if (!wfdownloads_TableExists('wfdownloads_meta')) {
-	    // Create table wfdownloads_meta
-        $table = new WfdownloadsTable('wfdownloads_meta');
-        $table->setStructure(	"CREATE TABLE %s (
+		// Create table wfdownloads_meta
+		$table = new WfdownloadsTable('wfdownloads_meta');
+		$table->setStructure(	"CREATE TABLE %s (
         						metakey varchar(50) NOT NULL default '',
         						metavalue varchar(255) NOT NULL default '',
         						PRIMARY KEY (metakey))
         						ENGINE=MyISAM;");
 
-        $table->setData(sprintf("'version', %s", round($GLOBALS['xoopsModule']->getVar('version') / 100, 2)));
-        if ($dbupdater->updateTable($table)) {
-            echo "wfdownloads_meta table created<br />";
-        }
+		$table->setData(sprintf("'version', %s", round($GLOBALS['xoopsModule']->getVar('version') / 100, 2)));
+		if ($dbupdater->updateTable($table)) {
+			echo "wfdownloads_meta table created<br />";
+		}
 	}
 
 	$download_fields = array(
@@ -85,11 +85,11 @@ 
 	$download_table = new WfdownloadsTable("wfdownloads_downloads");
 	$fields = get_table_info($download_handler->table, $download_fields);
 	// Check for renamed fields
-    rename_fields($download_table, $renamed_fields, $fields, $download_fields);
+	rename_fields($download_table, $renamed_fields, $fields, $download_fields);
 	update_table($download_fields, $fields, $download_table);
-    if ($dbupdater->updateTable($download_table)) {
-        echo "Downloads table updated<br />";
-    }
+	if ($dbupdater->updateTable($download_table)) {
+		echo "Downloads table updated<br />";
+	}
 	unset($fields);
 
 	$mod_fields = array(
@@ -143,7 +143,7 @@ 
 	rename_fields($mod_table, $renamed_fields, $fields, $mod_fields);
 	update_table($mod_fields, $fields, $mod_table);
 	if ($dbupdater->updateTable($mod_table)) {
-	    echo "Modified Downloads table updated <br />";
+		echo "Modified Downloads table updated <br />";
 	}
 	unset($fields);
 
@@ -171,7 +171,7 @@ 
 	$fields = get_table_info($cat_handler->table, $cat_fields);
 	update_table($cat_fields, $fields, $cat_table);
 	if ($dbupdater->updateTable($cat_table)) {
-	    echo "Category table updated<br />";
+		echo "Category table updated<br />";
 	}
 	unset($fields);
 
@@ -190,7 +190,7 @@ 
 	$fields = get_table_info($broken_handler->table, $broken_fields);
 	update_table($broken_fields, $fields, $broken_table);
 	if ($dbupdater->updateTable($broken_table)) {
-	    echo "Broken Reports table updated<br />";
+		echo "Broken Reports table updated<br />";
 	}
 	unset($fields);
 }
@@ -202,31 +202,31 @@ 
 // =========================================================================================
 function invert_nohtm_dohtml_values()
 {
-    $ret = array();
+	$ret = array();
 	global $xoopsDB;
 	$cat_handler = xoops_getmodulehandler('category', 'wfdownloads');
 	$result = $xoopsDB->query("SHOW COLUMNS FROM ".$cat_handler->table);
 	while ($existing_field = $xoopsDB->fetchArray($result)) {
-	     $fields[$existing_field['field']] = $existing_field['type'];
+		 $fields[$existing_field['field']] = $existing_field['type'];
 	}
 	if (in_array("nohtml", array_keys($fields))) {
-	    $dbupdater = new WfdownloadsDbupdater();
+		$dbupdater = new WfdownloadsDbupdater();
 	   //Invert column values
-	    // alter options in wfdownloads_cat
-        $table = new WfdownloadsTable('wfdownloads_cat');
-        $table->addAlteredField('nohtml', "dohtml tinyint(1) NOT NULL DEFAULT '1'");
-        $table->addAlteredField('nosmiley', "dosmiley tinyint(1) NOT NULL DEFAULT '1'");
-        $table->addAlteredField('noxcodes', "doxcode tinyint(1) NOT NULL DEFAULT '1'");
-        $table->addAlteredField('noimages', "doimage tinyint(1) NOT NULL DEFAULT '1'");
-        $table->addAlteredField('nobreak', "dobr tinyint(1) NOT NULL DEFAULT '1'");
+		// alter options in wfdownloads_cat
+		$table = new WfdownloadsTable('wfdownloads_cat');
+		$table->addAlteredField('nohtml', "dohtml tinyint(1) NOT NULL DEFAULT '1'");
+		$table->addAlteredField('nosmiley', "dosmiley tinyint(1) NOT NULL DEFAULT '1'");
+		$table->addAlteredField('noxcodes', "doxcode tinyint(1) NOT NULL DEFAULT '1'");
+		$table->addAlteredField('noimages', "doimage tinyint(1) NOT NULL DEFAULT '1'");
+		$table->addAlteredField('nobreak', "dobr tinyint(1) NOT NULL DEFAULT '1'");
 
-        //inverting values no=1 <=> do=0
-        // have to store teporarly as value = 2 to
-        // avoid putting everithing to same value
-        // if you change 1 to 0, then 0 to one,
-        // every value will be 1, follow me?
-        $table->addUpdatedWhere('dohtml', 2,'=1');
-        $table->addUpdatedWhere('dohtml', 1,'=0');
+		//inverting values no=1 <=> do=0
+		// have to store teporarly as value = 2 to
+		// avoid putting everithing to same value
+		// if you change 1 to 0, then 0 to one,
+		// every value will be 1, follow me?
+		$table->addUpdatedWhere('dohtml', 2,'=1');
+		$table->addUpdatedWhere('dohtml', 1,'=0');
 		$table->addUpdatedWhere('dohtml', 0,'=2');
 
 		$table->addUpdatedWhere('dosmiley', 2,'=1');
@@ -254,22 +254,22 @@ 
  * @return void
  */
 function update_table($new_fields, $existing_fields, &$table) {
-    foreach ($new_fields as $field => $fieldinfo) {
-	    $type = $fieldinfo["Type"];
-	    if (!in_array($field, array_keys($existing_fields) ) ) {
-	       //Add field as it is missing
-	       $table->addNewField($field, $type);
-	       //$xoopsDB->query("ALTER TABLE ".$table." ADD ".$field." ".$type);
-	       //echo $field."(".$type.") <FONT COLOR='##22DD51'>Added</FONT><br />";
+	foreach ($new_fields as $field => $fieldinfo) {
+		$type = $fieldinfo["Type"];
+		if (!in_array($field, array_keys($existing_fields) ) ) {
+		   //Add field as it is missing
+		   $table->addNewField($field, $type);
+		   //$xoopsDB->query("ALTER TABLE ".$table." ADD ".$field." ".$type);
+		   //echo $field."(".$type.") <FONT COLOR='##22DD51'>Added</FONT><br />";
 	   }
 	   elseif ($existing_fields[$field] != $type) {
-	       $table->addAlteredField($field, $field." ".$type);
-	       // check $fields[$field]['type'] for things like "int(10) unsigned"
-	       //$xoopsDB->query("ALTER TABLE ".$table." CHANGE ".$field." ".$field." ".$type);
-	       //echo $field." <FONT COLOR='#FF6600'>Changed to</FONT> ".$type."<br />";
+		   $table->addAlteredField($field, $field." ".$type);
+		   // check $fields[$field]['type'] for things like "int(10) unsigned"
+		   //$xoopsDB->query("ALTER TABLE ".$table." CHANGE ".$field." ".$field." ".$type);
+		   //echo $field." <FONT COLOR='#FF6600'>Changed to</FONT> ".$type."<br />";
 	   }
 	   else {
-	       //echo $field." <FONT COLOR='#0033FF'>Uptodate</FONT><br />";
+		   //echo $field." <FONT COLOR='#0033FF'>Uptodate</FONT><br />";
 	   }
 	}
 }
@@ -283,19 +283,19 @@ 
  * @return array
  */
 function get_table_info($table, $default_fields) {
-    global $xoopsDB;
+	global $xoopsDB;
 	$result = $xoopsDB->query("SHOW COLUMNS FROM ".$table);
 	while ($existing_field = $xoopsDB->fetchArray($result)) {
-	     $fields[$existing_field['Field']] = $existing_field['Type'];
-	     if ($existing_field['Null'] != "YES") {
-	         $fields[$existing_field['Field']] .= " NOT NULL";
-	     }
-	     if ($existing_field['Extra']) {
-	         $fields[$existing_field['Field']] .= " ".$existing_field['Extra'];
-	     }
-	     if ($default_fields[$existing_field['Field']]['Default']) {
-	         $fields[$existing_field['Field']] .= " default '".$existing_field['Default']."'";
-	     }
+		 $fields[$existing_field['Field']] = $existing_field['Type'];
+		 if ($existing_field['Null'] != "YES") {
+			 $fields[$existing_field['Field']] .= " NOT NULL";
+		 }
+		 if ($existing_field['Extra']) {
+			 $fields[$existing_field['Field']] .= " ".$existing_field['Extra'];
+		 }
+		 if ($default_fields[$existing_field['Field']]['Default']) {
+			 $fields[$existing_field['Field']] .= " default '".$existing_field['Default']."'";
+		 }
 	}
 	return $fields;
 }
@@ -310,59 +310,59 @@ 
  * @return array
  */
 function rename_fields(&$table, $renamed_fields, &$fields, $new_fields) {
-    foreach (array_keys($fields) as $field) {
-	    if (in_array($field, array_keys($renamed_fields))) {
-	        $new_field_name = $renamed_fields[$field];
-	        $new_field_type = $new_fields[$new_field_name]["Type"];
-	        $table->addAltered($field, $new_field_name." ".$new_field_type);
-	        //$xoopsDB->query("ALTER TABLE ".$table." CHANGE ".$field." ".$new_field_name." ".$new_field_type);
-	        //echo $field." Renamed to ".$new_field_name."<br />";
-	        $fields[$new_field_name] = $new_field_type;
-	    }
+	foreach (array_keys($fields) as $field) {
+		if (in_array($field, array_keys($renamed_fields))) {
+			$new_field_name = $renamed_fields[$field];
+			$new_field_type = $new_fields[$new_field_name]["Type"];
+			$table->addAltered($field, $new_field_name." ".$new_field_type);
+			//$xoopsDB->query("ALTER TABLE ".$table." CHANGE ".$field." ".$new_field_name." ".$new_field_type);
+			//echo $field." Renamed to ".$new_field_name."<br />";
+			$fields[$new_field_name] = $new_field_type;
+		}
 	}
 	//return $fields;
 }
 
 $op = isset($_REQUEST['op']) ? intval($_REQUEST['op']) : 0;
 switch ($op) {
-    case 1:
-        // Make sure that nohtml is properly changed to dohtml
-        invert_nohtm_dohtml_values();
-        // Ensure that the proper tables are present
-        update_tables_to_300();
-        // Import data from MyDownloads
-        import_mydownloads_to_wfdownloads();
-        break;
+	case 1:
+		// Make sure that nohtml is properly changed to dohtml
+		invert_nohtm_dohtml_values();
+		// Ensure that the proper tables are present
+		update_tables_to_300();
+		// Import data from MyDownloads
+		import_mydownloads_to_wfdownloads();
+		break;
 
-    case 2:
-        // Update WF-Downloads
-        $log = invert_nohtm_dohtml_values();
-        update_tables_to_300();
-        break;
+	case 2:
+		// Update WF-Downloads
+		$log = invert_nohtm_dohtml_values();
+		update_tables_to_300();
+		break;
 
-    default:
-        //ask what to do
-        include XOOPS_ROOT_PATH."/class/xoopsformloader.php";
-        $form = new XoopsThemeForm('Upgrade WF-Downloads',"form", $_SERVER['REQUEST_URI']);
+	default:
+		//ask what to do
+		include XOOPS_ROOT_PATH."/class/xoopsformloader.php";
+		$form = new XoopsThemeForm('Upgrade WF-Downloads',"form", $_SERVER['REQUEST_URI']);
 
-        //Is MyDownloads installed?
-        $module_handler = xoops_gethandler('module');
-        $mydownloadsModule = $module_handler->getByDirname("mydownloads");
-        if (is_object($mydownloadsModule)) {
-            $mydownloadsButton = new XoopsFormButton("Import data from MyDownloads", "myd_button", "Import", "submit");
-            $mydownloadsButton->setExtra("onclick='document.forms.form.op.value=\"1\"'");
-            $form->addElement($mydownloadsButton);
-        }
+		//Is MyDownloads installed?
+		$module_handler = xoops_gethandler('module');
+		$mydownloadsModule = $module_handler->getByDirname("mydownloads");
+		if (is_object($mydownloadsModule)) {
+			$mydownloadsButton = new XoopsFormButton("Import data from MyDownloads", "myd_button", "Import", "submit");
+			$mydownloadsButton->setExtra("onclick='document.forms.form.op.value=\"1\"'");
+			$form->addElement($mydownloadsButton);
+		}
 
-        if (!wfdownloads_TableExists('wfdownloads_meta')) {
-            $updateButton = new XoopsFormButton("Update WF-Downloads", "upd_button", "Update", "submit");
-            $updateButton->setExtra("onclick='document.forms.form.op.value=\"2\"'");
-            $form->addElement($updateButton);
-        }
+		if (!wfdownloads_TableExists('wfdownloads_meta')) {
+			$updateButton = new XoopsFormButton("Update WF-Downloads", "upd_button", "Update", "submit");
+			$updateButton->setExtra("onclick='document.forms.form.op.value=\"2\"'");
+			$form->addElement($updateButton);
+		}
 
-        $form->addElement(new XoopsFormHidden('op', 0));
-        $form->display();
-        break;
+		$form->addElement(new XoopsFormHidden('op', 0));
+		$form->display();
+		break;
 }
 //wfdownloads_modFooter();
 //xoops_cp_footer();

Spacing +22 added lines, -22 removed lines

@@ -25,7 +25,7 @@ 
 	if (!wfdownloads_TableExists('wfdownloads_meta')) {
 	    // Create table wfdownloads_meta
         $table = new WfdownloadsTable('wfdownloads_meta');
-        $table->setStructure(	"CREATE TABLE %s (
+        $table->setStructure("CREATE TABLE %s (
         						metakey varchar(50) NOT NULL default '',
         						metavalue varchar(255) NOT NULL default '',
         						PRIMARY KEY (metakey))
@@ -205,7 +205,7 @@ 
     $ret = array();
 	global $xoopsDB;
 	$cat_handler = xoops_getmodulehandler('category', 'wfdownloads');
-	$result = $xoopsDB->query("SHOW COLUMNS FROM ".$cat_handler->table);
+	$result = $xoopsDB->query("SHOW COLUMNS FROM " . $cat_handler->table);
 	while ($existing_field = $xoopsDB->fetchArray($result)) {
 	     $fields[$existing_field['field']] = $existing_field['type'];
 	}
@@ -225,21 +225,21 @@ 
         // avoid putting everithing to same value
         // if you change 1 to 0, then 0 to one,
         // every value will be 1, follow me?
-        $table->addUpdatedWhere('dohtml', 2,'=1');
-        $table->addUpdatedWhere('dohtml', 1,'=0');
-		$table->addUpdatedWhere('dohtml', 0,'=2');
+        $table->addUpdatedWhere('dohtml', 2, '=1');
+        $table->addUpdatedWhere('dohtml', 1, '=0');
+		$table->addUpdatedWhere('dohtml', 0, '=2');
 
-		$table->addUpdatedWhere('dosmiley', 2,'=1');
-		$table->addUpdatedWhere('dosmiley', 1,'=0');
-		$table->addUpdatedWhere('dosmiley', 0,'=2');
+		$table->addUpdatedWhere('dosmiley', 2, '=1');
+		$table->addUpdatedWhere('dosmiley', 1, '=0');
+		$table->addUpdatedWhere('dosmiley', 0, '=2');
 
-		$table->addUpdatedWhere('doxcode', 2,'=1');
-		$table->addUpdatedWhere('doxcode', 1,'=0');
-		$table->addUpdatedWhere('doxcode', 0,'=2');
+		$table->addUpdatedWhere('doxcode', 2, '=1');
+		$table->addUpdatedWhere('doxcode', 1, '=0');
+		$table->addUpdatedWhere('doxcode', 0, '=2');
 
-		$table->addUpdatedWhere('doimage', 2,'=1');
-		$table->addUpdatedWhere('doimage', 1,'=0');
-		$table->addUpdatedWhere('doimage', 0,'=2');
+		$table->addUpdatedWhere('doimage', 2, '=1');
+		$table->addUpdatedWhere('doimage', 1, '=0');
+		$table->addUpdatedWhere('doimage', 0, '=2');
 		$ret = $dbupdater->updateTable($table);
 	}
 	return $ret;
@@ -256,14 +256,14 @@ 
 function update_table($new_fields, $existing_fields, &$table) {
     foreach ($new_fields as $field => $fieldinfo) {
 	    $type = $fieldinfo["Type"];
-	    if (!in_array($field, array_keys($existing_fields) ) ) {
+	    if (!in_array($field, array_keys($existing_fields))) {
 	       //Add field as it is missing
 	       $table->addNewField($field, $type);
 	       //$xoopsDB->query("ALTER TABLE ".$table." ADD ".$field." ".$type);
 	       //echo $field."(".$type.") <FONT COLOR='##22DD51'>Added</FONT><br />";
 	   }
 	   elseif ($existing_fields[$field] != $type) {
-	       $table->addAlteredField($field, $field." ".$type);
+	       $table->addAlteredField($field, $field . " " . $type);
 	       // check $fields[$field]['type'] for things like "int(10) unsigned"
 	       //$xoopsDB->query("ALTER TABLE ".$table." CHANGE ".$field." ".$field." ".$type);
 	       //echo $field." <FONT COLOR='#FF6600'>Changed to</FONT> ".$type."<br />";
@@ -284,17 +284,17 @@ 
  */
 function get_table_info($table, $default_fields) {
     global $xoopsDB;
-	$result = $xoopsDB->query("SHOW COLUMNS FROM ".$table);
+	$result = $xoopsDB->query("SHOW COLUMNS FROM " . $table);
 	while ($existing_field = $xoopsDB->fetchArray($result)) {
 	     $fields[$existing_field['Field']] = $existing_field['Type'];
 	     if ($existing_field['Null'] != "YES") {
 	         $fields[$existing_field['Field']] .= " NOT NULL";
 	     }
 	     if ($existing_field['Extra']) {
-	         $fields[$existing_field['Field']] .= " ".$existing_field['Extra'];
+	         $fields[$existing_field['Field']] .= " " . $existing_field['Extra'];
 	     }
 	     if ($default_fields[$existing_field['Field']]['Default']) {
-	         $fields[$existing_field['Field']] .= " default '".$existing_field['Default']."'";
+	         $fields[$existing_field['Field']] .= " default '" . $existing_field['Default'] . "'";
 	     }
 	}
 	return $fields;
@@ -314,7 +314,7 @@ 
 	    if (in_array($field, array_keys($renamed_fields))) {
 	        $new_field_name = $renamed_fields[$field];
 	        $new_field_type = $new_fields[$new_field_name]["Type"];
-	        $table->addAltered($field, $new_field_name." ".$new_field_type);
+	        $table->addAltered($field, $new_field_name . " " . $new_field_type);
 	        //$xoopsDB->query("ALTER TABLE ".$table." CHANGE ".$field." ".$new_field_name." ".$new_field_type);
 	        //echo $field." Renamed to ".$new_field_name."<br />";
 	        $fields[$new_field_name] = $new_field_type;
@@ -342,8 +342,8 @@ 
 
     default:
         //ask what to do
-        include XOOPS_ROOT_PATH."/class/xoopsformloader.php";
-        $form = new XoopsThemeForm('Upgrade WF-Downloads',"form", $_SERVER['REQUEST_URI']);
+        include XOOPS_ROOT_PATH . "/class/xoopsformloader.php";
+        $form = new XoopsThemeForm('Upgrade WF-Downloads', "form", $_SERVER['REQUEST_URI']);
 
         //Is MyDownloads installed?
         $module_handler = xoops_gethandler('module');

Braces +2 added lines, -4 removed lines

@@ -261,14 +261,12 @@
 	       $table->addNewField($field, $type);
 	       //$xoopsDB->query("ALTER TABLE ".$table." ADD ".$field." ".$type);
 	       //echo $field."(".$type.") <FONT COLOR='##22DD51'>Added</FONT><br />";
-	   }
-	   elseif ($existing_fields[$field] != $type) {
+	   } elseif ($existing_fields[$field] != $type) {
 	       $table->addAlteredField($field, $field." ".$type);
 	       // check $fields[$field]['type'] for things like "int(10) unsigned"
 	       //$xoopsDB->query("ALTER TABLE ".$table." CHANGE ".$field." ".$field." ".$type);
 	       //echo $field." <FONT COLOR='#FF6600'>Changed to</FONT> ".$type."<br />";
-	   }
-	   else {
+	   } else {
 	       //echo $field." <FONT COLOR='#0033FF'>Uptodate</FONT><br />";
 	   }
 	}

admin/rating.php

Indentation +6 added lines, -6 removed lines

@@ -70,21 +70,21 @@ 
 		$ratingid = isset($_GET['ratingid']) ? intval($_GET['ratingid']) : 0 ;
 
 		smart_xoops_cp_header();
-        echo $indexAdmin->addNavigation('rating.php');
+		echo $indexAdmin->addNavigation('rating.php');
 
 		editclass(true, $ratingid);
 		break;
 
 	case "addrating":
-        include_once XOOPS_ROOT_PATH."/modules/smartobject/class/smartobjectcontroller.php";
-        $controller = new SmartObjectController($smartobject_rating_handler);
+		include_once XOOPS_ROOT_PATH."/modules/smartobject/class/smartobjectcontroller.php";
+		$controller = new SmartObjectController($smartobject_rating_handler);
 		$controller->storeFromDefaultForm(_AM_SOBJECT_RATINGS_CREATED, _AM_SOBJECT_RATINGS_MODIFIED, SMARTOBJECT_URL . 'admin/rating.php');
 
 		break;
 
 	case "del":
-	    include_once XOOPS_ROOT_PATH."/modules/smartobject/class/smartobjectcontroller.php";
-        $controller = new SmartObjectController($smartobject_rating_handler);
+		include_once XOOPS_ROOT_PATH."/modules/smartobject/class/smartobjectcontroller.php";
+		$controller = new SmartObjectController($smartobject_rating_handler);
 		$controller->handleObjectDeletion();
 
 		break;
@@ -92,7 +92,7 @@ 
 	default:
 
 		smart_xoops_cp_header();
-        echo $indexAdmin->addNavigation('rating.php');
+		echo $indexAdmin->addNavigation('rating.php');
 
 		//smart_adminMenu(4, _AM_SOBJECT_RATINGS);
 

Spacing +8 added lines, -8 removed lines

@@ -13,7 +13,7 @@ 
 
 	$ratingObj = $smartobject_rating_handler->get($ratingid);
 
-	if (!$ratingObj->isNew()){
+	if (!$ratingObj->isNew()) {
 
 		if ($showmenu) {
 			//smart_adminMenu(4, _AM_SOBJECT_RATINGS . " > " . _AM_SOBJECT_EDITING);
@@ -31,7 +31,7 @@ 
 			$controller->postDataToObject($ratingObj);
 
 			if ($_POST['op'] == 'changedField') {
-				switch($_POST['changedField']) {
+				switch ($_POST['changedField']) {
 					case 'dirname' :
 						$ratingObj->showFieldOnForm(array('item', 'itemid', 'uid', 'date', 'rate'));
 					break;
@@ -53,8 +53,8 @@ 
 }
 
 include_once("admin_header.php");
-include_once SMARTOBJECT_ROOT_PATH."class/smartobjecttable.php";
-include_once SMARTOBJECT_ROOT_PATH."class/rating.php";
+include_once SMARTOBJECT_ROOT_PATH . "class/smartobjecttable.php";
+include_once SMARTOBJECT_ROOT_PATH . "class/rating.php";
 $smartobject_rating_handler = xoops_getmodulehandler('rating');
 $indexAdmin = new ModuleAdmin();
 
@@ -67,7 +67,7 @@ 
 	case "mod":
 	case "changedField";
 
-		$ratingid = isset($_GET['ratingid']) ? intval($_GET['ratingid']) : 0 ;
+		$ratingid = isset($_GET['ratingid']) ? intval($_GET['ratingid']) : 0;
 
 		smart_xoops_cp_header();
         echo $indexAdmin->addNavigation('rating.php');
@@ -76,14 +76,14 @@ 
 		break;
 
 	case "addrating":
-        include_once XOOPS_ROOT_PATH."/modules/smartobject/class/smartobjectcontroller.php";
+        include_once XOOPS_ROOT_PATH . "/modules/smartobject/class/smartobjectcontroller.php";
         $controller = new SmartObjectController($smartobject_rating_handler);
 		$controller->storeFromDefaultForm(_AM_SOBJECT_RATINGS_CREATED, _AM_SOBJECT_RATINGS_MODIFIED, SMARTOBJECT_URL . 'admin/rating.php');
 
 		break;
 
 	case "del":
-	    include_once XOOPS_ROOT_PATH."/modules/smartobject/class/smartobjectcontroller.php";
+	    include_once XOOPS_ROOT_PATH . "/modules/smartobject/class/smartobjectcontroller.php";
         $controller = new SmartObjectController($smartobject_rating_handler);
 		$controller->handleObjectDeletion();
 
@@ -98,7 +98,7 @@ 
 
 		smart_collapsableBar('createdratings', _AM_SOBJECT_RATINGS, _AM_SOBJECT_RATINGS_DSC);
 
-		include_once SMARTOBJECT_ROOT_PATH."class/smartobjecttable.php";
+		include_once SMARTOBJECT_ROOT_PATH . "class/smartobjecttable.php";
 		$objectTable = new SmartObjectTable($smartobject_rating_handler);
 		$objectTable->addColumn(new SmartObjectColumn('name', 'left'));
 		$objectTable->addColumn(new SmartObjectColumn('dirname', 'left'));

Braces +6 added lines, -2 removed lines

@@ -60,8 +60,12 @@
 
 $op = '';
 
-if (isset($_GET['op'])) $op = $_GET['op'];
-if (isset($_POST['op'])) $op = $_POST['op'];
+if (isset($_GET['op'])) {
+	$op = $_GET['op'];
+}
+if (isset($_POST['op'])) {
+	$op = $_POST['op'];
+}
 
 switch ($op) {
 	case "mod":

admin/menu.php

Indentation +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
 
 
 if (!file_exists($fileinc = $pathLanguage . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) {
-    $fileinc = $pathLanguage . '/language/english/main.php';
+	$fileinc = $pathLanguage . '/language/english/main.php';
 }
 
 include_once $fileinc;
@@ -71,7 +71,7 @@ 
 	$i++;
 	$adminmenu[$i]['title'] = _MI_SOBJECT_CURRENCIES;
 	$adminmenu[$i]['link'] = "admin/currency.php";
-    $adminmenu[$i]["icon"]  = $pathIcon32 . '/cash_stack.png';
+	$adminmenu[$i]["icon"]  = $pathIcon32 . '/cash_stack.png';
 }
 
 

Spacing +12 added lines, -12 removed lines

@@ -26,7 +26,7 @@ 
 include_once $fileinc;
 
 $adminmenu = array();
-$i=0;
+$i = 0;
 $adminmenu[$i]["title"] = _AM_MODULEADMIN_HOME;
 $adminmenu[$i]['link'] = "admin/index.php";
 $adminmenu[$i]["icon"]  = $pathIcon32 . '/home.png';
@@ -71,7 +71,7 @@ 
 	$i++;
 	$adminmenu[$i]['title'] = _MI_SOBJECT_CURRENCIES;
 	$adminmenu[$i]['link'] = "admin/currency.php";
-    $adminmenu[$i]["icon"]  = $pathIcon32 . '/cash_stack.png';
+    $adminmenu[$i]["icon"] = $pathIcon32 . '/cash_stack.png';
 }
 
 
@@ -81,24 +81,24 @@ 
 
 // --- for XCL ---	
 //	$headermenu[$i]['link'] = '../../system/admin.php?fct=preferences&op=showmod&mod=' . $xoopsModule->getVar('mid');
-	$mid = $xoopsModule->getVar('mid') ;
-	if ( defined( 'XOOPS_CUBE_LEGACY' ) ) {
-		$link_pref = XOOPS_URL.'/modules/legacy/admin/index.php?action=PreferenceEdit&confmod_id='.$mid; 
+	$mid = $xoopsModule->getVar('mid');
+	if (defined('XOOPS_CUBE_LEGACY')) {
+		$link_pref = XOOPS_URL . '/modules/legacy/admin/index.php?action=PreferenceEdit&confmod_id=' . $mid; 
 	} else {
-		$link_pref = XOOPS_URL.'/modules/system/admin.php?fct=preferences&op=showmod&mod='.$mid ;
+		$link_pref = XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $mid;
 	}
-	$headermenu[$i]['link'] = $link_pref ;
+	$headermenu[$i]['link'] = $link_pref;
 // -----
 
 // --- for XCL ---	
 //	$headermenu[$i]['link'] = XOOPS_URL . "/modules/system/admin.php?fct=modulesadmin&op=update&module=" . $xoopsModule->getVar('dirname');
-	$dirname = $xoopsModule->getVar('dirname') ;
-	if ( defined( 'XOOPS_CUBE_LEGACY' ) ) {
-		$link_module = XOOPS_URL.'/modules/legacy/admin/index.php?action=ModuleUpdate&dirname='.$dirname;
+	$dirname = $xoopsModule->getVar('dirname');
+	if (defined('XOOPS_CUBE_LEGACY')) {
+		$link_module = XOOPS_URL . '/modules/legacy/admin/index.php?action=ModuleUpdate&dirname=' . $dirname;
 	} else {
-		$link_module = XOOPS_URL.'/modules/system/admin.php?fct=modulesadmin&op=update&module='.$dirname;
+		$link_module = XOOPS_URL . '/modules/system/admin.php?fct=modulesadmin&op=update&module=' . $dirname;
 	}
-	$headermenu[$i]['link'] = $link_module ;
+	$headermenu[$i]['link'] = $link_module;
 // -----
 
 	$i++;

admin/link.php

Indentation +3 added lines, -3 removed lines

@@ -26,8 +26,8 @@ 
 switch ($op) {
 
 	case "del":
-	    include_once XOOPS_ROOT_PATH."/modules/smartobject/class/smartobjectcontroller.php";
-        $controller = new SmartObjectController($smartobject_link_handler);
+		include_once XOOPS_ROOT_PATH."/modules/smartobject/class/smartobjectcontroller.php";
+		$controller = new SmartObjectController($smartobject_link_handler);
 		$controller->handleObjectDeletion(_AM_SOBJECT_SENT_LINK_DELETE_CONFIRM);
 
 		break;
@@ -68,7 +68,7 @@ 
 
 		smart_xoops_cp_header();
 
-        echo $indexAdmin->addNavigation('link.php');
+		echo $indexAdmin->addNavigation('link.php');
 
 
 		//smart_adminMenu(1, _AM_SOBJECT_SENT_LINKS);

Spacing +8 added lines, -8 removed lines

@@ -12,8 +12,8 @@ 
 */
 
 include_once("admin_header.php");
-include_once SMARTOBJECT_ROOT_PATH."class/smartobjecttable.php";
-include_once SMARTOBJECT_ROOT_PATH."class/smartobjectlink.php";
+include_once SMARTOBJECT_ROOT_PATH . "class/smartobjecttable.php";
+include_once SMARTOBJECT_ROOT_PATH . "class/smartobjectlink.php";
 $indexAdmin = new ModuleAdmin();
 
 $smartobject_link_handler = xoops_getmodulehandler('link');
@@ -26,7 +26,7 @@ 
 switch ($op) {
 
 	case "del":
-	    include_once XOOPS_ROOT_PATH."/modules/smartobject/class/smartobjectcontroller.php";
+	    include_once XOOPS_ROOT_PATH . "/modules/smartobject/class/smartobjectcontroller.php";
         $controller = new SmartObjectController($smartobject_link_handler);
 		$controller->handleObjectDeletion(_AM_SOBJECT_SENT_LINK_DELETE_CONFIRM);
 
@@ -51,11 +51,11 @@ 
 // ---
 // 2012-01-01 PHP 5.3 : Assigning the return value of new by reference is now deprecated.
 //		$xoopsTpl =& new XoopsTpl();
-		$xoopsTpl =  new XoopsTpl();
+		$xoopsTpl = new XoopsTpl();
 //---
 
 		$xoopsTpl->assign('link', $linkObj->toArray());
-		$xoopsTpl->display( 'db:smartobject_sentlink_display.html' );
+		$xoopsTpl->display('db:smartobject_sentlink_display.html');
 
 		echo "<br />";
 		smart_close_collapsable('sentlinks');
@@ -75,11 +75,11 @@ 
 
 		smart_collapsableBar('sentlinks', _AM_SOBJECT_SENT_LINKS, _AM_SOBJECT_SENT_LINKS_INFO);
 
-		include_once SMARTOBJECT_ROOT_PATH."class/smartobjecttable.php";
+		include_once SMARTOBJECT_ROOT_PATH . "class/smartobjecttable.php";
 		$objectTable = new SmartObjectTable($smartobject_link_handler, null, array('delete'));
 		$objectTable->addColumn(new SmartObjectColumn('date'));
-		$objectTable->addColumn(new SmartObjectColumn(_AM_SOBJECT_SENT_LINKS_FROM, $align='left', $width=false, 'getFromInfo'));
-		$objectTable->addColumn(new SmartObjectColumn(_AM_SOBJECT_SENT_LINKS_TO, $align='left', $width=false, 'getToInfo'));
+		$objectTable->addColumn(new SmartObjectColumn(_AM_SOBJECT_SENT_LINKS_FROM, $align = 'left', $width = false, 'getFromInfo'));
+		$objectTable->addColumn(new SmartObjectColumn(_AM_SOBJECT_SENT_LINKS_TO, $align = 'left', $width = false, 'getToInfo'));
 		$objectTable->addColumn(new SmartObjectColumn('link'));
 
 		$objectTable->addCustomAction("getViewItemLink");

Braces +6 added lines, -2 removed lines

@@ -20,8 +20,12 @@
 
 $op = '';
 
-if (isset($_GET['op'])) $op = $_GET['op'];
-if (isset($_POST['op'])) $op = $_POST['op'];
+if (isset($_GET['op'])) {
+	$op = $_GET['op'];
+}
+if (isset($_POST['op'])) {
+	$op = $_POST['op'];
+}
 
 switch ($op) {
 

admin/admin_header.php

Indentation +4 added lines, -4 removed lines

@@ -41,7 +41,7 @@
 $pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
 
 if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){
-        include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
-    }else{
-        redirect_header("../../../admin.php", 5, _AM_BIRTHDAY_MODULEADMIN_MISSING, false);
-    }
\ No newline at end of file
+		include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
+	}else{
+		redirect_header("../../../admin.php", 5, _AM_BIRTHDAY_MODULEADMIN_MISSING, false);
+	}
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -36,12 +36,12 @@
 xoops_loadLanguage('modinfo', $thisModuleDir);
 xoops_loadLanguage('main', $thisModuleDir);
 
-$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
-$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
+$pathIcon16 = '../' . $xoopsModule->getInfo('icons16');
+$pathIcon32 = '../' . $xoopsModule->getInfo('icons32');
 $pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
 
-if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){
-        include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
-    }else{
+if (file_exists($GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php'))) {
+        include_once $GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php');
+    } else {
         redirect_header("../../../admin.php", 5, _AM_BIRTHDAY_MODULEADMIN_MISSING, false);
     }
\ No newline at end of file

Braces +1 added lines, -1 removed lines

@@ -42,6 +42,6 @@
 
 if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){
         include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
-    }else{
+    } else{
         redirect_header("../../../admin.php", 5, _AM_BIRTHDAY_MODULEADMIN_MISSING, false);
     }
\ No newline at end of file