XoopsModules25x / efqdirectory

class/class.fieldtype.php

Spacing +10 added lines, -10 removed lines

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

class/class.image.php

Spacing +5 added lines, -5 removed lines

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

class/class.datatype.php

Spacing +11 added lines, -11 removed lines

@@ -50,7 +50,7 @@ 
    * @param bool $itemtype
    * @return
    */
-	function efqDataType($offer=false)
+	function efqDataType($offer = false)
 	{
 		global $moddir;
 		$this->db = Database::getInstance();
@@ -89,7 +89,7 @@ 
    * 
    * @return
    */
-	function efqDataTypeHandler($obj=false) {
+	function efqDataTypeHandler($obj = false) {
 		$this->db = Database::getInstance();
 		$this->objDataType = $obj;
 	}
@@ -104,7 +104,7 @@ 
 	 * 
 	 * @return	bool	true if insertion is succesful, false if unsuccesful
 	 */
-	function insertDataType($obj, $forceQuery=false) {
+	function insertDataType($obj, $forceQuery = false) {
 		$tablename = "efqdiralpha1_dtypes";
 		$keyName = "dtypeid";
 		$excludedVars = array();
@@ -121,7 +121,7 @@ 
 		$strFields = "";
 		$strValues = "";
 		foreach ($cleanvars as $k => $v) {
-			if ( !in_array($k, $excludedVars) ) {
+			if (!in_array($k, $excludedVars)) {
 				$strFields .= $k;
 				$strValues .= "'".$v."'";
 				if ($i < $countVars) {
@@ -158,7 +158,7 @@ 
 	 * 
 	 * @return	bool	true if update is succesful, false if unsuccesful
 	 */
-	function updateDataType($obj, $forceQuery=false) {
+	function updateDataType($obj, $forceQuery = false) {
 		$tablename = "efqdiralpha1_dtypes";
 		$keyName = "dtypeid";
 		$excludedVars = array();
@@ -176,7 +176,7 @@ 
 		$strSet = "";
 		$strValues = "";
 		foreach ($cleanvars as $k => $v) {
-			if ( !in_array($k, $excludedVars) ) {
+			if (!in_array($k, $excludedVars)) {
 				if ($i < $countVars and $i > 1) {
 					$strSet .= ", ";
 				}
@@ -204,14 +204,14 @@ 
    * 
    * @return bool true or false
    */
-	function setDataType($gpc_dtypeid=0) {
+	function setDataType($gpc_dtypeid = 0) {
 		$sql = "SELECT dtypeid,title,section,fieldtypeid,uid,defaultyn,created,seq,activeyn,options,custom,icon	WHERE dtypeid=".intval($gpc_dtypeid);
         $result = $this->db->query($sql);
         $numrows = $this->db->getRowsNum($result);
-        if ( $numrows > 0 ) {
-	        while (list($dtypeid,$title,$section,$fieldtypeid,$uid,$defaultyn, $activeyn,
-	                $options,$custom,$icon) = $this->db->fetchRow($result)) {
-				if (! $this->objDataType ) {
+        if ($numrows > 0) {
+	        while (list($dtypeid, $title, $section, $fieldtypeid, $uid, $defaultyn, $activeyn,
+	                $options, $custom, $icon) = $this->db->fetchRow($result)) {
+				if (!$this->objDataType) {
 					$this->objDataType = new efqDataType();
 				}
 				$this->objDataType->setVar('dtypeid', $dtypeid);

class/class.couponhandler.php

Spacing +8 added lines, -8 removed lines

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

class/class.formradio.php

Spacing +14 added lines, -14 removed lines

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

class/class.datafieldmanager.php

Spacing +54 added lines, -54 removed lines

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

class/class.gmap.php

Spacing +11 added lines, -11 removed lines

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

class/class.subscription.php

Spacing +34 added lines, -34 removed lines

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

class/class.itemtype.php

Spacing +12 added lines, -12 removed lines

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