XoopsModules25x / efqdirectory

class/class.category.php

Indentation +12 added lines, -12 removed lines

@@ -31,12 +31,12 @@ 
  */
 class efqCategory extends XoopsObject
 {
-    /**
-     * efqCategory constructor.
-     */
-    public function __construct()
-    {
-    }
+	/**
+	 * efqCategory constructor.
+	 */
+	public function __construct()
+	{
+	}
 }
 
 /**
@@ -50,10 +50,10 @@ 
  */
 class efqCategoryHandler extends XoopsObjectHandler
 {
-    /**
-     * efqCategoryHandler constructor.
-     */
-    public function __construct()
-    {
-    }
+	/**
+	 * efqCategoryHandler constructor.
+	 */
+	public function __construct()
+	{
+	}
 }

class/class.coupon.php

Indentation +287 added lines, -287 removed lines

@@ -19,135 +19,135 @@ 
  */
 
 if (!class_exists('Coupon')) {
-    class Coupon extends XoopsObject
-    {
-        //Constructor
-        /**
-         * @param mixed $coupid int for coupon id or array with name->value pairs of properties
-         */
-        public function __construct($coupid = false)
-        {
-            global $moddir;
-            $this->db = XoopsDatabaseFactory::getDatabaseConnection();
-            $this->initVar('couponid', XOBJ_DTYPE_INT, null, false);
-            $this->initVar('itemid', XOBJ_DTYPE_INT, null, true);
-            $this->initVar('description', XOBJ_DTYPE_TXTAREA);
-            $this->initVar('image', XOBJ_DTYPE_TXTBOX);
-            $this->initVar('publish', XOBJ_DTYPE_INT, 0, false);
-            $this->initVar('expire', XOBJ_DTYPE_INT, 0, false);
-            $this->initVar('heading', XOBJ_DTYPE_TXTBOX);
-            $this->initVar('counter', XOBJ_DTYPE_INT, 0, false);
-            $this->initVar('lbr', XOBJ_DTYPE_INT, 0, false);
-            if ($coupid !== false) {
-                if (is_array($coupid)) {
-                    $this->assignVars($coupid);
-                } else {
-                    $couponHandler = xoops_getModuleHandler('coupon', $moddir);
-                    $coupon        = $couponHandler->get($coupid);
-                    foreach ($coupon->vars as $k => $v) {
-                        $this->assignVar($k, $v['value']);
-                    }
-                    unset($coupon);
-                }
-            }
-        }
+	class Coupon extends XoopsObject
+	{
+		//Constructor
+		/**
+		 * @param mixed $coupid int for coupon id or array with name->value pairs of properties
+		 */
+		public function __construct($coupid = false)
+		{
+			global $moddir;
+			$this->db = XoopsDatabaseFactory::getDatabaseConnection();
+			$this->initVar('couponid', XOBJ_DTYPE_INT, null, false);
+			$this->initVar('itemid', XOBJ_DTYPE_INT, null, true);
+			$this->initVar('description', XOBJ_DTYPE_TXTAREA);
+			$this->initVar('image', XOBJ_DTYPE_TXTBOX);
+			$this->initVar('publish', XOBJ_DTYPE_INT, 0, false);
+			$this->initVar('expire', XOBJ_DTYPE_INT, 0, false);
+			$this->initVar('heading', XOBJ_DTYPE_TXTBOX);
+			$this->initVar('counter', XOBJ_DTYPE_INT, 0, false);
+			$this->initVar('lbr', XOBJ_DTYPE_INT, 0, false);
+			if ($coupid !== false) {
+				if (is_array($coupid)) {
+					$this->assignVars($coupid);
+				} else {
+					$couponHandler = xoops_getModuleHandler('coupon', $moddir);
+					$coupon        = $couponHandler->get($coupid);
+					foreach ($coupon->vars as $k => $v) {
+						$this->assignVar($k, $v['value']);
+					}
+					unset($coupon);
+				}
+			}
+		}
 
-        public function toArray()
-        {
-            $ret = array();
-            foreach ($this->vars as $k => $v) {
-                $ret[$k] = $v['value'];
-            }
+		public function toArray()
+		{
+			$ret = array();
+			foreach ($this->vars as $k => $v) {
+				$ret[$k] = $v['value'];
+			}
 
-            return $ret;
-        }
-    }
+			return $ret;
+		}
+	}
 }
 
 // Change the class name below to enable custom directory (Capitolize first letter YourdirectoryCouponHandler)
 class efqdirectoryCouponHandler extends XoopsObjectHandler
 {
-    /**
-     * create a new coupon object
-     *
-     * @param bool $isNew flag the new objects as "new"?
-     * @return object {@link Coupon}
-     */
-    //var $coupon;
-    //var $db;
+	/**
+	 * create a new coupon object
+	 *
+	 * @param bool $isNew flag the new objects as "new"?
+	 * @return object {@link Coupon}
+	 */
+	//var $coupon;
+	//var $db;
 
-    public function &create($isNew = true)
-    {
-        //$this->db = XoopsDatabaseFactory::getDatabaseConnection();
-        $coupon = new Coupon();
-        if ($isNew) {
-            $coupon->setNew();
-        }
+	public function &create($isNew = true)
+	{
+		//$this->db = XoopsDatabaseFactory::getDatabaseConnection();
+		$coupon = new Coupon();
+		if ($isNew) {
+			$coupon->setNew();
+		}
 
-        return $coupon;
-    }
+		return $coupon;
+	}
 
-    /**
-     * retrieve a coupon
-     *
-     * @param bool|int $coupid ID of the coupon
-     * @return mixed reference to the <a href='psi_element://Coupon'>Coupon</a> object, FALSE if failed
-     *                         object, FALSE if failed
-     */
-    public function &get($coupid = false)
-    {
-        if ($coupid === false) {
-            return false;
-        }
-        $coupid = (int)$coupid;
-        if ($coupid > 0) {
-            $sql = 'SELECT * FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_coupon') . ' WHERE couponid=' . $coupid;
-            if (!$result = $this->db->query($sql)) {
-                return false;
-            }
-            $coupon =& $this->create(false);
-            $coupon->assignVars($this->db->fetchArray($result));
+	/**
+	 * retrieve a coupon
+	 *
+	 * @param bool|int $coupid ID of the coupon
+	 * @return mixed reference to the <a href='psi_element://Coupon'>Coupon</a> object, FALSE if failed
+	 *                         object, FALSE if failed
+	 */
+	public function &get($coupid = false)
+	{
+		if ($coupid === false) {
+			return false;
+		}
+		$coupid = (int)$coupid;
+		if ($coupid > 0) {
+			$sql = 'SELECT * FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_coupon') . ' WHERE couponid=' . $coupid;
+			if (!$result = $this->db->query($sql)) {
+				return false;
+			}
+			$coupon =& $this->create(false);
+			$coupon->assignVars($this->db->fetchArray($result));
 
-            return $coupon;
-        }
+			return $coupon;
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Save coupon in database
-     * @param object|XoopsObject $coupon reference to the {@link Coupon}
-     *                                   object
-     * @return bool FALSE if failed, TRUE if already present and unchanged or successful
-     * @internal param bool $force
-     */
-    public function insert(XoopsObject $coupon)
-    {
-        global $eh, $xoopsDB, $description, $image, $heading, $couponid;
-        if (get_class($coupon) != 'Coupon') {
-            echo ' class not coupon ';
+	/**
+	 * Save coupon in database
+	 * @param object|XoopsObject $coupon reference to the {@link Coupon}
+	 *                                   object
+	 * @return bool FALSE if failed, TRUE if already present and unchanged or successful
+	 * @internal param bool $force
+	 */
+	public function insert(XoopsObject $coupon)
+	{
+		global $eh, $xoopsDB, $description, $image, $heading, $couponid;
+		if (get_class($coupon) != 'Coupon') {
+			echo ' class not coupon ';
 
-            return false;
-        }
-        if (!$coupon->isDirty()) {
-            echo ' coupon not dirty ';
+			return false;
+		}
+		if (!$coupon->isDirty()) {
+			echo ' coupon not dirty ';
 
-            return true;
-        }
-        if (!$coupon->cleanVars()) {
-            echo ' coupon not cleanvars ';
+			return true;
+		}
+		if (!$coupon->cleanVars()) {
+			echo ' coupon not cleanvars ';
 
-            return false;
-        }
-        foreach ($coupon->cleanVars as $k => $v) {
-            ${$k} = $v;
-        }
-        if ($coupon->_isNew) {
-            $sql = 'INSERT INTO ' . $this->db->prefix($module->getVar('dirname', 'n') . '_coupon') . "
+			return false;
+		}
+		foreach ($coupon->cleanVars as $k => $v) {
+			${$k} = $v;
+		}
+		if ($coupon->_isNew) {
+			$sql = 'INSERT INTO ' . $this->db->prefix($module->getVar('dirname', 'n') . '_coupon') . "
                 (itemid, description, image, publish, expire, heading, lbr) VALUES
                 ($itemid, " . $this->db->quoteString($description) . ', ' . $this->db->quoteString($image) . ", $publish, $expire, " . $this->db->quoteString($heading) . ", $lbr)";
-        } else {
-            $sql = 'UPDATE ' . $this->db->prefix($module->getVar('dirname', 'n') . '_coupon') . " SET
+		} else {
+			$sql = 'UPDATE ' . $this->db->prefix($module->getVar('dirname', 'n') . '_coupon') . " SET
                 itemid = $itemid,
                 description = " . $this->db->quoteString($description) . ',
                 image = ' . $this->db->quoteString($image) . ",
@@ -155,200 +155,200 @@ 
                 lbr = $lbr,
                 heading = " . $this->db->quoteString($heading) . ",
                 expire = $expire WHERE couponid = " . $couponid;
-        }
-        $xoopsDB->query($sql) or $eh->show('0013');
-        if ($coupon->_isNew) {
-            $coupon->setVar('couponid', $this->db->getInsertId());
-            $coupon->_isNew = false;
-        }
+		}
+		$xoopsDB->query($sql) or $eh->show('0013');
+		if ($coupon->_isNew) {
+			$coupon->setVar('couponid', $this->db->getInsertId());
+			$coupon->_isNew = false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * delete a coupon from the database
-     *
-     * @param object|XoopsObject $coupon reference to the {@link Coupon}
-     *                                   to delete
-     * @return bool FALSE if failed.
-     * @internal param bool $force
-     */
-    public function delete(XoopsObject $coupon)
-    {
-        $sql = 'DELETE FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_coupon') . ' WHERE couponid = ' . (int)$coupon->getVar('couponid');
-        if (!$this->db->query($sql)) {
-            return false;
-        }
+	/**
+	 * delete a coupon from the database
+	 *
+	 * @param object|XoopsObject $coupon reference to the {@link Coupon}
+	 *                                   to delete
+	 * @return bool FALSE if failed.
+	 * @internal param bool $force
+	 */
+	public function delete(XoopsObject $coupon)
+	{
+		$sql = 'DELETE FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_coupon') . ' WHERE couponid = ' . (int)$coupon->getVar('couponid');
+		if (!$this->db->query($sql)) {
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * get {@link Coupon} objects from criteria
-     *
-     * @param object $criteria   reference to a {@link Criteria} or {@link CriteriaCompo} object
-     * @param bool   $as_objects if true, the returned array will be {@link Coupon} objects
-     * @param bool   $id_as_key  if true, the returned array will have the coupon ids as key
-     *
-     * @return array array of {@link Coupon} objects
-     */
-    public function &getObjects($criteria = null, $as_objects = true, $id_as_key = false)
-    {
-        $ret   = array();
-        $limit = $start = 0;
-        $sql   = 'SELECT l.title AS listingTitle, coup.couponid, coup.heading, coup.counter, l.itemid, l.logourl, coup.description, coup.image, coup.lbr, coup.publish, coup.expire
+	/**
+	 * get {@link Coupon} objects from criteria
+	 *
+	 * @param object $criteria   reference to a {@link Criteria} or {@link CriteriaCompo} object
+	 * @param bool   $as_objects if true, the returned array will be {@link Coupon} objects
+	 * @param bool   $id_as_key  if true, the returned array will have the coupon ids as key
+	 *
+	 * @return array array of {@link Coupon} objects
+	 */
+	public function &getObjects($criteria = null, $as_objects = true, $id_as_key = false)
+	{
+		$ret   = array();
+		$limit = $start = 0;
+		$sql   = 'SELECT l.title AS listingTitle, coup.couponid, coup.heading, coup.counter, l.itemid, l.logourl, coup.description, coup.image, coup.lbr, coup.publish, coup.expire
             FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_coupon') . ' coup, ' . $this->db->prefix($module->getVar('dirname', 'n') . '_items') . ' l
             WHERE coup.itemid=l.itemid AND ';
-        if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->render();
-            if ($criteria->getSort() != '') {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $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)) {
-            if ($as_objects) {
-                $coupon = new Coupon();
-                $coupon->assignVars($myrow);
-                if (!$id_as_key) {
-                    $ret[] =& $coupon;
-                } else {
-                    $ret[$myrow['couponid']] =& $coupon;
-                }
-                unset($coupon);
-            } else {
-                $ret[] = $myrow;
-            }
-        }
+		if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+			$sql .= ' ' . $criteria->render();
+			if ($criteria->getSort() != '') {
+				$sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $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)) {
+			if ($as_objects) {
+				$coupon = new Coupon();
+				$coupon->assignVars($myrow);
+				if (!$id_as_key) {
+					$ret[] =& $coupon;
+				} else {
+					$ret[$myrow['couponid']] =& $coupon;
+				}
+				unset($coupon);
+			} else {
+				$ret[] = $myrow;
+			}
+		}
 
-        return $ret;
-    }
+		return $ret;
+	}
 
-    /**
-     * get {@link Coupon} objects by listing
-     *
-     * @param int $itemid listing id
-     *
-     * @return array array of {@link Coupon} objects
-     */
-    public function &getByLink($itemid)
-    {
-        global $eh;
-        $ret    = array();
-        $limit  = $start = 0;
-        $now    = time();
-        $sql    = 'SELECT l.title AS listingTitle, coup.couponid, coup.heading, coup.counter, l.itemid, l.logourl, coup.description, coup.image, coup.lbr, coup.publish, coup.expire
+	/**
+	 * get {@link Coupon} objects by listing
+	 *
+	 * @param int $itemid listing id
+	 *
+	 * @return array array of {@link Coupon} objects
+	 */
+	public function &getByLink($itemid)
+	{
+		global $eh;
+		$ret    = array();
+		$limit  = $start = 0;
+		$now    = time();
+		$sql    = 'SELECT l.title AS listingTitle, coup.couponid, coup.heading, coup.counter, l.itemid, l.logourl, coup.description, coup.image, coup.lbr, coup.publish, coup.expire
             FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_coupon') . ' coup, ' . $this->db->prefix($module->getVar('dirname', 'n') . '_items') . ' l';
-        $sql    .= ' WHERE coup.itemid = l.itemid AND coup.itemid=' . (int)$itemid . ' AND coup.publish < ' . $now . ' AND (coup.expire = 0 OR coup.expire > ' . $now . ')';
-        $sql    .= ' ORDER BY listingTitle ASC';
-        $result = $this->db->query($sql, $limit, $start) or $eh->show('0013');
+		$sql    .= ' WHERE coup.itemid = l.itemid AND coup.itemid=' . (int)$itemid . ' AND coup.publish < ' . $now . ' AND (coup.expire = 0 OR coup.expire > ' . $now . ')';
+		$sql    .= ' ORDER BY listingTitle ASC';
+		$result = $this->db->query($sql, $limit, $start) or $eh->show('0013');
 
-        if (!$result) {
-            return $ret;
-        }
-        while ($myrow = $this->db->fetchArray($result)) {
-            $ret[] = $myrow;
-        }
+		if (!$result) {
+			return $ret;
+		}
+		while ($myrow = $this->db->fetchArray($result)) {
+			$ret[] = $myrow;
+		}
 
-        return $ret;
-    }
+		return $ret;
+	}
 
-    /**
-     * Returns number of coupons for a listing
-     *
-     * @param int $itemid listing id
-     * @return bool|int
-     */
-    public function getCountByLink($itemid)
-    {
-        $ret = 0;
-        $now = time();
-        $sql = 'SELECT count(*) FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_coupon') . ' WHERE itemid=' . (int)$itemid . ' AND publish < ' . $now . ' AND (expire = 0 OR expire > ' . $now . ')';
-        if (!$result = $this->db->query($sql)) {
-            return false;
-        }
-        list($ret) = $this->db->fetchRow($result);
+	/**
+	 * Returns number of coupons for a listing
+	 *
+	 * @param int $itemid listing id
+	 * @return bool|int
+	 */
+	public function getCountByLink($itemid)
+	{
+		$ret = 0;
+		$now = time();
+		$sql = 'SELECT count(*) FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_coupon') . ' WHERE itemid=' . (int)$itemid . ' AND publish < ' . $now . ' AND (expire = 0 OR expire > ' . $now . ')';
+		if (!$result = $this->db->query($sql)) {
+			return false;
+		}
+		list($ret) = $this->db->fetchRow($result);
 
-        return $ret;
-    }
+		return $ret;
+	}
 
-    /**
-     * get {@link Coupon} object with listing info
-     *
-     * @param int $coupid Coupon ID
-     *
-     * @return array|object
-     */
-    public function &getLinkedCoupon($coupid)
-    {
-        $ret    = array();
-        $limit  = $start = 0;
-        $now    = time();
-        $sql    = 'SELECT l.title AS listingTitle, coup.couponid, coup.heading, coup.counter, l.itemid, l.logourl, coup.description,  coup.image, coup.lbr, coup.publish, coup.expire
+	/**
+	 * get {@link Coupon} object with listing info
+	 *
+	 * @param int $coupid Coupon ID
+	 *
+	 * @return array|object
+	 */
+	public function &getLinkedCoupon($coupid)
+	{
+		$ret    = array();
+		$limit  = $start = 0;
+		$now    = time();
+		$sql    = 'SELECT l.title AS listingTitle, coup.couponid, coup.heading, coup.counter, l.itemid, l.logourl, coup.description,  coup.image, coup.lbr, coup.publish, coup.expire
             FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_coupon') . ' coup, ' . $this->db->prefix($module->getVar('dirname', 'n') . '_items') . ' l';
-        $sql    .= ' WHERE coup.itemid = l.itemid AND coup.couponid=' . (int)$coupid;
-        $result = $this->db->query($sql, $limit, $start);
-        if (!$result) {
-            return $ret;
-        }
-        while ($myrow = $this->db->fetchArray($result)) {
-            $ret[] = $myrow;
-        }
+		$sql    .= ' WHERE coup.itemid = l.itemid AND coup.couponid=' . (int)$coupid;
+		$result = $this->db->query($sql, $limit, $start);
+		if (!$result) {
+			return $ret;
+		}
+		while ($myrow = $this->db->fetchArray($result)) {
+			$ret[] = $myrow;
+		}
 
-        return $ret;
-    }
+		return $ret;
+	}
 
-    /**
-     * Prepares rows from getByLink and getByCategory to be displayed
-     *
-     * @param array $array rows to be prepared
-     *
-     * @return array
-     */
-    public function prepare2show($array)
-    {
-        $myts = MyTextSanitizer::getInstance();
-        $ret  = array();
-        foreach ($array as $key => $myrow) {
-            $description = $myts->displayTarea($myrow['description'], 1, 1, 1, 1, $myrow['lbr']);
-            if ($myrow['expire'] > 0) {
-                $expire = formatTimestamp($myrow['expire'], 's');
-            } else {
-                $expire = 0;
-            }
-            $ret ['items']['coupons'][]    = array(
-                'itemid'      => $myrow['itemid'],
-                'couponid'    => $myrow['couponid'],
-                'heading'     => $myts->htmlSpecialChars($myrow['heading']),
-                'description' => $description,
-                'logourl'     => $myts->displayTarea($myrow['logourl']),
-                'publish'     => formatTimestamp($myrow['publish'], 's'),
-                'expire'      => $expire,
-                'counter'     => (int)$myrow['counter']
-            );
-            $ret ['items']['listingTitle'] = $myts->displayTarea($myrow['listingTitle']);
-            $ret ['items']['itemid']       = $myrow['itemid'];
-        }
+	/**
+	 * Prepares rows from getByLink and getByCategory to be displayed
+	 *
+	 * @param array $array rows to be prepared
+	 *
+	 * @return array
+	 */
+	public function prepare2show($array)
+	{
+		$myts = MyTextSanitizer::getInstance();
+		$ret  = array();
+		foreach ($array as $key => $myrow) {
+			$description = $myts->displayTarea($myrow['description'], 1, 1, 1, 1, $myrow['lbr']);
+			if ($myrow['expire'] > 0) {
+				$expire = formatTimestamp($myrow['expire'], 's');
+			} else {
+				$expire = 0;
+			}
+			$ret ['items']['coupons'][]    = array(
+				'itemid'      => $myrow['itemid'],
+				'couponid'    => $myrow['couponid'],
+				'heading'     => $myts->htmlSpecialChars($myrow['heading']),
+				'description' => $description,
+				'logourl'     => $myts->displayTarea($myrow['logourl']),
+				'publish'     => formatTimestamp($myrow['publish'], 's'),
+				'expire'      => $expire,
+				'counter'     => (int)$myrow['counter']
+			);
+			$ret ['items']['listingTitle'] = $myts->displayTarea($myrow['listingTitle']);
+			$ret ['items']['itemid']       = $myrow['itemid'];
+		}
 
-        return $ret;
-    }
+		return $ret;
+	}
 
-    /**
-     * Increment coupon counter
-     *
-     * @param int $couponid
-     *
-     * @return bool
-     */
-    public function increment($couponid)
-    {
-        $sql = 'UPDATE ' . $this->db->prefix($module->getVar('dirname', 'n') . '_coupon') . ' SET counter=counter+1 WHERE couponid=' . (int)$couponid;
+	/**
+	 * Increment coupon counter
+	 *
+	 * @param int $couponid
+	 *
+	 * @return bool
+	 */
+	public function increment($couponid)
+	{
+		$sql = 'UPDATE ' . $this->db->prefix($module->getVar('dirname', 'n') . '_coupon') . ' SET counter=counter+1 WHERE couponid=' . (int)$couponid;
 
-        return $this->db->queryF($sql);
-    }
+		return $this->db->queryF($sql);
+	}
 }

Spacing +24 added lines, -24 removed lines

@@ -99,13 +99,13 @@ 
         if ($coupid === false) {
             return false;
         }
-        $coupid = (int)$coupid;
+        $coupid = (int) $coupid;
         if ($coupid > 0) {
-            $sql = 'SELECT * FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_coupon') . ' WHERE couponid=' . $coupid;
+            $sql = 'SELECT * FROM '.$this->db->prefix($module->getVar('dirname', 'n').'_coupon').' WHERE couponid='.$coupid;
             if (!$result = $this->db->query($sql)) {
                 return false;
             }
-            $coupon =& $this->create(false);
+            $coupon = & $this->create(false);
             $coupon->assignVars($this->db->fetchArray($result));
 
             return $coupon;
@@ -143,18 +143,18 @@ 
             ${$k} = $v;
         }
         if ($coupon->_isNew) {
-            $sql = 'INSERT INTO ' . $this->db->prefix($module->getVar('dirname', 'n') . '_coupon') . "
+            $sql = 'INSERT INTO '.$this->db->prefix($module->getVar('dirname', 'n').'_coupon')."
                 (itemid, description, image, publish, expire, heading, lbr) VALUES
-                ($itemid, " . $this->db->quoteString($description) . ', ' . $this->db->quoteString($image) . ", $publish, $expire, " . $this->db->quoteString($heading) . ", $lbr)";
+                ($itemid, ".$this->db->quoteString($description).', '.$this->db->quoteString($image).", $publish, $expire, ".$this->db->quoteString($heading).", $lbr)";
         } else {
-            $sql = 'UPDATE ' . $this->db->prefix($module->getVar('dirname', 'n') . '_coupon') . " SET
+            $sql = 'UPDATE '.$this->db->prefix($module->getVar('dirname', 'n').'_coupon')." SET
                 itemid = $itemid,
-                description = " . $this->db->quoteString($description) . ',
-                image = ' . $this->db->quoteString($image) . ",
+                description = ".$this->db->quoteString($description).',
+                image = ' . $this->db->quoteString($image).",
                 publish = $publish,
                 lbr = $lbr,
-                heading = " . $this->db->quoteString($heading) . ",
-                expire = $expire WHERE couponid = " . $couponid;
+                heading = ".$this->db->quoteString($heading).",
+                expire = $expire WHERE couponid = ".$couponid;
         }
         $xoopsDB->query($sql) or $eh->show('0013');
         if ($coupon->_isNew) {
@@ -175,7 +175,7 @@ 
      */
     public function delete(XoopsObject $coupon)
     {
-        $sql = 'DELETE FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_coupon') . ' WHERE couponid = ' . (int)$coupon->getVar('couponid');
+        $sql = 'DELETE FROM '.$this->db->prefix($module->getVar('dirname', 'n').'_coupon').' WHERE couponid = '.(int) $coupon->getVar('couponid');
         if (!$this->db->query($sql)) {
             return false;
         }
@@ -197,12 +197,12 @@ 
         $ret   = array();
         $limit = $start = 0;
         $sql   = 'SELECT l.title AS listingTitle, coup.couponid, coup.heading, coup.counter, l.itemid, l.logourl, coup.description, coup.image, coup.lbr, coup.publish, coup.expire
-            FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_coupon') . ' coup, ' . $this->db->prefix($module->getVar('dirname', 'n') . '_items') . ' l
+            FROM ' . $this->db->prefix($module->getVar('dirname', 'n').'_coupon').' coup, '.$this->db->prefix($module->getVar('dirname', 'n').'_items').' l
             WHERE coup.itemid=l.itemid AND ';
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->render();
+            $sql .= ' '.$criteria->render();
             if ($criteria->getSort() != '') {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
@@ -216,9 +216,9 @@ 
                 $coupon = new Coupon();
                 $coupon->assignVars($myrow);
                 if (!$id_as_key) {
-                    $ret[] =& $coupon;
+                    $ret[] = & $coupon;
                 } else {
-                    $ret[$myrow['couponid']] =& $coupon;
+                    $ret[$myrow['couponid']] = & $coupon;
                 }
                 unset($coupon);
             } else {
@@ -243,8 +243,8 @@ 
         $limit  = $start = 0;
         $now    = time();
         $sql    = 'SELECT l.title AS listingTitle, coup.couponid, coup.heading, coup.counter, l.itemid, l.logourl, coup.description, coup.image, coup.lbr, coup.publish, coup.expire
-            FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_coupon') . ' coup, ' . $this->db->prefix($module->getVar('dirname', 'n') . '_items') . ' l';
-        $sql    .= ' WHERE coup.itemid = l.itemid AND coup.itemid=' . (int)$itemid . ' AND coup.publish < ' . $now . ' AND (coup.expire = 0 OR coup.expire > ' . $now . ')';
+            FROM ' . $this->db->prefix($module->getVar('dirname', 'n').'_coupon').' coup, '.$this->db->prefix($module->getVar('dirname', 'n').'_items').' l';
+        $sql    .= ' WHERE coup.itemid = l.itemid AND coup.itemid='.(int) $itemid.' AND coup.publish < '.$now.' AND (coup.expire = 0 OR coup.expire > '.$now.')';
         $sql    .= ' ORDER BY listingTitle ASC';
         $result = $this->db->query($sql, $limit, $start) or $eh->show('0013');
 
@@ -268,7 +268,7 @@ 
     {
         $ret = 0;
         $now = time();
-        $sql = 'SELECT count(*) FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_coupon') . ' WHERE itemid=' . (int)$itemid . ' AND publish < ' . $now . ' AND (expire = 0 OR expire > ' . $now . ')';
+        $sql = 'SELECT count(*) FROM '.$this->db->prefix($module->getVar('dirname', 'n').'_coupon').' WHERE itemid='.(int) $itemid.' AND publish < '.$now.' AND (expire = 0 OR expire > '.$now.')';
         if (!$result = $this->db->query($sql)) {
             return false;
         }
@@ -290,8 +290,8 @@ 
         $limit  = $start = 0;
         $now    = time();
         $sql    = 'SELECT l.title AS listingTitle, coup.couponid, coup.heading, coup.counter, l.itemid, l.logourl, coup.description,  coup.image, coup.lbr, coup.publish, coup.expire
-            FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_coupon') . ' coup, ' . $this->db->prefix($module->getVar('dirname', 'n') . '_items') . ' l';
-        $sql    .= ' WHERE coup.itemid = l.itemid AND coup.couponid=' . (int)$coupid;
+            FROM ' . $this->db->prefix($module->getVar('dirname', 'n').'_coupon').' coup, '.$this->db->prefix($module->getVar('dirname', 'n').'_items').' l';
+        $sql .= ' WHERE coup.itemid = l.itemid AND coup.couponid='.(int) $coupid;
         $result = $this->db->query($sql, $limit, $start);
         if (!$result) {
             return $ret;
@@ -321,7 +321,7 @@ 
             } else {
                 $expire = 0;
             }
-            $ret ['items']['coupons'][]    = array(
+            $ret ['items']['coupons'][] = array(
                 'itemid'      => $myrow['itemid'],
                 'couponid'    => $myrow['couponid'],
                 'heading'     => $myts->htmlSpecialChars($myrow['heading']),
@@ -329,7 +329,7 @@ 
                 'logourl'     => $myts->displayTarea($myrow['logourl']),
                 'publish'     => formatTimestamp($myrow['publish'], 's'),
                 'expire'      => $expire,
-                'counter'     => (int)$myrow['counter']
+                'counter'     => (int) $myrow['counter']
             );
             $ret ['items']['listingTitle'] = $myts->displayTarea($myrow['listingTitle']);
             $ret ['items']['itemid']       = $myrow['itemid'];
@@ -347,7 +347,7 @@ 
      */
     public function increment($couponid)
     {
-        $sql = 'UPDATE ' . $this->db->prefix($module->getVar('dirname', 'n') . '_coupon') . ' SET counter=counter+1 WHERE couponid=' . (int)$couponid;
+        $sql = 'UPDATE '.$this->db->prefix($module->getVar('dirname', 'n').'_coupon').' SET counter=counter+1 WHERE couponid='.(int) $couponid;
 
         return $this->db->queryF($sql);
     }

class/class.datatype.php

Indentation +183 added lines, -183 removed lines

@@ -44,29 +44,29 @@ 
 class efqDataType extends XoopsObject
 {
 
-    /**
-     * efqSubscriptionOffer::efqSubscriptionOffer()
-     *
-     * @param bool $offer
-     * @internal param bool $itemtype
-     */
-    public function __construct($offer = false)
-    {
-        global $moddir;
-        $this->db = XoopsDatabaseFactory::getDatabaseConnection();
-        $this->initVar('dtypeid', XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('title', XOBJ_DTYPE_TXTBOX, null, true, 255);
-        $this->initVar('section', XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('fieldtypeid', XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('uid', XOBJ_DTYPE_INT, 0, true, 5);
-        $this->initVar('defaultyn', XOBJ_DTYPE_INT, 0, true, 2);
-        $this->initVar('created', XOBJ_DTYPE_INT, 0, true, 10);
-        $this->initVar('seq', XOBJ_DTYPE_INT, 0, true, 5);
-        $this->initVar('options', XOBJ_DTYPE_TXTBOX, null, false, 10);
-        $this->initVar('activeyn', XOBJ_DTYPE_INT, 0, true, 2);
-        $this->initVar('custom', XOBJ_DTYPE_TXTBOX, null, false, 10);
-        $this->initVar('icons', XOBJ_DTYPE_TXTBOX, null, false, 50);
-    }
+	/**
+	 * efqSubscriptionOffer::efqSubscriptionOffer()
+	 *
+	 * @param bool $offer
+	 * @internal param bool $itemtype
+	 */
+	public function __construct($offer = false)
+	{
+		global $moddir;
+		$this->db = XoopsDatabaseFactory::getDatabaseConnection();
+		$this->initVar('dtypeid', XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('title', XOBJ_DTYPE_TXTBOX, null, true, 255);
+		$this->initVar('section', XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('fieldtypeid', XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('uid', XOBJ_DTYPE_INT, 0, true, 5);
+		$this->initVar('defaultyn', XOBJ_DTYPE_INT, 0, true, 2);
+		$this->initVar('created', XOBJ_DTYPE_INT, 0, true, 10);
+		$this->initVar('seq', XOBJ_DTYPE_INT, 0, true, 5);
+		$this->initVar('options', XOBJ_DTYPE_TXTBOX, null, false, 10);
+		$this->initVar('activeyn', XOBJ_DTYPE_INT, 0, true, 2);
+		$this->initVar('custom', XOBJ_DTYPE_TXTBOX, null, false, 10);
+		$this->initVar('icons', XOBJ_DTYPE_TXTBOX, null, false, 50);
+	}
 }
 
 /**
@@ -81,174 +81,174 @@ 
 class efqDataTypeHandler extends XoopsObjectHandler
 {
 //    public $db; //Database reference
-    public $objDataType; // reference to object
+	public $objDataType; // reference to object
 
-    /**
-     * efqSubscriptionOfferHandler::efqItemTypeHandler()
-     *
-     * @param bool $obj
-     */
-    public function __construct($obj = false)
-    {
-        $this->db          = XoopsDatabaseFactory::getDatabaseConnection();
-        $this->objDataType = $obj;
-    }
+	/**
+	 * efqSubscriptionOfferHandler::efqItemTypeHandler()
+	 *
+	 * @param bool $obj
+	 */
+	public function __construct($obj = false)
+	{
+		$this->db          = XoopsDatabaseFactory::getDatabaseConnection();
+		$this->objDataType = $obj;
+	}
 
-    /**
-     * Function insertOffer inserts record into DB
-     * @author    EFQ Consultancy <info@efqconsultancy.com>
-     * @copyright EFQ Consultancy (c) 2008
-     * @version   1.0.0
-     *
-     * @param   efqDataType $obj object
-     *
-     * @param bool     $forceQuery
-     * @return bool true if insertion is succesful, false if unsuccesful
-     */
-    public function insertDataType($obj, $forceQuery = false)
-    {
-        $tablename    = 'efqdiralpha1_dtypes';
-        $keyName      = 'dtypeid';
-        $excludedVars = array();
-        if ($obj instanceof efqDataType) {
-            // 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 record into DB
+	 * @author    EFQ Consultancy <info@efqconsultancy.com>
+	 * @copyright EFQ Consultancy (c) 2008
+	 * @version   1.0.0
+	 *
+	 * @param   efqDataType $obj object
+	 *
+	 * @param bool     $forceQuery
+	 * @return bool true if insertion is succesful, false if unsuccesful
+	 */
+	public function insertDataType($obj, $forceQuery = false)
+	{
+		$tablename    = 'efqdiralpha1_dtypes';
+		$keyName      = 'dtypeid';
+		$excludedVars = array();
+		if ($obj instanceof efqDataType) {
+			// 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
-     *
-     */
-    public function updateDataType($obj, $forceQuery = false)
-    {
-        $tablename    = 'efqdiralpha1_dtypes';
-        $keyName      = 'dtypeid';
-        $excludedVars = array();
-        if ($obj instanceof efqDataType) {
-            // 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
+	 *
+	 */
+	public function updateDataType($obj, $forceQuery = false)
+	{
+		$tablename    = 'efqdiralpha1_dtypes';
+		$keyName      = 'dtypeid';
+		$excludedVars = array();
+		if ($obj instanceof efqDataType) {
+			// 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;
+	}
 
-    /**
-     * function setDataType()
-     *
-     * Sets the object created by class efqDataType with data from query
-     *
-     * @param int $gpc_dtypeid
-     * @return bool true or false
-     */
-    public function setDataType($gpc_dtypeid = 0)
-    {
-        $sql     = 'SELECT dtypeid,title,section,fieldtypeid,uid,defaultyn,created,seq,activeyn,options,custom,icon	WHERE dtypeid=' . (int)$gpc_dtypeid;
-        $result  = $this->db->query($sql);
-        $numrows = $this->db->getRowsNum($result);
-        if ($numrows > 0) {
-            while (list($dtypeid, $title, $section, $fieldtypeid, $uid, $defaultyn, $activeyn, $options, $custom, $icon) = $this->db->fetchRow($result)) {
-                if (!$this->objDataType) {
-                    $this->objDataType = new efqDataType();
-                }
-                $this->objDataType->setVar('dtypeid', $dtypeid);
-                $this->objDataType->setVar('title', $title);
-                $this->objDataType->setVar('section', $section);
-                $this->objDataType->setVar('fieldtypeid', $fieldtypeid);
-                $this->objDataType->setVar('uid', $uid);
-                $this->objDataType->setVar('defaultyn', $defaultyn);
-                $this->objDataType->setVar('created', $created);
-                $this->objDataType->setVar('seq', $seq);
-                $this->objDataType->setVar('options', $options);
-                $this->objDataType->setVar('activeyn', $activeyn);
-                $this->objDataType->setVar('custom', $custom);
-                $this->objDataType->setVar('icon', $icon);
-            }
-        } else {
-            return false;
-        }
+	/**
+	 * function setDataType()
+	 *
+	 * Sets the object created by class efqDataType with data from query
+	 *
+	 * @param int $gpc_dtypeid
+	 * @return bool true or false
+	 */
+	public function setDataType($gpc_dtypeid = 0)
+	{
+		$sql     = 'SELECT dtypeid,title,section,fieldtypeid,uid,defaultyn,created,seq,activeyn,options,custom,icon	WHERE dtypeid=' . (int)$gpc_dtypeid;
+		$result  = $this->db->query($sql);
+		$numrows = $this->db->getRowsNum($result);
+		if ($numrows > 0) {
+			while (list($dtypeid, $title, $section, $fieldtypeid, $uid, $defaultyn, $activeyn, $options, $custom, $icon) = $this->db->fetchRow($result)) {
+				if (!$this->objDataType) {
+					$this->objDataType = new efqDataType();
+				}
+				$this->objDataType->setVar('dtypeid', $dtypeid);
+				$this->objDataType->setVar('title', $title);
+				$this->objDataType->setVar('section', $section);
+				$this->objDataType->setVar('fieldtypeid', $fieldtypeid);
+				$this->objDataType->setVar('uid', $uid);
+				$this->objDataType->setVar('defaultyn', $defaultyn);
+				$this->objDataType->setVar('created', $created);
+				$this->objDataType->setVar('seq', $seq);
+				$this->objDataType->setVar('options', $options);
+				$this->objDataType->setVar('activeyn', $activeyn);
+				$this->objDataType->setVar('custom', $custom);
+				$this->objDataType->setVar('icon', $icon);
+			}
+		} else {
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * @return bool
-     */
-    public function getDataType()
-    {
-        return $this->objDataType;
-    }
+	/**
+	 * @return bool
+	 */
+	public function getDataType()
+	{
+		return $this->objDataType;
+	}
 }

Spacing +3 added lines, -3 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 .= ', ';
@@ -188,7 +188,7 @@ 
                 if ($i < $countVars and $i > 1) {
                     $strSet .= ', ';
                 }
-                $strSet .= $k . '=' . "'" . $v . "'";
+                $strSet .= $k.'='."'".$v."'";
             }
             $i++;
         }
@@ -216,7 +216,7 @@ 
      */
     public function setDataType($gpc_dtypeid = 0)
     {
-        $sql     = 'SELECT dtypeid,title,section,fieldtypeid,uid,defaultyn,created,seq,activeyn,options,custom,icon	WHERE dtypeid=' . (int)$gpc_dtypeid;
+        $sql     = 'SELECT dtypeid,title,section,fieldtypeid,uid,defaultyn,created,seq,activeyn,options,custom,icon	WHERE dtypeid='.(int) $gpc_dtypeid;
         $result  = $this->db->query($sql);
         $numrows = $this->db->getRowsNum($result);
         if ($numrows > 0) {

listing.php

Indentation +35 added lines, -35 removed lines

@@ -36,21 +36,21 @@ 
 include XOOPS_ROOT_PATH . '/header.php';
 
 if ($xoopsUser && $xoopsUser->isAdmin($xoopsModule->mid())) {
-    $isadmin = true;
+	$isadmin = true;
 } else {
-    $isadmin = false;
+	$isadmin = false;
 }
 
 if (isset($_GET['catid'])) {
-    $get_catid = (int)$_GET['catid'];
+	$get_catid = (int)$_GET['catid'];
 } else {
-    $get_catid = 0;
+	$get_catid = 0;
 }
 if (!empty($_GET['item'])) {
-    $get_itemid = (int)$_GET['item'];
+	$get_itemid = (int)$_GET['item'];
 } else {
-    redirect_header('index.php', 2, _MD_NOVALIDITEM);
-    exit();
+	redirect_header('index.php', 2, _MD_NOVALIDITEM);
+	exit();
 }
 
 $moddir         = $xoopsModule->getVar('dirname');
@@ -59,9 +59,9 @@ 
 
 $xoopsTpl->assign('xoops_module_header', $xoops_module_header);
 if ($isadmin) {
-    $adminlink = '<a href="' . XOOPS_URL . '/modules/' . $moddir . '/admin/index.php?op=edit&amp;item=' . $get_itemid . '"><img src="' . XOOPS_URL . '/modules/' . $moddir . '/assets/images/editicon2.gif" border="0" alt="' . _MD_EDITTHISLISTING . '"></a>';
+	$adminlink = '<a href="' . XOOPS_URL . '/modules/' . $moddir . '/admin/index.php?op=edit&amp;item=' . $get_itemid . '"><img src="' . XOOPS_URL . '/modules/' . $moddir . '/assets/images/editicon2.gif" border="0" alt="' . _MD_EDITTHISLISTING . '"></a>';
 } else {
-    $adminlink = '';
+	$adminlink = '';
 }
 $xoopsTpl->assign('adminlink', $adminlink);
 
@@ -77,28 +77,28 @@ 
 $editlink = '<a href="edit.php?item=' . $get_itemid . '"><img src="' . XOOPS_URL . '/modules/' . $moddir . '/assets/images/' . $xoopsConfig['language'] . '/listing-edit.gif" alt="' . _MD_EDIT_LISTING . '" title="' . _MD_EDIT_LISTING . '"></a>';
 
 if (isset($xoopsUser) && $xoopsUser != null) {
-    if ($xoopsUser->getVar('uid') == $listing->getVar('uid')) {
-        $islistingowner = true;
-        $xoopsTpl->assign('listingowner', '1');
-        if ($listing->getVar('status') == '2' and $xoopsModuleConfig['autoapprove'] == 1) {
-            $editrights = '1';
-        } else {
-            $editrights = '0';
-        }
-    } else {
-        $editrights = '0';
-    }
+	if ($xoopsUser->getVar('uid') == $listing->getVar('uid')) {
+		$islistingowner = true;
+		$xoopsTpl->assign('listingowner', '1');
+		if ($listing->getVar('status') == '2' and $xoopsModuleConfig['autoapprove'] == 1) {
+			$editrights = '1';
+		} else {
+			$editrights = '0';
+		}
+	} else {
+		$editrights = '0';
+	}
 }
 if (!$islistingowner and !$isadmin) {
-    $listinghandler->incrementHits($get_itemid);
+	$listinghandler->incrementHits($get_itemid);
 }
 
 $type     = getTypeFromId($listing->getVar('typeid'));
 $template = getTemplateFromCatid($get_catid);
 if ($listing->getVar('logourl') !== '') {
-    $logourl = '<img src="' . XOOPS_URL . '/modules/' . $moddir . '/uploads/' . $listing->getVar('logourl') . '">';
+	$logourl = '<img src="' . XOOPS_URL . '/modules/' . $moddir . '/uploads/' . $listing->getVar('logourl') . '">';
 } else {
-    $logourl = '';
+	$logourl = '';
 }
 
 $myts   = MyTextSanitizer::getInstance();
@@ -126,25 +126,25 @@ 
 $listing->setDataTypes($listinghandler->getDataTypes($get_itemid));
 
 if (count($listing->_datatypes) > 0) {
-    xoops_debug('o, o');
-    $xoopsTpl->assign('datatypes', true);
-    foreach ($listing->_datatypes as $datatype) {
-        $xoopsTpl->append('section' . $datatype['section'] . '', array('icon' => $datatype['icon'], 'label' => $datatype['title'], 'value' => $datatype['value'], 'fieldtype' => $datatype['fieldtype']));
-    }
+	xoops_debug('o, o');
+	$xoopsTpl->assign('datatypes', true);
+	foreach ($listing->_datatypes as $datatype) {
+		$xoopsTpl->append('section' . $datatype['section'] . '', array('icon' => $datatype['icon'], 'label' => $datatype['title'], 'value' => $datatype['value'], 'fieldtype' => $datatype['fieldtype']));
+	}
 }
 
 if ($xoopsModuleConfig['allowcoupons'] == '0') {
-    $xoopsTpl->assign('couponsallowed', '0');
+	$xoopsTpl->assign('couponsallowed', '0');
 } else {
-    $xoopsTpl->assign('couponsallowed', '1');
-    $xoopsTpl->assign('lang_addcoupon', _MD_ADDCOUPON);
-    $xoopsTpl->assign('coupons', $coupon->getCountByLink($get_itemid));
+	$xoopsTpl->assign('couponsallowed', '1');
+	$xoopsTpl->assign('lang_addcoupon', _MD_ADDCOUPON);
+	$xoopsTpl->assign('coupons', $coupon->getCountByLink($get_itemid));
 }
 if ($xoopsModuleConfig['allowsubscr'] == '0') {
-    $xoopsTpl->assign('subscrallowed', '0');
+	$xoopsTpl->assign('subscrallowed', '0');
 } else {
-    $xoopsTpl->assign('subscrallowed', '1');
-    $xoopsTpl->assign('lang_viewsubscription', _MD_VIEWSUBSCRIPTIONS);
+	$xoopsTpl->assign('subscrallowed', '1');
+	$xoopsTpl->assign('lang_viewsubscription', _MD_VIEWSUBSCRIPTIONS);
 }
 
 include XOOPS_ROOT_PATH . '/footer.php';

Spacing +21 added lines, -21 removed lines

@@ -18,22 +18,22 @@ 
  * @author       XOOPS Development Team,
  */
 
-include __DIR__ . '/header.php';
-$myts = MyTextSanitizer::getInstance();// MyTextSanitizer object
-require_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
-require_once XOOPS_ROOT_PATH . '/class/module.errorhandler.php';
-require_once XOOPS_ROOT_PATH . '/include/xoopscodes.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-require_once __DIR__ . '/class/class.listing.php';
-require_once __DIR__ . '/class/class.datafieldmanager.php';
-require_once __DIR__ . '/class/class.couponhandler.php';
-
-$mytree           = new XoopsTree($xoopsDB->prefix($module->getVar('dirname', 'n') . '_cat'), 'cid', 'pid');
+include __DIR__.'/header.php';
+$myts = MyTextSanitizer::getInstance(); // MyTextSanitizer object
+require_once XOOPS_ROOT_PATH.'/class/xoopstree.php';
+require_once XOOPS_ROOT_PATH.'/class/module.errorhandler.php';
+require_once XOOPS_ROOT_PATH.'/include/xoopscodes.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
+require_once __DIR__.'/class/class.listing.php';
+require_once __DIR__.'/class/class.datafieldmanager.php';
+require_once __DIR__.'/class/class.couponhandler.php';
+
+$mytree           = new XoopsTree($xoopsDB->prefix($module->getVar('dirname', 'n').'_cat'), 'cid', 'pid');
 $datafieldmanager = new efqDataFieldManager();
 $eh               = new ErrorHandler;
 
 $GLOBALS['xoopsOption']['template_main'] = 'efqdiralpha1_listing.tpl';
-include XOOPS_ROOT_PATH . '/header.php';
+include XOOPS_ROOT_PATH.'/header.php';
 
 if ($xoopsUser && $xoopsUser->isAdmin($xoopsModule->mid())) {
     $isadmin = true;
@@ -42,12 +42,12 @@ 
 }
 
 if (isset($_GET['catid'])) {
-    $get_catid = (int)$_GET['catid'];
+    $get_catid = (int) $_GET['catid'];
 } else {
     $get_catid = 0;
 }
 if (!empty($_GET['item'])) {
-    $get_itemid = (int)$_GET['item'];
+    $get_itemid = (int) $_GET['item'];
 } else {
     redirect_header('index.php', 2, _MD_NOVALIDITEM);
     exit();
@@ -59,7 +59,7 @@ 
 
 $xoopsTpl->assign('xoops_module_header', $xoops_module_header);
 if ($isadmin) {
-    $adminlink = '<a href="' . XOOPS_URL . '/modules/' . $moddir . '/admin/index.php?op=edit&amp;item=' . $get_itemid . '"><img src="' . XOOPS_URL . '/modules/' . $moddir . '/assets/images/editicon2.gif" border="0" alt="' . _MD_EDITTHISLISTING . '"></a>';
+    $adminlink = '<a href="'.XOOPS_URL.'/modules/'.$moddir.'/admin/index.php?op=edit&amp;item='.$get_itemid.'"><img src="'.XOOPS_URL.'/modules/'.$moddir.'/assets/images/editicon2.gif" border="0" alt="'._MD_EDITTHISLISTING.'"></a>';
 } else {
     $adminlink = '';
 }
@@ -71,10 +71,10 @@ 
 
 $listing->setVars($listinghandler->getListing($get_itemid));
 
-$pathstring = "<a href='index.php?dirid=" . $dirid . '\'>' . _MD_MAIN . '</a>&nbsp;:&nbsp;';
-$pathstring .= $mytree->getNicePathFromId($get_catid, 'title', 'index.php?dirid=' . $dirid . '');
+$pathstring = "<a href='index.php?dirid=".$dirid.'\'>'._MD_MAIN.'</a>&nbsp;:&nbsp;';
+$pathstring .= $mytree->getNicePathFromId($get_catid, 'title', 'index.php?dirid='.$dirid.'');
 
-$editlink = '<a href="edit.php?item=' . $get_itemid . '"><img src="' . XOOPS_URL . '/modules/' . $moddir . '/assets/images/' . $xoopsConfig['language'] . '/listing-edit.gif" alt="' . _MD_EDIT_LISTING . '" title="' . _MD_EDIT_LISTING . '"></a>';
+$editlink = '<a href="edit.php?item='.$get_itemid.'"><img src="'.XOOPS_URL.'/modules/'.$moddir.'/assets/images/'.$xoopsConfig['language'].'/listing-edit.gif" alt="'._MD_EDIT_LISTING.'" title="'._MD_EDIT_LISTING.'"></a>';
 
 if (isset($xoopsUser) && $xoopsUser != null) {
     if ($xoopsUser->getVar('uid') == $listing->getVar('uid')) {
@@ -96,7 +96,7 @@ 
 $type     = getTypeFromId($listing->getVar('typeid'));
 $template = getTemplateFromCatid($get_catid);
 if ($listing->getVar('logourl') !== '') {
-    $logourl = '<img src="' . XOOPS_URL . '/modules/' . $moddir . '/uploads/' . $listing->getVar('logourl') . '">';
+    $logourl = '<img src="'.XOOPS_URL.'/modules/'.$moddir.'/uploads/'.$listing->getVar('logourl').'">';
 } else {
     $logourl = '';
 }
@@ -129,7 +129,7 @@ 
     xoops_debug('o, o');
     $xoopsTpl->assign('datatypes', true);
     foreach ($listing->_datatypes as $datatype) {
-        $xoopsTpl->append('section' . $datatype['section'] . '', array('icon' => $datatype['icon'], 'label' => $datatype['title'], 'value' => $datatype['value'], 'fieldtype' => $datatype['fieldtype']));
+        $xoopsTpl->append('section'.$datatype['section'].'', array('icon' => $datatype['icon'], 'label' => $datatype['title'], 'value' => $datatype['value'], 'fieldtype' => $datatype['fieldtype']));
     }
 }
 
@@ -147,4 +147,4 @@ 
     $xoopsTpl->assign('lang_viewsubscription', _MD_VIEWSUBSCRIPTIONS);
 }
 
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

php_paypal/process.php

Spacing +2 added lines, -2 removed lines

@@ -13,10 +13,10 @@
  */
 
 //Configuration File
-require_once __DIR__ . '/../paypal_includes/config.inc.php';
+require_once __DIR__.'/../paypal_includes/config.inc.php';
 
 //Global Configuration File
-require_once __DIR__ . '/../paypal_includes/global_config.inc.php';
+require_once __DIR__.'/../paypal_includes/global_config.inc.php';
 
 ?>
 

Indentation +3 added lines, -3 removed lines

@@ -27,11 +27,11 @@
 <form method="post" name="paypal_form" action="<?= $paypal['url'] ?>">
 
     <?php
-    //show paypal hidden variables
+	//show paypal hidden variables
 
-    showVariables();
+	showVariables();
 
-    ?>
+	?>
 
     <div style="text-align: center;"><span style="font-family: Verdana, Arial, Helvetica, sans-serif; font-size: x-small; color: 333333; ">Processing Transaction . . . </span></div>
 

advancedsearch.php

Indentation +602 added lines, -602 removed lines

@@ -36,24 +36,24 @@ 
 $moddir = $xoopsModule->getVar('dirname');
 
 if (isset($_GET['catid'])) {
-    $get_cid = (int)$_GET['cid'];
+	$get_cid = (int)$_GET['cid'];
 } else {
-    $get_cid = '1';
+	$get_cid = '1';
 }
 if (isset($_GET['dirid'])) {
-    $get_dirid = (int)$_GET['dirid'];
+	$get_dirid = (int)$_GET['dirid'];
 } elseif (isset($_POST['dirid'])) {
-    $get_dirid = (int)$_POST['dirid'];
+	$get_dirid = (int)$_POST['dirid'];
 }
 if (isset($_GET['orderby'])) {
-    $orderby = convertOrderByIn($_GET['orderby']);
+	$orderby = convertOrderByIn($_GET['orderby']);
 } else {
-    $orderby = 'title ASC';
+	$orderby = 'title ASC';
 }
 if (isset($_GET['page'])) {
-    $get_page = (int)$_GET['page'];
+	$get_page = (int)$_GET['page'];
 } else {
-    $get_page = 1;
+	$get_page = 1;
 }
 
 $GLOBALS['xoopsOption']['template_main'] = 'efqdiralpha1_search.tpl';
@@ -62,280 +62,280 @@ 
 //The advanced search is within a directory
 //First get an array of all datatypes within a directory that has listings linked to them
 if (isset($_POST['submit'])) {
-    $sql         = 'SELECT DISTINCT dt.dtypeid, dt.title, dt.options, ft.fieldtype FROM '
-                   . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_fieldtypes')
-                   . ' ft, '
-                   . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_dtypes')
-                   . ' dt, '
-                   . $xoopsDB->prefix($module->getVar('dirname', 'n')
-                                      . '_dtypes_x_cat')
-                   . ' dxc, '
-                   . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_cat')
-                   . " c WHERE c.cid=dxc.cid AND dt.dtypeid=dxc.dtypeid AND dt.fieldtypeid=ft.typeid AND c.dirid='$get_dirid' AND dt.activeyn='1'";
-    $result      = $xoopsDB->query($sql) or $eh->show('0013');
-    $num_results = $xoopsDB->getRowsNum($result);
-    $filter_arr  = array();
-    while (list($dtypeid, $dtypetitle, $dtypeoptions, $fieldtype) = $xoopsDB->fetchRow($result)) {
-        switch ($fieldtype) {
-            case 'textbox':
-                $filter_arr[] = getPostedValue_text($dtypeid);
-                break;
-            case 'textarea':
-                $filter_arr[] = getPostedValue_text($dtypeid);
-                break;
-            case 'yesno':
-                $filter_arr[] = getPostedValue_text($dtypeid);
-                break;
-            case 'radio':
-                $filter_arr[] = getPostedValue_text($dtypeid);
-                break;
-            case 'select':
-                $selectarr = getPostedValue_array($dtypeid);
-                $count_arr = count($selectarr);
-
-                if ($count_arr >= 1) {
-                    foreach ($selectarr as $arr) {
-                        $selectarray[] = $arr['postvalue'];
-                    }
-                    $filter_arr[] = array('dtypeid' => $dtypeid, 'constr' => 'equal', 'postvalue' => $selectarr['postvalue'], 'selectfields' => $selectarray, 'addressfields' => 0);
-                }
-                break;
-            case 'dhtml':
-                $filter_arr[] = getPostedValue_text($dtypeid);
-                break;
-            case 'address':
-                $addressarr   = getPostedValue_address($dtypeid);
-                $addressarray = array();
-                //$countarr = count($address
-                if (is_array($addressarray) && count($addressarray) >= 1) {
-                    foreach ($addressarr as $arr) {
-                        $addressarray[] = array($arr['field'] => $arr['postvalue']);
-                    }
-                    $filter_arr[] = array('dtypeid' => $dtypeid, 'constr' => 'equal', 'postvalue' => $arr['postvalue'], 'selectfields' => 0, 'addressfields' => $addressarray);
-                }
-                break;
-            case 'rating':
-                $selectarr = getPostedValue_array($dtypeid);
-                //$selectarr = getPostedValue_text($dtypeid);
-                $count_arr = count($selectarr);
-
-                if ($count_arr >= 1) {
-                    foreach ($selectarr as $arr) {
-                        $selectarray[] = $arr;
-                    }
-                    //echo $selectarr['postvalue'];
-                    $filter_arr[] = array('dtypeid' => $dtypeid, 'constr' => $selectarr['constr'], 'postvalue' => $selectarr['postvalue'], 'selectfields' => '', 'addressfields' => 0);
-                }
-                break;
-            case 'date':
-                $filter_arr[] = getPostedValue_text($dtypeid);
-                break;
-            default:
-                break;
-        }
-    }
-    if (isset($_POST['q'])) {
-        $querystring = $GLOBALS['xoopsDB']->escape($myts->stripSlashesGPC($_POST['q']));
-    } else {
-        $querystring = '';
-    }
-    $poscount   = substr_count($querystring, '"') / 2;
-    $specialarr = array();
-    for ($i = 0; $i < $poscount; ++$i) {
-        $start = strpos($querystring, '"', 0);
-        $end   = strpos($querystring, '"', $start + 1);
-        if ($end !== false) {
-            $specialstring = ltrim(substr($querystring, $start, $end - $start), '"');
-            $specialarr[]  = $specialstring;
-            $querystring   = ltrim(substr_replace($querystring, '', $start, $end - $start + 1));
-        } else {
-            $querystring = ltrim(substr_replace($querystring, '', $start, 1));
-        }
-    }
-    $queryarr   = explode(' ', $querystring);
-    $queryarr   = array_merge($specialarr, $queryarr);
-    $emptyarr[] = '';
-    $querydiff  = array_diff($queryarr, $emptyarr);
-
-    $limit  = $xoopsModuleConfig['searchresults_perpage'];
-    $offset = ($get_page - 1) * $limit;
-
-    $andor         = 'AND';
-    $searchresults = mod_search($querydiff, $andor, $limit, $offset, $filter_arr);
-
-    $maxpages      = 10;
-    $maxcount      = 30;
-    $count_results = count($searchresults);
-    $count_pages   = 0;
-
-    $items_arr_text = '';
-    //Calculate the number of result pages.
-    if ($count_results > $limit) {
-        $count_pages = ceil($count_results / $limit);
-    } else {
-        $count_pages = 1;
-    }
-    $pages_text = sprintf(_MD_LISTINGS_FOUND_ADV, $count_results);
-
-    if ($count_pages >= 2) {
-        $searchnum  = uniqid(mt_rand(), 1);
-        $pages_text .= '' . _MD_PAGES . '<a href="advancedsearch.php?ref=' . $searchnum . '&page=1&dirid=' . $get_dirid . '">1</a>';
-    }
-    for ($i = 1; $i < $count_pages; ++$i) {
-        $page       = $i + 1;
-        $pages_text .= ' - <a href="advancedsearch.php?ref=' . $searchnum . '&page=' . $page . '&dirid=' . $get_dirid . '">' . $page . '</a>';
-    }
-    $pages_text     .= sprintf(_MD_NEW_SEARCH_ADV, $get_dirid);
-    $pages_top_text = sprintf(_MD_PAGE_OF_PAGES, $get_page, $count_pages) . '<br><br>';
-
-    ob_start();
-    echo '<div class="itemTitleLarge">' . _MD_SEARCHRESULTS_TITLE . '</div><br>';
-    echo $pages_top_text;
-    if ($searchresults == 0) {
-        echo '<div class="itemTitle">' . _MD_NORESULTS . '</div>';
-    } else {
-        $y    = 0;
-        $page = 1;
-        foreach ($searchresults as $result) {
-            if ($y < $limit && $page == 1) {
-                echo '<div class="itemTitle"><a href="' . $result['link'] . '">' . $result['title'] . '</a></div><div class="itemText">' . $result['description'] . '</div><hr>';
-                if ($y < $limit && $y > 0) {
-                    $items_arr_text .= ',' . $result['itemid'] . '';
-                } else {
-                    $items_arr_text = $result['itemid'];
-                }
-                ++$y;
-            } elseif ($y < $limit && $y > 0) {
-                $items_arr_text .= ',' . $result['itemid'] . '';
-                ++$y;
-            } elseif ($y < $limit && $y == 0) {
-                $items_arr_text = $result['itemid'];
-                ++$y;
-            } elseif ($y == $limit) {
-                //Save $items_arr_text and $page into DB
-                $newid = $xoopsDB->genId($xoopsDB->prefix($module->getVar('dirname', 'n') . '_searchresults') . '_searchid_seq');
-                $sql   = sprintf("INSERT INTO %s (searchid, searchnum, created, PAGE, items, dirid, catid) VALUES (%u, '%s', '%s', %u, '%s', %u, %u)", $xoopsDB->prefix($module->getVar('dirname', 'n') . '_searchresults'), $newid, $searchnum, time(), $page, $items_arr_text, $get_dirid, $get_cid);
-                $xoopsDB->query($sql) or $eh->show('0013');
-                if ($newid == 0) {
-                    $itemid = $xoopsDB->getInsertId();
-                }
-                $items_arr_text = $result['itemid'];
-                $y              = 1;
-                ++$page;
-            }
-        }
-        if ($y != 0 && $page > 1) {
-            $newid = $xoopsDB->genId($xoopsDB->prefix($module->getVar('dirname', 'n') . '_searchresults') . '_searchid_seq');
-            $sql   = sprintf("INSERT INTO %s (searchid, searchnum, created, PAGE, items, dirid, catid) VALUES (%u, '%s', '%s', %u, '%s', %u, %u)", $xoopsDB->prefix($module->getVar('dirname', 'n') . '_searchresults'), $newid, $searchnum, time(), $page, $items_arr_text, $get_dirid, $get_cid);
-            $xoopsDB->query($sql) or $eh->show('0013');
-            if ($newid == 0) {
-                $itemid = $xoopsDB->getInsertId();
-            }
-        }
-    }
-    echo '<br>';
-    echo $pages_text;
-
-    $xoopsTpl->assign('search_page', ob_get_contents());
-    ob_end_clean();
+	$sql         = 'SELECT DISTINCT dt.dtypeid, dt.title, dt.options, ft.fieldtype FROM '
+				   . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_fieldtypes')
+				   . ' ft, '
+				   . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_dtypes')
+				   . ' dt, '
+				   . $xoopsDB->prefix($module->getVar('dirname', 'n')
+									  . '_dtypes_x_cat')
+				   . ' dxc, '
+				   . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_cat')
+				   . " c WHERE c.cid=dxc.cid AND dt.dtypeid=dxc.dtypeid AND dt.fieldtypeid=ft.typeid AND c.dirid='$get_dirid' AND dt.activeyn='1'";
+	$result      = $xoopsDB->query($sql) or $eh->show('0013');
+	$num_results = $xoopsDB->getRowsNum($result);
+	$filter_arr  = array();
+	while (list($dtypeid, $dtypetitle, $dtypeoptions, $fieldtype) = $xoopsDB->fetchRow($result)) {
+		switch ($fieldtype) {
+			case 'textbox':
+				$filter_arr[] = getPostedValue_text($dtypeid);
+				break;
+			case 'textarea':
+				$filter_arr[] = getPostedValue_text($dtypeid);
+				break;
+			case 'yesno':
+				$filter_arr[] = getPostedValue_text($dtypeid);
+				break;
+			case 'radio':
+				$filter_arr[] = getPostedValue_text($dtypeid);
+				break;
+			case 'select':
+				$selectarr = getPostedValue_array($dtypeid);
+				$count_arr = count($selectarr);
+
+				if ($count_arr >= 1) {
+					foreach ($selectarr as $arr) {
+						$selectarray[] = $arr['postvalue'];
+					}
+					$filter_arr[] = array('dtypeid' => $dtypeid, 'constr' => 'equal', 'postvalue' => $selectarr['postvalue'], 'selectfields' => $selectarray, 'addressfields' => 0);
+				}
+				break;
+			case 'dhtml':
+				$filter_arr[] = getPostedValue_text($dtypeid);
+				break;
+			case 'address':
+				$addressarr   = getPostedValue_address($dtypeid);
+				$addressarray = array();
+				//$countarr = count($address
+				if (is_array($addressarray) && count($addressarray) >= 1) {
+					foreach ($addressarr as $arr) {
+						$addressarray[] = array($arr['field'] => $arr['postvalue']);
+					}
+					$filter_arr[] = array('dtypeid' => $dtypeid, 'constr' => 'equal', 'postvalue' => $arr['postvalue'], 'selectfields' => 0, 'addressfields' => $addressarray);
+				}
+				break;
+			case 'rating':
+				$selectarr = getPostedValue_array($dtypeid);
+				//$selectarr = getPostedValue_text($dtypeid);
+				$count_arr = count($selectarr);
+
+				if ($count_arr >= 1) {
+					foreach ($selectarr as $arr) {
+						$selectarray[] = $arr;
+					}
+					//echo $selectarr['postvalue'];
+					$filter_arr[] = array('dtypeid' => $dtypeid, 'constr' => $selectarr['constr'], 'postvalue' => $selectarr['postvalue'], 'selectfields' => '', 'addressfields' => 0);
+				}
+				break;
+			case 'date':
+				$filter_arr[] = getPostedValue_text($dtypeid);
+				break;
+			default:
+				break;
+		}
+	}
+	if (isset($_POST['q'])) {
+		$querystring = $GLOBALS['xoopsDB']->escape($myts->stripSlashesGPC($_POST['q']));
+	} else {
+		$querystring = '';
+	}
+	$poscount   = substr_count($querystring, '"') / 2;
+	$specialarr = array();
+	for ($i = 0; $i < $poscount; ++$i) {
+		$start = strpos($querystring, '"', 0);
+		$end   = strpos($querystring, '"', $start + 1);
+		if ($end !== false) {
+			$specialstring = ltrim(substr($querystring, $start, $end - $start), '"');
+			$specialarr[]  = $specialstring;
+			$querystring   = ltrim(substr_replace($querystring, '', $start, $end - $start + 1));
+		} else {
+			$querystring = ltrim(substr_replace($querystring, '', $start, 1));
+		}
+	}
+	$queryarr   = explode(' ', $querystring);
+	$queryarr   = array_merge($specialarr, $queryarr);
+	$emptyarr[] = '';
+	$querydiff  = array_diff($queryarr, $emptyarr);
+
+	$limit  = $xoopsModuleConfig['searchresults_perpage'];
+	$offset = ($get_page - 1) * $limit;
+
+	$andor         = 'AND';
+	$searchresults = mod_search($querydiff, $andor, $limit, $offset, $filter_arr);
+
+	$maxpages      = 10;
+	$maxcount      = 30;
+	$count_results = count($searchresults);
+	$count_pages   = 0;
+
+	$items_arr_text = '';
+	//Calculate the number of result pages.
+	if ($count_results > $limit) {
+		$count_pages = ceil($count_results / $limit);
+	} else {
+		$count_pages = 1;
+	}
+	$pages_text = sprintf(_MD_LISTINGS_FOUND_ADV, $count_results);
+
+	if ($count_pages >= 2) {
+		$searchnum  = uniqid(mt_rand(), 1);
+		$pages_text .= '' . _MD_PAGES . '<a href="advancedsearch.php?ref=' . $searchnum . '&page=1&dirid=' . $get_dirid . '">1</a>';
+	}
+	for ($i = 1; $i < $count_pages; ++$i) {
+		$page       = $i + 1;
+		$pages_text .= ' - <a href="advancedsearch.php?ref=' . $searchnum . '&page=' . $page . '&dirid=' . $get_dirid . '">' . $page . '</a>';
+	}
+	$pages_text     .= sprintf(_MD_NEW_SEARCH_ADV, $get_dirid);
+	$pages_top_text = sprintf(_MD_PAGE_OF_PAGES, $get_page, $count_pages) . '<br><br>';
+
+	ob_start();
+	echo '<div class="itemTitleLarge">' . _MD_SEARCHRESULTS_TITLE . '</div><br>';
+	echo $pages_top_text;
+	if ($searchresults == 0) {
+		echo '<div class="itemTitle">' . _MD_NORESULTS . '</div>';
+	} else {
+		$y    = 0;
+		$page = 1;
+		foreach ($searchresults as $result) {
+			if ($y < $limit && $page == 1) {
+				echo '<div class="itemTitle"><a href="' . $result['link'] . '">' . $result['title'] . '</a></div><div class="itemText">' . $result['description'] . '</div><hr>';
+				if ($y < $limit && $y > 0) {
+					$items_arr_text .= ',' . $result['itemid'] . '';
+				} else {
+					$items_arr_text = $result['itemid'];
+				}
+				++$y;
+			} elseif ($y < $limit && $y > 0) {
+				$items_arr_text .= ',' . $result['itemid'] . '';
+				++$y;
+			} elseif ($y < $limit && $y == 0) {
+				$items_arr_text = $result['itemid'];
+				++$y;
+			} elseif ($y == $limit) {
+				//Save $items_arr_text and $page into DB
+				$newid = $xoopsDB->genId($xoopsDB->prefix($module->getVar('dirname', 'n') . '_searchresults') . '_searchid_seq');
+				$sql   = sprintf("INSERT INTO %s (searchid, searchnum, created, PAGE, items, dirid, catid) VALUES (%u, '%s', '%s', %u, '%s', %u, %u)", $xoopsDB->prefix($module->getVar('dirname', 'n') . '_searchresults'), $newid, $searchnum, time(), $page, $items_arr_text, $get_dirid, $get_cid);
+				$xoopsDB->query($sql) or $eh->show('0013');
+				if ($newid == 0) {
+					$itemid = $xoopsDB->getInsertId();
+				}
+				$items_arr_text = $result['itemid'];
+				$y              = 1;
+				++$page;
+			}
+		}
+		if ($y != 0 && $page > 1) {
+			$newid = $xoopsDB->genId($xoopsDB->prefix($module->getVar('dirname', 'n') . '_searchresults') . '_searchid_seq');
+			$sql   = sprintf("INSERT INTO %s (searchid, searchnum, created, PAGE, items, dirid, catid) VALUES (%u, '%s', '%s', %u, '%s', %u, %u)", $xoopsDB->prefix($module->getVar('dirname', 'n') . '_searchresults'), $newid, $searchnum, time(), $page, $items_arr_text, $get_dirid, $get_cid);
+			$xoopsDB->query($sql) or $eh->show('0013');
+			if ($newid == 0) {
+				$itemid = $xoopsDB->getInsertId();
+			}
+		}
+	}
+	echo '<br>';
+	echo $pages_text;
+
+	$xoopsTpl->assign('search_page', ob_get_contents());
+	ob_end_clean();
 } elseif (isset($_GET['ref']) && isset($_GET['page'])) {
-    $get_searchnum = $GLOBALS['xoopsDB']->escape($myts->stripSlashesGPC($_GET['ref']));
-    $get_page      = (int)$_GET['page'];
-
-    //Query the saved results from the DB.
-    $sql = 'SELECT searchid, searchnum, created, page, items, dirid, catid FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_searchresults') . " WHERE searchnum='$get_searchnum' AND page='$get_page'";
-
-    $result      = $xoopsDB->query($sql) or $eh->show('0013');
-    $num_results = $xoopsDB->getRowsNum($result);
-    while (list($searchid, $searchnum, $created, $page, $items, $dirid, $catid) = $xoopsDB->fetchRow($result)) {
-        //Split items and for each item, get item data.
-        if ($items !== '') {
-            $searchresults = get_search_results($items);
-        } else {
-            $searchresults = 0;
-        }
-    }
-    $maxpages      = 10;
-    $maxcount      = 30;
-    $limit         = $xoopsModuleConfig['searchresults_perpage'];
-    $count_results = getNumberOfResults($get_searchnum, $limit);
-    $count_pages   = 0;
-
-    $items_arr_text = '';
-
-    $offset = ($get_page - 1) * $limit;
-    //Calculate the number of result pages.
-    if ($count_results > $limit) {
-        $count_pages = ceil($count_results / $limit);
-    }
-
-    ob_start();
-    printf(_MD_LISTINGS_FOUND_ADV, $count_results);
-    $pages_text = ob_get_contents();
-    ob_end_clean();
-
-    ob_start();
-    printf(_MD_PAGE_OF_PAGES, $get_page, $count_pages) . '<br><br>';
-    $pages_top_text = ob_get_contents();
-    ob_end_clean();
-
-    if ($count_pages >= 2) {
-        $pages_text .= '' . _MD_PAGES . '<a href="advancedsearch.php?ref=' . $get_searchnum . '&page=1&dirid=' . $get_dirid . '">1</a>';
-    }
-    for ($i = 1; $i < $count_pages; ++$i) {
-        $page       = $i + 1;
-        $pages_text .= ' - <a href="advancedsearch.php?ref=' . $get_searchnum . '&page=' . $page . '&dirid=' . $get_dirid . '">' . $page . '</a><br>';
-    }
-    ob_start();
-    printf(_MD_NEW_SEARCH_ADV, $get_dirid);
-    $pages_text .= ob_get_contents();
-    ob_end_clean();
-
-    ob_start();
-    echo '<div class="itemTitleLarge">' . _MD_SEARCHRESULTS_TITLE . '</div><br>';
-    echo $pages_top_text;
-    if ($searchresults == 0) {
-        echo '<div class="itemTitle">' . _MD_NORESULTS . '</div>';
-    } else {
-        $y    = 0;
-        $page = 1;
-        foreach ($searchresults as $result) {
-            echo '<div class="itemTitle"><a href="' . $result['link'] . '">' . $result['title'] . '</a></div><div class="itemText">' . $result['description'] . '</div><hr>';
-        }
-    }
-    echo $pages_text;
-    $xoopsTpl->assign('search_page', ob_get_contents());
-    ob_end_clean();
+	$get_searchnum = $GLOBALS['xoopsDB']->escape($myts->stripSlashesGPC($_GET['ref']));
+	$get_page      = (int)$_GET['page'];
+
+	//Query the saved results from the DB.
+	$sql = 'SELECT searchid, searchnum, created, page, items, dirid, catid FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_searchresults') . " WHERE searchnum='$get_searchnum' AND page='$get_page'";
+
+	$result      = $xoopsDB->query($sql) or $eh->show('0013');
+	$num_results = $xoopsDB->getRowsNum($result);
+	while (list($searchid, $searchnum, $created, $page, $items, $dirid, $catid) = $xoopsDB->fetchRow($result)) {
+		//Split items and for each item, get item data.
+		if ($items !== '') {
+			$searchresults = get_search_results($items);
+		} else {
+			$searchresults = 0;
+		}
+	}
+	$maxpages      = 10;
+	$maxcount      = 30;
+	$limit         = $xoopsModuleConfig['searchresults_perpage'];
+	$count_results = getNumberOfResults($get_searchnum, $limit);
+	$count_pages   = 0;
+
+	$items_arr_text = '';
+
+	$offset = ($get_page - 1) * $limit;
+	//Calculate the number of result pages.
+	if ($count_results > $limit) {
+		$count_pages = ceil($count_results / $limit);
+	}
+
+	ob_start();
+	printf(_MD_LISTINGS_FOUND_ADV, $count_results);
+	$pages_text = ob_get_contents();
+	ob_end_clean();
+
+	ob_start();
+	printf(_MD_PAGE_OF_PAGES, $get_page, $count_pages) . '<br><br>';
+	$pages_top_text = ob_get_contents();
+	ob_end_clean();
+
+	if ($count_pages >= 2) {
+		$pages_text .= '' . _MD_PAGES . '<a href="advancedsearch.php?ref=' . $get_searchnum . '&page=1&dirid=' . $get_dirid . '">1</a>';
+	}
+	for ($i = 1; $i < $count_pages; ++$i) {
+		$page       = $i + 1;
+		$pages_text .= ' - <a href="advancedsearch.php?ref=' . $get_searchnum . '&page=' . $page . '&dirid=' . $get_dirid . '">' . $page . '</a><br>';
+	}
+	ob_start();
+	printf(_MD_NEW_SEARCH_ADV, $get_dirid);
+	$pages_text .= ob_get_contents();
+	ob_end_clean();
+
+	ob_start();
+	echo '<div class="itemTitleLarge">' . _MD_SEARCHRESULTS_TITLE . '</div><br>';
+	echo $pages_top_text;
+	if ($searchresults == 0) {
+		echo '<div class="itemTitle">' . _MD_NORESULTS . '</div>';
+	} else {
+		$y    = 0;
+		$page = 1;
+		foreach ($searchresults as $result) {
+			echo '<div class="itemTitle"><a href="' . $result['link'] . '">' . $result['title'] . '</a></div><div class="itemText">' . $result['description'] . '</div><hr>';
+		}
+	}
+	echo $pages_text;
+	$xoopsTpl->assign('search_page', ob_get_contents());
+	ob_end_clean();
 } else {
-    //No search was posted nor was a search page requested.
-    //A search form is generated from the datatype fields in the chosen directory.
-    $sql         = 'SELECT DISTINCT dt.dtypeid, dt.title, dt.options, ft.fieldtype FROM '
-                   . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_fieldtypes')
-                   . ' ft, '
-                   . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_dtypes')
-                   . ' dt, '
-                   . $xoopsDB->prefix($module->getVar('dirname', 'n')
-                                      . '_dtypes_x_cat')
-                   . ' dxc, '
-                   . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_cat')
-                   . " c WHERE c.cid=dxc.cid AND dt.dtypeid=dxc.dtypeid AND dt.fieldtypeid=ft.typeid AND c.dirid='$get_dirid' AND dt.activeyn='1'";
-    $result      = $xoopsDB->query($sql) or $eh->show('0013');
-    $num_results = $xoopsDB->getRowsNum($result);
-
-    $xoopsTpl->assign('xoops_module_header', $xoops_module_header);
-    ob_start();
-    $form = new XoopsThemeForm(_MD_ADVSEARCH_FORM, 'advsearchform', 'advancedsearch.php');
-    $form->setExtra('enctype="multipart/form-data"');
-    while (list($dtypeid, $dtypetitle, $dtypeoptions, $fieldtype) = $xoopsDB->fetchRow($result)) {
-        $field = $datafieldmanager->createSearchField($dtypetitle, $dtypeid, $fieldtype, '', $dtypeoptions);
-    }
-    $form->addElement(new XoopsFormText(_MD_SEARCHSTRING, 'q', 50, 250, ''));
-    $form->addElement(new XoopsFormButton('', 'submit', _MD_SEARCH, 'submit'));
-    $form->addElement(new XoopsFormHidden('op', 'search'));
-    $form->addElement(new XoopsFormHidden('dirid', $get_dirid));
-    $form->display();
-    $xoopsTpl->assign('search_page', ob_get_contents());
-    ob_end_clean();
+	//No search was posted nor was a search page requested.
+	//A search form is generated from the datatype fields in the chosen directory.
+	$sql         = 'SELECT DISTINCT dt.dtypeid, dt.title, dt.options, ft.fieldtype FROM '
+				   . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_fieldtypes')
+				   . ' ft, '
+				   . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_dtypes')
+				   . ' dt, '
+				   . $xoopsDB->prefix($module->getVar('dirname', 'n')
+									  . '_dtypes_x_cat')
+				   . ' dxc, '
+				   . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_cat')
+				   . " c WHERE c.cid=dxc.cid AND dt.dtypeid=dxc.dtypeid AND dt.fieldtypeid=ft.typeid AND c.dirid='$get_dirid' AND dt.activeyn='1'";
+	$result      = $xoopsDB->query($sql) or $eh->show('0013');
+	$num_results = $xoopsDB->getRowsNum($result);
+
+	$xoopsTpl->assign('xoops_module_header', $xoops_module_header);
+	ob_start();
+	$form = new XoopsThemeForm(_MD_ADVSEARCH_FORM, 'advsearchform', 'advancedsearch.php');
+	$form->setExtra('enctype="multipart/form-data"');
+	while (list($dtypeid, $dtypetitle, $dtypeoptions, $fieldtype) = $xoopsDB->fetchRow($result)) {
+		$field = $datafieldmanager->createSearchField($dtypetitle, $dtypeid, $fieldtype, '', $dtypeoptions);
+	}
+	$form->addElement(new XoopsFormText(_MD_SEARCHSTRING, 'q', 50, 250, ''));
+	$form->addElement(new XoopsFormButton('', 'submit', _MD_SEARCH, 'submit'));
+	$form->addElement(new XoopsFormHidden('op', 'search'));
+	$form->addElement(new XoopsFormHidden('dirid', $get_dirid));
+	$form->display();
+	$xoopsTpl->assign('search_page', ob_get_contents());
+	ob_end_clean();
 }
 include XOOPS_ROOT_PATH . '/footer.php';
 
@@ -349,203 +349,203 @@ 
  */
 function mod_search($queryarray, $andor, $limit, $offset, $filter_arr)
 {
-    global $xoopsDB, $eh;
-    // because count() returns 1 even if a supplied variable
-    // is not an array, we must check if $queryarray is really an array
-    $n            = 0;
-    ${'sql' . $n} = '';
-    $items        = '';
-    if (is_array($queryarray) && count($queryarray) >= 1) {
-        $count        = count($queryarray);
-        ${'sql' . $n} = 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
-                        . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_data')
-                        . ' d RIGHT JOIN '
-                        . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items')
-                        . ' i ON (d.itemid=i.itemid) LEFT JOIN '
-                        . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_text')
-                        . " t ON (t.itemid=i.itemid) WHERE i.status='2'";
-        ${'sql' . $n} .= " AND ((d.value LIKE '%$queryarray[0]%' OR i.title LIKE '%$queryarray[0]%' OR t.description LIKE '%$queryarray[0]%')";
-        for ($i = 1; $i < $count; ++$i) {
-            ${'sql' . $n} .= " $andor ";
-            ${'sql' . $n} .= "(d.value LIKE '%$queryarray[$i]%' OR i.title LIKE '%$queryarray[$i]%' OR t.description LIKE '%$queryarray[$i]%')";
-        }
-        ${'sql' . $n} .= ') ';
-        ${'sql' . $n} .= ' ORDER BY i.created DESC';
-        ++$n;
-    }
-
-    $andor = ' AND';
-    foreach ($filter_arr as $filter) {
-        ${'sql' . $n}  = '';
-        $dtypeid       = $filter['dtypeid'];
-        $constr        = $filter['constr'];
-        $postvalue     = $filter['postvalue'];
-        $selectfields  = $filter['selectfields'];
-        $addressfields = $filter['addressfields'];
-        if (is_array($selectfields)) {
-            if (count($selectfields) >= 1) {
-                ${'sql' . $n}       .= 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
-                                       . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_data')
-                                       . ' d, '
-                                       . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items')
-                                       . ' i LEFT JOIN '
-                                       . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_text')
-                                       . " t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
-                $select             = '';
-                ${'sql' . $n}       .= ' ' . $andor . " (d.dtypeid = $dtypeid AND d.value IN (";
-                $count_selectfields = count($selectfields);
-                $i                  = 1;
-                foreach ($selectfields as $selectfield) {
-                    ${'sql' . $n} .= '\'' . $selectfield . '\'';
-                    if ($i != $count_selectfields) {
-                        ${'sql' . $n} .= ', ';
-                    }
-                    ++$i;
-                }
-                ${'sql' . $n} .= '))';
-                ++$n;
-                $postvalue = '';
-            }
-        } else {
-            $select = '0';
-        }
-
-        if ($postvalue !== '') {
-            ${'sql' . $n} = '';
-            //$zero_allowed = '1';
-            switch ($constr) {
-                case 'equal':
-                    ${'sql' . $n} .= 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_data')
-                                     . ' d, '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items')
-                                     . ' i LEFT JOIN '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_text')
-                                     . " t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
-                    $constraint   = " = '" . $postvalue . '\'';
-                    break;
-                case 'notequal':
-                    ${'sql' . $n} .= 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_data')
-                                     . ' d, '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items')
-                                     . ' i LEFT JOIN '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_text')
-                                     . " t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
-                    $constraint   = " <> '" . $postvalue . '\'';
-                    break;
-                case 'contains':
-                    ${'sql' . $n} .= 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_data')
-                                     . ' d, '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items')
-                                     . ' i LEFT JOIN '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_text')
-                                     . " t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
-                    $constraint   = " LIKE '%" . $postvalue . "%'";
-                    break;
-                case 'notcontain':
-                    ${'sql' . $n} .= 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_data')
-                                     . ' d, '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items')
-                                     . ' i LEFT JOIN '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_text')
-                                     . " t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
-                    $constraint   = " NOT LIKE '%" . $postvalue . "%'";
-                    break;
-                case 'begins':
-                    ${'sql' . $n} .= 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_data')
-                                     . ' d, '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items')
-                                     . ' i LEFT JOIN '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_text')
-                                     . " t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
-                    $constraint   = " LIKE '" . $postvalue . "%'";
-                    break;
-                case 'ends':
-                    ${'sql' . $n} .= 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_data')
-                                     . ' d, '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items')
-                                     . ' i LEFT JOIN '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_text')
-                                     . " t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
-                    $constraint   = " LIKE '%" . $postvalue . '\'';
-                    break;
-                case 'bigger':
-                    ${'sql' . $n} .= 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_data')
-                                     . ' d, '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items')
-                                     . ' i LEFT JOIN '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_text')
-                                     . " t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
-                    $constraint   = ' > ' . (int)$postvalue . '';
-                    break;
-                case 'smaller':
-                    ${'sql' . $n} .= 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_data')
-                                     . ' d, '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items')
-                                     . ' i LEFT JOIN '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_text')
-                                     . " t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
-                    $constraint   = ' < ' . (int)$postvalue . '';
-                    break;
-                default:
-                    break;
-            }
-            if ($postvalue != '0') {
-                ${'sql' . $n} .= $andor . ' (d.dtypeid = ' . $dtypeid . ' AND d.value ' . $constraint . ')';
-            }
-            ${'sql' . $n} .= ' ORDER BY i.created DESC';
-            ++$n;
-        }
-    }
-
-    //Getting the results into an array.
-    $z = 0;
-
-    $ret          = array();
-    $items        = array();
-    $intersection = array();
-    for ($i = 0; $i < $n; ++$i) {
-        $result      = $xoopsDB->query(${'sql' . $i}) or $eh->show('0013');
-        $num_results = $xoopsDB->getRowsNum($result);
-
-        if (!$result) {
-            $num_results = 0;
-        } elseif ($num_results == 0) {
-            $num_results = 0;
-        } else {
-            while ($myrow = $xoopsDB->fetchArray($result)) {
-                $items[] = $myrow['itemid'];
-                if ($i == 0) {
-                    $ret[$z]['itemid']      = $myrow['itemid'];
-                    $ret[$z]['image']       = 'images/home.gif';
-                    $ret[$z]['link']        = 'listing.php?item=' . $myrow['itemid'] . '';
-                    $ret[$z]['title']       = $myrow['title'];
-                    $ret[$z]['description'] = $myrow['description'];
-                    $ret[$z]['time']        = $myrow['created'];
-                    $ret[$z]['uid']         = $myrow['uid'];
-                    $intersection           = $items;
-                }
-                ++$z;
-            }
-            $intersection = array_intersect($intersection, $items);
-        }
-    }
-
-    $i        = 0;
-    $item_arr = array();
-    foreach ($intersection as $value) {
-        $item_arr[$i] = $ret['' . findKeyValuePair($ret, 'itemid', $value, false) . ''];
-        ++$i;
-    }
-
-    return $item_arr;
+	global $xoopsDB, $eh;
+	// because count() returns 1 even if a supplied variable
+	// is not an array, we must check if $queryarray is really an array
+	$n            = 0;
+	${'sql' . $n} = '';
+	$items        = '';
+	if (is_array($queryarray) && count($queryarray) >= 1) {
+		$count        = count($queryarray);
+		${'sql' . $n} = 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
+						. $xoopsDB->prefix($module->getVar('dirname', 'n') . '_data')
+						. ' d RIGHT JOIN '
+						. $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items')
+						. ' i ON (d.itemid=i.itemid) LEFT JOIN '
+						. $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_text')
+						. " t ON (t.itemid=i.itemid) WHERE i.status='2'";
+		${'sql' . $n} .= " AND ((d.value LIKE '%$queryarray[0]%' OR i.title LIKE '%$queryarray[0]%' OR t.description LIKE '%$queryarray[0]%')";
+		for ($i = 1; $i < $count; ++$i) {
+			${'sql' . $n} .= " $andor ";
+			${'sql' . $n} .= "(d.value LIKE '%$queryarray[$i]%' OR i.title LIKE '%$queryarray[$i]%' OR t.description LIKE '%$queryarray[$i]%')";
+		}
+		${'sql' . $n} .= ') ';
+		${'sql' . $n} .= ' ORDER BY i.created DESC';
+		++$n;
+	}
+
+	$andor = ' AND';
+	foreach ($filter_arr as $filter) {
+		${'sql' . $n}  = '';
+		$dtypeid       = $filter['dtypeid'];
+		$constr        = $filter['constr'];
+		$postvalue     = $filter['postvalue'];
+		$selectfields  = $filter['selectfields'];
+		$addressfields = $filter['addressfields'];
+		if (is_array($selectfields)) {
+			if (count($selectfields) >= 1) {
+				${'sql' . $n}       .= 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
+									   . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_data')
+									   . ' d, '
+									   . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items')
+									   . ' i LEFT JOIN '
+									   . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_text')
+									   . " t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
+				$select             = '';
+				${'sql' . $n}       .= ' ' . $andor . " (d.dtypeid = $dtypeid AND d.value IN (";
+				$count_selectfields = count($selectfields);
+				$i                  = 1;
+				foreach ($selectfields as $selectfield) {
+					${'sql' . $n} .= '\'' . $selectfield . '\'';
+					if ($i != $count_selectfields) {
+						${'sql' . $n} .= ', ';
+					}
+					++$i;
+				}
+				${'sql' . $n} .= '))';
+				++$n;
+				$postvalue = '';
+			}
+		} else {
+			$select = '0';
+		}
+
+		if ($postvalue !== '') {
+			${'sql' . $n} = '';
+			//$zero_allowed = '1';
+			switch ($constr) {
+				case 'equal':
+					${'sql' . $n} .= 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
+									 . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_data')
+									 . ' d, '
+									 . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items')
+									 . ' i LEFT JOIN '
+									 . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_text')
+									 . " t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
+					$constraint   = " = '" . $postvalue . '\'';
+					break;
+				case 'notequal':
+					${'sql' . $n} .= 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
+									 . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_data')
+									 . ' d, '
+									 . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items')
+									 . ' i LEFT JOIN '
+									 . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_text')
+									 . " t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
+					$constraint   = " <> '" . $postvalue . '\'';
+					break;
+				case 'contains':
+					${'sql' . $n} .= 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
+									 . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_data')
+									 . ' d, '
+									 . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items')
+									 . ' i LEFT JOIN '
+									 . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_text')
+									 . " t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
+					$constraint   = " LIKE '%" . $postvalue . "%'";
+					break;
+				case 'notcontain':
+					${'sql' . $n} .= 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
+									 . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_data')
+									 . ' d, '
+									 . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items')
+									 . ' i LEFT JOIN '
+									 . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_text')
+									 . " t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
+					$constraint   = " NOT LIKE '%" . $postvalue . "%'";
+					break;
+				case 'begins':
+					${'sql' . $n} .= 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
+									 . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_data')
+									 . ' d, '
+									 . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items')
+									 . ' i LEFT JOIN '
+									 . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_text')
+									 . " t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
+					$constraint   = " LIKE '" . $postvalue . "%'";
+					break;
+				case 'ends':
+					${'sql' . $n} .= 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
+									 . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_data')
+									 . ' d, '
+									 . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items')
+									 . ' i LEFT JOIN '
+									 . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_text')
+									 . " t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
+					$constraint   = " LIKE '%" . $postvalue . '\'';
+					break;
+				case 'bigger':
+					${'sql' . $n} .= 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
+									 . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_data')
+									 . ' d, '
+									 . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items')
+									 . ' i LEFT JOIN '
+									 . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_text')
+									 . " t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
+					$constraint   = ' > ' . (int)$postvalue . '';
+					break;
+				case 'smaller':
+					${'sql' . $n} .= 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
+									 . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_data')
+									 . ' d, '
+									 . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items')
+									 . ' i LEFT JOIN '
+									 . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_text')
+									 . " t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
+					$constraint   = ' < ' . (int)$postvalue . '';
+					break;
+				default:
+					break;
+			}
+			if ($postvalue != '0') {
+				${'sql' . $n} .= $andor . ' (d.dtypeid = ' . $dtypeid . ' AND d.value ' . $constraint . ')';
+			}
+			${'sql' . $n} .= ' ORDER BY i.created DESC';
+			++$n;
+		}
+	}
+
+	//Getting the results into an array.
+	$z = 0;
+
+	$ret          = array();
+	$items        = array();
+	$intersection = array();
+	for ($i = 0; $i < $n; ++$i) {
+		$result      = $xoopsDB->query(${'sql' . $i}) or $eh->show('0013');
+		$num_results = $xoopsDB->getRowsNum($result);
+
+		if (!$result) {
+			$num_results = 0;
+		} elseif ($num_results == 0) {
+			$num_results = 0;
+		} else {
+			while ($myrow = $xoopsDB->fetchArray($result)) {
+				$items[] = $myrow['itemid'];
+				if ($i == 0) {
+					$ret[$z]['itemid']      = $myrow['itemid'];
+					$ret[$z]['image']       = 'images/home.gif';
+					$ret[$z]['link']        = 'listing.php?item=' . $myrow['itemid'] . '';
+					$ret[$z]['title']       = $myrow['title'];
+					$ret[$z]['description'] = $myrow['description'];
+					$ret[$z]['time']        = $myrow['created'];
+					$ret[$z]['uid']         = $myrow['uid'];
+					$intersection           = $items;
+				}
+				++$z;
+			}
+			$intersection = array_intersect($intersection, $items);
+		}
+	}
+
+	$i        = 0;
+	$item_arr = array();
+	foreach ($intersection as $value) {
+		$item_arr[$i] = $ret['' . findKeyValuePair($ret, 'itemid', $value, false) . ''];
+		++$i;
+	}
+
+	return $item_arr;
 }
 
 /**
@@ -554,31 +554,31 @@ 
  */
 function get_search_results($items = '')
 {
-    global $xoopsDB, $eh;
-    if ($items !== '') {
-        $z           = 0;
-        $ret         = array();
-        $split_items = explode(',', $items);
-        foreach ($split_items as $item) {
-            $sql         = 'SELECT i.itemid, i.title, i.uid, i.created, t.description FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items') . ' i, ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_text') . " t WHERE i.itemid=t.itemid AND i.itemid='$item'";
-            $result      = $xoopsDB->query($sql) or $eh->show('0013');
-            $num_results = $xoopsDB->getRowsNum($result);
-            while ($myrow = $xoopsDB->fetchArray($result)) {
-                $ret[$z]['itemid']      = $myrow['itemid'];
-                $ret[$z]['image']       = 'images/home.gif';
-                $ret[$z]['link']        = 'listing.php?item=' . $myrow['itemid'] . '';
-                $ret[$z]['title']       = $myrow['title'];
-                $ret[$z]['description'] = $myrow['description'];
-                $ret[$z]['time']        = $myrow['created'];
-                $ret[$z]['uid']         = $myrow['uid'];
-                ++$z;
-            }
-        }
-
-        return $ret;
-    } else {
-        return false;
-    }
+	global $xoopsDB, $eh;
+	if ($items !== '') {
+		$z           = 0;
+		$ret         = array();
+		$split_items = explode(',', $items);
+		foreach ($split_items as $item) {
+			$sql         = 'SELECT i.itemid, i.title, i.uid, i.created, t.description FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items') . ' i, ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_text') . " t WHERE i.itemid=t.itemid AND i.itemid='$item'";
+			$result      = $xoopsDB->query($sql) or $eh->show('0013');
+			$num_results = $xoopsDB->getRowsNum($result);
+			while ($myrow = $xoopsDB->fetchArray($result)) {
+				$ret[$z]['itemid']      = $myrow['itemid'];
+				$ret[$z]['image']       = 'images/home.gif';
+				$ret[$z]['link']        = 'listing.php?item=' . $myrow['itemid'] . '';
+				$ret[$z]['title']       = $myrow['title'];
+				$ret[$z]['description'] = $myrow['description'];
+				$ret[$z]['time']        = $myrow['created'];
+				$ret[$z]['uid']         = $myrow['uid'];
+				++$z;
+			}
+		}
+
+		return $ret;
+	} else {
+		return false;
+	}
 }
 
 /**
@@ -588,24 +588,24 @@ 
  */
 function getNumberOfResults($searchnum = 0, $limit = 10)
 {
-    global $xoopsDB, $eh;
-    $block       = array();
-    $sql         = 'SELECT MAX(page), items FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_searchresults') . " WHERE searchnum = '" . $searchnum . '\' GROUP BY page';
-    $result      = $xoopsDB->query($sql) or $eh->show('0013');
-    $num_results = $xoopsDB->getRowsNum($result);
-    if (!$result) {
-        return 0;
-    }
-    for ($i = 0; $i < $num_results; ++$i) {
-        $row   = $GLOBALS['xoopsDB']->fetchBoth($result);
-        $page  = $row['MAX(page)'];
-        $items = $row['items'];
-    }
-
-    $count_lastpage = substr_count($items, ',') + 1;
-    $count          = ($page * $limit) - ($limit - $count_lastpage);
-
-    return $count;
+	global $xoopsDB, $eh;
+	$block       = array();
+	$sql         = 'SELECT MAX(page), items FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_searchresults') . " WHERE searchnum = '" . $searchnum . '\' GROUP BY page';
+	$result      = $xoopsDB->query($sql) or $eh->show('0013');
+	$num_results = $xoopsDB->getRowsNum($result);
+	if (!$result) {
+		return 0;
+	}
+	for ($i = 0; $i < $num_results; ++$i) {
+		$row   = $GLOBALS['xoopsDB']->fetchBoth($result);
+		$page  = $row['MAX(page)'];
+		$items = $row['items'];
+	}
+
+	$count_lastpage = substr_count($items, ',') + 1;
+	$count          = ($page * $limit) - ($limit - $count_lastpage);
+
+	return $count;
 }
 
 /**
@@ -618,30 +618,30 @@ 
  */
 function mod_search_count($queryarray, $andor, $limit, $offset = 0, $filter_arr)
 {
-    global $xoopsDB, $eh;
-    $count = 0;
-
-    $sql = 'SELECT COUNT(DISTINCT i.itemid) FROM '
-           . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_data')
-           . ' d, '
-           . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items')
-           . ' i LEFT JOIN '
-           . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_text')
-           . " t ON (i.itemid=t.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
-    // because count() returns 1 even if a supplied variable
-    // is not an array, we must check if $queryarray is really an array
-    if (is_array($queryarray) && $count = count($queryarray)) {
-        $sql .= " AND ((d.value LIKE '%$queryarray[0]%' OR i.title LIKE '%$queryarray[0]%' OR t.description LIKE '%$queryarray[0]%')";
-        for ($i = 1; $i < $count; ++$i) {
-            $sql .= " $andor ";
-            $sql .= "(d.value LIKE '%$queryarray[$i]%' OR i.title LIKE '%$queryarray[$i]%' OR t.description LIKE '%$queryarray[$i]%')";
-        }
-        $sql .= ') ';
-    }
-    $result = $xoopsDB->query($sql) or $eh->show('0013');
-    list($count) = $xoopsDB->fetchRow($result);
-
-    return $count;
+	global $xoopsDB, $eh;
+	$count = 0;
+
+	$sql = 'SELECT COUNT(DISTINCT i.itemid) FROM '
+		   . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_data')
+		   . ' d, '
+		   . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items')
+		   . ' i LEFT JOIN '
+		   . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_text')
+		   . " t ON (i.itemid=t.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
+	// because count() returns 1 even if a supplied variable
+	// is not an array, we must check if $queryarray is really an array
+	if (is_array($queryarray) && $count = count($queryarray)) {
+		$sql .= " AND ((d.value LIKE '%$queryarray[0]%' OR i.title LIKE '%$queryarray[0]%' OR t.description LIKE '%$queryarray[0]%')";
+		for ($i = 1; $i < $count; ++$i) {
+			$sql .= " $andor ";
+			$sql .= "(d.value LIKE '%$queryarray[$i]%' OR i.title LIKE '%$queryarray[$i]%' OR t.description LIKE '%$queryarray[$i]%')";
+		}
+		$sql .= ') ';
+	}
+	$result = $xoopsDB->query($sql) or $eh->show('0013');
+	list($count) = $xoopsDB->fetchRow($result);
+
+	return $count;
 }
 
 /**
@@ -650,19 +650,19 @@ 
  */
 function getPostedValue_text($dtypeid = 0)
 {
-    global $_POST;
-    $postedvalues = array();
-    if (isset($_POST["$dtypeid"])) {
-        if (isset($_POST['' . $dtypeid . 'constr'])) {
-            $constrvalue = $_POST['' . $dtypeid . 'constr'];
-        } else {
-            $constrvalue = '';
-        }
-        $postvalue    = $_POST["$dtypeid"];
-        $postedvalues = array('dtypeid' => $dtypeid, 'constr' => $constrvalue, 'postvalue' => $postvalue, 'selectfields' => 0, 'addressfields' => 0);
-    }
-
-    return $postedvalues;
+	global $_POST;
+	$postedvalues = array();
+	if (isset($_POST["$dtypeid"])) {
+		if (isset($_POST['' . $dtypeid . 'constr'])) {
+			$constrvalue = $_POST['' . $dtypeid . 'constr'];
+		} else {
+			$constrvalue = '';
+		}
+		$postvalue    = $_POST["$dtypeid"];
+		$postedvalues = array('dtypeid' => $dtypeid, 'constr' => $constrvalue, 'postvalue' => $postvalue, 'selectfields' => 0, 'addressfields' => 0);
+	}
+
+	return $postedvalues;
 }
 
 /**
@@ -671,19 +671,19 @@ 
  */
 function getPostedValue_address($dtypeid = 0)
 {
-    global $_POST;
-    $addressfields = getAddressFields('0');
-    $postedvalues  = array();
-    foreach ($addressfields['addressfields'] as $field => $fieldvalue) {
-        if (isset($_POST["$dtypeid$field"])) {
-            $addressfield = $_POST["$dtypeid$field"];
-            if ($addressfield !== '') {
-                $postedvalues[] = array('field' => $field, 'postvalue' => $addressfield);
-            }
-        }
-    }
-
-    return $postedvalues;
+	global $_POST;
+	$addressfields = getAddressFields('0');
+	$postedvalues  = array();
+	foreach ($addressfields['addressfields'] as $field => $fieldvalue) {
+		if (isset($_POST["$dtypeid$field"])) {
+			$addressfield = $_POST["$dtypeid$field"];
+			if ($addressfield !== '') {
+				$postedvalues[] = array('field' => $field, 'postvalue' => $addressfield);
+			}
+		}
+	}
+
+	return $postedvalues;
 }
 
 /**
@@ -692,22 +692,22 @@ 
  */
 function getPostedValue_array($dtypeid = 0)
 {
-    global $_POST;
-    $postvalues_arr = array();
-    if (isset($_POST["$dtypeid"])) {
-        if (isset($_POST['' . $dtypeid . 'constr'])) {
-            $constrvalue = $_POST['' . $dtypeid . 'constr'];
-        } else {
-            $constrvalue = '';
-        }
-        $postvalue    = $_POST["$dtypeid"];
-        $postedvalues = array('dtypeid' => $dtypeid, 'constr' => $constrvalue, 'postvalue' => $postvalue, 'selectfields' => 0, 'addressfields' => 0);
-    }
-
-    //print_r($postedvalues);
-    return $postedvalues;
-
-    /* if ( isset($_POST["$dtypeid"]) ) {
+	global $_POST;
+	$postvalues_arr = array();
+	if (isset($_POST["$dtypeid"])) {
+		if (isset($_POST['' . $dtypeid . 'constr'])) {
+			$constrvalue = $_POST['' . $dtypeid . 'constr'];
+		} else {
+			$constrvalue = '';
+		}
+		$postvalue    = $_POST["$dtypeid"];
+		$postedvalues = array('dtypeid' => $dtypeid, 'constr' => $constrvalue, 'postvalue' => $postvalue, 'selectfields' => 0, 'addressfields' => 0);
+	}
+
+	//print_r($postedvalues);
+	return $postedvalues;
+
+	/* if ( isset($_POST["$dtypeid"]) ) {
     $postvalues_arr[] = $_POST["$dtypeid"];
     } else {
     $postvalues_arr[] = "";
@@ -728,23 +728,23 @@ 
  */
 function findKeyValuePair($multiArray, $keyName, $value, $strict = false)
 {
-    /* Doing this test here makes for a bit of redundant code, but
+	/* Doing this test here makes for a bit of redundant code, but
     * improves the speed greatly, as it is not being preformed on every
     * iteration of the loop.
     */
-    if (!$strict) {
-        foreach ($multiArray as $multiArrayKey => $childArray) {
-            if (array_key_exists($keyName, $childArray) && $childArray[$keyName] == $value) {
-                return $multiArrayKey;
-            }
-        }
-    } else {
-        foreach ($multiArray as $multiArrayKey => $childArray) {
-            if (array_key_exists($keyName, $childArray) && $childArray[$keyName] === $value) {
-                return $multiArrayKey;
-            }
-        }
-    }
-
-    return false;
+	if (!$strict) {
+		foreach ($multiArray as $multiArrayKey => $childArray) {
+			if (array_key_exists($keyName, $childArray) && $childArray[$keyName] == $value) {
+				return $multiArrayKey;
+			}
+		}
+	} else {
+		foreach ($multiArray as $multiArrayKey => $childArray) {
+			if (array_key_exists($keyName, $childArray) && $childArray[$keyName] === $value) {
+				return $multiArrayKey;
+			}
+		}
+	}
+
+	return false;
 }

Spacing +120 added lines, -120 removed lines

@@ -18,16 +18,16 @@ 
  * @author       XOOPS Development Team,
  */
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 //Include XOOPS classes
-require_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
-require_once XOOPS_ROOT_PATH . '/class/module.errorhandler.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopstree.php';
+require_once XOOPS_ROOT_PATH.'/class/module.errorhandler.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 //Include module classes
-require_once __DIR__ . '/class/class.formimage.php';
-require_once __DIR__ . '/class/class.image.php';
-require_once __DIR__ . '/class/class.efqtree.php';
-require_once __DIR__ . '/class/class.datafieldmanager.php';
+require_once __DIR__.'/class/class.formimage.php';
+require_once __DIR__.'/class/class.image.php';
+require_once __DIR__.'/class/class.efqtree.php';
+require_once __DIR__.'/class/class.datafieldmanager.php';
 
 $myts             = MyTextSanitizer::getInstance();
 $eh               = new ErrorHandler;
@@ -36,14 +36,14 @@ 
 $moddir = $xoopsModule->getVar('dirname');
 
 if (isset($_GET['catid'])) {
-    $get_cid = (int)$_GET['cid'];
+    $get_cid = (int) $_GET['cid'];
 } else {
     $get_cid = '1';
 }
 if (isset($_GET['dirid'])) {
-    $get_dirid = (int)$_GET['dirid'];
+    $get_dirid = (int) $_GET['dirid'];
 } elseif (isset($_POST['dirid'])) {
-    $get_dirid = (int)$_POST['dirid'];
+    $get_dirid = (int) $_POST['dirid'];
 }
 if (isset($_GET['orderby'])) {
     $orderby = convertOrderByIn($_GET['orderby']);
@@ -51,26 +51,26 @@ 
     $orderby = 'title ASC';
 }
 if (isset($_GET['page'])) {
-    $get_page = (int)$_GET['page'];
+    $get_page = (int) $_GET['page'];
 } else {
     $get_page = 1;
 }
 
 $GLOBALS['xoopsOption']['template_main'] = 'efqdiralpha1_search.tpl';
-include XOOPS_ROOT_PATH . '/header.php';
+include XOOPS_ROOT_PATH.'/header.php';
 $xoopsTpl->assign('xoops_module_header', $xoops_module_header);
 //The advanced search is within a directory
 //First get an array of all datatypes within a directory that has listings linked to them
 if (isset($_POST['submit'])) {
-    $sql         = 'SELECT DISTINCT dt.dtypeid, dt.title, dt.options, ft.fieldtype FROM '
-                   . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_fieldtypes')
+    $sql = 'SELECT DISTINCT dt.dtypeid, dt.title, dt.options, ft.fieldtype FROM '
+                   . $xoopsDB->prefix($module->getVar('dirname', 'n').'_fieldtypes')
                    . ' ft, '
-                   . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_dtypes')
+                   . $xoopsDB->prefix($module->getVar('dirname', 'n').'_dtypes')
                    . ' dt, '
                    . $xoopsDB->prefix($module->getVar('dirname', 'n')
                                       . '_dtypes_x_cat')
                    . ' dxc, '
-                   . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_cat')
+                   . $xoopsDB->prefix($module->getVar('dirname', 'n').'_cat')
                    . " c WHERE c.cid=dxc.cid AND dt.dtypeid=dxc.dtypeid AND dt.fieldtypeid=ft.typeid AND c.dirid='$get_dirid' AND dt.activeyn='1'";
     $result      = $xoopsDB->query($sql) or $eh->show('0013');
     $num_results = $xoopsDB->getRowsNum($result);
@@ -178,43 +178,43 @@ 
     $pages_text = sprintf(_MD_LISTINGS_FOUND_ADV, $count_results);
 
     if ($count_pages >= 2) {
-        $searchnum  = uniqid(mt_rand(), 1);
-        $pages_text .= '' . _MD_PAGES . '<a href="advancedsearch.php?ref=' . $searchnum . '&page=1&dirid=' . $get_dirid . '">1</a>';
+        $searchnum = uniqid(mt_rand(), 1);
+        $pages_text .= ''._MD_PAGES.'<a href="advancedsearch.php?ref='.$searchnum.'&page=1&dirid='.$get_dirid.'">1</a>';
     }
     for ($i = 1; $i < $count_pages; ++$i) {
-        $page       = $i + 1;
-        $pages_text .= ' - <a href="advancedsearch.php?ref=' . $searchnum . '&page=' . $page . '&dirid=' . $get_dirid . '">' . $page . '</a>';
+        $page = $i + 1;
+        $pages_text .= ' - <a href="advancedsearch.php?ref='.$searchnum.'&page='.$page.'&dirid='.$get_dirid.'">'.$page.'</a>';
     }
     $pages_text     .= sprintf(_MD_NEW_SEARCH_ADV, $get_dirid);
-    $pages_top_text = sprintf(_MD_PAGE_OF_PAGES, $get_page, $count_pages) . '<br><br>';
+    $pages_top_text = sprintf(_MD_PAGE_OF_PAGES, $get_page, $count_pages).'<br><br>';
 
     ob_start();
-    echo '<div class="itemTitleLarge">' . _MD_SEARCHRESULTS_TITLE . '</div><br>';
+    echo '<div class="itemTitleLarge">'._MD_SEARCHRESULTS_TITLE.'</div><br>';
     echo $pages_top_text;
     if ($searchresults == 0) {
-        echo '<div class="itemTitle">' . _MD_NORESULTS . '</div>';
+        echo '<div class="itemTitle">'._MD_NORESULTS.'</div>';
     } else {
         $y    = 0;
         $page = 1;
         foreach ($searchresults as $result) {
             if ($y < $limit && $page == 1) {
-                echo '<div class="itemTitle"><a href="' . $result['link'] . '">' . $result['title'] . '</a></div><div class="itemText">' . $result['description'] . '</div><hr>';
+                echo '<div class="itemTitle"><a href="'.$result['link'].'">'.$result['title'].'</a></div><div class="itemText">'.$result['description'].'</div><hr>';
                 if ($y < $limit && $y > 0) {
-                    $items_arr_text .= ',' . $result['itemid'] . '';
+                    $items_arr_text .= ','.$result['itemid'].'';
                 } else {
                     $items_arr_text = $result['itemid'];
                 }
                 ++$y;
             } elseif ($y < $limit && $y > 0) {
-                $items_arr_text .= ',' . $result['itemid'] . '';
+                $items_arr_text .= ','.$result['itemid'].'';
                 ++$y;
             } elseif ($y < $limit && $y == 0) {
                 $items_arr_text = $result['itemid'];
                 ++$y;
             } elseif ($y == $limit) {
                 //Save $items_arr_text and $page into DB
-                $newid = $xoopsDB->genId($xoopsDB->prefix($module->getVar('dirname', 'n') . '_searchresults') . '_searchid_seq');
-                $sql   = sprintf("INSERT INTO %s (searchid, searchnum, created, PAGE, items, dirid, catid) VALUES (%u, '%s', '%s', %u, '%s', %u, %u)", $xoopsDB->prefix($module->getVar('dirname', 'n') . '_searchresults'), $newid, $searchnum, time(), $page, $items_arr_text, $get_dirid, $get_cid);
+                $newid = $xoopsDB->genId($xoopsDB->prefix($module->getVar('dirname', 'n').'_searchresults').'_searchid_seq');
+                $sql   = sprintf("INSERT INTO %s (searchid, searchnum, created, PAGE, items, dirid, catid) VALUES (%u, '%s', '%s', %u, '%s', %u, %u)", $xoopsDB->prefix($module->getVar('dirname', 'n').'_searchresults'), $newid, $searchnum, time(), $page, $items_arr_text, $get_dirid, $get_cid);
                 $xoopsDB->query($sql) or $eh->show('0013');
                 if ($newid == 0) {
                     $itemid = $xoopsDB->getInsertId();
@@ -225,8 +225,8 @@ 
             }
         }
         if ($y != 0 && $page > 1) {
-            $newid = $xoopsDB->genId($xoopsDB->prefix($module->getVar('dirname', 'n') . '_searchresults') . '_searchid_seq');
-            $sql   = sprintf("INSERT INTO %s (searchid, searchnum, created, PAGE, items, dirid, catid) VALUES (%u, '%s', '%s', %u, '%s', %u, %u)", $xoopsDB->prefix($module->getVar('dirname', 'n') . '_searchresults'), $newid, $searchnum, time(), $page, $items_arr_text, $get_dirid, $get_cid);
+            $newid = $xoopsDB->genId($xoopsDB->prefix($module->getVar('dirname', 'n').'_searchresults').'_searchid_seq');
+            $sql   = sprintf("INSERT INTO %s (searchid, searchnum, created, PAGE, items, dirid, catid) VALUES (%u, '%s', '%s', %u, '%s', %u, %u)", $xoopsDB->prefix($module->getVar('dirname', 'n').'_searchresults'), $newid, $searchnum, time(), $page, $items_arr_text, $get_dirid, $get_cid);
             $xoopsDB->query($sql) or $eh->show('0013');
             if ($newid == 0) {
                 $itemid = $xoopsDB->getInsertId();
@@ -240,10 +240,10 @@ 
     ob_end_clean();
 } elseif (isset($_GET['ref']) && isset($_GET['page'])) {
     $get_searchnum = $GLOBALS['xoopsDB']->escape($myts->stripSlashesGPC($_GET['ref']));
-    $get_page      = (int)$_GET['page'];
+    $get_page      = (int) $_GET['page'];
 
     //Query the saved results from the DB.
-    $sql = 'SELECT searchid, searchnum, created, page, items, dirid, catid FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_searchresults') . " WHERE searchnum='$get_searchnum' AND page='$get_page'";
+    $sql = 'SELECT searchid, searchnum, created, page, items, dirid, catid FROM '.$xoopsDB->prefix($module->getVar('dirname', 'n').'_searchresults')." WHERE searchnum='$get_searchnum' AND page='$get_page'";
 
     $result      = $xoopsDB->query($sql) or $eh->show('0013');
     $num_results = $xoopsDB->getRowsNum($result);
@@ -275,16 +275,16 @@ 
     ob_end_clean();
 
     ob_start();
-    printf(_MD_PAGE_OF_PAGES, $get_page, $count_pages) . '<br><br>';
+    printf(_MD_PAGE_OF_PAGES, $get_page, $count_pages).'<br><br>';
     $pages_top_text = ob_get_contents();
     ob_end_clean();
 
     if ($count_pages >= 2) {
-        $pages_text .= '' . _MD_PAGES . '<a href="advancedsearch.php?ref=' . $get_searchnum . '&page=1&dirid=' . $get_dirid . '">1</a>';
+        $pages_text .= ''._MD_PAGES.'<a href="advancedsearch.php?ref='.$get_searchnum.'&page=1&dirid='.$get_dirid.'">1</a>';
     }
     for ($i = 1; $i < $count_pages; ++$i) {
-        $page       = $i + 1;
-        $pages_text .= ' - <a href="advancedsearch.php?ref=' . $get_searchnum . '&page=' . $page . '&dirid=' . $get_dirid . '">' . $page . '</a><br>';
+        $page = $i + 1;
+        $pages_text .= ' - <a href="advancedsearch.php?ref='.$get_searchnum.'&page='.$page.'&dirid='.$get_dirid.'">'.$page.'</a><br>';
     }
     ob_start();
     printf(_MD_NEW_SEARCH_ADV, $get_dirid);
@@ -292,15 +292,15 @@ 
     ob_end_clean();
 
     ob_start();
-    echo '<div class="itemTitleLarge">' . _MD_SEARCHRESULTS_TITLE . '</div><br>';
+    echo '<div class="itemTitleLarge">'._MD_SEARCHRESULTS_TITLE.'</div><br>';
     echo $pages_top_text;
     if ($searchresults == 0) {
-        echo '<div class="itemTitle">' . _MD_NORESULTS . '</div>';
+        echo '<div class="itemTitle">'._MD_NORESULTS.'</div>';
     } else {
         $y    = 0;
         $page = 1;
         foreach ($searchresults as $result) {
-            echo '<div class="itemTitle"><a href="' . $result['link'] . '">' . $result['title'] . '</a></div><div class="itemText">' . $result['description'] . '</div><hr>';
+            echo '<div class="itemTitle"><a href="'.$result['link'].'">'.$result['title'].'</a></div><div class="itemText">'.$result['description'].'</div><hr>';
         }
     }
     echo $pages_text;
@@ -309,15 +309,15 @@ 
 } else {
     //No search was posted nor was a search page requested.
     //A search form is generated from the datatype fields in the chosen directory.
-    $sql         = 'SELECT DISTINCT dt.dtypeid, dt.title, dt.options, ft.fieldtype FROM '
-                   . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_fieldtypes')
+    $sql = 'SELECT DISTINCT dt.dtypeid, dt.title, dt.options, ft.fieldtype FROM '
+                   . $xoopsDB->prefix($module->getVar('dirname', 'n').'_fieldtypes')
                    . ' ft, '
-                   . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_dtypes')
+                   . $xoopsDB->prefix($module->getVar('dirname', 'n').'_dtypes')
                    . ' dt, '
                    . $xoopsDB->prefix($module->getVar('dirname', 'n')
                                       . '_dtypes_x_cat')
                    . ' dxc, '
-                   . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_cat')
+                   . $xoopsDB->prefix($module->getVar('dirname', 'n').'_cat')
                    . " c WHERE c.cid=dxc.cid AND dt.dtypeid=dxc.dtypeid AND dt.fieldtypeid=ft.typeid AND c.dirid='$get_dirid' AND dt.activeyn='1'";
     $result      = $xoopsDB->query($sql) or $eh->show('0013');
     $num_results = $xoopsDB->getRowsNum($result);
@@ -337,7 +337,7 @@ 
     $xoopsTpl->assign('search_page', ob_get_contents());
     ob_end_clean();
 }
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';
 
 /**
  * @param $queryarray
@@ -353,30 +353,30 @@ 
     // because count() returns 1 even if a supplied variable
     // is not an array, we must check if $queryarray is really an array
     $n            = 0;
-    ${'sql' . $n} = '';
+    ${'sql'.$n} = '';
     $items        = '';
     if (is_array($queryarray) && count($queryarray) >= 1) {
         $count        = count($queryarray);
-        ${'sql' . $n} = 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
-                        . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_data')
+        ${'sql'.$n} = 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
+                        . $xoopsDB->prefix($module->getVar('dirname', 'n').'_data')
                         . ' d RIGHT JOIN '
-                        . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items')
+                        . $xoopsDB->prefix($module->getVar('dirname', 'n').'_items')
                         . ' i ON (d.itemid=i.itemid) LEFT JOIN '
-                        . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_text')
+                        . $xoopsDB->prefix($module->getVar('dirname', 'n').'_item_text')
                         . " t ON (t.itemid=i.itemid) WHERE i.status='2'";
-        ${'sql' . $n} .= " AND ((d.value LIKE '%$queryarray[0]%' OR i.title LIKE '%$queryarray[0]%' OR t.description LIKE '%$queryarray[0]%')";
+        ${'sql'.$n} .= " AND ((d.value LIKE '%$queryarray[0]%' OR i.title LIKE '%$queryarray[0]%' OR t.description LIKE '%$queryarray[0]%')";
         for ($i = 1; $i < $count; ++$i) {
-            ${'sql' . $n} .= " $andor ";
-            ${'sql' . $n} .= "(d.value LIKE '%$queryarray[$i]%' OR i.title LIKE '%$queryarray[$i]%' OR t.description LIKE '%$queryarray[$i]%')";
+            ${'sql'.$n} .= " $andor ";
+            ${'sql'.$n} .= "(d.value LIKE '%$queryarray[$i]%' OR i.title LIKE '%$queryarray[$i]%' OR t.description LIKE '%$queryarray[$i]%')";
         }
-        ${'sql' . $n} .= ') ';
-        ${'sql' . $n} .= ' ORDER BY i.created DESC';
+        ${'sql'.$n} .= ') ';
+        ${'sql'.$n} .= ' ORDER BY i.created DESC';
         ++$n;
     }
 
     $andor = ' AND';
     foreach ($filter_arr as $filter) {
-        ${'sql' . $n}  = '';
+        ${'sql'.$n}  = '';
         $dtypeid       = $filter['dtypeid'];
         $constr        = $filter['constr'];
         $postvalue     = $filter['postvalue'];
@@ -384,25 +384,25 @@ 
         $addressfields = $filter['addressfields'];
         if (is_array($selectfields)) {
             if (count($selectfields) >= 1) {
-                ${'sql' . $n}       .= 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
-                                       . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_data')
+                ${'sql'.$n} .= 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
+                                       . $xoopsDB->prefix($module->getVar('dirname', 'n').'_data')
                                        . ' d, '
-                                       . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items')
+                                       . $xoopsDB->prefix($module->getVar('dirname', 'n').'_items')
                                        . ' i LEFT JOIN '
-                                       . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_text')
+                                       . $xoopsDB->prefix($module->getVar('dirname', 'n').'_item_text')
                                        . " t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
                 $select             = '';
-                ${'sql' . $n}       .= ' ' . $andor . " (d.dtypeid = $dtypeid AND d.value IN (";
+                ${'sql'.$n} .= ' '.$andor." (d.dtypeid = $dtypeid AND d.value IN (";
                 $count_selectfields = count($selectfields);
                 $i                  = 1;
                 foreach ($selectfields as $selectfield) {
-                    ${'sql' . $n} .= '\'' . $selectfield . '\'';
+                    ${'sql'.$n} .= '\''.$selectfield.'\'';
                     if ($i != $count_selectfields) {
-                        ${'sql' . $n} .= ', ';
+                        ${'sql'.$n} .= ', ';
                     }
                     ++$i;
                 }
-                ${'sql' . $n} .= '))';
+                ${'sql'.$n} .= '))';
                 ++$n;
                 $postvalue = '';
             }
@@ -411,96 +411,96 @@ 
         }
 
         if ($postvalue !== '') {
-            ${'sql' . $n} = '';
+            ${'sql'.$n} = '';
             //$zero_allowed = '1';
             switch ($constr) {
                 case 'equal':
-                    ${'sql' . $n} .= 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_data')
+                    ${'sql'.$n} .= 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
+                                     . $xoopsDB->prefix($module->getVar('dirname', 'n').'_data')
                                      . ' d, '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items')
+                                     . $xoopsDB->prefix($module->getVar('dirname', 'n').'_items')
                                      . ' i LEFT JOIN '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_text')
+                                     . $xoopsDB->prefix($module->getVar('dirname', 'n').'_item_text')
                                      . " t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
-                    $constraint   = " = '" . $postvalue . '\'';
+                    $constraint = " = '".$postvalue.'\'';
                     break;
                 case 'notequal':
-                    ${'sql' . $n} .= 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_data')
+                    ${'sql'.$n} .= 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
+                                     . $xoopsDB->prefix($module->getVar('dirname', 'n').'_data')
                                      . ' d, '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items')
+                                     . $xoopsDB->prefix($module->getVar('dirname', 'n').'_items')
                                      . ' i LEFT JOIN '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_text')
+                                     . $xoopsDB->prefix($module->getVar('dirname', 'n').'_item_text')
                                      . " t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
-                    $constraint   = " <> '" . $postvalue . '\'';
+                    $constraint = " <> '".$postvalue.'\'';
                     break;
                 case 'contains':
-                    ${'sql' . $n} .= 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_data')
+                    ${'sql'.$n} .= 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
+                                     . $xoopsDB->prefix($module->getVar('dirname', 'n').'_data')
                                      . ' d, '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items')
+                                     . $xoopsDB->prefix($module->getVar('dirname', 'n').'_items')
                                      . ' i LEFT JOIN '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_text')
+                                     . $xoopsDB->prefix($module->getVar('dirname', 'n').'_item_text')
                                      . " t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
-                    $constraint   = " LIKE '%" . $postvalue . "%'";
+                    $constraint = " LIKE '%".$postvalue."%'";
                     break;
                 case 'notcontain':
-                    ${'sql' . $n} .= 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_data')
+                    ${'sql'.$n} .= 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
+                                     . $xoopsDB->prefix($module->getVar('dirname', 'n').'_data')
                                      . ' d, '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items')
+                                     . $xoopsDB->prefix($module->getVar('dirname', 'n').'_items')
                                      . ' i LEFT JOIN '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_text')
+                                     . $xoopsDB->prefix($module->getVar('dirname', 'n').'_item_text')
                                      . " t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
-                    $constraint   = " NOT LIKE '%" . $postvalue . "%'";
+                    $constraint = " NOT LIKE '%".$postvalue."%'";
                     break;
                 case 'begins':
-                    ${'sql' . $n} .= 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_data')
+                    ${'sql'.$n} .= 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
+                                     . $xoopsDB->prefix($module->getVar('dirname', 'n').'_data')
                                      . ' d, '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items')
+                                     . $xoopsDB->prefix($module->getVar('dirname', 'n').'_items')
                                      . ' i LEFT JOIN '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_text')
+                                     . $xoopsDB->prefix($module->getVar('dirname', 'n').'_item_text')
                                      . " t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
-                    $constraint   = " LIKE '" . $postvalue . "%'";
+                    $constraint = " LIKE '".$postvalue."%'";
                     break;
                 case 'ends':
-                    ${'sql' . $n} .= 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_data')
+                    ${'sql'.$n} .= 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
+                                     . $xoopsDB->prefix($module->getVar('dirname', 'n').'_data')
                                      . ' d, '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items')
+                                     . $xoopsDB->prefix($module->getVar('dirname', 'n').'_items')
                                      . ' i LEFT JOIN '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_text')
+                                     . $xoopsDB->prefix($module->getVar('dirname', 'n').'_item_text')
                                      . " t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
-                    $constraint   = " LIKE '%" . $postvalue . '\'';
+                    $constraint = " LIKE '%".$postvalue.'\'';
                     break;
                 case 'bigger':
-                    ${'sql' . $n} .= 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_data')
+                    ${'sql'.$n} .= 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
+                                     . $xoopsDB->prefix($module->getVar('dirname', 'n').'_data')
                                      . ' d, '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items')
+                                     . $xoopsDB->prefix($module->getVar('dirname', 'n').'_items')
                                      . ' i LEFT JOIN '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_text')
+                                     . $xoopsDB->prefix($module->getVar('dirname', 'n').'_item_text')
                                      . " t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
-                    $constraint   = ' > ' . (int)$postvalue . '';
+                    $constraint = ' > '.(int) $postvalue.'';
                     break;
                 case 'smaller':
-                    ${'sql' . $n} .= 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_data')
+                    ${'sql'.$n} .= 'SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM '
+                                     . $xoopsDB->prefix($module->getVar('dirname', 'n').'_data')
                                      . ' d, '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items')
+                                     . $xoopsDB->prefix($module->getVar('dirname', 'n').'_items')
                                      . ' i LEFT JOIN '
-                                     . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_text')
+                                     . $xoopsDB->prefix($module->getVar('dirname', 'n').'_item_text')
                                      . " t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
-                    $constraint   = ' < ' . (int)$postvalue . '';
+                    $constraint = ' < '.(int) $postvalue.'';
                     break;
                 default:
                     break;
             }
             if ($postvalue != '0') {
-                ${'sql' . $n} .= $andor . ' (d.dtypeid = ' . $dtypeid . ' AND d.value ' . $constraint . ')';
+                ${'sql'.$n} .= $andor.' (d.dtypeid = '.$dtypeid.' AND d.value '.$constraint.')';
             }
-            ${'sql' . $n} .= ' ORDER BY i.created DESC';
+            ${'sql'.$n} .= ' ORDER BY i.created DESC';
             ++$n;
         }
     }
@@ -512,7 +512,7 @@ 
     $items        = array();
     $intersection = array();
     for ($i = 0; $i < $n; ++$i) {
-        $result      = $xoopsDB->query(${'sql' . $i}) or $eh->show('0013');
+        $result      = $xoopsDB->query(${'sql'.$i}) or $eh->show('0013');
         $num_results = $xoopsDB->getRowsNum($result);
 
         if (!$result) {
@@ -525,7 +525,7 @@ 
                 if ($i == 0) {
                     $ret[$z]['itemid']      = $myrow['itemid'];
                     $ret[$z]['image']       = 'images/home.gif';
-                    $ret[$z]['link']        = 'listing.php?item=' . $myrow['itemid'] . '';
+                    $ret[$z]['link']        = 'listing.php?item='.$myrow['itemid'].'';
                     $ret[$z]['title']       = $myrow['title'];
                     $ret[$z]['description'] = $myrow['description'];
                     $ret[$z]['time']        = $myrow['created'];
@@ -541,7 +541,7 @@ 
     $i        = 0;
     $item_arr = array();
     foreach ($intersection as $value) {
-        $item_arr[$i] = $ret['' . findKeyValuePair($ret, 'itemid', $value, false) . ''];
+        $item_arr[$i] = $ret[''.findKeyValuePair($ret, 'itemid', $value, false).''];
         ++$i;
     }
 
@@ -560,13 +560,13 @@ 
         $ret         = array();
         $split_items = explode(',', $items);
         foreach ($split_items as $item) {
-            $sql         = 'SELECT i.itemid, i.title, i.uid, i.created, t.description FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items') . ' i, ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_text') . " t WHERE i.itemid=t.itemid AND i.itemid='$item'";
+            $sql         = 'SELECT i.itemid, i.title, i.uid, i.created, t.description FROM '.$xoopsDB->prefix($module->getVar('dirname', 'n').'_items').' i, '.$xoopsDB->prefix($module->getVar('dirname', 'n').'_item_text')." t WHERE i.itemid=t.itemid AND i.itemid='$item'";
             $result      = $xoopsDB->query($sql) or $eh->show('0013');
             $num_results = $xoopsDB->getRowsNum($result);
             while ($myrow = $xoopsDB->fetchArray($result)) {
                 $ret[$z]['itemid']      = $myrow['itemid'];
                 $ret[$z]['image']       = 'images/home.gif';
-                $ret[$z]['link']        = 'listing.php?item=' . $myrow['itemid'] . '';
+                $ret[$z]['link']        = 'listing.php?item='.$myrow['itemid'].'';
                 $ret[$z]['title']       = $myrow['title'];
                 $ret[$z]['description'] = $myrow['description'];
                 $ret[$z]['time']        = $myrow['created'];
@@ -590,7 +590,7 @@ 
 {
     global $xoopsDB, $eh;
     $block       = array();
-    $sql         = 'SELECT MAX(page), items FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_searchresults') . " WHERE searchnum = '" . $searchnum . '\' GROUP BY page';
+    $sql         = 'SELECT MAX(page), items FROM '.$xoopsDB->prefix($module->getVar('dirname', 'n').'_searchresults')." WHERE searchnum = '".$searchnum.'\' GROUP BY page';
     $result      = $xoopsDB->query($sql) or $eh->show('0013');
     $num_results = $xoopsDB->getRowsNum($result);
     if (!$result) {
@@ -622,11 +622,11 @@ 
     $count = 0;
 
     $sql = 'SELECT COUNT(DISTINCT i.itemid) FROM '
-           . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_data')
+           . $xoopsDB->prefix($module->getVar('dirname', 'n').'_data')
            . ' d, '
-           . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items')
+           . $xoopsDB->prefix($module->getVar('dirname', 'n').'_items')
            . ' i LEFT JOIN '
-           . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_text')
+           . $xoopsDB->prefix($module->getVar('dirname', 'n').'_item_text')
            . " t ON (i.itemid=t.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
     // because count() returns 1 even if a supplied variable
     // is not an array, we must check if $queryarray is really an array
@@ -653,8 +653,8 @@ 
     global $_POST;
     $postedvalues = array();
     if (isset($_POST["$dtypeid"])) {
-        if (isset($_POST['' . $dtypeid . 'constr'])) {
-            $constrvalue = $_POST['' . $dtypeid . 'constr'];
+        if (isset($_POST[''.$dtypeid.'constr'])) {
+            $constrvalue = $_POST[''.$dtypeid.'constr'];
         } else {
             $constrvalue = '';
         }
@@ -695,8 +695,8 @@ 
     global $_POST;
     $postvalues_arr = array();
     if (isset($_POST["$dtypeid"])) {
-        if (isset($_POST['' . $dtypeid . 'constr'])) {
-            $constrvalue = $_POST['' . $dtypeid . 'constr'];
+        if (isset($_POST[''.$dtypeid.'constr'])) {
+            $constrvalue = $_POST[''.$dtypeid.'constr'];
         } else {
             $constrvalue = '';
         }

printcoupon.php

Indentation +10 added lines, -10 removed lines

@@ -23,7 +23,7 @@ 
 $moduleDirName = basename(__DIR__);
 $coupid    = isset($_GET['coupid']) ? (int)$_GET['coupid'] : 0;
 if (!($coupid > 0)) {
-    redirect_header('index.php');
+	redirect_header('index.php');
 }
 
 /**
@@ -31,15 +31,15 @@ 
  */
 function PrintPage($coupid)
 {
-    global $xoopsModule, $xoopsTpl, $xoopsModuleConfig, $moduleDirName;
-    $couponHandler = xoops_getModuleHandler('coupon', $moduleDirName);
-    $couponHandler->increment($coupid);
-    $coupon     = $couponHandler->getLinkedCoupon($coupid);
-    $coupon_arr = $couponHandler->prepare2show($coupon);
-    //$xoopsTpl->assign('coupon_footer', $xoopsModuleConfig['coupon_footer']);
-    $xoopsTpl->assign('coupon', $coupon_arr['items']['coupons'][0]);
-    $xoopsTpl->template_dir = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->dirname();
-    $xoopsTpl->display('db:efqdiralpha1_print_savings.tpl');
+	global $xoopsModule, $xoopsTpl, $xoopsModuleConfig, $moduleDirName;
+	$couponHandler = xoops_getModuleHandler('coupon', $moduleDirName);
+	$couponHandler->increment($coupid);
+	$coupon     = $couponHandler->getLinkedCoupon($coupid);
+	$coupon_arr = $couponHandler->prepare2show($coupon);
+	//$xoopsTpl->assign('coupon_footer', $xoopsModuleConfig['coupon_footer']);
+	$xoopsTpl->assign('coupon', $coupon_arr['items']['coupons'][0]);
+	$xoopsTpl->template_dir = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->dirname();
+	$xoopsTpl->display('db:efqdiralpha1_print_savings.tpl');
 }
 
 //Smarty directory autodetect

Spacing +4 added lines, -4 removed lines

@@ -18,10 +18,10 @@ 
  * @author       XOOPS Development Team,
  */
 
-include __DIR__ . '/../../mainfile.php';
-include XOOPS_ROOT_PATH . '/header.php';
+include __DIR__.'/../../mainfile.php';
+include XOOPS_ROOT_PATH.'/header.php';
 $moduleDirName = basename(__DIR__);
-$coupid    = isset($_GET['coupid']) ? (int)$_GET['coupid'] : 0;
+$coupid = isset($_GET['coupid']) ? (int) $_GET['coupid'] : 0;
 if (!($coupid > 0)) {
     redirect_header('index.php');
 }
@@ -38,7 +38,7 @@ 
     $coupon_arr = $couponHandler->prepare2show($coupon);
     //$xoopsTpl->assign('coupon_footer', $xoopsModuleConfig['coupon_footer']);
     $xoopsTpl->assign('coupon', $coupon_arr['items']['coupons'][0]);
-    $xoopsTpl->template_dir = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->dirname();
+    $xoopsTpl->template_dir = XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->dirname();
     $xoopsTpl->display('db:efqdiralpha1_print_savings.tpl');
 }
 

ipn/ipn_error.php

Indentation +3 added lines, -3 removed lines

@@ -16,8 +16,8 @@
 // called directly
 
 if (isset($paypal['business'])) {
-    //log error to file or database
-    echo 'some kind of error occurred.';
+	//log error to file or database
+	echo 'some kind of error occurred.';
 } else {
-    die('This page is not directly accessible');
+	die('This page is not directly accessible');
 }

ipn/ipn.php

Indentation +17 added lines, -17 removed lines

@@ -24,36 +24,36 @@
 //decide which post method to use
 switch ($paypal['post_method']) {
 
-    case 'libCurl': //php compiled with libCurl support
+	case 'libCurl': //php compiled with libCurl support
 
-        $result = libCurlPost($paypal['url'], $_POST);
+		$result = libCurlPost($paypal['url'], $_POST);
 
-        break;
+		break;
 
-    case 'curl': //cURL via command line
+	case 'curl': //cURL via command line
 
-        $result = curlPost($paypal['url'], $_POST);
-        //print_r($result);
-        break;
+		$result = curlPost($paypal['url'], $_POST);
+		//print_r($result);
+		break;
 
-    case 'fso': //php fsockopen();
+	case 'fso': //php fsockopen();
 
-        $result = fsockPost($paypal['url'], $_POST);
-        //print_r($result);
-        break;
+		$result = fsockPost($paypal['url'], $_POST);
+		//print_r($result);
+		break;
 
-    default: //use the fsockopen method as default post method
+	default: //use the fsockopen method as default post method
 
-        $result = fsockPost($paypal['url'], $_POST);
-        //print_r($result);
-        break;
+		$result = fsockPost($paypal['url'], $_POST);
+		//print_r($result);
+		break;
 
 }
 
 //check the ipn result received back from paypal
 
 if (eregi('VERIFIED', $result)) {
-    require_once __DIR__ . '/ipn_success.php';
+	require_once __DIR__ . '/ipn_success.php';
 } else {
-    require_once __DIR__ . '/ipn_error.php';
+	require_once __DIR__ . '/ipn_error.php';
 }

Spacing +6 added lines, -6 removed lines

@@ -11,15 +11,15 @@ 
  * http://opensource.org/licenses/cpl.php
  *
  */
-include __DIR__ . '/../header.php';
-$myts = MyTextSanitizer::getInstance();// MyTextSanitizer object
+include __DIR__.'/../header.php';
+$myts = MyTextSanitizer::getInstance(); // MyTextSanitizer object
 
 $eh = new ErrorHandler;
 //get global configuration information
-require_once __DIR__ . '/../paypal_includes/global_config.inc.php';
+require_once __DIR__.'/../paypal_includes/global_config.inc.php';
 
 //get pay pal configuration file
-require_once __DIR__ . '/../paypal_includes/config.inc.php';
+require_once __DIR__.'/../paypal_includes/config.inc.php';
 
 //decide which post method to use
 switch ($paypal['post_method']) {
@@ -53,7 +53,7 @@ 
 //check the ipn result received back from paypal
 
 if (eregi('VERIFIED', $result)) {
-    require_once __DIR__ . '/ipn_success.php';
+    require_once __DIR__.'/ipn_success.php';
 } else {
-    require_once __DIR__ . '/ipn_error.php';
+    require_once __DIR__.'/ipn_error.php';
 }