XoopsModules25x / efqdirectory

header.php

Spacing +3 added lines, -3 removed lines

@@ -18,7 +18,7 @@
  * @author       XOOPS Development Team,
  */
 
-include __DIR__ . '/../../mainfile.php';
+include __DIR__.'/../../mainfile.php';
 $moduleDirName = basename(__DIR__);
-include __DIR__ . '/include/functions.php';
-$xoops_module_header = '<link rel="stylesheet" type="text/css" href="' . XOOPS_URL . '/modules/' . $moduleDirName . '/assets/css/efqdirectory.css">';
+include __DIR__.'/include/functions.php';
+$xoops_module_header = '<link rel="stylesheet" type="text/css" href="'.XOOPS_URL.'/modules/'.$moduleDirName.'/assets/css/efqdirectory.css">';

class/class.couponhandler.php

Indentation +148 added lines, -148 removed lines

@@ -15,168 +15,168 @@
 
 class efqCouponHandler
 {
-    public $db;
-    public $coupon = array();
-    public $couponid;
-    public $descr;
-    public $itemid;
-    public $publish;
-    public $expire;
-    public $heading;
-    public $message;
-    public $lbr;
-    public $_new   = false;
-
-    public function __construct()
-    {
-        $this->db = XoopsDatabaseFactory::getDatabaseConnection();
-    }
-
-    public function create()
-    {
-        global $myts;
-        $this->descr   = $myts->makeTareaData4Save($_POST['description']);
-        $this->image   = $myts->makeTboxData4Save($_POST['image']);
-        $this->itemid  = (int)$_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 = (int)$_POST['couponid'];
-            if ($this->update()) {
-                return true;
-            } else {
-                return false;
-            }
-        }
-    }
-
-    public function insert()
-    {
-        $sql = 'INSERT INTO ' . $this->db->prefix($module->getVar('dirname', 'n') . '_coupon') . '
+	public $db;
+	public $coupon = array();
+	public $couponid;
+	public $descr;
+	public $itemid;
+	public $publish;
+	public $expire;
+	public $heading;
+	public $message;
+	public $lbr;
+	public $_new   = false;
+
+	public function __construct()
+	{
+		$this->db = XoopsDatabaseFactory::getDatabaseConnection();
+	}
+
+	public function create()
+	{
+		global $myts;
+		$this->descr   = $myts->makeTareaData4Save($_POST['description']);
+		$this->image   = $myts->makeTboxData4Save($_POST['image']);
+		$this->itemid  = (int)$_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 = (int)$_POST['couponid'];
+			if ($this->update()) {
+				return true;
+			} else {
+				return false;
+			}
+		}
+	}
+
+	public function insert()
+	{
+		$sql = 'INSERT INTO ' . $this->db->prefix($module->getVar('dirname', 'n') . '_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();
+		if ($this->db->query($sql)) {
+			$this->couponid = $this->db->getInsertId();
 
-            return true;
-        }
+			return true;
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    public function update()
-    {
-        $sql = 'UPDATE ' . $this->db->prefix($module->getVar('dirname', 'n') . '_coupon') . ' SET
+	public function update()
+	{
+		$sql = 'UPDATE ' . $this->db->prefix($module->getVar('dirname', 'n') . '_coupon') . ' SET
             description = ' . $this->db->quoteString($this->descr) . ',
             image = ' . $this->db->quoteString($this->image) . ',
             publish = ' . $this->publish . ',
             lbr = ' . $this->lbr . ',
             heading = ' . $this->db->quoteString($this->heading) . ",
             expire = $this->expire WHERE couponid = $this->couponid";
-        $this->db->query($sql);
-
-        return true;
-    }
-
-    public function get($couponid = false)
-    {
-        if ($couponid === false) {
-            //echo 'couponid is false';
-            return false;
-        }
-        //$couponid = (int)($couponid);
-        if ($couponid > 0) {
-            $sql = 'SELECT itemid, description, image, publish, expire, heading, lbr FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_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;
-    }
-
-    public function delete($couponid)
-    {
-        $sql = 'DELETE FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_coupon') . ' WHERE couponid=' . (int)$couponid;
-        $this->db->query($sql);
-
-        return true;
-    }
-
-    /* Returns number of coupons for a listing
+		$this->db->query($sql);
+
+		return true;
+	}
+
+	public function get($couponid = false)
+	{
+		if ($couponid === false) {
+			//echo 'couponid is false';
+			return false;
+		}
+		//$couponid = (int)($couponid);
+		if ($couponid > 0) {
+			$sql = 'SELECT itemid, description, image, publish, expire, heading, lbr FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_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;
+	}
+
+	public function delete($couponid)
+	{
+		$sql = 'DELETE FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_coupon') . ' WHERE couponid=' . (int)$couponid;
+		$this->db->query($sql);
+
+		return true;
+	}
+
+	/* Returns number of coupons for a listing
     *
     * @param int $itemid listing id
     *
     * @return
     */
-    public function getCountByLink($itemid = 0)
-    {
-        $ret = 0;
-        $now = time();
-        $sql = 'SELECT count(*) FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_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;
-    }
-
-    public function getByItem($itemid = 0)
-    {
-        if ($itemid === false) {
-            //echo 'couponid is false';
-            return false;
-        }
-        //$couponid = (int)($couponid);
-        if ($itemid > 0) {
-            $sql = 'SELECT couponid, itemid, description, image, publish, expire, heading, lbr FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_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;
-    }
+	public function getCountByLink($itemid = 0)
+	{
+		$ret = 0;
+		$now = time();
+		$sql = 'SELECT count(*) FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_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;
+	}
+
+	public function getByItem($itemid = 0)
+	{
+		if ($itemid === false) {
+			//echo 'couponid is false';
+			return false;
+		}
+		//$couponid = (int)($couponid);
+		if ($itemid > 0) {
+			$sql = 'SELECT couponid, itemid, description, image, publish, expire, heading, lbr FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_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;
+	}
 }

Spacing +15 added lines, -15 removed lines

@@ -25,7 +25,7 @@ 
     public $heading;
     public $message;
     public $lbr;
-    public $_new   = false;
+    public $_new = false;
 
     public function __construct()
     {
@@ -37,7 +37,7 @@ 
         global $myts;
         $this->descr   = $myts->makeTareaData4Save($_POST['description']);
         $this->image   = $myts->makeTboxData4Save($_POST['image']);
-        $this->itemid  = (int)$_POST['itemid'];
+        $this->itemid  = (int) $_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'];
@@ -56,7 +56,7 @@ 
             }
         } else {
             $this->message  = _MD_COUPONUPDATED;
-            $this->couponid = (int)$_POST['couponid'];
+            $this->couponid = (int) $_POST['couponid'];
             if ($this->update()) {
                 return true;
             } else {
@@ -67,9 +67,9 @@ 
 
     public function insert()
     {
-        $sql = 'INSERT INTO ' . $this->db->prefix($module->getVar('dirname', 'n') . '_coupon') . '
+        $sql = 'INSERT INTO '.$this->db->prefix($module->getVar('dirname', 'n').'_coupon').'
             (itemid, description, image, publish, expire, heading, lbr) VALUES
-            (' . $this->itemid . ', ' . $this->db->quoteString($this->descr) . ', ' . $this->db->quoteString($this->image) . ', ' . $this->publish . ', ' . $this->expire . ', ' . $this->db->quoteString($this->heading) . ', ' . $this->lbr . ')';
+            (' . $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();
 
@@ -81,12 +81,12 @@ 
 
     public function update()
     {
-        $sql = 'UPDATE ' . $this->db->prefix($module->getVar('dirname', 'n') . '_coupon') . ' SET
-            description = ' . $this->db->quoteString($this->descr) . ',
-            image = ' . $this->db->quoteString($this->image) . ',
-            publish = ' . $this->publish . ',
-            lbr = ' . $this->lbr . ',
-            heading = ' . $this->db->quoteString($this->heading) . ",
+        $sql = 'UPDATE '.$this->db->prefix($module->getVar('dirname', 'n').'_coupon').' SET
+            description = ' . $this->db->quoteString($this->descr).',
+            image = ' . $this->db->quoteString($this->image).',
+            publish = ' . $this->publish.',
+            lbr = ' . $this->lbr.',
+            heading = ' . $this->db->quoteString($this->heading).",
             expire = $this->expire WHERE couponid = $this->couponid";
         $this->db->query($sql);
 
@@ -101,7 +101,7 @@ 
         }
         //$couponid = (int)($couponid);
         if ($couponid > 0) {
-            $sql = 'SELECT itemid, description, image, publish, expire, heading, lbr FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_coupon') . ' WHERE couponid=' . $couponid;
+            $sql = 'SELECT itemid, description, image, publish, expire, heading, lbr FROM '.$this->db->prefix($module->getVar('dirname', 'n').'_coupon').' WHERE couponid='.$couponid;
             //echo $sql;
             if (!$result = $this->db->query($sql)) {
                 return false;
@@ -124,7 +124,7 @@ 
 
     public function delete($couponid)
     {
-        $sql = 'DELETE FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_coupon') . ' WHERE couponid=' . (int)$couponid;
+        $sql = 'DELETE FROM '.$this->db->prefix($module->getVar('dirname', 'n').'_coupon').' WHERE couponid='.(int) $couponid;
         $this->db->query($sql);
 
         return true;
@@ -140,7 +140,7 @@ 
     {
         $ret = 0;
         $now = time();
-        $sql = 'SELECT count(*) FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_coupon') . ' WHERE itemid=' . $itemid . ' AND publish < ' . $now . ' AND (expire = 0 OR expire > ' . $now . ')';
+        $sql = 'SELECT count(*) FROM '.$this->db->prefix($module->getVar('dirname', 'n').'_coupon').' WHERE itemid='.$itemid.' AND publish < '.$now.' AND (expire = 0 OR expire > '.$now.')';
         //echo $sql;
         if (!$result = $this->db->query($sql)) {
             return false;
@@ -158,7 +158,7 @@ 
         }
         //$couponid = (int)($couponid);
         if ($itemid > 0) {
-            $sql = 'SELECT couponid, itemid, description, image, publish, expire, heading, lbr FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_coupon') . ' WHERE itemid=' . $itemid;
+            $sql = 'SELECT couponid, itemid, description, image, publish, expire, heading, lbr FROM '.$this->db->prefix($module->getVar('dirname', 'n').'_coupon').' WHERE itemid='.$itemid;
             //echo $sql;
             if (!$result = $this->db->query($sql)) {
                 return false;

class/class.datafield.php

Indentation +132 added lines, -132 removed lines

@@ -42,13 +42,13 @@ 
 class efqDataField extends XoopsObject
 {
 
-    /**
-     * Constructor
-     */
-    public function efqDataField()
-    {
-        // class constructor;
-    }
+	/**
+	 * Constructor
+	 */
+	public function efqDataField()
+	{
+		// class constructor;
+	}
 }
 
 /**
@@ -62,135 +62,135 @@ 
  */
 class efqDataFieldHandler extends XoopsObjectHandler
 {
-    public $errorhandler;
+	public $errorhandler;
 
-    public function efqDataFieldHandler()
-    {
-        //Instantiate class
-        global $eh;
-        $this->db           = XoopsDatabaseFactory::getDatabaseConnection();
-        $this->errorhandler = $eh;
-    }
+	public function efqDataFieldHandler()
+	{
+		//Instantiate class
+		global $eh;
+		$this->db           = XoopsDatabaseFactory::getDatabaseConnection();
+		$this->errorhandler = $eh;
+	}
 
-    public 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);
-        $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);
-            if ($icon != '') {
-                $iconurl = "<img src=\"uploads/$icon\" />";
-            } else {
-                $iconurl = "";
-            }
-            if ($custom != '0' && $customtitle != "") {
-                $title = $customtitle;
-            }
-            $arr[] = array(
-                'dtypeid'     => $dtypeid,
-                'title'       => $title,
-                'section'     => $section,
-                'icon'        => $iconurl,
-                'ftypeid'     => $ftypeid,
-                'fieldtype'   => $fieldtype,
-                'ext'         => $ext,
-                'options'     => $options,
-                'custom'      => $custom,
-                'itemid'      => $itemid,
-                'value'       => $fieldvalue,
-                'customtitle' => $customtitle
-            );
-        }
+	public function 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);
+		$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);
+			if ($icon != '') {
+				$iconurl = "<img src=\"uploads/$icon\" />";
+			} else {
+				$iconurl = "";
+			}
+			if ($custom != '0' && $customtitle != "") {
+				$title = $customtitle;
+			}
+			$arr[] = array(
+				'dtypeid'     => $dtypeid,
+				'title'       => $title,
+				'section'     => $section,
+				'icon'        => $iconurl,
+				'ftypeid'     => $ftypeid,
+				'fieldtype'   => $fieldtype,
+				'ext'         => $ext,
+				'options'     => $options,
+				'custom'      => $custom,
+				'itemid'      => $itemid,
+				'value'       => $fieldvalue,
+				'customtitle' => $customtitle
+			);
+		}
 
-        return $arr;
-    }
+		return $arr;
+	}
 
-    public function getFieldValue($fieldtype = "", $options = "", $value = 0)
-    {
-        global $myts, $moddir;
-        switch ($fieldtype) {
-            case "dhtml":
-                return $myts->displayTarea($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/assets/images/rating_1.gif";
-                        break;
-                    case 2:
-                        $src = "$xoops_url/modules/$moddir/assets/images/rating_2.gif";
-                        break;
-                    case 3:
-                        $src = "$xoops_url/modules/$moddir/assets/images/rating_3.gif";
-                        break;
-                    case 4:
-                        $src = "$xoops_url/modules/$moddir/assets/images/rating_4.gif";
-                        break;
-                    case 5:
-                        $src = "$xoops_url/modules/$moddir/assets/images/rating_5.gif";
-                        break;
-                    case 6:
-                        $src = "$xoops_url/modules/$moddir/assets/images/rating_6.gif";
-                        break;
-                    case 7:
-                        $src = "$xoops_url/modules/$moddir/assets/images/rating_7.gif";
-                        break;
-                    case 8:
-                        $src = "$xoops_url/modules/$moddir/assets/images/rating_8.gif";
-                        break;
-                    case 9:
-                        $src = "$xoops_url/modules/$moddir/assets/images/rating_9.gif";
-                        break;
-                    case 10:
-                        $src = "$xoops_url/modules/$moddir/assets/images/rating_10.gif";
-                        break;
-                    default:
-                        $src = "";
-                }
-                $rating = "<img src=\"$src\" />";
+	public function getFieldValue($fieldtype = "", $options = "", $value = 0)
+	{
+		global $myts, $moddir;
+		switch ($fieldtype) {
+			case "dhtml":
+				return $myts->displayTarea($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/assets/images/rating_1.gif";
+						break;
+					case 2:
+						$src = "$xoops_url/modules/$moddir/assets/images/rating_2.gif";
+						break;
+					case 3:
+						$src = "$xoops_url/modules/$moddir/assets/images/rating_3.gif";
+						break;
+					case 4:
+						$src = "$xoops_url/modules/$moddir/assets/images/rating_4.gif";
+						break;
+					case 5:
+						$src = "$xoops_url/modules/$moddir/assets/images/rating_5.gif";
+						break;
+					case 6:
+						$src = "$xoops_url/modules/$moddir/assets/images/rating_6.gif";
+						break;
+					case 7:
+						$src = "$xoops_url/modules/$moddir/assets/images/rating_7.gif";
+						break;
+					case 8:
+						$src = "$xoops_url/modules/$moddir/assets/images/rating_8.gif";
+						break;
+					case 9:
+						$src = "$xoops_url/modules/$moddir/assets/images/rating_9.gif";
+						break;
+					case 10:
+						$src = "$xoops_url/modules/$moddir/assets/images/rating_10.gif";
+						break;
+					default:
+						$src = "";
+				}
+				$rating = "<img src=\"$src\" />";
 
-                return $rating;
-                break;
-            case "select":
-                return $myts->makeTboxData4Show($value);
-                break;
-            case "textbox":
-                return $myts->makeTboxData4Show($value);
-                break;
-            case "url":
-                $link = explode('|', $value);
+				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;
-        }
-    }
+				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 +4 added lines, -4 removed lines

@@ -75,9 +75,9 @@ 
     public 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 . "";
+        $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();
@@ -179,7 +179,7 @@ 
             case "url":
                 $link = explode('|', $value);
 
-                return '<a href="' . $myts->makeTboxData4Show($link[0]) . '" title="' . $myts->makeTboxData4Show($link[1]) . '">' . $myts->makeTboxData4Show($link[0]) . '</a>';
+                return '<a href="'.$myts->makeTboxData4Show($link[0]).'" title="'.$myts->makeTboxData4Show($link[1]).'">'.$myts->makeTboxData4Show($link[0]).'</a>';
                 break;
             case "yesno":
                 if ($value == '1') {

class/class.efqtree.php

Indentation +361 added lines, -361 removed lines

@@ -23,365 +23,365 @@
 
 class efqTree
 {
-    public $table;
-    //table with parent-child structure
-    public $id;
-    //name of unique id for records in table $table
-    public $pid;
-    // name of parent id used in table $table
-    public $order;
-    //specifies the order of query results
-    public $title;
-    // name of a field in table $table which will be used when  selection box and paths are generated
-    public $db;
-    public $dirid;
-
-    //constructor of class XoopsTree
-    //sets the names of table, unique id, and parend id
-    /**
-     * efqTree constructor.
-     * @param $table_name
-     * @param $id_name
-     * @param $pid_name
-     */
-    public function __construct($table_name, $id_name, $pid_name)
-    {
-        $this->db    = XoopsDatabaseFactory::getDatabaseConnection();
-        $this->table = $table_name;
-        $this->id    = $id_name;
-        $this->pid   = $pid_name;
-        $this->dirid = 0;
-    }
-
-    /**
-     * @param int $dirid
-     */
-    public function setDir($dirid = 0)
-    {
-        $this->dirid = $dirid;
-    }
-
-    // returns an array of first child objects for a given id($sel_id)
-
-    /**
-     * @param        $sel_id
-     * @param string $order
-     * @return array
-     */
-    public function getFirstChild($sel_id, $order = '')
-    {
-        $arr = array();
-        $sql = 'SELECT * FROM ' . $this->table . ' WHERE ' . $this->pid . '=' . $sel_id . '';
-        if ($order !== '') {
-            $sql .= " ORDER BY $order";
-        }
-        $result = $this->db->query($sql);
-        $count  = $this->db->getRowsNum($result);
-        if ($count == 0) {
-            return $arr;
-        }
-        while ($myrow = $this->db->fetchArray($result)) {
-            array_push($arr, $myrow);
-        }
-
-        return $arr;
-    }
-
-    // returns an array of all FIRST child ids of a given id($sel_id)
-
-    /**
-     * @param $sel_id
-     * @return array
-     */
-    public function getFirstChildId($sel_id)
-    {
-        $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) {
-            return $idarray;
-        }
-        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)
-
-    /**
-     * @param        $sel_id
-     * @param string $order
-     * @param array  $idarray
-     * @return array
-     */
-    public function getAllChildId($sel_id, $order = '', $idarray = array())
-    {
-        $sql = 'SELECT ' . $this->id . ' FROM ' . $this->table . ' WHERE ' . $this->pid . '=' . $sel_id . '';
-        if ($order !== '') {
-            $sql .= " ORDER BY $order";
-        }
-        $result = $this->db->query($sql);
-        $count  = $this->db->getRowsNum($result);
-        if ($count == 0) {
-            return $idarray;
-        }
-        while (list($r_id) = $this->db->fetchRow($result)) {
-            array_push($idarray, $r_id);
-            $idarray = $this->getAllChildId($r_id, $order, $idarray);
-        }
-
-        return $idarray;
-    }
-
-    //returns an array of ALL parent ids for a given id($sel_id)
-
-    /**
-     * @param        $sel_id
-     * @param string $order
-     * @param array  $idarray
-     * @return array
-     */
-    public function getAllParentId($sel_id, $order = '', $idarray = array())
-    {
-        $sql = 'SELECT ' . $this->pid . ' FROM ' . $this->table . ' WHERE ' . $this->id . '=' . $sel_id . '';
-        if ($order !== '') {
-            $sql .= " ORDER BY $order";
-        }
-        $result = $this->db->query($sql);
-        list($r_id) = $this->db->fetchRow($result);
-        if ($r_id == 0) {
-            return $idarray;
-        }
-        array_push($idarray, $r_id);
-        $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 "/"
-    /**
-     * @param        $sel_id
-     * @param        $title
-     * @param string $path
-     * @return string
-     */
-    public 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) {
-            return $path;
-        }
-        list($parentid, $name) = $this->db->fetchRow($result);
-        $myts = MyTextSanitizer::getInstance();
-        $name = $myts->htmlSpecialChars($name);
-        $path = '/' . $name . $path . '';
-        if ($parentid == 0) {
-            return $path;
-        }
-        $path = $this->getPathFromId($parentid, $title, $path);
-
-        return $path;
-    }
-
-    //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
-    /**
-     * @param        $title
-     * @param string $order
-     * @param int    $preset_id
-     * @param int    $none
-     * @param string $sel_name
-     * @param string $onchange
-     * @param int    $multiple
-     */
-    public function makeMySelBox($title, $order = '', $preset_id = 0, $none = 0, $sel_name = '', $onchange = '', $multiple = 0)
-    {
-        if ($sel_name === '') {
-            $sel_name = $this->id;
-        }
-        $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 !== '') {
-            $sql .= " ORDER BY $order";
-        }
-        //echo 'test';
-        //echo $sql;
-        $result = $this->db->query($sql);
-
-        echo "<select name='" . $sel_name . '\'';
-        if ($onchange !== '') {
-            echo " onchange='" . $onchange . '\'';
-        }
-        if ($multiple != 0) {
-            echo ' multiple="multiple"';
-        }
-        echo ">\n";
-
-        if ($none) {
-            echo "<option value='0'>----</option>\n";
-        }
-        while (list($catid, $name) = $this->db->fetchRow($result)) {
-            $sel = '';
-            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']);
-                $catpath          = $option['prefix'] . '&nbsp;' . $myts->htmlSpecialChars($option[$title]);
-                if ($option[$this->id] == $preset_id) {
-                    $sel = " selected='selected'";
-                }
-                echo "<option value='" . $option[$this->id] . "'$sel>$catpath</option>\n";
-                $sel = '';
-            }
-        }
-        echo "</select>\n";
-    }
-
-    //generates nicely formatted linked path from the root id to a given id
-
-    /**
-     * @param        $sel_id
-     * @param        $title
-     * @param        $funcURL
-     * @param string $path
-     * @param string $outputvar
-     * @return string
-     */
-    public 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) {
-            return $path;
-        }
-        list($parentid, $name) = $this->db->fetchRow($result);
-        $myts = MyTextSanitizer::getInstance();
-        $name = $myts->htmlSpecialChars($name);
-        $path = "<a href='" . $funcURL . '&' . $outputvar . '=' . $sel_id . '\'>' . $name . '</a>&nbsp;:&nbsp;' . $path . '';
-        if ($parentid == 0) {
-            return $path;
-        }
-        $path = $this->getNicePathFromId($parentid, $title, $funcURL, $path, $outputvar);
-
-        return $path;
-    }
-
-    //generates nicely formatted path from the root id to a given id
-
-    /**
-     * @param        $sel_id
-     * @param        $title
-     * @param string $path
-     * @return string
-     */
-    public 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) {
-            return $path;
-        }
-        list($parentid, $name) = $this->db->fetchRow($result);
-        $myts = MyTextSanitizer::getInstance();
-        $name = $myts->htmlSpecialChars($name);
-        if ($path !== '') {
-            $path = '' . $name . '&nbsp;:&nbsp;' . $path . '';
-        } else {
-            $path = '' . $name . '';
-        }
-
-        if ($parentid == 0) {
-            return $path;
-        }
-        $path = $this->getUnformattedPathFromId($parentid, $title, $path);
-
-        return $path;
-    }
-
-    //generates id path from the root id to a given id
-    // the path is delimetered with "/"
-    /**
-     * @param        $sel_id
-     * @param string $path
-     * @return string
-     */
-    public 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) {
-            return $path;
-        }
-        list($parentid) = $this->db->fetchRow($result);
-        $path = '/' . $sel_id . $path . '';
-        if ($parentid == 0) {
-            return $path;
-        }
-        $path = $this->getIdPathFromId($parentid, $path);
-
-        return $path;
-    }
-
-    /**
-     * @param int    $sel_id
-     * @param string $order
-     * @param array  $parray
-     * @return array
-     */
-    public function getAllChild($sel_id = 0, $order = '', $parray = array())
-    {
-        $sql = 'SELECT * FROM ' . $this->table . ' WHERE ' . $this->pid . '=' . $sel_id . '';
-        if ($order !== '') {
-            $sql .= " ORDER BY $order";
-        }
-        $result = $this->db->query($sql);
-        $count  = $this->db->getRowsNum($result);
-        if ($count == 0) {
-            return $parray;
-        }
-        while ($row = $this->db->fetchArray($result)) {
-            array_push($parray, $row);
-            $parray = $this->getAllChild($row[$this->id], $order, $parray);
-        }
-
-        return $parray;
-    }
-
-    /**
-     * @param int    $sel_id
-     * @param string $order
-     * @param array  $parray
-     * @param string $r_prefix
-     * @return array
-     */
-    public function getChildTreeArray($sel_id = 0, $order = '', $parray = array(), $r_prefix = '')
-    {
-        $sql = 'SELECT * FROM ' . $this->table . ' WHERE ' . $this->pid . '=' . $sel_id . '';
-        if ($order !== '') {
-            $sql .= " ORDER BY $order";
-        }
-        $result = $this->db->query($sql);
-        $count  = $this->db->getRowsNum($result);
-        if ($count == 0) {
-            return $parray;
-        }
-        while ($row = $this->db->fetchArray($result)) {
-            $row['prefix'] = $r_prefix . '.';
-            array_push($parray, $row);
-            $parray = $this->getChildTreeArray($row[$this->id], $order, $parray, $row['prefix']);
-        }
-
-        return $parray;
-    }
+	public $table;
+	//table with parent-child structure
+	public $id;
+	//name of unique id for records in table $table
+	public $pid;
+	// name of parent id used in table $table
+	public $order;
+	//specifies the order of query results
+	public $title;
+	// name of a field in table $table which will be used when  selection box and paths are generated
+	public $db;
+	public $dirid;
+
+	//constructor of class XoopsTree
+	//sets the names of table, unique id, and parend id
+	/**
+	 * efqTree constructor.
+	 * @param $table_name
+	 * @param $id_name
+	 * @param $pid_name
+	 */
+	public function __construct($table_name, $id_name, $pid_name)
+	{
+		$this->db    = XoopsDatabaseFactory::getDatabaseConnection();
+		$this->table = $table_name;
+		$this->id    = $id_name;
+		$this->pid   = $pid_name;
+		$this->dirid = 0;
+	}
+
+	/**
+	 * @param int $dirid
+	 */
+	public function setDir($dirid = 0)
+	{
+		$this->dirid = $dirid;
+	}
+
+	// returns an array of first child objects for a given id($sel_id)
+
+	/**
+	 * @param        $sel_id
+	 * @param string $order
+	 * @return array
+	 */
+	public function getFirstChild($sel_id, $order = '')
+	{
+		$arr = array();
+		$sql = 'SELECT * FROM ' . $this->table . ' WHERE ' . $this->pid . '=' . $sel_id . '';
+		if ($order !== '') {
+			$sql .= " ORDER BY $order";
+		}
+		$result = $this->db->query($sql);
+		$count  = $this->db->getRowsNum($result);
+		if ($count == 0) {
+			return $arr;
+		}
+		while ($myrow = $this->db->fetchArray($result)) {
+			array_push($arr, $myrow);
+		}
+
+		return $arr;
+	}
+
+	// returns an array of all FIRST child ids of a given id($sel_id)
+
+	/**
+	 * @param $sel_id
+	 * @return array
+	 */
+	public function getFirstChildId($sel_id)
+	{
+		$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) {
+			return $idarray;
+		}
+		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)
+
+	/**
+	 * @param        $sel_id
+	 * @param string $order
+	 * @param array  $idarray
+	 * @return array
+	 */
+	public function getAllChildId($sel_id, $order = '', $idarray = array())
+	{
+		$sql = 'SELECT ' . $this->id . ' FROM ' . $this->table . ' WHERE ' . $this->pid . '=' . $sel_id . '';
+		if ($order !== '') {
+			$sql .= " ORDER BY $order";
+		}
+		$result = $this->db->query($sql);
+		$count  = $this->db->getRowsNum($result);
+		if ($count == 0) {
+			return $idarray;
+		}
+		while (list($r_id) = $this->db->fetchRow($result)) {
+			array_push($idarray, $r_id);
+			$idarray = $this->getAllChildId($r_id, $order, $idarray);
+		}
+
+		return $idarray;
+	}
+
+	//returns an array of ALL parent ids for a given id($sel_id)
+
+	/**
+	 * @param        $sel_id
+	 * @param string $order
+	 * @param array  $idarray
+	 * @return array
+	 */
+	public function getAllParentId($sel_id, $order = '', $idarray = array())
+	{
+		$sql = 'SELECT ' . $this->pid . ' FROM ' . $this->table . ' WHERE ' . $this->id . '=' . $sel_id . '';
+		if ($order !== '') {
+			$sql .= " ORDER BY $order";
+		}
+		$result = $this->db->query($sql);
+		list($r_id) = $this->db->fetchRow($result);
+		if ($r_id == 0) {
+			return $idarray;
+		}
+		array_push($idarray, $r_id);
+		$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 "/"
+	/**
+	 * @param        $sel_id
+	 * @param        $title
+	 * @param string $path
+	 * @return string
+	 */
+	public 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) {
+			return $path;
+		}
+		list($parentid, $name) = $this->db->fetchRow($result);
+		$myts = MyTextSanitizer::getInstance();
+		$name = $myts->htmlSpecialChars($name);
+		$path = '/' . $name . $path . '';
+		if ($parentid == 0) {
+			return $path;
+		}
+		$path = $this->getPathFromId($parentid, $title, $path);
+
+		return $path;
+	}
+
+	//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
+	/**
+	 * @param        $title
+	 * @param string $order
+	 * @param int    $preset_id
+	 * @param int    $none
+	 * @param string $sel_name
+	 * @param string $onchange
+	 * @param int    $multiple
+	 */
+	public function makeMySelBox($title, $order = '', $preset_id = 0, $none = 0, $sel_name = '', $onchange = '', $multiple = 0)
+	{
+		if ($sel_name === '') {
+			$sel_name = $this->id;
+		}
+		$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 !== '') {
+			$sql .= " ORDER BY $order";
+		}
+		//echo 'test';
+		//echo $sql;
+		$result = $this->db->query($sql);
+
+		echo "<select name='" . $sel_name . '\'';
+		if ($onchange !== '') {
+			echo " onchange='" . $onchange . '\'';
+		}
+		if ($multiple != 0) {
+			echo ' multiple="multiple"';
+		}
+		echo ">\n";
+
+		if ($none) {
+			echo "<option value='0'>----</option>\n";
+		}
+		while (list($catid, $name) = $this->db->fetchRow($result)) {
+			$sel = '';
+			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']);
+				$catpath          = $option['prefix'] . '&nbsp;' . $myts->htmlSpecialChars($option[$title]);
+				if ($option[$this->id] == $preset_id) {
+					$sel = " selected='selected'";
+				}
+				echo "<option value='" . $option[$this->id] . "'$sel>$catpath</option>\n";
+				$sel = '';
+			}
+		}
+		echo "</select>\n";
+	}
+
+	//generates nicely formatted linked path from the root id to a given id
+
+	/**
+	 * @param        $sel_id
+	 * @param        $title
+	 * @param        $funcURL
+	 * @param string $path
+	 * @param string $outputvar
+	 * @return string
+	 */
+	public 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) {
+			return $path;
+		}
+		list($parentid, $name) = $this->db->fetchRow($result);
+		$myts = MyTextSanitizer::getInstance();
+		$name = $myts->htmlSpecialChars($name);
+		$path = "<a href='" . $funcURL . '&' . $outputvar . '=' . $sel_id . '\'>' . $name . '</a>&nbsp;:&nbsp;' . $path . '';
+		if ($parentid == 0) {
+			return $path;
+		}
+		$path = $this->getNicePathFromId($parentid, $title, $funcURL, $path, $outputvar);
+
+		return $path;
+	}
+
+	//generates nicely formatted path from the root id to a given id
+
+	/**
+	 * @param        $sel_id
+	 * @param        $title
+	 * @param string $path
+	 * @return string
+	 */
+	public 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) {
+			return $path;
+		}
+		list($parentid, $name) = $this->db->fetchRow($result);
+		$myts = MyTextSanitizer::getInstance();
+		$name = $myts->htmlSpecialChars($name);
+		if ($path !== '') {
+			$path = '' . $name . '&nbsp;:&nbsp;' . $path . '';
+		} else {
+			$path = '' . $name . '';
+		}
+
+		if ($parentid == 0) {
+			return $path;
+		}
+		$path = $this->getUnformattedPathFromId($parentid, $title, $path);
+
+		return $path;
+	}
+
+	//generates id path from the root id to a given id
+	// the path is delimetered with "/"
+	/**
+	 * @param        $sel_id
+	 * @param string $path
+	 * @return string
+	 */
+	public 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) {
+			return $path;
+		}
+		list($parentid) = $this->db->fetchRow($result);
+		$path = '/' . $sel_id . $path . '';
+		if ($parentid == 0) {
+			return $path;
+		}
+		$path = $this->getIdPathFromId($parentid, $path);
+
+		return $path;
+	}
+
+	/**
+	 * @param int    $sel_id
+	 * @param string $order
+	 * @param array  $parray
+	 * @return array
+	 */
+	public function getAllChild($sel_id = 0, $order = '', $parray = array())
+	{
+		$sql = 'SELECT * FROM ' . $this->table . ' WHERE ' . $this->pid . '=' . $sel_id . '';
+		if ($order !== '') {
+			$sql .= " ORDER BY $order";
+		}
+		$result = $this->db->query($sql);
+		$count  = $this->db->getRowsNum($result);
+		if ($count == 0) {
+			return $parray;
+		}
+		while ($row = $this->db->fetchArray($result)) {
+			array_push($parray, $row);
+			$parray = $this->getAllChild($row[$this->id], $order, $parray);
+		}
+
+		return $parray;
+	}
+
+	/**
+	 * @param int    $sel_id
+	 * @param string $order
+	 * @param array  $parray
+	 * @param string $r_prefix
+	 * @return array
+	 */
+	public function getChildTreeArray($sel_id = 0, $order = '', $parray = array(), $r_prefix = '')
+	{
+		$sql = 'SELECT * FROM ' . $this->table . ' WHERE ' . $this->pid . '=' . $sel_id . '';
+		if ($order !== '') {
+			$sql .= " ORDER BY $order";
+		}
+		$result = $this->db->query($sql);
+		$count  = $this->db->getRowsNum($result);
+		if ($count == 0) {
+			return $parray;
+		}
+		while ($row = $this->db->fetchArray($result)) {
+			$row['prefix'] = $r_prefix . '.';
+			array_push($parray, $row);
+			$parray = $this->getChildTreeArray($row[$this->id], $order, $parray, $row['prefix']);
+		}
+
+		return $parray;
+	}
 }

Spacing +21 added lines, -21 removed lines

@@ -71,7 +71,7 @@ 
     public function getFirstChild($sel_id, $order = '')
     {
         $arr = array();
-        $sql = 'SELECT * FROM ' . $this->table . ' WHERE ' . $this->pid . '=' . $sel_id . '';
+        $sql = 'SELECT * FROM '.$this->table.' WHERE '.$this->pid.'='.$sel_id.'';
         if ($order !== '') {
             $sql .= " ORDER BY $order";
         }
@@ -96,7 +96,7 @@ 
     public function getFirstChildId($sel_id)
     {
         $idarray = array();
-        $result  = $this->db->query('SELECT ' . $this->id . ' FROM ' . $this->table . ' WHERE ' . $this->pid . '=' . $sel_id . '');
+        $result  = $this->db->query('SELECT '.$this->id.' FROM '.$this->table.' WHERE '.$this->pid.'='.$sel_id.'');
         $count   = $this->db->getRowsNum($result);
         if ($count == 0) {
             return $idarray;
@@ -118,7 +118,7 @@ 
      */
     public function getAllChildId($sel_id, $order = '', $idarray = array())
     {
-        $sql = 'SELECT ' . $this->id . ' FROM ' . $this->table . ' WHERE ' . $this->pid . '=' . $sel_id . '';
+        $sql = 'SELECT '.$this->id.' FROM '.$this->table.' WHERE '.$this->pid.'='.$sel_id.'';
         if ($order !== '') {
             $sql .= " ORDER BY $order";
         }
@@ -145,7 +145,7 @@ 
      */
     public function getAllParentId($sel_id, $order = '', $idarray = array())
     {
-        $sql = 'SELECT ' . $this->pid . ' FROM ' . $this->table . ' WHERE ' . $this->id . '=' . $sel_id . '';
+        $sql = 'SELECT '.$this->pid.' FROM '.$this->table.' WHERE '.$this->id.'='.$sel_id.'';
         if ($order !== '') {
             $sql .= " ORDER BY $order";
         }
@@ -170,14 +170,14 @@ 
      */
     public function getPathFromId($sel_id, $title, $path = '')
     {
-        $result = $this->db->query('SELECT ' . $this->pid . ', ' . $title . ' FROM ' . $this->table . ' WHERE ' . $this->id . "=$sel_id");
+        $result = $this->db->query('SELECT '.$this->pid.', '.$title.' FROM '.$this->table.' WHERE '.$this->id."=$sel_id");
         if ($this->db->getRowsNum($result) == 0) {
             return $path;
         }
         list($parentid, $name) = $this->db->fetchRow($result);
         $myts = MyTextSanitizer::getInstance();
         $name = $myts->htmlSpecialChars($name);
-        $path = '/' . $name . $path . '';
+        $path = '/'.$name.$path.'';
         if ($parentid == 0) {
             return $path;
         }
@@ -205,7 +205,7 @@ 
         }
         $myts = MyTextSanitizer::getInstance();
 
-        $sql = 'SELECT ' . $this->id . ', ' . $title . ' FROM ' . $this->table . ' WHERE ' . $this->pid . '=0';
+        $sql = 'SELECT '.$this->id.', '.$title.' FROM '.$this->table.' WHERE '.$this->pid.'=0';
         if ($this->dirid != 0) {
             $sql .= " AND dirid=$this->dirid";
         }
@@ -216,9 +216,9 @@ 
         //echo $sql;
         $result = $this->db->query($sql);
 
-        echo "<select name='" . $sel_name . '\'';
+        echo "<select name='".$sel_name.'\'';
         if ($onchange !== '') {
-            echo " onchange='" . $onchange . '\'';
+            echo " onchange='".$onchange.'\'';
         }
         if ($multiple != 0) {
             echo ' multiple="multiple"';
@@ -238,11 +238,11 @@ 
             $arr = $this->getChildTreeArray($catid, $order);
             foreach ($arr as $option) {
                 $option['prefix'] = str_replace('.', '--', $option['prefix']);
-                $catpath          = $option['prefix'] . '&nbsp;' . $myts->htmlSpecialChars($option[$title]);
+                $catpath          = $option['prefix'].'&nbsp;'.$myts->htmlSpecialChars($option[$title]);
                 if ($option[$this->id] == $preset_id) {
                     $sel = " selected='selected'";
                 }
-                echo "<option value='" . $option[$this->id] . "'$sel>$catpath</option>\n";
+                echo "<option value='".$option[$this->id]."'$sel>$catpath</option>\n";
                 $sel = '';
             }
         }
@@ -261,7 +261,7 @@ 
      */
     public function getNicePathFromId($sel_id, $title, $funcURL, $path = '', $outputvar = 'catid')
     {
-        $sql    = 'SELECT ' . $this->pid . ', ' . $title . ' FROM ' . $this->table . ' WHERE ' . $this->id . "=$sel_id";
+        $sql    = 'SELECT '.$this->pid.', '.$title.' FROM '.$this->table.' WHERE '.$this->id."=$sel_id";
         $result = $this->db->query($sql);
         if ($this->db->getRowsNum($result) == 0) {
             return $path;
@@ -269,7 +269,7 @@ 
         list($parentid, $name) = $this->db->fetchRow($result);
         $myts = MyTextSanitizer::getInstance();
         $name = $myts->htmlSpecialChars($name);
-        $path = "<a href='" . $funcURL . '&' . $outputvar . '=' . $sel_id . '\'>' . $name . '</a>&nbsp;:&nbsp;' . $path . '';
+        $path = "<a href='".$funcURL.'&'.$outputvar.'='.$sel_id.'\'>'.$name.'</a>&nbsp;:&nbsp;'.$path.'';
         if ($parentid == 0) {
             return $path;
         }
@@ -288,7 +288,7 @@ 
      */
     public function getUnformattedPathFromId($sel_id, $title, $path = '')
     {
-        $sql    = 'SELECT ' . $this->pid . ', ' . $title . ' FROM ' . $this->table . ' WHERE ' . $this->id . "=$sel_id";
+        $sql    = 'SELECT '.$this->pid.', '.$title.' FROM '.$this->table.' WHERE '.$this->id."=$sel_id";
         $result = $this->db->query($sql);
         if ($this->db->getRowsNum($result) == 0) {
             return $path;
@@ -297,9 +297,9 @@ 
         $myts = MyTextSanitizer::getInstance();
         $name = $myts->htmlSpecialChars($name);
         if ($path !== '') {
-            $path = '' . $name . '&nbsp;:&nbsp;' . $path . '';
+            $path = ''.$name.'&nbsp;:&nbsp;'.$path.'';
         } else {
-            $path = '' . $name . '';
+            $path = ''.$name.'';
         }
 
         if ($parentid == 0) {
@@ -319,12 +319,12 @@ 
      */
     public function getIdPathFromId($sel_id, $path = '')
     {
-        $result = $this->db->query('SELECT ' . $this->pid . ' FROM ' . $this->table . ' WHERE ' . $this->id . "=$sel_id");
+        $result = $this->db->query('SELECT '.$this->pid.' FROM '.$this->table.' WHERE '.$this->id."=$sel_id");
         if ($this->db->getRowsNum($result) == 0) {
             return $path;
         }
         list($parentid) = $this->db->fetchRow($result);
-        $path = '/' . $sel_id . $path . '';
+        $path = '/'.$sel_id.$path.'';
         if ($parentid == 0) {
             return $path;
         }
@@ -341,7 +341,7 @@ 
      */
     public function getAllChild($sel_id = 0, $order = '', $parray = array())
     {
-        $sql = 'SELECT * FROM ' . $this->table . ' WHERE ' . $this->pid . '=' . $sel_id . '';
+        $sql = 'SELECT * FROM '.$this->table.' WHERE '.$this->pid.'='.$sel_id.'';
         if ($order !== '') {
             $sql .= " ORDER BY $order";
         }
@@ -367,7 +367,7 @@ 
      */
     public function getChildTreeArray($sel_id = 0, $order = '', $parray = array(), $r_prefix = '')
     {
-        $sql = 'SELECT * FROM ' . $this->table . ' WHERE ' . $this->pid . '=' . $sel_id . '';
+        $sql = 'SELECT * FROM '.$this->table.' WHERE '.$this->pid.'='.$sel_id.'';
         if ($order !== '') {
             $sql .= " ORDER BY $order";
         }
@@ -377,7 +377,7 @@ 
             return $parray;
         }
         while ($row = $this->db->fetchArray($result)) {
-            $row['prefix'] = $r_prefix . '.';
+            $row['prefix'] = $r_prefix.'.';
             array_push($parray, $row);
             $parray = $this->getChildTreeArray($row[$this->id], $order, $parray, $row['prefix']);
         }

class/class.xdir.php

Indentation +166 added lines, -166 removed lines

@@ -44,181 +44,181 @@
 class efqXdirHandler extends XoopsObjectHandler
 {
 //    public $db; //Database reference
-    public $objXdir;
-    public $errors; //array();
-    public $categories; //array();
-    public $listings; //array();
-    public $xdir_cats; //array();
-    public $efq_dirid;
-    public $fieldtypes; //array();
-    public $datatypes; //array();
+	public $objXdir;
+	public $errors; //array();
+	public $categories; //array();
+	public $listings; //array();
+	public $xdir_cats; //array();
+	public $efq_dirid;
+	public $fieldtypes; //array();
+	public $datatypes; //array();
 
-    /**
-     * efqSubscriptionOfferHandler::efqItemTypeHandler()
-     *
-     */
-    public function __construct()
-    {
-        $this->db = XoopsDatabaseFactory::getDatabaseConnection();
-    }
+	/**
+	 * efqSubscriptionOfferHandler::efqItemTypeHandler()
+	 *
+	 */
+	public function __construct()
+	{
+		$this->db = XoopsDatabaseFactory::getDatabaseConnection();
+	}
 
-    /**
-     * @param $arr
-     */
-    public function set_xdir_cats($arr)
-    {
-        if (is_array($arr)) {
-            $this->xdir_cats = $arr;
-        }
-    }
+	/**
+	 * @param $arr
+	 */
+	public function set_xdir_cats($arr)
+	{
+		if (is_array($arr)) {
+			$this->xdir_cats = $arr;
+		}
+	}
 
-    /**
-     * @return mixed
-     */
-    public function get_xdir_cats()
-    {
-        return $this->xdir_cats;
-    }
+	/**
+	 * @return mixed
+	 */
+	public function get_xdir_cats()
+	{
+		return $this->xdir_cats;
+	}
 
-    /**
-     * @return mixed
-     */
-    public function get_errors()
-    {
-        return $this->errors;
-    }
+	/**
+	 * @return mixed
+	 */
+	public function get_errors()
+	{
+		return $this->errors;
+	}
 
-    /**
-     * getCategories_xdir()
-     *
-     * Get xdir categories from database and return
-     *
-     * @return \arr|bool
-     */
-    public 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)) {
-                $arr[] = array('cid' => $cid, 'pid' => $pid, 'title' => $title, 'imgurl' => $imgurl);
-            }
-        } else {
-            return false;
-        }
-        $this->set_xdir_cats($arr);
+	/**
+	 * getCategories_xdir()
+	 *
+	 * Get xdir categories from database and return
+	 *
+	 * @return \arr|bool
+	 */
+	public 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)) {
+				$arr[] = array('cid' => $cid, 'pid' => $pid, 'title' => $title, 'imgurl' => $imgurl);
+			}
+		} else {
+			return false;
+		}
+		$this->set_xdir_cats($arr);
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * @param int $dirid
-     * @return bool
-     */
-    public function saveCategories($dirid = 0)
-    {
-        $tablename = 'efqdiralpha1_cat';
-        $xdir_cats = $this->get_xdir_cats();
-        foreach ($xdir_cats as $xdir_cat) {
-            $cid    = $xdir_cat['cid'];
-            $pid    = $xdir_cat['pid'];
-            $title  = $xdir_cat['title'];
-            $imgurl = $xdir_cat['imgurl'];
-            //Set fields and values
-            $strFields = 'cid,dirid,title,active,pid,img,allowlist';
-            $strValues = "$cid,$dirid,'$title',1,$pid,'$imgurl',1";
-            $sql       = sprintf('INSERT INTO %s (%s) VALUES (%s)', $this->db->prefix($tablename), $strFields, $strValues);
-            if ($this->db->queryF($sql)) {
-                $itemid = $this->db->getInsertId();
-                $obj->setVar($keyName, $itemid);
+	/**
+	 * @param int $dirid
+	 * @return bool
+	 */
+	public function saveCategories($dirid = 0)
+	{
+		$tablename = 'efqdiralpha1_cat';
+		$xdir_cats = $this->get_xdir_cats();
+		foreach ($xdir_cats as $xdir_cat) {
+			$cid    = $xdir_cat['cid'];
+			$pid    = $xdir_cat['pid'];
+			$title  = $xdir_cat['title'];
+			$imgurl = $xdir_cat['imgurl'];
+			//Set fields and values
+			$strFields = 'cid,dirid,title,active,pid,img,allowlist';
+			$strValues = "$cid,$dirid,'$title',1,$pid,'$imgurl',1";
+			$sql       = sprintf('INSERT INTO %s (%s) VALUES (%s)', $this->db->prefix($tablename), $strFields, $strValues);
+			if ($this->db->queryF($sql)) {
+				$itemid = $this->db->getInsertId();
+				$obj->setVar($keyName, $itemid);
 
-                return true;
-            }
-        }
-    }
+				return true;
+			}
+		}
+	}
 
-    /**
-     * Function createDataTypes inserts datatypes into DB
-     * @author    EFQ Consultancy <info@efqconsultancy.com>
-     * @copyright EFQ Consultancy (c) 2008
-     * @version   1.0.0
-     * @return bool true if insertion is succesful, false if unsuccesful
-     * @internal  param object $obj object
-     *
-     */
-    public function createDataTypes()
-    {
-        $datatypeHandler = 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);
-        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']]);
-            $datatypeHandler->insertDataType($objDataType, true);
-            $datatypes[$datatype['title']] = $objDataType->getVar('dtypeid');
-        }
-    }
+	/**
+	 * Function createDataTypes inserts datatypes into DB
+	 * @author    EFQ Consultancy <info@efqconsultancy.com>
+	 * @copyright EFQ Consultancy (c) 2008
+	 * @version   1.0.0
+	 * @return bool true if insertion is succesful, false if unsuccesful
+	 * @internal  param object $obj object
+	 *
+	 */
+	public function createDataTypes()
+	{
+		$datatypeHandler = 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);
+		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']]);
+			$datatypeHandler->insertDataType($objDataType, true);
+			$datatypes[$datatype['title']] = $objDataType->getVar('dtypeid');
+		}
+	}
 
-    /**
-     * Function createFieldTypes inserts field types into DB
-     * @author    EFQ Consultancy <info@efqconsultancy.com>
-     * @copyright EFQ Consultancy (c) 2008
-     * @version   1.0.0
-     * @return bool true if insertion is succesful, false if unsuccesful
-     * @internal  param object $obj object
-     *
-     */
-    public function createFieldTypes()
-    {
-        $fieldtypeHandler = 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');
-        foreach ($arr as $fieldtype) {
-            $objFieldtype = new efqFieldType;
-            $objFieldtype->setVar('title', $fieldtype['title']);
-            $objFieldtype->setVar('fieldtype', $fieldtype['fieldtype']);
-            $objFieldtype->setVar('dirid', $this->efq_dirid);
-            $fieldtypeHandler->insertFieldType($objFieldtype, true);
-            $fieldtypes[$fieldtype['title']] = $objFieldtype->getVar('typeid');
-        }
-    }
+	/**
+	 * Function createFieldTypes inserts field types into DB
+	 * @author    EFQ Consultancy <info@efqconsultancy.com>
+	 * @copyright EFQ Consultancy (c) 2008
+	 * @version   1.0.0
+	 * @return bool true if insertion is succesful, false if unsuccesful
+	 * @internal  param object $obj object
+	 *
+	 */
+	public function createFieldTypes()
+	{
+		$fieldtypeHandler = 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');
+		foreach ($arr as $fieldtype) {
+			$objFieldtype = new efqFieldType;
+			$objFieldtype->setVar('title', $fieldtype['title']);
+			$objFieldtype->setVar('fieldtype', $fieldtype['fieldtype']);
+			$objFieldtype->setVar('dirid', $this->efq_dirid);
+			$fieldtypeHandler->insertFieldType($objFieldtype, true);
+			$fieldtypes[$fieldtype['title']] = $objFieldtype->getVar('typeid');
+		}
+	}
 
-    /**
-     * Function doMigrate migrates xDirectory to EFQ Directory
-     * @author    EFQ Consultancy <info@efqconsultancy.com>
-     * @copyright EFQ Consultancy (c) 2008
-     * @version   1.0.0
-     *
-     * @param int $dirid
-     * @return bool true if insertion is succesful, false if unsuccesful
-     * @internal  param object $obj object
-     *
-     */
-    public function doMigrate($dirid = 0)
-    {
-        $this->setCategories_xdir();
-        $this->saveCategories($this->efq_dirid);
-        $this->createFieldTypes();
-        $this->createDataTypes();
-    }
+	/**
+	 * Function doMigrate migrates xDirectory to EFQ Directory
+	 * @author    EFQ Consultancy <info@efqconsultancy.com>
+	 * @copyright EFQ Consultancy (c) 2008
+	 * @version   1.0.0
+	 *
+	 * @param int $dirid
+	 * @return bool true if insertion is succesful, false if unsuccesful
+	 * @internal  param object $obj object
+	 *
+	 */
+	public function doMigrate($dirid = 0)
+	{
+		$this->setCategories_xdir();
+		$this->saveCategories($this->efq_dirid);
+		$this->createFieldTypes();
+		$this->createDataTypes();
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -98,7 +98,7 @@
     public function setCategories_xdir()
     {
         $arr    = array();
-        $sql    = 'SELECT cid, pid, title, imgurl FROM ' . $this->db->prefix('efqdiralpha1_xdir_cat');
+        $sql    = 'SELECT cid, pid, title, imgurl FROM '.$this->db->prefix('efqdiralpha1_xdir_cat');
         $result = $this->db->query($sql);
         if (!$result) {
             return false;

class/class.subscription.php

Indentation +387 added lines, -387 removed lines

@@ -19,95 +19,95 @@ 
  */
 class efqSubscription extends XoopsObject
 {
-    /**
-     * Constructor
-     *
-     */
-    public function __construct()
-    {
-        //Constructor
-    }
-
-    /**
-     * Function durationArray: creates array of options for duration selbox:
-     * months, weeks, year, days etc.
-     *
-     * @author    EFQ Consultancy <info@efqconsultancy.com>
-     * @copyright EFQ Consultancy (c) 2007
-     * @version   1.0.0
-     *
-     * @return array $arr
-     */
-    public static function durationArray()
-    {
-        $arr = array('0' => '---', '1' => _MD_DAYS, '2' => _MD_WEEKS, '3' => _MD_MONTHS, '4' => _MD_QUARTERS, '5' => _MD_YEARS);
-
-        return $arr;
-    }
-
-    /**
-     * Function durationArray: creates array of options for duration selbox:
-     * single items like: month, week, year, day etc.
-     *
-     * @author    EFQ Consultancy <info@efqconsultancy.com>
-     * @copyright EFQ Consultancy (c) 2007
-     * @version   1.0.0
-     *
-     * @return array $arr
-     */
-    public function durationSingleArray()
-    {
-        $arr = array('0' => '---', '1' => _MD_DAY, '2' => _MD_WEEK, '3' => _MD_MONTH, '4' => _MD_QUARTER, '5' => _MD_YEAR);
-
-        return $arr;
-    }
-
-    /**
-     * Function currencyArray: creates array of options for currency selbox
-     *
-     * @author    EFQ Consultancy <info@efqconsultancy.com>
-     * @copyright EFQ Consultancy (c) 2007
-     * @version   1.0.0
-     *
-     * @return array $arr
-     */
-    public function currencyArray()
-    {
-        //create array of options for duration selbox: months, weeks, year, days etc.
-        $arr = array('0' => '---', 'USD' => _MD_CURR_USD, 'AUD' => _MD_CURR_AUD, 'EUR' => _MD_CURR_EUR, 'GBP' => _MD_CURR_GBP, 'YEN' => _MD_CURR_YEN);
-
-        return $arr;
-    }
-
-    /**
-     * Function notifyExpireWarning
-     * Notify user of a subscription order that is about to expire.
-     *
-     * @author    EFQ Consultancy <info@efqconsultancy.com>
-     * @copyright EFQ Consultancy (c) 2007
-     * @version   1.0.0
-     *
-     * @param int|string $orderid - Default: '0' - Order ID
-     * @param int|string $userid  - Default: '0' - User ID
-     */
-    public function notifyExpireWarning($orderid = '0', $userid = '0')
-    {
-        global $xoopsConfig, $moddir;
-        require_once XOOPS_ROOT_PATH . '/class/mail/xoopsmultimailer.php';
-
-        $xoopsMailer = new XoopsMailer();
-        $xoopsMailer->useMail();
-        $template_dir = XOOPS_URL . '/modules/' . $moddir . '/language/' . $xoopsConfig['language'] . '/mail_template/';
-        $template     = 'expirewarning.tpl';
-        $subject      = _MD_LANG_EXPIREWARNING_SUBJECT;
-        $xoopsMailer->setTemplateDir($template_dir);
-        $xoopsMailer->setTemplate($template);
-        $xoopsMailer->setToUsers($userid);
-        $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
-        $xoopsMailer->setFromName($xoopsConfig['sitename']);
-        $xoopsMailer->setSubject($subject);
-        $success = $xoopsMailer->send();
-    }
+	/**
+	 * Constructor
+	 *
+	 */
+	public function __construct()
+	{
+		//Constructor
+	}
+
+	/**
+	 * Function durationArray: creates array of options for duration selbox:
+	 * months, weeks, year, days etc.
+	 *
+	 * @author    EFQ Consultancy <info@efqconsultancy.com>
+	 * @copyright EFQ Consultancy (c) 2007
+	 * @version   1.0.0
+	 *
+	 * @return array $arr
+	 */
+	public static function durationArray()
+	{
+		$arr = array('0' => '---', '1' => _MD_DAYS, '2' => _MD_WEEKS, '3' => _MD_MONTHS, '4' => _MD_QUARTERS, '5' => _MD_YEARS);
+
+		return $arr;
+	}
+
+	/**
+	 * Function durationArray: creates array of options for duration selbox:
+	 * single items like: month, week, year, day etc.
+	 *
+	 * @author    EFQ Consultancy <info@efqconsultancy.com>
+	 * @copyright EFQ Consultancy (c) 2007
+	 * @version   1.0.0
+	 *
+	 * @return array $arr
+	 */
+	public function durationSingleArray()
+	{
+		$arr = array('0' => '---', '1' => _MD_DAY, '2' => _MD_WEEK, '3' => _MD_MONTH, '4' => _MD_QUARTER, '5' => _MD_YEAR);
+
+		return $arr;
+	}
+
+	/**
+	 * Function currencyArray: creates array of options for currency selbox
+	 *
+	 * @author    EFQ Consultancy <info@efqconsultancy.com>
+	 * @copyright EFQ Consultancy (c) 2007
+	 * @version   1.0.0
+	 *
+	 * @return array $arr
+	 */
+	public function currencyArray()
+	{
+		//create array of options for duration selbox: months, weeks, year, days etc.
+		$arr = array('0' => '---', 'USD' => _MD_CURR_USD, 'AUD' => _MD_CURR_AUD, 'EUR' => _MD_CURR_EUR, 'GBP' => _MD_CURR_GBP, 'YEN' => _MD_CURR_YEN);
+
+		return $arr;
+	}
+
+	/**
+	 * Function notifyExpireWarning
+	 * Notify user of a subscription order that is about to expire.
+	 *
+	 * @author    EFQ Consultancy <info@efqconsultancy.com>
+	 * @copyright EFQ Consultancy (c) 2007
+	 * @version   1.0.0
+	 *
+	 * @param int|string $orderid - Default: '0' - Order ID
+	 * @param int|string $userid  - Default: '0' - User ID
+	 */
+	public function notifyExpireWarning($orderid = '0', $userid = '0')
+	{
+		global $xoopsConfig, $moddir;
+		require_once XOOPS_ROOT_PATH . '/class/mail/xoopsmultimailer.php';
+
+		$xoopsMailer = new XoopsMailer();
+		$xoopsMailer->useMail();
+		$template_dir = XOOPS_URL . '/modules/' . $moddir . '/language/' . $xoopsConfig['language'] . '/mail_template/';
+		$template     = 'expirewarning.tpl';
+		$subject      = _MD_LANG_EXPIREWARNING_SUBJECT;
+		$xoopsMailer->setTemplateDir($template_dir);
+		$xoopsMailer->setTemplate($template);
+		$xoopsMailer->setToUsers($userid);
+		$xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
+		$xoopsMailer->setFromName($xoopsConfig['sitename']);
+		$xoopsMailer->setSubject($subject);
+		$success = $xoopsMailer->send();
+	}
 }
 
 /**
@@ -115,77 +115,77 @@ 
  */
 class efqSubscriptionHandler extends XoopsObjectHandler
 {
-    /**
-     * Constructor
-     *
-     */
-    public function __construct()
-    {
-        //Instantiate class
-        $this->db = XoopsDatabaseFactory::getDatabaseConnection();
-    }
-
-    /**
-     * Function delete: Delete subscription order
-     *
-     * @author    EFQ Consultancy <info@efqconsultancy.com>
-     * @copyright EFQ Consultancy (c) 2007
-     * @version   1.0.0
-     *
-     * @param int|string|XoopsObject $orderid - Default: '0' - Order ID
-     * @return array|bool
-     */
-    public function delete(XoopsObject $orderid = null)
-    {
-        if ($orderid !== null) {
-            $sql = 'DELETE FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_subscr_orders') . ' WHERE orderid=' . (int)$orderid . '';
-            $this->db->query($sql);
-
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Function createOrder: Create subscription order
-     *
-     * @author    EFQ Consultancy <info@efqconsultancy.com>
-     * @copyright EFQ Consultancy (c) 2007
-     * @version   1.0.0
-     *
-     * @param   int $itemid - Default: '0' - Item ID
-     * @return int $orderid - Newly created order id
-     */
-    public function createOrder($itemid = 0)
-    {
-        $orderid = 0;
-        if ($itemid != 0) {
-            if (isset($_POST['typeofferid'])) {
-                $typeofferid = explode('_', $_POST['typeofferid']);
-                $typeid      = $typeofferid[0];
-                $offerid     = $typeofferid[1];
-            } else {
-                return false;
-            }
-            $submitter = (int)$_POST['uid'];
-            $startdate = strtotime($_POST['startdate']);
-            //TO DO: Add Auto renew functionality.
-            //$autorenew = $_POST['autorenew'];
-            $newid = $this->db->genId($this->db->prefix($module->getVar('dirname', 'n') . '_subscr_orders') . '_orderid_seq');
-            $sql   = 'INSERT INTO ' . $this->db->prefix($module->getVar('dirname', 'n') . '_subscr_orders') . "
+	/**
+	 * Constructor
+	 *
+	 */
+	public function __construct()
+	{
+		//Instantiate class
+		$this->db = XoopsDatabaseFactory::getDatabaseConnection();
+	}
+
+	/**
+	 * Function delete: Delete subscription order
+	 *
+	 * @author    EFQ Consultancy <info@efqconsultancy.com>
+	 * @copyright EFQ Consultancy (c) 2007
+	 * @version   1.0.0
+	 *
+	 * @param int|string|XoopsObject $orderid - Default: '0' - Order ID
+	 * @return array|bool
+	 */
+	public function delete(XoopsObject $orderid = null)
+	{
+		if ($orderid !== null) {
+			$sql = 'DELETE FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_subscr_orders') . ' WHERE orderid=' . (int)$orderid . '';
+			$this->db->query($sql);
+
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Function createOrder: Create subscription order
+	 *
+	 * @author    EFQ Consultancy <info@efqconsultancy.com>
+	 * @copyright EFQ Consultancy (c) 2007
+	 * @version   1.0.0
+	 *
+	 * @param   int $itemid - Default: '0' - Item ID
+	 * @return int $orderid - Newly created order id
+	 */
+	public function createOrder($itemid = 0)
+	{
+		$orderid = 0;
+		if ($itemid != 0) {
+			if (isset($_POST['typeofferid'])) {
+				$typeofferid = explode('_', $_POST['typeofferid']);
+				$typeid      = $typeofferid[0];
+				$offerid     = $typeofferid[1];
+			} else {
+				return false;
+			}
+			$submitter = (int)$_POST['uid'];
+			$startdate = strtotime($_POST['startdate']);
+			//TO DO: Add Auto renew functionality.
+			//$autorenew = $_POST['autorenew'];
+			$newid = $this->db->genId($this->db->prefix($module->getVar('dirname', 'n') . '_subscr_orders') . '_orderid_seq');
+			$sql   = 'INSERT INTO ' . $this->db->prefix($module->getVar('dirname', 'n') . '_subscr_orders') . "
                 (orderid, uid, offerid, typeid, startdate, status, itemid, autorenew) VALUES
                 ($newid, $submitter, $offerid, $typeid, '$startdate', '0' , $itemid, '0')";
-            $this->db->query($sql);
-            if ($newid == 0) {
-                $orderid = $this->db->getInsertId();
-            }
-        }
+			$this->db->query($sql);
+			if ($newid == 0) {
+				$orderid = $this->db->getInsertId();
+			}
+		}
 
-        return $orderid;
-    }
+		return $orderid;
+	}
 
-    /*function renewOrder($itemid = '0', $orderid='0') {
+	/*function renewOrder($itemid = '0', $orderid='0') {
     //Renew order
     global $xoopsDB, $eh;
     //$orderid = '0';
@@ -217,107 +217,107 @@ 
     return $orderid;
     }*/
 
-    /**
-     * @param int $offerid
-     * @return string
-     */
-    public 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($module->getVar('dirname', 'n') . '_subscr_offers')
-                   . ' o, '
-                   . $this->db->prefix($module->getVar('dirname', 'n') . '_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)) {
-            if ($count == '1') {
-                $duration_arr = $this->durationSingleArray();
-            } else {
-                $duration_arr = $this->durationArray();
-            }
-            $durationname = $duration_arr['' . $duration . ''];
-            $itemname     = $typename . ' - ' . $count . ' ' . $durationname . ' - ' . $price . ' ' . $currency;
-        }
-
-        return $itemname;
-    }
-
-    /**
-     * @param string $orderid
-     * @param string $status
-     * @param string $startdate
-     * @param string $billto
-     */
-    public 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($module->getVar('dirname', 'n') . '_subscr_orders') . " SET status='$status'";
-        if ($startdate != '0') {
-            $sql .= ", startdate='$startdate'";
-        }
-        if ($billto != '0') {
-            $sql .= ", billto='$billto'";
-        }
-        $sql .= ' WHERE orderid=' . (int)$orderid . '';
-        $this->db->queryF($sql);
-        if ($startdate > time()) {
-            $this->updateScheduler('add', $itemid, $typeid, $startdate);
-        } else {
-            $this->updateItem($itemid, $typeid);
-        }
-    }
-
-    /**
-     * @param string $orderid
-     * @return mixed
-     */
-    public function getOrderVars($orderid = '0')
-    {
-        $sql     = 'SELECT ord.uid, ord.billto, ord.startdate, ord.typeid, ord.status, ord.itemid, ord.offerid FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_subscr_orders') . ' ord WHERE ord.orderid=' . (int)$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)) {
-            $arr['uid']       = $uid;
-            $arr['billto']    = $billto;
-            $arr['startdate'] = $startdate;
-            $arr['typeid']    = $typeid;
-            $arr['status']    = $status;
-            $arr['itemid']    = $itemid;
-            $arr['offerid']   = $offerid;
-        }
-
-        return $arr;
-    }
-
-    /**
-     * @param string $offerid
-     * @param string $showactive
-     * @return array
-     */
-    public function getOfferVars($offerid = '0', $showactive = '1')
-    {
-        $sql = 'SELECT count, duration FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_subscr_offers') . ' WHERE offerid=' . (int)$offerid . '';
-        if ($showactive == '1') {
-            $sql .= " AND activeyn='1'";
-        }
-        $result  = $this->db->query($sql);
-        $numrows = $this->db->getRowsNum($result);
-        $arr     = array();
-        $arr     = $this->db->fetchArray($result);
-        while (list($count, $duration) = $this->db->fetchRow($result)) {
-            $arr['count']    = $count;
-            $arr['duration'] = $duration;
-        }
-
-        return $arr;
-    }
-
-    /* function updateScheduler( $func='add', $itemid='0', $typeid='0', $startdate='0' ) {
+	/**
+	 * @param int $offerid
+	 * @return string
+	 */
+	public 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($module->getVar('dirname', 'n') . '_subscr_offers')
+				   . ' o, '
+				   . $this->db->prefix($module->getVar('dirname', 'n') . '_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)) {
+			if ($count == '1') {
+				$duration_arr = $this->durationSingleArray();
+			} else {
+				$duration_arr = $this->durationArray();
+			}
+			$durationname = $duration_arr['' . $duration . ''];
+			$itemname     = $typename . ' - ' . $count . ' ' . $durationname . ' - ' . $price . ' ' . $currency;
+		}
+
+		return $itemname;
+	}
+
+	/**
+	 * @param string $orderid
+	 * @param string $status
+	 * @param string $startdate
+	 * @param string $billto
+	 */
+	public 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($module->getVar('dirname', 'n') . '_subscr_orders') . " SET status='$status'";
+		if ($startdate != '0') {
+			$sql .= ", startdate='$startdate'";
+		}
+		if ($billto != '0') {
+			$sql .= ", billto='$billto'";
+		}
+		$sql .= ' WHERE orderid=' . (int)$orderid . '';
+		$this->db->queryF($sql);
+		if ($startdate > time()) {
+			$this->updateScheduler('add', $itemid, $typeid, $startdate);
+		} else {
+			$this->updateItem($itemid, $typeid);
+		}
+	}
+
+	/**
+	 * @param string $orderid
+	 * @return mixed
+	 */
+	public function getOrderVars($orderid = '0')
+	{
+		$sql     = 'SELECT ord.uid, ord.billto, ord.startdate, ord.typeid, ord.status, ord.itemid, ord.offerid FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_subscr_orders') . ' ord WHERE ord.orderid=' . (int)$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)) {
+			$arr['uid']       = $uid;
+			$arr['billto']    = $billto;
+			$arr['startdate'] = $startdate;
+			$arr['typeid']    = $typeid;
+			$arr['status']    = $status;
+			$arr['itemid']    = $itemid;
+			$arr['offerid']   = $offerid;
+		}
+
+		return $arr;
+	}
+
+	/**
+	 * @param string $offerid
+	 * @param string $showactive
+	 * @return array
+	 */
+	public function getOfferVars($offerid = '0', $showactive = '1')
+	{
+		$sql = 'SELECT count, duration FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_subscr_offers') . ' WHERE offerid=' . (int)$offerid . '';
+		if ($showactive == '1') {
+			$sql .= " AND activeyn='1'";
+		}
+		$result  = $this->db->query($sql);
+		$numrows = $this->db->getRowsNum($result);
+		$arr     = array();
+		$arr     = $this->db->fetchArray($result);
+		while (list($count, $duration) = $this->db->fetchRow($result)) {
+			$arr['count']    = $count;
+			$arr['duration'] = $duration;
+		}
+
+		return $arr;
+	}
+
+	/* function updateScheduler( $func='add', $itemid='0', $typeid='0', $startdate='0' ) {
     global $xoopsDB, $eh;
     if ($func='add') {
     $newid = $xoopsDB->genId($xoopsDB->prefix("efqdiralpha1_subscr_scheduler")."_id_seq");
@@ -328,134 +328,134 @@ 
     }
     }*/
 
-    /**
-     * @param string $itemid
-     * @param string $typeid
-     * @return bool
-     */
-    public function updateItem($itemid = '0', $typeid = '0')
-    {
-        if ($itemid != '0' && $typeid != '0') {
-            $sql = 'UPDATE ' . $this->db->prefix($module->getVar('dirname', 'n') . '_items') . " SET typeid='" . (int)$typeid . '\' WHERE itemid=' . (int)$itemid . '';
-            $this->db->queryF($sql);
-
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * @param string $offerid
-     */
-    public function getNewBillto($offerid = '0')
-    {
-    }
-
-    /**
-     * @param int $itemid
-     * @param int $itemtype
-     * @return bool
-     */
-    public function changeItemType($itemid = 0, $itemtype = 0)
-    {
-        global $xoopsDB, $eh;
-        $sql = 'UPDATE ' . $this->db->prefix($module->getVar('dirname', 'n') . '_items') . " SET typeid=$itemtype WHERE itemid=(int)($itemid)";
-        $this->db->queryF($sql);
-
-        return true;
-    }
-
-    /**
-     * @param string $dashes
-     * @param string $showactive
-     * @return array
-     */
-    public function durationPriceArray($dashes = '0', $showactive = '1')
-    {
-        $sql = 'SELECT o.offerid, o.duration, o.count, o.price, o.currency, o.descr, t.typeid, t.typename FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_subscr_offers') . ' o, ' . $this->db->prefix($module->getVar('dirname', 'n') . '_itemtypes') . ' t WHERE o.typeid=t.typeid';
-        if ($showactive == '1') {
-            $sql .= " AND activeyn='1'";
-        }
-        $sql     .= ' ORDER BY t.typelevel ASC, t.typename ASC';
-        $result  = $this->db->query($sql);
-        $numrows = $this->db->getRowsNum($result);
-        if ($dashes == '0') {
-            $arr = array('0' => '---');
-        }
-        while (list($offerid, $duration, $count, $price, $currency, $descr, $typeid, $typename) = $this->db->fetchRow($result)) {
-            if ($count == '1') {
-                $duration_arr = $this->durationSingleArray();
-            } else {
-                $duration_arr = $this->durationArray();
-            }
-            $durationname                  = $duration_arr['' . $duration . ''];
-            $arr[$typeid . '_' . $offerid] = $typename . '&nbsp;-&nbsp;' . $count . '&nbsp;' . $durationname . '&nbsp;-&nbsp;' . $price . '&nbsp;' . $currency;
-        }
-
-        return $arr;
-    }
-
-    /**
-     * @param string $selname
-     * @param bool   $none
-     * @param int    $preselected
-     */
-    public function itemsSelBox($selname = '', $none = false, $preselected = 0)
-    {
-        $sql     = 'SELECT typeid, typename FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_itemtypes') . '';
-        $result  = $this->db->query($sql);
-        $numrows = $this->db->getRowsNum($result);
-        echo "<select name='" . $selname . '\'';
-        echo ">\n";
-        $result = $this->db->query($sql);
-        if ($none) {
-            echo "<option value='0'>----</option>\n";
-        }
-        while (list($typeid, $typename) = $this->db->fetchRow($result)) {
-            if ($preselected == $typeid) {
-                $sel = '&nbsp;selected';
-            } else {
-                $sel = '';
-            }
-            echo "<option value='$typeid'>$typename</option>\n";
-        }
-        echo "</select>\n";
-    }
-
-    /**
-     * @param string $dashes
-     * @return array
-     */
-    public function itemTypesArray($dashes = '0')
-    {
-        global $xoopsModule;
-        $sql     = 'SELECT typeid, typename FROM ' . $this->db->prefix($xoopsModule->getVar('dirname', 'n') . '_itemtypes') . ' ORDER BY typelevel ASC';
-        $result  = $this->db->query($sql) or $eh->show('0013');
-        $numrows = $this->db->getRowsNum($result);
-        $result  = $this->db->query($sql);
-        if ($dashes == '0') {
-            $arr = array('0' => '---');
-        }
-        while (list($typeid, $typename) = $this->db->fetchRow($result)) {
-            $arr[$typeid] = $typename;
-        }
-
-        return $arr;
-    }
-
-    /**
-     * @param int $typeid
-     * @return bool
-     */
-    public function countSubscriptionsForType($typeid = 0)
-    {
-        $sql = 'SELECT COUNT(itemid) FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_items') . ' WHERE typeid=' . (int)$typeid . '';
-        if (!$result = $this->db->query($sql)) {
-            return false;
-        }
-        list($ret) = $this->db->fetchRow($result);
-
-        return $ret;
-    }
+	/**
+	 * @param string $itemid
+	 * @param string $typeid
+	 * @return bool
+	 */
+	public function updateItem($itemid = '0', $typeid = '0')
+	{
+		if ($itemid != '0' && $typeid != '0') {
+			$sql = 'UPDATE ' . $this->db->prefix($module->getVar('dirname', 'n') . '_items') . " SET typeid='" . (int)$typeid . '\' WHERE itemid=' . (int)$itemid . '';
+			$this->db->queryF($sql);
+
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * @param string $offerid
+	 */
+	public function getNewBillto($offerid = '0')
+	{
+	}
+
+	/**
+	 * @param int $itemid
+	 * @param int $itemtype
+	 * @return bool
+	 */
+	public function changeItemType($itemid = 0, $itemtype = 0)
+	{
+		global $xoopsDB, $eh;
+		$sql = 'UPDATE ' . $this->db->prefix($module->getVar('dirname', 'n') . '_items') . " SET typeid=$itemtype WHERE itemid=(int)($itemid)";
+		$this->db->queryF($sql);
+
+		return true;
+	}
+
+	/**
+	 * @param string $dashes
+	 * @param string $showactive
+	 * @return array
+	 */
+	public function durationPriceArray($dashes = '0', $showactive = '1')
+	{
+		$sql = 'SELECT o.offerid, o.duration, o.count, o.price, o.currency, o.descr, t.typeid, t.typename FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_subscr_offers') . ' o, ' . $this->db->prefix($module->getVar('dirname', 'n') . '_itemtypes') . ' t WHERE o.typeid=t.typeid';
+		if ($showactive == '1') {
+			$sql .= " AND activeyn='1'";
+		}
+		$sql     .= ' ORDER BY t.typelevel ASC, t.typename ASC';
+		$result  = $this->db->query($sql);
+		$numrows = $this->db->getRowsNum($result);
+		if ($dashes == '0') {
+			$arr = array('0' => '---');
+		}
+		while (list($offerid, $duration, $count, $price, $currency, $descr, $typeid, $typename) = $this->db->fetchRow($result)) {
+			if ($count == '1') {
+				$duration_arr = $this->durationSingleArray();
+			} else {
+				$duration_arr = $this->durationArray();
+			}
+			$durationname                  = $duration_arr['' . $duration . ''];
+			$arr[$typeid . '_' . $offerid] = $typename . '&nbsp;-&nbsp;' . $count . '&nbsp;' . $durationname . '&nbsp;-&nbsp;' . $price . '&nbsp;' . $currency;
+		}
+
+		return $arr;
+	}
+
+	/**
+	 * @param string $selname
+	 * @param bool   $none
+	 * @param int    $preselected
+	 */
+	public function itemsSelBox($selname = '', $none = false, $preselected = 0)
+	{
+		$sql     = 'SELECT typeid, typename FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_itemtypes') . '';
+		$result  = $this->db->query($sql);
+		$numrows = $this->db->getRowsNum($result);
+		echo "<select name='" . $selname . '\'';
+		echo ">\n";
+		$result = $this->db->query($sql);
+		if ($none) {
+			echo "<option value='0'>----</option>\n";
+		}
+		while (list($typeid, $typename) = $this->db->fetchRow($result)) {
+			if ($preselected == $typeid) {
+				$sel = '&nbsp;selected';
+			} else {
+				$sel = '';
+			}
+			echo "<option value='$typeid'>$typename</option>\n";
+		}
+		echo "</select>\n";
+	}
+
+	/**
+	 * @param string $dashes
+	 * @return array
+	 */
+	public function itemTypesArray($dashes = '0')
+	{
+		global $xoopsModule;
+		$sql     = 'SELECT typeid, typename FROM ' . $this->db->prefix($xoopsModule->getVar('dirname', 'n') . '_itemtypes') . ' ORDER BY typelevel ASC';
+		$result  = $this->db->query($sql) or $eh->show('0013');
+		$numrows = $this->db->getRowsNum($result);
+		$result  = $this->db->query($sql);
+		if ($dashes == '0') {
+			$arr = array('0' => '---');
+		}
+		while (list($typeid, $typename) = $this->db->fetchRow($result)) {
+			$arr[$typeid] = $typename;
+		}
+
+		return $arr;
+	}
+
+	/**
+	 * @param int $typeid
+	 * @return bool
+	 */
+	public function countSubscriptionsForType($typeid = 0)
+	{
+		$sql = 'SELECT COUNT(itemid) FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_items') . ' WHERE typeid=' . (int)$typeid . '';
+		if (!$result = $this->db->query($sql)) {
+			return false;
+		}
+		list($ret) = $this->db->fetchRow($result);
+
+		return $ret;
+	}
 }

Spacing +24 added lines, -24 removed lines

@@ -93,11 +93,11 @@ 
     public function notifyExpireWarning($orderid = '0', $userid = '0')
     {
         global $xoopsConfig, $moddir;
-        require_once XOOPS_ROOT_PATH . '/class/mail/xoopsmultimailer.php';
+        require_once XOOPS_ROOT_PATH.'/class/mail/xoopsmultimailer.php';
 
         $xoopsMailer = new XoopsMailer();
         $xoopsMailer->useMail();
-        $template_dir = XOOPS_URL . '/modules/' . $moddir . '/language/' . $xoopsConfig['language'] . '/mail_template/';
+        $template_dir = XOOPS_URL.'/modules/'.$moddir.'/language/'.$xoopsConfig['language'].'/mail_template/';
         $template     = 'expirewarning.tpl';
         $subject      = _MD_LANG_EXPIREWARNING_SUBJECT;
         $xoopsMailer->setTemplateDir($template_dir);
@@ -138,7 +138,7 @@ 
     public function delete(XoopsObject $orderid = null)
     {
         if ($orderid !== null) {
-            $sql = 'DELETE FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_subscr_orders') . ' WHERE orderid=' . (int)$orderid . '';
+            $sql = 'DELETE FROM '.$this->db->prefix($module->getVar('dirname', 'n').'_subscr_orders').' WHERE orderid='.(int) $orderid.'';
             $this->db->query($sql);
 
             return true;
@@ -168,12 +168,12 @@ 
             } else {
                 return false;
             }
-            $submitter = (int)$_POST['uid'];
+            $submitter = (int) $_POST['uid'];
             $startdate = strtotime($_POST['startdate']);
             //TO DO: Add Auto renew functionality.
             //$autorenew = $_POST['autorenew'];
-            $newid = $this->db->genId($this->db->prefix($module->getVar('dirname', 'n') . '_subscr_orders') . '_orderid_seq');
-            $sql   = 'INSERT INTO ' . $this->db->prefix($module->getVar('dirname', 'n') . '_subscr_orders') . "
+            $newid = $this->db->genId($this->db->prefix($module->getVar('dirname', 'n').'_subscr_orders').'_orderid_seq');
+            $sql   = 'INSERT INTO '.$this->db->prefix($module->getVar('dirname', 'n').'_subscr_orders')."
                 (orderid, uid, offerid, typeid, startdate, status, itemid, autorenew) VALUES
                 ($newid, $submitter, $offerid, $typeid, '$startdate', '0' , $itemid, '0')";
             $this->db->query($sql);
@@ -223,10 +223,10 @@ 
      */
     public 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($module->getVar('dirname', 'n') . '_subscr_offers')
+        $sql = 'SELECT o.offerid, o.duration, o.count, o.price, o.currency, o.descr, t.typeid, t.typename FROM '
+                   . $this->db->prefix($module->getVar('dirname', 'n').'_subscr_offers')
                    . ' o, '
-                   . $this->db->prefix($module->getVar('dirname', 'n') . '_itemtypes')
+                   . $this->db->prefix($module->getVar('dirname', 'n').'_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);
@@ -237,8 +237,8 @@ 
             } else {
                 $duration_arr = $this->durationArray();
             }
-            $durationname = $duration_arr['' . $duration . ''];
-            $itemname     = $typename . ' - ' . $count . ' ' . $durationname . ' - ' . $price . ' ' . $currency;
+            $durationname = $duration_arr[''.$duration.''];
+            $itemname     = $typename.' - '.$count.' '.$durationname.' - '.$price.' '.$currency;
         }
 
         return $itemname;
@@ -255,14 +255,14 @@ 
         $ordervars = $this->getOrderVars($orderid);
         $typeid    = $ordervars['typeid'];
         $itemid    = $ordervars['itemid'];
-        $sql       = 'UPDATE ' . $this->db->prefix($module->getVar('dirname', 'n') . '_subscr_orders') . " SET status='$status'";
+        $sql       = 'UPDATE '.$this->db->prefix($module->getVar('dirname', 'n').'_subscr_orders')." SET status='$status'";
         if ($startdate != '0') {
             $sql .= ", startdate='$startdate'";
         }
         if ($billto != '0') {
             $sql .= ", billto='$billto'";
         }
-        $sql .= ' WHERE orderid=' . (int)$orderid . '';
+        $sql .= ' WHERE orderid='.(int) $orderid.'';
         $this->db->queryF($sql);
         if ($startdate > time()) {
             $this->updateScheduler('add', $itemid, $typeid, $startdate);
@@ -277,7 +277,7 @@ 
      */
     public function getOrderVars($orderid = '0')
     {
-        $sql     = 'SELECT ord.uid, ord.billto, ord.startdate, ord.typeid, ord.status, ord.itemid, ord.offerid FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_subscr_orders') . ' ord WHERE ord.orderid=' . (int)$orderid . '';
+        $sql     = 'SELECT ord.uid, ord.billto, ord.startdate, ord.typeid, ord.status, ord.itemid, ord.offerid FROM '.$this->db->prefix($module->getVar('dirname', 'n').'_subscr_orders').' ord WHERE ord.orderid='.(int) $orderid.'';
         $result  = $this->db->query($sql);
         $numrows = $this->db->getRowsNum($result);
         $arr     = $this->db->fetchArray($result);
@@ -301,7 +301,7 @@ 
      */
     public function getOfferVars($offerid = '0', $showactive = '1')
     {
-        $sql = 'SELECT count, duration FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_subscr_offers') . ' WHERE offerid=' . (int)$offerid . '';
+        $sql = 'SELECT count, duration FROM '.$this->db->prefix($module->getVar('dirname', 'n').'_subscr_offers').' WHERE offerid='.(int) $offerid.'';
         if ($showactive == '1') {
             $sql .= " AND activeyn='1'";
         }
@@ -336,7 +336,7 @@ 
     public function updateItem($itemid = '0', $typeid = '0')
     {
         if ($itemid != '0' && $typeid != '0') {
-            $sql = 'UPDATE ' . $this->db->prefix($module->getVar('dirname', 'n') . '_items') . " SET typeid='" . (int)$typeid . '\' WHERE itemid=' . (int)$itemid . '';
+            $sql = 'UPDATE '.$this->db->prefix($module->getVar('dirname', 'n').'_items')." SET typeid='".(int) $typeid.'\' WHERE itemid='.(int) $itemid.'';
             $this->db->queryF($sql);
 
             return true;
@@ -360,7 +360,7 @@ 
     public function changeItemType($itemid = 0, $itemtype = 0)
     {
         global $xoopsDB, $eh;
-        $sql = 'UPDATE ' . $this->db->prefix($module->getVar('dirname', 'n') . '_items') . " SET typeid=$itemtype WHERE itemid=(int)($itemid)";
+        $sql = 'UPDATE '.$this->db->prefix($module->getVar('dirname', 'n').'_items')." SET typeid=$itemtype WHERE itemid=(int)($itemid)";
         $this->db->queryF($sql);
 
         return true;
@@ -373,7 +373,7 @@ 
      */
     public function durationPriceArray($dashes = '0', $showactive = '1')
     {
-        $sql = 'SELECT o.offerid, o.duration, o.count, o.price, o.currency, o.descr, t.typeid, t.typename FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_subscr_offers') . ' o, ' . $this->db->prefix($module->getVar('dirname', 'n') . '_itemtypes') . ' t WHERE o.typeid=t.typeid';
+        $sql = 'SELECT o.offerid, o.duration, o.count, o.price, o.currency, o.descr, t.typeid, t.typename FROM '.$this->db->prefix($module->getVar('dirname', 'n').'_subscr_offers').' o, '.$this->db->prefix($module->getVar('dirname', 'n').'_itemtypes').' t WHERE o.typeid=t.typeid';
         if ($showactive == '1') {
             $sql .= " AND activeyn='1'";
         }
@@ -389,8 +389,8 @@ 
             } else {
                 $duration_arr = $this->durationArray();
             }
-            $durationname                  = $duration_arr['' . $duration . ''];
-            $arr[$typeid . '_' . $offerid] = $typename . ' - ' . $count . ' ' . $durationname . ' - ' . $price . ' ' . $currency;
+            $durationname                  = $duration_arr[''.$duration.''];
+            $arr[$typeid.'_'.$offerid] = $typename.' - '.$count.' '.$durationname.' - '.$price.' '.$currency;
         }
 
         return $arr;
@@ -403,10 +403,10 @@ 
      */
     public function itemsSelBox($selname = '', $none = false, $preselected = 0)
     {
-        $sql     = 'SELECT typeid, typename FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_itemtypes') . '';
+        $sql     = 'SELECT typeid, typename FROM '.$this->db->prefix($module->getVar('dirname', 'n').'_itemtypes').'';
         $result  = $this->db->query($sql);
         $numrows = $this->db->getRowsNum($result);
-        echo "<select name='" . $selname . '\'';
+        echo "<select name='".$selname.'\'';
         echo ">\n";
         $result = $this->db->query($sql);
         if ($none) {
@@ -430,7 +430,7 @@ 
     public function itemTypesArray($dashes = '0')
     {
         global $xoopsModule;
-        $sql     = 'SELECT typeid, typename FROM ' . $this->db->prefix($xoopsModule->getVar('dirname', 'n') . '_itemtypes') . ' ORDER BY typelevel ASC';
+        $sql     = 'SELECT typeid, typename FROM '.$this->db->prefix($xoopsModule->getVar('dirname', 'n').'_itemtypes').' ORDER BY typelevel ASC';
         $result  = $this->db->query($sql) or $eh->show('0013');
         $numrows = $this->db->getRowsNum($result);
         $result  = $this->db->query($sql);
@@ -450,7 +450,7 @@ 
      */
     public function countSubscriptionsForType($typeid = 0)
     {
-        $sql = 'SELECT COUNT(itemid) FROM ' . $this->db->prefix($module->getVar('dirname', 'n') . '_items') . ' WHERE typeid=' . (int)$typeid . '';
+        $sql = 'SELECT COUNT(itemid) FROM '.$this->db->prefix($module->getVar('dirname', 'n').'_items').' WHERE typeid='.(int) $typeid.'';
         if (!$result = $this->db->query($sql)) {
             return false;
         }

class/class.listingdata.php

Indentation +189 added lines, -189 removed lines

@@ -41,62 +41,62 @@ 
  */
 class efqListingData extends XoopsObject
 {
-    public $_updated  = false;
-    public $_inserted = false;
+	public $_updated  = false;
+	public $_inserted = false;
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        // 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);
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		// 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);
+	}
 
-    //Set variable $_updated to true of false (default)
+	//Set variable $_updated to true of false (default)
 
-    /**
-     * @param bool $set
-     */
-    public function setUpdated($set = false)
-    {
-        $this->_updated = $set;
-    }
+	/**
+	 * @param bool $set
+	 */
+	public function setUpdated($set = false)
+	{
+		$this->_updated = $set;
+	}
 
-    //Set variable $_inserted to true of false (default)
+	//Set variable $_inserted to true of false (default)
 
-    /**
-     * @param bool $set
-     */
-    public function setInserted($set = false)
-    {
-        $this->_inserted = $set;
-    }
+	/**
+	 * @param bool $set
+	 */
+	public function setInserted($set = false)
+	{
+		$this->_inserted = $set;
+	}
 
-    /**
-     * @param $arr
-     * @return bool
-     */
-    public function setListingData($arr)
-    {
-        if (is_array($arr)) {
-            $vars = $this->getVars();
-            foreach ($vars as $k => $v) {
-                $this->setVar($k, $arr[$k]);
-            }
-        } else {
-            return false;
-        }
+	/**
+	 * @param $arr
+	 * @return bool
+	 */
+	public function setListingData($arr)
+	{
+		if (is_array($arr)) {
+			$vars = $this->getVars();
+			foreach ($vars as $k => $v) {
+				$this->setVar($k, $arr[$k]);
+			}
+		} else {
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 }
 
 /**
@@ -110,153 +110,153 @@ 
  */
 class efqListingDataHandler extends XoopsObjectHandler
 {
-    public $errorhandler;
+	public $errorhandler;
 
-    /**
-     * efqListingDataHandler constructor.
-     */
-    public function __construct()
-    {
-        //Instantiate class
-        global $eh;
-        $this->db           = XoopsDatabaseFactory::getDatabaseConnection();
-        $this->errorhandler = $eh;
-    }
+	/**
+	 * efqListingDataHandler constructor.
+	 */
+	public function __construct()
+	{
+		//Instantiate class
+		global $eh;
+		$this->db           = XoopsDatabaseFactory::getDatabaseConnection();
+		$this->errorhandler = $eh;
+	}
 
-    /**
-     * @param int $itemid
-     * @return array
-     */
-    public 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') . ' 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
-            );
-        }
+	/**
+	 * @param int $itemid
+	 * @return array
+	 */
+	public 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') . ' 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;
+	}
 
-    /**
-     * Function updateListingData updates listing data
-     * @author    EFQ Consultancy <info@efqconsultancy.com>
-     * @copyright EFQ Consultancy (c) 2008
-     * @version   1.0.0
-     *
-     * @param   object $obj object of type listing
-     *
-     * @param bool     $forceQuery
-     * @return bool true if update is successful, false if unsuccessful
-     */
-    public function updateListingData($obj, $forceQuery = false)
-    {
-        $tablename = 'efqdiralpha1_data';
-        $keyName   = 'dataid';
-        if ($obj instanceof efqListingData) {
-            // Variable part of this function ends. From this line you can copy
-            // this function for similar object handling functions.
-            $obj->cleanVars();
-            $cleanvars = $obj->cleanVars;
-            $keyValue  = $obj->getVar($keyName);
-        } else {
-            return false;
-        }
-        $countVars = count($cleanvars);
-        $i         = 1;
-        $strSet    = '';
-        $strValues = '';
-        foreach ($cleanvars as $k => $v) {
-            $strSet .= $k . '=' . "'" . $v . "'";
-            if ($i < $countVars) {
-                $strSet .= ', ';
-            }
-            $i++;
-        }
-        $sql = sprintf('UPDATE %s SET %s WHERE %s = %u', $this->db->prefix($tablename), $strSet, $keyName, $keyValue);
-        if ($forceQuery) {
-            if ($this->db->queryF($sql)) {
-                return true;
-            }
-        } else {
-            if ($this->db->query($sql)) {
-                return true;
-            }
-        }
+	/**
+	 * Function updateListingData updates listing data
+	 * @author    EFQ Consultancy <info@efqconsultancy.com>
+	 * @copyright EFQ Consultancy (c) 2008
+	 * @version   1.0.0
+	 *
+	 * @param   object $obj object of type listing
+	 *
+	 * @param bool     $forceQuery
+	 * @return bool true if update is successful, false if unsuccessful
+	 */
+	public function updateListingData($obj, $forceQuery = false)
+	{
+		$tablename = 'efqdiralpha1_data';
+		$keyName   = 'dataid';
+		if ($obj instanceof efqListingData) {
+			// Variable part of this function ends. From this line you can copy
+			// this function for similar object handling functions.
+			$obj->cleanVars();
+			$cleanvars = $obj->cleanVars;
+			$keyValue  = $obj->getVar($keyName);
+		} else {
+			return false;
+		}
+		$countVars = count($cleanvars);
+		$i         = 1;
+		$strSet    = '';
+		$strValues = '';
+		foreach ($cleanvars as $k => $v) {
+			$strSet .= $k . '=' . "'" . $v . "'";
+			if ($i < $countVars) {
+				$strSet .= ', ';
+			}
+			$i++;
+		}
+		$sql = sprintf('UPDATE %s SET %s WHERE %s = %u', $this->db->prefix($tablename), $strSet, $keyName, $keyValue);
+		if ($forceQuery) {
+			if ($this->db->queryF($sql)) {
+				return true;
+			}
+		} else {
+			if ($this->db->query($sql)) {
+				return true;
+			}
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Function insertListingData inserts listing data into DB
-     * @author    EFQ Consultancy <info@efqconsultancy.com>
-     * @copyright EFQ Consultancy (c) 2008
-     * @version   1.0.0
-     *
-     * @param      $obj
-     * @param bool $forceQuery
-     * @return bool true if insertion is succesful, false if unsuccesful
-     * @internal  param object $objListing object of type listing
-     */
-    public function insertListingData($obj, $forceQuery = false)
-    {
-        $tablename = 'efqdiralpha1_data';
-        $keyName   = 'dataid';
-        if ($obj instanceof efqListingData) {
-            // Variable part of this function ends. From this line you can copy
-            // this function for similar object handling functions.
-            $obj->cleanVars();
-            $cleanvars = $obj->cleanVars;
-        } else {
-            return false;
-        }
-        $countVars = count($cleanvars);
-        $i         = 1;
-        $strFields = '';
-        $strValues = '';
-        foreach ($cleanvars as $k => $v) {
-            $strFields .= $k;
-            $strValues .= "'" . $v . "'";
-            if ($i < $countVars) {
-                $strFields .= ', ';
-                $strValues .= ', ';
-            }
-            $i++;
-        }
-        $sql = sprintf('INSERT INTO %s (%s) VALUES (%s)', $this->db->prefix($tablename), $strFields, $strValues);
-        if ($forceQuery) {
-            if ($this->db->queryF($sql)) {
-                $itemid = $this->db->getInsertId();
-                $obj->setVar($keyName, $itemid);
+	/**
+	 * Function insertListingData inserts listing data into DB
+	 * @author    EFQ Consultancy <info@efqconsultancy.com>
+	 * @copyright EFQ Consultancy (c) 2008
+	 * @version   1.0.0
+	 *
+	 * @param      $obj
+	 * @param bool $forceQuery
+	 * @return bool true if insertion is succesful, false if unsuccesful
+	 * @internal  param object $objListing object of type listing
+	 */
+	public function insertListingData($obj, $forceQuery = false)
+	{
+		$tablename = 'efqdiralpha1_data';
+		$keyName   = 'dataid';
+		if ($obj instanceof efqListingData) {
+			// Variable part of this function ends. From this line you can copy
+			// this function for similar object handling functions.
+			$obj->cleanVars();
+			$cleanvars = $obj->cleanVars;
+		} else {
+			return false;
+		}
+		$countVars = count($cleanvars);
+		$i         = 1;
+		$strFields = '';
+		$strValues = '';
+		foreach ($cleanvars as $k => $v) {
+			$strFields .= $k;
+			$strValues .= "'" . $v . "'";
+			if ($i < $countVars) {
+				$strFields .= ', ';
+				$strValues .= ', ';
+			}
+			$i++;
+		}
+		$sql = sprintf('INSERT INTO %s (%s) VALUES (%s)', $this->db->prefix($tablename), $strFields, $strValues);
+		if ($forceQuery) {
+			if ($this->db->queryF($sql)) {
+				$itemid = $this->db->getInsertId();
+				$obj->setVar($keyName, $itemid);
 
-                return true;
-            }
-        } else {
-            if ($this->db->query($sql)) {
-                $itemid = $this->db->getInsertId();
-                $obj->setVar($keyName, $itemid);
+				return true;
+			}
+		} else {
+			if ($this->db->query($sql)) {
+				$itemid = $this->db->getInsertId();
+				$obj->setVar($keyName, $itemid);
 
-                return true;
-            }
-        }
+				return true;
+			}
+		}
 
-        return false;
-    }
+		return false;
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -131,9 +131,9 @@ 
     {
         $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 . '';
+        $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(
@@ -184,7 +184,7 @@ 
         $strSet    = '';
         $strValues = '';
         foreach ($cleanvars as $k => $v) {
-            $strSet .= $k . '=' . "'" . $v . "'";
+            $strSet .= $k.'='."'".$v."'";
             if ($i < $countVars) {
                 $strSet .= ', ';
             }
@@ -233,7 +233,7 @@ 
         $strValues = '';
         foreach ($cleanvars as $k => $v) {
             $strFields .= $k;
-            $strValues .= "'" . $v . "'";
+            $strValues .= "'".$v."'";
             if ($i < $countVars) {
                 $strFields .= ', ';
                 $strValues .= ', ';

class/class.uploader.php

Indentation +434 added lines, -434 removed lines

@@ -72,438 +72,438 @@
  */
 class XoopsMediaUploader
 {
-    /**
-     * Flag indicating if unrecognized mimetypes should be allowed (use with precaution ! may lead to security issues )
-     **/
-    public $allowUnknownTypes = false;
-
-    public $mediaName;
-    public $mediaType;
-    public $mediaSize;
-    public $mediaTmpName;
-    public $mediaError;
-    public $mediaRealType = '';
-
-    public $uploadDir = '';
-
-    public $allowedMimeTypes = array();
-
-    public $maxFileSize = 0;
-    public $maxWidth;
-    public $maxHeight;
-
-    public $targetFileName;
-
-    public $prefix;
-
-    public $errors = array();
-
-    public $savedDestination;
-
-    public $savedFileName;
-
-    public $extensionToMime = array();
-
-    /**
-     * Constructor
-     *
-     * @param   string $uploadDir
-     * @param   array  $allowedMimeTypes
-     * @param   int    $maxFileSize
-     * @param   int    $maxWidth
-     * @param   int    $maxHeight
-     * @internal param int $cmodvalue
-     */
-    public function __construct($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 = (int)$maxFileSize;
-        if (isset($maxWidth)) {
-            $this->maxWidth = (int)$maxWidth;
-        }
-        if (isset($maxHeight)) {
-            $this->maxHeight = (int)$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
-     **/
-    public 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');
-
-            //echo " - no such file ";
-            return false;
-        } elseif (is_array($_FILES[$media_name]['name']) && isset($index)) {
-            $index              = (int)$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;
-        }
-        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'))) {
-            // Prevent sending of invalid images that would crash IE
-            if (!($info = getimagesize($this->mediaTmpName))) {
-                $this->setErrors('Invalid file content');
-
-                return false;
-            }
-        }
-        if ((int)$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
-     **/
-    public function setTargetFileName($value)
-    {
-        $this->targetFileName = (string)trim($value);
-    }
-
-    /**
-     * Set the prefix
-     *
-     * @param   string $value
-     **/
-    public function setPrefix($value)
-    {
-        $this->prefix = (string)trim($value);
-    }
-
-    /**
-     * Get the uploaded filename
-     *
-     * @return  string
-     **/
-    public function getMediaName()
-    {
-        return $this->mediaName;
-    }
-
-    /**
-     * Get the type of the uploaded file
-     *
-     * @return  string
-     **/
-    public function getMediaType()
-    {
-        return $this->mediaType;
-    }
-
-    /**
-     * Get the size of the uploaded file
-     *
-     * @return  int
-     **/
-    public function getMediaSize()
-    {
-        return $this->mediaSize;
-    }
-
-    /**
-     * Get the temporary name that the uploaded file was stored under
-     *
-     * @return  string
-     **/
-    public function getMediaTmpName()
-    {
-        return $this->mediaTmpName;
-    }
-
-    /**
-     * Get the saved filename
-     *
-     * @return  string
-     **/
-    public function getSavedFileName()
-    {
-        return $this->savedFileName;
-    }
-
-    /**
-     * Get the destination the file is saved to
-     *
-     * @return  string
-     **/
-    public function getSavedDestination()
-    {
-        return $this->savedDestination;
-    }
-
-    /**
-     * Check the file and copy it to the destination
-     *
-     * @param int $chmod
-     * @return bool
-     */
-    public 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_writable($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
-     *
-     * @param $chmod
-     * @return bool
-     */
-    public 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, true) . '.' . 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
-     **/
-    public function checkMaxFileSize()
-    {
-        if ($this->mediaSize > $this->maxFileSize) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Is the picture the right width?
-     *
-     * @return  bool
-     **/
-    public 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;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getWidth()
-    {
-        //$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;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getHeight()
-    {
-        //$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;
-    }
-
-    /**
-     * Is the picture the right height?
-     *
-     * @return  bool
-     **/
-    public 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
-     **/
-    public function checkMimeType()
-    {
-        if (empty($this->mediaRealType) && !$this->allowUnknownTypes) {
-            $this->setErrors('Unknown filetype rejected');
-
-            return false;
-        }
-
-        return (empty($this->allowedMimeTypes) || in_array($this->mediaRealType, $this->allowedMimeTypes));
-    }
-
-    /**
-     * Add an error
-     *
-     * @param   string $error
-     **/
-    public 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
-     */
-    public 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;
-        }
-    }
+	/**
+	 * Flag indicating if unrecognized mimetypes should be allowed (use with precaution ! may lead to security issues )
+	 **/
+	public $allowUnknownTypes = false;
+
+	public $mediaName;
+	public $mediaType;
+	public $mediaSize;
+	public $mediaTmpName;
+	public $mediaError;
+	public $mediaRealType = '';
+
+	public $uploadDir = '';
+
+	public $allowedMimeTypes = array();
+
+	public $maxFileSize = 0;
+	public $maxWidth;
+	public $maxHeight;
+
+	public $targetFileName;
+
+	public $prefix;
+
+	public $errors = array();
+
+	public $savedDestination;
+
+	public $savedFileName;
+
+	public $extensionToMime = array();
+
+	/**
+	 * Constructor
+	 *
+	 * @param   string $uploadDir
+	 * @param   array  $allowedMimeTypes
+	 * @param   int    $maxFileSize
+	 * @param   int    $maxWidth
+	 * @param   int    $maxHeight
+	 * @internal param int $cmodvalue
+	 */
+	public function __construct($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 = (int)$maxFileSize;
+		if (isset($maxWidth)) {
+			$this->maxWidth = (int)$maxWidth;
+		}
+		if (isset($maxHeight)) {
+			$this->maxHeight = (int)$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
+	 **/
+	public 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');
+
+			//echo " - no such file ";
+			return false;
+		} elseif (is_array($_FILES[$media_name]['name']) && isset($index)) {
+			$index              = (int)$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;
+		}
+		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'))) {
+			// Prevent sending of invalid images that would crash IE
+			if (!($info = getimagesize($this->mediaTmpName))) {
+				$this->setErrors('Invalid file content');
+
+				return false;
+			}
+		}
+		if ((int)$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
+	 **/
+	public function setTargetFileName($value)
+	{
+		$this->targetFileName = (string)trim($value);
+	}
+
+	/**
+	 * Set the prefix
+	 *
+	 * @param   string $value
+	 **/
+	public function setPrefix($value)
+	{
+		$this->prefix = (string)trim($value);
+	}
+
+	/**
+	 * Get the uploaded filename
+	 *
+	 * @return  string
+	 **/
+	public function getMediaName()
+	{
+		return $this->mediaName;
+	}
+
+	/**
+	 * Get the type of the uploaded file
+	 *
+	 * @return  string
+	 **/
+	public function getMediaType()
+	{
+		return $this->mediaType;
+	}
+
+	/**
+	 * Get the size of the uploaded file
+	 *
+	 * @return  int
+	 **/
+	public function getMediaSize()
+	{
+		return $this->mediaSize;
+	}
+
+	/**
+	 * Get the temporary name that the uploaded file was stored under
+	 *
+	 * @return  string
+	 **/
+	public function getMediaTmpName()
+	{
+		return $this->mediaTmpName;
+	}
+
+	/**
+	 * Get the saved filename
+	 *
+	 * @return  string
+	 **/
+	public function getSavedFileName()
+	{
+		return $this->savedFileName;
+	}
+
+	/**
+	 * Get the destination the file is saved to
+	 *
+	 * @return  string
+	 **/
+	public function getSavedDestination()
+	{
+		return $this->savedDestination;
+	}
+
+	/**
+	 * Check the file and copy it to the destination
+	 *
+	 * @param int $chmod
+	 * @return bool
+	 */
+	public 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_writable($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
+	 *
+	 * @param $chmod
+	 * @return bool
+	 */
+	public 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, true) . '.' . 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
+	 **/
+	public function checkMaxFileSize()
+	{
+		if ($this->mediaSize > $this->maxFileSize) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Is the picture the right width?
+	 *
+	 * @return  bool
+	 **/
+	public 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;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getWidth()
+	{
+		//$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;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getHeight()
+	{
+		//$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;
+	}
+
+	/**
+	 * Is the picture the right height?
+	 *
+	 * @return  bool
+	 **/
+	public 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
+	 **/
+	public function checkMimeType()
+	{
+		if (empty($this->mediaRealType) && !$this->allowUnknownTypes) {
+			$this->setErrors('Unknown filetype rejected');
+
+			return false;
+		}
+
+		return (empty($this->allowedMimeTypes) || in_array($this->mediaRealType, $this->allowedMimeTypes));
+	}
+
+	/**
+	 * Add an error
+	 *
+	 * @param   string $error
+	 **/
+	public 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
+	 */
+	public 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;
+		}
+	}
 }

Spacing +21 added lines, -21 removed lines

@@ -116,22 +116,22 @@ 
      */
     public function __construct($uploadDir, $allowedMimeTypes, $maxFileSize = 0, $maxWidth = null, $maxHeight = null)
     {
-        @$this->extensionToMime = include XOOPS_ROOT_PATH . '/class/mimetypes.inc.php';
+        @$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 = (int)$maxFileSize;
+        $this->maxFileSize = (int) $maxFileSize;
         if (isset($maxWidth)) {
-            $this->maxWidth = (int)$maxWidth;
+            $this->maxWidth = (int) $maxWidth;
         }
         if (isset($maxHeight)) {
-            $this->maxHeight = (int)$maxHeight;
+            $this->maxHeight = (int) $maxHeight;
         }
     }
 
@@ -155,14 +155,14 @@ 
             //echo " - no such file ";
             return false;
         } elseif (is_array($_FILES[$media_name]['name']) && isset($index)) {
-            $index              = (int)$index;
+            $index              = (int) $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];
+            $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'];
@@ -186,7 +186,7 @@ 
                 return false;
             }
         }
-        if ((int)$this->mediaSize < 0) {
+        if ((int) $this->mediaSize < 0) {
             $this->setErrors('Invalid File Size');
 
             return false;
@@ -202,7 +202,7 @@ 
             return false;
         }
         if ($this->mediaError > 0) {
-            $this->setErrors('Error occurred: Error #' . $this->mediaError);
+            $this->setErrors('Error occurred: Error #'.$this->mediaError);
 
             return false;
         }
@@ -217,7 +217,7 @@ 
      **/
     public function setTargetFileName($value)
     {
-        $this->targetFileName = (string)trim($value);
+        $this->targetFileName = (string) trim($value);
     }
 
     /**
@@ -227,7 +227,7 @@ 
      **/
     public function setPrefix($value)
     {
-        $this->prefix = (string)trim($value);
+        $this->prefix = (string) trim($value);
     }
 
     /**
@@ -304,13 +304,13 @@ 
             return false;
         }
         if (!is_dir($this->uploadDir)) {
-            $this->setErrors('Failed opening directory: ' . $this->uploadDir);
+            $this->setErrors('Failed opening directory: '.$this->uploadDir);
         }
         if (!is_writable($this->uploadDir)) {
-            $this->setErrors('Failed opening directory with write permission: ' . $this->uploadDir);
+            $this->setErrors('Failed opening directory with write permission: '.$this->uploadDir);
         }
         if (!$this->checkMaxFileSize()) {
-            $this->setErrors('File size too large: ' . $this->mediaSize);
+            $this->setErrors('File size too large: '.$this->mediaSize);
         }
         if (!$this->checkMaxWidth()) {
             $this->setErrors(sprintf('File width must be smaller than %u', $this->maxWidth));
@@ -319,13 +319,13 @@ 
             $this->setErrors(sprintf('File height must be smaller than %u', $this->maxHeight));
         }
         if (!$this->checkMimeType()) {
-            $this->setErrors('MIME type not allowed: ' . $this->mediaType);
+            $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);
+            $this->setErrors('Failed uploading file: '.$this->mediaName);
 
             return false;
         }
@@ -348,11 +348,11 @@ 
         if (isset($this->targetFileName)) {
             $this->savedFileName = $this->targetFileName;
         } elseif (isset($this->prefix)) {
-            $this->savedFileName = uniqid($this->prefix, true) . '.' . strtolower($matched[1]);
+            $this->savedFileName = uniqid($this->prefix, true).'.'.strtolower($matched[1]);
         } else {
             $this->savedFileName = strtolower($this->mediaName);
         }
-        $this->savedDestination = $this->uploadDir . '/' . $this->savedFileName;
+        $this->savedDestination = $this->uploadDir.'/'.$this->savedFileName;
         if (!move_uploaded_file($this->mediaTmpName, $this->savedDestination)) {
             return false;
         }
@@ -404,7 +404,7 @@ 
     public function getWidth()
     {
         //$filename = $imgloc."/";
-        $filename = $this->uploadDir . '/';
+        $filename = $this->uploadDir.'/';
         $filename .= $this->savedFileName;
         if (false !== $dimension = getimagesize($filename)) {
             if ($dimension[0] > 0) {
@@ -423,7 +423,7 @@ 
     public function getHeight()
     {
         //$filename = $imgloc."/";
-        $filename = $this->uploadDir . '/';
+        $filename = $this->uploadDir.'/';
         $filename .= $this->savedFileName;
         if (false !== $dimension = getimagesize($filename)) {
             if ($dimension[1] > 0) {
@@ -499,7 +499,7 @@ 
             if (count($this->errors) > 0) {
                 $ret = '<h4>Errors Returned While Uploading</h4>';
                 foreach ($this->errors as $error) {
-                    $ret .= $error . '<br>';
+                    $ret .= $error.'<br>';
                 }
             }
 

class/class.formradio.php

Indentation +130 added lines, -130 removed lines

@@ -39,146 +39,146 @@
  */
 class efqFormRadio extends XoopsFormElement
 {
-    /**
-     * Array of Options
-     * @var array
-     * @access private
-     */
-    public $_options = array();
+	/**
+	 * Array of Options
+	 * @var array
+	 * @access private
+	 */
+	public $_options = array();
 
-    /**
-     * Pre-selected value
-     * @var string
-     * @access private
-     */
-    public $_value;
+	/**
+	 * Pre-selected value
+	 * @var string
+	 * @access private
+	 */
+	public $_value;
 
-    /**
-     * Pre-selected value
-     * @var string
-     * @access private
-     */
-    public $_linebreak;
+	/**
+	 * Pre-selected value
+	 * @var string
+	 * @access private
+	 */
+	public $_linebreak;
 
-    /**
-     * Constructor
-     *
-     * @param string $caption Caption
-     * @param string $name    "name" attribute
-     * @param string $value   Pre-selected value
-     * @param null   $linebreak
-     */
-    public function __construct($caption, $name, $value = null, $linebreak = null)
-    {
-        $this->setCaption($caption);
-        $this->setName($name);
-        if (isset($value)) {
-            $this->setValue($value);
-        }
-        if (isset($linebreak)) {
-            $this->setLineBreak($linebreak);
-        } else {
-            $this->setLineBreak('');
-        }
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param string $caption Caption
+	 * @param string $name    "name" attribute
+	 * @param string $value   Pre-selected value
+	 * @param null   $linebreak
+	 */
+	public function __construct($caption, $name, $value = null, $linebreak = null)
+	{
+		$this->setCaption($caption);
+		$this->setName($name);
+		if (isset($value)) {
+			$this->setValue($value);
+		}
+		if (isset($linebreak)) {
+			$this->setLineBreak($linebreak);
+		} else {
+			$this->setLineBreak('');
+		}
+	}
 
-    /**
-     * Get the pre-selected value
-     *
-     * @return string
-     */
-    public function getValue()
-    {
-        return $this->_value;
-    }
+	/**
+	 * Get the pre-selected value
+	 *
+	 * @return string
+	 */
+	public function getValue()
+	{
+		return $this->_value;
+	}
 
-    /**
-     * Get the pre-selected value
-     *
-     * @return string
-     */
-    public function getLineBreak()
-    {
-        return $this->_linebreak;
-    }
+	/**
+	 * Get the pre-selected value
+	 *
+	 * @return string
+	 */
+	public function getLineBreak()
+	{
+		return $this->_linebreak;
+	}
 
-    /**
-     * Set the pre-selected value
-     *
-     * @param $value string
-     */
-    public function setValue($value)
-    {
-        $this->_value = $value;
-    }
+	/**
+	 * Set the pre-selected value
+	 *
+	 * @param $value string
+	 */
+	public function setValue($value)
+	{
+		$this->_value = $value;
+	}
 
-    /**
-     * Set the pre-selected value
-     *
-     * @param $linebreak
-     * @internal param string $value
-     */
-    public function setLineBreak($linebreak)
-    {
-        $this->_linebreak = $linebreak;
-    }
+	/**
+	 * Set the pre-selected value
+	 *
+	 * @param $linebreak
+	 * @internal param string $value
+	 */
+	public function setLineBreak($linebreak)
+	{
+		$this->_linebreak = $linebreak;
+	}
 
-    /**
-     * Add an option
-     *
-     * @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.
-     */
-    public function addOption($value, $name = '')
-    {
-        if ($name !== '') {
-            $this->_options[$value] = $name;
-        } else {
-            $this->_options[$value] = $value;
-        }
-    }
+	/**
+	 * Add an option
+	 *
+	 * @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.
+	 */
+	public function addOption($value, $name = '')
+	{
+		if ($name !== '') {
+			$this->_options[$value] = $name;
+		} else {
+			$this->_options[$value] = $value;
+		}
+	}
 
-    /**
-     * Adds multiple options
-     *
-     * @param array $options Associative array of value->name pairs.
-     */
-    public function addOptionArray($options)
-    {
-        if (is_array($options)) {
-            foreach ($options as $k => $v) {
-                $this->addOption($k, $v);
-            }
-        }
-    }
+	/**
+	 * Adds multiple options
+	 *
+	 * @param array $options Associative array of value->name pairs.
+	 */
+	public function addOptionArray($options)
+	{
+		if (is_array($options)) {
+			foreach ($options as $k => $v) {
+				$this->addOption($k, $v);
+			}
+		}
+	}
 
-    /**
-     * Gets the options
-     *
-     * @return array Associative array of value->name pairs.
-     */
-    public function getOptions()
-    {
-        return $this->_options;
-    }
+	/**
+	 * Gets the options
+	 *
+	 * @return array Associative array of value->name pairs.
+	 */
+	public function getOptions()
+	{
+		return $this->_options;
+	}
 
-    /**
-     * Prepare HTML for output
-     *
-     * @return string HTML
-     */
-    public function render()
-    {
-        $ret = '';
-        foreach ($this->getOptions() as $value => $name) {
-            $ret      .= "<input type='radio' name='" . $this->getName() . '\' value=\'' . $value . '\'';
-            $selected = $this->getValue();
-            if (isset($selected) && ($value == $selected)) {
-                $ret .= ' checked';
-            }
-            $ret .= $this->getExtra() . '>' . $name . '' . $this->getLineBreak() . "\n";
-        }
+	/**
+	 * Prepare HTML for output
+	 *
+	 * @return string HTML
+	 */
+	public function render()
+	{
+		$ret = '';
+		foreach ($this->getOptions() as $value => $name) {
+			$ret      .= "<input type='radio' name='" . $this->getName() . '\' value=\'' . $value . '\'';
+			$selected = $this->getValue();
+			if (isset($selected) && ($value == $selected)) {
+				$ret .= ' checked';
+			}
+			$ret .= $this->getExtra() . '>' . $name . '' . $this->getLineBreak() . "\n";
+		}
 
-        return $ret;
-    }
+		return $ret;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -171,12 +171,12 @@
     {
         $ret = '';
         foreach ($this->getOptions() as $value => $name) {
-            $ret      .= "<input type='radio' name='" . $this->getName() . '\' value=\'' . $value . '\'';
+            $ret .= "<input type='radio' name='".$this->getName().'\' value=\''.$value.'\'';
             $selected = $this->getValue();
             if (isset($selected) && ($value == $selected)) {
                 $ret .= ' checked';
             }
-            $ret .= $this->getExtra() . '>' . $name . '' . $this->getLineBreak() . "\n";
+            $ret .= $this->getExtra().'>'.$name.''.$this->getLineBreak()."\n";
         }
 
         return $ret;