XoopsModules25x / efqdirectory

class/class.listing.php

Indentation +32 added lines, -32 removed lines

@@ -56,17 +56,17 @@ 
 		// class constructor;
 		$this->setCurrentUser();		
 		$this->initVar('itemid', XOBJ_DTYPE_INT, 0, true);
-        $this->initVar('logourl', XOBJ_DTYPE_TXTBOX, null, false, 255);
-        $this->initVar('uid', XOBJ_DTYPE_INT, 0, true);
-        $this->initVar('status', XOBJ_DTYPE_INT, 0, true);
-        $this->initVar('created', XOBJ_DTYPE_INT, 0, true); 
-        $this->initVar('title', XOBJ_DTYPE_TXTBOX, null, false, 255);
-        $this->initVar('hits', XOBJ_DTYPE_INT, 0, true);
-        $this->initVar('rating', XOBJ_DTYPE_OTHER, 0.0, true);
-        $this->initVar('votes', XOBJ_DTYPE_INT, 0, true);     
-        $this->initVar('typeid', XOBJ_DTYPE_INT, 0, true); 
-        $this->initVar('dirid', XOBJ_DTYPE_INT, 0, true);
-        $this->initVar('description', XOBJ_DTYPE_TXTAREA, null, false);
+		$this->initVar('logourl', XOBJ_DTYPE_TXTBOX, null, false, 255);
+		$this->initVar('uid', XOBJ_DTYPE_INT, 0, true);
+		$this->initVar('status', XOBJ_DTYPE_INT, 0, true);
+		$this->initVar('created', XOBJ_DTYPE_INT, 0, true); 
+		$this->initVar('title', XOBJ_DTYPE_TXTBOX, null, false, 255);
+		$this->initVar('hits', XOBJ_DTYPE_INT, 0, true);
+		$this->initVar('rating', XOBJ_DTYPE_OTHER, 0.0, true);
+		$this->initVar('votes', XOBJ_DTYPE_INT, 0, true);     
+		$this->initVar('typeid', XOBJ_DTYPE_INT, 0, true); 
+		$this->initVar('dirid', XOBJ_DTYPE_INT, 0, true);
+		$this->initVar('description', XOBJ_DTYPE_TXTAREA, null, false);
 	}	
 		
 	/**
@@ -82,16 +82,16 @@ 
 		global $moddir;
 		if ($arr != false and $handlername != false) {
 			if (is_array($arr)) {
-                $this->assignVars($arr);
-            } else {
+				$this->assignVars($arr);
+			} else {
 				$obj_handler = xoops_getmodulehandler($handlername, $moddir);
-                $object =& $obj_handler->get($arr);
-                foreach ($object->vars as $k => $v) {
-                    $this->assignVar($k, $v['value']);
-                }
-                unset($object);
-            }
-        }
+				$object =& $obj_handler->get($arr);
+				foreach ($object->vars as $k => $v) {
+					$this->assignVar($k, $v['value']);
+				}
+				unset($object);
+			}
+		}
 	}
 	
 	function setDataTypes($arr = array()) {
@@ -204,7 +204,7 @@ 
 		}		
 		$result = $this->db->query($sql);
 		$numrows = $this->db->getRowsNum($result);
-	    $arr = array();
+		$arr = array();
 		if ( $numrows > 0 ) {
 			while(list($cid, $active) = $this->db->fetchRow($result)) {
 				$arr[] = $cid;
@@ -232,7 +232,7 @@ 
 		}
 		$result = $this->db->query($sql);
 		$numrows = $this->db->getRowsNum($result);
-	    $arr = array();
+		$arr = array();
 		if ( $numrows > 0 ) {
 			while(list($cid) = $this->db->fetchRow($result)) {
 				$arr[] = $cid;
@@ -257,16 +257,16 @@ 
 		$result = $this->db->query($sql);
 		$arr = array();
 		if (!$result) {
-            return $arr;
-        } else {
-        	$numrows = $this->db->getRowsNum($result);
-        	if ($numrows == 0) {
-        		return $arr;
-        	} else {
-        		$arr = $this->db->fetchArray($result);
-        	}
-        }
-        return $arr;
+			return $arr;
+		} else {
+			$numrows = $this->db->getRowsNum($result);
+			if ($numrows == 0) {
+				return $arr;
+			} else {
+				$arr = $this->db->fetchArray($result);
+			}
+		}
+		return $arr;
 	}
 	
 	function getListingsByDirectory( $dirid=0, $show=10, $min=0, $orderby=false ) {

Switch Indentation +40 added lines, -40 removed lines

@@ -318,25 +318,25 @@ 
 	function getFieldValue($fieldtype="", $options="", $value=0) {
 		global $myts, $moddir;
 		switch ($fieldtype) {
-		case "dhtml":
-			return $myts->makeTareaData4Show($value);
-			break;
-		case "gmap":
-			$gmapHandler = new efqGmapHandler();
-			$gmap = new efqGmap();
-			$gmap->setPointsJS($gmapHandler->getPointsJS($gmap));
-			$gmap->generateMap();
-			$ret = $gmap->showMap();
-			unset($gmap);
-			unset($gmapHandler);
-			return $ret;
-			break;
-		case "radio":
-			return $myts->makeTboxData4Show($value);
-			break;
-		case "rating":
-			$xoops_url = XOOPS_URL;
-			switch ($value) {
+			case "dhtml":
+				return $myts->makeTareaData4Show($value);
+				break;
+			case "gmap":
+				$gmapHandler = new efqGmapHandler();
+				$gmap = new efqGmap();
+				$gmap->setPointsJS($gmapHandler->getPointsJS($gmap));
+				$gmap->generateMap();
+				$ret = $gmap->showMap();
+				unset($gmap);
+				unset($gmapHandler);
+				return $ret;
+				break;
+			case "radio":
+				return $myts->makeTboxData4Show($value);
+				break;
+			case "rating":
+				$xoops_url = XOOPS_URL;
+				switch ($value) {
 				case 1:
 					$src = "$xoops_url/modules/$moddir/images/rating_1.gif";
 					break;
@@ -369,30 +369,30 @@ 
 					break;
 				default:
 				$src = "";
-			}			
+				}			
 			$rating = "<img src=\"$src\" />";
 			return $rating;
 			break;
-		case "select":
-			return $myts->makeTboxData4Show($value);
-			break;
-		case "textbox":
-			return $myts->makeTboxData4Show($value);
-			break;
-		case "url":
-			$link = explode('|',$value);
-			return '<a href="'.$myts->makeTboxData4Show($link[0]).'" title="'.$myts->makeTboxData4Show($link[1]).'">'.$myts->makeTboxData4Show($link[0]).'</a>';
-			break;
-		case "yesno":
-			if ($value == '1') {
-				return _YES;
-			} else {
-				return _NO;
-			}
-			break;
-		default:
-			return $myts->makeTboxData4Show($value);
-			break;
+			case "select":
+				return $myts->makeTboxData4Show($value);
+				break;
+			case "textbox":
+				return $myts->makeTboxData4Show($value);
+				break;
+			case "url":
+				$link = explode('|',$value);
+				return '<a href="'.$myts->makeTboxData4Show($link[0]).'" title="'.$myts->makeTboxData4Show($link[1]).'">'.$myts->makeTboxData4Show($link[0]).'</a>';
+				break;
+			case "yesno":
+				if ($value == '1') {
+					return _YES;
+				} else {
+					return _NO;
+				}
+				break;
+			default:
+				return $myts->makeTboxData4Show($value);
+				break;
 		}
 	}
 	

Spacing +27 added lines, -27 removed lines

@@ -77,7 +77,7 @@ 
 	 * 
 	 * @param   array   $listing	Array with listing details
 	 */
-	function setListingVars($arr=array(),$handlername=false)
+	function setListingVars($arr = array(), $handlername = false)
 	{
 		global $moddir;
 		if ($arr != false and $handlername != false) {
@@ -85,7 +85,7 @@ 
                 $this->assignVars($arr);
             } else {
 				$obj_handler = xoops_getmodulehandler($handlername, $moddir);
-                $object =& $obj_handler->get($arr);
+                $object = & $obj_handler->get($arr);
                 foreach ($object->vars as $k => $v) {
                     $this->assignVar($k, $v['value']);
                 }
@@ -116,12 +116,12 @@ 
 	}
 	
 	//Set variable $_updated to true of false (default)
-	function setUpdated($set=false) {
+	function setUpdated($set = false) {
 		$this->_updated = $set;
 	}
 	
 	//Set variable $_inserted to true of false (default)
-	function setInserted($set=false) {
+	function setInserted($set = false) {
 		$this->_inserted = $set;
 	}
 	
@@ -144,7 +144,7 @@ 
 	{
 		//Instantiate class
 		global $eh;
-		$this->db =& XoopsDatabaseFactory::getDatabaseConnection();
+		$this->db = & XoopsDatabaseFactory::getDatabaseConnection();
 		$this->errorhandler = $eh;
 	}
 	
@@ -159,7 +159,7 @@ 
 	 * 
 	 * @return	bool	true if update is succesful, false if unsuccesful
 	 */
-	function updateStatus($itemid=0, $newstatus='1') {
+	function updateStatus($itemid = 0, $newstatus = '1') {
 		$sql = "UPDATE ".$this->db->prefix("efqdiralpha1_items")." SET status = ".$newstatus." WHERE itemid = ".intval($itemid)."";
 		if ($this->db->query($sql)) {
 			return true;	
@@ -177,7 +177,7 @@ 
 	 * 
 	 * @return	bool	true if update is succesful, false if unsuccesful
 	 */
-	function incrementHits($itemid=0) {
+	function incrementHits($itemid = 0) {
 		$sql = sprintf("UPDATE %s SET hits = hits+1 WHERE itemid = %u AND status = 2", $this->db->prefix("efqdiralpha1_items"), intval($itemid));
 		if ($this->db->queryF($sql)) {
 			return true;	
@@ -197,7 +197,7 @@ 
 	 * 
 	 * @return	array	$arr Array with category ID's
 	 */
-	function getLinkedCategories($itemid='0', $dirid='0', $activeonly=true) {
+	function getLinkedCategories($itemid = '0', $dirid = '0', $activeonly = true) {
 		$sql = "SELECT c.cid, x.active FROM ".$this->db->prefix("efqdiralpha1_cat")." c, ".$this->db->prefix("efqdiralpha1_item_x_cat")." x WHERE c.cid=x.cid AND x.itemid=".intval($itemid)." AND c.dirid='".intval($dirid)."'";
 		if ($activeonly) {
 			$sql .= " AND c.active='1'";	
@@ -205,8 +205,8 @@ 
 		$result = $this->db->query($sql);
 		$numrows = $this->db->getRowsNum($result);
 	    $arr = array();
-		if ( $numrows > 0 ) {
-			while(list($cid, $active) = $this->db->fetchRow($result)) {
+		if ($numrows > 0) {
+			while (list($cid, $active) = $this->db->fetchRow($result)) {
 				$arr[] = $cid;
 			}
 		}
@@ -225,7 +225,7 @@ 
 	 * 
 	 * @return	array	$arr Array with category ID's
 	 */
-	function getAllCategories($dirid='0', $activeonly=true) {
+	function getAllCategories($dirid = '0', $activeonly = true) {
 		$sql = "SELECT cid FROM ".$this->db->prefix("efqdiralpha1_cat")." WHERE dirid='".intval($dirid)."'";
 		if ($activeonly) {
 			$sql .= " AND active='1'";	
@@ -233,8 +233,8 @@ 
 		$result = $this->db->query($sql);
 		$numrows = $this->db->getRowsNum($result);
 	    $arr = array();
-		if ( $numrows > 0 ) {
-			while(list($cid) = $this->db->fetchRow($result)) {
+		if ($numrows > 0) {
+			while (list($cid) = $this->db->fetchRow($result)) {
 				$arr[] = $cid;
 			}
 		}
@@ -269,27 +269,27 @@ 
         return $arr;
 	}
 	
-	function getListingsByDirectory( $dirid=0, $show=10, $min=0, $orderby=false ) {
+	function getListingsByDirectory($dirid = 0, $show = 10, $min = 0, $orderby = false) {
 		$sql = "SELECT l.itemid, l.logourl, l.uid, l.status, l.created, l.title, l.hits, l.rating, l.votes, l.typeid, l.dirid, t.description FROM ".$this->db->prefix("efqdiralpha1_cat")." c, ".$this->db->prefix("efqdiralpha1_item_x_cat")." x, ".$this->db->prefix("efqdiralpha1_items")." l LEFT JOIN ".$this->db->prefix("efqdiralpha1_item_text")." t ON (l.itemid=t.itemid) WHERE x.cid=c.cid AND l.itemid=x.itemid AND c.showpopular=1 AND l.status='2' AND l.dirid = '".$dirid."' ORDER BY l.created DESC";
-		$result = $this->db->query($sql) or  $this->errorhandler->show("0013");
+		$result = $this->db->query($sql) or $this->errorhandler->show("0013");
 		return $result;
 	}
 	
-	function getListingsByCategory( $catid=0, $show=10, $min=0, $orderby=false ) {
+	function getListingsByCategory($catid = 0, $show = 10, $min = 0, $orderby = false) {
 		$sql = "SELECT i.itemid, i.logourl, i.uid, i.status, i.created, i.title, i.hits, i.rating, i.votes, i.typeid, i.dirid, t.level, txt.description, x.cid FROM ".$this->db->prefix("efqdiralpha1_item_x_cat")." x, ".$this->db->prefix("efqdiralpha1_items")." i LEFT JOIN ".$this->db->prefix("efqdiralpha1_itemtypes")." t ON (t.typeid=i.typeid) LEFT JOIN ".$this->db->prefix("efqdiralpha1_item_text")." txt ON (txt.itemid=i.itemid) WHERE i.itemid=x.itemid AND x.cid=$catid AND x.active='1' AND i.status='2' ORDER BY $orderby";
-		$result = $this->db->query($sql) or  $this->errorhandler->show("0013");
+		$result = $this->db->query($sql) or $this->errorhandler->show("0013");
 		return $result;
 	}
 	
-	function getDataTypes( $itemid, $show=10, $min=0 ) {
+	function getDataTypes($itemid, $show = 10, $min = 0) {
 		$sql = "SELECT DISTINCT t.dtypeid, t.title, t.section, t.icon, f.typeid, f.fieldtype, f.ext, t.options, t.custom, d.itemid, d.value, d.customtitle ";
 		$sql .= "FROM ".$this->db->prefix("efqdiralpha1_item_x_cat")." ic, ".$this->db->prefix("efqdiralpha1_dtypes_x_cat")." xc, ".$this->db->prefix("efqdiralpha1_fieldtypes")." f, ".$this->db->prefix("efqdiralpha1_dtypes")." t ";
 		$sql .= "LEFT JOIN ".$this->db->prefix("efqdiralpha1_data")." d ON (t.dtypeid=d.dtypeid AND d.itemid=".intval($itemid).") ";
 		$sql .= "WHERE ic.cid=xc.cid AND ic.active='1' AND xc.dtypeid=t.dtypeid AND t.fieldtypeid=f.typeid AND t.activeyn='1' AND ic.itemid=".intval($itemid)." ORDER BY t.seq ASC";
-		$result=$this->db->query($sql,$show,$min) or $this->errorhandler->show("0013");
+		$result = $this->db->query($sql, $show, $min) or $this->errorhandler->show("0013");
 		$numrows = $this->db->getRowsNum($result);
 		$arr = array();
-		while(list($dtypeid, $title, $section, $icon, $ftypeid, $fieldtype, $ext, $options, $custom, $itemid, $value, $customtitle) = $this->db->fetchRow($result)) {
+		while (list($dtypeid, $title, $section, $icon, $ftypeid, $fieldtype, $ext, $options, $custom, $itemid, $value, $customtitle) = $this->db->fetchRow($result)) {
 			$fieldvalue = $this->getFieldValue($fieldtype, $options, $value);
 			if ($icon != '') {
 				$iconurl = "<img src=\"uploads/$icon\" />";
@@ -310,12 +310,12 @@ 
 				'custom' => $custom,
 				'itemid' => $itemid,
 				'value' => $fieldvalue,
-				'customtitle' => $customtitle );			
+				'customtitle' => $customtitle);			
 		}
 		return $arr;
 	}
 	
-	function getFieldValue($fieldtype="", $options="", $value=0) {
+	function getFieldValue($fieldtype = "", $options = "", $value = 0) {
 		global $myts, $moddir;
 		switch ($fieldtype) {
 		case "dhtml":
@@ -380,7 +380,7 @@ 
 			return $myts->makeTboxData4Show($value);
 			break;
 		case "url":
-			$link = explode('|',$value);
+			$link = explode('|', $value);
 			return '<a href="'.$myts->makeTboxData4Show($link[0]).'" title="'.$myts->makeTboxData4Show($link[1]).'">'.$myts->makeTboxData4Show($link[0]).'</a>';
 			break;
 		case "yesno":
@@ -407,7 +407,7 @@ 
 	 * 
 	 * @return	bool	true if update is succesful, false if unsuccesful
 	 */
-	function updateDescription($itemid=0, $descr="") {
+	function updateDescription($itemid = 0, $descr = "") {
 		$sql = sprintf("UPDATE %s SET description = %s WHERE itemid = %u", $this->db->prefix("efqdiralpha1_item_text"), $this->db->quoteString($descr), intval($itemid));
 		if ($this->db->queryF($sql)) {
 			return true;	
@@ -426,7 +426,7 @@ 
 	 * 
 	 * @return	bool	true if update is succesful, false if unsuccesful
 	 */
-	function insertDescription($itemid=0, $descr="") {
+	function insertDescription($itemid = 0, $descr = "") {
 		$sql = sprintf("INSERT INTO %s (itemid, description) VALUES (%u, %s)", $this->db->prefix("efqdiralpha1_item_text"), intval($itemid), $this->db->quoteString($descr));
 		if ($this->db->queryF($sql)) {
 			return true;	
@@ -444,7 +444,7 @@ 
 	 * 
 	 * @return	bool	true if update is succesful, false if unsuccesful
 	 */
-	function updateListing($obj, $forceQuery=false) {
+	function updateListing($obj, $forceQuery = false) {
 		$tablename = "efqdiralpha1_items";
 		$keyName = "itemid";
 		if ($obj instanceof efqListing) {
@@ -492,7 +492,7 @@ 
 	 * 
 	 * @return	bool	true if insertion is succesful, false if unsuccesful
 	 */
-	function insertListing($obj, $forceQuery=false) {
+	function insertListing($obj, $forceQuery = false) {
 		$tablename = "efqdiralpha1_items";
 		$keyName = "itemid";
 		if ($obj instanceof efqListing) {

class/class.datafield.php

Indentation +6 added lines, -6 removed lines

@@ -74,12 +74,12 @@
 	
 	function getDataFields( $itemid, $show=10, $min=0 ) {
 		$sql = "SELECT DISTINCT t.dtypeid, t.title, t.section, t.icon, f.typeid, f.fieldtype, f.ext, t.options, d.itemid, d.value, d.customtitle, t.custom ";
-        $sql .= "FROM ".$this->db->prefix("efqdiralpha1_item_x_cat")." ic, ".$this->db->prefix("efqdiralpha1_dtypes_x_cat")." xc, ".$this->db->prefix("efqdiralpha1_fieldtypes")." f, ".$this->db->prefix("efqdiralpha1_dtypes")." t ";
-        $sql .= "LEFT JOIN ".$this->db->prefix("efqdiralpha1_data") .
-            " d ON (t.dtypeid=d.dtypeid AND d.itemid=".$itemid.") ";
-        $sql .= "WHERE ic.cid=xc.cid AND ic.active='1' AND xc.dtypeid=t.dtypeid AND t.fieldtypeid=f.typeid AND t.activeyn='1' AND ic.itemid=".$itemid."";
-        $data_result = $this->db->query($sql) or $this->errorhandler->show("0013");
-        //$numrows = $this->db->getRowsNum($data_result);
+		$sql .= "FROM ".$this->db->prefix("efqdiralpha1_item_x_cat")." ic, ".$this->db->prefix("efqdiralpha1_dtypes_x_cat")." xc, ".$this->db->prefix("efqdiralpha1_fieldtypes")." f, ".$this->db->prefix("efqdiralpha1_dtypes")." t ";
+		$sql .= "LEFT JOIN ".$this->db->prefix("efqdiralpha1_data") .
+			" d ON (t.dtypeid=d.dtypeid AND d.itemid=".$itemid.") ";
+		$sql .= "WHERE ic.cid=xc.cid AND ic.active='1' AND xc.dtypeid=t.dtypeid AND t.fieldtypeid=f.typeid AND t.activeyn='1' AND ic.itemid=".$itemid."";
+		$data_result = $this->db->query($sql) or $this->errorhandler->show("0013");
+		//$numrows = $this->db->getRowsNum($data_result);
 		$arr = array();
 		while (list($dtypeid, $title, $section, $icon, $ftypeid, $fieldtype, $ext, $options, $itemid, $value, $customtitle, $custom) = $this->db->fetchRow($data_result)) {
 			$fieldvalue = $this->getFieldValue($fieldtype, $options, $value);

Switch Indentation +40 added lines, -40 removed lines

@@ -110,25 +110,25 @@ 
 	function getFieldValue($fieldtype="", $options="", $value=0) {
 		global $myts, $moddir;
 		switch ($fieldtype) {
-		case "dhtml":
-			return $myts->makeTareaData4Show($value);
-			break;
-		//case "gmap":
-//			$gmapHandler = new efqGmapHandler();			
-//			$gmap = new efqGmap();
-//			$gmap->setPointsJS($gmapHandler->getPointsJS($gmap));
-//			$gmap->generateMap();
-//			$ret = $gmap->showMap();
-//			unset($gmap);
-//			unset($gmapHandler);
-			//return $myts->makeTboxData4Show($value);
-			//break;
-		case "radio":
-			return $myts->makeTboxData4Show($value);
-			break;
-		case "rating":
-			$xoops_url = XOOPS_URL;
-			switch ($value) {
+			case "dhtml":
+				return $myts->makeTareaData4Show($value);
+				break;
+			//case "gmap":
+	//			$gmapHandler = new efqGmapHandler();			
+	//			$gmap = new efqGmap();
+	//			$gmap->setPointsJS($gmapHandler->getPointsJS($gmap));
+	//			$gmap->generateMap();
+	//			$ret = $gmap->showMap();
+	//			unset($gmap);
+	//			unset($gmapHandler);
+				//return $myts->makeTboxData4Show($value);
+				//break;
+			case "radio":
+				return $myts->makeTboxData4Show($value);
+				break;
+			case "rating":
+				$xoops_url = XOOPS_URL;
+				switch ($value) {
 				case 1:
 					$src = "$xoops_url/modules/$moddir/images/rating_1.gif";
 					break;
@@ -161,30 +161,30 @@ 
 					break;
 				default:
 				$src = "";
-			}			
+				}			
 			$rating = "<img src=\"$src\" />";
 			return $rating;
 			break;
-		case "select":
-			return $myts->makeTboxData4Show($value);
-			break;
-		case "textbox":
-			return $myts->makeTboxData4Show($value);
-			break;
-		case "url":
-			$link = explode('|',$value);
-			return '<a href="'.$myts->makeTboxData4Show($link[0]).'" title="'.$myts->makeTboxData4Show($link[1]).'">'.$myts->makeTboxData4Show($link[0]).'</a>';
-			break;
-		case "yesno":
-			if ($value == '1') {
-				return _YES;
-			} else {
-				return _NO;
-			}
-			break;
-		default:
-			return $myts->makeTboxData4Show($value);
-			break;
+			case "select":
+				return $myts->makeTboxData4Show($value);
+				break;
+			case "textbox":
+				return $myts->makeTboxData4Show($value);
+				break;
+			case "url":
+				$link = explode('|',$value);
+				return '<a href="'.$myts->makeTboxData4Show($link[0]).'" title="'.$myts->makeTboxData4Show($link[1]).'">'.$myts->makeTboxData4Show($link[0]).'</a>';
+				break;
+			case "yesno":
+				if ($value == '1') {
+					return _YES;
+				} else {
+					return _NO;
+				}
+				break;
+			default:
+				return $myts->makeTboxData4Show($value);
+				break;
 		}
 	}
 	

Spacing +6 added lines, -6 removed lines

@@ -68,14 +68,14 @@ 
 	{
 		//Instantiate class
 		global $eh;
-		$this->db =& XoopsDatabaseFactory::getDatabaseConnection();
+		$this->db = & XoopsDatabaseFactory::getDatabaseConnection();
 		$this->errorhandler = $eh;
 	}
 	
-	function getDataFields( $itemid, $show=10, $min=0 ) {
+	function getDataFields($itemid, $show = 10, $min = 0) {
 		$sql = "SELECT DISTINCT t.dtypeid, t.title, t.section, t.icon, f.typeid, f.fieldtype, f.ext, t.options, d.itemid, d.value, d.customtitle, t.custom ";
         $sql .= "FROM ".$this->db->prefix("efqdiralpha1_item_x_cat")." ic, ".$this->db->prefix("efqdiralpha1_dtypes_x_cat")." xc, ".$this->db->prefix("efqdiralpha1_fieldtypes")." f, ".$this->db->prefix("efqdiralpha1_dtypes")." t ";
-        $sql .= "LEFT JOIN ".$this->db->prefix("efqdiralpha1_data") .
+        $sql .= "LEFT JOIN ".$this->db->prefix("efqdiralpha1_data").
             " d ON (t.dtypeid=d.dtypeid AND d.itemid=".$itemid.") ";
         $sql .= "WHERE ic.cid=xc.cid AND ic.active='1' AND xc.dtypeid=t.dtypeid AND t.fieldtypeid=f.typeid AND t.activeyn='1' AND ic.itemid=".$itemid."";
         $data_result = $this->db->query($sql) or $this->errorhandler->show("0013");
@@ -102,12 +102,12 @@ 
 				'custom' => $custom,
 				'itemid' => $itemid,
 				'value' => $fieldvalue,
-				'customtitle' => $customtitle );			
+				'customtitle' => $customtitle);			
 		}
 		return $arr;
 	}
 	
-	function getFieldValue($fieldtype="", $options="", $value=0) {
+	function getFieldValue($fieldtype = "", $options = "", $value = 0) {
 		global $myts, $moddir;
 		switch ($fieldtype) {
 		case "dhtml":
@@ -172,7 +172,7 @@ 
 			return $myts->makeTboxData4Show($value);
 			break;
 		case "url":
-			$link = explode('|',$value);
+			$link = explode('|', $value);
 			return '<a href="'.$myts->makeTboxData4Show($link[0]).'" title="'.$myts->makeTboxData4Show($link[1]).'">'.$myts->makeTboxData4Show($link[0]).'</a>';
 			break;
 		case "yesno":

class/class.offer.php

Indentation +16 added lines, -16 removed lines

@@ -54,14 +54,14 @@ 
 	{
 		global $moddir;
 		$this->db = Database::getInstance();
-	    $this->initVar('offerid', XOBJ_DTYPE_INT, 0, false);
-	    $this->initVar('dirid', XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('offerid', XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('dirid', XOBJ_DTYPE_INT, 0, false);
 		$this->initVar('typeid', XOBJ_DTYPE_INT, 0, false);
-	    $this->initVar('title', XOBJ_DTYPE_TXTBOX, null, true, 255);
-	    $this->initVar('duration', XOBJ_DTYPE_INT, 0, true, 5);
-	    $this->initVar('count', XOBJ_DTYPE_INT, 0, true, 5);
-	    $this->initVar('price', XOBJ_DTYPE_CURRENCY, 0.00, true);
-	    $this->initVar('activeyn', XOBJ_DTYPE_INT, 0, true, 2);
+		$this->initVar('title', XOBJ_DTYPE_TXTBOX, null, true, 255);
+		$this->initVar('duration', XOBJ_DTYPE_INT, 0, true, 5);
+		$this->initVar('count', XOBJ_DTYPE_INT, 0, true, 5);
+		$this->initVar('price', XOBJ_DTYPE_CURRENCY, 0.00, true);
+		$this->initVar('activeyn', XOBJ_DTYPE_INT, 0, true, 2);
 		$this->initVar('currency', XOBJ_DTYPE_TXTBOX, null, false, 10);
 		$this->initVar('descr', XOBJ_DTYPE_OTHER, 0);
 		$this->initVar('typename', XOBJ_DTYPE_TXTBOX, null, false, 50);
@@ -207,13 +207,13 @@ 
 	function setOffer($gpc_offerid=0) {
 		$sql = "SELECT o.offerid, o.title, o.typeid, o.duration, o.count, " .
 		"o.price, o.activeyn, o.currency, o.descr, o.dirid, t.typename, t.level FROM " .
-            $this->db->prefix("efqdiralpha1_itemtypes") . " t, " . $this->db->prefix("efqdiralpha1_subscr_offers") .
-            " o	WHERE o.typeid=t.typeid AND o.offerid=" . intval($gpc_offerid) . "";
-        $result = $this->db->query($sql);
-        $numrows = $this->db->getRowsNum($result);
-        if ( $numrows > 0 ) {
-	        while (list($offerid, $offertitle, $typeid, $duration, $count, $price, $activeyn,
-	                $currency, $descr, $dirid, $typename, $level) = $this->db->fetchRow($result)) {
+			$this->db->prefix("efqdiralpha1_itemtypes") . " t, " . $this->db->prefix("efqdiralpha1_subscr_offers") .
+			" o	WHERE o.typeid=t.typeid AND o.offerid=" . intval($gpc_offerid) . "";
+		$result = $this->db->query($sql);
+		$numrows = $this->db->getRowsNum($result);
+		if ( $numrows > 0 ) {
+			while (list($offerid, $offertitle, $typeid, $duration, $count, $price, $activeyn,
+					$currency, $descr, $dirid, $typename, $level) = $this->db->fetchRow($result)) {
 				if (! $this->objOffer ) {
 					$this->objOffer = new efqSubscriptionOffer();
 				}
@@ -229,8 +229,8 @@ 
 				$this->objOffer->setVar('dirid', $dirid);
 				$this->objOffer->setVar('typename', $typename);
 				$this->objOffer->setVar('level', $level);
-	        }
-	    } else {
+			}
+		} else {
 			return false;
 		}
 		return true;

Spacing +13 added lines, -13 removed lines

@@ -50,7 +50,7 @@ 
    * @param bool $itemtype
    * @return
    */
-	function efqSubscriptionOffer($offer=false)
+	function efqSubscriptionOffer($offer = false)
 	{
 		global $moddir;
 		$this->db = Database::getInstance();
@@ -89,7 +89,7 @@ 
    * 
    * @return
    */
-	function efqSubscriptionOfferHandler($offer=false) {
+	function efqSubscriptionOfferHandler($offer = false) {
 		$this->db = Database::getInstance();
 		$this->objOffer = $offer;
 	}
@@ -104,7 +104,7 @@ 
 	 * 
 	 * @return	bool	true if insertion is succesful, false if unsuccesful
 	 */
-	function insertOffer($obj, $forceQuery=false) {
+	function insertOffer($obj, $forceQuery = false) {
 		$tablename = "efqdiralpha1_subscr_offers";
 		$keyName = "offerid";
 		$excludedVars = array('level', 'typename');
@@ -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 updateOffer($obj, $forceQuery=false) {
+	function updateOffer($obj, $forceQuery = false) {
 		$tablename = "efqdiralpha1_subscr_offers";
 		$keyName = "offerid";
 		$excludedVars = array('level', 'typename');
@@ -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,17 +204,17 @@ 
    * 
    * @return bool true or false
    */
-	function setOffer($gpc_offerid=0) {
-		$sql = "SELECT o.offerid, o.title, o.typeid, o.duration, o.count, " .
-		"o.price, o.activeyn, o.currency, o.descr, o.dirid, t.typename, t.level FROM " .
-            $this->db->prefix("efqdiralpha1_itemtypes") . " t, " . $this->db->prefix("efqdiralpha1_subscr_offers") .
-            " o	WHERE o.typeid=t.typeid AND o.offerid=" . intval($gpc_offerid) . "";
+	function setOffer($gpc_offerid = 0) {
+		$sql = "SELECT o.offerid, o.title, o.typeid, o.duration, o.count, ".
+		"o.price, o.activeyn, o.currency, o.descr, o.dirid, t.typename, t.level FROM ".
+            $this->db->prefix("efqdiralpha1_itemtypes")." t, ".$this->db->prefix("efqdiralpha1_subscr_offers").
+            " o	WHERE o.typeid=t.typeid AND o.offerid=".intval($gpc_offerid)."";
         $result = $this->db->query($sql);
         $numrows = $this->db->getRowsNum($result);
-        if ( $numrows > 0 ) {
+        if ($numrows > 0) {
 	        while (list($offerid, $offertitle, $typeid, $duration, $count, $price, $activeyn,
 	                $currency, $descr, $dirid, $typename, $level) = $this->db->fetchRow($result)) {
-				if (! $this->objOffer ) {
+				if (!$this->objOffer) {
 					$this->objOffer = new efqSubscriptionOffer();
 				}
 				$this->objOffer->setVar('offerid', $offerid);

class/class.efqtree.php

Spacing +66 added lines, -66 removed lines

@@ -34,11 +34,11 @@ 
 
 class efqTree
 {
-	var $table;     //table with parent-child structure
-	var $id;    //name of unique id for records in table $table
-	var $pid;     // name of parent id used in table $table
-	var $order;    //specifies the order of query results
-	var $title;     // name of a field in table $table which will be used when  selection box and paths are generated
+	var $table; //table with parent-child structure
+	var $id; //name of unique id for records in table $table
+	var $pid; // name of parent id used in table $table
+	var $order; //specifies the order of query results
+	var $title; // name of a field in table $table which will be used when  selection box and paths are generated
 	var $db;
 	var $dirid;
 
@@ -46,32 +46,32 @@ 
 	//sets the names of table, unique id, and parend id
 	function EfqTree($table_name, $id_name, $pid_name)
 	{
-		$this->db =& Database::getInstance();
+		$this->db = & Database::getInstance();
 		$this->table = $table_name;
 		$this->id = $id_name;
 		$this->pid = $pid_name;
 		$this->dirid = 0;
 	}
 	
-	function setDir($dirid=0) {
+	function setDir($dirid = 0) {
 		$this->dirid = $dirid;
 	}
 
 
 	// returns an array of first child objects for a given id($sel_id)
-	function getFirstChild($sel_id, $order="")
+	function getFirstChild($sel_id, $order = "")
 	{
-		$arr =array();
+		$arr = array();
 		$sql = "SELECT * FROM ".$this->table." WHERE ".$this->pid."=".$sel_id."";
-		if ( $order != "" ) {
+		if ($order != "") {
 			$sql .= " ORDER BY $order";
 		}
 		$result = $this->db->query($sql);
 		$count = $this->db->getRowsNum($result);
-		if ( $count==0 ) {
+		if ($count == 0) {
 			return $arr;
 		}
-		while ( $myrow=$this->db->fetchArray($result) ) {
+		while ($myrow = $this->db->fetchArray($result)) {
 			array_push($arr, $myrow);
 		}
 		return $arr;
@@ -80,67 +80,67 @@ 
 	// returns an array of all FIRST child ids of a given id($sel_id)
 	function getFirstChildId($sel_id)
 	{
-		$idarray =array();
+		$idarray = array();
 		$result = $this->db->query("SELECT ".$this->id." FROM ".$this->table." WHERE ".$this->pid."=".$sel_id."");
 		$count = $this->db->getRowsNum($result);
-		if ( $count == 0 ) {
+		if ($count == 0) {
 			return $idarray;
 		}
-		while ( list($id) = $this->db->fetchRow($result) ) {
+		while (list($id) = $this->db->fetchRow($result)) {
 			array_push($idarray, $id);
 		}
 		return $idarray;
 	}
 
 	//returns an array of ALL child ids for a given id($sel_id)
-	function getAllChildId($sel_id, $order="", $idarray = array())
+	function getAllChildId($sel_id, $order = "", $idarray = array())
 	{
 		$sql = "SELECT ".$this->id." FROM ".$this->table." WHERE ".$this->pid."=".$sel_id."";
-		if ( $order != "" ) {
+		if ($order != "") {
 			$sql .= " ORDER BY $order";
 		}
-		$result=$this->db->query($sql);
+		$result = $this->db->query($sql);
 		$count = $this->db->getRowsNum($result);
-		if ( $count==0 ) {
+		if ($count == 0) {
 			return $idarray;
 		}
-		while ( list($r_id) = $this->db->fetchRow($result) ) {
+		while (list($r_id) = $this->db->fetchRow($result)) {
 			array_push($idarray, $r_id);
-			$idarray = $this->getAllChildId($r_id,$order,$idarray);
+			$idarray = $this->getAllChildId($r_id, $order, $idarray);
 		}
 		return $idarray;
 	}
 
 	//returns an array of ALL parent ids for a given id($sel_id)
-	function getAllParentId($sel_id, $order="", $idarray = array())
+	function getAllParentId($sel_id, $order = "", $idarray = array())
 	{
 		$sql = "SELECT ".$this->pid." FROM ".$this->table." WHERE ".$this->id."=".$sel_id."";
-		if ( $order != "" ) {
+		if ($order != "") {
 			$sql .= " ORDER BY $order";
 		}
-		$result=$this->db->query($sql);
+		$result = $this->db->query($sql);
 		list($r_id) = $this->db->fetchRow($result);
-		if ( $r_id == 0 ) {
+		if ($r_id == 0) {
 			return $idarray;
 		}
 		array_push($idarray, $r_id);
-		$idarray = $this->getAllParentId($r_id,$order,$idarray);
+		$idarray = $this->getAllParentId($r_id, $order, $idarray);
 		return $idarray;
 	}
 
 	//generates path from the root id to a given id($sel_id)
 	// the path is delimetered with "/"
-	function getPathFromId($sel_id, $title, $path="")
+	function getPathFromId($sel_id, $title, $path = "")
 	{
 		$result = $this->db->query("SELECT ".$this->pid.", ".$title." FROM ".$this->table." WHERE ".$this->id."=$sel_id");
-		if ( $this->db->getRowsNum($result) == 0 ) {
+		if ($this->db->getRowsNum($result) == 0) {
 			return $path;
 		}
-		list($parentid,$name) = $this->db->fetchRow($result);
-		$myts =& MyTextSanitizer::getInstance();
+		list($parentid, $name) = $this->db->fetchRow($result);
+		$myts = & MyTextSanitizer::getInstance();
 		$name = $myts->makeTboxData4Show($name);
 		$path = "/".$name.$path."";
-		if ( $parentid == 0 ) {
+		if ($parentid == 0) {
 			return $path;
 		}
 		$path = $this->getPathFromId($parentid, $title, $path);
@@ -150,18 +150,18 @@ 
 	//makes a nicely ordered selection box
 	//$preset_id is used to specify a preselected item
 	//set $none to 1 to add a option with value 0
-	function makeMySelBox($title, $order="",$preset_id=0, $none=0, $sel_name="", $onchange="", $multiple=0)
+	function makeMySelBox($title, $order = "", $preset_id = 0, $none = 0, $sel_name = "", $onchange = "", $multiple = 0)
 	{
-		if ( $sel_name == "" ) {
+		if ($sel_name == "") {
 			$sel_name = $this->id;
 		}
-		$myts =& MyTextSanitizer::getInstance();
+		$myts = & MyTextSanitizer::getInstance();
 		
 		$sql = "SELECT ".$this->id.", ".$title." FROM ".$this->table." WHERE ".$this->pid."=0";
 		if ($this->dirid != 0) {
 			$sql .= " AND dirid=$this->dirid";	
 		}
-		if ( $order != "" ) {
+		if ($order != "") {
 			$sql .= " ORDER BY $order";
 		}
 		//echo 'test';
@@ -169,29 +169,29 @@ 
 		$result = $this->db->query($sql);
 		
 		echo "<select name='".$sel_name."'";
-		if ( $onchange != "" ) {
+		if ($onchange != "") {
 			echo " onchange='".$onchange."'";
 		}
-		if ( $multiple != 0 ) {
+		if ($multiple != 0) {
 			echo " multiple=\"multiple\"";
 		}
 		echo ">\n";
 		
-		if ( $none ) {
+		if ($none) {
 			echo "<option value='0'>----</option>\n";
 		}
-		while ( list($catid, $name) = $this->db->fetchRow($result) ) {
+		while (list($catid, $name) = $this->db->fetchRow($result)) {
 			$sel = "";
-			if ( $catid == $preset_id ) {
+			if ($catid == $preset_id) {
 				$sel = " selected='selected'";
 			}
 			echo "<option value='$catid'$sel>$name</option>\n";
 			$sel = "";
 			$arr = $this->getChildTreeArray($catid, $order);
-			foreach ( $arr as $option ) {
-				$option['prefix'] = str_replace(".","--",$option['prefix']);
+			foreach ($arr as $option) {
+				$option['prefix'] = str_replace(".", "--", $option['prefix']);
 				$catpath = $option['prefix']."&nbsp;".$myts->makeTboxData4Show($option[$title]);
-				if ( $option[$this->id] == $preset_id ) {
+				if ($option[$this->id] == $preset_id) {
 					$sel = " selected='selected'";
 				}
 				echo "<option value='".$option[$this->id]."'$sel>$catpath</option>\n";
@@ -202,18 +202,18 @@ 
 	}
 
 	//generates nicely formatted linked path from the root id to a given id
-	function getNicePathFromId($sel_id, $title, $funcURL, $path="", $outputvar="catid")
+	function getNicePathFromId($sel_id, $title, $funcURL, $path = "", $outputvar = "catid")
 	{
 		$sql = "SELECT ".$this->pid.", ".$title." FROM ".$this->table." WHERE ".$this->id."=$sel_id";
 		$result = $this->db->query($sql);
-		if ( $this->db->getRowsNum($result) == 0 ) {
+		if ($this->db->getRowsNum($result) == 0) {
 			return $path;
 		}
-		list($parentid,$name) = $this->db->fetchRow($result);
-		$myts =& MyTextSanitizer::getInstance();
+		list($parentid, $name) = $this->db->fetchRow($result);
+		$myts = & MyTextSanitizer::getInstance();
 		$name = $myts->makeTboxData4Show($name);
 		$path = "<a href='".$funcURL."&".$outputvar."=".$sel_id."'>".$name."</a>&nbsp;:&nbsp;".$path."";
-		if ( $parentid == 0 ) {
+		if ($parentid == 0) {
 			return $path;
 		}
 		$path = $this->getNicePathFromId($parentid, $title, $funcURL, $path, $outputvar);
@@ -221,15 +221,15 @@ 
 	}
 	
 	//generates nicely formatted path from the root id to a given id
-	function getUnformattedPathFromId($sel_id, $title, $path="")
+	function getUnformattedPathFromId($sel_id, $title, $path = "")
 	{
 		$sql = "SELECT ".$this->pid.", ".$title." FROM ".$this->table." WHERE ".$this->id."=$sel_id";
 		$result = $this->db->query($sql);
-		if ( $this->db->getRowsNum($result) == 0 ) {
+		if ($this->db->getRowsNum($result) == 0) {
 			return $path;
 		}
-		list($parentid,$name) = $this->db->fetchRow($result);
-		$myts =& MyTextSanitizer::getInstance();
+		list($parentid, $name) = $this->db->fetchRow($result);
+		$myts = & MyTextSanitizer::getInstance();
 		$name = $myts->makeTboxData4Show($name);
 		if ($path != "") {
 			$path = "".$name."&nbsp;:&nbsp;".$path."";
@@ -237,7 +237,7 @@ 
 			$path = "".$name."";
 		}
 		
-		if ( $parentid == 0 ) {
+		if ($parentid == 0) {
 			return $path;
 		}
 		$path = $this->getUnformattedPathFromId($parentid, $title, $path);
@@ -246,54 +246,54 @@ 
 
 	//generates id path from the root id to a given id
 	// the path is delimetered with "/"
-	function getIdPathFromId($sel_id, $path="")
+	function getIdPathFromId($sel_id, $path = "")
 	{
 		$result = $this->db->query("SELECT ".$this->pid." FROM ".$this->table." WHERE ".$this->id."=$sel_id");
-		if ( $this->db->getRowsNum($result) == 0 ) {
+		if ($this->db->getRowsNum($result) == 0) {
 			return $path;
 		}
 		list($parentid) = $this->db->fetchRow($result);
 		$path = "/".$sel_id.$path."";
-		if ( $parentid == 0 ) {
+		if ($parentid == 0) {
 			return $path;
 		}
 		$path = $this->getIdPathFromId($parentid, $path);
 		return $path;
 	}
 
-	function getAllChild($sel_id=0,$order="",$parray = array())
+	function getAllChild($sel_id = 0, $order = "", $parray = array())
 	{
 		$sql = "SELECT * FROM ".$this->table." WHERE ".$this->pid."=".$sel_id."";
-		if ( $order != "" ) {
+		if ($order != "") {
 			$sql .= " ORDER BY $order";
 		}
 		$result = $this->db->query($sql);
 		$count = $this->db->getRowsNum($result);
-		if ( $count == 0 ) {
+		if ($count == 0) {
 			return $parray;
 		}
-		while ( $row = $this->db->fetchArray($result) ) {
+		while ($row = $this->db->fetchArray($result)) {
 			array_push($parray, $row);
-			$parray=$this->getAllChild($row[$this->id],$order,$parray);
+			$parray = $this->getAllChild($row[$this->id], $order, $parray);
 		}
 		return $parray;
 	}
 
-	function getChildTreeArray($sel_id=0,$order="",$parray = array(),$r_prefix="")
+	function getChildTreeArray($sel_id = 0, $order = "", $parray = array(), $r_prefix = "")
 	{
 		$sql = "SELECT * FROM ".$this->table." WHERE ".$this->pid."=".$sel_id."";
-		if ( $order != "" ) {
+		if ($order != "") {
 			$sql .= " ORDER BY $order";
 		}
 		$result = $this->db->query($sql);
 		$count = $this->db->getRowsNum($result);
-		if ( $count == 0 ) {
+		if ($count == 0) {
 			return $parray;
 		}
-		while ( $row = $this->db->fetchArray($result) ) {
+		while ($row = $this->db->fetchArray($result)) {
 			$row['prefix'] = $r_prefix.".";
 			array_push($parray, $row);
-			$parray = $this->getChildTreeArray($row[$this->id],$order,$parray,$row['prefix']);
+			$parray = $this->getChildTreeArray($row[$this->id], $order, $parray, $row['prefix']);
 		}
 		return $parray;
 	}

class/class.xdir.php

Indentation +9 added lines, -9 removed lines

@@ -89,16 +89,16 @@
 	function setCategories_xdir() {
 		$arr = array();
 		$sql = 'SELECT cid, pid, title, imgurl FROM '.$this->db->prefix("efqdiralpha1_xdir_cat");
-        $result = $this->db->query($sql);
-        if (!$result) {
-        	return false;
-        }
-        $numrows = $this->db->getRowsNum($result);
-        if ( $numrows > 0 ) {
-	        while (list($cid, $pid, $title, $imgurl) = $this->db->fetchRow($result)) {
+		$result = $this->db->query($sql);
+		if (!$result) {
+			return false;
+		}
+		$numrows = $this->db->getRowsNum($result);
+		if ( $numrows > 0 ) {
+			while (list($cid, $pid, $title, $imgurl) = $this->db->fetchRow($result)) {
 				$arr[] = array('cid'=>$cid,'pid'=>$pid,'title'=>$title,'imgurl'=>$imgurl);
-	        }
-	    } else {
+			}
+		} else {
 			return false;
 		}
 		$this->set_xdir_cats($arr);

Spacing +29 added lines, -29 removed lines

@@ -94,9 +94,9 @@ 
         	return false;
         }
         $numrows = $this->db->getRowsNum($result);
-        if ( $numrows > 0 ) {
+        if ($numrows > 0) {
 	        while (list($cid, $pid, $title, $imgurl) = $this->db->fetchRow($result)) {
-				$arr[] = array('cid'=>$cid,'pid'=>$pid,'title'=>$title,'imgurl'=>$imgurl);
+				$arr[] = array('cid'=>$cid, 'pid'=>$pid, 'title'=>$title, 'imgurl'=>$imgurl);
 	        }
 	    } else {
 			return false;
@@ -105,7 +105,7 @@ 
 		return true;
 	}
 	
-	function saveCategories($dirid=0) {
+	function saveCategories($dirid = 0) {
 		$tablename = "efqdiralpha1_cat";
 		$xdir_cats = $this->get_xdir_cats();
 		foreach ($xdir_cats as $xdir_cat) {
@@ -137,26 +137,26 @@ 
 	 */
 	function createDataTypes() {
 		$datatype_handler = new efqDataTypeHandler();
-		$arr[] = array('title'=>_MD_XDIR_DTYPE_ADDRESS,'fieldtype'=>_MD_XDIR_FIELDTYPE_TEXTBOX);
-		$arr[] = array('title'=>_MD_XDIR_DTYPE_ADDRESS2,'fieldtype'=>_MD_XDIR_FIELDTYPE_TEXTBOX);
-		$arr[] = array('title'=>_MD_XDIR_DTYPE_CITY,'fieldtype'=>_MD_XDIR_FIELDTYPE_TEXTBOX);
-		$arr[] = array('title'=>_MD_XDIR_DTYPE_STATE,'fieldtype'=>_MD_XDIR_FIELDTYPE_TEXTBOX);
-		$arr[] = array('title'=>_MD_XDIR_DTYPE_ZIP,'fieldtype'=>_MD_XDIR_FIELDTYPE_TEXTBOX);
-		$arr[] = array('title'=>_MD_XDIR_DTYPE_COUNTRY,'fieldtype'=>_MD_XDIR_FIELDTYPE_TEXTBOX);
-		$arr[] = array('title'=>_MD_XDIR_DTYPE_PHONE,'fieldtype'=>_MD_XDIR_FIELDTYPE_TEXTBOX);
-		$arr[] = array('title'=>_MD_XDIR_DTYPE_FAX,'fieldtype'=>_MD_XDIR_FIELDTYPE_TEXTBOX);
-		$arr[] = array('title'=>_MD_XDIR_DTYPE_EMAIL,'fieldtype'=>_MD_XDIR_FIELDTYPE_EMAIL);
-		$arr[] = array('title'=>_MD_XDIR_DTYPE_URL,'fieldtype'=>_MD_XDIR_FIELDTYPE_URL);
+		$arr[] = array('title'=>_MD_XDIR_DTYPE_ADDRESS, 'fieldtype'=>_MD_XDIR_FIELDTYPE_TEXTBOX);
+		$arr[] = array('title'=>_MD_XDIR_DTYPE_ADDRESS2, 'fieldtype'=>_MD_XDIR_FIELDTYPE_TEXTBOX);
+		$arr[] = array('title'=>_MD_XDIR_DTYPE_CITY, 'fieldtype'=>_MD_XDIR_FIELDTYPE_TEXTBOX);
+		$arr[] = array('title'=>_MD_XDIR_DTYPE_STATE, 'fieldtype'=>_MD_XDIR_FIELDTYPE_TEXTBOX);
+		$arr[] = array('title'=>_MD_XDIR_DTYPE_ZIP, 'fieldtype'=>_MD_XDIR_FIELDTYPE_TEXTBOX);
+		$arr[] = array('title'=>_MD_XDIR_DTYPE_COUNTRY, 'fieldtype'=>_MD_XDIR_FIELDTYPE_TEXTBOX);
+		$arr[] = array('title'=>_MD_XDIR_DTYPE_PHONE, 'fieldtype'=>_MD_XDIR_FIELDTYPE_TEXTBOX);
+		$arr[] = array('title'=>_MD_XDIR_DTYPE_FAX, 'fieldtype'=>_MD_XDIR_FIELDTYPE_TEXTBOX);
+		$arr[] = array('title'=>_MD_XDIR_DTYPE_EMAIL, 'fieldtype'=>_MD_XDIR_FIELDTYPE_EMAIL);
+		$arr[] = array('title'=>_MD_XDIR_DTYPE_URL, 'fieldtype'=>_MD_XDIR_FIELDTYPE_URL);
 		foreach ($arr as $datatype) {
 			$objDataType = new efqFieldType;
-			$objDataType->setVar('title',$datatype['title']);
-			$objDataType->setVar('section',0);
-			$objDataType->setVar('uid',$xoopsUser->getVar('uid'));
-			$objDataType->setVar('defaultyn',1);
-			$objDataType->setVar('created',time());
-			$objDataType->setVar('activeyn',1);
-			$objDataType->setVar('fieldtypeid',$this->fieldtypes[$datatype['fieldtype']]);
-			$datatype_handler->insertDataType($objDataType,true);
+			$objDataType->setVar('title', $datatype['title']);
+			$objDataType->setVar('section', 0);
+			$objDataType->setVar('uid', $xoopsUser->getVar('uid'));
+			$objDataType->setVar('defaultyn', 1);
+			$objDataType->setVar('created', time());
+			$objDataType->setVar('activeyn', 1);
+			$objDataType->setVar('fieldtypeid', $this->fieldtypes[$datatype['fieldtype']]);
+			$datatype_handler->insertDataType($objDataType, true);
 			$datatypes[$datatype['title']] = $objDataType->getVar('dtypeid');
 		}
 	}
@@ -173,15 +173,15 @@ 
 	 */
 	function createFieldTypes() {
 		$fieldtype_handler = new efqFieldTypeHandler();
-		$arr[] = array('title'=>_MD_XDIR_FIELDTYPE_TEXTBOX,'fieldtype'=>'textbox');
-		$arr[] = array('title'=>_MD_XDIR_FIELDTYPE_EMAIL,'fieldtype'=>'email');
-		$arr[] = array('title'=>_MD_XDIR_FIELDTYPE_URL,'fieldtype'=>'url');
+		$arr[] = array('title'=>_MD_XDIR_FIELDTYPE_TEXTBOX, 'fieldtype'=>'textbox');
+		$arr[] = array('title'=>_MD_XDIR_FIELDTYPE_EMAIL, 'fieldtype'=>'email');
+		$arr[] = array('title'=>_MD_XDIR_FIELDTYPE_URL, 'fieldtype'=>'url');
 		foreach ($arr as $fieldtype) {
 			$objFieldtype = new efqFieldType;
-			$objFieldtype->setVar('title',$fieldtype['title']);
-			$objFieldtype->setVar('fieldtype',$fieldtype['fieldtype']);
-			$objFieldtype->setVar('dirid',$this->efq_dirid);
-			$fieldtype_handler->insertFieldType($objFieldtype,true);
+			$objFieldtype->setVar('title', $fieldtype['title']);
+			$objFieldtype->setVar('fieldtype', $fieldtype['fieldtype']);
+			$objFieldtype->setVar('dirid', $this->efq_dirid);
+			$fieldtype_handler->insertFieldType($objFieldtype, true);
 			$fieldtypes[$fieldtype['title']] = $objFieldtype->getVar('typeid');
 		}
 	}
@@ -196,7 +196,7 @@ 
 	 * 
 	 * @return	bool	true if insertion is succesful, false if unsuccesful
 	 */	
-	function doMigrate($dirid=0) {
+	function doMigrate($dirid = 0) {
 		$this->setCategories_xdir();
 		$this->saveCategories($this->efq_dirid);
 		$this->createFieldTypes();

class/class.formdate.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 	 * 
 	 * @param   array   $listing	Array with listing details
 	 */
-	function XoopsFormDate($caption, $name, $size = 15, $value='')
+	function XoopsFormDate($caption, $name, $size = 15, $value = '')
 	{
 		$this->XoopsFormElementTray($caption, ' ');
 		$datetime = getDate($value);

class/class.directory.php

Indentation +105 added lines, -105 removed lines

@@ -46,8 +46,8 @@ 
 	{
 		global $moddir;
 		$this->db = Database::getInstance();
-	    $this->initVar('dirid', XOBJ_DTYPE_INT, null, false);
-	    $this->initVar('postfix', XOBJ_DTYPE_TXTBOX);
+		$this->initVar('dirid', XOBJ_DTYPE_INT, null, false);
+		$this->initVar('postfix', XOBJ_DTYPE_TXTBOX);
 		$this->initVar('open', XOBJ_DTYPE_INT, 0, false);
 		$this->initVar('name', XOBJ_DTYPE_TXTBOX);
 		$this->initVar('description', XOBJ_DTYPE_TXTAREA);
@@ -56,16 +56,16 @@ 
 		
 		if ($directory != false) {
 			if (is_array($directory)) {
-                $this->assignVars($directory);
-            } else {
+				$this->assignVars($directory);
+			} else {
 				$directory_handler = xoops_getmodulehandler('directory', $moddir);
-                $objDirectory =& $directory_handler->get($directory);
-                foreach ($objDirectory->vars as $k => $v) {
-                    $this->assignVar($k, $v['value']);
-                }
-                unset($objDirectory);
-            }
-        }
+				$objDirectory =& $directory_handler->get($directory);
+				foreach ($objDirectory->vars as $k => $v) {
+					$this->assignVar($k, $v['value']);
+				}
+				unset($objDirectory);
+			}
+		}
 	}
 }
 
@@ -86,53 +86,53 @@ 
 	}
 	
 	/**
-     * 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)
-    {
-        $directory = new efqDirectory();
-        if ($isNew) {
-            $directory->setNew();
-        }
-        return $directory;
-    }
+	{
+		$directory = new efqDirectory();
+		if ($isNew) {
+			$directory->setNew();
+		}
+		return $directory;
+	}
      
-    /**
-     * retrieve a directory
-     * 
-     * @param int $dirid ID of the directory
-     * @return mixed reference to the {@link efqDirectory} object, FALSE if failed
-     */
-    function &get($dirid = false) {
-        if ($dirid == false) {
-            return false;
-        }
-        $dirid = intval($dirid);
-        if ($dirid > 0) {
-            $sql = "SELECT * FROM ".$this->db->prefix("efqdiralpha1_dir")." WHERE dirid=".$dirid;
-            if (!$result = $this->db->query($sql)) {
-                return false;
-            }
-            $directory =& $this->create(false);
-            $directory->assignVars($this->db->fetchArray($result));
-            return $directory;
-        }
-        return false;
-    }
+	/**
+	 * retrieve a directory
+	 * 
+	 * @param int $dirid ID of the directory
+	 * @return mixed reference to the {@link efqDirectory} object, FALSE if failed
+	 */
+	function &get($dirid = false) {
+		if ($dirid == false) {
+			return false;
+		}
+		$dirid = intval($dirid);
+		if ($dirid > 0) {
+			$sql = "SELECT * FROM ".$this->db->prefix("efqdiralpha1_dir")." WHERE dirid=".$dirid;
+			if (!$result = $this->db->query($sql)) {
+				return false;
+			}
+			$directory =& $this->create(false);
+			$directory->assignVars($this->db->fetchArray($result));
+			return $directory;
+		}
+		return false;
+	}
      
-     /**
-     * retrieve all directories
-     * 
-     * @return mixed reference to the {@link efqDirectory} object, FALSE if failed
-     */
-    function &getAll() {
-        $sql = "SELECT dirid,postfix,open,name,descr,img FROM ".$this->db->prefix("efqdiralpha1_dir")."";
-        if (!$result = $this->db->query($sql)) {
-            return false;
-        }
-        while ( list($dirid,$postfix,$open,$name,$descr,$img) = $this->db->fetchRow($result) ) {
+	 /**
+	  * retrieve all directories
+	  * 
+	  * @return mixed reference to the {@link efqDirectory} object, FALSE if failed
+	  */
+	function &getAll() {
+		$sql = "SELECT dirid,postfix,open,name,descr,img FROM ".$this->db->prefix("efqdiralpha1_dir")."";
+		if (!$result = $this->db->query($sql)) {
+			return false;
+		}
+		while ( list($dirid,$postfix,$open,$name,$descr,$img) = $this->db->fetchRow($result) ) {
 			$arr[] = array('dirid' => $dirid,
 				'postfix' => $postfix,
 				'open' => $open,
@@ -140,76 +140,76 @@ 
 				'descr' => $descr,
 				'img' => $img );
 		}
-        return $arr;
-    }
+		return $arr;
+	}
     
          
-    /**
-     * retrieve all directory ID's
-     * 
-     * @return array $idarray
-     */
-    function &getAllDirectoryIds($idarray = array()) {
-        $sql = "SELECT dirid FROM ".$this->db->prefix("efqdiralpha1_dir")."";
-        if (!$result = $this->db->query($sql)) {
-            return false;
-        }
-        while ( list($r_id) = $this->db->fetchRow($result) ) {
+	/**
+	 * retrieve all directory ID's
+	 * 
+	 * @return array $idarray
+	 */
+	function &getAllDirectoryIds($idarray = array()) {
+		$sql = "SELECT dirid FROM ".$this->db->prefix("efqdiralpha1_dir")."";
+		if (!$result = $this->db->query($sql)) {
+			return false;
+		}
+		while ( list($r_id) = $this->db->fetchRow($result) ) {
 			array_push($idarray, $r_id);
 		}
-        return $idarray;
-    }
+		return $idarray;
+	}
     
-    /**
-     * retrieve all directory ID's and titles as array
-     * 
-     * @return array $idarray
-     */
-    function &getAllDirectoryTitles($arr = array()) {
-        $sql = "SELECT dirid, name FROM ".$this->db->prefix("efqdiralpha1_dir")."";
-        if (!$result = $this->db->query($sql)) {
-            return false;
-        }
-        while ( list($r_id, $r_title) = $this->db->fetchRow($result) ) {
+	/**
+	 * retrieve all directory ID's and titles as array
+	 * 
+	 * @return array $idarray
+	 */
+	function &getAllDirectoryTitles($arr = array()) {
+		$sql = "SELECT dirid, name FROM ".$this->db->prefix("efqdiralpha1_dir")."";
+		if (!$result = $this->db->query($sql)) {
+			return false;
+		}
+		while ( list($r_id, $r_title) = $this->db->fetchRow($result) ) {
 			$result_arr[$r_id] = $r_title;
 			//array_push($arr, $result_arr);
 		}
-        return $result_arr;
-    }
+		return $result_arr;
+	}
     
     
 	
 	/**
-     * count number of directories and if count == 1, set directory.
-     * 
-     * @return mixed $result, FALSE if failed, 0 if count is 0.
-     */
+	 * count number of directories and if count == 1, set directory.
+	 * 
+	 * @return mixed $result, FALSE if failed, 0 if count is 0.
+	 */
 	function countAll()
 	{		
 		global $xoopsDB;
-	    $block = array();
+		$block = array();
 		$myts =& MyTextSanitizer::getInstance();
 		$dirid = 0;
-	    $result = $xoopsDB->query("SELECT dirid FROM ".$xoopsDB->prefix("efqdiralpha1_dir")."");
-	    $num_results = $xoopsDB->getRowsNum($result);
-	    if (!$result) {
-	        return false;
-	    } else if ($num_results == 0) {
-	    	return 0;
-	    } else if ($num_results == 1) {
-	    	$row = mysql_fetch_array($result);
-	        $dirid = $row['dirid'];
-	        return $dirid;
-	    } else {
-	    	return false;
-	    }
+		$result = $xoopsDB->query("SELECT dirid FROM ".$xoopsDB->prefix("efqdiralpha1_dir")."");
+		$num_results = $xoopsDB->getRowsNum($result);
+		if (!$result) {
+			return false;
+		} else if ($num_results == 0) {
+			return 0;
+		} else if ($num_results == 1) {
+			$row = mysql_fetch_array($result);
+			$dirid = $row['dirid'];
+			return $dirid;
+		} else {
+			return false;
+		}
 	}
 	
 	/**
-     * retrieve all directory ID's and names
-     * 
-     * @return array $array
-     */
+	 * retrieve all directory ID's and names
+	 * 
+	 * @return array $array
+	 */
 	function directoryArray($dashes = false) {
 		$sql = "SELECT dirid, name FROM ".$this->db->prefix("efqdiralpha1_dir")." ORDER BY name ASC";
 		$result = $this->db->query($sql);

Spacing +11 added lines, -11 removed lines

@@ -59,7 +59,7 @@ 
                 $this->assignVars($directory);
             } else {
 				$directory_handler = xoops_getmodulehandler('directory', $moddir);
-                $objDirectory =& $directory_handler->get($directory);
+                $objDirectory = & $directory_handler->get($directory);
                 foreach ($objDirectory->vars as $k => $v) {
                     $this->assignVar($k, $v['value']);
                 }
@@ -82,7 +82,7 @@ 
 {
 	function efqDirectoryHandler()
 	{
-		$this->db =& Database::getInstance();
+		$this->db = & Database::getInstance();
 	}
 	
 	/**
@@ -115,7 +115,7 @@ 
             if (!$result = $this->db->query($sql)) {
                 return false;
             }
-            $directory =& $this->create(false);
+            $directory = & $this->create(false);
             $directory->assignVars($this->db->fetchArray($result));
             return $directory;
         }
@@ -132,13 +132,13 @@ 
         if (!$result = $this->db->query($sql)) {
             return false;
         }
-        while ( list($dirid,$postfix,$open,$name,$descr,$img) = $this->db->fetchRow($result) ) {
+        while (list($dirid, $postfix, $open, $name, $descr, $img) = $this->db->fetchRow($result)) {
 			$arr[] = array('dirid' => $dirid,
 				'postfix' => $postfix,
 				'open' => $open,
 				'name' => $name,
 				'descr' => $descr,
-				'img' => $img );
+				'img' => $img);
 		}
         return $arr;
     }
@@ -154,7 +154,7 @@ 
         if (!$result = $this->db->query($sql)) {
             return false;
         }
-        while ( list($r_id) = $this->db->fetchRow($result) ) {
+        while (list($r_id) = $this->db->fetchRow($result)) {
 			array_push($idarray, $r_id);
 		}
         return $idarray;
@@ -170,7 +170,7 @@ 
         if (!$result = $this->db->query($sql)) {
             return false;
         }
-        while ( list($r_id, $r_title) = $this->db->fetchRow($result) ) {
+        while (list($r_id, $r_title) = $this->db->fetchRow($result)) {
 			$result_arr[$r_id] = $r_title;
 			//array_push($arr, $result_arr);
 		}
@@ -188,7 +188,7 @@ 
 	{		
 		global $xoopsDB;
 	    $block = array();
-		$myts =& MyTextSanitizer::getInstance();
+		$myts = & MyTextSanitizer::getInstance();
 		$dirid = 0;
 	    $result = $xoopsDB->query("SELECT dirid FROM ".$xoopsDB->prefix("efqdiralpha1_dir")."");
 	    $num_results = $xoopsDB->getRowsNum($result);
@@ -218,7 +218,7 @@ 
 		if ($dashes != false) {
 			$arr = array('0' => '---');
 		}
-		while ( list($dirid, $dirname) = $this->db->fetchRow($result) ) {
+		while (list($dirid, $dirname) = $this->db->fetchRow($result)) {
 			$arr[$dirid] = $dirname;
 		}
 		return $arr;
@@ -234,7 +234,7 @@ 
 	 * 
 	 * @return	bool	true if insertion is succesful, false if unsuccesful
 	 */	
-	function insertDirectory($obj, $forceQuery=false) {
+	function insertDirectory($obj, $forceQuery = false) {
 		$tablename = "efqdiralpha1_dir";
 		$keyName = "dirid";
 		$excludedVars = array();
@@ -251,7 +251,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) {

class/class.uploader.php

Indentation +326 added lines, -326 removed lines

@@ -85,99 +85,99 @@ 
 class XoopsMediaUploader
 {
 	/**
-	* Flag indicating if unrecognized mimetypes should be allowed (use with precaution ! may lead to security issues )
-	**/
+	 * Flag indicating if unrecognized mimetypes should be allowed (use with precaution ! may lead to security issues )
+	 **/
  	var $allowUnknownTypes = false;
 
-    var $mediaName;
-    var $mediaType;
-    var $mediaSize;
-    var $mediaTmpName;
-    var $mediaError;
-    var $mediaRealType = '';
+	var $mediaName;
+	var $mediaType;
+	var $mediaSize;
+	var $mediaTmpName;
+	var $mediaError;
+	var $mediaRealType = '';
 
-    var $uploadDir = '';
+	var $uploadDir = '';
 
-    var $allowedMimeTypes = array();
+	var $allowedMimeTypes = array();
 
-    var $maxFileSize = 0;
-    var $maxWidth;
-    var $maxHeight;
+	var $maxFileSize = 0;
+	var $maxWidth;
+	var $maxHeight;
 
-    var $targetFileName;
+	var $targetFileName;
 
-    var $prefix;
+	var $prefix;
 
-    var $errors = array();
+	var $errors = array();
 
-    var $savedDestination;
+	var $savedDestination;
 
-    var $savedFileName;
+	var $savedFileName;
 
 	var $extensionToMime = array();
-    /**
-     * Constructor
-     *
-     * @param   string  $uploadDir
-     * @param   array   $allowedMimeTypes
-     * @param   int     $maxFileSize
-     * @param   int     $maxWidth
-     * @param   int     $maxHeight
-     * @param   int     $cmodvalue
-     **/
-    function XoopsMediaUploader($uploadDir, $allowedMimeTypes, $maxFileSize=0, $maxWidth=null, $maxHeight=null)
-    {
+	/**
+	 * Constructor
+	 *
+	 * @param   string  $uploadDir
+	 * @param   array   $allowedMimeTypes
+	 * @param   int     $maxFileSize
+	 * @param   int     $maxWidth
+	 * @param   int     $maxHeight
+	 * @param   int     $cmodvalue
+	 **/
+	function XoopsMediaUploader($uploadDir, $allowedMimeTypes, $maxFileSize=0, $maxWidth=null, $maxHeight=null)
+	{
 		@$this->extensionToMime = include( XOOPS_ROOT_PATH . '/class/mimetypes.inc.php' );
 		if ( !is_array( $this->extensionToMime ) ) {
 		 	$this->extensionToMime = array();
 			return false;
 		}
-        if (is_array($allowedMimeTypes)) {
-            $this->allowedMimeTypes =& $allowedMimeTypes;
-        }
-        $this->uploadDir = $uploadDir;
-        $this->maxFileSize = intval($maxFileSize);
-        if(isset($maxWidth)) {
-            $this->maxWidth = intval($maxWidth);
-        }
-        if(isset($maxHeight)) {
-            $this->maxHeight = intval($maxHeight);
-        }
-    }
+		if (is_array($allowedMimeTypes)) {
+			$this->allowedMimeTypes =& $allowedMimeTypes;
+		}
+		$this->uploadDir = $uploadDir;
+		$this->maxFileSize = intval($maxFileSize);
+		if(isset($maxWidth)) {
+			$this->maxWidth = intval($maxWidth);
+		}
+		if(isset($maxHeight)) {
+			$this->maxHeight = intval($maxHeight);
+		}
+	}
 
-    /**
-     * Fetch the uploaded file
-     *
-     * @param   string  $media_name Name of the file field
-     * @param   int     $index      Index of the file (if more than one uploaded under that name)
-     * @return  bool
-     **/
-    function fetchMedia($media_name, $index = null)
-    {
+	/**
+	 * Fetch the uploaded file
+	 *
+	 * @param   string  $media_name Name of the file field
+	 * @param   int     $index      Index of the file (if more than one uploaded under that name)
+	 * @return  bool
+	 **/
+	function fetchMedia($media_name, $index = null)
+	{
 		if ( empty( $this->extensionToMime ) ) {
 			$this->setErrors( 'Error loading mimetypes definition' );
 			return false;
 		}
 		if (!isset($_FILES[$media_name])) {
-            $this->setErrors('File not found');
+			$this->setErrors('File not found');
 			//echo " - no such file ";
-            return false;
-        } elseif (is_array($_FILES[$media_name]['name']) && isset($index)) {
-            $index = intval($index);
-            $this->mediaName = (get_magic_quotes_gpc()) ? stripslashes($_FILES[$media_name]['name'][$index]) : $_FILES[$media_name]['name'][$index];
-            $this->mediaType = $_FILES[$media_name]['type'][$index];
-            $this->mediaSize = $_FILES[$media_name]['size'][$index];
-            $this->mediaTmpName = $_FILES[$media_name]['tmp_name'][$index];
-            $this->mediaError = !empty($_FILES[$media_name]['error'][$index]) ? $_FILES[$media_name]['errir'][$index] : 0;
-        } else {
-            $media_name =& $_FILES[$media_name];
+			return false;
+		} elseif (is_array($_FILES[$media_name]['name']) && isset($index)) {
+			$index = intval($index);
+			$this->mediaName = (get_magic_quotes_gpc()) ? stripslashes($_FILES[$media_name]['name'][$index]) : $_FILES[$media_name]['name'][$index];
+			$this->mediaType = $_FILES[$media_name]['type'][$index];
+			$this->mediaSize = $_FILES[$media_name]['size'][$index];
+			$this->mediaTmpName = $_FILES[$media_name]['tmp_name'][$index];
+			$this->mediaError = !empty($_FILES[$media_name]['error'][$index]) ? $_FILES[$media_name]['errir'][$index] : 0;
+		} else {
+			$media_name =& $_FILES[$media_name];
 			$this->mediaName = (get_magic_quotes_gpc()) ? stripslashes($media_name['name']) : $media_name['name'];
-            $this->mediaName = $media_name['name'];
-            $this->mediaType = $media_name['type'];
-            $this->mediaSize = $media_name['size'];
-            $this->mediaTmpName = $media_name['tmp_name'];
-            $this->mediaError = !empty($media_name['error']) ? $media_name['error'] : 0;
-        }
+			$this->mediaName = $media_name['name'];
+			$this->mediaType = $media_name['type'];
+			$this->mediaSize = $media_name['size'];
+			$this->mediaTmpName = $media_name['tmp_name'];
+			$this->mediaError = !empty($media_name['error']) ? $media_name['error'] : 0;
+		}
 		if ( ($ext = strrpos( $this->mediaName, '.' )) !== false ) {
 			$ext = substr( $this->mediaName, $ext + 1 );
 			if ( isset( $this->extensionToMime[$ext] ) ) {
@@ -185,7 +185,7 @@ 
 				//trigger_error( "XoopsMediaUploader: Set mediaRealType to {$this->mediaRealType} (file extension is $ext)", E_USER_NOTICE );
 			}
 		}
-        $this->errors = array();
+		$this->errors = array();
 		if ( $ext && in_array( $ext, array( 'gif', 'jpg', 'jpeg', 'png', 'bmp', 'xbm' ) ) ) {
 	   		// Prevent sending of invalid images that would crash IE
 			if ( ! ( $info = getimagesize( $this->mediaTmpName ) ) ) {
@@ -193,258 +193,258 @@ 
 				return false;
 			}
 		}
-        if (intval($this->mediaSize) < 0) {
-            $this->setErrors('Invalid File Size');
-            return false;
-        }
-        if ($this->mediaName == '') {
-            $this->setErrors('Filename Is Empty');
-            return false;
-        }
-        if ($this->mediaTmpName == 'none' || !is_uploaded_file($this->mediaTmpName)) {
-            $this->setErrors('No file uploaded');
-            return false;
-        }
-        if ($this->mediaError > 0) {
-            $this->setErrors('Error occurred: Error #'.$this->mediaError);
-            return false;
-        }
-        return true;
-    }
+		if (intval($this->mediaSize) < 0) {
+			$this->setErrors('Invalid File Size');
+			return false;
+		}
+		if ($this->mediaName == '') {
+			$this->setErrors('Filename Is Empty');
+			return false;
+		}
+		if ($this->mediaTmpName == 'none' || !is_uploaded_file($this->mediaTmpName)) {
+			$this->setErrors('No file uploaded');
+			return false;
+		}
+		if ($this->mediaError > 0) {
+			$this->setErrors('Error occurred: Error #'.$this->mediaError);
+			return false;
+		}
+		return true;
+	}
 
-    /**
-     * Set the target filename
-     * 
-     * @param   string  $value
-     **/
-    function setTargetFileName($value){
-        $this->targetFileName = strval(trim($value));
-    }
+	/**
+	 * Set the target filename
+	 * 
+	 * @param   string  $value
+	 **/
+	function setTargetFileName($value){
+		$this->targetFileName = strval(trim($value));
+	}
 
-    /**
-     * Set the prefix
-     * 
-     * @param   string  $value
-     **/
-    function setPrefix($value){
-        $this->prefix = strval(trim($value));
-    }
+	/**
+	 * Set the prefix
+	 * 
+	 * @param   string  $value
+	 **/
+	function setPrefix($value){
+		$this->prefix = strval(trim($value));
+	}
 
-    /**
-     * Get the uploaded filename
-     * 
-     * @return  string 
-     **/
-    function getMediaName()
-    {
-        return $this->mediaName;
-    }
+	/**
+	 * Get the uploaded filename
+	 * 
+	 * @return  string 
+	 **/
+	function getMediaName()
+	{
+		return $this->mediaName;
+	}
 
-    /**
-     * Get the type of the uploaded file
-     * 
-     * @return  string 
-     **/
-    function getMediaType()
-    {
-        return $this->mediaType;
-    }
+	/**
+	 * Get the type of the uploaded file
+	 * 
+	 * @return  string 
+	 **/
+	function getMediaType()
+	{
+		return $this->mediaType;
+	}
 
-    /**
-     * Get the size of the uploaded file
-     * 
-     * @return  int 
-     **/
-    function getMediaSize()
-    {
-        return $this->mediaSize;
-    }
+	/**
+	 * Get the size of the uploaded file
+	 * 
+	 * @return  int 
+	 **/
+	function getMediaSize()
+	{
+		return $this->mediaSize;
+	}
 
-    /**
-     * Get the temporary name that the uploaded file was stored under
-     * 
-     * @return  string 
-     **/
-    function getMediaTmpName()
-    {
-        return $this->mediaTmpName;
-    }
+	/**
+	 * Get the temporary name that the uploaded file was stored under
+	 * 
+	 * @return  string 
+	 **/
+	function getMediaTmpName()
+	{
+		return $this->mediaTmpName;
+	}
 
-    /**
-     * Get the saved filename
-     * 
-     * @return  string 
-     **/
-    function getSavedFileName(){
-        return $this->savedFileName;
-    }
+	/**
+	 * Get the saved filename
+	 * 
+	 * @return  string 
+	 **/
+	function getSavedFileName(){
+		return $this->savedFileName;
+	}
 
-    /**
-     * Get the destination the file is saved to
-     * 
-     * @return  string
-     **/
-    function getSavedDestination(){
-        return $this->savedDestination;
-    }
+	/**
+	 * Get the destination the file is saved to
+	 * 
+	 * @return  string
+	 **/
+	function getSavedDestination(){
+		return $this->savedDestination;
+	}
 
-    /**
-     * Check the file and copy it to the destination
-     * 
-     * @return  bool
-     **/
-    function upload($chmod = 0644)
-    {
-        if ($this->uploadDir == '') {
-            $this->setErrors('Upload directory not set');
-            return false;
-        }
-        if (!is_dir($this->uploadDir)) {
-            $this->setErrors('Failed opening directory: '.$this->uploadDir);
-        }
-        if (!is_writeable($this->uploadDir)) {
-            $this->setErrors('Failed opening directory with write permission: '.$this->uploadDir);
-        }
-        if (!$this->checkMaxFileSize()) {
-            $this->setErrors('File size too large: '.$this->mediaSize);
-        }
-        if (!$this->checkMaxWidth()) {
-            $this->setErrors(sprintf('File width must be smaller than %u', $this->maxWidth));
-        }
-        if (!$this->checkMaxHeight()) {
-            $this->setErrors(sprintf('File height must be smaller than %u', $this->maxHeight));
-        }
-        if (!$this->checkMimeType()) {
-            $this->setErrors('MIME type not allowed: '.$this->mediaType);
-        }
-        if (count($this->errors) > 0) {
-            return false;
-        }
-        if (!$this->_copyFile($chmod)) {
-            $this->setErrors('Failed uploading file: '.$this->mediaName);
-            return false;
-        }
-        return true;
-    }
+	/**
+	 * Check the file and copy it to the destination
+	 * 
+	 * @return  bool
+	 **/
+	function upload($chmod = 0644)
+	{
+		if ($this->uploadDir == '') {
+			$this->setErrors('Upload directory not set');
+			return false;
+		}
+		if (!is_dir($this->uploadDir)) {
+			$this->setErrors('Failed opening directory: '.$this->uploadDir);
+		}
+		if (!is_writeable($this->uploadDir)) {
+			$this->setErrors('Failed opening directory with write permission: '.$this->uploadDir);
+		}
+		if (!$this->checkMaxFileSize()) {
+			$this->setErrors('File size too large: '.$this->mediaSize);
+		}
+		if (!$this->checkMaxWidth()) {
+			$this->setErrors(sprintf('File width must be smaller than %u', $this->maxWidth));
+		}
+		if (!$this->checkMaxHeight()) {
+			$this->setErrors(sprintf('File height must be smaller than %u', $this->maxHeight));
+		}
+		if (!$this->checkMimeType()) {
+			$this->setErrors('MIME type not allowed: '.$this->mediaType);
+		}
+		if (count($this->errors) > 0) {
+			return false;
+		}
+		if (!$this->_copyFile($chmod)) {
+			$this->setErrors('Failed uploading file: '.$this->mediaName);
+			return false;
+		}
+		return true;
+	}
 
-    /**
-     * Copy the file to its destination
-     * 
-     * @return  bool 
-     **/
-    function _copyFile($chmod)
-    {
-        $matched = array();
-        if (!preg_match("/\.([a-zA-Z0-9]+)$/", $this->mediaName, $matched)) {
-            return false;
-        }
-        if (isset($this->targetFileName)) {
-            $this->savedFileName = $this->targetFileName;
-        } elseif (isset($this->prefix)) {
-            $this->savedFileName = uniqid($this->prefix).'.'.strtolower($matched[1]);
-        } else {
-            $this->savedFileName = strtolower($this->mediaName);
-        }
-        $this->savedDestination = $this->uploadDir.'/'.$this->savedFileName;
-        if (!move_uploaded_file($this->mediaTmpName, $this->savedDestination)) {
-            return false;
-        }
-        @chmod($this->savedDestination, $chmod);
-        return true;
-    }
+	/**
+	 * Copy the file to its destination
+	 * 
+	 * @return  bool 
+	 **/
+	function _copyFile($chmod)
+	{
+		$matched = array();
+		if (!preg_match("/\.([a-zA-Z0-9]+)$/", $this->mediaName, $matched)) {
+			return false;
+		}
+		if (isset($this->targetFileName)) {
+			$this->savedFileName = $this->targetFileName;
+		} elseif (isset($this->prefix)) {
+			$this->savedFileName = uniqid($this->prefix).'.'.strtolower($matched[1]);
+		} else {
+			$this->savedFileName = strtolower($this->mediaName);
+		}
+		$this->savedDestination = $this->uploadDir.'/'.$this->savedFileName;
+		if (!move_uploaded_file($this->mediaTmpName, $this->savedDestination)) {
+			return false;
+		}
+		@chmod($this->savedDestination, $chmod);
+		return true;
+	}
 
-    /**
-     * Is the file the right size?
-     * 
-     * @return  bool 
-     **/
-    function checkMaxFileSize()
-    {
-        if ($this->mediaSize > $this->maxFileSize) {
-            return false;
-        }
-        return true;
-    }
+	/**
+	 * Is the file the right size?
+	 * 
+	 * @return  bool 
+	 **/
+	function checkMaxFileSize()
+	{
+		if ($this->mediaSize > $this->maxFileSize) {
+			return false;
+		}
+		return true;
+	}
 
-    /**
-     * Is the picture the right width?
-     * 
-     * @return  bool 
-     **/
-    function checkMaxWidth()
-    {
-        if (!isset($this->maxWidth)) {
-            return true;
-        }
-        if (false !== $dimension = getimagesize($this->mediaTmpName)) {
-            if ($dimension[0] > $this->maxWidth) {
-                return false;
-            }
+	/**
+	 * Is the picture the right width?
+	 * 
+	 * @return  bool 
+	 **/
+	function checkMaxWidth()
+	{
+		if (!isset($this->maxWidth)) {
+			return true;
+		}
+		if (false !== $dimension = getimagesize($this->mediaTmpName)) {
+			if ($dimension[0] > $this->maxWidth) {
+				return false;
+			}
 			//$result = $dimension[0];
 			//$this->width = $result;
-        } else {
-            trigger_error(sprintf('Failed fetching image size of %s, skipping max width check..', $this->mediaTmpName), E_USER_WARNING);
-        }
-        return true;
-    }
+		} else {
+			trigger_error(sprintf('Failed fetching image size of %s, skipping max width check..', $this->mediaTmpName), E_USER_WARNING);
+		}
+		return true;
+	}
 
 	function getWidth()
-    {
-        //$filename = $imgloc."/";
+	{
+		//$filename = $imgloc."/";
 		$filename = $this->uploadDir."/";
 		$filename .= $this->savedFileName;
 		if (false !== $dimension = getimagesize($filename)) {
-            if ($dimension[0] > 0) {
-                $result = $dimension[0];
-            }
-        } else {
-            trigger_error(sprintf('Failed fetching image size of %s, image width unknown..', $this->mediaTmpName), E_USER_WARNING);
-        }
-        return $result;
-    }
+			if ($dimension[0] > 0) {
+				$result = $dimension[0];
+			}
+		} else {
+			trigger_error(sprintf('Failed fetching image size of %s, image width unknown..', $this->mediaTmpName), E_USER_WARNING);
+		}
+		return $result;
+	}
 	
 	function getHeight()
-    {
-        //$filename = $imgloc."/";
+	{
+		//$filename = $imgloc."/";
 		$filename = $this->uploadDir."/";
 		$filename .= $this->savedFileName;
 		if (false !== $dimension = getimagesize($filename)) {
-            if ($dimension[1] > 0) {
-                $result = $dimension[1];
-            }
-        } else {
-            trigger_error(sprintf('Failed fetching image size of %s, image height unknown..', $this->mediaTmpName), E_USER_WARNING);
-        }
-        return $result;
-    }
+			if ($dimension[1] > 0) {
+				$result = $dimension[1];
+			}
+		} else {
+			trigger_error(sprintf('Failed fetching image size of %s, image height unknown..', $this->mediaTmpName), E_USER_WARNING);
+		}
+		return $result;
+	}
 	
-    /**
-     * Is the picture the right height?
-     * 
-     * @return  bool 
-     **/
-    function checkMaxHeight()
-    {
-        if (!isset($this->maxHeight)) {
-            return true;
-        }
-        if (false !== $dimension = getimagesize($this->mediaTmpName)) {
-            if ($dimension[1] > $this->maxHeight) {
-                return false;
-            }
-        } else {
-            trigger_error(sprintf('Failed fetching image size of %s, skipping max height check..', $this->mediaTmpName), E_USER_WARNING);
-        }
-        return true;
-    }
+	/**
+	 * Is the picture the right height?
+	 * 
+	 * @return  bool 
+	 **/
+	function checkMaxHeight()
+	{
+		if (!isset($this->maxHeight)) {
+			return true;
+		}
+		if (false !== $dimension = getimagesize($this->mediaTmpName)) {
+			if ($dimension[1] > $this->maxHeight) {
+				return false;
+			}
+		} else {
+			trigger_error(sprintf('Failed fetching image size of %s, skipping max height check..', $this->mediaTmpName), E_USER_WARNING);
+		}
+		return true;
+	}
 
-    /**
-     * Check whether or not the uploaded file type is allowed
-     *
-     * @return  bool
-     **/
-    function checkMimeType()
-    {
+	/**
+	 * Check whether or not the uploaded file type is allowed
+	 *
+	 * @return  bool
+	 **/
+	function checkMimeType()
+	{
 		if ( empty( $this->mediaRealType ) && !$this->allowUnknownTypes ) {
 			$this->setErrors( 'Unknown filetype rejected' );
 			return false;
@@ -453,37 +453,37 @@ 
 		return ( empty($this->allowedMimeTypes) || in_array($this->mediaRealType, $this->allowedMimeTypes) );
 	}
 
-    /**
-     * Add an error
-     * 
-     * @param   string  $error
-     **/
-    function setErrors($error)
-    {
-        $this->errors[] = trim($error);
-    }
+	/**
+	 * Add an error
+	 * 
+	 * @param   string  $error
+	 **/
+	function setErrors($error)
+	{
+		$this->errors[] = trim($error);
+	}
 
-    /**
-     * Get generated errors
-     *
-     * @param    bool    $ashtml Format using HTML?
-     * 
-     * @return    array|string    Array of array messages OR HTML string
-     */
-    function &getErrors($ashtml = true)
-    {
-        if (!$ashtml) {
-            return $this->errors;
-        } else {
-            $ret = '';
-            if (count($this->errors) > 0) {
-                $ret = '<h4>Errors Returned While Uploading</h4>';
-                foreach ($this->errors as $error) {
-                    $ret .= $error.'<br />';
-                }
-            }
-            return $ret;
-        }
-    }
+	/**
+	 * Get generated errors
+	 *
+	 * @param    bool    $ashtml Format using HTML?
+	 * 
+	 * @return    array|string    Array of array messages OR HTML string
+	 */
+	function &getErrors($ashtml = true)
+	{
+		if (!$ashtml) {
+			return $this->errors;
+		} else {
+			$ret = '';
+			if (count($this->errors) > 0) {
+				$ret = '<h4>Errors Returned While Uploading</h4>';
+				foreach ($this->errors as $error) {
+					$ret .= $error.'<br />';
+				}
+			}
+			return $ret;
+		}
+	}
 }
 ?>
\ No newline at end of file

Spacing +22 added lines, -22 removed lines

@@ -125,22 +125,22 @@ 
      * @param   int     $maxHeight
      * @param   int     $cmodvalue
      **/
-    function XoopsMediaUploader($uploadDir, $allowedMimeTypes, $maxFileSize=0, $maxWidth=null, $maxHeight=null)
+    function XoopsMediaUploader($uploadDir, $allowedMimeTypes, $maxFileSize = 0, $maxWidth = null, $maxHeight = null)
     {
-		@$this->extensionToMime = include( XOOPS_ROOT_PATH . '/class/mimetypes.inc.php' );
-		if ( !is_array( $this->extensionToMime ) ) {
+		@$this->extensionToMime = include(XOOPS_ROOT_PATH.'/class/mimetypes.inc.php');
+		if (!is_array($this->extensionToMime)) {
 		 	$this->extensionToMime = array();
 			return false;
 		}
         if (is_array($allowedMimeTypes)) {
-            $this->allowedMimeTypes =& $allowedMimeTypes;
+            $this->allowedMimeTypes = & $allowedMimeTypes;
         }
         $this->uploadDir = $uploadDir;
         $this->maxFileSize = intval($maxFileSize);
-        if(isset($maxWidth)) {
+        if (isset($maxWidth)) {
             $this->maxWidth = intval($maxWidth);
         }
-        if(isset($maxHeight)) {
+        if (isset($maxHeight)) {
             $this->maxHeight = intval($maxHeight);
         }
     }
@@ -154,8 +154,8 @@ 
      **/
     function fetchMedia($media_name, $index = null)
     {
-		if ( empty( $this->extensionToMime ) ) {
-			$this->setErrors( 'Error loading mimetypes definition' );
+		if (empty($this->extensionToMime)) {
+			$this->setErrors('Error loading mimetypes definition');
 			return false;
 		}
 		if (!isset($_FILES[$media_name])) {
@@ -170,7 +170,7 @@ 
             $this->mediaTmpName = $_FILES[$media_name]['tmp_name'][$index];
             $this->mediaError = !empty($_FILES[$media_name]['error'][$index]) ? $_FILES[$media_name]['errir'][$index] : 0;
         } else {
-            $media_name =& $_FILES[$media_name];
+            $media_name = & $_FILES[$media_name];
 			$this->mediaName = (get_magic_quotes_gpc()) ? stripslashes($media_name['name']) : $media_name['name'];
             $this->mediaName = $media_name['name'];
             $this->mediaType = $media_name['type'];
@@ -178,18 +178,18 @@ 
             $this->mediaTmpName = $media_name['tmp_name'];
             $this->mediaError = !empty($media_name['error']) ? $media_name['error'] : 0;
         }
-		if ( ($ext = strrpos( $this->mediaName, '.' )) !== false ) {
-			$ext = substr( $this->mediaName, $ext + 1 );
-			if ( isset( $this->extensionToMime[$ext] ) ) {
+		if (($ext = strrpos($this->mediaName, '.')) !== false) {
+			$ext = substr($this->mediaName, $ext + 1);
+			if (isset($this->extensionToMime[$ext])) {
 				$this->mediaRealType = $this->extensionToMime[$ext];
 				//trigger_error( "XoopsMediaUploader: Set mediaRealType to {$this->mediaRealType} (file extension is $ext)", E_USER_NOTICE );
 			}
 		}
         $this->errors = array();
-		if ( $ext && in_array( $ext, array( 'gif', 'jpg', 'jpeg', 'png', 'bmp', 'xbm' ) ) ) {
+		if ($ext && in_array($ext, array('gif', 'jpg', 'jpeg', 'png', 'bmp', 'xbm'))) {
 	   		// Prevent sending of invalid images that would crash IE
-			if ( ! ( $info = getimagesize( $this->mediaTmpName ) ) ) {
-				$this->setErrors( 'Invalid file content' );
+			if (!($info = getimagesize($this->mediaTmpName))) {
+				$this->setErrors('Invalid file content');
 				return false;
 			}
 		}
@@ -217,7 +217,7 @@ 
      * 
      * @param   string  $value
      **/
-    function setTargetFileName($value){
+    function setTargetFileName($value) {
         $this->targetFileName = strval(trim($value));
     }
 
@@ -226,7 +226,7 @@ 
      * 
      * @param   string  $value
      **/
-    function setPrefix($value){
+    function setPrefix($value) {
         $this->prefix = strval(trim($value));
     }
 
@@ -275,7 +275,7 @@ 
      * 
      * @return  string 
      **/
-    function getSavedFileName(){
+    function getSavedFileName() {
         return $this->savedFileName;
     }
 
@@ -284,7 +284,7 @@ 
      * 
      * @return  string
      **/
-    function getSavedDestination(){
+    function getSavedDestination() {
         return $this->savedDestination;
     }
 
@@ -445,12 +445,12 @@ 
      **/
     function checkMimeType()
     {
-		if ( empty( $this->mediaRealType ) && !$this->allowUnknownTypes ) {
-			$this->setErrors( 'Unknown filetype rejected' );
+		if (empty($this->mediaRealType) && !$this->allowUnknownTypes) {
+			$this->setErrors('Unknown filetype rejected');
 			return false;
 		}
 
-		return ( empty($this->allowedMimeTypes) || in_array($this->mediaRealType, $this->allowedMimeTypes) );
+		return (empty($this->allowedMimeTypes) || in_array($this->mediaRealType, $this->allowedMimeTypes));
 	}
 
     /**

class/class.listingdata.php

Indentation +16 added lines, -16 removed lines

@@ -51,12 +51,12 @@ 
 		// class constructor;
 		//$this->setCurrentUser();		
 		$this->initVar('dataid', XOBJ_DTYPE_INT, 0, true);
-        $this->initVar('itemid', XOBJ_DTYPE_INT, 0, true);
-        $this->initVar('dtypeid', XOBJ_DTYPE_INT, 0, true);
-        $this->initVar('itemid', XOBJ_DTYPE_INT, 0, true);
-        $this->initVar('value', XOBJ_DTYPE_TXTAREA, null, false);
-        $this->initVar('created', XOBJ_DTYPE_INT, 0, true); 
-        $this->initVar('customtitle', XOBJ_DTYPE_TXTBOX, null, false, 255);
+		$this->initVar('itemid', XOBJ_DTYPE_INT, 0, true);
+		$this->initVar('dtypeid', XOBJ_DTYPE_INT, 0, true);
+		$this->initVar('itemid', XOBJ_DTYPE_INT, 0, true);
+		$this->initVar('value', XOBJ_DTYPE_TXTAREA, null, false);
+		$this->initVar('created', XOBJ_DTYPE_INT, 0, true); 
+		$this->initVar('customtitle', XOBJ_DTYPE_TXTBOX, null, false, 255);
 	}
 		
 	//Set variable $_updated to true of false (default)
@@ -110,19 +110,19 @@ 
 	{
 		$arr = array();
 		$sql = "SELECT DISTINCT t.dtypeid, t.title, t.section, f.typeid, f.fieldtype, f.ext, t.options, d.dataid, d.itemid, d.value, d.created, t.custom ";
-	    $sql .= "FROM ".$this->db->prefix("efqdiralpha1_item_x_cat")." ic, ".$this->db->
-	        prefix("efqdiralpha1_dtypes_x_cat")." xc, ".$this->db->prefix("efqdiralpha1_fieldtypes")." f, ".$this->db->prefix("efqdiralpha1_dtypes")." t ";
-	    $sql .= "LEFT JOIN ".$this->db->prefix("efqdiralpha1_data") .
-	        " d ON (t.dtypeid=d.dtypeid AND d.itemid=".$itemid.") ";
-	    $sql .= "WHERE ic.cid=xc.cid AND ic.active='1' AND xc.dtypeid=t.dtypeid AND t.fieldtypeid=f.typeid AND t.activeyn='1' AND ic.itemid=".$itemid."";
-	    $data_result = $this->db->query($sql) or $eh->show("0013");
-	    while (list($dtypeid, $title, $section, $ftypeid, $fieldtype, $ext, $options, $dataid, $itemid, $value, $created, $custom) = $this->db->fetchRow($data_result)) {
-	    	$arr[] = array('dtypeid'=>$dtypeid, 'title'=>$title, 'section'=>$section,
+		$sql .= "FROM ".$this->db->prefix("efqdiralpha1_item_x_cat")." ic, ".$this->db->
+			prefix("efqdiralpha1_dtypes_x_cat")." xc, ".$this->db->prefix("efqdiralpha1_fieldtypes")." f, ".$this->db->prefix("efqdiralpha1_dtypes")." t ";
+		$sql .= "LEFT JOIN ".$this->db->prefix("efqdiralpha1_data") .
+			" d ON (t.dtypeid=d.dtypeid AND d.itemid=".$itemid.") ";
+		$sql .= "WHERE ic.cid=xc.cid AND ic.active='1' AND xc.dtypeid=t.dtypeid AND t.fieldtypeid=f.typeid AND t.activeyn='1' AND ic.itemid=".$itemid."";
+		$data_result = $this->db->query($sql) or $eh->show("0013");
+		while (list($dtypeid, $title, $section, $ftypeid, $fieldtype, $ext, $options, $dataid, $itemid, $value, $created, $custom) = $this->db->fetchRow($data_result)) {
+			$arr[] = array('dtypeid'=>$dtypeid, 'title'=>$title, 'section'=>$section,
 				'ftypeid'=>$ftypeid, 'fieldtype'=>$fieldtype, 'ext'=>$ext,
 				'options'=>$options, 'dataid' => $dataid, 'itemid'=>$itemid,
 				'value'=>$value, 'created'=>$created, 'customtitle'=>$custom);
-	    }
-	    return $arr;
+		}
+		return $arr;
 	}
 
 	

Spacing +7 added lines, -7 removed lines

@@ -60,12 +60,12 @@ 
 	}
 		
 	//Set variable $_updated to true of false (default)
-	function setUpdated($set=false) {
+	function setUpdated($set = false) {
 		$this->_updated = $set;
 	}
 	
 	//Set variable $_inserted to true of false (default)
-	function setInserted($set=false) {
+	function setInserted($set = false) {
 		$this->_inserted = $set;
 	}
 	
@@ -102,17 +102,17 @@ 
 	{
 		//Instantiate class
 		global $eh;
-		$this->db =& XoopsDatabaseFactory::getDatabaseConnection();
+		$this->db = & XoopsDatabaseFactory::getDatabaseConnection();
 		$this->errorhandler = $eh;
 	}
 	
-	function getData($itemid=0)
+	function getData($itemid = 0)
 	{
 		$arr = array();
 		$sql = "SELECT DISTINCT t.dtypeid, t.title, t.section, f.typeid, f.fieldtype, f.ext, t.options, d.dataid, d.itemid, d.value, d.created, t.custom ";
 	    $sql .= "FROM ".$this->db->prefix("efqdiralpha1_item_x_cat")." ic, ".$this->db->
 	        prefix("efqdiralpha1_dtypes_x_cat")." xc, ".$this->db->prefix("efqdiralpha1_fieldtypes")." f, ".$this->db->prefix("efqdiralpha1_dtypes")." t ";
-	    $sql .= "LEFT JOIN ".$this->db->prefix("efqdiralpha1_data") .
+	    $sql .= "LEFT JOIN ".$this->db->prefix("efqdiralpha1_data").
 	        " d ON (t.dtypeid=d.dtypeid AND d.itemid=".$itemid.") ";
 	    $sql .= "WHERE ic.cid=xc.cid AND ic.active='1' AND xc.dtypeid=t.dtypeid AND t.fieldtypeid=f.typeid AND t.activeyn='1' AND ic.itemid=".$itemid."";
 	    $data_result = $this->db->query($sql) or $eh->show("0013");
@@ -136,7 +136,7 @@ 
 	 * 
 	 * @return	bool	true if update is succesful, false if unsuccesful
 	 */
-	function updateListingData($obj, $forceQuery=false) {
+	function updateListingData($obj, $forceQuery = false) {
 		$tablename = "efqdiralpha1_data";
 		$keyName = "dataid";
 		if ($obj instanceof efqListingData) {
@@ -182,7 +182,7 @@ 
 	 * 
 	 * @return	bool	true if insertion is succesful, false if unsuccesful
 	 */
-	function insertListingData($obj, $forceQuery=false) {
+	function insertListingData($obj, $forceQuery = false) {
 		$tablename = "efqdiralpha1_data";
 		$keyName = "dataid";
 		if ($obj instanceof efqListingData) {