mambax7 / smartobject

include/captcha/scripts/img.php

Doc Comments +2 added lines, -2 removed lines

@@ -189,7 +189,7 @@ 
     }
 
     /**
-     * @param         $name
+     * @param         string $name
      * @param  string $extension
      * @return array
      */
@@ -255,7 +255,7 @@ 
     /**
      * Return random background
      *
-     * @return array
+     * @return string|null
      */
     public function loadBackground()
     {

Indentation +405 added lines, -405 removed lines

@@ -10,7 +10,7 @@ 
 $xoopsLogger->activated = false;
 
 if (empty($_SERVER['HTTP_REFERER']) || !preg_match('/^' . preg_quote(XOOPS_URL, '/') . '/', $_SERVER['HTTP_REFERER'])) {
-    exit();
+	exit();
 }
 
 /**
@@ -18,185 +18,185 @@ 
  */
 class XoopsCaptchaImageHandler
 {
-    public $config = array();
-    //var $mode = "gd"; // GD or bmp
-    public $code;
-    public $invalid = false;
-
-    public $font;
-    public $spacing;
-    public $width;
-    public $height;
-
-    /**
-     * XoopsCaptchaImageHandler constructor.
-     */
-    public function __construct()
-    {
-        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
-     * @param array $config
-     */
-    public function setConfig($config = array())
-    {
-        // Loading default preferences
-        $this->config = $config;
-    }
-
-    public function loadImage()
-    {
-        $this->createCode();
-        $this->setCode();
-        $this->createImage();
-    }
-
-    /**
-     * Create Code
-     */
-    public function createCode()
-    {
-        if ($this->invalid) {
-            return;
-        }
-
-        if ($this->mode === 'bmp') {
-            $this->config['num_chars'] = 4;
-            $this->code                = mt_rand(pow(10, $this->config['num_chars'] - 1), (int)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);
-            }
-        }
-    }
-
-    public function setCode()
-    {
-        if ($this->invalid) {
-            return;
-        }
-
-        $_SESSION['XoopsCaptcha_sessioncode'] = (string)$this->code;
-        $maxAttempts                          = (int)(@$_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;
-            }
-        }
-    }
-
-    /**
-     * @param  string      $file
-     * @return string|void
-     */
-    public 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
-     * @param string $file
-     */
-    //  --------------------------------------------------------------------------- //
-    // Class: SecurityImage 1.5                                                    //
-    // Author: DuGris aka L. Jen <http://www.dugris.info>                           //
-    // Email: DuGris@wanadoo.fr                                                    //
-    // Licence: GNU                                                                 //
-    // Project: XOOPS Project                                                   //
-    //  --------------------------------------------------------------------------- //
-    public 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);
-    }
-
-    /**
-     * @param         $name
-     * @param  string $extension
-     * @return array
-     */
-    public function _getList($name, $extension = '')
-    {
-        $items = array();
-        /*
+	public $config = array();
+	//var $mode = "gd"; // GD or bmp
+	public $code;
+	public $invalid = false;
+
+	public $font;
+	public $spacing;
+	public $width;
+	public $height;
+
+	/**
+	 * XoopsCaptchaImageHandler constructor.
+	 */
+	public function __construct()
+	{
+		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
+	 * @param array $config
+	 */
+	public function setConfig($config = array())
+	{
+		// Loading default preferences
+		$this->config = $config;
+	}
+
+	public function loadImage()
+	{
+		$this->createCode();
+		$this->setCode();
+		$this->createImage();
+	}
+
+	/**
+	 * Create Code
+	 */
+	public function createCode()
+	{
+		if ($this->invalid) {
+			return;
+		}
+
+		if ($this->mode === 'bmp') {
+			$this->config['num_chars'] = 4;
+			$this->code                = mt_rand(pow(10, $this->config['num_chars'] - 1), (int)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);
+			}
+		}
+	}
+
+	public function setCode()
+	{
+		if ($this->invalid) {
+			return;
+		}
+
+		$_SESSION['XoopsCaptcha_sessioncode'] = (string)$this->code;
+		$maxAttempts                          = (int)(@$_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;
+			}
+		}
+	}
+
+	/**
+	 * @param  string      $file
+	 * @return string|void
+	 */
+	public 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
+	 * @param string $file
+	 */
+	//  --------------------------------------------------------------------------- //
+	// Class: SecurityImage 1.5                                                    //
+	// Author: DuGris aka L. Jen <http://www.dugris.info>                           //
+	// Email: DuGris@wanadoo.fr                                                    //
+	// Licence: GNU                                                                 //
+	// Project: XOOPS Project                                                   //
+	//  --------------------------------------------------------------------------- //
+	public 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);
+	}
+
+	/**
+	 * @param         $name
+	 * @param  string $extension
+	 * @return array
+	 */
+	public 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")) {
@@ -204,231 +204,231 @@ 
          }
          }
          */
-        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;
-    }
-
-    public function loadFont()
-    {
-        $fonts      = $this->_getList('fonts', 'ttf');
-        $this->font = $this->config['rootpath'] . '/fonts/' . $fonts[array_rand($fonts)];
-    }
-
-    public 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
-     */
-    public 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
-     */
-    public 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
-     */
-    public 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
-     */
-    public function drawBorder()
-    {
-        $rgb          = mt_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
-     */
-    public 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
-     */
-    public 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
-     */
-    public 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
-     */
-    public 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 += 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 += 2.5;
-        }
-    }
-
-    /**
-     * Draw Ellipses background
-     */
-    public 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
-     */
-    public 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
-     * @param  string $file
-     * @return string
-     */
-    public 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;
+	}
+
+	public function loadFont()
+	{
+		$fonts      = $this->_getList('fonts', 'ttf');
+		$this->font = $this->config['rootpath'] . '/fonts/' . $fonts[array_rand($fonts)];
+	}
+
+	public 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
+	 */
+	public 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
+	 */
+	public 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
+	 */
+	public 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
+	 */
+	public function drawBorder()
+	{
+		$rgb          = mt_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
+	 */
+	public 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
+	 */
+	public 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
+	 */
+	public 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
+	 */
+	public 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 += 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 += 2.5;
+		}
+	}
+
+	/**
+	 * Draw Ellipses background
+	 */
+	public 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
+	 */
+	public 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
+	 * @param  string $file
+	 * @return string
+	 */
+	public function createImageBmp($file = '')
+	{
+		$image = '';
+
+		if (empty($file)) {
+			header('Content-type: image/bmp');
+			echo $image;
+		} else {
+			return $image;
+		}
+	}
 }
 
 $config       = @include dirname(__DIR__) . '/config.php';

Spacing +15 added lines, -15 removed lines

@@ -5,11 +5,11 @@ 
  * D.J.
  */
 
-include dirname(dirname(dirname(dirname(dirname(__DIR__))))) . '/mainfile.php';
+include dirname(dirname(dirname(dirname(dirname(__DIR__))))).'/mainfile.php';
 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();
 }
 
@@ -78,7 +78,7 @@ 
 
         if ($this->mode === 'bmp') {
             $this->config['num_chars'] = 4;
-            $this->code                = mt_rand(pow(10, $this->config['num_chars'] - 1), (int)str_pad('9', $this->config['num_chars'], '9'));
+            $this->code                = mt_rand(pow(10, $this->config['num_chars'] - 1), (int) 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']) {
@@ -93,13 +93,13 @@ 
             return;
         }
 
-        $_SESSION['XoopsCaptcha_sessioncode'] = (string)$this->code;
-        $maxAttempts                          = (int)(@$_SESSION['XoopsCaptcha_maxattempts']);
+        $_SESSION['XoopsCaptcha_sessioncode'] = (string) $this->code;
+        $maxAttempts                          = (int) (@$_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) {
+            $_SESSION['XoopsCaptcha_attempt_'.$_SESSION['XoopsCaptcha_name']]++;
+            if ($_SESSION['XoopsCaptcha_attempt_'.$_SESSION['XoopsCaptcha_name']] > $maxAttempts) {
                 $this->invalid = true;
             }
         }
@@ -113,7 +113,7 @@ 
     {
         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;
         }
@@ -183,7 +183,7 @@ 
             header('Content-type: image/jpeg');
             imagejpeg($this->oImage);
         } else {
-            imagejpeg($this->oImage, XOOPS_ROOT_PATH . '/' . $this->config['imagepath'] . '/' . $file . '.jpg');
+            imagejpeg($this->oImage, XOOPS_ROOT_PATH.'/'.$this->config['imagepath'].'/'.$file.'.jpg');
         }
         imagedestroy($this->oImage);
     }
@@ -204,8 +204,8 @@ 
          }
          }
          */
-        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)) {
@@ -222,7 +222,7 @@ 
     public 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)];
     }
 
     public function setImageSize()
@@ -248,7 +248,7 @@ 
         imagedestroy($oImage);
 
         $this->height  = $MaxCharHeight + 2;
-        $this->spacing = (int)(($this->config['num_chars'] * $MaxCharWidth) / $this->config['num_chars']);
+        $this->spacing = (int) (($this->config['num_chars'] * $MaxCharWidth) / $this->config['num_chars']);
         $this->width   = ($this->config['num_chars'] * $MaxCharWidth) + ($this->spacing / 2);
     }
 
@@ -261,7 +261,7 @@ 
     {
         $RandBackground = null;
         if ($backgrounds = $this->_getList('backgrounds', '(gif|jpg|png)')) {
-            $RandBackground = $this->config['rootpath'] . '/backgrounds/' . $backgrounds[array_rand($backgrounds)];
+            $RandBackground = $this->config['rootpath'].'/backgrounds/'.$backgrounds[array_rand($backgrounds)];
         }
 
         return $RandBackground;
@@ -431,7 +431,7 @@ 
     }
 }
 
-$config       = @include dirname(__DIR__) . '/config.php';
+$config       = @include dirname(__DIR__).'/config.php';
 $imageHandler = new XoopsCaptchaImageHandler();
 $imageHandler->setConfig($config);
 $imageHandler->loadImage();

include/projax/classes/JavaScript.php

Doc Comments +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
 
     /**
      * @param $javascript
-     * @return mixed|string
+     * @return string
      */
     public function escape($javascript)
     {
@@ -48,7 +48,7 @@ 
 
     /**
      * @param       $name
-     * @param       $function
+     * @param       string $function
      * @param  null $html_options
      * @return string
      */

Indentation +75 added lines, -75 removed lines

@@ -15,90 +15,90 @@
  */
 class JavaScript
 {
-    /**
-     * @param       $name
-     * @param  null $function
-     * @return string
-     */
-    public function button_to_function($name, $function = null)
-    {
-        return '<input type="button" value="' . $name . '" onclick="' . $function . '" />';
-    }
+	/**
+	 * @param       $name
+	 * @param  null $function
+	 * @return string
+	 */
+	public function button_to_function($name, $function = null)
+	{
+		return '<input type="button" value="' . $name . '" onclick="' . $function . '" />';
+	}
 
-    /**
-     * @param $javascript
-     * @return mixed|string
-     */
-    public function escape($javascript)
-    {
-        $javascript = addslashes($javascript);
-        $javascript = str_replace(array("\r\n", "\n", "\r"), array("\n"), $javascript);
+	/**
+	 * @param $javascript
+	 * @return mixed|string
+	 */
+	public function escape($javascript)
+	{
+		$javascript = addslashes($javascript);
+		$javascript = str_replace(array("\r\n", "\n", "\r"), array("\n"), $javascript);
 
-        return $javascript;
-    }
+		return $javascript;
+	}
 
-    /**
-     * @param $content
-     * @return string
-     */
-    public function tag($content)
-    {
-        return '<script type="text/javascript">' . $content . '</script>';
-    }
+	/**
+	 * @param $content
+	 * @return string
+	 */
+	public function tag($content)
+	{
+		return '<script type="text/javascript">' . $content . '</script>';
+	}
 
-    /**
-     * @param       $name
-     * @param       $function
-     * @param  null $html_options
-     * @return string
-     */
-    public function link_to_function($name, $function, $html_options = null)
-    {
-        return '<a href="' . (isset($html_options['href']) ? $html_options['href'] : '#') . '" onclick="' . (isset($html_options['onclick']) ? $html_options['onclick'] . ';' : '') . $function . '; return false;" />' . $name . '</a>';
-    }
+	/**
+	 * @param       $name
+	 * @param       $function
+	 * @param  null $html_options
+	 * @return string
+	 */
+	public function link_to_function($name, $function, $html_options = null)
+	{
+		return '<a href="' . (isset($html_options['href']) ? $html_options['href'] : '#') . '" onclick="' . (isset($html_options['onclick']) ? $html_options['onclick'] . ';' : '') . $function . '; return false;" />' . $name . '</a>';
+	}
 
-    /////////////////////////////////////////////////////////////////////////////////////
-    //                             Private functions
-    /////////////////////////////////////////////////////////////////////////////////////
+	/////////////////////////////////////////////////////////////////////////////////////
+	//                             Private functions
+	/////////////////////////////////////////////////////////////////////////////////////
 
-    /**
-     * @param $option
-     * @return string
-     */
-    public function _array_or_string_for_javascript($option)
-    {
-        $return_val = '';
-        if (is_array($option)) {
-            foreach ($option as $value) {
-                if (!empty($return_val)) {
-                    $ret_val .= ', ';
-                }
-                $return_val .= $value;
-            }
+	/**
+	 * @param $option
+	 * @return string
+	 */
+	public function _array_or_string_for_javascript($option)
+	{
+		$return_val = '';
+		if (is_array($option)) {
+			foreach ($option as $value) {
+				if (!empty($return_val)) {
+					$ret_val .= ', ';
+				}
+				$return_val .= $value;
+			}
 
-            return '[' . $return_val . ']';
-        }
+			return '[' . $return_val . ']';
+		}
 
-        return "'$option'";
-    }
+		return "'$option'";
+	}
 
-    /**
-     * @param $options
-     * @return string
-     */
-    public function _options_for_javascript($options)
-    {
-        $return_val = '';
+	/**
+	 * @param $options
+	 * @return string
+	 */
+	public function _options_for_javascript($options)
+	{
+		$return_val = '';
 
-        if (is_array($options)) {
-            foreach ($options as $var => $val) {
-                if (!empty($return_val)) {
-                    $return_val .= ', ';
-                }
-                $return_val .= "$var:$val";
-            }
-        }
+		if (is_array($options)) {
+			foreach ($options as $var => $val) {
+				if (!empty($return_val)) {
+					$return_val .= ', ';
+				}
+				$return_val .= "$var:$val";
+			}
+		}
 
-        return '{' . $return_val . '}';
-    }
+		return '{' . $return_val . '}';
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -22,7 +22,7 @@ 
      */
     public function button_to_function($name, $function = null)
     {
-        return '<input type="button" value="' . $name . '" onclick="' . $function . '" />';
+        return '<input type="button" value="'.$name.'" onclick="'.$function.'" />';
     }
 
     /**
@@ -43,7 +43,7 @@ 
      */
     public function tag($content)
     {
-        return '<script type="text/javascript">' . $content . '</script>';
+        return '<script type="text/javascript">'.$content.'</script>';
     }
 
     /**
@@ -54,7 +54,7 @@ 
      */
     public function link_to_function($name, $function, $html_options = null)
     {
-        return '<a href="' . (isset($html_options['href']) ? $html_options['href'] : '#') . '" onclick="' . (isset($html_options['onclick']) ? $html_options['onclick'] . ';' : '') . $function . '; return false;" />' . $name . '</a>';
+        return '<a href="'.(isset($html_options['href']) ? $html_options['href'] : '#').'" onclick="'.(isset($html_options['onclick']) ? $html_options['onclick'].';' : '').$function.'; return false;" />'.$name.'</a>';
     }
 
     /////////////////////////////////////////////////////////////////////////////////////
@@ -76,7 +76,7 @@ 
                 $return_val .= $value;
             }
 
-            return '[' . $return_val . ']';
+            return '['.$return_val.']';
         }
 
         return "'$option'";
@@ -99,6 +99,6 @@ 
             }
         }
 
-        return '{' . $return_val . '}';
+        return '{'.$return_val.'}';
     }
 }

include/projax/classes/Prototype.php

Doc Comments +3 added lines, -3 removed lines

@@ -212,7 +212,7 @@ 
     }
 
     /**
-     * @param       $klass
+     * @param       string $klass
      * @param       $name
      * @param  null $options
      * @return string
@@ -311,7 +311,7 @@ 
     }
 
     /**
-     * @param $variable
+     * @param string $variable
      * @param $value
      * @return string
      */
@@ -321,7 +321,7 @@ 
     }
 
     /**
-     * @param       $function
+     * @param       string $function
      * @param  null $args
      * @return string
      */

Indentation +448 added lines, -448 removed lines

@@ -15,452 +15,452 @@
  */
 class Prototype extends JavaScript
 {
-    public $CALLBACKS = array(
-        'uninitialized',
-        'loading',
-        'loaded',
-        'interactive',
-        'complete',
-        'failure',
-        'success'
-    );
-
-    public $AJAX_OPTIONS = array(
-        'before',
-        'after',
-        'condition',
-        'url',
-        'asynchronous',
-        'method',
-        'insertion',
-        'position',
-        'form',
-        'with',
-        'update',
-        'script',
-        'uninitialized',
-        'loading',
-        'loaded',
-        'interactive',
-        'complete',
-        'failure',
-        'success'
-    );
-
-    /**
-     * @return string
-     */
-    public function evaluate_remote_response()
-    {
-        return 'eval(request.responseText)';
-    }
-
-    /**
-     * @param $options
-     * @return string
-     */
-    public function form_remote_tag($options)
-    {
-        $options['form'] = true;
-
-        return '<form action="' . $options['url'] . '" onsubmit="' . $this->remote_function($options) . '; return false;" method="' . (isset($options['method']) ? $options['method'] : 'post') . '"  >';
-    }
-
-    /**
-     * @param       $name
-     * @param  null $options
-     * @param  null $html_options
-     * @return string
-     */
-    public function link_to_remote($name, $options = null, $html_options = null)
-    {
-        return $this->link_to_function($name, $this->remote_function($options), $html_options);
-    }
-
-    /**
-     * @param       $field_id
-     * @param  null $options
-     * @return string
-     */
-    public function observe_field($field_id, $options = null)
-    {
-        if (isset($options['frequency']) && $options['frequency'] > 0) {
-            return $this->_build_observer('Form.Element.Observer', $field_id, $options);
-        } else {
-            return $this->_build_observer('Form.Element.EventObserver', $field_id, $options);
-        }
-    }
-
-    /**
-     * @param       $form_id
-     * @param  null $options
-     * @return string
-     */
-    public function observe_form($form_id, $options = null)
-    {
-        if (isset($options['frequency'])) {
-            return $this->_build_observer('Form.Observer', $form_id, $options);
-        } else {
-            return $this->_build_observer('Form.EventObserver', $form_id, $options);
-        }
-    }
-
-    /**
-     * @param  null $options
-     * @return string
-     */
-    public function periodically_call_remote($options = null)
-    {
-        $frequency = isset($options['frequency']) ? $options['frequency'] : 10;
-        $code      = 'new PeriodicalExecuter(function() {' . $this->remote_function($options) . '},' . $frequency . ')';
-
-        return $code;
-    }
-
-    /**
-     * @param $options
-     * @return string
-     */
-    public function remote_function($options)
-    {
-        $javascript_options = $this->_options_for_ajax($options);
-
-        $update = '';
-
-        if (isset($options['update']) && is_array($options['update'])) {
-            $update = isset($options['update']['success']) ? 'success: ' . $options['update']['success'] : '';
-            $update .= empty($update) ? '' : ',';
-            $update .= isset($options['update']['failure']) ? 'failure: ' . $options['update']['failure'] : '';
-        } else {
-            $update .= isset($options['update']) ? $options['update'] : '';
-        }
-
-        $ajax_function = empty($update) ? 'new Ajax.Request(' : 'new Ajax.Updater(\'' . $update . '\',';
-
-        $ajax_function .= "'" . $options['url'] . "'";
-        $ajax_function .= ',' . $javascript_options . ')';
-
-        $ajax_function = isset($options['before']) ? $options['before'] . ';' . $ajax_function : $ajax_function;
-        $ajax_function = isset($options['after']) ? $ajax_function . ';' . $options['after'] : $ajax_function;
-        $ajax_function = isset($options['condition']) ? 'if (' . $options['condition'] . ') {' . $ajax_function . '}' : $ajax_function;
-        $ajax_function = isset($options['confirm']) ? 'if ( confirm(\'' . $options['confirm'] . '\' ) ) { ' . $ajax_function . ' } ' : $ajax_function;
-
-        return $ajax_function;
-    }
-
-    /**
-     * @param $name
-     * @param $value
-     * @param $options
-     * @return string
-     */
-    public function submit_to_remote($name, $value, $options)
-    {
-        if (isset($options['with'])) {
-            $options['with'] = 'Form.serialize(this.form)';
-        }
-
-        return '<input type="button" onclick="' . $this->remote_function($options) . '" name="' . $name . '" value ="' . $value . '" />';
-    }
-
-    /**
-     * @param      $element_id
-     * @param null $options
-     * @param      $block
-     */
-    public function update_element_function($element_id, $options = null, $block)
-    {
-        $content = isset($options['content']) ? $options['content'] : '';
-        $content = $this->escape($content);
-    }
-
-    /**
-     * @param $block
-     */
-    public function update_page($block)
-    {
-    }
-
-    /**
-     * @param $block
-     * @return string
-     */
-    public function update_page_tag(& $block)
-    {
-        return $this->tag($block);
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////
-    //                             Private functions
-    /////////////////////////////////////////////////////////////////////////////////////
-
-    /**
-     * @param $options
-     * @return array
-     */
-    public function _build_callbacks($options)
-    {
-        $callbacks = array();
-        foreach ($options as $callback => $code) {
-            if (in_array($callback, $this->CALLBACKS)) {
-                $name             = 'on' . ucfirst($callback);
-                $callbacks[$name] = 'function(request){' . $code . '}';
-            }
-        }
-
-        return $callbacks;
-    }
-
-    /**
-     * @param       $klass
-     * @param       $name
-     * @param  null $options
-     * @return string
-     */
-    public function _build_observer($klass, $name, $options = null)
-    {
-        if (isset($options['with']) && false === strpos($options['with'], '=')) {
-            $options['with'] = '\'' . $options['with'] . '=\' + value';
-        } elseif (isset($options['with']) && isset($options['update'])) {
-            $options['with'] = 'value';
-        }
-
-        $callback = $options['function'] ?: $this->remote_function($options);
-
-        $javascript = "new $klass('$name', ";
-        $javascript .= isset($options['frequency']) ? $options['frequency'] . ', ' : '';
-        $javascript .= 'function (element,value) { ';
-        $javascript .= $callback;
-        $javascript .= isset($options['on']) ? ', ' . $options['on'] : '';
-        $javascript .= '})';
-
-        return $javascript;
-    }
-
-    /**
-     * @param $method
-     * @return string
-     */
-    public function _method_option_to_s($method)
-    {
-        return strstr($method, "'") ? $method : "'$method'";
-    }
-
-    /**
-     * @param $options
-     * @return string
-     */
-    public function _options_for_ajax($options)
-    {
-        $js_options = is_array($options) ? $this->_build_callbacks($options) : array();
-
-        if (isset($options['type']) && $option['type'] === 'synchronous') {
-            $js_options['asynchronous'] = 'false';
-        }
-
-        if (isset($options['method'])) {
-            $js_options['method'] = $this->_method_option_to_s($options['method']);
-        }
-
-        if (isset($options['position'])) {
-            $js_options['insertion'] = 'Insertion.' . ucfirst($options['position']);
-        }
-
-        $js_options['evalScripts'] = isset($options['script']) ? $options['script'] : 'true';
-
-        if (isset($options['form'])) {
-            $js_options['parameters'] = 'Form.serialize(this)';
-        } elseif (isset($options['parameters'])) {
-            $js_options['parameters'] = 'Form.serialize(\'' . $options['submit'] . '\')';
-        } elseif (isset($options['with'])) {
-            $js_options['parameters'] = $options['with'];
-        }
-
-        return $this->_options_for_javascript($js_options);
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////
-    //                            Mergerd Javascript Generator helpers
-    /////////////////////////////////////////////////////////////////////////////////////
-
-    /**
-     * @param $javascript
-     */
-    public function dump($javascript)
-    {
-        echo $javascript;
-    }
-
-    /**
-     * @param       $id
-     * @param  null $extend
-     * @return string
-     */
-    public function ID($id, $extend = null)
-    {
-        return "$('$id')" . (!empty($extend)) ? '.' . $extend . '()' : '';
-    }
-
-    /**
-     * @param $message
-     * @return string
-     */
-    public function alert($message)
-    {
-        return $this->call('alert', $message);
-    }
-
-    /**
-     * @param $variable
-     * @param $value
-     * @return string
-     */
-    public function assign($variable, $value)
-    {
-        return "$variable = $value;";
-    }
-
-    /**
-     * @param       $function
-     * @param  null $args
-     * @return string
-     */
-    public function call($function, $args = null)
-    {
-        $arg_str = '';
-        if (is_array($args)) {
-            foreach ($args as $arg) {
-                if (!empty($arg_str)) {
-                    $arg_str .= ', ';
-                }
-                if (is_string($arg)) {
-                    $arg_str .= "'$arg'";
-                } else {
-                    $arg_str .= $arg;
-                }
-            }
-        } else {
-            if (is_string($args)) {
-                $arg_str .= "'$args'";
-            } else {
-                $arg_str .= $args;
-            }
-        }
-
-        return "$function($arg_str)";
-    }
-
-    /**
-     * @param  int    $seconds
-     * @param  string $script
-     * @return string
-     */
-    public function delay($seconds = 1, $script = '')
-    {
-        return "setTimeout( function() { $script } , " . ($seconds * 1000) . ' )';
-    }
-
-    /**
-     * @param $id
-     * @return string
-     */
-    public function hide($id)
-    {
-        return $this->call('Element.hide', $id);
-    }
-
-    /**
-     * @param       $position
-     * @param       $id
-     * @param  null $options_for_render
-     * @return string
-     */
-    public function insert_html($position, $id, $options_for_render = null)
-    {
-        $args = array_merge(array($id), (is_array($options_for_render) ? $options_for_render : array($options_for_render)));
-
-        return $this->call('new Insertion.' . ucfirst($position), $args);
-    }
-
-    /**
-     * @param $location
-     * @return string
-     */
-    public function redirect_to($location)
-    {
-        return $this->assign('window.location.href', $location);
-    }
-
-    /**
-     * @param $id
-     * @return string
-     */
-    public function remove($id)
-    {
-        if (is_array($id)) {
-            $arr_str = '';
-            foreach ($id as $obj) {
-                if (!empty($arg_str)) {
-                    $arg_str .= ', ';
-                }
-                $arg_str .= "'$arg'";
-            }
-
-            return "$A[$arg_str].each(Element.remove)";
-        } else {
-            return "Element.remove('$id')";
-        }
-    }
-
-    /**
-     * @param $id
-     * @param $options_for_render
-     * @return string
-     */
-    public function replace($id, $options_for_render)
-    {
-        $args = array_merge(array($id), (is_array($options_for_render) ? $options_for_render : array($options_for_render)));
-
-        return $this->call('Element.replace', $args);
-    }
-
-    /**
-     * @param $id
-     * @param $options_for_render
-     * @return string
-     */
-    public function replace_html($id, $options_for_render)
-    {
-        $args = array_merge(array($id), (is_array($options_for_render) ? $options_for_render : array($options_for_render)));
-
-        return $this->call('Element.update', $args);
-    }
-
-    /**
-     * @param       $pattern
-     * @param  null $extend
-     * @return string
-     */
-    public function select($pattern, $extend = null)
-    {
-        return "$$('$pattern')" . (!empty($extend)) ? '.' . $extend : '';
-    }
-
-    /**
-     * @param $id
-     * @return string
-     */
-    public function show($id)
-    {
-        return $this->call('Element.show', $id);
-    }
-
-    /**
-     * @param $id
-     * @return string
-     */
-    public function toggle($id)
-    {
-        return $this->call('Element.toggle', $id);
-    }
+	public $CALLBACKS = array(
+		'uninitialized',
+		'loading',
+		'loaded',
+		'interactive',
+		'complete',
+		'failure',
+		'success'
+	);
+
+	public $AJAX_OPTIONS = array(
+		'before',
+		'after',
+		'condition',
+		'url',
+		'asynchronous',
+		'method',
+		'insertion',
+		'position',
+		'form',
+		'with',
+		'update',
+		'script',
+		'uninitialized',
+		'loading',
+		'loaded',
+		'interactive',
+		'complete',
+		'failure',
+		'success'
+	);
+
+	/**
+	 * @return string
+	 */
+	public function evaluate_remote_response()
+	{
+		return 'eval(request.responseText)';
+	}
+
+	/**
+	 * @param $options
+	 * @return string
+	 */
+	public function form_remote_tag($options)
+	{
+		$options['form'] = true;
+
+		return '<form action="' . $options['url'] . '" onsubmit="' . $this->remote_function($options) . '; return false;" method="' . (isset($options['method']) ? $options['method'] : 'post') . '"  >';
+	}
+
+	/**
+	 * @param       $name
+	 * @param  null $options
+	 * @param  null $html_options
+	 * @return string
+	 */
+	public function link_to_remote($name, $options = null, $html_options = null)
+	{
+		return $this->link_to_function($name, $this->remote_function($options), $html_options);
+	}
+
+	/**
+	 * @param       $field_id
+	 * @param  null $options
+	 * @return string
+	 */
+	public function observe_field($field_id, $options = null)
+	{
+		if (isset($options['frequency']) && $options['frequency'] > 0) {
+			return $this->_build_observer('Form.Element.Observer', $field_id, $options);
+		} else {
+			return $this->_build_observer('Form.Element.EventObserver', $field_id, $options);
+		}
+	}
+
+	/**
+	 * @param       $form_id
+	 * @param  null $options
+	 * @return string
+	 */
+	public function observe_form($form_id, $options = null)
+	{
+		if (isset($options['frequency'])) {
+			return $this->_build_observer('Form.Observer', $form_id, $options);
+		} else {
+			return $this->_build_observer('Form.EventObserver', $form_id, $options);
+		}
+	}
+
+	/**
+	 * @param  null $options
+	 * @return string
+	 */
+	public function periodically_call_remote($options = null)
+	{
+		$frequency = isset($options['frequency']) ? $options['frequency'] : 10;
+		$code      = 'new PeriodicalExecuter(function() {' . $this->remote_function($options) . '},' . $frequency . ')';
+
+		return $code;
+	}
+
+	/**
+	 * @param $options
+	 * @return string
+	 */
+	public function remote_function($options)
+	{
+		$javascript_options = $this->_options_for_ajax($options);
+
+		$update = '';
+
+		if (isset($options['update']) && is_array($options['update'])) {
+			$update = isset($options['update']['success']) ? 'success: ' . $options['update']['success'] : '';
+			$update .= empty($update) ? '' : ',';
+			$update .= isset($options['update']['failure']) ? 'failure: ' . $options['update']['failure'] : '';
+		} else {
+			$update .= isset($options['update']) ? $options['update'] : '';
+		}
+
+		$ajax_function = empty($update) ? 'new Ajax.Request(' : 'new Ajax.Updater(\'' . $update . '\',';
+
+		$ajax_function .= "'" . $options['url'] . "'";
+		$ajax_function .= ',' . $javascript_options . ')';
+
+		$ajax_function = isset($options['before']) ? $options['before'] . ';' . $ajax_function : $ajax_function;
+		$ajax_function = isset($options['after']) ? $ajax_function . ';' . $options['after'] : $ajax_function;
+		$ajax_function = isset($options['condition']) ? 'if (' . $options['condition'] . ') {' . $ajax_function . '}' : $ajax_function;
+		$ajax_function = isset($options['confirm']) ? 'if ( confirm(\'' . $options['confirm'] . '\' ) ) { ' . $ajax_function . ' } ' : $ajax_function;
+
+		return $ajax_function;
+	}
+
+	/**
+	 * @param $name
+	 * @param $value
+	 * @param $options
+	 * @return string
+	 */
+	public function submit_to_remote($name, $value, $options)
+	{
+		if (isset($options['with'])) {
+			$options['with'] = 'Form.serialize(this.form)';
+		}
+
+		return '<input type="button" onclick="' . $this->remote_function($options) . '" name="' . $name . '" value ="' . $value . '" />';
+	}
+
+	/**
+	 * @param      $element_id
+	 * @param null $options
+	 * @param      $block
+	 */
+	public function update_element_function($element_id, $options = null, $block)
+	{
+		$content = isset($options['content']) ? $options['content'] : '';
+		$content = $this->escape($content);
+	}
+
+	/**
+	 * @param $block
+	 */
+	public function update_page($block)
+	{
+	}
+
+	/**
+	 * @param $block
+	 * @return string
+	 */
+	public function update_page_tag(& $block)
+	{
+		return $this->tag($block);
+	}
+
+	/////////////////////////////////////////////////////////////////////////////////////
+	//                             Private functions
+	/////////////////////////////////////////////////////////////////////////////////////
+
+	/**
+	 * @param $options
+	 * @return array
+	 */
+	public function _build_callbacks($options)
+	{
+		$callbacks = array();
+		foreach ($options as $callback => $code) {
+			if (in_array($callback, $this->CALLBACKS)) {
+				$name             = 'on' . ucfirst($callback);
+				$callbacks[$name] = 'function(request){' . $code . '}';
+			}
+		}
+
+		return $callbacks;
+	}
+
+	/**
+	 * @param       $klass
+	 * @param       $name
+	 * @param  null $options
+	 * @return string
+	 */
+	public function _build_observer($klass, $name, $options = null)
+	{
+		if (isset($options['with']) && false === strpos($options['with'], '=')) {
+			$options['with'] = '\'' . $options['with'] . '=\' + value';
+		} elseif (isset($options['with']) && isset($options['update'])) {
+			$options['with'] = 'value';
+		}
+
+		$callback = $options['function'] ?: $this->remote_function($options);
+
+		$javascript = "new $klass('$name', ";
+		$javascript .= isset($options['frequency']) ? $options['frequency'] . ', ' : '';
+		$javascript .= 'function (element,value) { ';
+		$javascript .= $callback;
+		$javascript .= isset($options['on']) ? ', ' . $options['on'] : '';
+		$javascript .= '})';
+
+		return $javascript;
+	}
+
+	/**
+	 * @param $method
+	 * @return string
+	 */
+	public function _method_option_to_s($method)
+	{
+		return strstr($method, "'") ? $method : "'$method'";
+	}
+
+	/**
+	 * @param $options
+	 * @return string
+	 */
+	public function _options_for_ajax($options)
+	{
+		$js_options = is_array($options) ? $this->_build_callbacks($options) : array();
+
+		if (isset($options['type']) && $option['type'] === 'synchronous') {
+			$js_options['asynchronous'] = 'false';
+		}
+
+		if (isset($options['method'])) {
+			$js_options['method'] = $this->_method_option_to_s($options['method']);
+		}
+
+		if (isset($options['position'])) {
+			$js_options['insertion'] = 'Insertion.' . ucfirst($options['position']);
+		}
+
+		$js_options['evalScripts'] = isset($options['script']) ? $options['script'] : 'true';
+
+		if (isset($options['form'])) {
+			$js_options['parameters'] = 'Form.serialize(this)';
+		} elseif (isset($options['parameters'])) {
+			$js_options['parameters'] = 'Form.serialize(\'' . $options['submit'] . '\')';
+		} elseif (isset($options['with'])) {
+			$js_options['parameters'] = $options['with'];
+		}
+
+		return $this->_options_for_javascript($js_options);
+	}
+
+	/////////////////////////////////////////////////////////////////////////////////////
+	//                            Mergerd Javascript Generator helpers
+	/////////////////////////////////////////////////////////////////////////////////////
+
+	/**
+	 * @param $javascript
+	 */
+	public function dump($javascript)
+	{
+		echo $javascript;
+	}
+
+	/**
+	 * @param       $id
+	 * @param  null $extend
+	 * @return string
+	 */
+	public function ID($id, $extend = null)
+	{
+		return "$('$id')" . (!empty($extend)) ? '.' . $extend . '()' : '';
+	}
+
+	/**
+	 * @param $message
+	 * @return string
+	 */
+	public function alert($message)
+	{
+		return $this->call('alert', $message);
+	}
+
+	/**
+	 * @param $variable
+	 * @param $value
+	 * @return string
+	 */
+	public function assign($variable, $value)
+	{
+		return "$variable = $value;";
+	}
+
+	/**
+	 * @param       $function
+	 * @param  null $args
+	 * @return string
+	 */
+	public function call($function, $args = null)
+	{
+		$arg_str = '';
+		if (is_array($args)) {
+			foreach ($args as $arg) {
+				if (!empty($arg_str)) {
+					$arg_str .= ', ';
+				}
+				if (is_string($arg)) {
+					$arg_str .= "'$arg'";
+				} else {
+					$arg_str .= $arg;
+				}
+			}
+		} else {
+			if (is_string($args)) {
+				$arg_str .= "'$args'";
+			} else {
+				$arg_str .= $args;
+			}
+		}
+
+		return "$function($arg_str)";
+	}
+
+	/**
+	 * @param  int    $seconds
+	 * @param  string $script
+	 * @return string
+	 */
+	public function delay($seconds = 1, $script = '')
+	{
+		return "setTimeout( function() { $script } , " . ($seconds * 1000) . ' )';
+	}
+
+	/**
+	 * @param $id
+	 * @return string
+	 */
+	public function hide($id)
+	{
+		return $this->call('Element.hide', $id);
+	}
+
+	/**
+	 * @param       $position
+	 * @param       $id
+	 * @param  null $options_for_render
+	 * @return string
+	 */
+	public function insert_html($position, $id, $options_for_render = null)
+	{
+		$args = array_merge(array($id), (is_array($options_for_render) ? $options_for_render : array($options_for_render)));
+
+		return $this->call('new Insertion.' . ucfirst($position), $args);
+	}
+
+	/**
+	 * @param $location
+	 * @return string
+	 */
+	public function redirect_to($location)
+	{
+		return $this->assign('window.location.href', $location);
+	}
+
+	/**
+	 * @param $id
+	 * @return string
+	 */
+	public function remove($id)
+	{
+		if (is_array($id)) {
+			$arr_str = '';
+			foreach ($id as $obj) {
+				if (!empty($arg_str)) {
+					$arg_str .= ', ';
+				}
+				$arg_str .= "'$arg'";
+			}
+
+			return "$A[$arg_str].each(Element.remove)";
+		} else {
+			return "Element.remove('$id')";
+		}
+	}
+
+	/**
+	 * @param $id
+	 * @param $options_for_render
+	 * @return string
+	 */
+	public function replace($id, $options_for_render)
+	{
+		$args = array_merge(array($id), (is_array($options_for_render) ? $options_for_render : array($options_for_render)));
+
+		return $this->call('Element.replace', $args);
+	}
+
+	/**
+	 * @param $id
+	 * @param $options_for_render
+	 * @return string
+	 */
+	public function replace_html($id, $options_for_render)
+	{
+		$args = array_merge(array($id), (is_array($options_for_render) ? $options_for_render : array($options_for_render)));
+
+		return $this->call('Element.update', $args);
+	}
+
+	/**
+	 * @param       $pattern
+	 * @param  null $extend
+	 * @return string
+	 */
+	public function select($pattern, $extend = null)
+	{
+		return "$$('$pattern')" . (!empty($extend)) ? '.' . $extend : '';
+	}
+
+	/**
+	 * @param $id
+	 * @return string
+	 */
+	public function show($id)
+	{
+		return $this->call('Element.show', $id);
+	}
+
+	/**
+	 * @param $id
+	 * @return string
+	 */
+	public function toggle($id)
+	{
+		return $this->call('Element.toggle', $id);
+	}
 }

Spacing +23 added lines, -23 removed lines

@@ -63,7 +63,7 @@ 
     {
         $options['form'] = true;
 
-        return '<form action="' . $options['url'] . '" onsubmit="' . $this->remote_function($options) . '; return false;" method="' . (isset($options['method']) ? $options['method'] : 'post') . '"  >';
+        return '<form action="'.$options['url'].'" onsubmit="'.$this->remote_function($options).'; return false;" method="'.(isset($options['method']) ? $options['method'] : 'post').'"  >';
     }
 
     /**
@@ -112,7 +112,7 @@ 
     public function periodically_call_remote($options = null)
     {
         $frequency = isset($options['frequency']) ? $options['frequency'] : 10;
-        $code      = 'new PeriodicalExecuter(function() {' . $this->remote_function($options) . '},' . $frequency . ')';
+        $code      = 'new PeriodicalExecuter(function() {'.$this->remote_function($options).'},'.$frequency.')';
 
         return $code;
     }
@@ -128,22 +128,22 @@ 
         $update = '';
 
         if (isset($options['update']) && is_array($options['update'])) {
-            $update = isset($options['update']['success']) ? 'success: ' . $options['update']['success'] : '';
+            $update = isset($options['update']['success']) ? 'success: '.$options['update']['success'] : '';
             $update .= empty($update) ? '' : ',';
-            $update .= isset($options['update']['failure']) ? 'failure: ' . $options['update']['failure'] : '';
+            $update .= isset($options['update']['failure']) ? 'failure: '.$options['update']['failure'] : '';
         } else {
             $update .= isset($options['update']) ? $options['update'] : '';
         }
 
-        $ajax_function = empty($update) ? 'new Ajax.Request(' : 'new Ajax.Updater(\'' . $update . '\',';
+        $ajax_function = empty($update) ? 'new Ajax.Request(' : 'new Ajax.Updater(\''.$update.'\',';
 
-        $ajax_function .= "'" . $options['url'] . "'";
-        $ajax_function .= ',' . $javascript_options . ')';
+        $ajax_function .= "'".$options['url']."'";
+        $ajax_function .= ','.$javascript_options.')';
 
-        $ajax_function = isset($options['before']) ? $options['before'] . ';' . $ajax_function : $ajax_function;
-        $ajax_function = isset($options['after']) ? $ajax_function . ';' . $options['after'] : $ajax_function;
-        $ajax_function = isset($options['condition']) ? 'if (' . $options['condition'] . ') {' . $ajax_function . '}' : $ajax_function;
-        $ajax_function = isset($options['confirm']) ? 'if ( confirm(\'' . $options['confirm'] . '\' ) ) { ' . $ajax_function . ' } ' : $ajax_function;
+        $ajax_function = isset($options['before']) ? $options['before'].';'.$ajax_function : $ajax_function;
+        $ajax_function = isset($options['after']) ? $ajax_function.';'.$options['after'] : $ajax_function;
+        $ajax_function = isset($options['condition']) ? 'if ('.$options['condition'].') {'.$ajax_function.'}' : $ajax_function;
+        $ajax_function = isset($options['confirm']) ? 'if ( confirm(\''.$options['confirm'].'\' ) ) { '.$ajax_function.' } ' : $ajax_function;
 
         return $ajax_function;
     }
@@ -160,7 +160,7 @@ 
             $options['with'] = 'Form.serialize(this.form)';
         }
 
-        return '<input type="button" onclick="' . $this->remote_function($options) . '" name="' . $name . '" value ="' . $value . '" />';
+        return '<input type="button" onclick="'.$this->remote_function($options).'" name="'.$name.'" value ="'.$value.'" />';
     }
 
     /**
@@ -203,8 +203,8 @@ 
         $callbacks = array();
         foreach ($options as $callback => $code) {
             if (in_array($callback, $this->CALLBACKS)) {
-                $name             = 'on' . ucfirst($callback);
-                $callbacks[$name] = 'function(request){' . $code . '}';
+                $name             = 'on'.ucfirst($callback);
+                $callbacks[$name] = 'function(request){'.$code.'}';
             }
         }
 
@@ -220,7 +220,7 @@ 
     public function _build_observer($klass, $name, $options = null)
     {
         if (isset($options['with']) && false === strpos($options['with'], '=')) {
-            $options['with'] = '\'' . $options['with'] . '=\' + value';
+            $options['with'] = '\''.$options['with'].'=\' + value';
         } elseif (isset($options['with']) && isset($options['update'])) {
             $options['with'] = 'value';
         }
@@ -228,10 +228,10 @@ 
         $callback = $options['function'] ?: $this->remote_function($options);
 
         $javascript = "new $klass('$name', ";
-        $javascript .= isset($options['frequency']) ? $options['frequency'] . ', ' : '';
+        $javascript .= isset($options['frequency']) ? $options['frequency'].', ' : '';
         $javascript .= 'function (element,value) { ';
         $javascript .= $callback;
-        $javascript .= isset($options['on']) ? ', ' . $options['on'] : '';
+        $javascript .= isset($options['on']) ? ', '.$options['on'] : '';
         $javascript .= '})';
 
         return $javascript;
@@ -263,7 +263,7 @@ 
         }
 
         if (isset($options['position'])) {
-            $js_options['insertion'] = 'Insertion.' . ucfirst($options['position']);
+            $js_options['insertion'] = 'Insertion.'.ucfirst($options['position']);
         }
 
         $js_options['evalScripts'] = isset($options['script']) ? $options['script'] : 'true';
@@ -271,7 +271,7 @@ 
         if (isset($options['form'])) {
             $js_options['parameters'] = 'Form.serialize(this)';
         } elseif (isset($options['parameters'])) {
-            $js_options['parameters'] = 'Form.serialize(\'' . $options['submit'] . '\')';
+            $js_options['parameters'] = 'Form.serialize(\''.$options['submit'].'\')';
         } elseif (isset($options['with'])) {
             $js_options['parameters'] = $options['with'];
         }
@@ -298,7 +298,7 @@ 
      */
     public function ID($id, $extend = null)
     {
-        return "$('$id')" . (!empty($extend)) ? '.' . $extend . '()' : '';
+        return "$('$id')".(!empty($extend)) ? '.'.$extend.'()' : '';
     }
 
     /**
@@ -357,7 +357,7 @@ 
      */
     public function delay($seconds = 1, $script = '')
     {
-        return "setTimeout( function() { $script } , " . ($seconds * 1000) . ' )';
+        return "setTimeout( function() { $script } , ".($seconds * 1000).' )';
     }
 
     /**
@@ -379,7 +379,7 @@ 
     {
         $args = array_merge(array($id), (is_array($options_for_render) ? $options_for_render : array($options_for_render)));
 
-        return $this->call('new Insertion.' . ucfirst($position), $args);
+        return $this->call('new Insertion.'.ucfirst($position), $args);
     }
 
     /**
@@ -443,7 +443,7 @@ 
      */
     public function select($pattern, $extend = null)
     {
-        return "$$('$pattern')" . (!empty($extend)) ? '.' . $extend : '';
+        return "$$('$pattern')".(!empty($extend)) ? '.'.$extend : '';
     }
 
     /**

include/projax/classes/Scriptaculous.php

Doc Comments +1 added lines, -1 removed lines

@@ -248,7 +248,7 @@
     /**
      * @param $field_id
      * @param $options
-     * @return mixed
+     * @return string
      */
     public function auto_complete_field($field_id, $options)
     {

Indentation +305 added lines, -305 removed lines

@@ -15,310 +15,310 @@ 
  */
 class Scriptaculous extends Prototype
 {
-    public $TOGGLE_EFFECTS = array('toggle_appear', 'toggle_slide', 'toggle_blind');
-
-    /**
-     * Scriptaculous constructor.
-     */
-    public function __construct()
-    {
-    }
-
-    /**
-     * @param      $element_id
-     * @param null $options
-     * @return string
-     */
-    public function dragable_element($element_id, $options = null)
-    {
-        return $this->tag($this->_dragable_element_js($element_id, $options));
-    }
-
-    /**
-     * @param      $element_id
-     * @param null $options
-     * @return string
-     */
-    public function drop_receiving_element($element_id, $options = null)
-    {
-        return $this->tag($this->_drop_receiving_element($element_id, $options));
-    }
-
-    /**
-     * @param      $name
-     * @param bool $element_id
-     * @param null $js_options
-     * @return string
-     */
-    public function visual_effect($name, $element_id = false, $js_options = null)
-    {
-        $element = $element_id ? "'$element_id'" : 'element';
-
-        $js_queue = '';
-        if (isset($js_options) && is_array($js_options['queue'])) {
-        } elseif (isset($js_options)) {
-            $js_queue = "'$js_options'";
-        }
-
-        if (in_array($name, $this->TOGGLE_EFFECTS)) {
-            return "Effect.toggle($element,'" . str_replace('toggle_', '', $name) . "'," . $this->_options_for_javascript($js_options) . ')';
-        } else {
-            return 'new Effect.' . ucwords($name) . "($element," . $this->_options_for_javascript($js_options) . ')';
-        }
-    }
-
-    /**
-     * @param      $element_id
-     * @param null $options
-     * @return string
-     */
-    public function sortabe_element($element_id, $options = null)
-    {
-        return $this->tag($this->_sortabe_element($element_id, $options));
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////
-    //                             Private functions
-    /////////////////////////////////////////////////////////////////////////////////////
-
-    /**
-     * @param $element_id
-     * @param $options
-     * @return string
-     */
-
-    public function _sortabe_element($element_id, $options)
-    {
-        //if (isset($options['with']))
-        {
-            $options['with'] = "Sortable.serialize('$element_id')";
-        }
-
-        //if (isset($option['onUpdate']))
-        {
-            $options['onUpdate'] = 'function(){' . $this->remote_function($options) . '}';
-        }
-
-        foreach ($options as $var => $val) {
-            if (in_array($var, $this->AJAX_OPTIONS)) {
-                unset($options[$var]);
-            }
-        }
-
-        $arr = array('tag', 'overlap', 'contraint', 'handle');
-
-        foreach ($arr as $var) {
-            if (isset($options[$var])) {
-                $options[$var] = "'" . $options[$var] . "'";
-            }
-        }
-
-        if (isset($options['containment'])) {
-            $options['containment'] = $this->_array_or_string_for_javascript($options['containment']);
-        }
-
-        if (isset($options['only'])) {
-            $options['only'] = $this->_array_or_string_for_javascript($options['only']);
-        }
-
-        return "Sortable.create('$element_id'," . $this->_options_for_javascript($options) . ')';
-    }
-
-    /**
-     * @param $element_id
-     * @param $options
-     * @return string
-     */
-    public function _dragable_element_js($element_id, $options)
-    {
-        return 'new Draggable(\'' . $element_id . '\',' . $this->_options_for_javascript($options) . ')';
-    }
-
-    /**
-     * @param $element_id
-     * @param $options
-     * @return string
-     */
-    public function _drop_receiving_element($element_id, $options)
-    {
-
-        //if (isset($options['with']))
-        {
-            $options['with'] = '\'id=\' + encodeURIComponent(element.id)';
-        }
-
-        //if (isset($option['onDrop']))
-        {
-            $options['onDrop'] = 'function(element){' . $this->remote_function($options) . '}';
-        }
-
-        if (is_array($options)) {
-            foreach ($options as $var => $val) {
-                if (in_array($var, $this->AJAX_OPTIONS)) {
-                    unset($options[$var]);
-                }
-            }
-        }
-
-        if (isset($options['accept'])) {
-            $options['accept'] = $this->_array_or_string_for_javascript($options['accept']);
-        }
-
-        if (isset($options['hoverclass'])) {
-            $options['hoverclass'] = "'" . $options['hoverclass'] . "'";
-        }
-
-        return 'Droppables.add(\'' . $element_id . '\',' . $this->_options_for_javascript($options) . ')';
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////
-    //                            Merged Javascript macro
-    /////////////////////////////////////////////////////////////////////////////////////
-
-    /**
-     * @param      $field_id
-     * @param      $options
-     * @param bool $tag
-     * @return string
-     */
-    public function in_place_editor($field_id, $options, $tag = true)
-    {
-        $function = 'new Ajax.InPlaceEditor(';
-        $function .= "'$field_id', ";
-        $function .= "'" . $options['url'] . "'";
-
-        $js_options = array();
-        if (isset($options['cancel_text'])) {
-            $js_options['cancelText'] = $options['cancel_text'];
-        }
-        if (isset($options['save_text'])) {
-            $js_options['okText'] = $options['save_text'];
-        }
-        if (isset($options['loading_text'])) {
-            $js_options['loadingText'] = $options['loading_text'];
-        }
-        if (isset($options['rows'])) {
-            $js_options['rows'] = $options['rows'];
-        }
-        if (isset($options['cols'])) {
-            $js_options['cols'] = $options['cols'];
-        }
-        if (isset($options['size'])) {
-            $js_options['size'] = $options['size'];
-        }
-        if (isset($options['external_control'])) {
-            $js_options['externalControl'] = "'" . $options['external_control'] . "'";
-        }
-        if (isset($options['load_text_url'])) {
-            $js_options['loadTextURL'] = "'" . $options['load_text_url'] . "'";
-        }
-        if (isset($options['options'])) {
-            $js_options['ajaxOptions'] = $options['options'];
-        }
-        if (isset($options['script'])) {
-            $js_options['evalScripts'] = $options['script'];
-        }
-        if (isset($options['with'])) {
-            $js_options['callback'] = 'function(form) { return ' . $options['with'] . ' }';
-        }
-
-        $function .= ', ' . $this->_options_for_javascript($js_options) . ' )';
-        if ($tag) {
-            return $this->tag($function);
-        } else {
-            return $function;
-        }
-    }
-
-    /**
-     * @param      $object
-     * @param null $tag_options
-     * @param null $in_place_editor_options
-     * @return string
-     */
-    public function in_place_editor_field($object, $tag_options = null, $in_place_editor_options = null)
-    {
-        $ret_val = '';
-        $ret_val .= '<span id="' . $object . '" class="in_place_editor_field">' . (isset($tag_options['value']) ? $tag_options['value'] : '') . '</span>';
-        $ret_val .= $this->in_place_editor($object, $in_place_editor_options);
-
-        return $ret_val;
-    }
-
-    /**
-     * @param $field_id
-     * @param $options
-     * @return mixed
-     */
-    public function auto_complete_field($field_id, $options)
-    {
-        $function = "var $field_id" . '_auto_completer = new Ajax.Autocompleter(';
-        $function .= "'$field_id', ";
-        $function .= "'" . (isset($options['update']) ? $options['update'] : $field_id . '_auto_complete') . "', ";
-        $function .= "'" . $options['url'] . "'";
-
-        $js_options = array();
-        if (isset($options['tokens'])) {
-            $js_options['tokens'] = $this->javascript->_array_or_string_for_javascript($options['tokens']);
-        }
-        if (isset($options['with'])) {
-            $js_options['callback'] = 'function(element, value) { return ' . $options['with'] . ' }';
-        }
-        if (isset($options['indicator'])) {
-            $js_options['indicator'] = "'" . $options['indicator'] . "'";
-        }
-        if (isset($options['select'])) {
-            $js_options['select'] = "'" . $options['select'] . "'";
-        }
-
-        foreach (array('on_show' => 'onShow', 'on_hide' => 'onHide', 'min_chars' => 'min_chars') as $var => $val) {
-            if (isset($options[$var])) {
-                $js_options['$val'] = $options['var'];
-            }
-        }
-
-        $function .= ', ' . $this->_options_for_javascript($js_options) . ' )';
-
-        return $this->tag($function);
-    }
-
-    /**
-     * @param      $entries
-     * @param      $field
-     * @param null $phrase
-     */
-    public function auto_complete_results($entries, $field, $phrase = null)
-    {
-        if (!is_array($entries)) {
-            return;
-        }
-        $ret_val = '<ul>';
-        //  Complete this function
-    }
-
-    /**
-     * @param      $object
-     * @param null $tag_options
-     * @param null $completion_options
-     * @return string
-     */
-    public function text_field_with_auto_complete($object, $tag_options = null, $completion_options = null)
-    {
-        $ret_val = isset($completion_options['skip_style']) ? '' : $this->_auto_complete_stylesheet();
-        $ret_val .= '<input autocomplete="off" id="' . $object . '" name="' . $object . '" size="' . (isset($tag_options['size']) ? $tag_options['size'] : 30) . '" type="text" value="' . (isset($tag_options['size']) ? $tag_options['value'] : '') . '" ' . (isset($tag_options['class']) ? 'class = "' . $tag_options['class'] . '" ' : '') . '/>';
-
-        $ret_val .= '<div id="' . $object . '_auto_complete" class="auto_complete"></div>';
-        $ret_val .= $this->auto_complete_field($object, $completion_options);
-
-        return $ret_val;
-    }
-
-    /**
-     * @return string
-     */
-    public function _auto_complete_stylesheet()
-    {
-        return '<style> div.auto_complete {
+	public $TOGGLE_EFFECTS = array('toggle_appear', 'toggle_slide', 'toggle_blind');
+
+	/**
+	 * Scriptaculous constructor.
+	 */
+	public function __construct()
+	{
+	}
+
+	/**
+	 * @param      $element_id
+	 * @param null $options
+	 * @return string
+	 */
+	public function dragable_element($element_id, $options = null)
+	{
+		return $this->tag($this->_dragable_element_js($element_id, $options));
+	}
+
+	/**
+	 * @param      $element_id
+	 * @param null $options
+	 * @return string
+	 */
+	public function drop_receiving_element($element_id, $options = null)
+	{
+		return $this->tag($this->_drop_receiving_element($element_id, $options));
+	}
+
+	/**
+	 * @param      $name
+	 * @param bool $element_id
+	 * @param null $js_options
+	 * @return string
+	 */
+	public function visual_effect($name, $element_id = false, $js_options = null)
+	{
+		$element = $element_id ? "'$element_id'" : 'element';
+
+		$js_queue = '';
+		if (isset($js_options) && is_array($js_options['queue'])) {
+		} elseif (isset($js_options)) {
+			$js_queue = "'$js_options'";
+		}
+
+		if (in_array($name, $this->TOGGLE_EFFECTS)) {
+			return "Effect.toggle($element,'" . str_replace('toggle_', '', $name) . "'," . $this->_options_for_javascript($js_options) . ')';
+		} else {
+			return 'new Effect.' . ucwords($name) . "($element," . $this->_options_for_javascript($js_options) . ')';
+		}
+	}
+
+	/**
+	 * @param      $element_id
+	 * @param null $options
+	 * @return string
+	 */
+	public function sortabe_element($element_id, $options = null)
+	{
+		return $this->tag($this->_sortabe_element($element_id, $options));
+	}
+
+	/////////////////////////////////////////////////////////////////////////////////////
+	//                             Private functions
+	/////////////////////////////////////////////////////////////////////////////////////
+
+	/**
+	 * @param $element_id
+	 * @param $options
+	 * @return string
+	 */
+
+	public function _sortabe_element($element_id, $options)
+	{
+		//if (isset($options['with']))
+		{
+			$options['with'] = "Sortable.serialize('$element_id')";
+		}
+
+		//if (isset($option['onUpdate']))
+		{
+			$options['onUpdate'] = 'function(){' . $this->remote_function($options) . '}';
+		}
+
+		foreach ($options as $var => $val) {
+			if (in_array($var, $this->AJAX_OPTIONS)) {
+				unset($options[$var]);
+			}
+		}
+
+		$arr = array('tag', 'overlap', 'contraint', 'handle');
+
+		foreach ($arr as $var) {
+			if (isset($options[$var])) {
+				$options[$var] = "'" . $options[$var] . "'";
+			}
+		}
+
+		if (isset($options['containment'])) {
+			$options['containment'] = $this->_array_or_string_for_javascript($options['containment']);
+		}
+
+		if (isset($options['only'])) {
+			$options['only'] = $this->_array_or_string_for_javascript($options['only']);
+		}
+
+		return "Sortable.create('$element_id'," . $this->_options_for_javascript($options) . ')';
+	}
+
+	/**
+	 * @param $element_id
+	 * @param $options
+	 * @return string
+	 */
+	public function _dragable_element_js($element_id, $options)
+	{
+		return 'new Draggable(\'' . $element_id . '\',' . $this->_options_for_javascript($options) . ')';
+	}
+
+	/**
+	 * @param $element_id
+	 * @param $options
+	 * @return string
+	 */
+	public function _drop_receiving_element($element_id, $options)
+	{
+
+		//if (isset($options['with']))
+		{
+			$options['with'] = '\'id=\' + encodeURIComponent(element.id)';
+		}
+
+		//if (isset($option['onDrop']))
+		{
+			$options['onDrop'] = 'function(element){' . $this->remote_function($options) . '}';
+		}
+
+		if (is_array($options)) {
+			foreach ($options as $var => $val) {
+				if (in_array($var, $this->AJAX_OPTIONS)) {
+					unset($options[$var]);
+				}
+			}
+		}
+
+		if (isset($options['accept'])) {
+			$options['accept'] = $this->_array_or_string_for_javascript($options['accept']);
+		}
+
+		if (isset($options['hoverclass'])) {
+			$options['hoverclass'] = "'" . $options['hoverclass'] . "'";
+		}
+
+		return 'Droppables.add(\'' . $element_id . '\',' . $this->_options_for_javascript($options) . ')';
+	}
+
+	/////////////////////////////////////////////////////////////////////////////////////
+	//                            Merged Javascript macro
+	/////////////////////////////////////////////////////////////////////////////////////
+
+	/**
+	 * @param      $field_id
+	 * @param      $options
+	 * @param bool $tag
+	 * @return string
+	 */
+	public function in_place_editor($field_id, $options, $tag = true)
+	{
+		$function = 'new Ajax.InPlaceEditor(';
+		$function .= "'$field_id', ";
+		$function .= "'" . $options['url'] . "'";
+
+		$js_options = array();
+		if (isset($options['cancel_text'])) {
+			$js_options['cancelText'] = $options['cancel_text'];
+		}
+		if (isset($options['save_text'])) {
+			$js_options['okText'] = $options['save_text'];
+		}
+		if (isset($options['loading_text'])) {
+			$js_options['loadingText'] = $options['loading_text'];
+		}
+		if (isset($options['rows'])) {
+			$js_options['rows'] = $options['rows'];
+		}
+		if (isset($options['cols'])) {
+			$js_options['cols'] = $options['cols'];
+		}
+		if (isset($options['size'])) {
+			$js_options['size'] = $options['size'];
+		}
+		if (isset($options['external_control'])) {
+			$js_options['externalControl'] = "'" . $options['external_control'] . "'";
+		}
+		if (isset($options['load_text_url'])) {
+			$js_options['loadTextURL'] = "'" . $options['load_text_url'] . "'";
+		}
+		if (isset($options['options'])) {
+			$js_options['ajaxOptions'] = $options['options'];
+		}
+		if (isset($options['script'])) {
+			$js_options['evalScripts'] = $options['script'];
+		}
+		if (isset($options['with'])) {
+			$js_options['callback'] = 'function(form) { return ' . $options['with'] . ' }';
+		}
+
+		$function .= ', ' . $this->_options_for_javascript($js_options) . ' )';
+		if ($tag) {
+			return $this->tag($function);
+		} else {
+			return $function;
+		}
+	}
+
+	/**
+	 * @param      $object
+	 * @param null $tag_options
+	 * @param null $in_place_editor_options
+	 * @return string
+	 */
+	public function in_place_editor_field($object, $tag_options = null, $in_place_editor_options = null)
+	{
+		$ret_val = '';
+		$ret_val .= '<span id="' . $object . '" class="in_place_editor_field">' . (isset($tag_options['value']) ? $tag_options['value'] : '') . '</span>';
+		$ret_val .= $this->in_place_editor($object, $in_place_editor_options);
+
+		return $ret_val;
+	}
+
+	/**
+	 * @param $field_id
+	 * @param $options
+	 * @return mixed
+	 */
+	public function auto_complete_field($field_id, $options)
+	{
+		$function = "var $field_id" . '_auto_completer = new Ajax.Autocompleter(';
+		$function .= "'$field_id', ";
+		$function .= "'" . (isset($options['update']) ? $options['update'] : $field_id . '_auto_complete') . "', ";
+		$function .= "'" . $options['url'] . "'";
+
+		$js_options = array();
+		if (isset($options['tokens'])) {
+			$js_options['tokens'] = $this->javascript->_array_or_string_for_javascript($options['tokens']);
+		}
+		if (isset($options['with'])) {
+			$js_options['callback'] = 'function(element, value) { return ' . $options['with'] . ' }';
+		}
+		if (isset($options['indicator'])) {
+			$js_options['indicator'] = "'" . $options['indicator'] . "'";
+		}
+		if (isset($options['select'])) {
+			$js_options['select'] = "'" . $options['select'] . "'";
+		}
+
+		foreach (array('on_show' => 'onShow', 'on_hide' => 'onHide', 'min_chars' => 'min_chars') as $var => $val) {
+			if (isset($options[$var])) {
+				$js_options['$val'] = $options['var'];
+			}
+		}
+
+		$function .= ', ' . $this->_options_for_javascript($js_options) . ' )';
+
+		return $this->tag($function);
+	}
+
+	/**
+	 * @param      $entries
+	 * @param      $field
+	 * @param null $phrase
+	 */
+	public function auto_complete_results($entries, $field, $phrase = null)
+	{
+		if (!is_array($entries)) {
+			return;
+		}
+		$ret_val = '<ul>';
+		//  Complete this function
+	}
+
+	/**
+	 * @param      $object
+	 * @param null $tag_options
+	 * @param null $completion_options
+	 * @return string
+	 */
+	public function text_field_with_auto_complete($object, $tag_options = null, $completion_options = null)
+	{
+		$ret_val = isset($completion_options['skip_style']) ? '' : $this->_auto_complete_stylesheet();
+		$ret_val .= '<input autocomplete="off" id="' . $object . '" name="' . $object . '" size="' . (isset($tag_options['size']) ? $tag_options['size'] : 30) . '" type="text" value="' . (isset($tag_options['size']) ? $tag_options['value'] : '') . '" ' . (isset($tag_options['class']) ? 'class = "' . $tag_options['class'] . '" ' : '') . '/>';
+
+		$ret_val .= '<div id="' . $object . '_auto_complete" class="auto_complete"></div>';
+		$ret_val .= $this->auto_complete_field($object, $completion_options);
+
+		return $ret_val;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function _auto_complete_stylesheet()
+	{
+		return '<style> div.auto_complete {
                   width: 350px;
                   background: #fff;
                  }
@@ -342,5 +342,5 @@ 
                    padding:0;
                  }
                  </style>';
-    }
+	}
 }

Spacing +24 added lines, -24 removed lines

@@ -61,9 +61,9 @@ 
         }
 
         if (in_array($name, $this->TOGGLE_EFFECTS)) {
-            return "Effect.toggle($element,'" . str_replace('toggle_', '', $name) . "'," . $this->_options_for_javascript($js_options) . ')';
+            return "Effect.toggle($element,'".str_replace('toggle_', '', $name)."',".$this->_options_for_javascript($js_options).')';
         } else {
-            return 'new Effect.' . ucwords($name) . "($element," . $this->_options_for_javascript($js_options) . ')';
+            return 'new Effect.'.ucwords($name)."($element,".$this->_options_for_javascript($js_options).')';
         }
     }
 
@@ -96,7 +96,7 @@ 
 
         //if (isset($option['onUpdate']))
         {
-            $options['onUpdate'] = 'function(){' . $this->remote_function($options) . '}';
+            $options['onUpdate'] = 'function(){'.$this->remote_function($options).'}';
         }
 
         foreach ($options as $var => $val) {
@@ -109,7 +109,7 @@ 
 
         foreach ($arr as $var) {
             if (isset($options[$var])) {
-                $options[$var] = "'" . $options[$var] . "'";
+                $options[$var] = "'".$options[$var]."'";
             }
         }
 
@@ -121,7 +121,7 @@ 
             $options['only'] = $this->_array_or_string_for_javascript($options['only']);
         }
 
-        return "Sortable.create('$element_id'," . $this->_options_for_javascript($options) . ')';
+        return "Sortable.create('$element_id',".$this->_options_for_javascript($options).')';
     }
 
     /**
@@ -131,7 +131,7 @@ 
      */
     public function _dragable_element_js($element_id, $options)
     {
-        return 'new Draggable(\'' . $element_id . '\',' . $this->_options_for_javascript($options) . ')';
+        return 'new Draggable(\''.$element_id.'\','.$this->_options_for_javascript($options).')';
     }
 
     /**
@@ -149,7 +149,7 @@ 
 
         //if (isset($option['onDrop']))
         {
-            $options['onDrop'] = 'function(element){' . $this->remote_function($options) . '}';
+            $options['onDrop'] = 'function(element){'.$this->remote_function($options).'}';
         }
 
         if (is_array($options)) {
@@ -165,10 +165,10 @@ 
         }
 
         if (isset($options['hoverclass'])) {
-            $options['hoverclass'] = "'" . $options['hoverclass'] . "'";
+            $options['hoverclass'] = "'".$options['hoverclass']."'";
         }
 
-        return 'Droppables.add(\'' . $element_id . '\',' . $this->_options_for_javascript($options) . ')';
+        return 'Droppables.add(\''.$element_id.'\','.$this->_options_for_javascript($options).')';
     }
 
     /////////////////////////////////////////////////////////////////////////////////////
@@ -185,7 +185,7 @@ 
     {
         $function = 'new Ajax.InPlaceEditor(';
         $function .= "'$field_id', ";
-        $function .= "'" . $options['url'] . "'";
+        $function .= "'".$options['url']."'";
 
         $js_options = array();
         if (isset($options['cancel_text'])) {
@@ -207,10 +207,10 @@ 
             $js_options['size'] = $options['size'];
         }
         if (isset($options['external_control'])) {
-            $js_options['externalControl'] = "'" . $options['external_control'] . "'";
+            $js_options['externalControl'] = "'".$options['external_control']."'";
         }
         if (isset($options['load_text_url'])) {
-            $js_options['loadTextURL'] = "'" . $options['load_text_url'] . "'";
+            $js_options['loadTextURL'] = "'".$options['load_text_url']."'";
         }
         if (isset($options['options'])) {
             $js_options['ajaxOptions'] = $options['options'];
@@ -219,10 +219,10 @@ 
             $js_options['evalScripts'] = $options['script'];
         }
         if (isset($options['with'])) {
-            $js_options['callback'] = 'function(form) { return ' . $options['with'] . ' }';
+            $js_options['callback'] = 'function(form) { return '.$options['with'].' }';
         }
 
-        $function .= ', ' . $this->_options_for_javascript($js_options) . ' )';
+        $function .= ', '.$this->_options_for_javascript($js_options).' )';
         if ($tag) {
             return $this->tag($function);
         } else {
@@ -239,7 +239,7 @@ 
     public function in_place_editor_field($object, $tag_options = null, $in_place_editor_options = null)
     {
         $ret_val = '';
-        $ret_val .= '<span id="' . $object . '" class="in_place_editor_field">' . (isset($tag_options['value']) ? $tag_options['value'] : '') . '</span>';
+        $ret_val .= '<span id="'.$object.'" class="in_place_editor_field">'.(isset($tag_options['value']) ? $tag_options['value'] : '').'</span>';
         $ret_val .= $this->in_place_editor($object, $in_place_editor_options);
 
         return $ret_val;
@@ -252,23 +252,23 @@ 
      */
     public function auto_complete_field($field_id, $options)
     {
-        $function = "var $field_id" . '_auto_completer = new Ajax.Autocompleter(';
+        $function = "var $field_id".'_auto_completer = new Ajax.Autocompleter(';
         $function .= "'$field_id', ";
-        $function .= "'" . (isset($options['update']) ? $options['update'] : $field_id . '_auto_complete') . "', ";
-        $function .= "'" . $options['url'] . "'";
+        $function .= "'".(isset($options['update']) ? $options['update'] : $field_id.'_auto_complete')."', ";
+        $function .= "'".$options['url']."'";
 
         $js_options = array();
         if (isset($options['tokens'])) {
             $js_options['tokens'] = $this->javascript->_array_or_string_for_javascript($options['tokens']);
         }
         if (isset($options['with'])) {
-            $js_options['callback'] = 'function(element, value) { return ' . $options['with'] . ' }';
+            $js_options['callback'] = 'function(element, value) { return '.$options['with'].' }';
         }
         if (isset($options['indicator'])) {
-            $js_options['indicator'] = "'" . $options['indicator'] . "'";
+            $js_options['indicator'] = "'".$options['indicator']."'";
         }
         if (isset($options['select'])) {
-            $js_options['select'] = "'" . $options['select'] . "'";
+            $js_options['select'] = "'".$options['select']."'";
         }
 
         foreach (array('on_show' => 'onShow', 'on_hide' => 'onHide', 'min_chars' => 'min_chars') as $var => $val) {
@@ -277,7 +277,7 @@ 
             }
         }
 
-        $function .= ', ' . $this->_options_for_javascript($js_options) . ' )';
+        $function .= ', '.$this->_options_for_javascript($js_options).' )';
 
         return $this->tag($function);
     }
@@ -305,9 +305,9 @@ 
     public function text_field_with_auto_complete($object, $tag_options = null, $completion_options = null)
     {
         $ret_val = isset($completion_options['skip_style']) ? '' : $this->_auto_complete_stylesheet();
-        $ret_val .= '<input autocomplete="off" id="' . $object . '" name="' . $object . '" size="' . (isset($tag_options['size']) ? $tag_options['size'] : 30) . '" type="text" value="' . (isset($tag_options['size']) ? $tag_options['value'] : '') . '" ' . (isset($tag_options['class']) ? 'class = "' . $tag_options['class'] . '" ' : '') . '/>';
+        $ret_val .= '<input autocomplete="off" id="'.$object.'" name="'.$object.'" size="'.(isset($tag_options['size']) ? $tag_options['size'] : 30).'" type="text" value="'.(isset($tag_options['size']) ? $tag_options['value'] : '').'" '.(isset($tag_options['class']) ? 'class = "'.$tag_options['class'].'" ' : '').'/>';
 
-        $ret_val .= '<div id="' . $object . '_auto_complete" class="auto_complete"></div>';
+        $ret_val .= '<div id="'.$object.'_auto_complete" class="auto_complete"></div>';
         $ret_val .= $this->auto_complete_field($object, $completion_options);
 
         return $ret_val;

plugins/smartpartner.php

Indentation +8 added lines, -8 removed lines

@@ -9,15 +9,15 @@
 
 function smartobject_plugin_smartpartner()
 {
-    $pluginInfo = array();
+	$pluginInfo = array();
 
-    $pluginInfo['items']['partner']['caption'] = 'Partner';
-    $pluginInfo['items']['partner']['url']     = 'partner.php?partnerid=%u';
-    $pluginInfo['items']['partner']['request'] = 'partnerid';
+	$pluginInfo['items']['partner']['caption'] = 'Partner';
+	$pluginInfo['items']['partner']['url']     = 'partner.php?partnerid=%u';
+	$pluginInfo['items']['partner']['request'] = 'partnerid';
 
-    $pluginInfo['items']['category']['caption'] = 'Category';
-    $pluginInfo['items']['category']['url']     = 'index.php?view_category_id=%u';
-    $pluginInfo['items']['category']['request'] = 'view_category_id';
+	$pluginInfo['items']['category']['caption'] = 'Category';
+	$pluginInfo['items']['category']['url']     = 'index.php?view_category_id=%u';
+	$pluginInfo['items']['category']['request'] = 'view_category_id';
 
-    return $pluginInfo;
+	return $pluginInfo;
 }

plugins/smartsection.php

Indentation +8 added lines, -8 removed lines

@@ -9,15 +9,15 @@
 
 function smartobject_plugin_smartsection()
 {
-    $pluginInfo = array();
+	$pluginInfo = array();
 
-    $pluginInfo['items']['item']['caption'] = 'Article';
-    $pluginInfo['items']['item']['url']     = 'item.php?itemid=%u';
-    $pluginInfo['items']['item']['request'] = 'itemid';
+	$pluginInfo['items']['item']['caption'] = 'Article';
+	$pluginInfo['items']['item']['url']     = 'item.php?itemid=%u';
+	$pluginInfo['items']['item']['request'] = 'itemid';
 
-    $pluginInfo['items']['category']['caption'] = 'Category';
-    $pluginInfo['items']['category']['url']     = 'category.php?categoryid=%u';
-    $pluginInfo['items']['category']['request'] = 'categoryid';
+	$pluginInfo['items']['category']['caption'] = 'Category';
+	$pluginInfo['items']['category']['url']     = 'category.php?categoryid=%u';
+	$pluginInfo['items']['category']['request'] = 'categoryid';
 
-    return $pluginInfo;
+	return $pluginInfo;
 }

plugins/xcgal.php

Indentation +6 added lines, -6 removed lines

@@ -9,12 +9,12 @@
 
 function smartobject_plugin_xcgal()
 {
-    global $xoopsConfig;
+	global $xoopsConfig;
 
-    $pluginInfo                              = array();
-    $pluginInfo['items']['album']['caption'] = 'Album';
-    $pluginInfo['items']['item']['url']      = 'thumbnails.php?album=%u';
-    $pluginInfo['items']['item']['request']  = 'album';
+	$pluginInfo                              = array();
+	$pluginInfo['items']['album']['caption'] = 'Album';
+	$pluginInfo['items']['item']['url']      = 'thumbnails.php?album=%u';
+	$pluginInfo['items']['item']['request']  = 'album';
 
-    return $pluginInfo;
+	return $pluginInfo;
 }

plugins/smartshop.php

Indentation +8 added lines, -8 removed lines

@@ -9,15 +9,15 @@
 
 function smartobject_plugin_smartshop()
 {
-    $pluginInfo = array();
+	$pluginInfo = array();
 
-    $pluginInfo['items']['item']['caption'] = 'Item';
-    $pluginInfo['items']['item']['url']     = 'item.php?itemid=%u';
-    $pluginInfo['items']['item']['request'] = 'itemid';
+	$pluginInfo['items']['item']['caption'] = 'Item';
+	$pluginInfo['items']['item']['url']     = 'item.php?itemid=%u';
+	$pluginInfo['items']['item']['request'] = 'itemid';
 
-    $pluginInfo['items']['category']['caption'] = 'Category';
-    $pluginInfo['items']['category']['url']     = 'category.php?categoryid=%u';
-    $pluginInfo['items']['category']['request'] = 'categoryid';
+	$pluginInfo['items']['category']['caption'] = 'Category';
+	$pluginInfo['items']['category']['url']     = 'category.php?categoryid=%u';
+	$pluginInfo['items']['category']['request'] = 'categoryid';
 
-    return $pluginInfo;
+	return $pluginInfo;
 }

plugins/smartband.php

Indentation +10 added lines, -10 removed lines

@@ -9,17 +9,17 @@
 
 function smartobject_plugin_smartband()
 {
-    global $xoopsConfig;
-    include_once(XOOPS_ROOT_PATH . '/modules/smartband/language/' . $xoopsConfig['language'] . '/main.php');
+	global $xoopsConfig;
+	include_once(XOOPS_ROOT_PATH . '/modules/smartband/language/' . $xoopsConfig['language'] . '/main.php');
 
-    $pluginInfo                             = array();
-    $pluginInfo['items']['item']['caption'] = _MD_ARTALBUM_ITEM_CAP;
-    $pluginInfo['items']['item']['url']     = 'item.php?itemid=%u';
-    $pluginInfo['items']['item']['request'] = 'itemid';
+	$pluginInfo                             = array();
+	$pluginInfo['items']['item']['caption'] = _MD_ARTALBUM_ITEM_CAP;
+	$pluginInfo['items']['item']['url']     = 'item.php?itemid=%u';
+	$pluginInfo['items']['item']['request'] = 'itemid';
 
-    $pluginInfo['items']['category']['caption'] = _MD_ARTALBUM_CATEGORY;
-    $pluginInfo['items']['category']['url']     = 'category.php?categoryid=%u';
-    $pluginInfo['items']['category']['request'] = 'categoryid';
+	$pluginInfo['items']['category']['caption'] = _MD_ARTALBUM_CATEGORY;
+	$pluginInfo['items']['category']['url']     = 'category.php?categoryid=%u';
+	$pluginInfo['items']['category']['request'] = 'categoryid';
 
-    return $pluginInfo;
+	return $pluginInfo;
 }

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 function smartobject_plugin_smartband()
 {
     global $xoopsConfig;
-    include_once(XOOPS_ROOT_PATH . '/modules/smartband/language/' . $xoopsConfig['language'] . '/main.php');
+    include_once(XOOPS_ROOT_PATH.'/modules/smartband/language/'.$xoopsConfig['language'].'/main.php');
 
     $pluginInfo                             = array();
     $pluginInfo['items']['item']['caption'] = _MD_ARTALBUM_ITEM_CAP;