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;
 	}
 	
 	

Spacing +10 added lines, -10 removed lines

@@ -44,7 +44,7 @@ 
 class efqFieldType extends XoopsObject
 {
 	
-	function efqFieldType($fieldtype=false)
+	function efqFieldType($fieldtype = false)
 	{
 		global $moddir;
 		$this->db = Database::getInstance();
@@ -61,7 +61,7 @@ 
                 $this->assignVars($fieldtype);
             } else {
 				$fieldtype_handler = new efqFieldTypeHandler($this->db);
-                $objFieldtype =& $fieldtype_handler->get($fieldtype);
+                $objFieldtype = & $fieldtype_handler->get($fieldtype);
                 foreach ($objFieldtype->vars as $k => $v) {
                     $this->assignVar($k, $v['value']);
                 }
@@ -100,7 +100,7 @@ 
 	 * 
 	 * @return	bool	true if insertion is succesful, false if unsuccesful
 	 */
-	function insertFieldType($obj, $forceQuery=false) {
+	function insertFieldType($obj, $forceQuery = false) {
 		$tablename = "efqdiralpha1_fieldtypes";
 		$keyName = "typeid";
 		$excludedVars = array();
@@ -117,7 +117,7 @@ 
 		$strFields = "";
 		$strValues = "";
 		foreach ($cleanvars as $k => $v) {
-			if ( !in_array($k, $excludedVars) ) {
+			if (!in_array($k, $excludedVars)) {
 				$strFields .= $k;
 				$strValues .= "'".$v."'";
 				if ($i < $countVars) {
@@ -154,7 +154,7 @@ 
 	 * 
 	 * @return	bool	true if update is succesful, false if unsuccesful
 	 */
-	function updateFieldType($obj, $forceQuery=false) {
+	function updateFieldType($obj, $forceQuery = false) {
 		$tablename = "efqdiralpha1_fieldtypes";
 		$keyName = "typeid";
 		$excludedVars = array();
@@ -172,7 +172,7 @@ 
 		$strSet = "";
 		$strValues = "";
 		foreach ($cleanvars as $k => $v) {
-			if ( !in_array($k, $excludedVars) ) {
+			if (!in_array($k, $excludedVars)) {
 				if ($i < $countVars and $i > 1) {
 					$strSet .= ", ";
 				}
@@ -193,7 +193,7 @@ 
 		return false;		
 	}
 	
-	function delete($obj_fieldtype,$force=false)
+	function delete($obj_fieldtype, $force = false)
 	{
 		if (!is_object($obj_fieldtype)) {
 			return false;
@@ -217,7 +217,7 @@ 
      * @param int $dirid ID of the directory
      * @return array $arr or boolean false
      */
-	function getByDir($dirid=0)
+	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)."";
@@ -228,8 +228,8 @@ 
 		$numrows = $this->db->getRowsNum($result);
 		$result = $this->db->query($sql);
 		$arr = array();
-        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);
+        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;
 	}

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

Spacing +5 added lines, -5 removed lines

@@ -95,7 +95,7 @@ 
      * @param   object  &$image {@link XoopsImage} 
      * @return  bool
      **/
-    function insert(&$image, $itemid='0')
+    function insert(&$image, $itemid = '0')
     {
         global $image_name;
         if ($itemid == '0') {
@@ -200,9 +200,9 @@ 
             $image = new XoopsImage();
             $image->assignVars($myrow);
             if (!$id_as_key) {
-                $ret[] =& $image;
+                $ret[] = & $image;
             } else {
-                $ret[$myrow['image_id']] =& $image;
+                $ret[$myrow['image_id']] = & $image;
             }
             unset($image);
         }
@@ -221,7 +221,7 @@ 
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
             $sql .= ' '.$criteria->renderWhere();
         }
-        if (!$result =& $this->db->query($sql)) {
+        if (!$result = & $this->db->query($sql)) {
             return 0;
         }
         list($count) = $this->db->fetchRow($result);
@@ -241,7 +241,7 @@ 
         if (isset($image_display)) {
             $criteria->add(new Criteria('image_display', intval($image_display)));
         }
-        $images =& $this->getObjects($criteria, false, true);
+        $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');

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;

Spacing +11 added lines, -11 removed lines

@@ -50,7 +50,7 @@ 
    * @param bool $itemtype
    * @return
    */
-	function efqDataType($offer=false)
+	function efqDataType($offer = false)
 	{
 		global $moddir;
 		$this->db = Database::getInstance();
@@ -89,7 +89,7 @@ 
    * 
    * @return
    */
-	function efqDataTypeHandler($obj=false) {
+	function efqDataTypeHandler($obj = false) {
 		$this->db = Database::getInstance();
 		$this->objDataType = $obj;
 	}
@@ -104,7 +104,7 @@ 
 	 * 
 	 * @return	bool	true if insertion is succesful, false if unsuccesful
 	 */
-	function insertDataType($obj, $forceQuery=false) {
+	function insertDataType($obj, $forceQuery = false) {
 		$tablename = "efqdiralpha1_dtypes";
 		$keyName = "dtypeid";
 		$excludedVars = array();
@@ -121,7 +121,7 @@ 
 		$strFields = "";
 		$strValues = "";
 		foreach ($cleanvars as $k => $v) {
-			if ( !in_array($k, $excludedVars) ) {
+			if (!in_array($k, $excludedVars)) {
 				$strFields .= $k;
 				$strValues .= "'".$v."'";
 				if ($i < $countVars) {
@@ -158,7 +158,7 @@ 
 	 * 
 	 * @return	bool	true if update is succesful, false if unsuccesful
 	 */
-	function updateDataType($obj, $forceQuery=false) {
+	function updateDataType($obj, $forceQuery = false) {
 		$tablename = "efqdiralpha1_dtypes";
 		$keyName = "dtypeid";
 		$excludedVars = array();
@@ -176,7 +176,7 @@ 
 		$strSet = "";
 		$strValues = "";
 		foreach ($cleanvars as $k => $v) {
-			if ( !in_array($k, $excludedVars) ) {
+			if (!in_array($k, $excludedVars)) {
 				if ($i < $countVars and $i > 1) {
 					$strSet .= ", ";
 				}
@@ -204,14 +204,14 @@ 
    * 
    * @return bool true or false
    */
-	function setDataType($gpc_dtypeid=0) {
+	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)) {
-				if (! $this->objDataType ) {
+        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);

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

Spacing +8 added lines, -8 removed lines

@@ -28,7 +28,7 @@ 
 	
 	
 	function efqCouponHandler() {
-		$this->db =& Database::getInstance();
+		$this->db = & Database::getInstance();
 	}
 	
 	function create() {
@@ -40,7 +40,7 @@ 
 	    if (isset($_POST['expire_enable']) && ($_POST['expire_enable'] == 1)) {
 	        $this->expire = strtotime($_POST['expire']['date']) + $_POST['expire']['time'];
 	    } else {
-	        $this->expire =  0;
+	        $this->expire = 0;
 	    }
 	    $this->lbr = $_POST['lbr'];
 	    $this->heading = $myts->makeTboxData4Save($_POST['heading']);
@@ -86,7 +86,7 @@ 
 		return true;
 	}
 	
-	function get($couponid=false) {
+	function get($couponid = false) {
 		if ($couponid == false) {
             //echo 'couponid is false';
             return false;
@@ -98,7 +98,7 @@ 
             if (!$result = $this->db->query($sql)) {
                 return false;
             }
-            while(list($itemid, $descr, $image, $publish, $expire, $heading, $lbr) = $this->db->fetchRow($result)) {
+            while (list($itemid, $descr, $image, $publish, $expire, $heading, $lbr) = $this->db->fetchRow($result)) {
             	$this->itemid = $itemid;
             	$this->descr = $descr;
             	$this->image = $image;
@@ -124,7 +124,7 @@ 
     *
     * @return
     */
-    function getCountByLink($itemid=0) {
+    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.')';
@@ -136,7 +136,7 @@ 
         return $ret;
     }
     
-    function getByItem($itemid=0) {
+    function getByItem($itemid = 0) {
     	if ($itemid == false) {
             //echo 'couponid is false';
             return false;
@@ -148,7 +148,7 @@ 
             if (!$result = $this->db->query($sql)) {
                 return false;
             }
-            while(list($couponid, $itemid, $descr, $image, $publish, $expire, $heading, $lbr) = $this->db->fetchRow($result)) {
+            while (list($couponid, $itemid, $descr, $image, $publish, $expire, $heading, $lbr) = $this->db->fetchRow($result)) {
             	if ($publish == 0) {
             		$publish = time();
             	}
@@ -156,7 +156,7 @@ 
             		$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 );
+            	$ret[] = array('couponid' => $couponid, 'itemid' => $itemid, 'descr' => $descr, 'image' => $image, 'publish' => $publish, 'expire' => $expire, 'heading' => $heading, 'lbr' => $lbr);
 	        }
 	        return $ret;
         }

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
 	 */

Spacing +14 added lines, -14 removed lines

@@ -78,7 +78,7 @@ 
 	 * @param	string	$name		"name" attribute
 	 * @param	string	$value		Pre-selected value
 	 */
-	function efqFormRadio($caption, $name, $value = null, $linebreak = null){
+	function efqFormRadio($caption, $name, $value = null, $linebreak = null) {
 		$this->setCaption($caption);
 		$this->setName($name);
 		if (isset($value)) {
@@ -96,7 +96,7 @@ 
 	 * 
 	 * @return	string
 	 */
-	function getValue(){
+	function getValue() {
 		return $this->_value;
 	}
 
@@ -105,7 +105,7 @@ 
 	 * 
 	 * @return	string
 	 */
-	function getLineBreak(){
+	function getLineBreak() {
 		return $this->_linebreak;
 	}
 	/**
@@ -113,7 +113,7 @@ 
 	 * 
 	 * @param	$value	string
 	 */
-	function setValue($value){
+	function setValue($value) {
 		$this->_value = $value;
 	}
 
@@ -122,7 +122,7 @@ 
 	 * 
 	 * @param	$value	string
 	 */
-	function setLineBreak($linebreak){
+	function setLineBreak($linebreak) {
 		$this->_linebreak = $linebreak;
 	}
 	
@@ -132,8 +132,8 @@ 
 	 * @param	string	$value	"value" attribute - This gets submitted as form-data.
 	 * @param	string	$name	"name" attribute - This is displayed. If empty, we use the "value" instead.
 	 */
-	function addOption($value, $name=""){
-		if ( $name != "" ) {
+	function addOption($value, $name = "") {
+		if ($name != "") {
 			$this->_options[$value] = $name;
 		} else {
 			$this->_options[$value] = $value;
@@ -145,9 +145,9 @@ 
 	 * 
 	 * @param	array	$options	Associative array of value->name pairs.
 	 */
-	function addOptionArray($options){
-		if ( is_array($options) ) {
-			foreach ( $options as $k=>$v ) {
+	function addOptionArray($options) {
+		if (is_array($options)) {
+			foreach ($options as $k=>$v) {
 				$this->addOption($k, $v);
 			}
 		}
@@ -158,7 +158,7 @@ 
 	 * 
 	 * @return	array	Associative array of value->name pairs.
 	 */
-	function getOptions(){
+	function getOptions() {
 		return $this->_options;
 	}
 
@@ -167,12 +167,12 @@ 
 	 * 
 	 * @return	string	HTML
 	 */
-	function render(){
+	function render() {
 		$ret = "";
-		foreach ( $this->getOptions() as $value => $name ) {
+		foreach ($this->getOptions() as $value => $name) {
 			$ret .= "<input type='radio' name='".$this->getName()."' value='".$value."'";
 			$selected = $this->getValue();
-			if ( isset($selected) && ($value == $selected) ) {
+			if (isset($selected) && ($value == $selected)) {
 				$ret .= " checked='checked'";
 			}
 			$ret .= $this->getExtra()." />".$name."".$this->getLineBreak()."\n";

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()."'";

Switch Indentation +187 added lines, -187 removed lines

@@ -91,168 +91,168 @@ 
 				$ext_item_value = $ext_item_arr[1];
 
 				switch ($ext_item_name) {
-				case "cols":
-					$cols = $ext_item_value;
-					break;
-				case "rows":
-					$rows = $ext_item_value;
-					break;
-				case "size":
-					$size = $ext_item_value;
-					break;
-				case "maxsize":
-					$maxsize = $ext_item_value;
-					break;
-				case "multiple":
-					$multiple = true;
-					$size = 5;
-				case "value":
-					if ($ext_item_value != '' and $value == '' ) {
-						$value = $ext_item_value;
-					} 
-					break;
+					case "cols":
+						$cols = $ext_item_value;
+						break;
+					case "rows":
+						$rows = $ext_item_value;
+						break;
+					case "size":
+						$size = $ext_item_value;
+						break;
+					case "maxsize":
+						$maxsize = $ext_item_value;
+						break;
+					case "multiple":
+						$multiple = true;
+						$size = 5;
+					case "value":
+						if ($ext_item_value != '' and $value == '' ) {
+							$value = $ext_item_value;
+						} 
+						break;
 				}	
 			}						
 		}
 		
 		switch ($fieldtype) {
-		case "address":
-			//Query all address fields associated with the address type that belongs to the locid.
-			$addressfields = getAddressFields('0');
-			$addressvalues = getAddressValues($value);
-			$form->addElement(new XoopsFormLabel("", "<strong>".$title."</strong>"));
-			$fieldtitles = array('address' => _MD_DF_ADDRESS, 'address2' => _MD_DF_ADDRESS2, 'zip' => _MD_DF_ZIP, 'postcode' => _MD_DF_POSTCODE, 'lat' => _MD_DF_LAT, 'lon' => _MD_DF_LON, 'phone' => _MD_DF_PHONE, 'fax' => _MD_DF_FAX, 'mobile' => _MD_DF_MOBILE, 'city' => _MD_DF_CITY, 'country' => _MD_DF_COUNTRY, 'typename' => _MD_DF_TYPENAME, 'uselocyn' => _MD_DF_USELOCYN);
-			foreach ($addressfields['addressfields'] as $field => $fieldvalue) {
-				$storedvalue = $addressvalues["$field"];
-				if ($fieldvalue == 1) {
-					$title = $fieldtitles["$field"];
-					$form->addElement(new XoopsFormText($title, $name.$field, 50, 250, $myts->makeTboxData4Show($storedvalue)));
+			case "address":
+				//Query all address fields associated with the address type that belongs to the locid.
+				$addressfields = getAddressFields('0');
+				$addressvalues = getAddressValues($value);
+				$form->addElement(new XoopsFormLabel("", "<strong>".$title."</strong>"));
+				$fieldtitles = array('address' => _MD_DF_ADDRESS, 'address2' => _MD_DF_ADDRESS2, 'zip' => _MD_DF_ZIP, 'postcode' => _MD_DF_POSTCODE, 'lat' => _MD_DF_LAT, 'lon' => _MD_DF_LON, 'phone' => _MD_DF_PHONE, 'fax' => _MD_DF_FAX, 'mobile' => _MD_DF_MOBILE, 'city' => _MD_DF_CITY, 'country' => _MD_DF_COUNTRY, 'typename' => _MD_DF_TYPENAME, 'uselocyn' => _MD_DF_USELOCYN);
+				foreach ($addressfields['addressfields'] as $field => $fieldvalue) {
+					$storedvalue = $addressvalues["$field"];
+					if ($fieldvalue == 1) {
+						$title = $fieldtitles["$field"];
+						$form->addElement(new XoopsFormText($title, $name.$field, 50, 250, $myts->makeTboxData4Show($storedvalue)));
+					}
+				}
+				$form->addElement(new XoopsFormHidden("submitaddress","1"));
+				$form->addElement(new XoopsFormHidden($name, $value));
+				$form->addElement(new XoopsFormHidden("addrid", $value));
+				break;
+			case "checkbox":
+				$options_arr = split("[|]",$options);
+				$form_checkbox = new XoopsFormCheckbox($title, $name, $value, 1);
+				foreach($options_arr as $option) {
+					$form_checkbox->addOption($option, $option);
+				}
+				$form->addElement($form_checkbox);
+				break;
+			case "date":
+				$form->addElement(new XoopsFormText($title, $name, 10, 10, $value));
+				break;
+			case "datetime":
+				$form->addElement(new XoopsFormDateTime($title, $name, 10, $value));
+				break;
+			case "dhtml":
+				if ($custom == '1') {
+					$form_dhtmlarea_tray = new XoopsFormElementTray($title, "", $name);
+					$form_dhtmlarea_tray->addElement(new XoopsFormLabel("", "<table><tr><td>"));
+					$form_dhtmlarea_tray->addElement(new XoopsFormText("<b>"._MD_CUSTOM_TITLE."</b></td><td>", "custom".$name, 50, 250, $customtitle));
+					$form_dhtmlarea_tray->addElement(new XoopsFormLabel("", "</td></tr><tr><td>"));
+					$form_dhtmlarea_tray->addElement(new XoopsFormDhtmlTextArea("<b>"._MD_CUSTOM_VALUE."</b></td><td>", $name, $value, $rows, $cols));
+					$form_dhtmlarea_tray->addElement(new XoopsFormLabel("", "</td></tr></table>"));
+					$form->addElement($form_dhtmlarea_tray);
+				} else {
+					$form->addElement(new XoopsFormDhtmlTextArea($title, $name, $value, $rows, $cols));
+				}
+				break;
+			//case "gmap":
+				//$gmap = new efqGmap();
+	//			$gmapHandler = new efqGmapHandler();
+	//			$gmap_lon = '';
+	//			$gmap_lat = '';
+	//			$gmap_descr = '';
+	//			if (intval($value) > 0) {
+	//				$gmap->setData($gmapHandler->getGmapById($value));
+	//				$gmap_lon = $gmap->getVar('lon');
+	//				$gmap_lat = $gmap->getVar('lat');
+	//				$gmap_descr = $gmap->getVar('descr');	
+	//			}
+	//			$form->addElement(new XoopsFormHidden($name.'_dataid', $name));
+	//			$form->addElement(new XoopsFormText(_MD_GMAP_LON, $name.'_lon', 10, 30, $gmap_lon));
+	//			$form->addElement(new XoopsFormText(_MD_GMAP_LAT, $name.'_lat', 10, 30, $gmap_lat));
+	//			$form->addElement(new XoopsFormTextArea(_MD_GMAP_DESCR, $name.'_descr', $gmap_descr, 5, 50));
+	//			break;
+			case "radio":
+				$options_arr = split("[|]",$options);
+				$form_radio = new XoopsFormRadio($title, $name, $value, 1);
+				foreach($options_arr as $option) {
+					$form_radio->addOption($option, $option);
+				}
+				$form->addElement($form_radio);
+				break;
+			case "rating":
+				$rating_options = array(1,2,3,4,5,6,7,8,9,10);
+				$form_rating = new XoopsFormSelect($title, $name, $value, 1);
+				$form_rating->addOption('0', '----');
+				foreach($rating_options as $option) {
+					$form_rating->addOption($option, $option);
+				}
+				$form->addElement($form_rating);
+				break;
+			case "select":
+				$options_arr = split("[|]",$options);
+				$value_arr = split("[|]",$value);
+				$form_select = new XoopsFormSelect($title, $name, $value, $size, $multiple);
+				$form_select->addOption('-', '----');
+				$form_select->setValue($value_arr);
+				foreach($options_arr as $key => $option) {
+					$form_select->addOption($option, $option);
+				}
+				$form->addElement($form_select);
+				break;
+			case "textarea":
+				if ($custom == '1') {
+					$form_textarea_tray = new XoopsFormElementTray($title, "", $name);
+					$form_textarea_tray->addElement(new XoopsFormLabel("", "<table><tr><td>"));
+					$form_textarea_tray->addElement(new XoopsFormText("<b>"._MD_CUSTOM_TITLE."</b></td><td>", "custom".$name, 50, 250, $customtitle));
+					$form_textarea_tray->addElement(new XoopsFormLabel("", "</td></tr><tr><td>"));
+					$form_textarea_tray->addElement(new XoopsFormTextArea("<b>"._MD_CUSTOM_VALUE."</b></td><td>", $name, $value, $rows, $cols));
+					$form_textarea_tray->addElement(new XoopsFormLabel("", "</td></tr></table>"));
+					$form->addElement($form_textarea_tray);
+				} else {
+					$form->addElement(new XoopsFormTextArea($title, $name, $value, $rows, $cols));
+				}
+				break;
+			case "textbox":
+				if ($custom == '1') {
+					$form_text_tray = new XoopsFormElementTray($title, "", $name);
+					$form_text_tray->addElement(new XoopsFormLabel("", "<table><tr><td>"));
+					$form_text_tray->addElement(new XoopsFormText("<b>"._MD_CUSTOM_TITLE."</b></td><td>", "custom".$name, 50, 250, $customtitle));
+					$form_text_tray->addElement(new XoopsFormLabel("", "</td></tr><tr><td>"));
+					$form_text_tray->addElement(new XoopsFormText("<b>"._MD_CUSTOM_VALUE."</b></td><td>", $name, $size, $maxsize, $value));
+					$form_text_tray->addElement(new XoopsFormLabel("", "</td></tr></table>"));
+					$form->addElement($form_text_tray);
+				} else {
+					$form->addElement(new XoopsFormText($title, $name, 50, 250, $myts->makeTboxData4Show($value)));
+				}
+				break;
+			case "url":
+				if ($value != '') {
+					$link = explode('|',$value);
+				} else {
+					$link = array();
+					$link[0] = '';
+					$link[1] = '';
 				}
-			}
-			$form->addElement(new XoopsFormHidden("submitaddress","1"));
-			$form->addElement(new XoopsFormHidden($name, $value));
-			$form->addElement(new XoopsFormHidden("addrid", $value));
-			break;
-		case "checkbox":
-			$options_arr = split("[|]",$options);
-			$form_checkbox = new XoopsFormCheckbox($title, $name, $value, 1);
-			foreach($options_arr as $option) {
-				$form_checkbox->addOption($option, $option);
-			}
-			$form->addElement($form_checkbox);
-			break;
-		case "date":
-			$form->addElement(new XoopsFormText($title, $name, 10, 10, $value));
-			break;
-		case "datetime":
-			$form->addElement(new XoopsFormDateTime($title, $name, 10, $value));
-			break;
-		case "dhtml":
-			if ($custom == '1') {
-				$form_dhtmlarea_tray = new XoopsFormElementTray($title, "", $name);
-				$form_dhtmlarea_tray->addElement(new XoopsFormLabel("", "<table><tr><td>"));
-				$form_dhtmlarea_tray->addElement(new XoopsFormText("<b>"._MD_CUSTOM_TITLE."</b></td><td>", "custom".$name, 50, 250, $customtitle));
-				$form_dhtmlarea_tray->addElement(new XoopsFormLabel("", "</td></tr><tr><td>"));
-				$form_dhtmlarea_tray->addElement(new XoopsFormDhtmlTextArea("<b>"._MD_CUSTOM_VALUE."</b></td><td>", $name, $value, $rows, $cols));
-				$form_dhtmlarea_tray->addElement(new XoopsFormLabel("", "</td></tr></table>"));
-				$form->addElement($form_dhtmlarea_tray);
-			} else {
-				$form->addElement(new XoopsFormDhtmlTextArea($title, $name, $value, $rows, $cols));
-			}
-			break;
-		//case "gmap":
-			//$gmap = new efqGmap();
-//			$gmapHandler = new efqGmapHandler();
-//			$gmap_lon = '';
-//			$gmap_lat = '';
-//			$gmap_descr = '';
-//			if (intval($value) > 0) {
-//				$gmap->setData($gmapHandler->getGmapById($value));
-//				$gmap_lon = $gmap->getVar('lon');
-//				$gmap_lat = $gmap->getVar('lat');
-//				$gmap_descr = $gmap->getVar('descr');	
-//			}
-//			$form->addElement(new XoopsFormHidden($name.'_dataid', $name));
-//			$form->addElement(new XoopsFormText(_MD_GMAP_LON, $name.'_lon', 10, 30, $gmap_lon));
-//			$form->addElement(new XoopsFormText(_MD_GMAP_LAT, $name.'_lat', 10, 30, $gmap_lat));
-//			$form->addElement(new XoopsFormTextArea(_MD_GMAP_DESCR, $name.'_descr', $gmap_descr, 5, 50));
-//			break;
-		case "radio":
-			$options_arr = split("[|]",$options);
-			$form_radio = new XoopsFormRadio($title, $name, $value, 1);
-			foreach($options_arr as $option) {
-				$form_radio->addOption($option, $option);
-			}
-			$form->addElement($form_radio);
-			break;
-		case "rating":
-			$rating_options = array(1,2,3,4,5,6,7,8,9,10);
-			$form_rating = new XoopsFormSelect($title, $name, $value, 1);
-			$form_rating->addOption('0', '----');
-			foreach($rating_options as $option) {
-				$form_rating->addOption($option, $option);
-			}
-			$form->addElement($form_rating);
-			break;
-		case "select":
-			$options_arr = split("[|]",$options);
-			$value_arr = split("[|]",$value);
-			$form_select = new XoopsFormSelect($title, $name, $value, $size, $multiple);
-			$form_select->addOption('-', '----');
-			$form_select->setValue($value_arr);
-			foreach($options_arr as $key => $option) {
-				$form_select->addOption($option, $option);
-			}
-			$form->addElement($form_select);
-			break;
-		case "textarea":
-			if ($custom == '1') {
 				$form_textarea_tray = new XoopsFormElementTray($title, "", $name);
 				$form_textarea_tray->addElement(new XoopsFormLabel("", "<table><tr><td>"));
-				$form_textarea_tray->addElement(new XoopsFormText("<b>"._MD_CUSTOM_TITLE."</b></td><td>", "custom".$name, 50, 250, $customtitle));
+				$form_textarea_tray->addElement(new XoopsFormText("<b>"._MD_FIELDNAMES_URL_TITLE."</b></td><td>", "url_title".$name, 50, 250, $link[1]));
 				$form_textarea_tray->addElement(new XoopsFormLabel("", "</td></tr><tr><td>"));
-				$form_textarea_tray->addElement(new XoopsFormTextArea("<b>"._MD_CUSTOM_VALUE."</b></td><td>", $name, $value, $rows, $cols));
+				$form_textarea_tray->addElement(new XoopsFormText("<b>"._MD_FIELDNAMES_URL_LINK."</b></td><td>", "url_link".$name, 50, 250, $link[0]));
 				$form_textarea_tray->addElement(new XoopsFormLabel("", "</td></tr></table>"));
 				$form->addElement($form_textarea_tray);
-			} else {
-				$form->addElement(new XoopsFormTextArea($title, $name, $value, $rows, $cols));
-			}
-			break;
-		case "textbox":
-			if ($custom == '1') {
-				$form_text_tray = new XoopsFormElementTray($title, "", $name);
-				$form_text_tray->addElement(new XoopsFormLabel("", "<table><tr><td>"));
-				$form_text_tray->addElement(new XoopsFormText("<b>"._MD_CUSTOM_TITLE."</b></td><td>", "custom".$name, 50, 250, $customtitle));
-				$form_text_tray->addElement(new XoopsFormLabel("", "</td></tr><tr><td>"));
-				$form_text_tray->addElement(new XoopsFormText("<b>"._MD_CUSTOM_VALUE."</b></td><td>", $name, $size, $maxsize, $value));
-				$form_text_tray->addElement(new XoopsFormLabel("", "</td></tr></table>"));
-				$form->addElement($form_text_tray);
-			} else {
-				$form->addElement(new XoopsFormText($title, $name, 50, 250, $myts->makeTboxData4Show($value)));
-			}
-			break;
-		case "url":
-			if ($value != '') {
-				$link = explode('|',$value);
-			} else {
-				$link = array();
-				$link[0] = '';
-				$link[1] = '';
-			}
-			$form_textarea_tray = new XoopsFormElementTray($title, "", $name);
-			$form_textarea_tray->addElement(new XoopsFormLabel("", "<table><tr><td>"));
-			$form_textarea_tray->addElement(new XoopsFormText("<b>"._MD_FIELDNAMES_URL_TITLE."</b></td><td>", "url_title".$name, 50, 250, $link[1]));
-			$form_textarea_tray->addElement(new XoopsFormLabel("", "</td></tr><tr><td>"));
-			$form_textarea_tray->addElement(new XoopsFormText("<b>"._MD_FIELDNAMES_URL_LINK."</b></td><td>", "url_link".$name, 50, 250, $link[0]));
-			$form_textarea_tray->addElement(new XoopsFormLabel("", "</td></tr></table>"));
-			$form->addElement($form_textarea_tray);
-			break;
-		case "yesno":
-			$form->addElement(new XoopsFormRadioyn($title, $name, $value, _YES, _NO));
-			break;
-		default:
-			echo $fieldtype." is an unknown field type.";
-			break;
+				break;
+			case "yesno":
+				$form->addElement(new XoopsFormRadioyn($title, $name, $value, _YES, _NO));
+				break;
+			default:
+				echo $fieldtype." is an unknown field type.";
+				break;
 		}
 	}
 	
@@ -391,30 +391,30 @@ 
 		global $form, $myts;
 	
 		switch ($fieldtype) {
-		case "textbox":
-			$this->createSearchField_text($title, $name, $value, $options);
-			break;
-		case "textarea":
-			$this->createSearchField_text($title, $value, $options);
-			break;
-		case "yesno":
-			$form->addElement(new XoopsFormRadioyn($title, $name, "", _YES, _NO));
-			break;
-		case "radio":
-			$this->createSearchField_select($title, $name, $value, $options);
-			break;
-		case "checkbox":
-			$this->createSearchField_checkbox($title, $name, $value, $options);
-			break;
-		case "select":
-			$this->createSearchField_checkbox($title, $name, $value, $options);
-			break;
-		case "dhtml":
-			$this->createSearchField_text($title, $name, $value, $options);
-			break;
-		case "address":
-			//Query all address fields associated with the address type that belongs to the locid.
-			/* $addressfields = getAddressFields('0');
+			case "textbox":
+				$this->createSearchField_text($title, $name, $value, $options);
+				break;
+			case "textarea":
+				$this->createSearchField_text($title, $value, $options);
+				break;
+			case "yesno":
+				$form->addElement(new XoopsFormRadioyn($title, $name, "", _YES, _NO));
+				break;
+			case "radio":
+				$this->createSearchField_select($title, $name, $value, $options);
+				break;
+			case "checkbox":
+				$this->createSearchField_checkbox($title, $name, $value, $options);
+				break;
+			case "select":
+				$this->createSearchField_checkbox($title, $name, $value, $options);
+				break;
+			case "dhtml":
+				$this->createSearchField_text($title, $name, $value, $options);
+				break;
+			case "address":
+				//Query all address fields associated with the address type that belongs to the locid.
+				/* $addressfields = getAddressFields('0');
 			$fieldtitles = array('address' => _MD_DF_ADDRESS, 'address2' => _MD_DF_ADDRESS2, 'zip' => _MD_DF_ZIP, 'postcode' => _MD_DF_POSTCODE, 'lat' => _MD_DF_LAT, 'lon' => _MD_DF_LON, 'phone' => _MD_DF_PHONE, 'fax' => _MD_DF_FAX, 'mobile' => _MD_DF_MOBILE, 'city' => _MD_DF_CITY, 'country' => _MD_DF_COUNTRY, 'typename' => _MD_DF_TYPENAME);
 			$form->addElement(new XoopsFormLabel("", "<strong>".$title."</strong>"));
 			foreach ($addressfields['addressfields'] as $field => $fieldvalue) {
@@ -426,18 +426,18 @@ 
 			$form->addElement(new XoopsFormHidden("submitaddress","1"));
 			$form->addElement(new XoopsFormHidden($name, $value));
 			$form->addElement(new XoopsFormHidden("addrid", $value)); */
-			break;
-		case "rating":
-			$this->createSearchField_rating($title, $name, $value, $options);
-			break;
-		case "date":
-			$this->createSearchField_text($title, $name, $value, $options);
-			break;
-		case "url":
-			$this->createSearchField_text($title, $name, $value, $options);
-		default:
-			echo $fieldtype." geen bekend veldtype ";
-			break;
+				break;
+			case "rating":
+				$this->createSearchField_rating($title, $name, $value, $options);
+				break;
+			case "date":
+				$this->createSearchField_text($title, $name, $value, $options);
+				break;
+			case "url":
+				$this->createSearchField_text($title, $name, $value, $options);
+			default:
+				echo $fieldtype." geen bekend veldtype ";
+				break;
 		}
 	}
 	

Spacing +54 added lines, -54 removed lines

@@ -51,14 +51,14 @@ 
 	}
 	
 	function loadFormFiles() {
-		if ( !$this->formfilesloaded ) {
+		if (!$this->formfilesloaded) {
 			include_once XOOPS_ROOT_PATH.'/include/xoopscodes.php';
 			include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 			$this->setFormFilesLoaded();
 		}
 	}
 	
-	function setFormFilesLoaded($set=true) {
+	function setFormFilesLoaded($set = true) {
 		$this->formfilesloaded = true;
 	}
 
@@ -72,11 +72,11 @@ 
 			$value = $arr['value'];
 			$custom = $arr['custom'];
 			$customtitle = $arr['customtitle'];
-			$this->createField($title,$name,$fieldtype,$ext,$options,$value,$custom,$customtitle);
+			$this->createField($title, $name, $fieldtype, $ext, $options, $value, $custom, $customtitle);
 		}
 	}
 
-	function createField($title="", $name="", $fieldtype="", $ext="", $options="", $value="", $custom='0', $customtitle=NULL) {
+	function createField($title = "", $name = "", $fieldtype = "", $ext = "", $options = "", $value = "", $custom = '0', $customtitle = NULL) {
 		global $form, $myts, $moddir;
 		$this->loadFormFiles();
 		if ($customtitle == NULL) {
@@ -84,9 +84,9 @@ 
 		}
 		$multiple = false;
 		if ($ext != "") {
-			$ext_arr = split("[|]",$ext);
-			foreach($ext_arr as $ext_item) {
-				$ext_item_arr = split("[=]",$ext_item);
+			$ext_arr = split("[|]", $ext);
+			foreach ($ext_arr as $ext_item) {
+				$ext_item_arr = split("[=]", $ext_item);
 				$ext_item_name = $ext_item_arr[0];
 				$ext_item_value = $ext_item_arr[1];
 
@@ -107,7 +107,7 @@ 
 					$multiple = true;
 					$size = 5;
 				case "value":
-					if ($ext_item_value != '' and $value == '' ) {
+					if ($ext_item_value != '' and $value == '') {
 						$value = $ext_item_value;
 					} 
 					break;
@@ -129,14 +129,14 @@ 
 					$form->addElement(new XoopsFormText($title, $name.$field, 50, 250, $myts->makeTboxData4Show($storedvalue)));
 				}
 			}
-			$form->addElement(new XoopsFormHidden("submitaddress","1"));
+			$form->addElement(new XoopsFormHidden("submitaddress", "1"));
 			$form->addElement(new XoopsFormHidden($name, $value));
 			$form->addElement(new XoopsFormHidden("addrid", $value));
 			break;
 		case "checkbox":
-			$options_arr = split("[|]",$options);
+			$options_arr = split("[|]", $options);
 			$form_checkbox = new XoopsFormCheckbox($title, $name, $value, 1);
-			foreach($options_arr as $option) {
+			foreach ($options_arr as $option) {
 				$form_checkbox->addOption($option, $option);
 			}
 			$form->addElement($form_checkbox);
@@ -178,29 +178,29 @@ 
 //			$form->addElement(new XoopsFormTextArea(_MD_GMAP_DESCR, $name.'_descr', $gmap_descr, 5, 50));
 //			break;
 		case "radio":
-			$options_arr = split("[|]",$options);
+			$options_arr = split("[|]", $options);
 			$form_radio = new XoopsFormRadio($title, $name, $value, 1);
-			foreach($options_arr as $option) {
+			foreach ($options_arr as $option) {
 				$form_radio->addOption($option, $option);
 			}
 			$form->addElement($form_radio);
 			break;
 		case "rating":
-			$rating_options = array(1,2,3,4,5,6,7,8,9,10);
+			$rating_options = array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
 			$form_rating = new XoopsFormSelect($title, $name, $value, 1);
 			$form_rating->addOption('0', '----');
-			foreach($rating_options as $option) {
+			foreach ($rating_options as $option) {
 				$form_rating->addOption($option, $option);
 			}
 			$form->addElement($form_rating);
 			break;
 		case "select":
-			$options_arr = split("[|]",$options);
-			$value_arr = split("[|]",$value);
+			$options_arr = split("[|]", $options);
+			$value_arr = split("[|]", $value);
 			$form_select = new XoopsFormSelect($title, $name, $value, $size, $multiple);
 			$form_select->addOption('-', '----');
 			$form_select->setValue($value_arr);
-			foreach($options_arr as $key => $option) {
+			foreach ($options_arr as $key => $option) {
 				$form_select->addOption($option, $option);
 			}
 			$form->addElement($form_select);
@@ -233,7 +233,7 @@ 
 			break;
 		case "url":
 			if ($value != '') {
-				$link = explode('|',$value);
+				$link = explode('|', $value);
 			} else {
 				$link = array();
 				$link[0] = '';
@@ -387,7 +387,7 @@ 
 		}
 	}*/
 	
-	function createSearchField($title="", $name="", $fieldtype="", $ext="", $options="", $value="", $custom='0', $customtitle=NULL) {
+	function createSearchField($title = "", $name = "", $fieldtype = "", $ext = "", $options = "", $value = "", $custom = '0', $customtitle = NULL) {
 		global $form, $myts;
 	
 		switch ($fieldtype) {
@@ -449,12 +449,12 @@ 
 			 'contains' => _MD_CONTAINS,
 			 'begins' => _MD_BEGINSWITH,
 			 'ends' => _MD_ENDSWITH,
-			 'notcontain' => _MD_NOTCONTAIN );
+			 'notcontain' => _MD_NOTCONTAIN);
 		$form_tray = new XoopsFormElementTray($title, "", $name);
 		$form_tray->addElement(new XoopsFormLabel("", "<table><tr><td width=\"150\">"));
 		$form_select_constr = new XoopsFormSelect("", $name."constr", $value, 1);
 		//$form_select->addOption('0', '----');
-		foreach($options_arr_constr as $optionname => $option) {
+		foreach ($options_arr_constr as $optionname => $option) {
 			$form_select_constr->addOption($optionname, $option);
 		}
 		$form_tray->addElement($form_select_constr);
@@ -465,8 +465,8 @@ 
 	}
 	function createSearchField_checkbox($title = "", $name = "", $value = "", $options = "") {
 		global $form, $myts;
-		$options_arr = split("[|]",$options);
-		$countoptions = count($options_arr)+1;
+		$options_arr = split("[|]", $options);
+		$countoptions = count($options_arr) + 1;
 		$form_checkbox = new XoopsFormCheckBox($title, $name, $value);
 		foreach ($options_arr as $optionname) {
 			$form_checkbox->addOption($optionname, $optionname);
@@ -475,18 +475,18 @@ 
 	}
 	function createSearchField_select($title = "", $name = "", $value = "", $options = "") {
 		global $form, $myts;
-		$options_arr = split("[|]",$options);
-		$options_arr_constr = array('equal' => _MD_EQUAL_TO, 'notequal' => _MD_NOT_EQUAL_TO );
+		$options_arr = split("[|]", $options);
+		$options_arr_constr = array('equal' => _MD_EQUAL_TO, 'notequal' => _MD_NOT_EQUAL_TO);
 		$form_tray = new XoopsFormElementTray($title, "", $name);
 		$form_tray->addElement(new XoopsFormLabel("", "<table><tr><td width=\"150\">"));
 		$form_select_constr = new XoopsFormSelect("", $name, $value, 1);
-		foreach($options_arr_constr as $option) {
+		foreach ($options_arr_constr as $option) {
 			$form_select_constr->addOption($option, $option);
 		}
 		$form_tray->addElement($form_select_constr);
 		$form_tray->addElement(new XoopsFormLabel("", "</td><td>"));
-		$countoptions = count($options_arr)+1;
-		if ( $countoptions >= 5 ) {
+		$countoptions = count($options_arr) + 1;
+		if ($countoptions >= 5) {
 			$selectformsize = 5;
 		} else {
 			$selectformsize = $countoptions;
@@ -494,7 +494,7 @@ 
 		$form_select = new XoopsFormSelect("", $name, $value, $selectformsize);
 		$form_select->setExtra(" multiple='multiple'");
 		$form_select->addOption('0', '----');
-		foreach($options_arr as $option) {
+		foreach ($options_arr as $option) {
 			$form_select->addOption($option, $option);
 		}
 		$form_tray->addElement($form_select);
@@ -503,33 +503,33 @@ 
 	}
 	function createSearchField_rating2($title = "", $name = "", $value = "", $options = "") {
 		global $form, $myts;
-		$options_arr = split("[|]",$options);
-		$rating_options = array(1,2,3,4,5,6,7,8,9,10);
+		$options_arr = split("[|]", $options);
+		$rating_options = array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
 		$form_rating = new XoopsFormSelect($title, $name, $value, 1);
 		$form_rating->addOption('0', '----');
-		foreach($rating_options as $option) {
+		foreach ($rating_options as $option) {
 			$form_rating->addOption($option, $option);
 		}
 		$form->addElement($form_rating);
 	}
 	function createSearchField_rating($title = "", $name = "", $value = "", $options = "") {
 		global $form, $myts;
-		$options_arr = split("[|]",$options);
-		$rating_options = array(1,2,3,4,5,6,7,8,9,10);
+		$options_arr = split("[|]", $options);
+		$rating_options = array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
 		$options_arr_constr = array('equal' => _MD_EQUAL_TO,
 			 'notequal' => _MD_NOT_EQUAL_TO,
 			 'smaller' => _MD_SMALLER_THAN,
-			 'bigger' => _MD_GREATER_THAN );
+			 'bigger' => _MD_GREATER_THAN);
 		$form_tray = new XoopsFormElementTray($title, "", $name);
 		$form_tray->addElement(new XoopsFormLabel("", "<table><tr><td width=\"150\">"));
 		$form_select_constr = new XoopsFormSelect("", $name."constr", $value, 1);
-		foreach($options_arr_constr as $optionname => $option) {
+		foreach ($options_arr_constr as $optionname => $option) {
 			$form_select_constr->addOption($optionname, $option);
 		}
 		$form_tray->addElement($form_select_constr);
 		$form_tray->addElement(new XoopsFormLabel("", "</td><td>"));
-		$countoptions = count($rating_options)+1;
-		if ( $countoptions >= 5 ) {
+		$countoptions = count($rating_options) + 1;
+		if ($countoptions >= 5) {
 			$selectformsize = 5;
 		} else {
 			$selectformsize = $rating_options;
@@ -537,20 +537,20 @@ 
 		$form_select = new XoopsFormSelect("", $name, $value, $selectformsize);
 		//$form_select->setExtra(" multiple='multiple'");
 		$form_select->addOption('0', '----');
-		foreach($rating_options as $option) {
+		foreach ($rating_options as $option) {
 			$form_select->addOption($option, $option);
 		}
 		$form_tray->addElement($form_select);
 		$form_tray->addElement(new XoopsFormLabel("", "</td></tr></table>"));
 		$form->addElement($form_tray);
 	}
-	function getWidth(){
+	function getWidth() {
 		return $this->_width;
 	}
-	function getHeight(){
+	function getHeight() {
 		return $this->_height;
 	}
-	function getSrc(){
+	function getSrc() {
 		return $this->_src;
 	}
 	/*
@@ -558,7 +558,7 @@ 
 	 * 
      * @return	bool
 	 */
-	function isMultiple(){
+	function isMultiple() {
 		return $this->_multiple;
 	}
 
@@ -567,7 +567,7 @@ 
 	 * 
      * @return	int
 	 */
-	function getSize(){
+	function getSize() {
 		return $this->_size;
 	}
 
@@ -576,7 +576,7 @@ 
 	 * 
      * @return	array
 	 */
-	function getValue(){
+	function getValue() {
 		return $this->_value;
 	}
 
@@ -585,7 +585,7 @@ 
 	 * 
      * @param	$value	mixed
 	 */
-	function setValue($value){
+	function setValue($value) {
 		if (is_array($value)) {
 			foreach ($value as $v) {
 				$this->_value[] = $v;
@@ -601,8 +601,8 @@ 
 	 * @param	string  $value  "value" attribute
      * @param	string  $name   "name" attribute
 	 */
-	function addOption($value, $name=""){
-		if ( $name != "" ) {
+	function addOption($value, $name = "") {
+		if ($name != "") {
 			$this->_options[$value] = $name;
 		} else {
 			$this->_options[$value] = $value;
@@ -614,9 +614,9 @@ 
 	 * 
      * @param	array   $options    Associative array of value->name pairs
 	 */
-	function addOptionArray($options){
-		if ( is_array($options) ) {
-			foreach ( $options as $k=>$v ) {
+	function addOptionArray($options) {
+		if (is_array($options)) {
+			foreach ($options as $k=>$v) {
 				$this->addOption($k, $v);
 			}
 		}
@@ -627,7 +627,7 @@ 
 	 * 
      * @return	array   Associative array of value->name pairs
 	 */
-	function getOptions(){
+	function getOptions() {
 		return $this->_options;
 	}
 	
@@ -637,7 +637,7 @@ 
 	 * 
      * @return	string  HTML
 	 */
-	function render(){
+	function render() {
 		$ret = "<img src='".$this->getSrc()."' width='".$this->getWidth()."'  height='".$this->getHeight()."'";
 		$ret .= " />";
 		return $ret;

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;	
 	}
 
 	/**

Spacing +11 added lines, -11 removed lines

@@ -76,7 +76,7 @@ 
                 $this->assignVars($gmap);
             } else {
 				$$gmap_handler = xoops_getmodulehandler('gmap', $moddir);
-                $objGmap =& $$gmap_handler->get($directory);
+                $objGmap = & $$gmap_handler->get($directory);
                 foreach ($objGmap->vars as $k => $v) {
                     $this->assignVar($k, $v['value']);
                 }
@@ -85,7 +85,7 @@ 
         }
 	}
 	
-	function setKey($key='')
+	function setKey($key = '')
 	{
 		$this->_key = $key;
 	}
@@ -120,13 +120,13 @@ 
 		$this->_map .= $this->printTrigger();
 	}
 	
-	function printPlaceHolder($width=700, $height=500)
+	function printPlaceHolder($width = 700, $height = 500)
 	{
 		return '<div id="map" style="width:'.$width.'px; height:'.$height.'px"></div>';
 	}
 	
 	
-	function printScript($jsPointsArray='', $key='')
+	function printScript($jsPointsArray = '', $key = '')
 	{
 		global $icmsPreloadHandler;
 		
@@ -289,13 +289,13 @@ 
 		if (!$result = $this->db->query($sql)) {
             return false;
         }
-        $gmap =& $this->create(false);
+        $gmap = & $this->create(false);
 		$javaScript = '';
 		while ($row = $this->db->fetchArray($result)) {
 			//$row{'descr'} = addslashes($row{'descr'});
 			$row['descr'] = addslashes($row['descr']);
 			//$row{'descr'} = str_replace(';',',',$row{'descr'});
-			$row['descr'] = str_replace(';',',',$row['descr']);
+			$row['descr'] = str_replace(';', ',', $row['descr']);
 			//$javaScript .= "mArray.push('{$row{'lat'}};{$row{'lon'}};{$row{'descr'}}')\n";
 			//echo $row['lat'];
 			$javaScript .= "mArray.push('{".$row['lat']."};{".$row['lon']."};{".$row['descr']."}')\n";
@@ -304,7 +304,7 @@ 
 		return true;
 	}
 	
-	function getGmapById($id=0)
+	function getGmapById($id = 0)
 	{
 		$arr = array();
 		$sql = sprintf('SELECT * FROM %s WHERE id=%u',
@@ -317,7 +317,7 @@ 
 	    return $arr;
 	}
 	
-	function getByDataId($id=0)
+	function getByDataId($id = 0)
 	{
 		if ($id == false) {
             return false;
@@ -329,7 +329,7 @@ 
             if (!$result = $this->db->query($sql)) {
                 return false;
             }
-            $gmap =& $this->create(false);
+            $gmap = & $this->create(false);
             $gmap->assignVars($this->db->fetchArray($result));
             return $gmap;
         }
@@ -346,7 +346,7 @@ 
 	 * 
 	 * @return	bool	true if insertion is succesful, false if unsuccesful
 	 */
-	function insertGmap($obj, $forceQuery=false) {
+	function insertGmap($obj, $forceQuery = false) {
 		$tablename = "efqdiralpha1_gmaps";
 		$keyName = "id";
 		if ($obj instanceof efqGmap) {
@@ -398,7 +398,7 @@ 
 	 * 
 	 * @return	bool	true if update is succesful, false if unsuccesful
 	 */
-	function updateGmap($obj, $forceQuery=false) {
+	function updateGmap($obj, $forceQuery = false) {
 		$tablename = "efqdiralpha1_gmaps";
 		$keyName = "id";
 		if ($obj instanceof efqGmap) {

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) {

Spacing +34 added lines, -34 removed lines

@@ -36,7 +36,7 @@ 
 	 * Constructor
 	 * 
 	 */
-	function efqSubscription(){
+	function efqSubscription() {
 		//Constructor
 	}
 	
@@ -51,7 +51,7 @@ 
 	 * 
 	 * @return	array	$arr
 	 */
-	function durationArray($dashes=false) {
+	function durationArray($dashes = false) {
 		if ($dashes) {
 			$arr = array('0' => '---', '1' => _MD_DAYS, '2' => _MD_WEEKS, '3' => _MD_MONTHS, '4' => _MD_QUARTERS, '5' => _MD_YEARS);			
 		} else {
@@ -101,7 +101,7 @@ 
 	 * @param   int   $orderid - Default: '0' - Order ID
 	 * @param   int   $userid - Default: '0' - User ID
 	 */
-	function notifyExpireWarning($orderid='0', $userid='0') {
+	function notifyExpireWarning($orderid = '0', $userid = '0') {
 		global $xoopsConfig, $moddir;
 		include_once(XOOPS_ROOT_PATH."/class/mail/xoopsmultimailer.php");
 		
@@ -135,7 +135,7 @@ 
 	{
 		//Instantiate class
 		global $eh;
-		$this->db =& XoopsDatabaseFactory::getDatabaseConnection();
+		$this->db = & XoopsDatabaseFactory::getDatabaseConnection();
 		$this->errorhandler = $eh;	
 	}
 	
@@ -163,8 +163,8 @@ 
 	 * @param   int   $orderid - Default: '0' - Order ID
 	 * @return	array	$arr
 	 */	
-	function delete($orderid='0') {
-		if ( $orderid != '0' ) {
+	function delete($orderid = '0') {
+		if ($orderid != '0') {
 			$sql = "DELETE FROM ".$this->db->prefix('efqdiralpha1_subscr_orders')." WHERE orderid=".intval($orderid)."";
 			$this->db->query($sql);
 			return true;
@@ -186,8 +186,8 @@ 
 	function createOrder($itemid = 0) {
 		$orderid = 0;
 		if ($itemid != 0) {
-			if ( isset( $_POST['typeofferid'] ) ) {
-				$typeofferid = split("_",$_POST['typeofferid']);
+			if (isset($_POST['typeofferid'])) {
+				$typeofferid = split("_", $_POST['typeofferid']);
 				$typeid = $typeofferid[0];
 				$offerid = $typeofferid[1];
 			} else {
@@ -240,12 +240,12 @@ 
 		return $orderid;
 	}*/
 	
-	function getOrderItemName($offerid=0) {
+	function getOrderItemName($offerid = 0) {
 		$sql = "SELECT o.offerid, o.duration, o.count, o.price, o.currency, o.descr, t.typeid, t.typename FROM ".$this->db->prefix("efqdiralpha1_subscr_offers")." o, ".$this->db->prefix("efqdiralpha1_itemtypes")." t WHERE o.typeid=t.typeid AND o.offerid='$offerid' ORDER BY t.typename ASC";
 		$result = $this->db->query($sql);
 		$numrows = $this->db->getRowsNum($result);
 		$result = $this->db->query($sql);
-		while ( list($offerid, $duration, $count, $price, $currency, $descr, $typeid, $typename) = $this->db->fetchRow($result) ) {
+		while (list($offerid, $duration, $count, $price, $currency, $descr, $typeid, $typename) = $this->db->fetchRow($result)) {
 			if ($count == '1') {
 				$duration_arr = $this->durationSingleArray();
 			} else {
@@ -258,33 +258,33 @@ 
 	}
 	
 	
-	function updateOrder( $orderid='0', $status='1', $startdate='0', $billto='0' ) {
+	function updateOrder($orderid = '0', $status = '1', $startdate = '0', $billto = '0') {
 		$ordervars = $this->getOrderVars($orderid);
 		$typeid = $ordervars['typeid'];
 		$itemid = $ordervars['itemid'];
 		$sql = "UPDATE ".$this->db->prefix("efqdiralpha1_subscr_orders")." SET status='$status'";
-		if ( $startdate != '0' ) {
+		if ($startdate != '0') {
 			$sql .= ", startdate='$startdate'";
 		}
-		if ( $billto != '0' ) {
+		if ($billto != '0') {
 			$sql .= ", billto='$billto'";
 		}
 		$sql .= " WHERE orderid=".intval($orderid)."";
 		$this->db->queryF($sql);
-		if ( $startdate > time() ) {
-			$this->updateScheduler( 'add', $itemid, $typeid, $startdate );	
+		if ($startdate > time()) {
+			$this->updateScheduler('add', $itemid, $typeid, $startdate);	
 		} else {
-			$this->updateItem( $itemid, $typeid );
+			$this->updateItem($itemid, $typeid);
 		}
 		
 	}
 	
-	function getOrderVars( $orderid='0' ) {
+	function getOrderVars($orderid = '0') {
 		$sql = "SELECT ord.uid, ord.billto, ord.startdate, ord.typeid, ord.status, ord.itemid, ord.offerid FROM ".$this->db->prefix("efqdiralpha1_subscr_orders")." ord WHERE ord.orderid=".intval($orderid)."";
 		$result = $this->db->query($sql);
 		$numrows = $this->db->getRowsNum($result);
 		$arr = $this->db->fetchArray($result);
-		while ( list($uid, $billto, $startdate, $typeid, $status, $itemid, $offerid ) = $this->db->fetchRow($result) ) {
+		while (list($uid, $billto, $startdate, $typeid, $status, $itemid, $offerid) = $this->db->fetchRow($result)) {
 			$arr['uid'] = $uid;
 			$arr['billto'] = $billto;
 			$arr['startdate'] = $startdate;
@@ -296,7 +296,7 @@ 
 		return $arr;
 	}
 	
-	function getOfferVars( $offerid='0', $showactive='1' ) {
+	function getOfferVars($offerid = '0', $showactive = '1') {
 		$sql = "SELECT count, duration FROM ".$this->db->prefix("efqdiralpha1_subscr_offers")." WHERE offerid=".intval($offerid)."";
 		if ($showactive == '1') {
 			$sql .= " AND activeyn='1'";
@@ -305,7 +305,7 @@ 
 		$numrows = $this->db->getRowsNum($result);
 		$arr = array();
 		$arr = $this->db->fetchArray($result);
-		while ( list( $count, $duration ) = $this->db->fetchRow($result) ) {
+		while (list($count, $duration) = $this->db->fetchRow($result)) {
 			$arr['count'] = $count;
 			$arr['duration'] = $duration;
 		}
@@ -323,8 +323,8 @@ 
 		}
 	}*/
 	
-	function updateItem( $itemid='0', $typeid='0' ) {
-		if ( $itemid != '0' && $typeid != '0' ) {
+	function updateItem($itemid = '0', $typeid = '0') {
+		if ($itemid != '0' && $typeid != '0') {
 			$sql = "UPDATE ".$this->db->prefix("efqdiralpha1_items")." SET typeid='".intval($typeid)."' WHERE itemid=".intval($itemid)."";
 			$this->db->queryF($sql);
 			return true;
@@ -335,11 +335,11 @@ 
 	
 	
 	
-	function getNewBillto($offerid='0') {
+	function getNewBillto($offerid = '0') {
 				
 	}
 	
-	function changeItemType($itemid=0, $itemtype=0) {
+	function changeItemType($itemid = 0, $itemtype = 0) {
 		global $xoopsDB, $eh;
 		$sql = "UPDATE ".$this->db->prefix('efqdiralpha1_items')." SET typeid=$itemtype WHERE itemid=intval($itemid)";
 		$this->db->queryF($sql);
@@ -357,7 +357,7 @@ 
 		if ($dashes != '0') {
 			$arr = array('0' => '---');
 		}
-		while ( list($offerid, $duration, $count, $price, $currency, $descr, $typeid, $typename) = $this->db->fetchRow($result) ) {
+		while (list($offerid, $duration, $count, $price, $currency, $descr, $typeid, $typename) = $this->db->fetchRow($result)) {
 			if ($count == '1') {
 				$duration_arr = $this->durationSingleArray();
 			} else {
@@ -369,17 +369,17 @@ 
 		return $arr;
 	}
 	
-	function itemsSelBox($selname="", $none=false, $preselected=0) {
+	function itemsSelBox($selname = "", $none = false, $preselected = 0) {
 		$sql = "SELECT typeid, typename FROM ".$this->db->prefix("efqdiralpha1_itemtypes")."";
 		$result = $this->db->query($sql);
 		$numrows = $this->db->getRowsNum($result);
 		echo "<select name='".$selname."'";
 		echo ">\n";
-		if ( $none ) {
+		if ($none) {
 			echo "<option value='0'>----</option>\n";
 		}
-		while ( list($typeid, $typename) = $this->db->fetchRow($result) ) {
-			if ( $preselected == $typeid ) {
+		while (list($typeid, $typename) = $this->db->fetchRow($result)) {
+			if ($preselected == $typeid) {
 				$sel = "&nbsp;selected";
 			} else {
 				$sel = "";
@@ -397,13 +397,13 @@ 
 		if ($dashes != 0) {
 			$arr = array('0' => '---');
 		}
-		while ( list($typeid, $typename) = $this->db->fetchRow($result) ) {
+		while (list($typeid, $typename) = $this->db->fetchRow($result)) {
 			$arr[$typeid] = $typename;
 		}
 		return $arr;
 	}
 	
-	function countSubscriptionsForType($typeid=0) {
+	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;
@@ -412,7 +412,7 @@ 
         return $ret;
 	}
 	
-	function getOffers($dirid=0) {
+	function getOffers($dirid = 0) {
 		$extendedwhere = '';
 		if ($dirid != 0) {
 			$extendedwhere = ' AND o.dirid='.intval($dirid);
@@ -420,7 +420,7 @@ 
 		$sql = "SELECT o.dirid, o.offerid, o.typeid, o.title, o.duration, o.count, o.price, o.activeyn, o.currency, o.descr, t.typename, t.level FROM ".$this->db->prefix("efqdiralpha1_itemtypes")." t, ".$this->db->prefix("efqdiralpha1_subscr_offers")." o WHERE o.typeid=t.typeid".$extendedwhere;
 		$result = $this->db->query($sql) or $this->errorhandler->show("0013");
 		$arr = array();
-		while(list($dirid, $offerid, $typeid, $title, $duration, $count, $price, $activeyn, $currency, $descr, $typename, $level) = $this->db->fetchRow($result)) {
+		while (list($dirid, $offerid, $typeid, $title, $duration, $count, $price, $activeyn, $currency, $descr, $typename, $level) = $this->db->fetchRow($result)) {
 			$arr[] = array('dirid' => $dirid,
 				'offerid' => $offerid,
 				'typeid' => $typeid,
@@ -432,7 +432,7 @@ 
 				'currency' => $currency,
 				'descr' => $descr,
 				'typename' => $typename,
-				'level' => $level );			
+				'level' => $level);			
 		}
 		return $arr;
 	}

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;
 	}
 
 	/**

Spacing +12 added lines, -12 removed lines

@@ -50,7 +50,7 @@ 
    * @param bool $itemtype
    * @return
    */
-	function efqItemType($obj=false)
+	function efqItemType($obj = false)
 	{
 		global $moddir;
 		$this->db = Database::getInstance();
@@ -96,7 +96,7 @@ 
 	 * 
 	 * @return	bool	true if insertion is succesful, false if unsuccesful
 	 */
-	function insert($obj, $forceQuery=false) {
+	function insert($obj, $forceQuery = false) {
 		$tablename = "efqdiralpha1_itemtypes";
 		$keyName = "typeid";
 		$excludedVars = array();
@@ -113,7 +113,7 @@ 
 		$strFields = "";
 		$strValues = "";
 		foreach ($cleanvars as $k => $v) {
-			if ( !in_array($k, $excludedVars) ) {
+			if (!in_array($k, $excludedVars)) {
 				$strFields .= $k;
 				$strValues .= "'".$v."'";
 				if ($i < $countVars) {
@@ -150,7 +150,7 @@ 
 	 * 
 	 * @return	bool	true if update is succesful, false if unsuccesful
 	 */
-	function update($obj, $forceQuery=false) {
+	function update($obj, $forceQuery = false) {
 		$tablename = "efqdiralpha1_itemtypes";
 		$keyName = "typeid";
 		$excludedVars = array();
@@ -168,7 +168,7 @@ 
 		$strSet = "";
 		$strValues = "";
 		foreach ($cleanvars as $k => $v) {
-			if ( !in_array($k, $excludedVars) ) {
+			if (!in_array($k, $excludedVars)) {
 				if ($i < $countVars and $i > 0) {
 					$strSet .= ", ";
 				}
@@ -196,13 +196,13 @@ 
    * 
    * @return bool true or false
    */
-	function set($typeid=0) {
+	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 ) {
+        if ($numrows > 0) {
 	        while (list($typeid, $typename, $level, $dirid) = $this->db->fetchRow($result)) {
-				if (! $this->objItemType) {
+				if (!$this->objItemType) {
 					$this->objItemType = new efqSubscriptionOffer();
 				}
 				$this->objItemType->setVar('typeid', $typeid);
@@ -226,15 +226,15 @@ 
    * @param integer $dirid
    * @return array $arr or boolean false
    */
-	function getByDir($dirid=0)	{
+	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;
         }
 		$numrows = $this->db->getRowsNum($result);
-        while ( list($typeid,$typename,$level) = $this->db->fetchRow($result) ) {
-			$arr[$typeid] = array('typeid' => $typeid,'typename' => $typename,'level' => $level);
+        while (list($typeid, $typename, $level) = $this->db->fetchRow($result)) {
+			$arr[$typeid] = array('typeid' => $typeid, 'typename' => $typename, 'level' => $level);
 		}
         return $arr;
 	}
@@ -253,7 +253,7 @@ 
 		$tablename = "efqdiralpha1_itemtypes";
 		$keyName = "typeid";
 		$id = $obj->getVar($keyName);
-		if ( $id != 0 ) {
+		if ($id != 0) {
 			$sql = "DELETE FROM ".$this->db->prefix($tablename)." WHERE ".$keyName."=".intval($id)."";
 			$this->db->queryF($sql);
 			return true;