XoopsModules25x / efqdirectory

class/class.fieldtype.php

Indentation +31 added lines, -31 removed lines

@@ -48,26 +48,26 @@ 
 	{
 		global $moddir;
 		$this->db = Database::getInstance();
-	    $this->initVar('fieldtypeid', XOBJ_DTYPE_INT, null, false);
-	    $this->initVar('dirid', XOBJ_DTYPE_INT, null, false);
-	    $this->initVar('title', XOBJ_DTYPE_TXTBOX);
-	    $this->initVar('fieldtype', XOBJ_DTYPE_TXTBOX);
-	    $this->initVar('descr', XOBJ_DTYPE_TXTAREA);
-	    $this->initVar('ext', XOBJ_DTYPE_TXTBOX);
+		$this->initVar('fieldtypeid', XOBJ_DTYPE_INT, null, false);
+		$this->initVar('dirid', XOBJ_DTYPE_INT, null, false);
+		$this->initVar('title', XOBJ_DTYPE_TXTBOX);
+		$this->initVar('fieldtype', XOBJ_DTYPE_TXTBOX);
+		$this->initVar('descr', XOBJ_DTYPE_TXTAREA);
+		$this->initVar('ext', XOBJ_DTYPE_TXTBOX);
 		$this->initVar('activeyn', XOBJ_DTYPE_INT, 0, false);
 		
 		if ($fieldtype != false) {
 			if (is_array($fieldtype)) {
-                $this->assignVars($fieldtype);
-            } else {
+				$this->assignVars($fieldtype);
+			} else {
 				$fieldtype_handler = new efqFieldTypeHandler($this->db);
-                $objFieldtype =& $fieldtype_handler->get($fieldtype);
-                foreach ($objFieldtype->vars as $k => $v) {
-                    $this->assignVar($k, $v['value']);
-                }
-                unset($objFieldtype);
-            }
-        }
+				$objFieldtype =& $fieldtype_handler->get($fieldtype);
+				foreach ($objFieldtype->vars as $k => $v) {
+					$this->assignVar($k, $v['value']);
+				}
+				unset($objFieldtype);
+			}
+		}
 	}
 }
 
@@ -201,37 +201,37 @@ 
 		$sql = "DELETE * FROM ".$this->db->prefix("efqdiralpha1_fieldtypes")." WHERE typeid='".intval($this->getVar("typeid"))."'";
 		if ($force) {
 			if (!$result = $this->db->queryF($sql)) {
-            	return false;
-        	}
+				return false;
+			}
 		} else {
 			if (!$result = $this->db->query($sql)) {
-            	return false;
-        	}
+				return false;
+			}
 		}
-        return true;
+		return true;
 	}
 	
 	/**
-     * retrieve all field types for a directory
-     * 
-     * @param int $dirid ID of the directory
-     * @return array $arr or boolean false
-     */
+	 * retrieve all field types for a directory
+	 * 
+	 * @param int $dirid ID of the directory
+	 * @return array $arr or boolean false
+	 */
 	function getByDir($dirid=0)
 	{
 		//Get all fieldtypes for the selected directory
 		$sql = "SELECT typeid,title,fieldtype,descr,ext,activeyn FROM ".$this->db->prefix("efqdiralpha1_fieldtypes")." WHERE dirid=".intval($dirid)."";
-        if (!$result = $this->db->query($sql)) {
-            return false;
-        }
-        $result = $this->db->query($sql);
+		if (!$result = $this->db->query($sql)) {
+			return false;
+		}
+		$result = $this->db->query($sql);
 		$numrows = $this->db->getRowsNum($result);
 		$result = $this->db->query($sql);
 		$arr = array();
-        while ( list($typeid,$title,$fieldtype,$descr,$ext,$activeyn) = $this->db->fetchRow($result) ) {
+		while ( list($typeid,$title,$fieldtype,$descr,$ext,$activeyn) = $this->db->fetchRow($result) ) {
 			$arr[$typeid] = array('typeid' => $typeid,'title' => $title,'fieldtype' => $fieldtype,'descr' => $descr, 'ext' => $ext, 'activeyn' => $activeyn);
 		}
-        return $arr;
+		return $arr;
 	}
 	
 	

class/class.image.php

Indentation +151 added lines, -151 removed lines

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

class/class.datatype.php

Indentation +12 added lines, -12 removed lines

@@ -54,15 +54,15 @@ 
 	{
 		global $moddir;
 		$this->db = Database::getInstance();
-	    $this->initVar('dtypeid', XOBJ_DTYPE_INT, 0, false);
-	    $this->initVar('title', XOBJ_DTYPE_TXTBOX, null, true, 255);
+		$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('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);
@@ -206,11 +206,11 @@ 
    */
 	function setDataType($gpc_dtypeid=0) {
 		$sql = "SELECT dtypeid,title,section,fieldtypeid,uid,defaultyn,created,seq,activeyn,options,custom,icon	WHERE dtypeid=".intval($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)) {
+		$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();
 				}
@@ -226,8 +226,8 @@ 
 				$this->objDataType->setVar('activeyn', $activeyn);
 				$this->objDataType->setVar('custom', $custom);
 				$this->objDataType->setVar('icon', $icon);
-	        }
-	    } else {
+			}
+		} else {
 			return false;
 		}
 		return true;

class/class.couponhandler.php

Indentation +88 added lines, -88 removed lines

@@ -37,41 +37,41 @@ 
 		$this->image = $myts->makeTboxData4Save($_POST['image']);
 		$this->itemid = intval($_POST['itemid']);
 		$this->publish = strtotime($_POST['publish']['date']) + $_POST['publish']['time'];
-	    if (isset($_POST['expire_enable']) && ($_POST['expire_enable'] == 1)) {
-	        $this->expire = strtotime($_POST['expire']['date']) + $_POST['expire']['time'];
-	    } else {
-	        $this->expire =  0;
-	    }
-	    $this->lbr = $_POST['lbr'];
-	    $this->heading = $myts->makeTboxData4Save($_POST['heading']);
-	    if (!isset($_POST['couponid'])) {
-	        $this->_new = true;	        
-	        $this->message = _MD_COUPONADDED;
-	        if ($this->insert()) {
-	        	return true;
-	        } else {
-	        	return false;
-	        }
-	    } else {
-	        $this->message = _MD_COUPONUPDATED;
-	        $this->couponid = intval($_POST['couponid']);
-	        if ($this->update()) {
-	        	return true;
-	        } else {
-	        	return false;
-	        }
-	    }
+		if (isset($_POST['expire_enable']) && ($_POST['expire_enable'] == 1)) {
+			$this->expire = strtotime($_POST['expire']['date']) + $_POST['expire']['time'];
+		} else {
+			$this->expire =  0;
+		}
+		$this->lbr = $_POST['lbr'];
+		$this->heading = $myts->makeTboxData4Save($_POST['heading']);
+		if (!isset($_POST['couponid'])) {
+			$this->_new = true;	        
+			$this->message = _MD_COUPONADDED;
+			if ($this->insert()) {
+				return true;
+			} else {
+				return false;
+			}
+		} else {
+			$this->message = _MD_COUPONUPDATED;
+			$this->couponid = intval($_POST['couponid']);
+			if ($this->update()) {
+				return true;
+			} else {
+				return false;
+			}
+		}
 	}
 	
 	function insert() {
 		$sql = "INSERT INTO ".$this->db->prefix("efqdiralpha1_coupon")." 
         (itemid, description, image, publish, expire, heading, lbr) VALUES 
         (".$this->itemid.", ".$this->db->quoteString($this->descr).", ".$this->db->quoteString($this->image).", ".$this->publish.", ".$this->expire.", ".$this->db->quoteString($this->heading).", ".$this->lbr.")";
-        if ($this->db->query($sql)) {
-        	$this->couponid = $this->db->getInsertId();
-        	return true;
-        }        
-        return false;
+		if ($this->db->query($sql)) {
+			$this->couponid = $this->db->getInsertId();
+			return true;
+		}        
+		return false;
 	}
 	
 	function update() {
@@ -88,34 +88,34 @@ 
 	
 	function get($couponid=false) {
 		if ($couponid == false) {
-            //echo 'couponid is false';
-            return false;
-        }
-        //$couponid = intval($couponid);
-        if ($couponid > 0) {
-            $sql = "SELECT itemid, description, image, publish, expire, heading, lbr FROM ".$this->db->prefix("efqdiralpha1_coupon")." WHERE couponid=".$couponid;
-            //echo $sql;
-            if (!$result = $this->db->query($sql)) {
-                return false;
-            }
-            while(list($itemid, $descr, $image, $publish, $expire, $heading, $lbr) = $this->db->fetchRow($result)) {
-            	$this->itemid = $itemid;
-            	$this->descr = $descr;
-            	$this->image = $image;
-            	$this->publish = $publish;
-            	$this->expire = $expire;
-            	$this->heading = $heading;
-            	$this->lbr = $lbr; 
-	        }
-	        return true;
-        }
-        return false;
+			//echo 'couponid is false';
+			return false;
+		}
+		//$couponid = intval($couponid);
+		if ($couponid > 0) {
+			$sql = "SELECT itemid, description, image, publish, expire, heading, lbr FROM ".$this->db->prefix("efqdiralpha1_coupon")." WHERE couponid=".$couponid;
+			//echo $sql;
+			if (!$result = $this->db->query($sql)) {
+				return false;
+			}
+			while(list($itemid, $descr, $image, $publish, $expire, $heading, $lbr) = $this->db->fetchRow($result)) {
+				$this->itemid = $itemid;
+				$this->descr = $descr;
+				$this->image = $image;
+				$this->publish = $publish;
+				$this->expire = $expire;
+				$this->heading = $heading;
+				$this->lbr = $lbr; 
+			}
+			return true;
+		}
+		return false;
 	}
 	
 	function delete($couponid) {
 		$sql = "DELETE FROM ".$this->db->prefix("efqdiralpha1_coupon")." WHERE couponid=".intval($couponid); 
-        $this->db->query($sql);
-        return true;
+		$this->db->query($sql);
+		return true;
 	}
 	
 	/* Returns number of coupons for a listing
@@ -124,43 +124,43 @@ 
     *
     * @return
     */
-    function getCountByLink($itemid=0) {
-        $ret = 0;
-        $now = time();
+	function getCountByLink($itemid=0) {
+		$ret = 0;
+		$now = time();
 		$sql = "SELECT count(*) FROM ".$this->db->prefix("efqdiralpha1_coupon")." WHERE itemid=".$itemid.' AND publish < '.$now.' AND (expire = 0 OR expire > '.$now.')';
 		//echo $sql;
-        if (!$result = $this->db->query($sql)) {
-            return false;
-        }
-        list($ret) = $this->db->fetchRow($result);
-        return $ret;
-    }
+		if (!$result = $this->db->query($sql)) {
+			return false;
+		}
+		list($ret) = $this->db->fetchRow($result);
+		return $ret;
+	}
     
-    function getByItem($itemid=0) {
-    	if ($itemid == false) {
-            //echo 'couponid is false';
-            return false;
-        }
-        //$couponid = intval($couponid);
-        if ($itemid > 0) {
-            $sql = "SELECT couponid, itemid, description, image, publish, expire, heading, lbr FROM ".$this->db->prefix("efqdiralpha1_coupon")." WHERE itemid=".$itemid;
-            //echo $sql;
-            if (!$result = $this->db->query($sql)) {
-                return false;
-            }
-            while(list($couponid, $itemid, $descr, $image, $publish, $expire, $heading, $lbr) = $this->db->fetchRow($result)) {
-            	if ($publish == 0) {
-            		$publish = time();
-            	}
-            	if ($expire > 0) {
-            		$expire = formatTimestamp($expire, 's');
-            	}
-            	$publish = formatTimestamp($publish, 's');
-            	$ret[] = array('couponid' => $couponid, 'itemid' => $itemid, 'descr' => $descr, 'image' => $image, 'publish' => $publish, 'expire' => $expire, 'heading' => $heading, 'lbr' => $lbr );
-	        }
-	        return $ret;
-        }
-        return false;
-    }
+	function getByItem($itemid=0) {
+		if ($itemid == false) {
+			//echo 'couponid is false';
+			return false;
+		}
+		//$couponid = intval($couponid);
+		if ($itemid > 0) {
+			$sql = "SELECT couponid, itemid, description, image, publish, expire, heading, lbr FROM ".$this->db->prefix("efqdiralpha1_coupon")." WHERE itemid=".$itemid;
+			//echo $sql;
+			if (!$result = $this->db->query($sql)) {
+				return false;
+			}
+			while(list($couponid, $itemid, $descr, $image, $publish, $expire, $heading, $lbr) = $this->db->fetchRow($result)) {
+				if ($publish == 0) {
+					$publish = time();
+				}
+				if ($expire > 0) {
+					$expire = formatTimestamp($expire, 's');
+				}
+				$publish = formatTimestamp($publish, 's');
+				$ret[] = array('couponid' => $couponid, 'itemid' => $itemid, 'descr' => $descr, 'image' => $image, 'publish' => $publish, 'expire' => $expire, 'heading' => $heading, 'lbr' => $lbr );
+			}
+			return $ret;
+		}
+		return false;
+	}
 }
 ?>
\ No newline at end of file

class/class.formradio.php

Indentation +3 added lines, -3 removed lines

@@ -52,21 +52,21 @@
 class efqFormRadio extends XoopsFormElement {
 
 	/**
-     * Array of Options
+	 * Array of Options
 	 * @var	array	
 	 * @access	private
 	 */
 	var $_options = array();
 
 	/**
-     * Pre-selected value
+	 * Pre-selected value
 	 * @var	string	
 	 * @access	private
 	 */
 	var $_value;
 	
 	/**
-     * Pre-selected value
+	 * Pre-selected value
 	 * @var	string	
 	 * @access	private
 	 */

class/class.datafieldmanager.php

Indentation +8 added lines, -8 removed lines

@@ -565,7 +565,7 @@ 
 	/**
 	 * Get the size
 	 * 
-     * @return	int
+	 * @return	int
 	 */
 	function getSize(){
 		return $this->_size;
@@ -574,7 +574,7 @@ 
 	/**
 	 * Get an array of pre-selected values
 	 * 
-     * @return	array
+	 * @return	array
 	 */
 	function getValue(){
 		return $this->_value;
@@ -583,7 +583,7 @@ 
 	/**
 	 * Set pre-selected values
 	 * 
-     * @param	$value	mixed
+	 * @param	$value	mixed
 	 */
 	function setValue($value){
 		if (is_array($value)) {
@@ -597,9 +597,9 @@ 
 
 	/**
 	 * Add an option
-     * 
+	 * 
 	 * @param	string  $value  "value" attribute
-     * @param	string  $name   "name" attribute
+	 * @param	string  $name   "name" attribute
 	 */
 	function addOption($value, $name=""){
 		if ( $name != "" ) {
@@ -612,7 +612,7 @@ 
 	/**
 	 * Add multiple options
 	 * 
-     * @param	array   $options    Associative array of value->name pairs
+	 * @param	array   $options    Associative array of value->name pairs
 	 */
 	function addOptionArray($options){
 		if ( is_array($options) ) {
@@ -625,7 +625,7 @@ 
 	/**
 	 * Get all options
 	 * 
-     * @return	array   Associative array of value->name pairs
+	 * @return	array   Associative array of value->name pairs
 	 */
 	function getOptions(){
 		return $this->_options;
@@ -635,7 +635,7 @@ 
 	/**
 	 * Prepare HTML for output
 	 * 
-     * @return	string  HTML
+	 * @return	string  HTML
 	 */
 	function render(){
 		$ret = "<img src='".$this->getSrc()."' width='".$this->getWidth()."'  height='".$this->getHeight()."'";

class/class.gmap.php

Indentation +54 added lines, -54 removed lines

@@ -65,24 +65,24 @@ 
 		$this->setPointsJS('');
 		
 		$this->db = Database::getInstance();
-	    $this->initVar('id', XOBJ_DTYPE_INT, null, false);
-	    $this->initVar('dataid', XOBJ_DTYPE_INT, null, true);
-	    $this->initVar('lat', XOBJ_DTYPE_TXTBOX, null, true);
+		$this->initVar('id', XOBJ_DTYPE_INT, null, false);
+		$this->initVar('dataid', XOBJ_DTYPE_INT, null, true);
+		$this->initVar('lat', XOBJ_DTYPE_TXTBOX, null, true);
 		$this->initVar('lon', XOBJ_DTYPE_TXTBOX, null, true);
 		$this->initVar('descr', XOBJ_DTYPE_TXTAREA);
 		
 		if ($gmap != false) {
 			if (is_array($gmap)) {
-                $this->assignVars($gmap);
-            } else {
+				$this->assignVars($gmap);
+			} else {
 				$$gmap_handler = xoops_getmodulehandler('gmap', $moddir);
-                $objGmap =& $$gmap_handler->get($directory);
-                foreach ($objGmap->vars as $k => $v) {
-                    $this->assignVar($k, $v['value']);
-                }
-                unset($objGmap);
-            }
-        }
+				$objGmap =& $$gmap_handler->get($directory);
+				foreach ($objGmap->vars as $k => $v) {
+					$this->assignVar($k, $v['value']);
+				}
+				unset($objGmap);
+			}
+		}
 	}
 	
 	function setKey($key='')
@@ -91,8 +91,8 @@ 
 	}
 	
 	/**
-     * Set the value of the script that triggers the points to be added to the google map. 
-    */
+	 * Set the value of the script that triggers the points to be added to the google map. 
+	 */
 	function setPointsJS($pointsJS)
 	{
 		$this->_jsPointsArray = $pointsJS;
@@ -100,8 +100,8 @@ 
 	}
 	
 	/**
-     * Get the value of the script that triggers the points to be added to the google map. 
-    */
+	 * Get the value of the script that triggers the points to be added to the google map. 
+	 */
 	function getPointsJS()
 	{
 		return $this->_jsPointsArray;
@@ -195,8 +195,8 @@ 
 	}
 	
 	/**
-     * Adds a script which triggers the other javascript code to execute 
-    */
+	 * Adds a script which triggers the other javascript code to execute 
+	 */
 	function printTrigger()
 	{
 $trigger = <<<EOH
@@ -262,34 +262,34 @@ 
 	}
 	
 	/**
-     * create instance of efqGmap class or reset the existing instance.
-     * 
-     * @return object $efqGmap
-     */
+	 * create instance of efqGmap class or reset the existing instance.
+	 * 
+	 * @return object $efqGmap
+	 */
 	function &create($isNew = true)
-    {
-        $gmap = new efqGmap();
-        if ($isNew) {
-            $gmap->setNew();
-        }
-        return $gmap;
-    }
+	{
+		$gmap = new efqGmap();
+		if ($isNew) {
+			$gmap->setNew();
+		}
+		return $gmap;
+	}
 	
 	/**
-     * retrieve all points from the database 
-     * 
-     * @param int $dirid ID of the directory
-     * @return mixed reference to the {@link efqGmap} object, FALSE if failed
-     */
+	 * retrieve all points from the database 
+	 * 
+	 * @param int $dirid ID of the directory
+	 * @return mixed reference to the {@link efqGmap} object, FALSE if failed
+	 */
 	function getPointsJS($gmap) {
 		if (!is_object($gmap)) {
 			return false;
 		}
 		$sql = 'SELECT * FROM '.$this->db->prefix("efqdiralpha1_gmaps");
 		if (!$result = $this->db->query($sql)) {
-            return false;
-        }
-        $gmap =& $this->create(false);
+			return false;
+		}
+		$gmap =& $this->create(false);
 		$javaScript = '';
 		while ($row = $this->db->fetchArray($result)) {
 			//$row{'descr'} = addslashes($row{'descr'});
@@ -309,31 +309,31 @@ 
 		$arr = array();
 		$sql = sprintf('SELECT * FROM %s WHERE id=%u',
 		$this->db->prefix("efqdiralpha1_gmaps"), intval($id));		
-	    $result = $this->db->query($sql) or $eh->show("0013");
-	    while (list($id, $lat, $lon, $descr, $dataid) = $this->db->fetchRow($result))
+		$result = $this->db->query($sql) or $eh->show("0013");
+		while (list($id, $lat, $lon, $descr, $dataid) = $this->db->fetchRow($result))
 		{
 			$arr = array('id'=>$id, 'lat'=>$lat, 'lon'=>$lon, 'descr'=>$descr, 'dataid'=>$dataid);
 		}
-	    return $arr;
+		return $arr;
 	}
 	
 	function getByDataId($id=0)
 	{
 		if ($id == false) {
-            return false;
-        }
-        $id = intval($id);
-        echo $id;
-        if ($id > 0) {
-            $sql = 'SELECT * FROM '.$this->db->prefix("efqdiralpha1_gmaps").' WHERE dataid='.intval($id);
-            if (!$result = $this->db->query($sql)) {
-                return false;
-            }
-            $gmap =& $this->create(false);
-            $gmap->assignVars($this->db->fetchArray($result));
-            return $gmap;
-        }
-        return false;	
+			return false;
+		}
+		$id = intval($id);
+		echo $id;
+		if ($id > 0) {
+			$sql = 'SELECT * FROM '.$this->db->prefix("efqdiralpha1_gmaps").' WHERE dataid='.intval($id);
+			if (!$result = $this->db->query($sql)) {
+				return false;
+			}
+			$gmap =& $this->create(false);
+			$gmap->assignVars($this->db->fetchArray($result));
+			return $gmap;
+		}
+		return false;	
 	}
 
 	/**

class/class.subscription.php

Indentation +15 added lines, -15 removed lines

@@ -140,18 +140,18 @@ 
 	}
 	
 	/**
-     * create instance of directory class or reset the existing instance.
-     * 
-     * @return object $directory
-     */
+	 * create instance of directory class or reset the existing instance.
+	 * 
+	 * @return object $directory
+	 */
 	function &create($isNew = true)
-    {
-        $subscription = new efqSubscription();
-        if ($isNew) {
-            $subscription->setNew();
-        }
-        return $subscription;
-    }
+	{
+		$subscription = new efqSubscription();
+		if ($isNew) {
+			$subscription->setNew();
+		}
+		return $subscription;
+	}
     
 	/**
 	 * Function delete: Delete subscription order
@@ -406,10 +406,10 @@ 
 	function countSubscriptionsForType($typeid=0) {
 		$sql = "SELECT COUNT(itemid) FROM ".$this->db->prefix("efqdiralpha1_items")." WHERE typeid=".intval($typeid)."";
 		if (!$result = $this->db->query($sql)) {
-            return false;
-        }
-        list($ret) = $this->db->fetchRow($result);
-        return $ret;
+			return false;
+		}
+		list($ret) = $this->db->fetchRow($result);
+		return $ret;
 	}
 	
 	function getOffers($dirid=0) {

class/class.itemtype.php

Indentation +14 added lines, -14 removed lines

@@ -54,9 +54,9 @@ 
 	{
 		global $moddir;
 		$this->db = Database::getInstance();
-	    $this->initVar('typeid', XOBJ_DTYPE_INT, 0, false);
-	    $this->initVar('typename', XOBJ_DTYPE_TXTBOX, null, false, 50);
-	    $this->initVar('level', XOBJ_DTYPE_INT, 0, true, 4);
+		$this->initVar('typeid', XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('typename', XOBJ_DTYPE_TXTBOX, null, false, 50);
+		$this->initVar('level', XOBJ_DTYPE_INT, 0, true, 4);
 		$this->initVar('dirid', XOBJ_DTYPE_INT, 0, true, 5);
 
 	}
@@ -198,10 +198,10 @@ 
    */
 	function set($typeid=0) {
 		$sql = "SELECT typeid,typename,level,dirid FROM ".$this->db->prefix("efqdiralpha1_itemtypes")." WHERE typeid=".intval($typeid)."";
-        $result = $this->db->query($sql);
-        $numrows = $this->db->getRowsNum($result);
-        if ( $numrows > 0 ) {
-	        while (list($typeid, $typename, $level, $dirid) = $this->db->fetchRow($result)) {
+		$result = $this->db->query($sql);
+		$numrows = $this->db->getRowsNum($result);
+		if ( $numrows > 0 ) {
+			while (list($typeid, $typename, $level, $dirid) = $this->db->fetchRow($result)) {
 				if (! $this->objItemType) {
 					$this->objItemType = new efqSubscriptionOffer();
 				}
@@ -209,8 +209,8 @@ 
 				$this->objItemType->setVar('typename', $typename);
 				$this->objItemType->setVar('level', $level);
 				$this->objItemType->setVar('dirid', $dirid);
-	        }
-	    } else {
+			}
+		} else {
 			return false;
 		}
 		return true;
@@ -229,14 +229,14 @@ 
 	function getByDir($dirid=0)	{
 		$arr = array();
 		$sql = "SELECT typeid,typename,level FROM ".$this->db->prefix("efqdiralpha1_itemtypes")." WHERE dirid=".intval($dirid)."";
-        if (!$result = $this->db->query($sql)) {
-            return false;
-        }
+		if (!$result = $this->db->query($sql)) {
+			return false;
+		}
 		$numrows = $this->db->getRowsNum($result);
-        while ( list($typeid,$typename,$level) = $this->db->fetchRow($result) ) {
+		while ( list($typeid,$typename,$level) = $this->db->fetchRow($result) ) {
 			$arr[$typeid] = array('typeid' => $typeid,'typename' => $typename,'level' => $level);
 		}
-        return $arr;
+		return $arr;
 	}
 
 	/**