XoopsModules25x / efqdirectory

class/utility.php

Indentation +138 added lines, -138 removed lines

@@ -5,149 +5,149 @@
  */
 class EfqDirectoryUtility extends XoopsObject
 {
-    /**
-     * Function responsible for checking if a directory exists, we can also write in and create an index.html file
-     *
-     * @param string $folder The full path of the directory to check
-     *
-     * @return void
-     */
-    public static function createFolder($folder)
-    {
-        //        try {
-        //            if (!mkdir($folder) && !is_dir($folder)) {
-        //                throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
-        //            } else {
-        //                file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
-        //            }
-        //        }
-        //        catch (Exception $e) {
-        //            echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
-        //        }
-        try {
-            if (!file_exists($folder)) {
-                if (!mkdir($folder) && !is_dir($folder)) {
-                    throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
-                } else {
-                    file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
-                }
-            }
-        } catch (Exception $e) {
-            echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
-        }
-    }
+	/**
+	 * Function responsible for checking if a directory exists, we can also write in and create an index.html file
+	 *
+	 * @param string $folder The full path of the directory to check
+	 *
+	 * @return void
+	 */
+	public static function createFolder($folder)
+	{
+		//        try {
+		//            if (!mkdir($folder) && !is_dir($folder)) {
+		//                throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
+		//            } else {
+		//                file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
+		//            }
+		//        }
+		//        catch (Exception $e) {
+		//            echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
+		//        }
+		try {
+			if (!file_exists($folder)) {
+				if (!mkdir($folder) && !is_dir($folder)) {
+					throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
+				} else {
+					file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
+				}
+			}
+		} catch (Exception $e) {
+			echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
+		}
+	}
 
-    /**
-     * @param $file
-     * @param $folder
-     * @return bool
-     */
-    public static function copyFile($file, $folder)
-    {
-        return copy($file, $folder);
-        //        try {
-        //            if (!is_dir($folder)) {
-        //                throw new \RuntimeException(sprintf('Unable to copy file as: %s ', $folder));
-        //            } else {
-        //                return copy($file, $folder);
-        //            }
-        //        } catch (Exception $e) {
-        //            echo 'Caught exception: ', $e->getMessage(), "\n", "<br>";
-        //        }
-        //        return false;
-    }
+	/**
+	 * @param $file
+	 * @param $folder
+	 * @return bool
+	 */
+	public static function copyFile($file, $folder)
+	{
+		return copy($file, $folder);
+		//        try {
+		//            if (!is_dir($folder)) {
+		//                throw new \RuntimeException(sprintf('Unable to copy file as: %s ', $folder));
+		//            } else {
+		//                return copy($file, $folder);
+		//            }
+		//        } catch (Exception $e) {
+		//            echo 'Caught exception: ', $e->getMessage(), "\n", "<br>";
+		//        }
+		//        return false;
+	}
 
-    /**
-     * @param $src
-     * @param $dst
-     */
-    public static function recurseCopy($src, $dst)
-    {
-        $dir = opendir($src);
-        //    @mkdir($dst);
-        while (false !== ($file = readdir($dir))) {
-            if (($file !== '.') && ($file !== '..')) {
-                if (is_dir($src . '/' . $file)) {
-                    self::recurseCopy($src . '/' . $file, $dst . '/' . $file);
-                } else {
-                    copy($src . '/' . $file, $dst . '/' . $file);
-                }
-            }
-        }
-        closedir($dir);
-    }
+	/**
+	 * @param $src
+	 * @param $dst
+	 */
+	public static function recurseCopy($src, $dst)
+	{
+		$dir = opendir($src);
+		//    @mkdir($dst);
+		while (false !== ($file = readdir($dir))) {
+			if (($file !== '.') && ($file !== '..')) {
+				if (is_dir($src . '/' . $file)) {
+					self::recurseCopy($src . '/' . $file, $dst . '/' . $file);
+				} else {
+					copy($src . '/' . $file, $dst . '/' . $file);
+				}
+			}
+		}
+		closedir($dir);
+	}
 
-    /**
-     *
-     * Verifies XOOPS version meets minimum requirements for this module
-     * @static
-     * @param XoopsModule $module
-     * @param null|string $requiredVer
-     *
-     * @return bool true if meets requirements, false if not
-     */
-    public static function checkVerXoops(XoopsModule $module = null, $requiredVer = null)
-    {
-        $moduleDirName = basename(dirname(__DIR__));
-        if (null === $module) {
-            $module = XoopsModule::getByDirname($moduleDirName);
-        }
-        xoops_loadLanguage('admin', $moduleDirName);
-        //check for minimum XOOPS version
-        $currentVer = substr(XOOPS_VERSION, 6); // get the numeric part of string
-        $currArray  = explode('.', $currentVer);
-        if (null === $requiredVer) {
-            $requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string
-        }
-        $reqArray = explode('.', $requiredVer);
-        $success  = true;
-        foreach ($reqArray as $k => $v) {
-            if (isset($currArray[$k])) {
-                if ($currArray[$k] > $v) {
-                    break;
-                } elseif ($currArray[$k] == $v) {
-                    continue;
-                } else {
-                    $success = false;
-                    break;
-                }
-            } else {
-                if ((int)$v > 0) { // handles things like x.x.x.0_RC2
-                    $success = false;
-                    break;
-                }
-            }
-        }
+	/**
+	 *
+	 * Verifies XOOPS version meets minimum requirements for this module
+	 * @static
+	 * @param XoopsModule $module
+	 * @param null|string $requiredVer
+	 *
+	 * @return bool true if meets requirements, false if not
+	 */
+	public static function checkVerXoops(XoopsModule $module = null, $requiredVer = null)
+	{
+		$moduleDirName = basename(dirname(__DIR__));
+		if (null === $module) {
+			$module = XoopsModule::getByDirname($moduleDirName);
+		}
+		xoops_loadLanguage('admin', $moduleDirName);
+		//check for minimum XOOPS version
+		$currentVer = substr(XOOPS_VERSION, 6); // get the numeric part of string
+		$currArray  = explode('.', $currentVer);
+		if (null === $requiredVer) {
+			$requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string
+		}
+		$reqArray = explode('.', $requiredVer);
+		$success  = true;
+		foreach ($reqArray as $k => $v) {
+			if (isset($currArray[$k])) {
+				if ($currArray[$k] > $v) {
+					break;
+				} elseif ($currArray[$k] == $v) {
+					continue;
+				} else {
+					$success = false;
+					break;
+				}
+			} else {
+				if ((int)$v > 0) { // handles things like x.x.x.0_RC2
+					$success = false;
+					break;
+				}
+			}
+		}
 
-        if (!$success) {
-            $module->setErrors(sprintf(_AM_EFQDIR_ERROR_BAD_XOOPS, $requiredVer, $currentVer));
-        }
+		if (!$success) {
+			$module->setErrors(sprintf(_AM_EFQDIR_ERROR_BAD_XOOPS, $requiredVer, $currentVer));
+		}
 
-        return $success;
-    }
+		return $success;
+	}
 
-    /**
-     *
-     * Verifies PHP version meets minimum requirements for this module
-     * @static
-     * @param XoopsModule $module
-     *
-     * @return bool true if meets requirements, false if not
-     */
-    public static function checkVerPhp(XoopsModule $module)
-    {
-        xoops_loadLanguage('admin', $module->dirname());
-        // check for minimum PHP version
-        $success = true;
-        $verNum  = PHP_VERSION;
-        $reqVer  = $module->getInfo('min_php');
-        if (false !== $reqVer && '' !== $reqVer) {
-            if (version_compare($verNum, $reqVer, '<')) {
-                $module->setErrors(sprintf(_AM_EFQDIR_ERROR_BAD_PHP, $reqVer, $verNum));
-                $success = false;
-            }
-        }
+	/**
+	 *
+	 * Verifies PHP version meets minimum requirements for this module
+	 * @static
+	 * @param XoopsModule $module
+	 *
+	 * @return bool true if meets requirements, false if not
+	 */
+	public static function checkVerPhp(XoopsModule $module)
+	{
+		xoops_loadLanguage('admin', $module->dirname());
+		// check for minimum PHP version
+		$success = true;
+		$verNum  = PHP_VERSION;
+		$reqVer  = $module->getInfo('min_php');
+		if (false !== $reqVer && '' !== $reqVer) {
+			if (version_compare($verNum, $reqVer, '<')) {
+				$module->setErrors(sprintf(_AM_EFQDIR_ERROR_BAD_PHP, $reqVer, $verNum));
+				$success = false;
+			}
+		}
 
-        return $success;
-    }
+		return $success;
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -29,7 +29,7 @@ 
                 if (!mkdir($folder) && !is_dir($folder)) {
                     throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
                 } else {
-                    file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
+                    file_put_contents($folder.'/index.html', '<script>history.go(-1);</script>');
                 }
             }
         } catch (Exception $e) {
@@ -67,10 +67,10 @@ 
         //    @mkdir($dst);
         while (false !== ($file = readdir($dir))) {
             if (($file !== '.') && ($file !== '..')) {
-                if (is_dir($src . '/' . $file)) {
-                    self::recurseCopy($src . '/' . $file, $dst . '/' . $file);
+                if (is_dir($src.'/'.$file)) {
+                    self::recurseCopy($src.'/'.$file, $dst.'/'.$file);
                 } else {
-                    copy($src . '/' . $file, $dst . '/' . $file);
+                    copy($src.'/'.$file, $dst.'/'.$file);
                 }
             }
         }
@@ -97,7 +97,7 @@ 
         $currentVer = substr(XOOPS_VERSION, 6); // get the numeric part of string
         $currArray  = explode('.', $currentVer);
         if (null === $requiredVer) {
-            $requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string
+            $requiredVer = ''.$module->getInfo('min_xoops'); //making sure it's a string
         }
         $reqArray = explode('.', $requiredVer);
         $success  = true;
@@ -112,7 +112,7 @@ 
                     break;
                 }
             } else {
-                if ((int)$v > 0) { // handles things like x.x.x.0_RC2
+                if ((int) $v > 0) { // handles things like x.x.x.0_RC2
                     $success = false;
                     break;
                 }

class/class.formimage.php

Indentation +150 added lines, -150 removed lines

@@ -19,172 +19,172 @@
  */
 class XoopsFormImage extends XoopsFormElement
 {
-    /**
-     * Options
-     * @var array
-     * @access private
-     */
-    public $_options  = array();
-    public $_multiple = false;
-    public $_size;
+	/**
+	 * Options
+	 * @var array
+	 * @access private
+	 */
+	public $_options  = array();
+	public $_multiple = false;
+	public $_size;
 
-    public $_height;
-    public $_width;
-    public $_src;
-    public $_value = array();
+	public $_height;
+	public $_width;
+	public $_src;
+	public $_value = array();
 
-    /**
-     * Constructor
-     *
-     * @param string     $caption  Caption
-     * @param string     $name     "name" attribute
-     * @param mixed      $value    Pre-selected value (or array of them).
-     * @param string     $src
-     * @param string     $height
-     * @param string     $width
-     * @param bool       $multiple Allow multiple selections?
-     * @param int|string $size     Size of the selection box
-     */
-    public function __construct($caption, $name, $value = null, $src = '', $height = '50', $width = '50', $multiple = false, $size = '1')
-    {
-        $this->setCaption($caption);
-        $this->setName($name);
-        $this->_multiple = $multiple;
-        $this->_size     = (int)$size;
-        if (isset($value)) {
-            $this->setValue($value);
-        }
-        $this->_height = $height;
-        $this->_width  = $width;
-        $this->_src    = $src;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param string     $caption  Caption
+	 * @param string     $name     "name" attribute
+	 * @param mixed      $value    Pre-selected value (or array of them).
+	 * @param string     $src
+	 * @param string     $height
+	 * @param string     $width
+	 * @param bool       $multiple Allow multiple selections?
+	 * @param int|string $size     Size of the selection box
+	 */
+	public function __construct($caption, $name, $value = null, $src = '', $height = '50', $width = '50', $multiple = false, $size = '1')
+	{
+		$this->setCaption($caption);
+		$this->setName($name);
+		$this->_multiple = $multiple;
+		$this->_size     = (int)$size;
+		if (isset($value)) {
+			$this->setValue($value);
+		}
+		$this->_height = $height;
+		$this->_width  = $width;
+		$this->_src    = $src;
+	}
 
-    /**
-     * @return string
-     */
-    public function getWidth()
-    {
-        return $this->_width;
-    }
+	/**
+	 * @return string
+	 */
+	public function getWidth()
+	{
+		return $this->_width;
+	}
 
-    /**
-     * @return string
-     */
-    public function getHeight()
-    {
-        return $this->_height;
-    }
+	/**
+	 * @return string
+	 */
+	public function getHeight()
+	{
+		return $this->_height;
+	}
 
-    /**
-     * @return string
-     */
-    public function getSrc()
-    {
-        return $this->_src;
-    }
+	/**
+	 * @return string
+	 */
+	public function getSrc()
+	{
+		return $this->_src;
+	}
 
-    /*
+	/*
     * Are multiple selections allowed?
     *
     * @return bool
     */
-    /**
-     * @return bool
-     */
-    public function isMultiple()
-    {
-        return $this->_multiple;
-    }
+	/**
+	 * @return bool
+	 */
+	public function isMultiple()
+	{
+		return $this->_multiple;
+	}
 
-    /**
-     * Get the size
-     *
-     * @return int
-     */
-    public function getSize()
-    {
-        return $this->_size;
-    }
+	/**
+	 * Get the size
+	 *
+	 * @return int
+	 */
+	public function getSize()
+	{
+		return $this->_size;
+	}
 
-    /**
-     * Get an array of pre-selected values
-     *
-     * @return array
-     */
-    public function getValue()
-    {
-        return $this->_value;
-    }
+	/**
+	 * Get an array of pre-selected values
+	 *
+	 * @return array
+	 */
+	public function getValue()
+	{
+		return $this->_value;
+	}
 
-    /**
-     * Set pre-selected values
-     *
-     * @param $value mixed
-     */
-    public function setValue($value)
-    {
-        if (is_array($value)) {
-            foreach ($value as $v) {
-                $this->_value[] = $v;
-            }
-        } else {
-            $this->_value[] = $value;
-        }
-    }
+	/**
+	 * Set pre-selected values
+	 *
+	 * @param $value mixed
+	 */
+	public function setValue($value)
+	{
+		if (is_array($value)) {
+			foreach ($value as $v) {
+				$this->_value[] = $v;
+			}
+		} else {
+			$this->_value[] = $value;
+		}
+	}
 
-    /**
-     * Add an option
-     *
-     * @param string $value "value" attribute
-     * @param string $name  "name" attribute
-     */
-    public function addOption($value, $name = '')
-    {
-        if ($name !== '') {
-            $this->_options[$value] = $name;
-        } else {
-            $this->_options[$value] = $value;
-        }
-    }
+	/**
+	 * Add an option
+	 *
+	 * @param string $value "value" attribute
+	 * @param string $name  "name" attribute
+	 */
+	public function addOption($value, $name = '')
+	{
+		if ($name !== '') {
+			$this->_options[$value] = $name;
+		} else {
+			$this->_options[$value] = $value;
+		}
+	}
 
-    /**
-     * Add multiple options
-     *
-     * @param array $options Associative array of value->name pairs
-     */
-    public function addOptionArray($options)
-    {
-        if (is_array($options)) {
-            foreach ($options as $k => $v) {
-                $this->addOption($k, $v);
-            }
-        }
-    }
+	/**
+	 * Add multiple options
+	 *
+	 * @param array $options Associative array of value->name pairs
+	 */
+	public function addOptionArray($options)
+	{
+		if (is_array($options)) {
+			foreach ($options as $k => $v) {
+				$this->addOption($k, $v);
+			}
+		}
+	}
 
-    /**
-     * Get all options
-     *
-     * @return array   Associative array of value->name pairs
-     */
-    public function getOptions()
-    {
-        return $this->_options;
-    }
+	/**
+	 * Get all options
+	 *
+	 * @return array   Associative array of value->name pairs
+	 */
+	public function getOptions()
+	{
+		return $this->_options;
+	}
 
-    /**
-     * Prepare HTML for output
-     *
-     * @return string  HTML
-     */
-    public function render()
-    {
-        if ($this->getSrc() !== '') {
-            $ret = "<img src='" . $this->getSrc() . '\' width=\'' . $this->getWidth() . '\'  height=\'' . $this->getHeight() . '\'';
-            $ret .= '>';
-        } else {
-            $ret = _MD_NOIMAGE;
-        }
+	/**
+	 * Prepare HTML for output
+	 *
+	 * @return string  HTML
+	 */
+	public function render()
+	{
+		if ($this->getSrc() !== '') {
+			$ret = "<img src='" . $this->getSrc() . '\' width=\'' . $this->getWidth() . '\'  height=\'' . $this->getHeight() . '\'';
+			$ret .= '>';
+		} else {
+			$ret = _MD_NOIMAGE;
+		}
 
-        return $ret;
-    }
+		return $ret;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
         $this->setCaption($caption);
         $this->setName($name);
         $this->_multiple = $multiple;
-        $this->_size     = (int)$size;
+        $this->_size     = (int) $size;
         if (isset($value)) {
             $this->setValue($value);
         }
@@ -179,7 +179,7 @@ 
     public function render()
     {
         if ($this->getSrc() !== '') {
-            $ret = "<img src='" . $this->getSrc() . '\' width=\'' . $this->getWidth() . '\'  height=\'' . $this->getHeight() . '\'';
+            $ret = "<img src='".$this->getSrc().'\' width=\''.$this->getWidth().'\'  height=\''.$this->getHeight().'\'';
             $ret .= '>';
         } else {
             $ret = _MD_NOIMAGE;

class/class.listing.php

Indentation +227 added lines, -227 removed lines

@@ -29,97 +29,97 @@ 
  */
 class efqListing extends XoopsObject
 {
-    public $_editrights = false;
-    public $_currentuser;
-    public $_value      = array();
-    public $_postdata   = array();
-    public $_datatypes  = array();
+	public $_editrights = false;
+	public $_currentuser;
+	public $_value      = array();
+	public $_postdata   = array();
+	public $_datatypes  = array();
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        // class constructor;
-        $this->setCurrentUser();
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		// class constructor;
+		$this->setCurrentUser();
 
-        $this->initVar('itemid', XOBJ_DTYPE_INT, 0, true);
-        $this->initVar('logourl', XOBJ_DTYPE_TXTBOX, null, false, 255);
-        $this->initVar('uid', XOBJ_DTYPE_INT, 0, true);
-        $this->initVar('status', XOBJ_DTYPE_INT, 0, true);
-        $this->initVar('created', XOBJ_DTYPE_INT, 0, true);
-        $this->initVar('title', XOBJ_DTYPE_TXTBOX, null, false, 255);
-        $this->initVar('hits', XOBJ_DTYPE_INT, 0, true);
-        $this->initVar('rating', XOBJ_DTYPE_OTHER, 0.0, true);
-        $this->initVar('votes', XOBJ_DTYPE_INT, 0, true);
-        $this->initVar('typeid', XOBJ_DTYPE_INT, 0, true);
-        $this->initVar('dirid', XOBJ_DTYPE_INT, 0, true);
-        $this->initVar('description', XOBJ_DTYPE_TXTAREA, null, false);
-    }
+		$this->initVar('itemid', XOBJ_DTYPE_INT, 0, true);
+		$this->initVar('logourl', XOBJ_DTYPE_TXTBOX, null, false, 255);
+		$this->initVar('uid', XOBJ_DTYPE_INT, 0, true);
+		$this->initVar('status', XOBJ_DTYPE_INT, 0, true);
+		$this->initVar('created', XOBJ_DTYPE_INT, 0, true);
+		$this->initVar('title', XOBJ_DTYPE_TXTBOX, null, false, 255);
+		$this->initVar('hits', XOBJ_DTYPE_INT, 0, true);
+		$this->initVar('rating', XOBJ_DTYPE_OTHER, 0.0, true);
+		$this->initVar('votes', XOBJ_DTYPE_INT, 0, true);
+		$this->initVar('typeid', XOBJ_DTYPE_INT, 0, true);
+		$this->initVar('dirid', XOBJ_DTYPE_INT, 0, true);
+		$this->initVar('description', XOBJ_DTYPE_TXTAREA, null, false);
+	}
 
-    /**
-     * Function setListingVars sets listing variables
-     * @author    EFQ Consultancy <info@efqconsultancy.com>
-     * @copyright EFQ Consultancy (c) 2007
-     * @version   1.0.0
-     *
-     * @param   array $listing Array with listing details
-     */
-    public function setListingVars($listing = array())
-    {
-        if (is_array($listing)) {
-            $this->setVar('itemid', $listing['itemid']);
-            $this->setVar('logourl', $listing['logourl']);
-            $this->setVar('uid', $listing['uid']);
-            $this->setVar('status', $listing['status']);
-            $this->setVar('created', $listing['created']);
-            $this->setVar('title', $listing['title']);
-            $this->setVar('hits', $listing['hits']);
-            $this->setVar('rating', $listing['rating']);
-            $this->setVar('votes', $listing['votes']);
-            $this->setVar('typeid', $listing['typeid']);
-            $this->setVar('dirid', $listing['dirid']);
-            $this->setVar('description', $listing['description']);
-        }
-    }
+	/**
+	 * Function setListingVars sets listing variables
+	 * @author    EFQ Consultancy <info@efqconsultancy.com>
+	 * @copyright EFQ Consultancy (c) 2007
+	 * @version   1.0.0
+	 *
+	 * @param   array $listing Array with listing details
+	 */
+	public function setListingVars($listing = array())
+	{
+		if (is_array($listing)) {
+			$this->setVar('itemid', $listing['itemid']);
+			$this->setVar('logourl', $listing['logourl']);
+			$this->setVar('uid', $listing['uid']);
+			$this->setVar('status', $listing['status']);
+			$this->setVar('created', $listing['created']);
+			$this->setVar('title', $listing['title']);
+			$this->setVar('hits', $listing['hits']);
+			$this->setVar('rating', $listing['rating']);
+			$this->setVar('votes', $listing['votes']);
+			$this->setVar('typeid', $listing['typeid']);
+			$this->setVar('dirid', $listing['dirid']);
+			$this->setVar('description', $listing['description']);
+		}
+	}
 
-    public function setDataTypes($arr = array())
-    {
-        $this->_datatypes = $arr;
-    }
+	public function setDataTypes($arr = array())
+	{
+		$this->_datatypes = $arr;
+	}
 
-    public function getDataTypes()
-    {
-        return $this->_datatypes;
-    }
+	public function getDataTypes()
+	{
+		return $this->_datatypes;
+	}
 
-    public function setCurrentUser()
-    {
-        global $xoopsUser;
-        $this->_currentuser = !empty($xoopsUser) ? $xoopsUser->getVar('uid') : 0;
-    }
+	public function setCurrentUser()
+	{
+		global $xoopsUser;
+		$this->_currentuser = !empty($xoopsUser) ? $xoopsUser->getVar('uid') : 0;
+	}
 
-    public function setEditRights($value = false)
-    {
-        $this->_editrights = $value;
-    }
+	public function setEditRights($value = false)
+	{
+		$this->_editrights = $value;
+	}
 
-    public function addPostDataArray($arr)
-    {
-        $this->_postdata[] = $arr;
-    }
+	public function addPostDataArray($arr)
+	{
+		$this->_postdata[] = $arr;
+	}
 
-    public function updateListing()
-    {
-        global $xoopsDB;
-        // Save array _postdata into database as update;
-    }
+	public function updateListing()
+	{
+		global $xoopsDB;
+		// Save array _postdata into database as update;
+	}
 
-    public function insertListing()
-    {
-        global $xoopsDB;
-        // Save array postdata into database as new record;
-    }
+	public function insertListing()
+	{
+		global $xoopsDB;
+		// Save array postdata into database as new record;
+	}
 }
 
 /**
@@ -133,160 +133,160 @@ 
  */
 class efqListingHandler extends XoopsObjectHandler
 {
-    public function __construct()
-    {
-        //Instantiate class
-        $this->db = XoopsDatabaseFactory::getDatabaseConnection();
-    }
+	public function __construct()
+	{
+		//Instantiate class
+		$this->db = XoopsDatabaseFactory::getDatabaseConnection();
+	}
 
-    /**
-     * Function updateStatus updates status for listing
-     * @author    EFQ Consultancy <info@efqconsultancy.com>
-     * @copyright EFQ Consultancy (c) 2007
-     * @version   1.0.0
-     *
-     * @param   int      $itemid    - Default: 0 - Listing to be updated
-     * @param int|string $newstatus - Default: '1' - New status for listing
-     * @return bool true if update is succesful, false if unsuccesful
-     */
-    public function updateStatus($itemid = 0, $newstatus = '1')
-    {
-        $sql = 'UPDATE ' . $this->db->prefix($module->getVar('dirname', 'n') . '_items') . ' SET status = ' . $newstatus . ' WHERE itemid = ' . (int)$itemid . '';
-        if ($this->db->query($sql)) {
-            return true;
-        }
+	/**
+	 * Function updateStatus updates status for listing
+	 * @author    EFQ Consultancy <info@efqconsultancy.com>
+	 * @copyright EFQ Consultancy (c) 2007
+	 * @version   1.0.0
+	 *
+	 * @param   int      $itemid    - Default: 0 - Listing to be updated
+	 * @param int|string $newstatus - Default: '1' - New status for listing
+	 * @return bool true if update is succesful, false if unsuccesful
+	 */
+	public function updateStatus($itemid = 0, $newstatus = '1')
+	{
+		$sql = 'UPDATE ' . $this->db->prefix($module->getVar('dirname', 'n') . '_items') . ' SET status = ' . $newstatus . ' WHERE itemid = ' . (int)$itemid . '';
+		if ($this->db->query($sql)) {
+			return true;
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Function incrementHits increments hits for listing with 1
-     * @author    EFQ Consultancy <info@efqconsultancy.com>
-     * @copyright EFQ Consultancy (c) 2007
-     * @version   1.0.0
-     *
-     * @param   int $itemid - Default: 0 - Listing to be updated
-     *
-     * @return bool true if update is succesful, false if unsuccesful
-     */
-    public function incrementHits($itemid = 0)
-    {
-        $sql = sprintf('UPDATE %s SET hits = hits+1 WHERE itemid = %u AND STATUS = 2', $this->db->prefix($module->getVar('dirname', 'n') . '_items'), (int)$itemid);
-        if ($this->db->queryF($sql)) {
-            return true;
-        }
+	/**
+	 * Function incrementHits increments hits for listing with 1
+	 * @author    EFQ Consultancy <info@efqconsultancy.com>
+	 * @copyright EFQ Consultancy (c) 2007
+	 * @version   1.0.0
+	 *
+	 * @param   int $itemid - Default: 0 - Listing to be updated
+	 *
+	 * @return bool true if update is succesful, false if unsuccesful
+	 */
+	public function incrementHits($itemid = 0)
+	{
+		$sql = sprintf('UPDATE %s SET hits = hits+1 WHERE itemid = %u AND STATUS = 2', $this->db->prefix($module->getVar('dirname', 'n') . '_items'), (int)$itemid);
+		if ($this->db->queryF($sql)) {
+			return true;
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Function getLinkedCatsArray gets categories linked to a listing.
-     * @author    EFQ Consultancy <info@efqconsultancy.com>
-     * @copyright EFQ Consultancy (c) 2007
-     * @version   1.0.0
-     *
-     * @param int|string $itemid - Default: '0' - Listing ID
-     * @param int|string $dirid  - Default: '0' - Directory ID
-     * @return array $arr Array with category ID's
-     */
-    public function getLinkedCatsArray($itemid = '0', $dirid = '0')
-    {
-        $sql     = 'SELECT c.cid, x.active FROM '
-                   . $this->db->prefix($module->getVar('dirname', 'n') . '_cat')
-                   . ' c, '
-                   . $this->db->prefix($module->getVar('dirname', 'n') . '_item_x_cat')
-                   . ' x WHERE c.cid=x.cid AND x.itemid='
-                   . (int)$itemid
-                   . " AND c.dirid='"
-                   . (int)$dirid
-                   . '\' AND c.active=\'1\'';
-        $result  = $this->db->query($sql);
-        $numrows = $this->db->getRowsNum($result);
-        $arr     = array();
-        if ($numrows > 0) {
-            while (list($cid, $active) = $this->db->fetchRow($result)) {
-                $arr[] = $cid;
-            }
-        }
+	/**
+	 * Function getLinkedCatsArray gets categories linked to a listing.
+	 * @author    EFQ Consultancy <info@efqconsultancy.com>
+	 * @copyright EFQ Consultancy (c) 2007
+	 * @version   1.0.0
+	 *
+	 * @param int|string $itemid - Default: '0' - Listing ID
+	 * @param int|string $dirid  - Default: '0' - Directory ID
+	 * @return array $arr Array with category ID's
+	 */
+	public function getLinkedCatsArray($itemid = '0', $dirid = '0')
+	{
+		$sql     = 'SELECT c.cid, x.active FROM '
+				   . $this->db->prefix($module->getVar('dirname', 'n') . '_cat')
+				   . ' c, '
+				   . $this->db->prefix($module->getVar('dirname', 'n') . '_item_x_cat')
+				   . ' x WHERE c.cid=x.cid AND x.itemid='
+				   . (int)$itemid
+				   . " AND c.dirid='"
+				   . (int)$dirid
+				   . '\' AND c.active=\'1\'';
+		$result  = $this->db->query($sql);
+		$numrows = $this->db->getRowsNum($result);
+		$arr     = array();
+		if ($numrows > 0) {
+			while (list($cid, $active) = $this->db->fetchRow($result)) {
+				$arr[] = $cid;
+			}
+		}
 
-        return $arr;
-    }
+		return $arr;
+	}
 
-    /**
-     * Function getListing gets listing from DB as an array.
-     *
-     * @author    EFQ Consultancy <info@efqconsultancy.com>
-     * @copyright EFQ Consultancy (c) 2007
-     * @version   1.0.0
-     *
-     * @param   int $itemid - Default: '0' - Listing ID
-     *
-     * @return array $arr Array with listing fields and values
-     */
-    public function getListing($itemid)
-    {
-        $sql    = 'SELECT i.*, t.description FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_items') . ' i LEFT JOIN ' . $this->db->prefix($module->getVar('dirname', 'n') . '_item_text') . ' t ON (i.itemid=t.itemid) WHERE i.itemid=' . (int)$itemid;
-        $result = $this->db->query($sql);
-        $arr    = array();
-        if (!$result) {
-            return $arr;
-        } else {
-            $numrows = $this->db->getRowsNum($result);
-            if ($numrows == 0) {
-                return $arr;
-            } else {
-                $arr = $this->db->fetchArray($result);
-            }
-        }
+	/**
+	 * Function getListing gets listing from DB as an array.
+	 *
+	 * @author    EFQ Consultancy <info@efqconsultancy.com>
+	 * @copyright EFQ Consultancy (c) 2007
+	 * @version   1.0.0
+	 *
+	 * @param   int $itemid - Default: '0' - Listing ID
+	 *
+	 * @return array $arr Array with listing fields and values
+	 */
+	public function getListing($itemid)
+	{
+		$sql    = 'SELECT i.*, t.description FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_items') . ' i LEFT JOIN ' . $this->db->prefix($module->getVar('dirname', 'n') . '_item_text') . ' t ON (i.itemid=t.itemid) WHERE i.itemid=' . (int)$itemid;
+		$result = $this->db->query($sql);
+		$arr    = array();
+		if (!$result) {
+			return $arr;
+		} else {
+			$numrows = $this->db->getRowsNum($result);
+			if ($numrows == 0) {
+				return $arr;
+			} else {
+				$arr = $this->db->fetchArray($result);
+			}
+		}
 
-        return $arr;
-    }
+		return $arr;
+	}
 
-    public function getDataTypes($itemid)
-    {
-        global $datafieldmanager;
-        $sql     = 'SELECT DISTINCT t.dtypeid, t.title, t.section, t.icon, f.typeid, f.fieldtype, f.ext, t.options, t.custom, d.itemid, d.value, d.customtitle ';
-        $sql     .= 'FROM '
-                    . $this->db->prefix($module->getVar('dirname', 'n') . '_item_x_cat')
-                    . ' ic, '
-                    . $this->db->prefix($module->getVar('dirname', 'n') . '_dtypes_x_cat')
-                    . ' xc, '
-                    . $this->db->prefix($module->getVar('dirname', 'n') . '_fieldtypes')
-                    . ' f, '
-                    . $this->db->prefix($module->getVar('dirname', 'n') . '_dtypes')
-                    . ' t ';
-        $sql     .= 'LEFT JOIN ' . $this->db->prefix($module->getVar('dirname', 'n') . '_data') . ' d ON (t.dtypeid=d.dtypeid AND d.itemid=' . (int)$itemid . ') ';
-        $sql     .= "WHERE ic.cid=xc.cid AND ic.active='1' AND xc.dtypeid=t.dtypeid AND t.fieldtypeid=f.typeid AND t.activeyn='1' AND ic.itemid=" . (int)$itemid . ' ORDER BY t.seq ASC';
-        $result  = $this->db->query($sql);
-        $numrows = $this->db->getRowsNum($result);
-        //$arr = $this->db->fetchArray($result);
-        $arr = array();
-        while (list($dtypeid, $title, $section, $icon, $ftypeid, $fieldtype, $ext, $options, $custom, $itemid, $value, $customtitle) = $this->db->fetchRow($result)) {
-            $fieldvalue = $datafieldmanager->getFieldValue($fieldtype, $options, $value);
-            if ($icon != '') {
-                $iconurl = "<img src=\"uploads/$icon\">";
-            } else {
-                $iconurl = '';
-            }
-            if ($custom != '0' && $customtitle != '') {
-                $title = $customtitle;
-            }
-            $arr[] = array(
-                'dtypeid'     => $dtypeid,
-                'title'       => $title,
-                'section'     => $section,
-                'icon'        => $iconurl,
-                'ftypeid'     => $ftypeid,
-                'fieldtype'   => $fieldtype,
-                'ext'         => $ext,
-                'options'     => $options,
-                'custom'      => $custom,
-                'itemid'      => $itemid,
-                'value'       => $fieldvalue,
-                'customtitle' => $customtitle
-            );
-        }
+	public function getDataTypes($itemid)
+	{
+		global $datafieldmanager;
+		$sql     = 'SELECT DISTINCT t.dtypeid, t.title, t.section, t.icon, f.typeid, f.fieldtype, f.ext, t.options, t.custom, d.itemid, d.value, d.customtitle ';
+		$sql     .= 'FROM '
+					. $this->db->prefix($module->getVar('dirname', 'n') . '_item_x_cat')
+					. ' ic, '
+					. $this->db->prefix($module->getVar('dirname', 'n') . '_dtypes_x_cat')
+					. ' xc, '
+					. $this->db->prefix($module->getVar('dirname', 'n') . '_fieldtypes')
+					. ' f, '
+					. $this->db->prefix($module->getVar('dirname', 'n') . '_dtypes')
+					. ' t ';
+		$sql     .= 'LEFT JOIN ' . $this->db->prefix($module->getVar('dirname', 'n') . '_data') . ' d ON (t.dtypeid=d.dtypeid AND d.itemid=' . (int)$itemid . ') ';
+		$sql     .= "WHERE ic.cid=xc.cid AND ic.active='1' AND xc.dtypeid=t.dtypeid AND t.fieldtypeid=f.typeid AND t.activeyn='1' AND ic.itemid=" . (int)$itemid . ' ORDER BY t.seq ASC';
+		$result  = $this->db->query($sql);
+		$numrows = $this->db->getRowsNum($result);
+		//$arr = $this->db->fetchArray($result);
+		$arr = array();
+		while (list($dtypeid, $title, $section, $icon, $ftypeid, $fieldtype, $ext, $options, $custom, $itemid, $value, $customtitle) = $this->db->fetchRow($result)) {
+			$fieldvalue = $datafieldmanager->getFieldValue($fieldtype, $options, $value);
+			if ($icon != '') {
+				$iconurl = "<img src=\"uploads/$icon\">";
+			} else {
+				$iconurl = '';
+			}
+			if ($custom != '0' && $customtitle != '') {
+				$title = $customtitle;
+			}
+			$arr[] = array(
+				'dtypeid'     => $dtypeid,
+				'title'       => $title,
+				'section'     => $section,
+				'icon'        => $iconurl,
+				'ftypeid'     => $ftypeid,
+				'fieldtype'   => $fieldtype,
+				'ext'         => $ext,
+				'options'     => $options,
+				'custom'      => $custom,
+				'itemid'      => $itemid,
+				'value'       => $fieldvalue,
+				'customtitle' => $customtitle
+			);
+		}
 
-        return $arr;
-    }
+		return $arr;
+	}
 }

Spacing +16 added lines, -16 removed lines

@@ -151,7 +151,7 @@ 
      */
     public function updateStatus($itemid = 0, $newstatus = '1')
     {
-        $sql = 'UPDATE ' . $this->db->prefix($module->getVar('dirname', 'n') . '_items') . ' SET status = ' . $newstatus . ' WHERE itemid = ' . (int)$itemid . '';
+        $sql = 'UPDATE '.$this->db->prefix($module->getVar('dirname', 'n').'_items').' SET status = '.$newstatus.' WHERE itemid = '.(int) $itemid.'';
         if ($this->db->query($sql)) {
             return true;
         }
@@ -171,7 +171,7 @@ 
      */
     public function incrementHits($itemid = 0)
     {
-        $sql = sprintf('UPDATE %s SET hits = hits+1 WHERE itemid = %u AND STATUS = 2', $this->db->prefix($module->getVar('dirname', 'n') . '_items'), (int)$itemid);
+        $sql = sprintf('UPDATE %s SET hits = hits+1 WHERE itemid = %u AND STATUS = 2', $this->db->prefix($module->getVar('dirname', 'n').'_items'), (int) $itemid);
         if ($this->db->queryF($sql)) {
             return true;
         }
@@ -191,14 +191,14 @@ 
      */
     public function getLinkedCatsArray($itemid = '0', $dirid = '0')
     {
-        $sql     = 'SELECT c.cid, x.active FROM '
-                   . $this->db->prefix($module->getVar('dirname', 'n') . '_cat')
+        $sql = 'SELECT c.cid, x.active FROM '
+                   . $this->db->prefix($module->getVar('dirname', 'n').'_cat')
                    . ' c, '
-                   . $this->db->prefix($module->getVar('dirname', 'n') . '_item_x_cat')
+                   . $this->db->prefix($module->getVar('dirname', 'n').'_item_x_cat')
                    . ' x WHERE c.cid=x.cid AND x.itemid='
-                   . (int)$itemid
+                   . (int) $itemid
                    . " AND c.dirid='"
-                   . (int)$dirid
+                   . (int) $dirid
                    . '\' AND c.active=\'1\'';
         $result  = $this->db->query($sql);
         $numrows = $this->db->getRowsNum($result);
@@ -225,7 +225,7 @@ 
      */
     public function getListing($itemid)
     {
-        $sql    = 'SELECT i.*, t.description FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_items') . ' i LEFT JOIN ' . $this->db->prefix($module->getVar('dirname', 'n') . '_item_text') . ' t ON (i.itemid=t.itemid) WHERE i.itemid=' . (int)$itemid;
+        $sql    = 'SELECT i.*, t.description FROM '.$this->db->prefix($module->getVar('dirname', 'n').'_items').' i LEFT JOIN '.$this->db->prefix($module->getVar('dirname', 'n').'_item_text').' t ON (i.itemid=t.itemid) WHERE i.itemid='.(int) $itemid;
         $result = $this->db->query($sql);
         $arr    = array();
         if (!$result) {
@@ -245,18 +245,18 @@ 
     public function getDataTypes($itemid)
     {
         global $datafieldmanager;
-        $sql     = 'SELECT DISTINCT t.dtypeid, t.title, t.section, t.icon, f.typeid, f.fieldtype, f.ext, t.options, t.custom, d.itemid, d.value, d.customtitle ';
-        $sql     .= 'FROM '
-                    . $this->db->prefix($module->getVar('dirname', 'n') . '_item_x_cat')
+        $sql = 'SELECT DISTINCT t.dtypeid, t.title, t.section, t.icon, f.typeid, f.fieldtype, f.ext, t.options, t.custom, d.itemid, d.value, d.customtitle ';
+        $sql .= 'FROM '
+                    . $this->db->prefix($module->getVar('dirname', 'n').'_item_x_cat')
                     . ' ic, '
-                    . $this->db->prefix($module->getVar('dirname', 'n') . '_dtypes_x_cat')
+                    . $this->db->prefix($module->getVar('dirname', 'n').'_dtypes_x_cat')
                     . ' xc, '
-                    . $this->db->prefix($module->getVar('dirname', 'n') . '_fieldtypes')
+                    . $this->db->prefix($module->getVar('dirname', 'n').'_fieldtypes')
                     . ' f, '
-                    . $this->db->prefix($module->getVar('dirname', 'n') . '_dtypes')
+                    . $this->db->prefix($module->getVar('dirname', 'n').'_dtypes')
                     . ' t ';
-        $sql     .= 'LEFT JOIN ' . $this->db->prefix($module->getVar('dirname', 'n') . '_data') . ' d ON (t.dtypeid=d.dtypeid AND d.itemid=' . (int)$itemid . ') ';
-        $sql     .= "WHERE ic.cid=xc.cid AND ic.active='1' AND xc.dtypeid=t.dtypeid AND t.fieldtypeid=f.typeid AND t.activeyn='1' AND ic.itemid=" . (int)$itemid . ' ORDER BY t.seq ASC';
+        $sql     .= 'LEFT JOIN '.$this->db->prefix($module->getVar('dirname', 'n').'_data').' d ON (t.dtypeid=d.dtypeid AND d.itemid='.(int) $itemid.') ';
+        $sql     .= "WHERE ic.cid=xc.cid AND ic.active='1' AND xc.dtypeid=t.dtypeid AND t.fieldtypeid=f.typeid AND t.activeyn='1' AND ic.itemid=".(int) $itemid.' ORDER BY t.seq ASC';
         $result  = $this->db->query($sql);
         $numrows = $this->db->getRowsNum($result);
         //$arr = $this->db->fetchArray($result);

class/class.image.php

Indentation +184 added lines, -184 removed lines

@@ -28,22 +28,22 @@ 
  */
 class XoopsImage extends XoopsObject
 {
-    /**
-     * Constructor
-     **/
-    public function __construct()
-    {
-        parent::__construct();
-        $this->initVar('image_id', XOBJ_DTYPE_INT, null, false);
-        $this->initVar('image_name', XOBJ_DTYPE_OTHER, null, false, 30);
-        $this->initVar('image_nicename', XOBJ_DTYPE_TXTBOX, null, true, 100);
-        $this->initVar('image_mimetype', XOBJ_DTYPE_OTHER, null, false);
-        $this->initVar('image_created', XOBJ_DTYPE_INT, null, false);
-        $this->initVar('image_display', XOBJ_DTYPE_INT, 1, false);
-        $this->initVar('image_weight', XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('image_body', XOBJ_DTYPE_SOURCE, null, true);
-        $this->initVar('imgcat_id', XOBJ_DTYPE_INT, 0, false);
-    }
+	/**
+	 * Constructor
+	 **/
+	public function __construct()
+	{
+		parent::__construct();
+		$this->initVar('image_id', XOBJ_DTYPE_INT, null, false);
+		$this->initVar('image_name', XOBJ_DTYPE_OTHER, null, false, 30);
+		$this->initVar('image_nicename', XOBJ_DTYPE_TXTBOX, null, true, 100);
+		$this->initVar('image_mimetype', XOBJ_DTYPE_OTHER, null, false);
+		$this->initVar('image_created', XOBJ_DTYPE_INT, null, false);
+		$this->initVar('image_display', XOBJ_DTYPE_INT, 1, false);
+		$this->initVar('image_weight', XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('image_body', XOBJ_DTYPE_SOURCE, null, true);
+		$this->initVar('imgcat_id', XOBJ_DTYPE_INT, 0, false);
+	}
 }
 
 /**
@@ -59,57 +59,57 @@ 
  */
 class XoopsImageHandler extends XoopsObjectHandler
 {
-    /**
-     * Create a new {@link XoopsImage}
-     *
-     * @param   boolean $isNew Flag the object as "new"
-     * @return  XoopsImage
-     **/
-    public function &create($isNew = true)
-    {
-        $image = new XoopsImage();
-        if ($isNew) {
-            $image->setNew();
-        }
-
-        return $image;
-    }
-
-    /**
-     * Write a {@link XoopsImage} object to the database
-     *
-     * @param XoopsObject $image
-     * @param string             $itemid
-     * @return bool
-     */
-    public function insert(XoopsObject $image, $itemid = '0')
-    {
-        global $image_name;
-        if ($itemid == '0') {
-            return false;
-        }
-        //if (strtolower(get_class($image)) != 'xoopsimage') {
-        //    return false;
-        //}
-        if (!$image->isDirty()) {
-            return true;
-        }
-        if (!$image->cleanVars()) {
-            return false;
-        }
-        foreach ($image->cleanVars as $k => $v) {
-            ${$k} = $v;
-        }
-        if ($image->isNew()) {
-            $image_id = $this->db->genId('image_image_id_seq');
-            $sql      = sprintf('INSERT INTO %s WHERE itemid=' . $itemid . ' (logourl) VALUES (%s)', $this->db->prefix($module->getVar('dirname', 'n') . '_items'), $this->db->quoteString($image_name));
-            if (!$result = $this->db->query($sql)) {
-                return false;
-            }
-            if (empty($image_id)) {
-                $image_id = $this->db->getInsertId();
-            }
-            /*             if (isset($image_body) && $image_body != '') {
+	/**
+	 * Create a new {@link XoopsImage}
+	 *
+	 * @param   boolean $isNew Flag the object as "new"
+	 * @return  XoopsImage
+	 **/
+	public function &create($isNew = true)
+	{
+		$image = new XoopsImage();
+		if ($isNew) {
+			$image->setNew();
+		}
+
+		return $image;
+	}
+
+	/**
+	 * Write a {@link XoopsImage} object to the database
+	 *
+	 * @param XoopsObject $image
+	 * @param string             $itemid
+	 * @return bool
+	 */
+	public function insert(XoopsObject $image, $itemid = '0')
+	{
+		global $image_name;
+		if ($itemid == '0') {
+			return false;
+		}
+		//if (strtolower(get_class($image)) != 'xoopsimage') {
+		//    return false;
+		//}
+		if (!$image->isDirty()) {
+			return true;
+		}
+		if (!$image->cleanVars()) {
+			return false;
+		}
+		foreach ($image->cleanVars as $k => $v) {
+			${$k} = $v;
+		}
+		if ($image->isNew()) {
+			$image_id = $this->db->genId('image_image_id_seq');
+			$sql      = sprintf('INSERT INTO %s WHERE itemid=' . $itemid . ' (logourl) VALUES (%s)', $this->db->prefix($module->getVar('dirname', 'n') . '_items'), $this->db->quoteString($image_name));
+			if (!$result = $this->db->query($sql)) {
+				return false;
+			}
+			if (empty($image_id)) {
+				$image_id = $this->db->getInsertId();
+			}
+			/*             if (isset($image_body) && $image_body != '') {
             $sql = sprintf("INSERT INTO %s (image_id, image_body) VALUES (%u, %s)", $this->db->prefix('imagebody'), $image_id, $this->db->quoteString($image_body));
             if (!$result = $this->db->query($sql)) {
             $sql = sprintf("DELETE FROM %s WHERE image_id = %u", $this->db->prefix('image'), $image_id);
@@ -118,13 +118,13 @@ 
             return false;
             }
             } */
-            /* $image->assignVar('image_id', $image_id); */
-        } else {
-            $sql = sprintf('UPDATE %s SET image_name = %s WHERE itemid = %u', $this->db->prefix($module->getVar('dirname', 'n') . '_items'), $this->db->quoteString($image_name));
-            if (!$result = $this->db->query($sql)) {
-                return false;
-            }
-            /*             if (isset($image_body) && $image_body != '') {
+			/* $image->assignVar('image_id', $image_id); */
+		} else {
+			$sql = sprintf('UPDATE %s SET image_name = %s WHERE itemid = %u', $this->db->prefix($module->getVar('dirname', 'n') . '_items'), $this->db->quoteString($image_name));
+			if (!$result = $this->db->query($sql)) {
+				return false;
+			}
+			/*             if (isset($image_body) && $image_body != '') {
             $sql = sprintf("UPDATE %s SET image_body = %s WHERE image_id = %u", $this->db->prefix('imagebody'), $this->db->quoteString($image_body), $image_id);
             if (!$result = $this->db->query($sql)) {
             $this->db->query(sprintf("DELETE FROM %s WHERE image_id = %u", $this->db->prefix('image'), $image_id));
@@ -132,114 +132,114 @@ 
             return false;
             }
             } */
-        }
-
-        return true;
-    }
-
-    /**
-     * Delete an image from the database
-     *
-     * @param XoopsObject $image
-     * @return bool
-     */
-    public function delete(XoopsObject $image)
-    {
-        if (strtolower(get_class($image)) !== 'xoopsimage') {
-            return false;
-        }
-        $id  = $image->getVar('image_id');
-        $sql = sprintf('DELETE FROM %s WHERE image_id = %u', $this->db->prefix('image'), $id);
-        if (!$result = $this->db->query($sql)) {
-            return false;
-        }
-        $sql = sprintf('DELETE FROM %s WHERE image_id = %u', $this->db->prefix('imagebody'), $id);
-        $this->db->query($sql);
-
-        return true;
-    }
-
-    /**
-     * Load {@link XoopsImage}s from the database
-     *
-     * @param   $criteria  {@link CriteriaElement}
-     * @param   boolean $id_as_key Use the ID as key into the array
-     * @param   boolean $getbinary
-     * @return  array   Array of {@link XoopsImage} objects
-     **/
-    public function &getObjects(CriteriaElement $criteria = null, $id_as_key = false, $getbinary = false)
-    {
-        $ret   = array();
-        $limit = $start = 0;
-        if ($getbinary) {
-            $sql = 'SELECT i.*, b.image_body FROM ' . $this->db->prefix('image') . ' i LEFT JOIN ' . $this->db->prefix('imagebody') . ' b ON b.image_id=i.image_id';
-        } else {
-            $sql = 'SELECT * FROM ' . $this->db->prefix('image');
-        }
-        if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql   .= ' ' . $criteria->renderWhere();
-            $sort  = !in_array($criteria->getSort(), array('image_id', 'image_created', 'image_mimetype', 'image_display', 'image_weight')) ? 'image_weight' : $criteria->getSort();
-            $sql   .= ' ORDER BY ' . $sort . ' ' . $criteria->getOrder();
-            $limit = $criteria->getLimit();
-            $start = $criteria->getStart();
-        }
-        $result = $this->db->query($sql, $limit, $start);
-        if (!$result) {
-            return $ret;
-        }
-        while ($myrow = $this->db->fetchArray($result)) {
-            $image = new XoopsImage();
-            $image->assignVars($myrow);
-            if (!$id_as_key) {
-                $ret[] =& $image;
-            } else {
-                $ret[$myrow['image_id']] =& $image;
-            }
-            unset($image);
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Count some images
-     *
-     * @param   $criteria {@link CriteriaElement}
-     * @return  int
-     **/
-    public function getCount(CriteriaElement $criteria = null)
-    {
-        $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('image');
-        if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
-        }
-        if (!$result = $this->db->query($sql)) {
-            return 0;
-        }
-        list($count) = $this->db->fetchRow($result);
-
-        return $count;
-    }
-
-    /**
-     * Get a list of images
-     *
-     * @param   int  $imgcat_id
-     * @param   bool $image_display
-     * @return  array   Array of {@link XoopsImage} objects
-     **/
-    public function &getList($imgcat_id, $image_display = null)
-    {
-        $criteria = new CriteriaCompo(new Criteria('imgcat_id', (int)$imgcat_id));
-        if (isset($image_display)) {
-            $criteria->add(new Criteria('image_display', (int)$image_display));
-        }
-        $images = $this->getObjects($criteria, false, true);
-        $ret    = array();
-        foreach (array_keys($images) as $i) {
-            $ret[$images[$i]->getVar('image_name')] = $images[$i]->getVar('image_nicename');
-        }
-
-        return $ret;
-    }
+		}
+
+		return true;
+	}
+
+	/**
+	 * Delete an image from the database
+	 *
+	 * @param XoopsObject $image
+	 * @return bool
+	 */
+	public function delete(XoopsObject $image)
+	{
+		if (strtolower(get_class($image)) !== 'xoopsimage') {
+			return false;
+		}
+		$id  = $image->getVar('image_id');
+		$sql = sprintf('DELETE FROM %s WHERE image_id = %u', $this->db->prefix('image'), $id);
+		if (!$result = $this->db->query($sql)) {
+			return false;
+		}
+		$sql = sprintf('DELETE FROM %s WHERE image_id = %u', $this->db->prefix('imagebody'), $id);
+		$this->db->query($sql);
+
+		return true;
+	}
+
+	/**
+	 * Load {@link XoopsImage}s from the database
+	 *
+	 * @param   $criteria  {@link CriteriaElement}
+	 * @param   boolean $id_as_key Use the ID as key into the array
+	 * @param   boolean $getbinary
+	 * @return  array   Array of {@link XoopsImage} objects
+	 **/
+	public function &getObjects(CriteriaElement $criteria = null, $id_as_key = false, $getbinary = false)
+	{
+		$ret   = array();
+		$limit = $start = 0;
+		if ($getbinary) {
+			$sql = 'SELECT i.*, b.image_body FROM ' . $this->db->prefix('image') . ' i LEFT JOIN ' . $this->db->prefix('imagebody') . ' b ON b.image_id=i.image_id';
+		} else {
+			$sql = 'SELECT * FROM ' . $this->db->prefix('image');
+		}
+		if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+			$sql   .= ' ' . $criteria->renderWhere();
+			$sort  = !in_array($criteria->getSort(), array('image_id', 'image_created', 'image_mimetype', 'image_display', 'image_weight')) ? 'image_weight' : $criteria->getSort();
+			$sql   .= ' ORDER BY ' . $sort . ' ' . $criteria->getOrder();
+			$limit = $criteria->getLimit();
+			$start = $criteria->getStart();
+		}
+		$result = $this->db->query($sql, $limit, $start);
+		if (!$result) {
+			return $ret;
+		}
+		while ($myrow = $this->db->fetchArray($result)) {
+			$image = new XoopsImage();
+			$image->assignVars($myrow);
+			if (!$id_as_key) {
+				$ret[] =& $image;
+			} else {
+				$ret[$myrow['image_id']] =& $image;
+			}
+			unset($image);
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Count some images
+	 *
+	 * @param   $criteria {@link CriteriaElement}
+	 * @return  int
+	 **/
+	public function getCount(CriteriaElement $criteria = null)
+	{
+		$sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('image');
+		if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+			$sql .= ' ' . $criteria->renderWhere();
+		}
+		if (!$result = $this->db->query($sql)) {
+			return 0;
+		}
+		list($count) = $this->db->fetchRow($result);
+
+		return $count;
+	}
+
+	/**
+	 * Get a list of images
+	 *
+	 * @param   int  $imgcat_id
+	 * @param   bool $image_display
+	 * @return  array   Array of {@link XoopsImage} objects
+	 **/
+	public function &getList($imgcat_id, $image_display = null)
+	{
+		$criteria = new CriteriaCompo(new Criteria('imgcat_id', (int)$imgcat_id));
+		if (isset($image_display)) {
+			$criteria->add(new Criteria('image_display', (int)$image_display));
+		}
+		$images = $this->getObjects($criteria, false, true);
+		$ret    = array();
+		foreach (array_keys($images) as $i) {
+			$ret[$images[$i]->getVar('image_name')] = $images[$i]->getVar('image_nicename');
+		}
+
+		return $ret;
+	}
 }

Spacing +12 added lines, -12 removed lines

@@ -102,7 +102,7 @@ 
         }
         if ($image->isNew()) {
             $image_id = $this->db->genId('image_image_id_seq');
-            $sql      = sprintf('INSERT INTO %s WHERE itemid=' . $itemid . ' (logourl) VALUES (%s)', $this->db->prefix($module->getVar('dirname', 'n') . '_items'), $this->db->quoteString($image_name));
+            $sql      = sprintf('INSERT INTO %s WHERE itemid='.$itemid.' (logourl) VALUES (%s)', $this->db->prefix($module->getVar('dirname', 'n').'_items'), $this->db->quoteString($image_name));
             if (!$result = $this->db->query($sql)) {
                 return false;
             }
@@ -120,7 +120,7 @@ 
             } */
             /* $image->assignVar('image_id', $image_id); */
         } else {
-            $sql = sprintf('UPDATE %s SET image_name = %s WHERE itemid = %u', $this->db->prefix($module->getVar('dirname', 'n') . '_items'), $this->db->quoteString($image_name));
+            $sql = sprintf('UPDATE %s SET image_name = %s WHERE itemid = %u', $this->db->prefix($module->getVar('dirname', 'n').'_items'), $this->db->quoteString($image_name));
             if (!$result = $this->db->query($sql)) {
                 return false;
             }
@@ -172,14 +172,14 @@ 
         $ret   = array();
         $limit = $start = 0;
         if ($getbinary) {
-            $sql = 'SELECT i.*, b.image_body FROM ' . $this->db->prefix('image') . ' i LEFT JOIN ' . $this->db->prefix('imagebody') . ' b ON b.image_id=i.image_id';
+            $sql = 'SELECT i.*, b.image_body FROM '.$this->db->prefix('image').' i LEFT JOIN '.$this->db->prefix('imagebody').' b ON b.image_id=i.image_id';
         } else {
-            $sql = 'SELECT * FROM ' . $this->db->prefix('image');
+            $sql = 'SELECT * FROM '.$this->db->prefix('image');
         }
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql   .= ' ' . $criteria->renderWhere();
+            $sql   .= ' '.$criteria->renderWhere();
             $sort  = !in_array($criteria->getSort(), array('image_id', 'image_created', 'image_mimetype', 'image_display', 'image_weight')) ? 'image_weight' : $criteria->getSort();
-            $sql   .= ' ORDER BY ' . $sort . ' ' . $criteria->getOrder();
+            $sql   .= ' ORDER BY '.$sort.' '.$criteria->getOrder();
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
         }
@@ -191,9 +191,9 @@ 
             $image = new XoopsImage();
             $image->assignVars($myrow);
             if (!$id_as_key) {
-                $ret[] =& $image;
+                $ret[] = & $image;
             } else {
-                $ret[$myrow['image_id']] =& $image;
+                $ret[$myrow['image_id']] = & $image;
             }
             unset($image);
         }
@@ -209,9 +209,9 @@ 
      **/
     public function getCount(CriteriaElement $criteria = null)
     {
-        $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('image');
+        $sql = 'SELECT COUNT(*) FROM '.$this->db->prefix('image');
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         if (!$result = $this->db->query($sql)) {
             return 0;
@@ -230,9 +230,9 @@ 
      **/
     public function &getList($imgcat_id, $image_display = null)
     {
-        $criteria = new CriteriaCompo(new Criteria('imgcat_id', (int)$imgcat_id));
+        $criteria = new CriteriaCompo(new Criteria('imgcat_id', (int) $imgcat_id));
         if (isset($image_display)) {
-            $criteria->add(new Criteria('image_display', (int)$image_display));
+            $criteria->add(new Criteria('image_display', (int) $image_display));
         }
         $images = $this->getObjects($criteria, false, true);
         $ret    = array();

class/class.offer.php

Indentation +189 added lines, -189 removed lines

@@ -44,29 +44,29 @@ 
 class efqSubscriptionOffer extends XoopsObject
 {
 
-    /**
-     * efqSubscriptionOffer::efqSubscriptionOffer()
-     *
-     * @param bool $offer
-     * @internal param bool $itemtype
-     */
-    public function __construct($offer = false)
-    {
-        global $moddir;
-        $this->db = XoopsDatabaseFactory::getDatabaseConnection();
-        $this->initVar('offerid', XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('dirid', XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('typeid', XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('title', XOBJ_DTYPE_TXTBOX, null, true, 255);
-        $this->initVar('duration', XOBJ_DTYPE_INT, 0, true, 5);
-        $this->initVar('count', XOBJ_DTYPE_INT, 0, true, 5);
-        $this->initVar('price', XOBJ_DTYPE_CURRENCY, 0.00, true);
-        $this->initVar('activeyn', XOBJ_DTYPE_INT, 0, true, 2);
-        $this->initVar('currency', XOBJ_DTYPE_TXTBOX, null, false, 10);
-        $this->initVar('descr', XOBJ_DTYPE_OTHER, 0);
-        $this->initVar('typename', XOBJ_DTYPE_TXTBOX, null, false, 50);
-        $this->initVar('level', XOBJ_DTYPE_INT, null, false, 10);
-    }
+	/**
+	 * efqSubscriptionOffer::efqSubscriptionOffer()
+	 *
+	 * @param bool $offer
+	 * @internal param bool $itemtype
+	 */
+	public function __construct($offer = false)
+	{
+		global $moddir;
+		$this->db = XoopsDatabaseFactory::getDatabaseConnection();
+		$this->initVar('offerid', XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('dirid', XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('typeid', XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('title', XOBJ_DTYPE_TXTBOX, null, true, 255);
+		$this->initVar('duration', XOBJ_DTYPE_INT, 0, true, 5);
+		$this->initVar('count', XOBJ_DTYPE_INT, 0, true, 5);
+		$this->initVar('price', XOBJ_DTYPE_CURRENCY, 0.00, true);
+		$this->initVar('activeyn', XOBJ_DTYPE_INT, 0, true, 2);
+		$this->initVar('currency', XOBJ_DTYPE_TXTBOX, null, false, 10);
+		$this->initVar('descr', XOBJ_DTYPE_OTHER, 0);
+		$this->initVar('typename', XOBJ_DTYPE_TXTBOX, null, false, 50);
+		$this->initVar('level', XOBJ_DTYPE_INT, null, false, 10);
+	}
 }
 
 /**
@@ -81,180 +81,180 @@ 
 class efqSubscriptionOfferHandler extends xoopsObjectHandler
 {
 //    public $db; //Database reference
-    public $objOffer; // reference to object
+	public $objOffer; // reference to object
 
-    /**
-     * efqSubscriptionOfferHandler::efqItemTypeHandler()
-     *
-     * @param bool $offer
-     */
-    public function __construct($offer = false)
-    {
-        $this->db       = XoopsDatabaseFactory::getDatabaseConnection();
-        $this->objOffer = $offer;
-    }
+	/**
+	 * efqSubscriptionOfferHandler::efqItemTypeHandler()
+	 *
+	 * @param bool $offer
+	 */
+	public function __construct($offer = false)
+	{
+		$this->db       = XoopsDatabaseFactory::getDatabaseConnection();
+		$this->objOffer = $offer;
+	}
 
-    /**
-     * Function insertOffer inserts Subscripion offer into DB
-     * @author    EFQ Consultancy <info@efqconsultancy.com>
-     * @copyright EFQ Consultancy (c) 2008
-     * @version   1.0.0
-     *
-     * @param   efqSubscriptionOffer $obj object
-     *
-     * @param bool     $forceQuery
-     * @return bool true if insertion is succesful, false if unsuccesful
-     */
-    public function insertOffer($obj, $forceQuery = false)
-    {
-        $tablename    = 'efqdiralpha1_subscr_offers';
-        $keyName      = 'offerid';
-        $excludedVars = array('level', 'typename');
-        if ($obj instanceof efqSubscriptionOffer) {
-            // Variable part of this function ends. From this line you can copy
-            // this function for similar object handling functions.
-            $obj->cleanVars();
-            $cleanvars = $obj->cleanVars;
-        } else {
-            return false;
-        }
-        $countVars = count($cleanvars);
-        $i         = 1;
-        $strFields = '';
-        $strValues = '';
-        foreach ($cleanvars as $k => $v) {
-            if (!in_array($k, $excludedVars)) {
-                $strFields .= $k;
-                $strValues .= "'" . $v . "'";
-                if ($i < $countVars) {
-                    $strFields .= ', ';
-                    $strValues .= ', ';
-                }
-                $i++;
-            }
-        }
-        $sql = sprintf('INSERT INTO %s (%s) VALUES (%s)', $this->db->prefix($tablename), $strFields, $strValues);
-        if ($forceQuery) {
-            if ($this->db->queryF($sql)) {
-                $itemid = $this->db->getInsertId();
-                $obj->setVar($keyName, $itemid);
+	/**
+	 * Function insertOffer inserts Subscripion offer into DB
+	 * @author    EFQ Consultancy <info@efqconsultancy.com>
+	 * @copyright EFQ Consultancy (c) 2008
+	 * @version   1.0.0
+	 *
+	 * @param   efqSubscriptionOffer $obj object
+	 *
+	 * @param bool     $forceQuery
+	 * @return bool true if insertion is succesful, false if unsuccesful
+	 */
+	public function insertOffer($obj, $forceQuery = false)
+	{
+		$tablename    = 'efqdiralpha1_subscr_offers';
+		$keyName      = 'offerid';
+		$excludedVars = array('level', 'typename');
+		if ($obj instanceof efqSubscriptionOffer) {
+			// Variable part of this function ends. From this line you can copy
+			// this function for similar object handling functions.
+			$obj->cleanVars();
+			$cleanvars = $obj->cleanVars;
+		} else {
+			return false;
+		}
+		$countVars = count($cleanvars);
+		$i         = 1;
+		$strFields = '';
+		$strValues = '';
+		foreach ($cleanvars as $k => $v) {
+			if (!in_array($k, $excludedVars)) {
+				$strFields .= $k;
+				$strValues .= "'" . $v . "'";
+				if ($i < $countVars) {
+					$strFields .= ', ';
+					$strValues .= ', ';
+				}
+				$i++;
+			}
+		}
+		$sql = sprintf('INSERT INTO %s (%s) VALUES (%s)', $this->db->prefix($tablename), $strFields, $strValues);
+		if ($forceQuery) {
+			if ($this->db->queryF($sql)) {
+				$itemid = $this->db->getInsertId();
+				$obj->setVar($keyName, $itemid);
 
-                return true;
-            }
-        } else {
-            if ($this->db->query($sql)) {
-                $itemid = $this->db->getInsertId();
-                $obj->setVar($keyName, $itemid);
+				return true;
+			}
+		} else {
+			if ($this->db->query($sql)) {
+				$itemid = $this->db->getInsertId();
+				$obj->setVar($keyName, $itemid);
 
-                return true;
-            }
-        }
+				return true;
+			}
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Function updateOffer updates subscription offer
-     * @author    EFQ Consultancy <info@efqconsultancy.com>
-     * @copyright EFQ Consultancy (c) 2008
-     * @version   1.0.0
-     *
-     * @param      $obj
-     * @param bool $forceQuery
-     * @return bool true if update is succesful, false if unsuccesful
-     * @internal  param object $objOffer object of type listing
-     */
-    public function updateOffer($obj, $forceQuery = false)
-    {
-        $tablename    = 'efqdiralpha1_subscr_offers';
-        $keyName      = 'offerid';
-        $excludedVars = array('level', 'typename');
-        if ($obj instanceof efqSubscriptionOffer) {
-            // Variable part of this function ends. From this line you can copy
-            // this function for similar object handling functions.
-            $obj->cleanVars();
-            $cleanvars = $obj->cleanVars;
-            $keyValue  = $obj->getVar($keyName);
-        } else {
-            return false;
-        }
-        $countVars = count($cleanvars);
-        $i         = 1;
-        $strSet    = '';
-        $strValues = '';
-        foreach ($cleanvars as $k => $v) {
-            if (!in_array($k, $excludedVars)) {
-                if ($i < $countVars and $i > 1) {
-                    $strSet .= ', ';
-                }
-                $strSet .= $k . '=' . "'" . $v . "'";
-            }
-            $i++;
-        }
-        $sql = sprintf('UPDATE %s SET %s WHERE %s = %u', $this->db->prefix($tablename), $strSet, $keyName, $keyValue);
-        if ($forceQuery) {
-            if ($this->db->queryF($sql)) {
-                return true;
-            }
-        } else {
-            if ($this->db->query($sql)) {
-                return true;
-            }
-        }
+	/**
+	 * Function updateOffer updates subscription offer
+	 * @author    EFQ Consultancy <info@efqconsultancy.com>
+	 * @copyright EFQ Consultancy (c) 2008
+	 * @version   1.0.0
+	 *
+	 * @param      $obj
+	 * @param bool $forceQuery
+	 * @return bool true if update is succesful, false if unsuccesful
+	 * @internal  param object $objOffer object of type listing
+	 */
+	public function updateOffer($obj, $forceQuery = false)
+	{
+		$tablename    = 'efqdiralpha1_subscr_offers';
+		$keyName      = 'offerid';
+		$excludedVars = array('level', 'typename');
+		if ($obj instanceof efqSubscriptionOffer) {
+			// Variable part of this function ends. From this line you can copy
+			// this function for similar object handling functions.
+			$obj->cleanVars();
+			$cleanvars = $obj->cleanVars;
+			$keyValue  = $obj->getVar($keyName);
+		} else {
+			return false;
+		}
+		$countVars = count($cleanvars);
+		$i         = 1;
+		$strSet    = '';
+		$strValues = '';
+		foreach ($cleanvars as $k => $v) {
+			if (!in_array($k, $excludedVars)) {
+				if ($i < $countVars and $i > 1) {
+					$strSet .= ', ';
+				}
+				$strSet .= $k . '=' . "'" . $v . "'";
+			}
+			$i++;
+		}
+		$sql = sprintf('UPDATE %s SET %s WHERE %s = %u', $this->db->prefix($tablename), $strSet, $keyName, $keyValue);
+		if ($forceQuery) {
+			if ($this->db->queryF($sql)) {
+				return true;
+			}
+		} else {
+			if ($this->db->query($sql)) {
+				return true;
+			}
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * efqSubscriptionOfferHandler::setOffer()
-     *
-     * Sets the object created by class efqSubscriptionOffer with data from query
-     *
-     * @param int $gpc_offerid
-     * @return bool true or false
-     */
-    public function setOffer($gpc_offerid = 0)
-    {
-        $sql     = 'SELECT o.offerid, o.title, o.typeid, o.duration, o.count, '
-                   . 'o.price, o.activeyn, o.currency, o.descr, o.dirid, t.typename, t.level FROM '
-                   . $this->db->prefix('efqdiralpha1_itemtypes')
-                   . ' t, '
-                   . $this->db->prefix('efqdiralpha1_subscr_offers')
-                   . ' o	WHERE o.typeid=t.typeid AND o.offerid='
-                   . (int)$gpc_offerid
-                   . '';
-        $result  = $this->db->query($sql);
-        $numrows = $this->db->getRowsNum($result);
-        if ($numrows > 0) {
-            while (list($offerid, $offertitle, $typeid, $duration, $count, $price, $activeyn, $currency, $descr, $dirid, $typename, $level) = $this->db->fetchRow($result)) {
-                if (!$this->objOffer) {
-                    $this->objOffer = new efqSubscriptionOffer();
-                }
-                $this->objOffer->setVar('offerid', $offerid);
-                $this->objOffer->setVar('title', $offertitle);
-                $this->objOffer->setVar('typeid', $typeid);
-                $this->objOffer->setVar('duration', $duration);
-                $this->objOffer->setVar('count', $count);
-                $this->objOffer->setVar('price', $price);
-                $this->objOffer->setVar('activeyn', $activeyn);
-                $this->objOffer->setVar('currency', $currency);
-                $this->objOffer->setVar('descr', $descr);
-                $this->objOffer->setVar('dirid', $dirid);
-                $this->objOffer->setVar('typename', $typename);
-                $this->objOffer->setVar('level', $level);
-            }
-        } else {
-            return false;
-        }
+	/**
+	 * efqSubscriptionOfferHandler::setOffer()
+	 *
+	 * Sets the object created by class efqSubscriptionOffer with data from query
+	 *
+	 * @param int $gpc_offerid
+	 * @return bool true or false
+	 */
+	public function setOffer($gpc_offerid = 0)
+	{
+		$sql     = 'SELECT o.offerid, o.title, o.typeid, o.duration, o.count, '
+				   . 'o.price, o.activeyn, o.currency, o.descr, o.dirid, t.typename, t.level FROM '
+				   . $this->db->prefix('efqdiralpha1_itemtypes')
+				   . ' t, '
+				   . $this->db->prefix('efqdiralpha1_subscr_offers')
+				   . ' o	WHERE o.typeid=t.typeid AND o.offerid='
+				   . (int)$gpc_offerid
+				   . '';
+		$result  = $this->db->query($sql);
+		$numrows = $this->db->getRowsNum($result);
+		if ($numrows > 0) {
+			while (list($offerid, $offertitle, $typeid, $duration, $count, $price, $activeyn, $currency, $descr, $dirid, $typename, $level) = $this->db->fetchRow($result)) {
+				if (!$this->objOffer) {
+					$this->objOffer = new efqSubscriptionOffer();
+				}
+				$this->objOffer->setVar('offerid', $offerid);
+				$this->objOffer->setVar('title', $offertitle);
+				$this->objOffer->setVar('typeid', $typeid);
+				$this->objOffer->setVar('duration', $duration);
+				$this->objOffer->setVar('count', $count);
+				$this->objOffer->setVar('price', $price);
+				$this->objOffer->setVar('activeyn', $activeyn);
+				$this->objOffer->setVar('currency', $currency);
+				$this->objOffer->setVar('descr', $descr);
+				$this->objOffer->setVar('dirid', $dirid);
+				$this->objOffer->setVar('typename', $typename);
+				$this->objOffer->setVar('level', $level);
+			}
+		} else {
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * @return bool
-     */
-    public function getOffer()
-    {
-        return $this->objOffer;
-    }
+	/**
+	 * @return bool
+	 */
+	public function getOffer()
+	{
+		return $this->objOffer;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -125,7 +125,7 @@ 
         foreach ($cleanvars as $k => $v) {
             if (!in_array($k, $excludedVars)) {
                 $strFields .= $k;
-                $strValues .= "'" . $v . "'";
+                $strValues .= "'".$v."'";
                 if ($i < $countVars) {
                     $strFields .= ', ';
                     $strValues .= ', ';
@@ -187,7 +187,7 @@ 
                 if ($i < $countVars and $i > 1) {
                     $strSet .= ', ';
                 }
-                $strSet .= $k . '=' . "'" . $v . "'";
+                $strSet .= $k.'='."'".$v."'";
             }
             $i++;
         }
@@ -215,13 +215,13 @@ 
      */
     public function setOffer($gpc_offerid = 0)
     {
-        $sql     = 'SELECT o.offerid, o.title, o.typeid, o.duration, o.count, '
+        $sql = 'SELECT o.offerid, o.title, o.typeid, o.duration, o.count, '
                    . 'o.price, o.activeyn, o.currency, o.descr, o.dirid, t.typename, t.level FROM '
                    . $this->db->prefix('efqdiralpha1_itemtypes')
                    . ' t, '
                    . $this->db->prefix('efqdiralpha1_subscr_offers')
                    . ' o	WHERE o.typeid=t.typeid AND o.offerid='
-                   . (int)$gpc_offerid
+                   . (int) $gpc_offerid
                    . '';
         $result  = $this->db->query($sql);
         $numrows = $this->db->getRowsNum($result);

class/class.datafieldmanager.php

Indentation +569 added lines, -569 removed lines

@@ -19,372 +19,372 @@ 
  */
 class efqDataFieldManager extends XoopsFormElement
 {
-    public $_options  = array();
-    public $_multiple = false;
-    public $_size;
+	public $_options  = array();
+	public $_multiple = false;
+	public $_size;
 
-    public $_height;
-    public $_width;
-    public $_src;
-    public $_value = array();
+	public $_height;
+	public $_width;
+	public $_src;
+	public $_value = array();
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+	}
 
-    public function createField($title = '', $name = '', $fieldtype = '', $ext = '', $options = '', $value = '', $custom = '0', $customtitle = null)
-    {
-        global $form, $myts, $moddir;
-        if ($customtitle == null) {
-            $customtitle = '';
-        }
-        $multiple = false;
-        if ($ext != '') {
-            $ext_arr = explode('[|]', $ext);
-            foreach ($ext_arr as $ext_item) {
-                $ext_item_arr   = explode('[=]', $ext_item);
-                $ext_item_name  = $ext_item_arr[0];
-                $ext_item_value = $ext_item_arr[1];
+	public function createField($title = '', $name = '', $fieldtype = '', $ext = '', $options = '', $value = '', $custom = '0', $customtitle = null)
+	{
+		global $form, $myts, $moddir;
+		if ($customtitle == null) {
+			$customtitle = '';
+		}
+		$multiple = false;
+		if ($ext != '') {
+			$ext_arr = explode('[|]', $ext);
+			foreach ($ext_arr as $ext_item) {
+				$ext_item_arr   = explode('[=]', $ext_item);
+				$ext_item_name  = $ext_item_arr[0];
+				$ext_item_value = $ext_item_arr[1];
 
-                switch ($ext_item_name) {
-                    case 'cols':
-                        $cols = $ext_item_value;
-                        break;
-                    case 'rows':
-                        $rows = $ext_item_value;
-                        break;
-                    case 'size':
-                        $size = $ext_item_value;
-                        break;
-                    case 'maxsize':
-                        $maxsize = $ext_item_value;
-                        break;
-                    case 'multiple':
-                        $multiple = true;
-                        $size     = 5;
-                    case 'value':
-                        if ($ext_item_value != '' and $value == '') {
-                            $value = $ext_item_value;
-                        }
-                        break;
-                }
-            }
-        }
+				switch ($ext_item_name) {
+					case 'cols':
+						$cols = $ext_item_value;
+						break;
+					case 'rows':
+						$rows = $ext_item_value;
+						break;
+					case 'size':
+						$size = $ext_item_value;
+						break;
+					case 'maxsize':
+						$maxsize = $ext_item_value;
+						break;
+					case 'multiple':
+						$multiple = true;
+						$size     = 5;
+					case 'value':
+						if ($ext_item_value != '' and $value == '') {
+							$value = $ext_item_value;
+						}
+						break;
+				}
+			}
+		}
 
-        switch ($fieldtype) {
-            case 'textbox':
-                if ($custom == '1') {
-                    $form_text_tray = new XoopsFormElementTray($title, '', $name);
-                    $form_text_tray->addElement(new XoopsFormLabel('', '<table><tr><td>'));
-                    $form_text_tray->addElement(new XoopsFormText('<b>' . _MD_CUSTOM_TITLE . '</b></td><td>', 'custom' . $name, 50, 250, $customtitle));
-                    $form_text_tray->addElement(new XoopsFormLabel('', '</td></tr><tr><td>'));
-                    $form_text_tray->addElement(new XoopsFormText('<b>' . _MD_CUSTOM_VALUE . '</b></td><td>', $name, $size, $maxsize, $value));
-                    $form_text_tray->addElement(new XoopsFormLabel('', '</td></tr></table>'));
-                    $form->addElement($form_text_tray);
-                } else {
-                    $form->addElement(new XoopsFormText($title, $name, 50, 250, $myts->htmlSpecialChars($value)));
-                }
-                break;
-            case 'textarea':
-                if ($custom == '1') {
-                    $form_textarea_tray = new XoopsFormElementTray($title, '', $name);
-                    $form_textarea_tray->addElement(new XoopsFormLabel('', '<table><tr><td>'));
-                    $form_textarea_tray->addElement(new XoopsFormText('<b>' . _MD_CUSTOM_TITLE . '</b></td><td>', 'custom' . $name, 50, 250, $customtitle));
-                    $form_textarea_tray->addElement(new XoopsFormLabel('', '</td></tr><tr><td>'));
-                    $form_textarea_tray->addElement(new XoopsFormTextArea('<b>' . _MD_CUSTOM_VALUE . '</b></td><td>', $name, $value, $rows, $cols));
-                    $form_textarea_tray->addElement(new XoopsFormLabel('', '</td></tr></table>'));
-                    $form->addElement($form_textarea_tray);
-                } else {
-                    $form->addElement(new XoopsFormTextArea($title, $name, $value, $rows, $cols));
-                }
-                break;
-            case 'yesno':
-                $form->addElement(new XoopsFormRadioyn($title, $name, $value, _YES, _NO));
-                break;
-            case 'radio':
-                $options_arr = explode('[|]', $options);
-                $form_radio  = new XoopsFormRadio($title, $name, $value, 1);
-                foreach ($options_arr as $option) {
-                    $form_radio->addOption($option, $option);
-                }
-                $form->addElement($form_radio);
-                break;
-            case 'checkbox':
-                $options_arr   = explode('[|]', $options);
-                $form_checkbox = new XoopsFormCheckbox($title, $name, $value, 1);
-                foreach ($options_arr as $option) {
-                    $form_checkbox->addOption($option, $option);
-                }
-                $form->addElement($form_checkbox);
-                break;
-            case 'select':
-                $options_arr = explode('[|]', $options);
-                $value_arr   = explode('[|]', $value);
-                $form_select = new XoopsFormSelect($title, $name, $value, $size, $multiple);
-                $form_select->addOption('-', '----');
-                $form_select->setValue($value_arr);
-                foreach ($options_arr as $key => $option) {
-                    $form_select->addOption($option, $option);
-                }
-                $form->addElement($form_select);
-                break;
-            case 'dhtml':
-                if ($custom == '1') {
-                    $form_dhtmlarea_tray = new XoopsFormElementTray($title, '', $name);
-                    $form_dhtmlarea_tray->addElement(new XoopsFormLabel('', '<table><tr><td>'));
-                    $form_dhtmlarea_tray->addElement(new XoopsFormText('<b>' . _MD_CUSTOM_TITLE . '</b></td><td>', 'custom' . $name, 50, 250, $customtitle));
-                    $form_dhtmlarea_tray->addElement(new XoopsFormLabel('', '</td></tr><tr><td>'));
-                    $form_dhtmlarea_tray->addElement(new XoopsFormDhtmlTextArea('<b>' . _MD_CUSTOM_VALUE . '</b></td><td>', $name, $value, $rows, $cols));
-                    $form_dhtmlarea_tray->addElement(new XoopsFormLabel('', '</td></tr></table>'));
-                    $form->addElement($form_dhtmlarea_tray);
-                } else {
-                    $form->addElement(new XoopsFormDhtmlTextArea($title, $name, $value, $rows, $cols));
-                }
-                break;
-            case 'address':
-                //Query all address fields associated with the address type that belongs to the locid.
-                $addressfields = getAddressFields('0');
-                $addressvalues = getAddressValues($value);
-                $form->addElement(new XoopsFormLabel('', '<strong>' . $title . '</strong>'));
-                $fieldtitles = array(
-                    'address'  => _MD_DF_ADDRESS,
-                    'address2' => _MD_DF_ADDRESS2,
-                    'zip'      => _MD_DF_ZIP,
-                    'postcode' => _MD_DF_POSTCODE,
-                    'lat'      => _MD_DF_LAT,
-                    'lon'      => _MD_DF_LON,
-                    'phone'    => _MD_DF_PHONE,
-                    'fax'      => _MD_DF_FAX,
-                    'mobile'   => _MD_DF_MOBILE,
-                    'city'     => _MD_DF_CITY,
-                    'country'  => _MD_DF_COUNTRY,
-                    'typename' => _MD_DF_TYPENAME,
-                    'uselocyn' => _MD_DF_USELOCYN
-                );
-                foreach ($addressfields['addressfields'] as $field => $fieldvalue) {
-                    $storedvalue = $addressvalues["$field"];
-                    if ($fieldvalue == 1) {
-                        $title = $fieldtitles["$field"];
-                        $form->addElement(new XoopsFormText($title, $name . $field, 50, 250, $myts->htmlSpecialChars($storedvalue)));
-                    }
-                }
-                $form->addElement(new XoopsFormHidden('submitaddress', '1'));
-                $form->addElement(new XoopsFormHidden($name, $value));
-                $form->addElement(new XoopsFormHidden('addrid', $value));
-                break;
-            case 'rating':
-                $rating_options = array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
-                $form_rating    = new XoopsFormSelect($title, $name, $value, 1);
-                $form_rating->addOption('0', '----');
-                foreach ($rating_options as $option) {
-                    $form_rating->addOption($option, $option);
-                }
-                $form->addElement($form_rating);
-                break;
-            case 'date':
-                $form->addElement(new XoopsFormText($title, $name, 10, 10, $value));
-                break;
-            case 'url':
-                if ($value != '') {
-                    $link = explode('|', $value);
-                } else {
-                    $link    = array();
-                    $link[0] = '';
-                    $link[1] = '';
-                }
-                $form_textarea_tray = new XoopsFormElementTray($title, '', $name);
-                $form_textarea_tray->addElement(new XoopsFormLabel('', '<table><tr><td>'));
-                $form_textarea_tray->addElement(new XoopsFormText('<b>' . _MD_FIELDNAMES_URL_TITLE . '</b></td><td>', 'url_title' . $name, 50, 250, $link[1]));
-                $form_textarea_tray->addElement(new XoopsFormLabel('', '</td></tr><tr><td>'));
-                $form_textarea_tray->addElement(new XoopsFormText('<b>' . _MD_FIELDNAMES_URL_LINK . '</b></td><td>', 'url_link' . $name, 50, 250, $link[0]));
-                $form_textarea_tray->addElement(new XoopsFormLabel('', '</td></tr></table>'));
-                $form->addElement($form_textarea_tray);
-                break;
-            default:
-                echo $fieldtype . ' is an unknown field type.';
-                break;
-        }
-    }
+		switch ($fieldtype) {
+			case 'textbox':
+				if ($custom == '1') {
+					$form_text_tray = new XoopsFormElementTray($title, '', $name);
+					$form_text_tray->addElement(new XoopsFormLabel('', '<table><tr><td>'));
+					$form_text_tray->addElement(new XoopsFormText('<b>' . _MD_CUSTOM_TITLE . '</b></td><td>', 'custom' . $name, 50, 250, $customtitle));
+					$form_text_tray->addElement(new XoopsFormLabel('', '</td></tr><tr><td>'));
+					$form_text_tray->addElement(new XoopsFormText('<b>' . _MD_CUSTOM_VALUE . '</b></td><td>', $name, $size, $maxsize, $value));
+					$form_text_tray->addElement(new XoopsFormLabel('', '</td></tr></table>'));
+					$form->addElement($form_text_tray);
+				} else {
+					$form->addElement(new XoopsFormText($title, $name, 50, 250, $myts->htmlSpecialChars($value)));
+				}
+				break;
+			case 'textarea':
+				if ($custom == '1') {
+					$form_textarea_tray = new XoopsFormElementTray($title, '', $name);
+					$form_textarea_tray->addElement(new XoopsFormLabel('', '<table><tr><td>'));
+					$form_textarea_tray->addElement(new XoopsFormText('<b>' . _MD_CUSTOM_TITLE . '</b></td><td>', 'custom' . $name, 50, 250, $customtitle));
+					$form_textarea_tray->addElement(new XoopsFormLabel('', '</td></tr><tr><td>'));
+					$form_textarea_tray->addElement(new XoopsFormTextArea('<b>' . _MD_CUSTOM_VALUE . '</b></td><td>', $name, $value, $rows, $cols));
+					$form_textarea_tray->addElement(new XoopsFormLabel('', '</td></tr></table>'));
+					$form->addElement($form_textarea_tray);
+				} else {
+					$form->addElement(new XoopsFormTextArea($title, $name, $value, $rows, $cols));
+				}
+				break;
+			case 'yesno':
+				$form->addElement(new XoopsFormRadioyn($title, $name, $value, _YES, _NO));
+				break;
+			case 'radio':
+				$options_arr = explode('[|]', $options);
+				$form_radio  = new XoopsFormRadio($title, $name, $value, 1);
+				foreach ($options_arr as $option) {
+					$form_radio->addOption($option, $option);
+				}
+				$form->addElement($form_radio);
+				break;
+			case 'checkbox':
+				$options_arr   = explode('[|]', $options);
+				$form_checkbox = new XoopsFormCheckbox($title, $name, $value, 1);
+				foreach ($options_arr as $option) {
+					$form_checkbox->addOption($option, $option);
+				}
+				$form->addElement($form_checkbox);
+				break;
+			case 'select':
+				$options_arr = explode('[|]', $options);
+				$value_arr   = explode('[|]', $value);
+				$form_select = new XoopsFormSelect($title, $name, $value, $size, $multiple);
+				$form_select->addOption('-', '----');
+				$form_select->setValue($value_arr);
+				foreach ($options_arr as $key => $option) {
+					$form_select->addOption($option, $option);
+				}
+				$form->addElement($form_select);
+				break;
+			case 'dhtml':
+				if ($custom == '1') {
+					$form_dhtmlarea_tray = new XoopsFormElementTray($title, '', $name);
+					$form_dhtmlarea_tray->addElement(new XoopsFormLabel('', '<table><tr><td>'));
+					$form_dhtmlarea_tray->addElement(new XoopsFormText('<b>' . _MD_CUSTOM_TITLE . '</b></td><td>', 'custom' . $name, 50, 250, $customtitle));
+					$form_dhtmlarea_tray->addElement(new XoopsFormLabel('', '</td></tr><tr><td>'));
+					$form_dhtmlarea_tray->addElement(new XoopsFormDhtmlTextArea('<b>' . _MD_CUSTOM_VALUE . '</b></td><td>', $name, $value, $rows, $cols));
+					$form_dhtmlarea_tray->addElement(new XoopsFormLabel('', '</td></tr></table>'));
+					$form->addElement($form_dhtmlarea_tray);
+				} else {
+					$form->addElement(new XoopsFormDhtmlTextArea($title, $name, $value, $rows, $cols));
+				}
+				break;
+			case 'address':
+				//Query all address fields associated with the address type that belongs to the locid.
+				$addressfields = getAddressFields('0');
+				$addressvalues = getAddressValues($value);
+				$form->addElement(new XoopsFormLabel('', '<strong>' . $title . '</strong>'));
+				$fieldtitles = array(
+					'address'  => _MD_DF_ADDRESS,
+					'address2' => _MD_DF_ADDRESS2,
+					'zip'      => _MD_DF_ZIP,
+					'postcode' => _MD_DF_POSTCODE,
+					'lat'      => _MD_DF_LAT,
+					'lon'      => _MD_DF_LON,
+					'phone'    => _MD_DF_PHONE,
+					'fax'      => _MD_DF_FAX,
+					'mobile'   => _MD_DF_MOBILE,
+					'city'     => _MD_DF_CITY,
+					'country'  => _MD_DF_COUNTRY,
+					'typename' => _MD_DF_TYPENAME,
+					'uselocyn' => _MD_DF_USELOCYN
+				);
+				foreach ($addressfields['addressfields'] as $field => $fieldvalue) {
+					$storedvalue = $addressvalues["$field"];
+					if ($fieldvalue == 1) {
+						$title = $fieldtitles["$field"];
+						$form->addElement(new XoopsFormText($title, $name . $field, 50, 250, $myts->htmlSpecialChars($storedvalue)));
+					}
+				}
+				$form->addElement(new XoopsFormHidden('submitaddress', '1'));
+				$form->addElement(new XoopsFormHidden($name, $value));
+				$form->addElement(new XoopsFormHidden('addrid', $value));
+				break;
+			case 'rating':
+				$rating_options = array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+				$form_rating    = new XoopsFormSelect($title, $name, $value, 1);
+				$form_rating->addOption('0', '----');
+				foreach ($rating_options as $option) {
+					$form_rating->addOption($option, $option);
+				}
+				$form->addElement($form_rating);
+				break;
+			case 'date':
+				$form->addElement(new XoopsFormText($title, $name, 10, 10, $value));
+				break;
+			case 'url':
+				if ($value != '') {
+					$link = explode('|', $value);
+				} else {
+					$link    = array();
+					$link[0] = '';
+					$link[1] = '';
+				}
+				$form_textarea_tray = new XoopsFormElementTray($title, '', $name);
+				$form_textarea_tray->addElement(new XoopsFormLabel('', '<table><tr><td>'));
+				$form_textarea_tray->addElement(new XoopsFormText('<b>' . _MD_FIELDNAMES_URL_TITLE . '</b></td><td>', 'url_title' . $name, 50, 250, $link[1]));
+				$form_textarea_tray->addElement(new XoopsFormLabel('', '</td></tr><tr><td>'));
+				$form_textarea_tray->addElement(new XoopsFormText('<b>' . _MD_FIELDNAMES_URL_LINK . '</b></td><td>', 'url_link' . $name, 50, 250, $link[0]));
+				$form_textarea_tray->addElement(new XoopsFormLabel('', '</td></tr></table>'));
+				$form->addElement($form_textarea_tray);
+				break;
+			default:
+				echo $fieldtype . ' is an unknown field type.';
+				break;
+		}
+	}
 
-    public function getFieldValue($fieldtype = '', $options = '', $value = 0)
-    {
-        global $form, $myts, $moddir;
-        switch ($fieldtype) {
-            case 'textbox':
-                return $myts->htmlSpecialChars($value);
-                break;
-            case 'yesno':
-                if ($value == '1') {
-                    return _YES;
-                } else {
-                    return _NO;
-                }
-                break;
-            case 'radio':
-                return $myts->htmlSpecialChars($value);
-                break;
-            case 'select':
-                return $myts->htmlSpecialChars($value);
-            case 'dhtml':
-                return $myts->displayTarea($value);
-            case 'rating':
-                $xoops_url = XOOPS_URL;
-                switch ($value) {
-                    case 1:
-                        $src = "$xoops_url/modules/$moddir/assets/images/rating_1.gif";
-                        break;
-                    case 2:
-                        $src = "$xoops_url/modules/$moddir/assets/images/rating_2.gif";
-                        break;
-                    case 3:
-                        $src = "$xoops_url/modules/$moddir/assets/images/rating_3.gif";
-                        break;
-                    case 4:
-                        $src = "$xoops_url/modules/$moddir/assets/images/rating_4.gif";
-                        break;
-                    case 5:
-                        $src = "$xoops_url/modules/$moddir/assets/images/rating_5.gif";
-                        break;
-                    case 6:
-                        $src = "$xoops_url/modules/$moddir/assets/images/rating_6.gif";
-                        break;
-                    case 7:
-                        $src = "$xoops_url/modules/$moddir/assets/images/rating_7.gif";
-                        break;
-                    case 8:
-                        $src = "$xoops_url/modules/$moddir/assets/images/rating_8.gif";
-                        break;
-                    case 9:
-                        $src = "$xoops_url/modules/$moddir/assets/images/rating_9.gif";
-                        break;
-                    case 10:
-                        $src = "$xoops_url/modules/$moddir/assets/images/rating_10.gif";
-                        break;
-                    default:
-                        $src = '';
-                }
-                $rating = "<img src=\"$src\">";
+	public function getFieldValue($fieldtype = '', $options = '', $value = 0)
+	{
+		global $form, $myts, $moddir;
+		switch ($fieldtype) {
+			case 'textbox':
+				return $myts->htmlSpecialChars($value);
+				break;
+			case 'yesno':
+				if ($value == '1') {
+					return _YES;
+				} else {
+					return _NO;
+				}
+				break;
+			case 'radio':
+				return $myts->htmlSpecialChars($value);
+				break;
+			case 'select':
+				return $myts->htmlSpecialChars($value);
+			case 'dhtml':
+				return $myts->displayTarea($value);
+			case 'rating':
+				$xoops_url = XOOPS_URL;
+				switch ($value) {
+					case 1:
+						$src = "$xoops_url/modules/$moddir/assets/images/rating_1.gif";
+						break;
+					case 2:
+						$src = "$xoops_url/modules/$moddir/assets/images/rating_2.gif";
+						break;
+					case 3:
+						$src = "$xoops_url/modules/$moddir/assets/images/rating_3.gif";
+						break;
+					case 4:
+						$src = "$xoops_url/modules/$moddir/assets/images/rating_4.gif";
+						break;
+					case 5:
+						$src = "$xoops_url/modules/$moddir/assets/images/rating_5.gif";
+						break;
+					case 6:
+						$src = "$xoops_url/modules/$moddir/assets/images/rating_6.gif";
+						break;
+					case 7:
+						$src = "$xoops_url/modules/$moddir/assets/images/rating_7.gif";
+						break;
+					case 8:
+						$src = "$xoops_url/modules/$moddir/assets/images/rating_8.gif";
+						break;
+					case 9:
+						$src = "$xoops_url/modules/$moddir/assets/images/rating_9.gif";
+						break;
+					case 10:
+						$src = "$xoops_url/modules/$moddir/assets/images/rating_10.gif";
+						break;
+					default:
+						$src = '';
+				}
+				$rating = "<img src=\"$src\">";
 
-                return $rating;
-            case 'address':
-                $fieldtitles   = array(
-                    'address'  => _MD_DF_ADDRESS,
-                    'address2' => _MD_DF_ADDRESS2,
-                    'zip'      => _MD_DF_ZIP,
-                    'postcode' => _MD_DF_POSTCODE,
-                    'lat'      => _MD_DF_LAT,
-                    'lon'      => _MD_DF_LON,
-                    'phone'    => _MD_DF_PHONE,
-                    'fax'      => _MD_DF_FAX,
-                    'mobile'   => _MD_DF_MOBILE,
-                    'city'     => _MD_DF_CITY,
-                    'country'  => _MD_DF_COUNTRY
-                );
-                $addressfields = getAddressFields('0');
-                $addressvalues = getAddressValues($value);
-                $address       = '';
+				return $rating;
+			case 'address':
+				$fieldtitles   = array(
+					'address'  => _MD_DF_ADDRESS,
+					'address2' => _MD_DF_ADDRESS2,
+					'zip'      => _MD_DF_ZIP,
+					'postcode' => _MD_DF_POSTCODE,
+					'lat'      => _MD_DF_LAT,
+					'lon'      => _MD_DF_LON,
+					'phone'    => _MD_DF_PHONE,
+					'fax'      => _MD_DF_FAX,
+					'mobile'   => _MD_DF_MOBILE,
+					'city'     => _MD_DF_CITY,
+					'country'  => _MD_DF_COUNTRY
+				);
+				$addressfields = getAddressFields('0');
+				$addressvalues = getAddressValues($value);
+				$address       = '';
 
-                foreach ($addressfields['addressfields'] as $field => $fieldvalue) {
-                    $storedvalue = $addressvalues["$field"];
-                    if ($fieldvalue == '1' && $storedvalue != '') {
-                        $title = $fieldtitles["$field"];
+				foreach ($addressfields['addressfields'] as $field => $fieldvalue) {
+					$storedvalue = $addressvalues["$field"];
+					if ($fieldvalue == '1' && $storedvalue != '') {
+						$title = $fieldtitles["$field"];
 
-                        switch ($field) {
-                            case 'address':
-                                $street = $myts->htmlSpecialChars($storedvalue);
-                                break;
-                            case 'city':
-                                $city = $myts->htmlSpecialChars($storedvalue);
-                                break;
-                            case 'zip':
-                                $zip = $myts->htmlSpecialChars($storedvalue);
-                                break;
-                            case 'state':
-                                $state = $myts->htmlSpecialChars($storedvalue);
-                                break;
-                            case 'country':
-                                $country = $myts->htmlSpecialChars($storedvalue);
-                                break;
-                            default:
-                                break;
-                        }
-                        $address .= $myts->htmlSpecialChars($storedvalue) . '<br>';
-                    }
-                }
-                if (!isset($street)) {
-                    $street = '';
-                }
-                if (!isset($city)) {
-                    $city = '';
-                }
-                if (!isset($zip)) {
-                    $zip = '';
-                }
-                if (!isset($state)) {
-                    $state = '';
-                }
-                if (!isset($country)) {
-                    $country = '';
-                }
-                if ($country == 'United States') {
-                    $countrycode = 'us';
-                } elseif ($country == 'Canada') {
-                    $countrycode = 'ca';
-                }
-                if (isset($countrycode) && isset($city) && isset($street)) {
-                    $address .= '<form name=mapForm2 action="http://us.rd.yahoo.com/maps/home/submit_a/*-http://maps.yahoo.com/maps" target="_new" method=get>
+						switch ($field) {
+							case 'address':
+								$street = $myts->htmlSpecialChars($storedvalue);
+								break;
+							case 'city':
+								$city = $myts->htmlSpecialChars($storedvalue);
+								break;
+							case 'zip':
+								$zip = $myts->htmlSpecialChars($storedvalue);
+								break;
+							case 'state':
+								$state = $myts->htmlSpecialChars($storedvalue);
+								break;
+							case 'country':
+								$country = $myts->htmlSpecialChars($storedvalue);
+								break;
+							default:
+								break;
+						}
+						$address .= $myts->htmlSpecialChars($storedvalue) . '<br>';
+					}
+				}
+				if (!isset($street)) {
+					$street = '';
+				}
+				if (!isset($city)) {
+					$city = '';
+				}
+				if (!isset($zip)) {
+					$zip = '';
+				}
+				if (!isset($state)) {
+					$state = '';
+				}
+				if (!isset($country)) {
+					$country = '';
+				}
+				if ($country == 'United States') {
+					$countrycode = 'us';
+				} elseif ($country == 'Canada') {
+					$countrycode = 'ca';
+				}
+				if (isset($countrycode) && isset($city) && isset($street)) {
+					$address .= '<form name=mapForm2 action="http://us.rd.yahoo.com/maps/home/submit_a/*-http://maps.yahoo.com/maps" target="_new" method=get>
                     <input type="hidden" name="addr" value="' . $street . '">
                     <input type="hidden" name="csz" value="' . $city . ', ' . $state . ' ' . $zip . '">
                     <input type="hidden" name="country" value="' . $countrycode . '">
                     <input type=hidden name=srchtype value=a>
                     <input type=submit name="getmap" value="Yahoo Map">
                     </form>';
-                }
+				}
 
-                return $address;
-            case 'url':
-                $link = explode('|', $value);
+				return $address;
+			case 'url':
+				$link = explode('|', $value);
 
-                return '<a href="' . $myts->htmlSpecialChars($link[0]) . '" title="' . $myts->htmlSpecialChars($link[1]) . '">' . $myts->htmlSpecialChars($link[0]) . '</a>';
-                break;
-            default:
-                return $myts->htmlSpecialChars($value);
-                break;
-        }
-    }
+				return '<a href="' . $myts->htmlSpecialChars($link[0]) . '" title="' . $myts->htmlSpecialChars($link[1]) . '">' . $myts->htmlSpecialChars($link[0]) . '</a>';
+				break;
+			default:
+				return $myts->htmlSpecialChars($value);
+				break;
+		}
+	}
 
-    public function createSearchField($title = '', $name = '', $fieldtype = '', $ext = '', $options = '', $value = '', $custom = '0', $customtitle = null)
-    {
-        global $form, $myts;
+	public function createSearchField($title = '', $name = '', $fieldtype = '', $ext = '', $options = '', $value = '', $custom = '0', $customtitle = null)
+	{
+		global $form, $myts;
 
-        switch ($fieldtype) {
-            case 'textbox':
-                $this->createSearchField_text($title, $name, $value, $options);
-                break;
-            case 'textarea':
-                $this->createSearchField_text($title, $value, $options);
-                break;
-            case 'yesno':
-                $form->addElement(new XoopsFormRadioyn($title, $name, '', _YES, _NO));
-                break;
-            case 'radio':
-                $this->createSearchField_select($title, $name, $value, $options);
-                break;
-            case 'checkbox':
-                $this->createSearchField_checkbox($title, $name, $value, $options);
-                break;
-            case 'select':
-                $this->createSearchField_checkbox($title, $name, $value, $options);
-                break;
-            case 'dhtml':
-                $this->createSearchField_text($title, $name, $value, $options);
-                break;
-            case 'address':
-                //Query all address fields associated with the address type that belongs to the locid.
-                /* $addressfields = getAddressFields('0');
+		switch ($fieldtype) {
+			case 'textbox':
+				$this->createSearchField_text($title, $name, $value, $options);
+				break;
+			case 'textarea':
+				$this->createSearchField_text($title, $value, $options);
+				break;
+			case 'yesno':
+				$form->addElement(new XoopsFormRadioyn($title, $name, '', _YES, _NO));
+				break;
+			case 'radio':
+				$this->createSearchField_select($title, $name, $value, $options);
+				break;
+			case 'checkbox':
+				$this->createSearchField_checkbox($title, $name, $value, $options);
+				break;
+			case 'select':
+				$this->createSearchField_checkbox($title, $name, $value, $options);
+				break;
+			case 'dhtml':
+				$this->createSearchField_text($title, $name, $value, $options);
+				break;
+			case 'address':
+				//Query all address fields associated with the address type that belongs to the locid.
+				/* $addressfields = getAddressFields('0');
                 $fieldtitles = array('address' => _MD_DF_ADDRESS, 'address2' => _MD_DF_ADDRESS2, 'zip' => _MD_DF_ZIP, 'postcode' => _MD_DF_POSTCODE, 'lat' => _MD_DF_LAT, 'lon' => _MD_DF_LON, 'phone' => _MD_DF_PHONE, 'fax' => _MD_DF_FAX, 'mobile' => _MD_DF_MOBILE, 'city' => _MD_DF_CITY, 'country' => _MD_DF_COUNTRY, 'typename' => _MD_DF_TYPENAME);
                 $form->addElement(new XoopsFormLabel("", "<strong>".$title."</strong>"));
                 foreach ($addressfields['addressfields'] as $field => $fieldvalue) {
@@ -396,247 +396,247 @@ 
                 $form->addElement(new XoopsFormHidden("submitaddress","1"));
                 $form->addElement(new XoopsFormHidden($name, $value));
                 $form->addElement(new XoopsFormHidden("addrid", $value)); */
-                break;
-            case 'rating':
-                $this->createSearchField_rating($title, $name, $value, $options);
-                break;
-            case 'date':
-                $this->createSearchField_text($title, $name, $value, $options);
-                break;
-            case 'url':
-                $this->createSearchField_text($title, $name, $value, $options);
-            default:
-                echo $fieldtype . ' geen bekend veldtype ';
-                break;
-        }
-    }
+				break;
+			case 'rating':
+				$this->createSearchField_rating($title, $name, $value, $options);
+				break;
+			case 'date':
+				$this->createSearchField_text($title, $name, $value, $options);
+				break;
+			case 'url':
+				$this->createSearchField_text($title, $name, $value, $options);
+			default:
+				echo $fieldtype . ' geen bekend veldtype ';
+				break;
+		}
+	}
 
-    public function createSearchField_text($title = '', $name = '', $value = '', $options = '')
-    {
-        global $form, $myts;
-        $options_arr_constr = array(
-            'equal'      => _MD_EQUAL_TO,
-            'notequal'   => _MD_NOT_EQUAL_TO,
-            'contains'   => _MD_CONTAINS,
-            'begins'     => _MD_BEGINSWITH,
-            'ends'       => _MD_ENDSWITH,
-            'notcontain' => _MD_NOTCONTAIN
-        );
-        $form_tray          = new XoopsFormElementTray($title, '', $name);
-        $form_tray->addElement(new XoopsFormLabel('', '<table><tr><td width="150">'));
-        $form_select_constr = new XoopsFormSelect('', $name . 'constr', $value, 1);
-        //$form_select->addOption('0', '----');
-        foreach ($options_arr_constr as $optionname => $option) {
-            $form_select_constr->addOption($optionname, $option);
-        }
-        $form_tray->addElement($form_select_constr);
-        $form_tray->addElement(new XoopsFormLabel('', '</td><td>'));
-        $form_tray->addElement(new XoopsFormText('', $name, 50, 250, ''));
-        $form_tray->addElement(new XoopsFormLabel('', '</td></tr></table>'));
-        $form->addElement($form_tray);
-    }
+	public function createSearchField_text($title = '', $name = '', $value = '', $options = '')
+	{
+		global $form, $myts;
+		$options_arr_constr = array(
+			'equal'      => _MD_EQUAL_TO,
+			'notequal'   => _MD_NOT_EQUAL_TO,
+			'contains'   => _MD_CONTAINS,
+			'begins'     => _MD_BEGINSWITH,
+			'ends'       => _MD_ENDSWITH,
+			'notcontain' => _MD_NOTCONTAIN
+		);
+		$form_tray          = new XoopsFormElementTray($title, '', $name);
+		$form_tray->addElement(new XoopsFormLabel('', '<table><tr><td width="150">'));
+		$form_select_constr = new XoopsFormSelect('', $name . 'constr', $value, 1);
+		//$form_select->addOption('0', '----');
+		foreach ($options_arr_constr as $optionname => $option) {
+			$form_select_constr->addOption($optionname, $option);
+		}
+		$form_tray->addElement($form_select_constr);
+		$form_tray->addElement(new XoopsFormLabel('', '</td><td>'));
+		$form_tray->addElement(new XoopsFormText('', $name, 50, 250, ''));
+		$form_tray->addElement(new XoopsFormLabel('', '</td></tr></table>'));
+		$form->addElement($form_tray);
+	}
 
-    public function createSearchField_checkbox($title = '', $name = '', $value = '', $options = '')
-    {
-        global $form, $myts;
-        $options_arr   = explode('[|]', $options);
-        $countoptions  = count($options_arr) + 1;
-        $form_checkbox = new XoopsFormCheckBox($title, $name, $value);
-        foreach ($options_arr as $optionname) {
-            $form_checkbox->addOption($optionname, $optionname);
-        }
-        $form->addElement($form_checkbox);
-    }
+	public function createSearchField_checkbox($title = '', $name = '', $value = '', $options = '')
+	{
+		global $form, $myts;
+		$options_arr   = explode('[|]', $options);
+		$countoptions  = count($options_arr) + 1;
+		$form_checkbox = new XoopsFormCheckBox($title, $name, $value);
+		foreach ($options_arr as $optionname) {
+			$form_checkbox->addOption($optionname, $optionname);
+		}
+		$form->addElement($form_checkbox);
+	}
 
-    public function createSearchField_select($title = '', $name = '', $value = '', $options = '')
-    {
-        global $form, $myts;
-        $options_arr        = explode('[|]', $options);
-        $options_arr_constr = array('equal' => _MD_EQUAL_TO, 'notequal' => _MD_NOT_EQUAL_TO);
-        $form_tray          = new XoopsFormElementTray($title, '', $name);
-        $form_tray->addElement(new XoopsFormLabel('', '<table><tr><td width="150">'));
-        $form_select_constr = new XoopsFormSelect('', $name, $value, 1);
-        foreach ($options_arr_constr as $option) {
-            $form_select_constr->addOption($option, $option);
-        }
-        $form_tray->addElement($form_select_constr);
-        $form_tray->addElement(new XoopsFormLabel('', '</td><td>'));
-        $countoptions = count($options_arr) + 1;
-        if ($countoptions >= 5) {
-            $selectformsize = 5;
-        } else {
-            $selectformsize = $countoptions;
-        }
-        $form_select = new XoopsFormSelect('', $name, $value, $selectformsize);
-        $form_select->setExtra(" multiple='multiple'");
-        $form_select->addOption('0', '----');
-        foreach ($options_arr as $option) {
-            $form_select->addOption($option, $option);
-        }
-        $form_tray->addElement($form_select);
-        $form_tray->addElement(new XoopsFormLabel('', '</td></tr></table>'));
-        $form->addElement($form_tray);
-    }
+	public function createSearchField_select($title = '', $name = '', $value = '', $options = '')
+	{
+		global $form, $myts;
+		$options_arr        = explode('[|]', $options);
+		$options_arr_constr = array('equal' => _MD_EQUAL_TO, 'notequal' => _MD_NOT_EQUAL_TO);
+		$form_tray          = new XoopsFormElementTray($title, '', $name);
+		$form_tray->addElement(new XoopsFormLabel('', '<table><tr><td width="150">'));
+		$form_select_constr = new XoopsFormSelect('', $name, $value, 1);
+		foreach ($options_arr_constr as $option) {
+			$form_select_constr->addOption($option, $option);
+		}
+		$form_tray->addElement($form_select_constr);
+		$form_tray->addElement(new XoopsFormLabel('', '</td><td>'));
+		$countoptions = count($options_arr) + 1;
+		if ($countoptions >= 5) {
+			$selectformsize = 5;
+		} else {
+			$selectformsize = $countoptions;
+		}
+		$form_select = new XoopsFormSelect('', $name, $value, $selectformsize);
+		$form_select->setExtra(" multiple='multiple'");
+		$form_select->addOption('0', '----');
+		foreach ($options_arr as $option) {
+			$form_select->addOption($option, $option);
+		}
+		$form_tray->addElement($form_select);
+		$form_tray->addElement(new XoopsFormLabel('', '</td></tr></table>'));
+		$form->addElement($form_tray);
+	}
 
-    public function createSearchField_rating2($title = '', $name = '', $value = '', $options = '')
-    {
-        global $form, $myts;
-        $options_arr    = explode('[|]', $options);
-        $rating_options = array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
-        $form_rating    = new XoopsFormSelect($title, $name, $value, 1);
-        $form_rating->addOption('0', '----');
-        foreach ($rating_options as $option) {
-            $form_rating->addOption($option, $option);
-        }
-        $form->addElement($form_rating);
-    }
+	public function createSearchField_rating2($title = '', $name = '', $value = '', $options = '')
+	{
+		global $form, $myts;
+		$options_arr    = explode('[|]', $options);
+		$rating_options = array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+		$form_rating    = new XoopsFormSelect($title, $name, $value, 1);
+		$form_rating->addOption('0', '----');
+		foreach ($rating_options as $option) {
+			$form_rating->addOption($option, $option);
+		}
+		$form->addElement($form_rating);
+	}
 
-    public function createSearchField_rating($title = '', $name = '', $value = '', $options = '')
-    {
-        global $form, $myts;
-        $options_arr        = explode('[|]', $options);
-        $rating_options     = array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
-        $options_arr_constr = array(
-            'equal'    => _MD_EQUAL_TO,
-            'notequal' => _MD_NOT_EQUAL_TO,
-            'smaller'  => _MD_SMALLER_THAN,
-            'bigger'   => _MD_GREATER_THAN
-        );
-        $form_tray          = new XoopsFormElementTray($title, '', $name);
-        $form_tray->addElement(new XoopsFormLabel('', '<table><tr><td width="150">'));
-        $form_select_constr = new XoopsFormSelect('', $name . 'constr', $value, 1);
-        foreach ($options_arr_constr as $optionname => $option) {
-            $form_select_constr->addOption($optionname, $option);
-        }
-        $form_tray->addElement($form_select_constr);
-        $form_tray->addElement(new XoopsFormLabel('', '</td><td>'));
-        $countoptions = count($rating_options) + 1;
-        if ($countoptions >= 5) {
-            $selectformsize = 5;
-        } else {
-            $selectformsize = $rating_options;
-        }
-        $form_select = new XoopsFormSelect('', $name, $value, $selectformsize);
-        //$form_select->setExtra(" multiple='multiple'");
-        $form_select->addOption('0', '----');
-        foreach ($rating_options as $option) {
-            $form_select->addOption($option, $option);
-        }
-        $form_tray->addElement($form_select);
-        $form_tray->addElement(new XoopsFormLabel('', '</td></tr></table>'));
-        $form->addElement($form_tray);
-    }
+	public function createSearchField_rating($title = '', $name = '', $value = '', $options = '')
+	{
+		global $form, $myts;
+		$options_arr        = explode('[|]', $options);
+		$rating_options     = array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+		$options_arr_constr = array(
+			'equal'    => _MD_EQUAL_TO,
+			'notequal' => _MD_NOT_EQUAL_TO,
+			'smaller'  => _MD_SMALLER_THAN,
+			'bigger'   => _MD_GREATER_THAN
+		);
+		$form_tray          = new XoopsFormElementTray($title, '', $name);
+		$form_tray->addElement(new XoopsFormLabel('', '<table><tr><td width="150">'));
+		$form_select_constr = new XoopsFormSelect('', $name . 'constr', $value, 1);
+		foreach ($options_arr_constr as $optionname => $option) {
+			$form_select_constr->addOption($optionname, $option);
+		}
+		$form_tray->addElement($form_select_constr);
+		$form_tray->addElement(new XoopsFormLabel('', '</td><td>'));
+		$countoptions = count($rating_options) + 1;
+		if ($countoptions >= 5) {
+			$selectformsize = 5;
+		} else {
+			$selectformsize = $rating_options;
+		}
+		$form_select = new XoopsFormSelect('', $name, $value, $selectformsize);
+		//$form_select->setExtra(" multiple='multiple'");
+		$form_select->addOption('0', '----');
+		foreach ($rating_options as $option) {
+			$form_select->addOption($option, $option);
+		}
+		$form_tray->addElement($form_select);
+		$form_tray->addElement(new XoopsFormLabel('', '</td></tr></table>'));
+		$form->addElement($form_tray);
+	}
 
-    public function getWidth()
-    {
-        return $this->_width;
-    }
+	public function getWidth()
+	{
+		return $this->_width;
+	}
 
-    public function getHeight()
-    {
-        return $this->_height;
-    }
+	public function getHeight()
+	{
+		return $this->_height;
+	}
 
-    public function getSrc()
-    {
-        return $this->_src;
-    }
+	public function getSrc()
+	{
+		return $this->_src;
+	}
 
-    /*
+	/*
     * Are multiple selections allowed?
     *
     * @return bool
     */
-    public function isMultiple()
-    {
-        return $this->_multiple;
-    }
+	public function isMultiple()
+	{
+		return $this->_multiple;
+	}
 
-    /**
-     * Get the size
-     *
-     * @return int
-     */
-    public function getSize()
-    {
-        return $this->_size;
-    }
+	/**
+	 * Get the size
+	 *
+	 * @return int
+	 */
+	public function getSize()
+	{
+		return $this->_size;
+	}
 
-    /**
-     * Get an array of pre-selected values
-     *
-     * @return array
-     */
-    public function getValue()
-    {
-        return $this->_value;
-    }
+	/**
+	 * Get an array of pre-selected values
+	 *
+	 * @return array
+	 */
+	public function getValue()
+	{
+		return $this->_value;
+	}
 
-    /**
-     * Set pre-selected values
-     *
-     * @param $value mixed
-     */
-    public function setValue($value)
-    {
-        if (is_array($value)) {
-            foreach ($value as $v) {
-                $this->_value[] = $v;
-            }
-        } else {
-            $this->_value[] = $value;
-        }
-    }
+	/**
+	 * Set pre-selected values
+	 *
+	 * @param $value mixed
+	 */
+	public function setValue($value)
+	{
+		if (is_array($value)) {
+			foreach ($value as $v) {
+				$this->_value[] = $v;
+			}
+		} else {
+			$this->_value[] = $value;
+		}
+	}
 
-    /**
-     * Add an option
-     *
-     * @param string $value "value" attribute
-     * @param string $name  "name" attribute
-     */
-    public function addOption($value, $name = '')
-    {
-        if ($name != '') {
-            $this->_options[$value] = $name;
-        } else {
-            $this->_options[$value] = $value;
-        }
-    }
+	/**
+	 * Add an option
+	 *
+	 * @param string $value "value" attribute
+	 * @param string $name  "name" attribute
+	 */
+	public function addOption($value, $name = '')
+	{
+		if ($name != '') {
+			$this->_options[$value] = $name;
+		} else {
+			$this->_options[$value] = $value;
+		}
+	}
 
-    /**
-     * Add multiple options
-     *
-     * @param array $options Associative array of value->name pairs
-     */
-    public function addOptionArray($options)
-    {
-        if (is_array($options)) {
-            foreach ($options as $k => $v) {
-                $this->addOption($k, $v);
-            }
-        }
-    }
+	/**
+	 * Add multiple options
+	 *
+	 * @param array $options Associative array of value->name pairs
+	 */
+	public function addOptionArray($options)
+	{
+		if (is_array($options)) {
+			foreach ($options as $k => $v) {
+				$this->addOption($k, $v);
+			}
+		}
+	}
 
-    /**
-     * Get all options
-     *
-     * @return array   Associative array of value->name pairs
-     */
-    public function getOptions()
-    {
-        return $this->_options;
-    }
+	/**
+	 * Get all options
+	 *
+	 * @return array   Associative array of value->name pairs
+	 */
+	public function getOptions()
+	{
+		return $this->_options;
+	}
 
-    /**
-     * Prepare HTML for output
-     *
-     * @return string  HTML
-     */
-    public function render()
-    {
-        $ret = "<img src='" . $this->getSrc() . '\' width=\'' . $this->getWidth() . '\'  height=\'' . $this->getHeight() . '\'';
-        $ret .= '>';
+	/**
+	 * Prepare HTML for output
+	 *
+	 * @return string  HTML
+	 */
+	public function render()
+	{
+		$ret = "<img src='" . $this->getSrc() . '\' width=\'' . $this->getWidth() . '\'  height=\'' . $this->getHeight() . '\'';
+		$ret .= '>';
 
-        return $ret;
-    }
+		return $ret;
+	}
 }

Spacing +21 added lines, -21 removed lines

@@ -79,9 +79,9 @@ 
                 if ($custom == '1') {
                     $form_text_tray = new XoopsFormElementTray($title, '', $name);
                     $form_text_tray->addElement(new XoopsFormLabel('', '<table><tr><td>'));
-                    $form_text_tray->addElement(new XoopsFormText('<b>' . _MD_CUSTOM_TITLE . '</b></td><td>', 'custom' . $name, 50, 250, $customtitle));
+                    $form_text_tray->addElement(new XoopsFormText('<b>'._MD_CUSTOM_TITLE.'</b></td><td>', 'custom'.$name, 50, 250, $customtitle));
                     $form_text_tray->addElement(new XoopsFormLabel('', '</td></tr><tr><td>'));
-                    $form_text_tray->addElement(new XoopsFormText('<b>' . _MD_CUSTOM_VALUE . '</b></td><td>', $name, $size, $maxsize, $value));
+                    $form_text_tray->addElement(new XoopsFormText('<b>'._MD_CUSTOM_VALUE.'</b></td><td>', $name, $size, $maxsize, $value));
                     $form_text_tray->addElement(new XoopsFormLabel('', '</td></tr></table>'));
                     $form->addElement($form_text_tray);
                 } else {
@@ -92,9 +92,9 @@ 
                 if ($custom == '1') {
                     $form_textarea_tray = new XoopsFormElementTray($title, '', $name);
                     $form_textarea_tray->addElement(new XoopsFormLabel('', '<table><tr><td>'));
-                    $form_textarea_tray->addElement(new XoopsFormText('<b>' . _MD_CUSTOM_TITLE . '</b></td><td>', 'custom' . $name, 50, 250, $customtitle));
+                    $form_textarea_tray->addElement(new XoopsFormText('<b>'._MD_CUSTOM_TITLE.'</b></td><td>', 'custom'.$name, 50, 250, $customtitle));
                     $form_textarea_tray->addElement(new XoopsFormLabel('', '</td></tr><tr><td>'));
-                    $form_textarea_tray->addElement(new XoopsFormTextArea('<b>' . _MD_CUSTOM_VALUE . '</b></td><td>', $name, $value, $rows, $cols));
+                    $form_textarea_tray->addElement(new XoopsFormTextArea('<b>'._MD_CUSTOM_VALUE.'</b></td><td>', $name, $value, $rows, $cols));
                     $form_textarea_tray->addElement(new XoopsFormLabel('', '</td></tr></table>'));
                     $form->addElement($form_textarea_tray);
                 } else {
@@ -135,9 +135,9 @@ 
                 if ($custom == '1') {
                     $form_dhtmlarea_tray = new XoopsFormElementTray($title, '', $name);
                     $form_dhtmlarea_tray->addElement(new XoopsFormLabel('', '<table><tr><td>'));
-                    $form_dhtmlarea_tray->addElement(new XoopsFormText('<b>' . _MD_CUSTOM_TITLE . '</b></td><td>', 'custom' . $name, 50, 250, $customtitle));
+                    $form_dhtmlarea_tray->addElement(new XoopsFormText('<b>'._MD_CUSTOM_TITLE.'</b></td><td>', 'custom'.$name, 50, 250, $customtitle));
                     $form_dhtmlarea_tray->addElement(new XoopsFormLabel('', '</td></tr><tr><td>'));
-                    $form_dhtmlarea_tray->addElement(new XoopsFormDhtmlTextArea('<b>' . _MD_CUSTOM_VALUE . '</b></td><td>', $name, $value, $rows, $cols));
+                    $form_dhtmlarea_tray->addElement(new XoopsFormDhtmlTextArea('<b>'._MD_CUSTOM_VALUE.'</b></td><td>', $name, $value, $rows, $cols));
                     $form_dhtmlarea_tray->addElement(new XoopsFormLabel('', '</td></tr></table>'));
                     $form->addElement($form_dhtmlarea_tray);
                 } else {
@@ -148,7 +148,7 @@ 
                 //Query all address fields associated with the address type that belongs to the locid.
                 $addressfields = getAddressFields('0');
                 $addressvalues = getAddressValues($value);
-                $form->addElement(new XoopsFormLabel('', '<strong>' . $title . '</strong>'));
+                $form->addElement(new XoopsFormLabel('', '<strong>'.$title.'</strong>'));
                 $fieldtitles = array(
                     'address'  => _MD_DF_ADDRESS,
                     'address2' => _MD_DF_ADDRESS2,
@@ -168,7 +168,7 @@ 
                     $storedvalue = $addressvalues["$field"];
                     if ($fieldvalue == 1) {
                         $title = $fieldtitles["$field"];
-                        $form->addElement(new XoopsFormText($title, $name . $field, 50, 250, $myts->htmlSpecialChars($storedvalue)));
+                        $form->addElement(new XoopsFormText($title, $name.$field, 50, 250, $myts->htmlSpecialChars($storedvalue)));
                     }
                 }
                 $form->addElement(new XoopsFormHidden('submitaddress', '1'));
@@ -197,14 +197,14 @@ 
                 }
                 $form_textarea_tray = new XoopsFormElementTray($title, '', $name);
                 $form_textarea_tray->addElement(new XoopsFormLabel('', '<table><tr><td>'));
-                $form_textarea_tray->addElement(new XoopsFormText('<b>' . _MD_FIELDNAMES_URL_TITLE . '</b></td><td>', 'url_title' . $name, 50, 250, $link[1]));
+                $form_textarea_tray->addElement(new XoopsFormText('<b>'._MD_FIELDNAMES_URL_TITLE.'</b></td><td>', 'url_title'.$name, 50, 250, $link[1]));
                 $form_textarea_tray->addElement(new XoopsFormLabel('', '</td></tr><tr><td>'));
-                $form_textarea_tray->addElement(new XoopsFormText('<b>' . _MD_FIELDNAMES_URL_LINK . '</b></td><td>', 'url_link' . $name, 50, 250, $link[0]));
+                $form_textarea_tray->addElement(new XoopsFormText('<b>'._MD_FIELDNAMES_URL_LINK.'</b></td><td>', 'url_link'.$name, 50, 250, $link[0]));
                 $form_textarea_tray->addElement(new XoopsFormLabel('', '</td></tr></table>'));
                 $form->addElement($form_textarea_tray);
                 break;
             default:
-                echo $fieldtype . ' is an unknown field type.';
+                echo $fieldtype.' is an unknown field type.';
                 break;
         }
     }
@@ -270,7 +270,7 @@ 
 
                 return $rating;
             case 'address':
-                $fieldtitles   = array(
+                $fieldtitles = array(
                     'address'  => _MD_DF_ADDRESS,
                     'address2' => _MD_DF_ADDRESS2,
                     'zip'      => _MD_DF_ZIP,
@@ -311,7 +311,7 @@ 
                             default:
                                 break;
                         }
-                        $address .= $myts->htmlSpecialChars($storedvalue) . '<br>';
+                        $address .= $myts->htmlSpecialChars($storedvalue).'<br>';
                     }
                 }
                 if (!isset($street)) {
@@ -336,9 +336,9 @@ 
                 }
                 if (isset($countrycode) && isset($city) && isset($street)) {
                     $address .= '<form name=mapForm2 action="http://us.rd.yahoo.com/maps/home/submit_a/*-http://maps.yahoo.com/maps" target="_new" method=get>
-                    <input type="hidden" name="addr" value="' . $street . '">
-                    <input type="hidden" name="csz" value="' . $city . ', ' . $state . ' ' . $zip . '">
-                    <input type="hidden" name="country" value="' . $countrycode . '">
+                    <input type="hidden" name="addr" value="' . $street.'">
+                    <input type="hidden" name="csz" value="' . $city.', '.$state.' '.$zip.'">
+                    <input type="hidden" name="country" value="' . $countrycode.'">
                     <input type=hidden name=srchtype value=a>
                     <input type=submit name="getmap" value="Yahoo Map">
                     </form>';
@@ -348,7 +348,7 @@ 
             case 'url':
                 $link = explode('|', $value);
 
-                return '<a href="' . $myts->htmlSpecialChars($link[0]) . '" title="' . $myts->htmlSpecialChars($link[1]) . '">' . $myts->htmlSpecialChars($link[0]) . '</a>';
+                return '<a href="'.$myts->htmlSpecialChars($link[0]).'" title="'.$myts->htmlSpecialChars($link[1]).'">'.$myts->htmlSpecialChars($link[0]).'</a>';
                 break;
             default:
                 return $myts->htmlSpecialChars($value);
@@ -406,7 +406,7 @@ 
             case 'url':
                 $this->createSearchField_text($title, $name, $value, $options);
             default:
-                echo $fieldtype . ' geen bekend veldtype ';
+                echo $fieldtype.' geen bekend veldtype ';
                 break;
         }
     }
@@ -424,7 +424,7 @@ 
         );
         $form_tray          = new XoopsFormElementTray($title, '', $name);
         $form_tray->addElement(new XoopsFormLabel('', '<table><tr><td width="150">'));
-        $form_select_constr = new XoopsFormSelect('', $name . 'constr', $value, 1);
+        $form_select_constr = new XoopsFormSelect('', $name.'constr', $value, 1);
         //$form_select->addOption('0', '----');
         foreach ($options_arr_constr as $optionname => $option) {
             $form_select_constr->addOption($optionname, $option);
@@ -504,7 +504,7 @@ 
         );
         $form_tray          = new XoopsFormElementTray($title, '', $name);
         $form_tray->addElement(new XoopsFormLabel('', '<table><tr><td width="150">'));
-        $form_select_constr = new XoopsFormSelect('', $name . 'constr', $value, 1);
+        $form_select_constr = new XoopsFormSelect('', $name.'constr', $value, 1);
         foreach ($options_arr_constr as $optionname => $option) {
             $form_select_constr->addOption($optionname, $option);
         }
@@ -634,7 +634,7 @@ 
      */
     public function render()
     {
-        $ret = "<img src='" . $this->getSrc() . '\' width=\'' . $this->getWidth() . '\'  height=\'' . $this->getHeight() . '\'';
+        $ret = "<img src='".$this->getSrc().'\' width=\''.$this->getWidth().'\'  height=\''.$this->getHeight().'\'';
         $ret .= '>';
 
         return $ret;

class/class.directory.php

Indentation +231 added lines, -231 removed lines

@@ -43,35 +43,35 @@ 
  */
 class efqDirectory extends XoopsObject
 {
-    /**
-     * efqDirectory constructor.
-     * @param bool $directory
-     */
-    public function __construct($directory = false)
-    {
-        global $moddir;
-        $this->db = XoopsDatabaseFactory::getDatabaseConnection();
-        $this->initVar('dirid', XOBJ_DTYPE_INT, null, false);
-        $this->initVar('postfix', XOBJ_DTYPE_TXTBOX);
-        $this->initVar('open', XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('name', XOBJ_DTYPE_TXTBOX);
-        $this->initVar('description', XOBJ_DTYPE_TXTAREA);
-        $this->initVar('img', XOBJ_DTYPE_TXTBOX);
-        $this->initVar('allowreview', XOBJ_DTYPE_INT, 0, false);
+	/**
+	 * efqDirectory constructor.
+	 * @param bool $directory
+	 */
+	public function __construct($directory = false)
+	{
+		global $moddir;
+		$this->db = XoopsDatabaseFactory::getDatabaseConnection();
+		$this->initVar('dirid', XOBJ_DTYPE_INT, null, false);
+		$this->initVar('postfix', XOBJ_DTYPE_TXTBOX);
+		$this->initVar('open', XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('name', XOBJ_DTYPE_TXTBOX);
+		$this->initVar('description', XOBJ_DTYPE_TXTAREA);
+		$this->initVar('img', XOBJ_DTYPE_TXTBOX);
+		$this->initVar('allowreview', XOBJ_DTYPE_INT, 0, false);
 
-        if ($directory !== false) {
-            if (is_array($directory)) {
-                $this->assignVars($directory);
-            } else {
-                $directoryHandler = xoops_getModuleHandler('directory', $moddir);
-                $objDirectory      = $directoryHandler->get($directory);
-                foreach ($objDirectory->vars as $k => $v) {
-                    $this->assignVar($k, $v['value']);
-                }
-                unset($objDirectory);
-            }
-        }
-    }
+		if ($directory !== false) {
+			if (is_array($directory)) {
+				$this->assignVars($directory);
+			} else {
+				$directoryHandler = xoops_getModuleHandler('directory', $moddir);
+				$objDirectory      = $directoryHandler->get($directory);
+				foreach ($objDirectory->vars as $k => $v) {
+					$this->assignVar($k, $v['value']);
+				}
+				unset($objDirectory);
+			}
+		}
+	}
 }
 
 /**
@@ -85,226 +85,226 @@ 
  */
 class efqDirectoryHandler extends XoopsObjectHandler
 {
-    /**
-     * efqDirectoryHandler constructor.
-     */
-    public function __construct()
-    {
-        $this->db = XoopsDatabaseFactory::getDatabaseConnection();
-    }
+	/**
+	 * efqDirectoryHandler constructor.
+	 */
+	public function __construct()
+	{
+		$this->db = XoopsDatabaseFactory::getDatabaseConnection();
+	}
 
-    /**
-     * create instance of directory class or reset the existing instance.
-     *
-     * @param bool $isNew
-     * @return efqDirectory $directory
-     */
-    public function &create($isNew = true)
-    {
-        $directory = new efqDirectory();
-        if ($isNew) {
-            $directory->setNew();
-        }
+	/**
+	 * create instance of directory class or reset the existing instance.
+	 *
+	 * @param bool $isNew
+	 * @return efqDirectory $directory
+	 */
+	public function &create($isNew = true)
+	{
+		$directory = new efqDirectory();
+		if ($isNew) {
+			$directory->setNew();
+		}
 
-        return $directory;
-    }
+		return $directory;
+	}
 
-    /**
-     * retrieve a directory
-     *
-     * @param bool|int $dirid ID of the directory
-     * @return mixed reference to the <a href='psi_element://efqDirectory'>efqDirectory</a> object, FALSE if failed
-     *                        object, FALSE if failed
-     */
-    public function &get($dirid = false)
-    {
-        if ($dirid === false) {
-            return false;
-        }
-        $dirid = (int)$dirid;
-        if ($dirid > 0) {
-            $sql = 'SELECT * FROM ' . $this->db->prefix('efqdiralpha1_dir') . ' WHERE dirid=' . $dirid;
-            if (!$result = $this->db->query($sql)) {
-                return false;
-            }
-            $directory =& $this->create(false);
-            $directory->assignVars($this->db->fetchArray($result));
+	/**
+	 * retrieve a directory
+	 *
+	 * @param bool|int $dirid ID of the directory
+	 * @return mixed reference to the <a href='psi_element://efqDirectory'>efqDirectory</a> object, FALSE if failed
+	 *                        object, FALSE if failed
+	 */
+	public function &get($dirid = false)
+	{
+		if ($dirid === false) {
+			return false;
+		}
+		$dirid = (int)$dirid;
+		if ($dirid > 0) {
+			$sql = 'SELECT * FROM ' . $this->db->prefix('efqdiralpha1_dir') . ' WHERE dirid=' . $dirid;
+			if (!$result = $this->db->query($sql)) {
+				return false;
+			}
+			$directory =& $this->create(false);
+			$directory->assignVars($this->db->fetchArray($result));
 
-            return $directory;
-        }
+			return $directory;
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * retrieve all directories
-     *
-     * @return mixed reference to the {@link efqDirectory} object, FALSE if failed
-     */
-    public function &getAll()
-    {
-        $sql = 'SELECT dirid,postfix,open,name,descr,img FROM ' . $this->db->prefix('efqdiralpha1_dir') . '';
-        if (!$result = $this->db->query($sql)) {
-            return false;
-        }
-        while (list($dirid, $postfix, $open, $name, $descr, $img) = $this->db->fetchRow($result)) {
-            $arr[] = array(
-                'dirid'   => $dirid,
-                'postfix' => $postfix,
-                'open'    => $open,
-                'name'    => $name,
-                'descr'   => $descr,
-                'img'     => $img
-            );
-        }
+	/**
+	 * retrieve all directories
+	 *
+	 * @return mixed reference to the {@link efqDirectory} object, FALSE if failed
+	 */
+	public function &getAll()
+	{
+		$sql = 'SELECT dirid,postfix,open,name,descr,img FROM ' . $this->db->prefix('efqdiralpha1_dir') . '';
+		if (!$result = $this->db->query($sql)) {
+			return false;
+		}
+		while (list($dirid, $postfix, $open, $name, $descr, $img) = $this->db->fetchRow($result)) {
+			$arr[] = array(
+				'dirid'   => $dirid,
+				'postfix' => $postfix,
+				'open'    => $open,
+				'name'    => $name,
+				'descr'   => $descr,
+				'img'     => $img
+			);
+		}
 
-        return $arr;
-    }
+		return $arr;
+	}
 
-    /**
-     * retrieve all directory ID's
-     *
-     * @param array $idarray
-     * @return array|bool
-     */
-    public function &getAllDirectoryIds($idarray = array())
-    {
-        $sql = 'SELECT dirid FROM ' . $this->db->prefix('efqdiralpha1_dir') . '';
-        if (!$result = $this->db->query($sql)) {
-            return false;
-        }
-        while (list($r_id) = $this->db->fetchRow($result)) {
-            array_push($idarray, $r_id);
-        }
+	/**
+	 * retrieve all directory ID's
+	 *
+	 * @param array $idarray
+	 * @return array|bool
+	 */
+	public function &getAllDirectoryIds($idarray = array())
+	{
+		$sql = 'SELECT dirid FROM ' . $this->db->prefix('efqdiralpha1_dir') . '';
+		if (!$result = $this->db->query($sql)) {
+			return false;
+		}
+		while (list($r_id) = $this->db->fetchRow($result)) {
+			array_push($idarray, $r_id);
+		}
 
-        return $idarray;
-    }
+		return $idarray;
+	}
 
-    /**
-     * retrieve all directory ID's and titles as array
-     *
-     * @param array $arr
-     * @return array|bool
-     */
-    public function &getAllDirectoryTitles($arr = array())
-    {
-        $sql = 'SELECT dirid, name FROM ' . $this->db->prefix('efqdiralpha1_dir') . '';
-        if (!$result = $this->db->query($sql)) {
-            return false;
-        }
-        while (list($r_id, $r_title) = $this->db->fetchRow($result)) {
-            $result_arr[$r_id] = $r_title;
-            //array_push($arr, $result_arr);
-        }
+	/**
+	 * retrieve all directory ID's and titles as array
+	 *
+	 * @param array $arr
+	 * @return array|bool
+	 */
+	public function &getAllDirectoryTitles($arr = array())
+	{
+		$sql = 'SELECT dirid, name FROM ' . $this->db->prefix('efqdiralpha1_dir') . '';
+		if (!$result = $this->db->query($sql)) {
+			return false;
+		}
+		while (list($r_id, $r_title) = $this->db->fetchRow($result)) {
+			$result_arr[$r_id] = $r_title;
+			//array_push($arr, $result_arr);
+		}
 
-        return $result_arr;
-    }
+		return $result_arr;
+	}
 
-    /**
-     * count number of directories and if count == 1, set directory.
-     *
-     * @return mixed $result, FALSE if failed, 0 if count is 0.
-     */
-    public function countAll()
-    {
-        global $xoopsDB;
-        $block       = array();
-        $myts        = MyTextSanitizer::getInstance();
-        $dirid       = 0;
-        $result      = $xoopsDB->query('SELECT dirid FROM ' . $xoopsDB->prefix('efqdiralpha1_dir') . '');
-        $num_results = $xoopsDB->getRowsNum($result);
-        if (!$result) {
-            return false;
-        } elseif ($num_results == 0) {
-            return 0;
-        } elseif ($num_results == 1) {
-            $row   = $GLOBALS['xoopsDB']->fetchBoth($result);
-            $dirid = $row['dirid'];
+	/**
+	 * count number of directories and if count == 1, set directory.
+	 *
+	 * @return mixed $result, FALSE if failed, 0 if count is 0.
+	 */
+	public function countAll()
+	{
+		global $xoopsDB;
+		$block       = array();
+		$myts        = MyTextSanitizer::getInstance();
+		$dirid       = 0;
+		$result      = $xoopsDB->query('SELECT dirid FROM ' . $xoopsDB->prefix('efqdiralpha1_dir') . '');
+		$num_results = $xoopsDB->getRowsNum($result);
+		if (!$result) {
+			return false;
+		} elseif ($num_results == 0) {
+			return 0;
+		} elseif ($num_results == 1) {
+			$row   = $GLOBALS['xoopsDB']->fetchBoth($result);
+			$dirid = $row['dirid'];
 
-            return $dirid;
-        } else {
-            return false;
-        }
-    }
+			return $dirid;
+		} else {
+			return false;
+		}
+	}
 
-    /**
-     * retrieve all directory ID's and names
-     *
-     * @param bool $dashes
-     * @return array $array
-     */
-    public function directoryArray($dashes = false)
-    {
-        $sql     = 'SELECT dirid, name FROM ' . $this->db->prefix('efqdiralpha1_dir') . ' ORDER BY name ASC';
-        $result  = $this->db->query($sql);
-        $numrows = $this->db->getRowsNum($result);
-        $result  = $this->db->query($sql);
-        if ($dashes !== false) {
-            $arr = array('0' => '---');
-        }
-        while (list($dirid, $dirname) = $this->db->fetchRow($result)) {
-            $arr[$dirid] = $dirname;
-        }
+	/**
+	 * retrieve all directory ID's and names
+	 *
+	 * @param bool $dashes
+	 * @return array $array
+	 */
+	public function directoryArray($dashes = false)
+	{
+		$sql     = 'SELECT dirid, name FROM ' . $this->db->prefix('efqdiralpha1_dir') . ' ORDER BY name ASC';
+		$result  = $this->db->query($sql);
+		$numrows = $this->db->getRowsNum($result);
+		$result  = $this->db->query($sql);
+		if ($dashes !== false) {
+			$arr = array('0' => '---');
+		}
+		while (list($dirid, $dirname) = $this->db->fetchRow($result)) {
+			$arr[$dirid] = $dirname;
+		}
 
-        return $arr;
-    }
+		return $arr;
+	}
 
-    /**
-     * Function insertDirectory inserts new record into DB
-     * @author    EFQ Consultancy <info@efqconsultancy.com>
-     * @copyright EFQ Consultancy (c) 2008
-     * @version   1.0.0
-     *
-     * @param   efqDirectory $obj object
-     *
-     * @param bool     $forceQuery
-     * @return bool true if insertion is succesful, false if unsuccesful
-     */
-    public function insertDirectory($obj, $forceQuery = false)
-    {
-        $tablename    = 'efqdiralpha1_dir';
-        $keyName      = 'dirid';
-        $excludedVars = array();
-        if ($obj instanceof efqDirectory) {
-            // Variable part of this function ends. From this line you can copy
-            // this function for similar object handling functions.
-            $obj->cleanVars();
-            $cleanvars = $obj->cleanVars;
-        } else {
-            return false;
-        }
-        $countVars = count($cleanvars);
-        $i         = 1;
-        $strFields = '';
-        $strValues = '';
-        foreach ($cleanvars as $k => $v) {
-            if (!in_array($k, $excludedVars)) {
-                $strFields .= $k;
-                $strValues .= "'" . $v . "'";
-                if ($i < $countVars) {
-                    $strFields .= ', ';
-                    $strValues .= ', ';
-                }
-                $i++;
-            }
-        }
-        $sql = sprintf('INSERT INTO %s (%s) VALUES (%s)', $this->db->prefix($tablename), $strFields, $strValues);
-        if ($forceQuery) {
-            if ($this->db->queryF($sql)) {
-                $itemid = $this->db->getInsertId();
-                $obj->setVar($keyName, $itemid);
+	/**
+	 * Function insertDirectory inserts new record into DB
+	 * @author    EFQ Consultancy <info@efqconsultancy.com>
+	 * @copyright EFQ Consultancy (c) 2008
+	 * @version   1.0.0
+	 *
+	 * @param   efqDirectory $obj object
+	 *
+	 * @param bool     $forceQuery
+	 * @return bool true if insertion is succesful, false if unsuccesful
+	 */
+	public function insertDirectory($obj, $forceQuery = false)
+	{
+		$tablename    = 'efqdiralpha1_dir';
+		$keyName      = 'dirid';
+		$excludedVars = array();
+		if ($obj instanceof efqDirectory) {
+			// Variable part of this function ends. From this line you can copy
+			// this function for similar object handling functions.
+			$obj->cleanVars();
+			$cleanvars = $obj->cleanVars;
+		} else {
+			return false;
+		}
+		$countVars = count($cleanvars);
+		$i         = 1;
+		$strFields = '';
+		$strValues = '';
+		foreach ($cleanvars as $k => $v) {
+			if (!in_array($k, $excludedVars)) {
+				$strFields .= $k;
+				$strValues .= "'" . $v . "'";
+				if ($i < $countVars) {
+					$strFields .= ', ';
+					$strValues .= ', ';
+				}
+				$i++;
+			}
+		}
+		$sql = sprintf('INSERT INTO %s (%s) VALUES (%s)', $this->db->prefix($tablename), $strFields, $strValues);
+		if ($forceQuery) {
+			if ($this->db->queryF($sql)) {
+				$itemid = $this->db->getInsertId();
+				$obj->setVar($keyName, $itemid);
 
-                return true;
-            }
-        } else {
-            if ($this->db->query($sql)) {
-                $itemid = $this->db->getInsertId();
-                $obj->setVar($keyName, $itemid);
+				return true;
+			}
+		} else {
+			if ($this->db->query($sql)) {
+				$itemid = $this->db->getInsertId();
+				$obj->setVar($keyName, $itemid);
 
-                return true;
-            }
-        }
+				return true;
+			}
+		}
 
-        return false;
-    }
+		return false;
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -64,7 +64,7 @@ 
                 $this->assignVars($directory);
             } else {
                 $directoryHandler = xoops_getModuleHandler('directory', $moddir);
-                $objDirectory      = $directoryHandler->get($directory);
+                $objDirectory = $directoryHandler->get($directory);
                 foreach ($objDirectory->vars as $k => $v) {
                     $this->assignVar($k, $v['value']);
                 }
@@ -121,13 +121,13 @@ 
         if ($dirid === false) {
             return false;
         }
-        $dirid = (int)$dirid;
+        $dirid = (int) $dirid;
         if ($dirid > 0) {
-            $sql = 'SELECT * FROM ' . $this->db->prefix('efqdiralpha1_dir') . ' WHERE dirid=' . $dirid;
+            $sql = 'SELECT * FROM '.$this->db->prefix('efqdiralpha1_dir').' WHERE dirid='.$dirid;
             if (!$result = $this->db->query($sql)) {
                 return false;
             }
-            $directory =& $this->create(false);
+            $directory = & $this->create(false);
             $directory->assignVars($this->db->fetchArray($result));
 
             return $directory;
@@ -143,7 +143,7 @@ 
      */
     public function &getAll()
     {
-        $sql = 'SELECT dirid,postfix,open,name,descr,img FROM ' . $this->db->prefix('efqdiralpha1_dir') . '';
+        $sql = 'SELECT dirid,postfix,open,name,descr,img FROM '.$this->db->prefix('efqdiralpha1_dir').'';
         if (!$result = $this->db->query($sql)) {
             return false;
         }
@@ -169,7 +169,7 @@ 
      */
     public function &getAllDirectoryIds($idarray = array())
     {
-        $sql = 'SELECT dirid FROM ' . $this->db->prefix('efqdiralpha1_dir') . '';
+        $sql = 'SELECT dirid FROM '.$this->db->prefix('efqdiralpha1_dir').'';
         if (!$result = $this->db->query($sql)) {
             return false;
         }
@@ -188,7 +188,7 @@ 
      */
     public function &getAllDirectoryTitles($arr = array())
     {
-        $sql = 'SELECT dirid, name FROM ' . $this->db->prefix('efqdiralpha1_dir') . '';
+        $sql = 'SELECT dirid, name FROM '.$this->db->prefix('efqdiralpha1_dir').'';
         if (!$result = $this->db->query($sql)) {
             return false;
         }
@@ -211,7 +211,7 @@ 
         $block       = array();
         $myts        = MyTextSanitizer::getInstance();
         $dirid       = 0;
-        $result      = $xoopsDB->query('SELECT dirid FROM ' . $xoopsDB->prefix('efqdiralpha1_dir') . '');
+        $result      = $xoopsDB->query('SELECT dirid FROM '.$xoopsDB->prefix('efqdiralpha1_dir').'');
         $num_results = $xoopsDB->getRowsNum($result);
         if (!$result) {
             return false;
@@ -235,7 +235,7 @@ 
      */
     public function directoryArray($dashes = false)
     {
-        $sql     = 'SELECT dirid, name FROM ' . $this->db->prefix('efqdiralpha1_dir') . ' ORDER BY name ASC';
+        $sql     = 'SELECT dirid, name FROM '.$this->db->prefix('efqdiralpha1_dir').' ORDER BY name ASC';
         $result  = $this->db->query($sql);
         $numrows = $this->db->getRowsNum($result);
         $result  = $this->db->query($sql);
@@ -280,7 +280,7 @@ 
         foreach ($cleanvars as $k => $v) {
             if (!in_array($k, $excludedVars)) {
                 $strFields .= $k;
-                $strValues .= "'" . $v . "'";
+                $strValues .= "'".$v."'";
                 if ($i < $countVars) {
                     $strFields .= ', ';
                     $strValues .= ', ';

class/class.gmap.php

Indentation +327 added lines, -327 removed lines

@@ -44,109 +44,109 @@ 
  */
 class efqGmap extends XoopsObject
 {
-    private $_lon; //longitude
-    private $_lat; //lattitude
-    private $_descr; //description
-    private $_key; //developer's key
-    private $_zoomlevel; //zoom level of google map
-    private $_jsPointsArray; //javascript assigning points to google map
-    private $_map; // generate output for showing the map on a web page
-    public $db;
-
-    /**
-     * efqGmap constructor.
-     * @param bool $gmap
-     */
-    public function __construct($gmap = false)
-    {
-        global $xoopsModuleConfig;
-        $key = $xoopsModuleConfig['gmapkey'];
-        $this->setKey($key);
-        $this->setPointsJS('');
-
-        $this->db = XoopsDatabaseFactory::getDatabaseConnection();
-        $this->initVar('id', XOBJ_DTYPE_INT, null, false);
-        $this->initVar('dataid', XOBJ_DTYPE_INT, null, true);
-        $this->initVar('lat', XOBJ_DTYPE_TXTBOX, null, true);
-        $this->initVar('lon', XOBJ_DTYPE_TXTBOX, null, true);
-        $this->initVar('descr', XOBJ_DTYPE_TXTAREA);
-
-        if ($gmap !== false) {
-            if (is_array($gmap)) {
-                $this->assignVars($gmap);
-            } else {
-                $$gmapHandler = xoops_getModuleHandler('gmap', $moddir);
-                $objGmap       =& $$gmapHandler->get($directory);
-                foreach ($objGmap->vars as $k => $v) {
-                    $this->assignVar($k, $v['value']);
-                }
-                unset($objGmap);
-            }
-        }
-    }
+	private $_lon; //longitude
+	private $_lat; //lattitude
+	private $_descr; //description
+	private $_key; //developer's key
+	private $_zoomlevel; //zoom level of google map
+	private $_jsPointsArray; //javascript assigning points to google map
+	private $_map; // generate output for showing the map on a web page
+	public $db;
+
+	/**
+	 * efqGmap constructor.
+	 * @param bool $gmap
+	 */
+	public function __construct($gmap = false)
+	{
+		global $xoopsModuleConfig;
+		$key = $xoopsModuleConfig['gmapkey'];
+		$this->setKey($key);
+		$this->setPointsJS('');
+
+		$this->db = XoopsDatabaseFactory::getDatabaseConnection();
+		$this->initVar('id', XOBJ_DTYPE_INT, null, false);
+		$this->initVar('dataid', XOBJ_DTYPE_INT, null, true);
+		$this->initVar('lat', XOBJ_DTYPE_TXTBOX, null, true);
+		$this->initVar('lon', XOBJ_DTYPE_TXTBOX, null, true);
+		$this->initVar('descr', XOBJ_DTYPE_TXTAREA);
+
+		if ($gmap !== false) {
+			if (is_array($gmap)) {
+				$this->assignVars($gmap);
+			} else {
+				$$gmapHandler = xoops_getModuleHandler('gmap', $moddir);
+				$objGmap       =& $$gmapHandler->get($directory);
+				foreach ($objGmap->vars as $k => $v) {
+					$this->assignVar($k, $v['value']);
+				}
+				unset($objGmap);
+			}
+		}
+	}
 
-    /**
-     * @param string $key
-     */
-    public function setKey($key = '')
-    {
-        $this->_key = $key;
-    }
+	/**
+	 * @param string $key
+	 */
+	public function setKey($key = '')
+	{
+		$this->_key = $key;
+	}
 
-    /**
-     * Set the value of the script that triggers the points to be added to the google map.
-     * @param $pointsJS
-     */
-    public function setPointsJS($pointsJS)
-    {
-        $this->_jsPointsArray = $pointsJS;
-        $this->_map           = '';
-    }
+	/**
+	 * Set the value of the script that triggers the points to be added to the google map.
+	 * @param $pointsJS
+	 */
+	public function setPointsJS($pointsJS)
+	{
+		$this->_jsPointsArray = $pointsJS;
+		$this->_map           = '';
+	}
 
-    /**
-     * Get the value of the script that triggers the points to be added to the google map.
-     */
-    public function getPointsJS()
-    {
-        return $this->_jsPointsArray;
-    }
+	/**
+	 * Get the value of the script that triggers the points to be added to the google map.
+	 */
+	public function getPointsJS()
+	{
+		return $this->_jsPointsArray;
+	}
 
-    /**
-     * @return mixed
-     */
-    public function showMap()
-    {
-        return $this->_map;
-    }
+	/**
+	 * @return mixed
+	 */
+	public function showMap()
+	{
+		return $this->_map;
+	}
 
-    public function generateMap()
-    {
-        $this->_map .= $this->printPlaceHolder();
-        $this->_map .= $this->printScript($this->_jsPointsArray, $this->_key);
-        $this->_map .= $this->printTrigger();
-    }
+	public function generateMap()
+	{
+		$this->_map .= $this->printPlaceHolder();
+		$this->_map .= $this->printScript($this->_jsPointsArray, $this->_key);
+		$this->_map .= $this->printTrigger();
+	}
 
-    /**
-     * @param int $width
-     * @param int $height
-     * @return string
-     */
-    public function printPlaceHolder($width = 700, $height = 500)
-    {
-        return '<div id="map" style="width:' . $width . 'px; height:' . $height . 'px"></div>';
-    }
+	/**
+	 * @param int $width
+	 * @param int $height
+	 * @return string
+	 */
+	public function printPlaceHolder($width = 700, $height = 500)
+	{
+		return '<div id="map" style="width:' . $width . 'px; height:' . $height . 'px"></div>';
+	}
 
-    /**
-     * @param string $jsPointsArray
-     * @param string $key
-     * @return string
-     */
-    public function printScript($jsPointsArray = '', $key = '')
-    {
-        global $icmsPreloadHandler;
-
-        $icmsPreloadHandler->addPreloadEvents('gmap.php');
-        $gmapScript = <<<EOH
+	/**
+	 * @param string $jsPointsArray
+	 * @param string $key
+	 * @return string
+	 */
+	public function printScript($jsPointsArray = '', $key = '')
+	{
+		global $icmsPreloadHandler;
+
+		$icmsPreloadHandler->addPreloadEvents('gmap.php');
+		$gmapScript = <<<EOH
 <script type="text/javascript">
 var mArray = Array();
 var map;
@@ -207,15 +207,15 @@ 
 </script>\n
 EOH;
 
-        return $gmapScript;
-    }
+		return $gmapScript;
+	}
 
-    /**
-     * Adds a script which triggers the other javascript code to execute
-     */
-    public function printTrigger()
-    {
-        $trigger = <<<EOH
+	/**
+	 * Adds a script which triggers the other javascript code to execute
+	 */
+	public function printTrigger()
+	{
+		$trigger = <<<EOH
 <script>		
 if (window.onload){
     var oldonload = window.onload;
@@ -230,32 +230,32 @@ 
 }
 </script>\n
 EOH;
-    }
+	}
 
-    /**
-     * Function setData sets class from array.
-     * @author    EFQ Consultancy <info@efqconsultancy.com>
-     * @copyright EFQ Consultancy (c) 2008
-     * @version   1.0.0
-     *
-     * @param $arr
-     * @return bool true if insertion is succesful, false if unsuccesful
-     * @internal  param object $obj object
-     *
-     */
-    public function setData($arr)
-    {
-        if (is_array($arr)) {
-            $vars = $this->getVars();
-            foreach ($vars as $k => $v) {
-                $this->setVar($k, $arr[$k]);
-            }
-        } else {
-            return false;
-        }
-
-        return true;
-    }
+	/**
+	 * Function setData sets class from array.
+	 * @author    EFQ Consultancy <info@efqconsultancy.com>
+	 * @copyright EFQ Consultancy (c) 2008
+	 * @version   1.0.0
+	 *
+	 * @param $arr
+	 * @return bool true if insertion is succesful, false if unsuccesful
+	 * @internal  param object $obj object
+	 *
+	 */
+	public function setData($arr)
+	{
+		if (is_array($arr)) {
+			$vars = $this->getVars();
+			foreach ($vars as $k => $v) {
+				$this->setVar($k, $arr[$k]);
+			}
+		} else {
+			return false;
+		}
+
+		return true;
+	}
 }
 
 /**
@@ -271,208 +271,208 @@ 
 {
 //    public $db;
 
-    /**
-     * efqGmapHandler constructor.
-     */
-    public function __construct()
-    {
-        $this->db = XoopsDatabaseFactory::getDatabaseConnection();
-    }
+	/**
+	 * efqGmapHandler constructor.
+	 */
+	public function __construct()
+	{
+		$this->db = XoopsDatabaseFactory::getDatabaseConnection();
+	}
 
-    /**
-     * create instance of efqGmap class or reset the existing instance.
-     *
-     * @param bool $isNew
-     * @return efqGmap $efqGmap
-     */
-    public function &create($isNew = true)
-    {
-        $gmap = new efqGmap();
-        if ($isNew) {
-            $gmap->setNew();
-        }
-
-        return $gmap;
-    }
+	/**
+	 * create instance of efqGmap class or reset the existing instance.
+	 *
+	 * @param bool $isNew
+	 * @return efqGmap $efqGmap
+	 */
+	public function &create($isNew = true)
+	{
+		$gmap = new efqGmap();
+		if ($isNew) {
+			$gmap->setNew();
+		}
 
-    /**
-     * retrieve all points from the database
-     *
-     * @param $gmap
-     * @return mixed reference to the <a href='psi_element://efqGmap'>efqGmap</a> object, FALSE if failed
-     * object, FALSE if failed
-     * @internal param int $dirid ID of the directory
-     */
-    public function getPointsJS($gmap)
-    {
-        if (!is_object($gmap)) {
-            return false;
-        }
-        $sql = 'SELECT * FROM ' . $this->db->prefix('efqdiralpha1_gmaps');
-        if (!$result = $this->db->query($sql)) {
-            return false;
-        }
-        $gmap       =& $this->create(false);
-        $javaScript = '';
-        while ($row = $this->db->fetchArray($result)) {
-            //$row{'descr'} = addslashes($row{'descr'});
-            $row['descr'] = addslashes($row['descr']);
-            //$row{'descr'} = str_replace(';',',',$row{'descr'});
-            $row['descr'] = str_replace(';', ',', $row['descr']);
-            //$javaScript .= "mArray.push('{$row{'lat'}};{$row{'lon'}};{$row{'descr'}}')\n";
-            //echo $row['lat'];
-            $javaScript .= "mArray.push('{" . $row['lat'] . '};{' . $row['lon'] . '};{' . $row['descr'] . "}')\n";
-        }
-        $gmap->setPointsJS($javaScript);
-
-        return true;
-    }
+		return $gmap;
+	}
 
-    /**
-     * @param int $id
-     * @return array
-     */
-    public function getGmapById($id = 0)
-    {
-        $arr = array();
-        $sql = sprintf('SELECT * FROM %s WHERE id=%u', $this->db->prefix('efqdiralpha1_gmaps'), (int)$id);
-        $result = $this->db->query($sql) or $eh->show('0013');
-        while (list($id, $lat, $lon, $descr, $dataid) = $this->db->fetchRow($result)) {
-            $arr = array('id' => $id, 'lat' => $lat, 'lon' => $lon, 'descr' => $descr, 'dataid' => $dataid);
-        }
-
-        return $arr;
-    }
+	/**
+	 * retrieve all points from the database
+	 *
+	 * @param $gmap
+	 * @return mixed reference to the <a href='psi_element://efqGmap'>efqGmap</a> object, FALSE if failed
+	 * object, FALSE if failed
+	 * @internal param int $dirid ID of the directory
+	 */
+	public function getPointsJS($gmap)
+	{
+		if (!is_object($gmap)) {
+			return false;
+		}
+		$sql = 'SELECT * FROM ' . $this->db->prefix('efqdiralpha1_gmaps');
+		if (!$result = $this->db->query($sql)) {
+			return false;
+		}
+		$gmap       =& $this->create(false);
+		$javaScript = '';
+		while ($row = $this->db->fetchArray($result)) {
+			//$row{'descr'} = addslashes($row{'descr'});
+			$row['descr'] = addslashes($row['descr']);
+			//$row{'descr'} = str_replace(';',',',$row{'descr'});
+			$row['descr'] = str_replace(';', ',', $row['descr']);
+			//$javaScript .= "mArray.push('{$row{'lat'}};{$row{'lon'}};{$row{'descr'}}')\n";
+			//echo $row['lat'];
+			$javaScript .= "mArray.push('{" . $row['lat'] . '};{' . $row['lon'] . '};{' . $row['descr'] . "}')\n";
+		}
+		$gmap->setPointsJS($javaScript);
 
-    /**
-     * @param int $id
-     * @return bool|efqGmap
-     */
-    public function getByDataId($id = 0)
-    {
-        if ($id === false) {
-            return false;
-        }
-        $id = (int)$id;
-        echo $id;
-        if ($id > 0) {
-            $sql = 'SELECT * FROM ' . $this->db->prefix('efqdiralpha1_gmaps') . ' WHERE dataid=' . (int)$id;
-            if (!$result = $this->db->query($sql)) {
-                return false;
-            }
-            $gmap =& $this->create(false);
-            $gmap->assignVars($this->db->fetchArray($result));
-
-            return $gmap;
-        }
-
-        return false;
-    }
+		return true;
+	}
 
-    /**
-     * Function insertGmap inserts google map data into DB
-     * @author    EFQ Consultancy <info@efqconsultancy.com>
-     * @copyright EFQ Consultancy (c) 2008
-     * @version   1.0.0
-     *
-     * @param   efqGmap $obj object
-     *
-     * @param bool     $forceQuery
-     * @return bool true if insertion is succesful, false if unsuccesful
-     */
-    public function insertGmap($obj, $forceQuery = false)
-    {
-        $tablename = 'efqdiralpha1_gmaps';
-        $keyName   = 'id';
-        if ($obj instanceof efqGmap) {
-            // Variable part of this function ends. From this line you can copy
-            // this function for similar object handling functions.
-            $obj->cleanVars();
-            $cleanvars = $obj->cleanVars;
-        } else {
-            return false;
-        }
-        $countVars = count($cleanvars);
-        $i         = 1;
-        $strFields = '';
-        $strValues = '';
-        foreach ($cleanvars as $k => $v) {
-            $strFields .= $k;
-            $strValues .= "'" . $v . "'";
-            if ($i < $countVars) {
-                $strFields .= ', ';
-                $strValues .= ', ';
-            }
-            $i++;
-        }
-        $sql = sprintf('INSERT INTO %s (%s) VALUES (%s)', $this->db->prefix($tablename), $strFields, $strValues);
-        if ($forceQuery) {
-            if ($this->db->queryF($sql)) {
-                $itemid = $this->db->getInsertId();
-                $obj->setVar($keyName, $itemid);
-
-                return true;
-            }
-        } else {
-            if ($this->db->query($sql)) {
-                $itemid = $this->db->getInsertId();
-                $obj->setVar($keyName, $itemid);
-
-                return true;
-            }
-        }
-
-        return false;
-    }
+	/**
+	 * @param int $id
+	 * @return array
+	 */
+	public function getGmapById($id = 0)
+	{
+		$arr = array();
+		$sql = sprintf('SELECT * FROM %s WHERE id=%u', $this->db->prefix('efqdiralpha1_gmaps'), (int)$id);
+		$result = $this->db->query($sql) or $eh->show('0013');
+		while (list($id, $lat, $lon, $descr, $dataid) = $this->db->fetchRow($result)) {
+			$arr = array('id' => $id, 'lat' => $lat, 'lon' => $lon, 'descr' => $descr, 'dataid' => $dataid);
+		}
 
-    /**
-     * Function updateGmap updates google map data
-     * @author    EFQ Consultancy <info@efqconsultancy.com>
-     * @copyright EFQ Consultancy (c) 2008
-     * @version   1.0.0
-     *
-     * @param   efqGmap $obj object
-     *
-     * @param bool     $forceQuery
-     * @return bool true if update is succesful, false if unsuccesful
-     */
-    public function updateGmap($obj, $forceQuery = false)
-    {
-        $tablename = 'efqdiralpha1_gmaps';
-        $keyName   = 'id';
-        if ($obj instanceof efqGmap) {
-            // Variable part of this function ends. From this line you can copy
-            // this function for similar object handling functions.
-            $obj->cleanVars();
-            $cleanvars = $obj->cleanVars;
-            $keyValue  = $obj->getVar($keyName);
-        } else {
-            return false;
-        }
-        $countVars = count($cleanvars);
-        $i         = 1;
-        $strSet    = '';
-        $strValues = '';
-        foreach ($cleanvars as $k => $v) {
-            if ($k !== 'id') {
-                $strSet .= $k . '=' . "'" . $v . "'";
-                if ($i < $countVars) {
-                    $strSet .= ', ';
-                }
-            }
-            $i++;
-        }
-        $sql = sprintf('UPDATE %s SET %s WHERE %s = %u', $this->db->prefix($tablename), $strSet, $keyName, $keyValue);
-        if ($forceQuery) {
-            if ($this->db->queryF($sql)) {
-                return true;
-            }
-        } else {
-            if ($this->db->query($sql)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
+		return $arr;
+	}
+
+	/**
+	 * @param int $id
+	 * @return bool|efqGmap
+	 */
+	public function getByDataId($id = 0)
+	{
+		if ($id === false) {
+			return false;
+		}
+		$id = (int)$id;
+		echo $id;
+		if ($id > 0) {
+			$sql = 'SELECT * FROM ' . $this->db->prefix('efqdiralpha1_gmaps') . ' WHERE dataid=' . (int)$id;
+			if (!$result = $this->db->query($sql)) {
+				return false;
+			}
+			$gmap =& $this->create(false);
+			$gmap->assignVars($this->db->fetchArray($result));
+
+			return $gmap;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Function insertGmap inserts google map data into DB
+	 * @author    EFQ Consultancy <info@efqconsultancy.com>
+	 * @copyright EFQ Consultancy (c) 2008
+	 * @version   1.0.0
+	 *
+	 * @param   efqGmap $obj object
+	 *
+	 * @param bool     $forceQuery
+	 * @return bool true if insertion is succesful, false if unsuccesful
+	 */
+	public function insertGmap($obj, $forceQuery = false)
+	{
+		$tablename = 'efqdiralpha1_gmaps';
+		$keyName   = 'id';
+		if ($obj instanceof efqGmap) {
+			// Variable part of this function ends. From this line you can copy
+			// this function for similar object handling functions.
+			$obj->cleanVars();
+			$cleanvars = $obj->cleanVars;
+		} else {
+			return false;
+		}
+		$countVars = count($cleanvars);
+		$i         = 1;
+		$strFields = '';
+		$strValues = '';
+		foreach ($cleanvars as $k => $v) {
+			$strFields .= $k;
+			$strValues .= "'" . $v . "'";
+			if ($i < $countVars) {
+				$strFields .= ', ';
+				$strValues .= ', ';
+			}
+			$i++;
+		}
+		$sql = sprintf('INSERT INTO %s (%s) VALUES (%s)', $this->db->prefix($tablename), $strFields, $strValues);
+		if ($forceQuery) {
+			if ($this->db->queryF($sql)) {
+				$itemid = $this->db->getInsertId();
+				$obj->setVar($keyName, $itemid);
+
+				return true;
+			}
+		} else {
+			if ($this->db->query($sql)) {
+				$itemid = $this->db->getInsertId();
+				$obj->setVar($keyName, $itemid);
+
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Function updateGmap updates google map data
+	 * @author    EFQ Consultancy <info@efqconsultancy.com>
+	 * @copyright EFQ Consultancy (c) 2008
+	 * @version   1.0.0
+	 *
+	 * @param   efqGmap $obj object
+	 *
+	 * @param bool     $forceQuery
+	 * @return bool true if update is succesful, false if unsuccesful
+	 */
+	public function updateGmap($obj, $forceQuery = false)
+	{
+		$tablename = 'efqdiralpha1_gmaps';
+		$keyName   = 'id';
+		if ($obj instanceof efqGmap) {
+			// Variable part of this function ends. From this line you can copy
+			// this function for similar object handling functions.
+			$obj->cleanVars();
+			$cleanvars = $obj->cleanVars;
+			$keyValue  = $obj->getVar($keyName);
+		} else {
+			return false;
+		}
+		$countVars = count($cleanvars);
+		$i         = 1;
+		$strSet    = '';
+		$strValues = '';
+		foreach ($cleanvars as $k => $v) {
+			if ($k !== 'id') {
+				$strSet .= $k . '=' . "'" . $v . "'";
+				if ($i < $countVars) {
+					$strSet .= ', ';
+				}
+			}
+			$i++;
+		}
+		$sql = sprintf('UPDATE %s SET %s WHERE %s = %u', $this->db->prefix($tablename), $strSet, $keyName, $keyValue);
+		if ($forceQuery) {
+			if ($this->db->queryF($sql)) {
+				return true;
+			}
+		} else {
+			if ($this->db->query($sql)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -76,7 +76,7 @@ 
                 $this->assignVars($gmap);
             } else {
                 $$gmapHandler = xoops_getModuleHandler('gmap', $moddir);
-                $objGmap       =& $$gmapHandler->get($directory);
+                $objGmap = & $$gmapHandler->get($directory);
                 foreach ($objGmap->vars as $k => $v) {
                     $this->assignVar($k, $v['value']);
                 }
@@ -133,7 +133,7 @@ 
      */
     public function printPlaceHolder($width = 700, $height = 500)
     {
-        return '<div id="map" style="width:' . $width . 'px; height:' . $height . 'px"></div>';
+        return '<div id="map" style="width:'.$width.'px; height:'.$height.'px"></div>';
     }
 
     /**
@@ -308,11 +308,11 @@ 
         if (!is_object($gmap)) {
             return false;
         }
-        $sql = 'SELECT * FROM ' . $this->db->prefix('efqdiralpha1_gmaps');
+        $sql = 'SELECT * FROM '.$this->db->prefix('efqdiralpha1_gmaps');
         if (!$result = $this->db->query($sql)) {
             return false;
         }
-        $gmap       =& $this->create(false);
+        $gmap       = & $this->create(false);
         $javaScript = '';
         while ($row = $this->db->fetchArray($result)) {
             //$row{'descr'} = addslashes($row{'descr'});
@@ -321,7 +321,7 @@ 
             $row['descr'] = str_replace(';', ',', $row['descr']);
             //$javaScript .= "mArray.push('{$row{'lat'}};{$row{'lon'}};{$row{'descr'}}')\n";
             //echo $row['lat'];
-            $javaScript .= "mArray.push('{" . $row['lat'] . '};{' . $row['lon'] . '};{' . $row['descr'] . "}')\n";
+            $javaScript .= "mArray.push('{".$row['lat'].'};{'.$row['lon'].'};{'.$row['descr']."}')\n";
         }
         $gmap->setPointsJS($javaScript);
 
@@ -335,7 +335,7 @@ 
     public function getGmapById($id = 0)
     {
         $arr = array();
-        $sql = sprintf('SELECT * FROM %s WHERE id=%u', $this->db->prefix('efqdiralpha1_gmaps'), (int)$id);
+        $sql = sprintf('SELECT * FROM %s WHERE id=%u', $this->db->prefix('efqdiralpha1_gmaps'), (int) $id);
         $result = $this->db->query($sql) or $eh->show('0013');
         while (list($id, $lat, $lon, $descr, $dataid) = $this->db->fetchRow($result)) {
             $arr = array('id' => $id, 'lat' => $lat, 'lon' => $lon, 'descr' => $descr, 'dataid' => $dataid);
@@ -353,14 +353,14 @@ 
         if ($id === false) {
             return false;
         }
-        $id = (int)$id;
+        $id = (int) $id;
         echo $id;
         if ($id > 0) {
-            $sql = 'SELECT * FROM ' . $this->db->prefix('efqdiralpha1_gmaps') . ' WHERE dataid=' . (int)$id;
+            $sql = 'SELECT * FROM '.$this->db->prefix('efqdiralpha1_gmaps').' WHERE dataid='.(int) $id;
             if (!$result = $this->db->query($sql)) {
                 return false;
             }
-            $gmap =& $this->create(false);
+            $gmap = & $this->create(false);
             $gmap->assignVars($this->db->fetchArray($result));
 
             return $gmap;
@@ -398,7 +398,7 @@ 
         $strValues = '';
         foreach ($cleanvars as $k => $v) {
             $strFields .= $k;
-            $strValues .= "'" . $v . "'";
+            $strValues .= "'".$v."'";
             if ($i < $countVars) {
                 $strFields .= ', ';
                 $strValues .= ', ';
@@ -455,7 +455,7 @@ 
         $strValues = '';
         foreach ($cleanvars as $k => $v) {
             if ($k !== 'id') {
-                $strSet .= $k . '=' . "'" . $v . "'";
+                $strSet .= $k.'='."'".$v."'";
                 if ($i < $countVars) {
                     $strSet .= ', ';
                 }

class/class.fieldtype.php

Indentation +12 added lines, -12 removed lines

@@ -29,12 +29,12 @@ 
  */
 class efqFieldType extends XoopsObject
 {
-    /**
-     * efqFieldType constructor.
-     */
-    public function __construct()
-    {
-    }
+	/**
+	 * efqFieldType constructor.
+	 */
+	public function __construct()
+	{
+	}
 }
 
 /**
@@ -48,10 +48,10 @@ 
  */
 class efqFieldTypeHandler extends XoopsObjectHandler
 {
-    /**
-     * efqFieldTypeHandler constructor.
-     */
-    public function __construct()
-    {
-    }
+	/**
+	 * efqFieldTypeHandler constructor.
+	 */
+	public function __construct()
+	{
+	}
 }