XoopsModules25x / efqdirectory

blocks/efqdiralpha1_menu.php

Spacing +6 added lines, -6 removed lines

@@ -40,16 +40,16 @@ 
  
 function b_efqdiralpha1_menu_show($options) {
 	global $xoopsDB, $xoopsModule, $eh;
-	$info =  dirname(__FILE__);
-	$split = split("[\]",$info);
+	$info = dirname(__FILE__);
+	$split = split("[\]", $info);
 	$count = count($split) - 2;
 	$moddir = $split[$count];
 	$block = array();
 	$block['lang_dirmenu'] = _MB_EFQDIR_MENU;
 	$block['moddir'] = $moddir;
-	$myts =& MyTextSanitizer::getInstance();
+	$myts = & MyTextSanitizer::getInstance();
 	$result = $xoopsDB->query("SELECT dirid, name, descr FROM ".$xoopsDB->prefix("efqdiralpha1_dir")." WHERE open='1' ORDER BY name") or $eh->show("0013");
-	while($myrow = $xoopsDB->fetchArray($result)){
+	while ($myrow = $xoopsDB->fetchArray($result)) {
 		$directory = array();
 		$name = $myts->makeTboxData4Show($myrow["name"]);
 		$directory['dirid'] = $myrow['dirid'];
@@ -64,9 +64,9 @@ 
 function b_efqdiralpha1_menu_edit($options) {
 	$form = ""._MB_EFQDIR_DISP." ";
 	$form .= "<input type='hidden' name='options[]' value='";
-	if($options[0] == "date"){
+	if ($options[0] == "date") {
 		$form .= "date'";
-	}else {
+	} else {
 		$form .= "hits'";
 	}
 	$form .= " />";

Braces +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
 	$form .= "<input type='hidden' name='options[]' value='";
 	if($options[0] == "date"){
 		$form .= "date'";
-	}else {
+	} else {
 		$form .= "hits'";
 	}
 	$form .= " />";

blocks/efqdir_menu.php

Spacing +6 added lines, -6 removed lines

@@ -43,19 +43,19 @@ 
 	if (isset($xoopsModule)) {
 		$moddir = $xoopsModule->getvar("dirname");
 	} else {
-		$info =  dirname(__FILE__);
-		$split = split("[\]",$info);
+		$info = dirname(__FILE__);
+		$split = split("[\]", $info);
 		$count = count($split) - 2;
 		$moddir = $split[$count];
 	}
 	$block = array();
 	$block['lang_dirmenu'] = _MB_EFQDIR_MENU;
 	$block['moddir'] = $moddir;
-	$myts =& MyTextSanitizer::getInstance();
+	$myts = & MyTextSanitizer::getInstance();
 	$result = $xoopsDB->query("SELECT dirid, name, descr FROM ".$xoopsDB->prefix("efqdiralpha1_dir")." WHERE open='1' ORDER BY name") or $eh->show("0013");
 	echo "test";
 	print_r($result);
-	while($myrow = $xoopsDB->fetchArray($result)){
+	while ($myrow = $xoopsDB->fetchArray($result)) {
 		$directory = array();
 		$name = $myts->makeTboxData4Show($myrow["name"]);
 		$directory['dirid'] = $myrow['dirid'];
@@ -70,9 +70,9 @@ 
 function b_efqdiralpha1_menu_edit($options) {
 	$form = ""._MB_EFQDIR_DISP." ";
 	$form .= "<input type='hidden' name='options[]' value='";
-	if($options[0] == "date"){
+	if ($options[0] == "date") {
 		$form .= "date'";
-	}else {
+	} else {
 		$form .= "hits'";
 	}
 	$form .= " />";

Braces +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
 	$form .= "<input type='hidden' name='options[]' value='";
 	if($options[0] == "date"){
 		$form .= "date'";
-	}else {
+	} else {
 		$form .= "hits'";
 	}
 	$form .= " />";

include/couponform.php

Indentation +2 added lines, -2 removed lines

@@ -64,8 +64,8 @@
 $button_tray->addElement(new XoopsFormButton('', 'submit', _MD_SUBMIT, 'submit'));
 
 if ($couponid) {
-    $button_tray->addElement(new XoopsFormButton('', 'delete', _MD_DELETE, 'submit'));
-    $coupform->addElement(new XoopsFormHidden('couponid', $couponid));
+	$button_tray->addElement(new XoopsFormButton('', 'delete', _MD_DELETE, 'submit'));
+	$coupform->addElement(new XoopsFormHidden('couponid', $couponid));
 }
 $coupform->addElement($button_tray);
 $coupform->display();

Spacing +5 added lines, -5 removed lines

@@ -45,13 +45,13 @@
 $coupform->addElement(new XoopsFormHidden('itemid', $itemid));
 $coupform->addElement(new XoopsFormText(_MD_COUPONHEADER, 'heading', 25, 30, $heading), true);
 $coupform->addElement(new XoopsFormDhtmlTextArea(_MD_DESCRIPTIONC, 'description', $description));
-$image_option=new XoopsFormSelect(_MD_COUPONIMGMGR."<br />"._MD_COUPONIMG."<br />", 'image', $image);
+$image_option = new XoopsFormSelect(_MD_COUPONIMGMGR."<br />"._MD_COUPONIMG."<br />", 'image', $image);
 $image_option->addOptionArray($linkimg_array);
-$imgtray = new XoopsFormElementTray(_MD_COUPSEL,'<br />');
+$imgtray = new XoopsFormElementTray(_MD_COUPSEL, '<br />');
 
-$image_option->setExtra("onchange='showImgSelected(\"imagex\", \"image\", \"" . $uploaddirectory . "\", \"\", \"" . XOOPS_URL . "\")'" );
-$imgtray->addElement($image_option,false);
-$imgtray -> addElement( new XoopsFormLabel( '', "<br /><img src='". $uploaddirectory . "/" . $image . "' name='imagex' id='imagex' alt='' />" ) );
+$image_option->setExtra("onchange='showImgSelected(\"imagex\", \"image\", \"".$uploaddirectory."\", \"\", \"".XOOPS_URL."\")'");
+$imgtray->addElement($image_option, false);
+$imgtray -> addElement(new XoopsFormLabel('', "<br /><img src='".$uploaddirectory."/".$image."' name='imagex' id='imagex' alt='' />"));
 $coupform->addElement($imgtray);
 $coupform->addelement(new XoopsFormRadioYN(_MD_CONVERTLBR, 'lbr', $lbr));
 $coupform->addElement(new XoopsFormDateTime(_MD_PUBLISHCOUPON, 'publish', 25, $publish));

include/functions.php

Indentation +211 added lines, -211 removed lines

@@ -61,27 +61,27 @@ 
 }
 
 function convertorderbytrans($orderby) {
-            $orderbyTrans = "";
+			$orderbyTrans = "";
 			if ($orderby == "hits ASC")    $orderbyTrans = ""._MD_POPULARITYLTOM."";
-            if ($orderby == "hits DESC")   $orderbyTrans = ""._MD_POPULARITYMTOL."";
-            if ($orderby == "title ASC")   $orderbyTrans = ""._MD_TITLEATOZ."";
-           	if ($orderby == "title DESC")  $orderbyTrans = ""._MD_TITLEZTOA."";
-            if ($orderby == "date ASC")    $orderbyTrans = ""._MD_DATEOLD."";
-            if ($orderby == "date DESC")   $orderbyTrans = ""._MD_DATENEW."";
-            if ($orderby == "rating ASC")  $orderbyTrans = ""._MD_RATINGLTOH."";
-            if ($orderby == "rating DESC") $orderbyTrans = ""._MD_RATINGHTOL."";
-            return $orderbyTrans;
+			if ($orderby == "hits DESC")   $orderbyTrans = ""._MD_POPULARITYMTOL."";
+			if ($orderby == "title ASC")   $orderbyTrans = ""._MD_TITLEATOZ."";
+		   	if ($orderby == "title DESC")  $orderbyTrans = ""._MD_TITLEZTOA."";
+			if ($orderby == "date ASC")    $orderbyTrans = ""._MD_DATEOLD."";
+			if ($orderby == "date DESC")   $orderbyTrans = ""._MD_DATENEW."";
+			if ($orderby == "rating ASC")  $orderbyTrans = ""._MD_RATINGLTOH."";
+			if ($orderby == "rating DESC") $orderbyTrans = ""._MD_RATINGHTOL."";
+			return $orderbyTrans;
 }
 function convertorderbyout($orderby) {
-            if ($orderby == "title ASC")            $orderby = "titleA";
-            if ($orderby == "date ASC")            $orderby = "dateA";
-            if ($orderby == "hits ASC")          $orderby = "hitsA";
-            if ($orderby == "rating ASC")        $orderby = "ratingA";
-            if ($orderby == "title DESC")              $orderby = "titleD";
-            if ($orderby == "date DESC")            $orderby = "dateD";
-            if ($orderby == "hits DESC")          $orderby = "hitsD";
-            if ($orderby == "rating DESC")        $orderby = "ratingD";
-            return $orderby;
+			if ($orderby == "title ASC")            $orderby = "titleA";
+			if ($orderby == "date ASC")            $orderby = "dateA";
+			if ($orderby == "hits ASC")          $orderby = "hitsA";
+			if ($orderby == "rating ASC")        $orderby = "ratingA";
+			if ($orderby == "title DESC")              $orderby = "titleD";
+			if ($orderby == "date DESC")            $orderby = "dateD";
+			if ($orderby == "hits DESC")          $orderby = "hitsD";
+			if ($orderby == "rating DESC")        $orderby = "ratingD";
+			return $orderby;
 }
 
 function newlinkgraphic($time, $status) {
@@ -106,82 +106,82 @@ 
 	return '';
 }
 function getTotalItems($sel_id, $status=0){
-        global $xoopsDB, $mytree;
-	    $count = 0;
-        $arr = array();
-        $query = "SELECT DISTINCT l.itemid FROM ".$xoopsDB->prefix("efqdiralpha1_items")." l, ".$xoopsDB->prefix("efqdiralpha1_item_x_cat")." x WHERE x.itemid=l.itemid AND x.cid=".$sel_id."";
+		global $xoopsDB, $mytree;
+		$count = 0;
+		$arr = array();
+		$query = "SELECT DISTINCT l.itemid FROM ".$xoopsDB->prefix("efqdiralpha1_items")." l, ".$xoopsDB->prefix("efqdiralpha1_item_x_cat")." x WHERE x.itemid=l.itemid AND x.cid=".$sel_id."";
 		if($status != ""){
-        	$query .= " AND l.status>='$status'";
-        } else {
+			$query .= " AND l.status>='$status'";
+		} else {
 			$query .= "";
 		}
 		$query .= " AND x.active >= '1'";
-        $result = $xoopsDB->query($query);
+		$result = $xoopsDB->query($query);
 		//print_r($xoopsDB->fetchArray($result));
 		if (!$result) {
-        	$count = 0;
-        } else {
+			$count = 0;
+		} else {
 			$num_results = mysql_num_rows($result);
 			$count = $num_results;
 		}
-        $arr = $mytree->getAllChildId($sel_id);
-	    $size = count($arr);
-    	for($i=0;$i<$size;$i++){
+		$arr = $mytree->getAllChildId($sel_id);
+		$size = count($arr);
+		for($i=0;$i<$size;$i++){
 				$query2 = "SELECT DISTINCT l.itemid FROM ".$xoopsDB->prefix("efqdiralpha1_items")." l, ".$xoopsDB->prefix("efqdiralpha1_item_x_cat")." x WHERE l.itemid=x.itemid AND x.cid=".$arr[$i]."";
 				if($status != ""){
-			       	$query2 .= " AND l.status>='$status'";
-			    } else {
+				   	$query2 .= " AND l.status>='$status'";
+				} else {
 					$query2 .= "";
 				}
 				$query2 .= " AND x.active >= '1'";
-                $result2 = $xoopsDB->query($query2);
+				$result2 = $xoopsDB->query($query2);
 				$num_results2 = mysql_num_rows($result2);
-                $count += $num_results2;
-        }
-        return $count;
+				$count += $num_results2;
+		}
+		return $count;
 }
 function getTotalItems2($sel_id, $status="", $locdestid){
-        global $xoopsDB, $mytree;
-        $count = 0;
-        $arr = array();
-        $query = "select count(*) from ".$xoopsDB->prefix("links_links")." t, ".$xoopsDB->prefix("links_x_loc_dest")." x  where x.ldestid=t.lid AND x.locdestid=".$locdestid." AND t.cid=".$sel_id."";
+		global $xoopsDB, $mytree;
+		$count = 0;
+		$arr = array();
+		$query = "select count(*) from ".$xoopsDB->prefix("links_links")." t, ".$xoopsDB->prefix("links_x_loc_dest")." x  where x.ldestid=t.lid AND x.locdestid=".$locdestid." AND t.cid=".$sel_id."";
 //		$query = "select DISTINCT count(lid) from ".$xoopsDB->prefix("links_links")." t, ".$xoopsDB->prefix("links_x_loc_dest")." x  where x.ldestid=t.lid AND x.locdestid=".$locdestid." AND t.cid=".$sel_id."";
 //		$query = "select count(*) from ".$xoopsDB->prefix("links_links")." where cid=".$sel_id."";
-        if($status!=""){
-                $query .= " and status>=$status";
-        }
-        $result = $xoopsDB->query($query);
-        list($thing) = $xoopsDB->fetchRow($result);
-        $count = $thing;
-        $arr = $mytree->getAllChildId($sel_id);
-        $size = count($arr);
-        for($i=0;$i<$size;$i++){
-                $query2 = "select count(*) ".$xoopsDB->prefix("links_links")." t, ".$xoopsDB->prefix("links_x_loc_dest")." x  where x.ldestid=t.lid AND x.locdestid=".$locdestid." AND t.cid=".$arr[$i]."";
-                if($status!=""){
-                        $query2 .= " and status>=$status";
-                }
-                $result2 = $xoopsDB->query($query2);
-                list($thing) = $xoopsDB->fetchRow($result2);
-                $count += $thing;
-        }
-        return $count;
+		if($status!=""){
+				$query .= " and status>=$status";
+		}
+		$result = $xoopsDB->query($query);
+		list($thing) = $xoopsDB->fetchRow($result);
+		$count = $thing;
+		$arr = $mytree->getAllChildId($sel_id);
+		$size = count($arr);
+		for($i=0;$i<$size;$i++){
+				$query2 = "select count(*) ".$xoopsDB->prefix("links_links")." t, ".$xoopsDB->prefix("links_x_loc_dest")." x  where x.ldestid=t.lid AND x.locdestid=".$locdestid." AND t.cid=".$arr[$i]."";
+				if($status!=""){
+						$query2 .= " and status>=$status";
+				}
+				$result2 = $xoopsDB->query($query2);
+				list($thing) = $xoopsDB->fetchRow($result2);
+				$count += $thing;
+		}
+		return $count;
 }
 
 function getDirNameFromId($dirid=0)
 {
 	global $xoopsDB;
 	$myts =& MyTextSanitizer::getInstance();
-    $result = $xoopsDB->query("SELECT name FROM ".$xoopsDB->prefix("efqdiralpha1_dir")." WHERE dirid = '".$dirid."'");
-    $num_results = mysql_num_rows($result);
-    if (!$result) {
-        return 0;
-        }
-    for ($i=0; $i <$num_results; $i++)
-    {
-        $row = mysql_fetch_array($result);
-        $dirname = $row['name'];
-    }
-    return $dirname;
+	$result = $xoopsDB->query("SELECT name FROM ".$xoopsDB->prefix("efqdiralpha1_dir")." WHERE dirid = '".$dirid."'");
+	$num_results = mysql_num_rows($result);
+	if (!$result) {
+		return 0;
+		}
+	for ($i=0; $i <$num_results; $i++)
+	{
+		$row = mysql_fetch_array($result);
+		$dirname = $row['name'];
+	}
+	return $dirname;
 }
 
 function getCatTitleFromId($cid=0)
@@ -189,17 +189,17 @@ 
 	global $xoopsDB;
 	//$block = array();
 	$myts =& MyTextSanitizer::getInstance();
-    $result = $xoopsDB->query("SELECT title FROM ".$xoopsDB->prefix("efqdiralpha1_cat")." WHERE cid = '".$cid."'");
-    $num_results = mysql_num_rows($result);
-    if (!$result) {
-        return 0;
-        }
-    for ($i=0; $i <$num_results; $i++)
-    {
-        $row = mysql_fetch_array($result);
-        $cattitle = $row['title'];
-    }
-    return $cattitle;
+	$result = $xoopsDB->query("SELECT title FROM ".$xoopsDB->prefix("efqdiralpha1_cat")." WHERE cid = '".$cid."'");
+	$num_results = mysql_num_rows($result);
+	if (!$result) {
+		return 0;
+		}
+	for ($i=0; $i <$num_results; $i++)
+	{
+		$row = mysql_fetch_array($result);
+		$cattitle = $row['title'];
+	}
+	return $cattitle;
 }
 
 function getCategoriesPaths($get_itemid)
@@ -211,44 +211,44 @@ 
 		$isadmin = false;
 	}
 	$result = $xoopsDB->query("SELECT xid, cid, itemid FROM ".$xoopsDB->prefix("efqdiralpha1_item_x_cat")." WHERE itemid = ".$get_itemid." AND active='1'");
-    $num_results = mysql_num_rows($result);
-    if (!$result) {
-        return 0;
-    }
-    $output = "";
+	$num_results = mysql_num_rows($result);
+	if (!$result) {
+		return 0;
+	}
+	$output = "";
 	for ($i=0; $i <$num_results; $i++)
-    {
-        $row = mysql_fetch_array($result);
-        $cid = $row['cid'];
+	{
+		$row = mysql_fetch_array($result);
+		$cid = $row['cid'];
 		$path = "";
 		$path .= $efqtree->getUnformattedPathFromId($cid, "title", $path);
 		$path .= "<br />";
 		$output .= $path;
-    }
+	}
 	if ($isadmin) {
 		$output .= "<br /><a href=\"admin/categories.php?dirid=".$get_dirid."\">"._MD_EDITCATEGORIES."</a>";
 	}
 	//$output .= "<br /><a href=\"editcategories.php?item=".$get_itemid."\">["._MD_EDIT_CATEGORIES."]</a>";
-    return $output;
+	return $output;
 }
 
 function adminmenu($currentoption=0,$breadcrumb)
 {
-    global $xoopsModule, $xoopsConfig;
-    $tblColors=Array();
-    $tblColors[0]=$tblColors[1]=$tblColors[2]=$tblColors[3]=$tblColors[4]=$tblColors[5]=$tblColors[6]=$tblColors[7] = '#DDE';
-    $tblColors[$currentoption] = 'white';
-    echo "<table width=100% class='outer'><tr><td align=right>
+	global $xoopsModule, $xoopsConfig;
+	$tblColors=Array();
+	$tblColors[0]=$tblColors[1]=$tblColors[2]=$tblColors[3]=$tblColors[4]=$tblColors[5]=$tblColors[6]=$tblColors[7] = '#DDE';
+	$tblColors[$currentoption] = 'white';
+	echo "<table width=100% class='outer'><tr><td align=right>
           <font size=2>".$xoopsModule->name().":".$breadcrumb."</font>
           </td></tr></table><br />";
-    echo "<div id=\"navcontainer\"><ul style=\"padding: 3px 0; margin-left:
+	echo "<div id=\"navcontainer\"><ul style=\"padding: 3px 0; margin-left:
          0;font: bold 12px Verdana, sans-serif; \">";
-    echo "<li style=\"list-style: none; margin: 0; display: inline; \">
+	echo "<li style=\"list-style: none; margin: 0; display: inline; \">
          <a href=\"index.php\" style=\"padding: 3px 0.5em;
          margin-left: 3px;
          border: 1px solid #778; background: ".$tblColors[0].";
          text-decoration: none; \">"._MD_A_MODADMIN_HOME ."</a></li>";
-    echo "<li style=\"list-style: none; margin: 0; display: inline; \">
+	echo "<li style=\"list-style: none; margin: 0; display: inline; \">
          <a href=\"directories.php\" style=\"padding: 3px 0.5em;
          margin-left: 3px;
          border: 1px solid #778; background: ".$tblColors[1].";
@@ -258,7 +258,7 @@ 
          margin-left: 3px;
          border: 1px solid #778; background: ".$tblColors[2].";
          text-decoration: none; \">"._MD_A_CATEGORIESADMIN."</a></li>";
-    echo "<li style=\"list-style: none; margin: 0; display: inline; \">
+	echo "<li style=\"list-style: none; margin: 0; display: inline; \">
          <a href=\"fieldtypes.php\" style=\"padding: 3px 0.5em;
          margin-left: 3px;
          border: 1px solid #778; background: ".$tblColors[3].";
@@ -274,69 +274,69 @@ 
 function getTypeFromId($typeid='0') {
 	global $xoopsDB;
 	$myts =& MyTextSanitizer::getInstance();
-    $result = $xoopsDB->query("SELECT typename  FROM ".$xoopsDB->prefix("efqdiralpha1_itemtypes")." WHERE typeid = '".$typeid."'");
-    $num_results = $xoopsDB->getRowsNum($result);
-    $typename = "";
+	$result = $xoopsDB->query("SELECT typename  FROM ".$xoopsDB->prefix("efqdiralpha1_itemtypes")." WHERE typeid = '".$typeid."'");
+	$num_results = $xoopsDB->getRowsNum($result);
+	$typename = "";
 	if (!$result) {
-        return 0;
-    }
-    for ($i=0; $i <$num_results; $i++)
-    {
-        $row = mysql_fetch_array($result);
-        $typename = $row['typename'];
-    }
-    return $typename;
+		return 0;
+	}
+	for ($i=0; $i <$num_results; $i++)
+	{
+		$row = mysql_fetch_array($result);
+		$typename = $row['typename'];
+	}
+	return $typename;
 }
 
 function getDirId($catid='0') {
 	global $xoopsDB;
 	$myts =& MyTextSanitizer::getInstance();
-    $result = $xoopsDB->query("SELECT dirid  FROM ".$xoopsDB->prefix("efqdiralpha1_cat")." WHERE cid = '".$catid."'");
-    $num_results = $xoopsDB->getRowsNum($result);
-    $dirid = 0;
+	$result = $xoopsDB->query("SELECT dirid  FROM ".$xoopsDB->prefix("efqdiralpha1_cat")." WHERE cid = '".$catid."'");
+	$num_results = $xoopsDB->getRowsNum($result);
+	$dirid = 0;
 	if (!$result) {
-        return 0;
-    }
-    for ($i=0; $i <$num_results; $i++)
-    {
-        $row = mysql_fetch_array($result);
-        $dirid = $row['dirid'];
-    }
-    return $dirid;
+		return 0;
+	}
+	for ($i=0; $i <$num_results; $i++)
+	{
+		$row = mysql_fetch_array($result);
+		$dirid = $row['dirid'];
+	}
+	return $dirid;
 }
 
 function checkDescription($catid='0') {
 	global $xoopsDB;
 	$myts =& MyTextSanitizer::getInstance();
-    $result = $xoopsDB->query("SELECT txtid FROM ".$xoopsDB->prefix("efqdiralpha1_cat_txt")." WHERE cid = '".$catid."'");
-    $num_results = $xoopsDB->getRowsNum($result);
-    $txtid = false;
+	$result = $xoopsDB->query("SELECT txtid FROM ".$xoopsDB->prefix("efqdiralpha1_cat_txt")." WHERE cid = '".$catid."'");
+	$num_results = $xoopsDB->getRowsNum($result);
+	$txtid = false;
 	if (!$result) {
-        return false;
-    }
-    for ($i=0; $i <$num_results; $i++)
-    {
-        $row = mysql_fetch_array($result);
-        $txtid = $row['txtid'];
-    }
-    return $txtid;
+		return false;
+	}
+	for ($i=0; $i <$num_results; $i++)
+	{
+		$row = mysql_fetch_array($result);
+		$txtid = $row['txtid'];
+	}
+	return $txtid;
 }
 
 function getTemplateFromCatid($get_catid='0') {
 	global $xoopsDB;
 	$myts =& MyTextSanitizer::getInstance();
-    $result = $xoopsDB->query("SELECT c.tplid, t.name  FROM ".$xoopsDB->prefix("efqdiralpha1_cat_tpl")." c, ".$xoopsDB->prefix("efqdiralpha1_tpl")." t WHERE c.tplid=t.tplid AND c.catid = '".$get_catid."'");
-    $num_results = $xoopsDB->getRowsNum($result);
-    $tplname = "";
+	$result = $xoopsDB->query("SELECT c.tplid, t.name  FROM ".$xoopsDB->prefix("efqdiralpha1_cat_tpl")." c, ".$xoopsDB->prefix("efqdiralpha1_tpl")." t WHERE c.tplid=t.tplid AND c.catid = '".$get_catid."'");
+	$num_results = $xoopsDB->getRowsNum($result);
+	$tplname = "";
 	if (!$result) {
-        return 0;
-        }
-    for ($i=0; $i <$num_results; $i++)
-    {
-        $row = mysql_fetch_array($result);
-        $tplname = $row['name'];
-    }
-    return $tplname;
+		return 0;
+		}
+	for ($i=0; $i <$num_results; $i++)
+	{
+		$row = mysql_fetch_array($result);
+		$tplname = $row['name'];
+	}
+	return $tplname;
 }
 
 function getCatSelectArea($item='0', $dirid = '0')
@@ -345,7 +345,7 @@ 
 	$sql = "SELECT c.cid, c.title, c.pid, c.allowlist, x.active FROM ".$xoopsDB->prefix("efqdiralpha1_cat")." c LEFT JOIN ".$xoopsDB->prefix("efqdiralpha1_item_x_cat")." x ON (c.cid=x.cid AND x.itemid=".$item.")  WHERE c.dirid='".$dirid."' AND c.pid='0' AND c.active='1'";
 	$mainresult = $xoopsDB->query($sql);
 	$numrows = $xoopsDB->getRowsNum($mainresult);
-    $output = "<table>";
+	$output = "<table>";
 	if ( $numrows > 0 ) {
 		$cats = "";
 		$output .= "<tr><td class=\"categoryHeader\" colspan=\"2\"><strong>"._MD_CATTITLE."</strong></td><td class=\"categoryHeader\"><strong>"._MD_SELECT."</strong></td></tr>\n";
@@ -409,108 +409,108 @@ 
 function getDirIdFromItem($item = 0)
 {
 	global $xoopsDB;
-    $block = array();
+	$block = array();
 	$myts =& MyTextSanitizer::getInstance();
 	$dirid = 0;
-    $result = $xoopsDB->query("SELECT dirid FROM ".$xoopsDB->prefix("efqdiralpha1_items")." WHERE itemid = ".$item."");
-    $num_results = $xoopsDB->getRowsNum($result);
-    if (!$result) {
-        return 0;
-        }
-    for ($i=0; $i <$num_results; $i++)
-    {
-        $row = mysql_fetch_array($result);
-        $dirid = $row['dirid'];
-    }
-    return $dirid;
+	$result = $xoopsDB->query("SELECT dirid FROM ".$xoopsDB->prefix("efqdiralpha1_items")." WHERE itemid = ".$item."");
+	$num_results = $xoopsDB->getRowsNum($result);
+	if (!$result) {
+		return 0;
+		}
+	for ($i=0; $i <$num_results; $i++)
+	{
+		$row = mysql_fetch_array($result);
+		$dirid = $row['dirid'];
+	}
+	return $dirid;
 }
 function countOpenDirectories()
 {
 	global $xoopsDB;
-    $block = array();
+	$block = array();
 	$myts =& MyTextSanitizer::getInstance();
 	$dirid = 0;
-    $result = $xoopsDB->query("SELECT dirid FROM ".$xoopsDB->prefix("efqdiralpha1_dir")." WHERE open = '1'");
-    $num_results = $xoopsDB->getRowsNum($result);
-    if (!$result) {
-        return 0;
-    } else if ($num_results == 0) {
-    	return 0;
-    } else if ($num_results == 1) {
-    	$row = mysql_fetch_array($result);
-        $dirid = $row['dirid'];
-        return $dirid;
-    } else {
-    	return 0;
-    }
+	$result = $xoopsDB->query("SELECT dirid FROM ".$xoopsDB->prefix("efqdiralpha1_dir")." WHERE open = '1'");
+	$num_results = $xoopsDB->getRowsNum($result);
+	if (!$result) {
+		return 0;
+	} else if ($num_results == 0) {
+		return 0;
+	} else if ($num_results == 1) {
+		$row = mysql_fetch_array($result);
+		$dirid = $row['dirid'];
+		return $dirid;
+	} else {
+		return 0;
+	}
 }
 function getUserIdFromItem($item = 0)
 {
 	global $xoopsDB;
-    $block = array();
+	$block = array();
 	$myts =& MyTextSanitizer::getInstance();
 	$userid = 0;
-    $result = $xoopsDB->query("SELECT uid FROM ".$xoopsDB->prefix("efqdiralpha1_items")." WHERE itemid = ".$item."");
-    $num_results = $xoopsDB->getRowsNum($result);
-    if (!$result) {
-        return 0;
-        }
-    for ($i=0; $i <$num_results; $i++)
-    {
-        $row = mysql_fetch_array($result);
-        $userid = $row['uid'];
-    }
-    return $userid;
+	$result = $xoopsDB->query("SELECT uid FROM ".$xoopsDB->prefix("efqdiralpha1_items")." WHERE itemid = ".$item."");
+	$num_results = $xoopsDB->getRowsNum($result);
+	if (!$result) {
+		return 0;
+		}
+	for ($i=0; $i <$num_results; $i++)
+	{
+		$row = mysql_fetch_array($result);
+		$userid = $row['uid'];
+	}
+	return $userid;
 }
 //updates rating data in itemtable for a given item
 function updaterating($sel_id){
-        global $xoopsDB;
-        $query = "select rating FROM ".$xoopsDB->prefix("efqdiralpha1_votedata")." WHERE itemid = ".$sel_id."";
-        $voteresult = $xoopsDB->query($query);
-            $votesDB = $xoopsDB->getRowsNum($voteresult);
-        $totalrating = 0;
-            while(list($rating)=$xoopsDB->fetchRow($voteresult)){
-                $totalrating += $rating;
-        }
-        $finalrating = $totalrating/$votesDB;
-        $finalrating = number_format($finalrating, 4);
-        $query =  "UPDATE ".$xoopsDB->prefix("efqdiralpha1_items")." SET rating=$finalrating, votes=$votesDB WHERE itemid = $sel_id";
-        $xoopsDB->query($query) or exit();
+		global $xoopsDB;
+		$query = "select rating FROM ".$xoopsDB->prefix("efqdiralpha1_votedata")." WHERE itemid = ".$sel_id."";
+		$voteresult = $xoopsDB->query($query);
+			$votesDB = $xoopsDB->getRowsNum($voteresult);
+		$totalrating = 0;
+			while(list($rating)=$xoopsDB->fetchRow($voteresult)){
+				$totalrating += $rating;
+		}
+		$finalrating = $totalrating/$votesDB;
+		$finalrating = number_format($finalrating, 4);
+		$query =  "UPDATE ".$xoopsDB->prefix("efqdiralpha1_items")." SET rating=$finalrating, votes=$votesDB WHERE itemid = $sel_id";
+		$xoopsDB->query($query) or exit();
 }
 function getAddressFields($typeid='0')
 {
 	global $xoopsDB;
-    $block = array();
+	$block = array();
 	$myts =& MyTextSanitizer::getInstance();
 	$dirid = 0;
 	$addressarray = array();
 	if ($typeid == '0') {
 		$result = $xoopsDB->query("SELECT typeid, address, address2, zip, postcode, lat, lon, phone, fax, mobile, city, country, typename, uselocyn FROM ".$xoopsDB->prefix("efqdiralpha1_address_types")." WHERE defaultyn = '1'");
-    } else {
+	} else {
 		$result = $xoopsDB->query("SELECT typeid, address, address2, zip, postcode, lat, lon, phone, fax, mobile, city, country, typename, uselocyn FROM ".$xoopsDB->prefix("efqdiralpha1_address_types")." WHERE typeid = '$typeid'");
 	}	
-    $num_results = $xoopsDB->getRowsNum($result);
-    if (!$result) {
-        return 0;
-    }
-    while ( list($typeid, $address, $address2, $zip, $postcode, $lat, $lon, $phone, $fax, $mobile, $city, $country, $typename, $uselocyn) = $xoopsDB->fetchRow($result) ) {
+	$num_results = $xoopsDB->getRowsNum($result);
+	if (!$result) {
+		return 0;
+	}
+	while ( list($typeid, $address, $address2, $zip, $postcode, $lat, $lon, $phone, $fax, $mobile, $city, $country, $typename, $uselocyn) = $xoopsDB->fetchRow($result) ) {
 		$addressarray = array('typeid' => $typeid, 'typename' => $typename, 'uselocyn' => $uselocyn, 'addressfields' => array('address' => $address, 'address2' => $address2, 'zip' => $zip, 'postcode' => $postcode, 'lat' => $lat, 'lon' => $lon, 'phone' => $phone, 'fax' => $fax, 'mobile' => $mobile, 'city' => $city, 'country' => $country));
-    }
-    return $addressarray;
+	}
+	return $addressarray;
 }
 function getAddressValues($addrid = '0') {
 	global $xoopsDB;
 	$myts =& MyTextSanitizer::getInstance();
 	$addressarray = array();
-    $result = $xoopsDB->query("SELECT address, address2, zip, postcode, lat, lon, phone, fax, mobile, city, country FROM ".$xoopsDB->prefix("efqdiralpha1_addresses")." WHERE addrid = '$addrid'");
-    $num_results = $xoopsDB->getRowsNum($result);
-    if ($num_results == 0) {
-        $addressarray = array('address' => "", 'address2' => "", 'zip' => "", 'postcode' => "", 'lat' => "", 'lon' => "", 'phone' => "", 'fax' => "", 'mobile' => "", 'city' => "", 'country' => "");
+	$result = $xoopsDB->query("SELECT address, address2, zip, postcode, lat, lon, phone, fax, mobile, city, country FROM ".$xoopsDB->prefix("efqdiralpha1_addresses")." WHERE addrid = '$addrid'");
+	$num_results = $xoopsDB->getRowsNum($result);
+	if ($num_results == 0) {
+		$addressarray = array('address' => "", 'address2' => "", 'zip' => "", 'postcode' => "", 'lat' => "", 'lon' => "", 'phone' => "", 'fax' => "", 'mobile' => "", 'city' => "", 'country' => "");
 	}
-    while ( list($address, $address2, $zip, $postcode, $lat, $lon, $phone, $fax, $mobile, $city, $country) = $xoopsDB->fetchRow($result) ) {
+	while ( list($address, $address2, $zip, $postcode, $lat, $lon, $phone, $fax, $mobile, $city, $country) = $xoopsDB->fetchRow($result) ) {
 		$addressarray = array('address' => $address, 'address2' => $address2, 'zip' => $zip, 'postcode' => $postcode, 'lat' => $lat, 'lon' => $lon, 'phone' => $phone, 'fax' => $fax, 'mobile' => $mobile, 'city' => $city, 'country' => $country);
-    }
-    return $addressarray;
+	}
+	return $addressarray;
 }
 function getCatSelectArea2()
 {
@@ -524,7 +524,7 @@ 
 	$mainresult = $xoopsDB->query($sql);
 	$numrows = $xoopsDB->getRowsNum($mainresult);
 	$output= "";
-    if ( $numrows > 0 ) {
+	if ( $numrows > 0 ) {
 		$cats = "";
 		$output = "<table class=\"categoryTable\"><tr><td class=\"categoryHeader\" colspan=\"2\"><strong>"._MD_CATTITLE."</strong></td><td class=\"categoryHeader\"><strong>"._MD_SELECT."</strong></td></tr>\n";
 		$brench = 0;

Switch Indentation +25 added lines, -25 removed lines

@@ -31,31 +31,31 @@
 // ------------------------------------------------------------------------- //
 function convertorderbyin($orderby) {
 	switch (trim($orderby)) {
-	case "titleA":
-		$orderby = "title ASC";
-		break;
-	case "dateA":
-		$orderby = "created ASC";
-		break;
-	case "hitsA":
-		$orderby = "hits ASC";
-		break;
-	case "ratingA":
-		$orderby = "rating ASC";
-		break;
-	case "titleD":
-		$orderby = "title DESC";
-		break;
-	case "hitsD":
-		$orderby = "hits DESC";
-		break;
-	case "ratingD":
-		$orderby = "rating DESC";
-		break;
-	case"dateD":
-	default:
-		$orderby = "created DESC";
-		break;
+		case "titleA":
+			$orderby = "title ASC";
+			break;
+		case "dateA":
+			$orderby = "created ASC";
+			break;
+		case "hitsA":
+			$orderby = "hits ASC";
+			break;
+		case "ratingA":
+			$orderby = "rating ASC";
+			break;
+		case "titleD":
+			$orderby = "title DESC";
+			break;
+		case "hitsD":
+			$orderby = "hits DESC";
+			break;
+		case "ratingD":
+			$orderby = "rating DESC";
+			break;
+		case"dateD":
+		default:
+			$orderby = "created DESC";
+			break;
 	}
 	return $orderby;
 }

Spacing +64 added lines, -64 removed lines

@@ -88,11 +88,11 @@ 
 	global $moddir;
 	$count = 7;
 	$new = '';
-	$startdate = (time()-(86400 * $count));
+	$startdate = (time() - (86400 * $count));
 	if ($startdate < $time) {
-		if($status==2){
+		if ($status == 2) {
 			$new = "&nbsp;<img src=\"".XOOPS_URL."/modules/$moddir/images/newred.gif\" alt=\""._MD_NEWTHISWEEK."\" />";
-		}elseif($status==3){
+		}elseif ($status == 3) {
 			$new = "&nbsp;<img src=\"".XOOPS_URL."/modules/$moddir/images/update.gif\" alt=\""._MD_UPTHISWEEK."\" />";
 		}
 	}
@@ -105,12 +105,12 @@ 
 	}
 	return '';
 }
-function getTotalItems($sel_id, $status=0){
+function getTotalItems($sel_id, $status = 0) {
         global $xoopsDB, $mytree;
 	    $count = 0;
         $arr = array();
         $query = "SELECT DISTINCT l.itemid FROM ".$xoopsDB->prefix("efqdiralpha1_items")." l, ".$xoopsDB->prefix("efqdiralpha1_item_x_cat")." x WHERE x.itemid=l.itemid AND x.cid=".$sel_id."";
-		if($status != ""){
+		if ($status != "") {
         	$query .= " AND l.status>='$status'";
         } else {
 			$query .= "";
@@ -126,9 +126,9 @@ 
 		}
         $arr = $mytree->getAllChildId($sel_id);
 	    $size = count($arr);
-    	for($i=0;$i<$size;$i++){
+    	for ($i = 0; $i < $size; $i++) {
 				$query2 = "SELECT DISTINCT l.itemid FROM ".$xoopsDB->prefix("efqdiralpha1_items")." l, ".$xoopsDB->prefix("efqdiralpha1_item_x_cat")." x WHERE l.itemid=x.itemid AND x.cid=".$arr[$i]."";
-				if($status != ""){
+				if ($status != "") {
 			       	$query2 .= " AND l.status>='$status'";
 			    } else {
 					$query2 .= "";
@@ -140,14 +140,14 @@ 
         }
         return $count;
 }
-function getTotalItems2($sel_id, $status="", $locdestid){
+function getTotalItems2($sel_id, $status = "", $locdestid) {
         global $xoopsDB, $mytree;
         $count = 0;
         $arr = array();
         $query = "select count(*) from ".$xoopsDB->prefix("links_links")." t, ".$xoopsDB->prefix("links_x_loc_dest")." x  where x.ldestid=t.lid AND x.locdestid=".$locdestid." AND t.cid=".$sel_id."";
 //		$query = "select DISTINCT count(lid) from ".$xoopsDB->prefix("links_links")." t, ".$xoopsDB->prefix("links_x_loc_dest")." x  where x.ldestid=t.lid AND x.locdestid=".$locdestid." AND t.cid=".$sel_id."";
 //		$query = "select count(*) from ".$xoopsDB->prefix("links_links")." where cid=".$sel_id."";
-        if($status!=""){
+        if ($status != "") {
                 $query .= " and status>=$status";
         }
         $result = $xoopsDB->query($query);
@@ -155,9 +155,9 @@ 
         $count = $thing;
         $arr = $mytree->getAllChildId($sel_id);
         $size = count($arr);
-        for($i=0;$i<$size;$i++){
+        for ($i = 0; $i < $size; $i++) {
                 $query2 = "select count(*) ".$xoopsDB->prefix("links_links")." t, ".$xoopsDB->prefix("links_x_loc_dest")." x  where x.ldestid=t.lid AND x.locdestid=".$locdestid." AND t.cid=".$arr[$i]."";
-                if($status!=""){
+                if ($status != "") {
                         $query2 .= " and status>=$status";
                 }
                 $result2 = $xoopsDB->query($query2);
@@ -167,16 +167,16 @@ 
         return $count;
 }
 
-function getDirNameFromId($dirid=0)
+function getDirNameFromId($dirid = 0)
 {
 	global $xoopsDB;
-	$myts =& MyTextSanitizer::getInstance();
+	$myts = & MyTextSanitizer::getInstance();
     $result = $xoopsDB->query("SELECT name FROM ".$xoopsDB->prefix("efqdiralpha1_dir")." WHERE dirid = '".$dirid."'");
     $num_results = mysql_num_rows($result);
     if (!$result) {
         return 0;
         }
-    for ($i=0; $i <$num_results; $i++)
+    for ($i = 0; $i < $num_results; $i++)
     {
         $row = mysql_fetch_array($result);
         $dirname = $row['name'];
@@ -184,17 +184,17 @@ 
     return $dirname;
 }
 
-function getCatTitleFromId($cid=0)
+function getCatTitleFromId($cid = 0)
 {
 	global $xoopsDB;
 	//$block = array();
-	$myts =& MyTextSanitizer::getInstance();
+	$myts = & MyTextSanitizer::getInstance();
     $result = $xoopsDB->query("SELECT title FROM ".$xoopsDB->prefix("efqdiralpha1_cat")." WHERE cid = '".$cid."'");
     $num_results = mysql_num_rows($result);
     if (!$result) {
         return 0;
         }
-    for ($i=0; $i <$num_results; $i++)
+    for ($i = 0; $i < $num_results; $i++)
     {
         $row = mysql_fetch_array($result);
         $cattitle = $row['title'];
@@ -216,7 +216,7 @@ 
         return 0;
     }
     $output = "";
-	for ($i=0; $i <$num_results; $i++)
+	for ($i = 0; $i < $num_results; $i++)
     {
         $row = mysql_fetch_array($result);
         $cid = $row['cid'];
@@ -232,11 +232,11 @@ 
     return $output;
 }
 
-function adminmenu($currentoption=0,$breadcrumb)
+function adminmenu($currentoption = 0, $breadcrumb)
 {
     global $xoopsModule, $xoopsConfig;
-    $tblColors=Array();
-    $tblColors[0]=$tblColors[1]=$tblColors[2]=$tblColors[3]=$tblColors[4]=$tblColors[5]=$tblColors[6]=$tblColors[7] = '#DDE';
+    $tblColors = Array();
+    $tblColors[0] = $tblColors[1] = $tblColors[2] = $tblColors[3] = $tblColors[4] = $tblColors[5] = $tblColors[6] = $tblColors[7] = '#DDE';
     $tblColors[$currentoption] = 'white';
     echo "<table width=100% class='outer'><tr><td align=right>
           <font size=2>".$xoopsModule->name().":".$breadcrumb."</font>
@@ -247,7 +247,7 @@ 
          <a href=\"index.php\" style=\"padding: 3px 0.5em;
          margin-left: 3px;
          border: 1px solid #778; background: ".$tblColors[0].";
-         text-decoration: none; \">"._MD_A_MODADMIN_HOME ."</a></li>";
+         text-decoration: none; \">"._MD_A_MODADMIN_HOME."</a></li>";
     echo "<li style=\"list-style: none; margin: 0; display: inline; \">
          <a href=\"directories.php\" style=\"padding: 3px 0.5em;
          margin-left: 3px;
@@ -271,16 +271,16 @@ 
 	 echo "</div></ul>";
 } 
 
-function getTypeFromId($typeid='0') {
+function getTypeFromId($typeid = '0') {
 	global $xoopsDB;
-	$myts =& MyTextSanitizer::getInstance();
+	$myts = & MyTextSanitizer::getInstance();
     $result = $xoopsDB->query("SELECT typename  FROM ".$xoopsDB->prefix("efqdiralpha1_itemtypes")." WHERE typeid = '".$typeid."'");
     $num_results = $xoopsDB->getRowsNum($result);
     $typename = "";
 	if (!$result) {
         return 0;
     }
-    for ($i=0; $i <$num_results; $i++)
+    for ($i = 0; $i < $num_results; $i++)
     {
         $row = mysql_fetch_array($result);
         $typename = $row['typename'];
@@ -288,16 +288,16 @@ 
     return $typename;
 }
 
-function getDirId($catid='0') {
+function getDirId($catid = '0') {
 	global $xoopsDB;
-	$myts =& MyTextSanitizer::getInstance();
+	$myts = & MyTextSanitizer::getInstance();
     $result = $xoopsDB->query("SELECT dirid  FROM ".$xoopsDB->prefix("efqdiralpha1_cat")." WHERE cid = '".$catid."'");
     $num_results = $xoopsDB->getRowsNum($result);
     $dirid = 0;
 	if (!$result) {
         return 0;
     }
-    for ($i=0; $i <$num_results; $i++)
+    for ($i = 0; $i < $num_results; $i++)
     {
         $row = mysql_fetch_array($result);
         $dirid = $row['dirid'];
@@ -305,16 +305,16 @@ 
     return $dirid;
 }
 
-function checkDescription($catid='0') {
+function checkDescription($catid = '0') {
 	global $xoopsDB;
-	$myts =& MyTextSanitizer::getInstance();
+	$myts = & MyTextSanitizer::getInstance();
     $result = $xoopsDB->query("SELECT txtid FROM ".$xoopsDB->prefix("efqdiralpha1_cat_txt")." WHERE cid = '".$catid."'");
     $num_results = $xoopsDB->getRowsNum($result);
     $txtid = false;
 	if (!$result) {
         return false;
     }
-    for ($i=0; $i <$num_results; $i++)
+    for ($i = 0; $i < $num_results; $i++)
     {
         $row = mysql_fetch_array($result);
         $txtid = $row['txtid'];
@@ -322,16 +322,16 @@ 
     return $txtid;
 }
 
-function getTemplateFromCatid($get_catid='0') {
+function getTemplateFromCatid($get_catid = '0') {
 	global $xoopsDB;
-	$myts =& MyTextSanitizer::getInstance();
+	$myts = & MyTextSanitizer::getInstance();
     $result = $xoopsDB->query("SELECT c.tplid, t.name  FROM ".$xoopsDB->prefix("efqdiralpha1_cat_tpl")." c, ".$xoopsDB->prefix("efqdiralpha1_tpl")." t WHERE c.tplid=t.tplid AND c.catid = '".$get_catid."'");
     $num_results = $xoopsDB->getRowsNum($result);
     $tplname = "";
 	if (!$result) {
         return 0;
         }
-    for ($i=0; $i <$num_results; $i++)
+    for ($i = 0; $i < $num_results; $i++)
     {
         $row = mysql_fetch_array($result);
         $tplname = $row['name'];
@@ -339,19 +339,19 @@ 
     return $tplname;
 }
 
-function getCatSelectArea($item='0', $dirid = '0')
+function getCatSelectArea($item = '0', $dirid = '0')
 {
 	global $xoopsDB, $myts, $eh, $mytree, $moddir, $get_itemid;
 	$sql = "SELECT c.cid, c.title, c.pid, c.allowlist, x.active FROM ".$xoopsDB->prefix("efqdiralpha1_cat")." c LEFT JOIN ".$xoopsDB->prefix("efqdiralpha1_item_x_cat")." x ON (c.cid=x.cid AND x.itemid=".$item.")  WHERE c.dirid='".$dirid."' AND c.pid='0' AND c.active='1'";
 	$mainresult = $xoopsDB->query($sql);
 	$numrows = $xoopsDB->getRowsNum($mainresult);
     $output = "<table>";
-	if ( $numrows > 0 ) {
+	if ($numrows > 0) {
 		$cats = "";
 		$output .= "<tr><td class=\"categoryHeader\" colspan=\"2\"><strong>"._MD_CATTITLE."</strong></td><td class=\"categoryHeader\"><strong>"._MD_SELECT."</strong></td></tr>\n";
 		$brench = 0;
 		$tab = "";
-		while(list($cid, $title, $pid, $allowlist, $active) = $xoopsDB->fetchRow($mainresult)) {
+		while (list($cid, $title, $pid, $allowlist, $active) = $xoopsDB->fetchRow($mainresult)) {
 			//For each cid, get all 'first children' using getFirstChildId() function
 				if ($allowlist != '0') {
 					if ($active == '1') {
@@ -373,22 +373,22 @@ 
 	return $output;
 }
 
-function getCatSelectAreaChildren($childid="0", $level="0")
+function getCatSelectAreaChildren($childid = "0", $level = "0")
 {
 	global $xoopsDB, $myts, $eh, $mytree, $get_dirid, $moddir, $get_itemid;
 	$tab = "&nbsp;";
 	$level = $level;
 	$output = "";
 	$plus = "<img src=\"".XOOPS_URL."/images/arrow.gif\">";
-	for ($i=0; $i <$level; $i++)
+	for ($i = 0; $i < $level; $i++)
 	{
 		$tab .= "&nbsp;&nbsp;&nbsp;&nbsp;";
 	}
 	$sql = "SELECT DISTINCT c.cid, c.title, c.pid, c.allowlist, x.active FROM ".$xoopsDB->prefix("efqdiralpha1_cat")." c LEFT JOIN ".$xoopsDB->prefix("efqdiralpha1_item_x_cat")." x ON (c.cid=x.cid AND x.itemid='".$get_itemid."')  WHERE c.dirid='".$get_dirid."' AND c.pid='".$childid."' AND c.active='1'";
 	$childresult = $xoopsDB->query($sql);
 	$numrows = $xoopsDB->getRowsNum($childresult);
-	if ( $numrows > 0 ) {
-		while(list($cid, $title, $pid, $allowlist, $active) = $xoopsDB->fetchRow($childresult)) {
+	if ($numrows > 0) {
+		while (list($cid, $title, $pid, $allowlist, $active) = $xoopsDB->fetchRow($childresult)) {
 			if ($allowlist != '0') {
 				if ($active == '1') {
 					$checked = " checked";
@@ -410,14 +410,14 @@ 
 {
 	global $xoopsDB;
     $block = array();
-	$myts =& MyTextSanitizer::getInstance();
+	$myts = & MyTextSanitizer::getInstance();
 	$dirid = 0;
     $result = $xoopsDB->query("SELECT dirid FROM ".$xoopsDB->prefix("efqdiralpha1_items")." WHERE itemid = ".$item."");
     $num_results = $xoopsDB->getRowsNum($result);
     if (!$result) {
         return 0;
         }
-    for ($i=0; $i <$num_results; $i++)
+    for ($i = 0; $i < $num_results; $i++)
     {
         $row = mysql_fetch_array($result);
         $dirid = $row['dirid'];
@@ -428,7 +428,7 @@ 
 {
 	global $xoopsDB;
     $block = array();
-	$myts =& MyTextSanitizer::getInstance();
+	$myts = & MyTextSanitizer::getInstance();
 	$dirid = 0;
     $result = $xoopsDB->query("SELECT dirid FROM ".$xoopsDB->prefix("efqdiralpha1_dir")." WHERE open = '1'");
     $num_results = $xoopsDB->getRowsNum($result);
@@ -448,14 +448,14 @@ 
 {
 	global $xoopsDB;
     $block = array();
-	$myts =& MyTextSanitizer::getInstance();
+	$myts = & MyTextSanitizer::getInstance();
 	$userid = 0;
     $result = $xoopsDB->query("SELECT uid FROM ".$xoopsDB->prefix("efqdiralpha1_items")." WHERE itemid = ".$item."");
     $num_results = $xoopsDB->getRowsNum($result);
     if (!$result) {
         return 0;
         }
-    for ($i=0; $i <$num_results; $i++)
+    for ($i = 0; $i < $num_results; $i++)
     {
         $row = mysql_fetch_array($result);
         $userid = $row['uid'];
@@ -463,25 +463,25 @@ 
     return $userid;
 }
 //updates rating data in itemtable for a given item
-function updaterating($sel_id){
+function updaterating($sel_id) {
         global $xoopsDB;
         $query = "select rating FROM ".$xoopsDB->prefix("efqdiralpha1_votedata")." WHERE itemid = ".$sel_id."";
         $voteresult = $xoopsDB->query($query);
             $votesDB = $xoopsDB->getRowsNum($voteresult);
         $totalrating = 0;
-            while(list($rating)=$xoopsDB->fetchRow($voteresult)){
+            while (list($rating) = $xoopsDB->fetchRow($voteresult)) {
                 $totalrating += $rating;
         }
-        $finalrating = $totalrating/$votesDB;
+        $finalrating = $totalrating / $votesDB;
         $finalrating = number_format($finalrating, 4);
-        $query =  "UPDATE ".$xoopsDB->prefix("efqdiralpha1_items")." SET rating=$finalrating, votes=$votesDB WHERE itemid = $sel_id";
+        $query = "UPDATE ".$xoopsDB->prefix("efqdiralpha1_items")." SET rating=$finalrating, votes=$votesDB WHERE itemid = $sel_id";
         $xoopsDB->query($query) or exit();
 }
-function getAddressFields($typeid='0')
+function getAddressFields($typeid = '0')
 {
 	global $xoopsDB;
     $block = array();
-	$myts =& MyTextSanitizer::getInstance();
+	$myts = & MyTextSanitizer::getInstance();
 	$dirid = 0;
 	$addressarray = array();
 	if ($typeid == '0') {
@@ -493,21 +493,21 @@ 
     if (!$result) {
         return 0;
     }
-    while ( list($typeid, $address, $address2, $zip, $postcode, $lat, $lon, $phone, $fax, $mobile, $city, $country, $typename, $uselocyn) = $xoopsDB->fetchRow($result) ) {
+    while (list($typeid, $address, $address2, $zip, $postcode, $lat, $lon, $phone, $fax, $mobile, $city, $country, $typename, $uselocyn) = $xoopsDB->fetchRow($result)) {
 		$addressarray = array('typeid' => $typeid, 'typename' => $typename, 'uselocyn' => $uselocyn, 'addressfields' => array('address' => $address, 'address2' => $address2, 'zip' => $zip, 'postcode' => $postcode, 'lat' => $lat, 'lon' => $lon, 'phone' => $phone, 'fax' => $fax, 'mobile' => $mobile, 'city' => $city, 'country' => $country));
     }
     return $addressarray;
 }
 function getAddressValues($addrid = '0') {
 	global $xoopsDB;
-	$myts =& MyTextSanitizer::getInstance();
+	$myts = & MyTextSanitizer::getInstance();
 	$addressarray = array();
     $result = $xoopsDB->query("SELECT address, address2, zip, postcode, lat, lon, phone, fax, mobile, city, country FROM ".$xoopsDB->prefix("efqdiralpha1_addresses")." WHERE addrid = '$addrid'");
     $num_results = $xoopsDB->getRowsNum($result);
     if ($num_results == 0) {
         $addressarray = array('address' => "", 'address2' => "", 'zip' => "", 'postcode' => "", 'lat' => "", 'lon' => "", 'phone' => "", 'fax' => "", 'mobile' => "", 'city' => "", 'country' => "");
 	}
-    while ( list($address, $address2, $zip, $postcode, $lat, $lon, $phone, $fax, $mobile, $city, $country) = $xoopsDB->fetchRow($result) ) {
+    while (list($address, $address2, $zip, $postcode, $lat, $lon, $phone, $fax, $mobile, $city, $country) = $xoopsDB->fetchRow($result)) {
 		$addressarray = array('address' => $address, 'address2' => $address2, 'zip' => $zip, 'postcode' => $postcode, 'lat' => $lat, 'lon' => $lon, 'phone' => $phone, 'fax' => $fax, 'mobile' => $mobile, 'city' => $city, 'country' => $country);
     }
     return $addressarray;
@@ -523,14 +523,14 @@ 
 	$sql = "SELECT cid, title, pid, allowlist FROM ".$xoopsDB->prefix("efqdiralpha1_cat")." WHERE dirid='".$get_dirid."' AND pid='0' AND active='1'";
 	$mainresult = $xoopsDB->query($sql);
 	$numrows = $xoopsDB->getRowsNum($mainresult);
-	$output= "";
-    if ( $numrows > 0 ) {
+	$output = "";
+    if ($numrows > 0) {
 		$cats = "";
 		$output = "<table class=\"categoryTable\"><tr><td class=\"categoryHeader\" colspan=\"2\"><strong>"._MD_CATTITLE."</strong></td><td class=\"categoryHeader\"><strong>"._MD_SELECT."</strong></td></tr>\n";
 		$brench = 0;
 		$tab = "";
 		$selectablecat = false;
-		while(list($cid, $title, $pid, $allowlist) = $xoopsDB->fetchRow($mainresult)) {
+		while (list($cid, $title, $pid, $allowlist) = $xoopsDB->fetchRow($mainresult)) {
 			//For each cid, get all 'first children' using getFirstChildId() function
 			if ($allowlist != '0') {
 				$checkbox = "<input type=\"checkbox\" name=\"selected".$cid."\"";
@@ -548,7 +548,7 @@ 
 			}
 		}
 	} else {
-		redirect_header(XOOPS_URL."/modules/$moddir/index.php?dirid=$get_dirid",2,_MD_NOACTIVECATEGORIES);
+		redirect_header(XOOPS_URL."/modules/$moddir/index.php?dirid=$get_dirid", 2, _MD_NOACTIVECATEGORIES);
 		exit();
 		//$output = ""._MD_NORESULTS."";
 	}
@@ -557,28 +557,28 @@ 
 	}
 	$output .= "</table>";
 	if ($selectablecat == false) {
-		redirect_header(XOOPS_URL."/modules/$moddir/index.php?dirid=$get_dirid",2,_MD_NOACTIVECATEGORIES);
+		redirect_header(XOOPS_URL."/modules/$moddir/index.php?dirid=$get_dirid", 2, _MD_NOACTIVECATEGORIES);
 		exit();
 	}
 	return $output;
 }
 
-function getCatSelectAreaChildren2($childid="0", $level="0")
+function getCatSelectAreaChildren2($childid = "0", $level = "0")
 {
 	global $xoopsDB, $myts, $eh, $mytree, $get_dirid, $moddir;
 	$tab = "&nbsp;";
 	$level = $level;
 	$output = "";
 	$plus = "<img src=\"".XOOPS_URL."/images/arrow.gif\">";
-	for ($i=0; $i <$level; $i++)
+	for ($i = 0; $i < $level; $i++)
 	{
 		$tab .= "&nbsp;&nbsp;&nbsp;&nbsp;";
 	}
 	$sql = "SELECT cid, title, pid, allowlist FROM ".$xoopsDB->prefix("efqdiralpha1_cat")." WHERE dirid='".intval($get_dirid)."' AND pid='".intval($childid)."' AND active='1'";
 	$childresult = $xoopsDB->query($sql);
 	$numrows = $xoopsDB->getRowsNum($childresult);
-	if ( $numrows > 0 ) {
-		while(list($cid, $title, $pid, $allowlist) = $xoopsDB->fetchRow($childresult)) {
+	if ($numrows > 0) {
+		while (list($cid, $title, $pid, $allowlist) = $xoopsDB->fetchRow($childresult)) {
 			if ($allowlist != '0') {
 				$checkbox = "<input type=\"checkbox\" name=\"selected".$cid."\"";
 			} else {

Braces +49 added lines, -17 removed lines

@@ -62,25 +62,57 @@ 
 
 function convertorderbytrans($orderby) {
             $orderbyTrans = "";
-			if ($orderby == "hits ASC")    $orderbyTrans = ""._MD_POPULARITYLTOM."";
-            if ($orderby == "hits DESC")   $orderbyTrans = ""._MD_POPULARITYMTOL."";
-            if ($orderby == "title ASC")   $orderbyTrans = ""._MD_TITLEATOZ."";
-           	if ($orderby == "title DESC")  $orderbyTrans = ""._MD_TITLEZTOA."";
-            if ($orderby == "date ASC")    $orderbyTrans = ""._MD_DATEOLD."";
-            if ($orderby == "date DESC")   $orderbyTrans = ""._MD_DATENEW."";
-            if ($orderby == "rating ASC")  $orderbyTrans = ""._MD_RATINGLTOH."";
-            if ($orderby == "rating DESC") $orderbyTrans = ""._MD_RATINGHTOL."";
+			if ($orderby == "hits ASC") {
+				$orderbyTrans = ""._MD_POPULARITYLTOM."";
+			}
+            if ($orderby == "hits DESC") {
+            	$orderbyTrans = ""._MD_POPULARITYMTOL."";
+            }
+            if ($orderby == "title ASC") {
+            	$orderbyTrans = ""._MD_TITLEATOZ."";
+            }
+           	if ($orderby == "title DESC") {
+           		$orderbyTrans = ""._MD_TITLEZTOA."";
+           	}
+            if ($orderby == "date ASC") {
+            	$orderbyTrans = ""._MD_DATEOLD."";
+            }
+            if ($orderby == "date DESC") {
+            	$orderbyTrans = ""._MD_DATENEW."";
+            }
+            if ($orderby == "rating ASC") {
+            	$orderbyTrans = ""._MD_RATINGLTOH."";
+            }
+            if ($orderby == "rating DESC") {
+            	$orderbyTrans = ""._MD_RATINGHTOL."";
+            }
             return $orderbyTrans;
 }
 function convertorderbyout($orderby) {
-            if ($orderby == "title ASC")            $orderby = "titleA";
-            if ($orderby == "date ASC")            $orderby = "dateA";
-            if ($orderby == "hits ASC")          $orderby = "hitsA";
-            if ($orderby == "rating ASC")        $orderby = "ratingA";
-            if ($orderby == "title DESC")              $orderby = "titleD";
-            if ($orderby == "date DESC")            $orderby = "dateD";
-            if ($orderby == "hits DESC")          $orderby = "hitsD";
-            if ($orderby == "rating DESC")        $orderby = "ratingD";
+            if ($orderby == "title ASC") {
+            	$orderby = "titleA";
+            }
+            if ($orderby == "date ASC") {
+            	$orderby = "dateA";
+            }
+            if ($orderby == "hits ASC") {
+            	$orderby = "hitsA";
+            }
+            if ($orderby == "rating ASC") {
+            	$orderby = "ratingA";
+            }
+            if ($orderby == "title DESC") {
+            	$orderby = "titleD";
+            }
+            if ($orderby == "date DESC") {
+            	$orderby = "dateD";
+            }
+            if ($orderby == "hits DESC") {
+            	$orderby = "hitsD";
+            }
+            if ($orderby == "rating DESC") {
+            	$orderby = "ratingD";
+            }
             return $orderby;
 }
 
@@ -92,7 +124,7 @@ 
 	if ($startdate < $time) {
 		if($status==2){
 			$new = "&nbsp;<img src=\"".XOOPS_URL."/modules/$moddir/images/newred.gif\" alt=\""._MD_NEWTHISWEEK."\" />";
-		}elseif($status==3){
+		} elseif($status==3){
 			$new = "&nbsp;<img src=\"".XOOPS_URL."/modules/$moddir/images/update.gif\" alt=\""._MD_UPTHISWEEK."\" />";
 		}
 	}

paypal_includes/global_config.inc.php

Spacing +29 added lines, -29 removed lines

@@ -17,7 +17,7 @@ 
 function create_local_variables() {
 
 	$array_name = array();
-	$variables = array('business','receiver_email', 'receiver_id', 'item_name', 'item_number', 'quantity', 'invoice', 
+	$variables = array('business', 'receiver_email', 'receiver_id', 'item_name', 'item_number', 'quantity', 'invoice', 
 		'custom', 'memo', 'tax', 'option_selection1', 'option_name1', 'option_selection2', 'option_name2', 'num_cart_items',
 		'mc_gross', 'mc_fee', 'mc_currency', 'settle_amount', 'settle_currency', 'exchange_rate', 'payment_gross',
 		'payment_fee', 'payment_status', 'pending_reason', 'reason_code', 'payment_date', 'txn_id', 'txn_type',
@@ -28,9 +28,9 @@ 
 		
 	foreach ($variables as $k => $v) {
 		if (isset($_POST[$v])) {
-			$array_name[$v]="$_POST[$v]";
+			$array_name[$v] = "$_POST[$v]";
 		} else {
-			$array_name[$v]="";
+			$array_name[$v] = "";
 		}
 	}
 	//print_r($array_name);
@@ -40,23 +40,23 @@ 
 
 //post transaction data using curl
 
-function curlPost($url,$data)  {
+function curlPost($url, $data) {
 
 global $paypal, $info;
 
 //build post string
 
-foreach($data as $i=>$v) {
-$postdata.= $i . "=" . urlencode($v) . "&";
+foreach ($data as $i=>$v) {
+$postdata .= $i."=".urlencode($v)."&";
 }
 
-$postdata.="cmd=_notify-validate";
+$postdata .= "cmd=_notify-validate";
 
 //execute curl on the command line
 
 exec("$paypal[curl_location] -d \"$postdata\" $url", $info);
 
-$info=implode(",",$info);
+$info = implode(",", $info);
 
 return $info;
 
@@ -64,31 +64,31 @@ 
 
 //posts transaction data using libCurl
 
-function libCurlPost($url,$data)  {
+function libCurlPost($url, $data) {
 
 //build post string
 
-foreach($data as $i=>$v) {
+foreach ($data as $i=>$v) {
 
-$postdata.= $i . "=" . urlencode($v) . "&";
+$postdata .= $i."=".urlencode($v)."&";
 
 }
 
-$postdata.="cmd=_notify-validate";
+$postdata .= "cmd=_notify-validate";
 
-$ch=curl_init();
+$ch = curl_init();
 
-curl_setopt($ch,CURLOPT_SSL_VERIFYPEER,FALSE);
-curl_setopt($ch,CURLOPT_URL,$url);
-curl_setopt($ch,CURLOPT_POST,1);
-curl_setopt($ch,CURLOPT_POSTFIELDS,$postdata);
+curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
+curl_setopt($ch, CURLOPT_URL, $url);
+curl_setopt($ch, CURLOPT_POST, 1);
+curl_setopt($ch, CURLOPT_POSTFIELDS, $postdata);
 
 //Start ob to prevent curl_exec from displaying stuff.
 ob_start();
 curl_exec($ch);
 
 //Get contents of output buffer
-$info=ob_get_contents();
+$info = ob_get_contents();
 curl_close($ch);
 
 //End ob and erase contents.
@@ -99,27 +99,27 @@ 
 }
 
 //posts transaction data using fsockopen.
-function fsockPost($url,$data) {
+function fsockPost($url, $data) {
 
 //Parse url
-$web=parse_url($url);
+$web = parse_url($url);
 
 $postdata = "";
 //build post string
-foreach($data as $i=>$v) {
-$postdata.= $i . "=" . urlencode($v) . "&";
+foreach ($data as $i=>$v) {
+$postdata .= $i."=".urlencode($v)."&";
 }
 
-$postdata.="cmd=_notify-validate";
+$postdata .= "cmd=_notify-validate";
 
 //Set the port number
-if($web['scheme'] == "https") { $web['port']="443";  $ssl="ssl://"; } else { $web['port']="80"; }
+if ($web['scheme'] == "https") { $web['port'] = "443"; $ssl = "ssl://"; } else { $web['port'] = "80"; }
 
 //Create paypal connection
-$fp=@fsockopen($ssl . $web[host],$web[port],$errnum,$errstr,30);
+$fp = @fsockopen($ssl.$web[host], $web[port], $errnum, $errstr, 30);
 
 //Error checking
-if(!$fp) { echo "$errnum: $errstr"; }
+if (!$fp) { echo "$errnum: $errstr"; }
 
 //Post Data
 else {
@@ -129,16 +129,16 @@ 
   fputs($fp, "Content-type: application/x-www-form-urlencoded\r\n");
   fputs($fp, "Content-length: ".strlen($postdata)."\r\n");
   fputs($fp, "Connection: close\r\n\r\n");
-  fputs($fp, $postdata . "\r\n\r\n");
+  fputs($fp, $postdata."\r\n\r\n");
 
 //loop through the response from the server
-while(!feof($fp)) { $info[]=@fgets($fp, 1024); }
+while (!feof($fp)) { $info[] = @fgets($fp, 1024); }
 
 //close fp - we are done with it
 fclose($fp);
 
 //break up results into a string
-$info=implode(",",$info);
+$info = implode(",", $info);
 
 }
 

paypal_includes/config.inc.php

Spacing +30 added lines, -30 removed lines

@@ -12,7 +12,7 @@ 
  *
  */
  
-$vars = array('item_name','item_number', 'receiver_id', 'item_name', 'item_number', 'on1', 'os1', 
+$vars = array('item_name', 'item_number', 'receiver_id', 'item_name', 'item_number', 'on1', 'os1', 
 		'on0', 'on1', 'tax', 'quantity', 'invoice', 'firstname', 'lastname', 'address1',
 		'address2', 'city', 'state', 'zip', 'email', 'phone1', 'phone2', 'phone3', 'custom', 'amount');
 		 
@@ -22,45 +22,45 @@ 
 		
 foreach ($vars as $k => $v) {
 	if (isset($_POST[$v])) {
-		$paypal[$v]="$_POST[$v]";
+		$paypal[$v] = "$_POST[$v]";
 	} else {
-		$paypal[$v]="";
+		$paypal[$v] = "";
 	}
 }
 
 //Configuration Settings
-$paypal['business']=$xoopsModuleConfig['paypal_business_mail'];
-$paypal['site_url']= "".XOOPS_URL."/modules/".$moddir."/";
-$paypal['image_url']="";
-$paypal['success_url']="ipn.php";
+$paypal['business'] = $xoopsModuleConfig['paypal_business_mail'];
+$paypal['site_url'] = "".XOOPS_URL."/modules/".$moddir."/";
+$paypal['image_url'] = "";
+$paypal['success_url'] = "ipn.php";
 //$paypal[success_url]="php_paypal/ipn/ipn.php";
-$paypal['cancel_url']="ipn.php";
-$paypal['notify_url']="ipn.php";
-$paypal['return_method']="2"; //1=GET 2=POST
-$paypal['currency_code']="EUR"; //[USD,GBP,JPY,CAD,EUR]
-$paypal['lc']="US";
+$paypal['cancel_url'] = "ipn.php";
+$paypal['notify_url'] = "ipn.php";
+$paypal['return_method'] = "2"; //1=GET 2=POST
+$paypal['currency_code'] = "EUR"; //[USD,GBP,JPY,CAD,EUR]
+$paypal['lc'] = "US";
 
-if ( $xoopsModuleConfig['paypal_test'] == '1' ) {
-	$paypal['url']="https://www.sandbox.paypal.com/cgi-bin/webscr";
-} else if ( $xoopsModuleConfig['paypal_secure_yn'] == '0' ) {
-	$paypal[url]="http://www.paypal.com/cgi-bin/webscr";
+if ($xoopsModuleConfig['paypal_test'] == '1') {
+	$paypal['url'] = "https://www.sandbox.paypal.com/cgi-bin/webscr";
+} else if ($xoopsModuleConfig['paypal_secure_yn'] == '0') {
+	$paypal[url] = "http://www.paypal.com/cgi-bin/webscr";
 } else {
-	$paypal[url]="https://www.paypal.com/cgi-bin/webscr";
+	$paypal[url] = "https://www.paypal.com/cgi-bin/webscr";
 }
 
-$paypal['post_method']="fso"; //fso=fsockopen(); curl=curl command line libCurl=php compiled with libCurl support
-$paypal['curl_location']="/usr/local/bin/curl";
+$paypal['post_method'] = "fso"; //fso=fsockopen(); curl=curl command line libCurl=php compiled with libCurl support
+$paypal['curl_location'] = "/usr/local/bin/curl";
 
-$paypal['bn']="toolkit-php";
-$paypal['cmd']="_xclick";
+$paypal['bn'] = "toolkit-php";
+$paypal['cmd'] = "_xclick";
 
 //Payment Page Settings
-$paypal['display_comment']="0"; //0=yes 1=no
-$paypal['comment_header']="Comments";
-$paypal['continue_button_text']="Continue >>";
-$paypal['background_color']=""; //""=white 1=black
-$paypal['display_shipping_address']=""; //""=yes 1=no
-$paypal['display_comment']="1"; //""=yes 1=no
+$paypal['display_comment'] = "0"; //0=yes 1=no
+$paypal['comment_header'] = "Comments";
+$paypal['continue_button_text'] = "Continue >>";
+$paypal['background_color'] = ""; //""=white 1=black
+$paypal['display_shipping_address'] = ""; //""=yes 1=no
+$paypal['display_comment'] = "1"; //""=yes 1=no
 
 
 //Product Settings
@@ -73,14 +73,14 @@ 
 $paypal['on1']="$_POST[on1]";
 $paypal['os1']="$_POST[os1]";
 $paypal['quantity']="$_POST[quantity]"; */
-$paypal['edit_quantity']=""; //1=yes ""=no
+$paypal['edit_quantity'] = ""; //1=yes ""=no
 /* $paypal['invoice']="$_POST[invoice]";
 $paypal['tax']="$_POST[tax]"; */
 
 //Shipping and Taxes
 //$paypal['shipping_amount']="$_POST[shipping_amount]";
-$paypal['shipping_amount_per_item']="";
-$paypal['handling_amount']="";
+$paypal['shipping_amount_per_item'] = "";
+$paypal['handling_amount'] = "";
 /* $paypal['custom']="$_POST[custom]"; */
 
 //Customer Settings

ratelisting.php

Indentation +14 added lines, -14 removed lines

@@ -57,46 +57,46 @@
 
    	// Check if Link POSTER is voting (UNLESS Anonymous users allowed to post)
    	if ($ratinguser != 0) {
-       	$result=$xoopsDB->query("select submitter from ".$xoopsDB->prefix("efqdiralpha1_items")." where itemid=$p_itemid");
-       	while(list($ratinguserDB) = $xoopsDB->fetchRow($result)) {
-       		if ($ratinguserDB == $ratinguser) {
+	   	$result=$xoopsDB->query("select submitter from ".$xoopsDB->prefix("efqdiralpha1_items")." where itemid=$p_itemid");
+	   	while(list($ratinguserDB) = $xoopsDB->fetchRow($result)) {
+	   		if ($ratinguserDB == $ratinguser) {
 				redirect_header("index.php",4,_MD_CANTVOTEOWN);
 				exit();
-          	}
-       	}
+		  	}
+	   	}
 
-    	// Check if REG user is trying to vote twice.
+		// Check if REG user is trying to vote twice.
    		$result=$xoopsDB->query("select ratinguser from ".$xoopsDB->prefix("efqdiralpha1_votedata")." where itemid=$p_itemid");
-       	while(list($ratinguserDB) = $xoopsDB->fetchRow($result)) {
-       		if ($ratinguserDB == $ratinguser) {
+	   	while(list($ratinguserDB) = $xoopsDB->fetchRow($result)) {
+	   		if ($ratinguserDB == $ratinguser) {
 				redirect_header("index.php",4,_MD_VOTEONCE2);
 				exit();
-           	}
-      	}
+		   	}
+	  	}
 
    	} else {
 
    		// Check if ANONYMOUS user is trying to vote more than once per day.
 		$yesterday = (time()-(86400 * $anonwaitdays));
-       	$result=$xoopsDB->query("select count(*) FROM ".$xoopsDB->prefix("efqdiralpha1_votedata")." WHERE itemid=$p_itemid AND ratinguser=0 AND ratinghostname = '$ip' AND ratingtimestamp > $yesterday");
+	   	$result=$xoopsDB->query("select count(*) FROM ".$xoopsDB->prefix("efqdiralpha1_votedata")." WHERE itemid=$p_itemid AND ratinguser=0 AND ratinghostname = '$ip' AND ratingtimestamp > $yesterday");
    		list($anonvotecount) = $xoopsDB->fetchRow($result);
    		if ($anonvotecount > 0) {
 			redirect_header("index.php",4,_MD_VOTEONCE2);
 			exit();
-       	}
+	   	}
    	}
 	if($rating > 10){
 		$rating = 10;
 	}
 
-    //Add to Line Item Rate to DB.
+	//Add to Line Item Rate to DB.
 	$newid = $xoopsDB->genId($xoopsDB->prefix("efqdiralpha1_votedata")."_ratingid_seq");
 	$datetime = time();
 	$sql = sprintf("INSERT INTO %s (ratingid, itemid, ratinguser, rating, ratinghostname, ratingtimestamp) VALUES (%u, %u, %u, %u, '%s', %u)", $xoopsDB->prefix("efqdiralpha1_votedata"), $newid, $p_itemid, $ratinguser, $p_rating, $ip, $datetime);
 	$xoopsDB->query($sql) or $eh->show("0013");
 
 	//Calculate Score & Add to Summary (for quick retrieval & sorting) to DB.
-    updaterating($p_itemid);
+	updaterating($p_itemid);
 	if (!empty($_POST['catid'])) {
 		$p_catid = intval($_POST['catid']);
 	} else {

Spacing +18 added lines, -18 removed lines

@@ -31,14 +31,14 @@ 
 // ------------------------------------------------------------------------- //
 include "header.php";
 include_once XOOPS_ROOT_PATH."/class/module.errorhandler.php";
-$myts =& MyTextSanitizer::getInstance(); // MyTextSanitizer object
+$myts = & MyTextSanitizer::getInstance(); // MyTextSanitizer object
 $moddir = $xoopsModule->getvar("dirname");
 
 if (!empty($_POST['submit'])) {
 	$eh = new ErrorHandler; //ErrorHandler object
-	if(empty($xoopsUser)){
+	if (empty($xoopsUser)) {
 		$ratinguser = 0;
-	}else{
+	} else {
 		$ratinguser = $xoopsUser->getVar('uid');
 	}
 
@@ -50,26 +50,26 @@ 
 	$p_rating = intval($_POST['rating']);
 
    	// Check if Rating is Null
-   	if ($p_rating=="--") {
-		redirect_header("ratelisting.php?catid=".$p_catid."&item=".$itemid."",2,_MD_NORATING);
+   	if ($p_rating == "--") {
+		redirect_header("ratelisting.php?catid=".$p_catid."&item=".$itemid."", 2, _MD_NORATING);
 		exit();
    	}
 
    	// Check if Link POSTER is voting (UNLESS Anonymous users allowed to post)
    	if ($ratinguser != 0) {
-       	$result=$xoopsDB->query("select submitter from ".$xoopsDB->prefix("efqdiralpha1_items")." where itemid=$p_itemid");
-       	while(list($ratinguserDB) = $xoopsDB->fetchRow($result)) {
+       	$result = $xoopsDB->query("select submitter from ".$xoopsDB->prefix("efqdiralpha1_items")." where itemid=$p_itemid");
+       	while (list($ratinguserDB) = $xoopsDB->fetchRow($result)) {
        		if ($ratinguserDB == $ratinguser) {
-				redirect_header("index.php",4,_MD_CANTVOTEOWN);
+				redirect_header("index.php", 4, _MD_CANTVOTEOWN);
 				exit();
           	}
        	}
 
     	// Check if REG user is trying to vote twice.
-   		$result=$xoopsDB->query("select ratinguser from ".$xoopsDB->prefix("efqdiralpha1_votedata")." where itemid=$p_itemid");
-       	while(list($ratinguserDB) = $xoopsDB->fetchRow($result)) {
+   		$result = $xoopsDB->query("select ratinguser from ".$xoopsDB->prefix("efqdiralpha1_votedata")." where itemid=$p_itemid");
+       	while (list($ratinguserDB) = $xoopsDB->fetchRow($result)) {
        		if ($ratinguserDB == $ratinguser) {
-				redirect_header("index.php",4,_MD_VOTEONCE2);
+				redirect_header("index.php", 4, _MD_VOTEONCE2);
 				exit();
            	}
       	}
@@ -77,15 +77,15 @@ 
    	} else {
 
    		// Check if ANONYMOUS user is trying to vote more than once per day.
-		$yesterday = (time()-(86400 * $anonwaitdays));
-       	$result=$xoopsDB->query("select count(*) FROM ".$xoopsDB->prefix("efqdiralpha1_votedata")." WHERE itemid=$p_itemid AND ratinguser=0 AND ratinghostname = '$ip' AND ratingtimestamp > $yesterday");
+		$yesterday = (time() - (86400 * $anonwaitdays));
+       	$result = $xoopsDB->query("select count(*) FROM ".$xoopsDB->prefix("efqdiralpha1_votedata")." WHERE itemid=$p_itemid AND ratinguser=0 AND ratinghostname = '$ip' AND ratingtimestamp > $yesterday");
    		list($anonvotecount) = $xoopsDB->fetchRow($result);
    		if ($anonvotecount > 0) {
-			redirect_header("index.php",4,_MD_VOTEONCE2);
+			redirect_header("index.php", 4, _MD_VOTEONCE2);
 			exit();
        	}
    	}
-	if($rating > 10){
+	if ($rating > 10) {
 		$rating = 10;
 	}
 
@@ -112,8 +112,8 @@ 
 	} else {
 		$dirid = $p_dirid;
 	}
-	$ratemessage = _MD_VOTEAPPRE."<br />".sprintf(_MD_THANKURATE,$xoopsConfig['sitename']);
-	redirect_header("index.php?dirid=".$dirid."",2,$ratemessage);
+	$ratemessage = _MD_VOTEAPPRE."<br />".sprintf(_MD_THANKURATE, $xoopsConfig['sitename']);
+	redirect_header("index.php?dirid=".$dirid."", 2, $ratemessage);
 	exit();
 
 } else {
@@ -131,7 +131,7 @@ 
 		$get_catid = '0';
 	}
 	
-	$result=$xoopsDB->query("select title from ".$xoopsDB->prefix("efqdiralpha1_listings")." where itemid=$get_itemid");
+	$result = $xoopsDB->query("select title from ".$xoopsDB->prefix("efqdiralpha1_listings")." where itemid=$get_itemid");
 	list($title) = $xoopsDB->fetchRow($result);
 	$xoopsTpl->assign('listing', array('itemid' => $get_itemid, 'catid' => $get_catid, 'title' => $myts->htmlSpecialChars($title)));
 	$xoopsTpl->assign('moddir', $moddir);

Braces +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 	$eh = new ErrorHandler; //ErrorHandler object
 	if(empty($xoopsUser)){
 		$ratinguser = 0;
-	}else{
+	} else{
 		$ratinguser = $xoopsUser->getVar('uid');
 	}
 

addcoupon.php

Indentation +62 added lines, -62 removed lines

@@ -62,7 +62,7 @@ 
 
 if ((empty($xoopsUser)) || !$xoopsUser->isAdmin($xoopsModule->mid()) || ($itemid == 0 && empty($_POST['delete']))) {
 	redirect_header('index.php', 3, _NOPERM);
-    exit();
+	exit();
 }
 
 
@@ -73,40 +73,40 @@ 
 	$lbr = 0;
 }
 if ($couponid > 0) {
-    $coupon = new efqCouponHandler();
-    $coupon->get($couponid);
-    //$couponid = $coupon->couponid;
-    $myts =& MyTextSanitizer::getInstance();
-    $lbr = $coupon->lbr;
-    $description = $coupon->descr;
-    $image = $coupon->image;
-    $heading = $coupon->heading;
-    $publish = $coupon->publish > 0 ? $coupon->publish : time();
-    $expire = $coupon->expire;    
-    $dohtml = 1;
-    $dobr = $lbr;
-    if ($expire > 0) {
-        $setexpire = 1;
-    }
-    else {
-        $setexpire = 0;
-        $expire = time() + 3600 * 24 * 7;
-    }
+	$coupon = new efqCouponHandler();
+	$coupon->get($couponid);
+	//$couponid = $coupon->couponid;
+	$myts =& MyTextSanitizer::getInstance();
+	$lbr = $coupon->lbr;
+	$description = $coupon->descr;
+	$image = $coupon->image;
+	$heading = $coupon->heading;
+	$publish = $coupon->publish > 0 ? $coupon->publish : time();
+	$expire = $coupon->expire;    
+	$dohtml = 1;
+	$dobr = $lbr;
+	if ($expire > 0) {
+		$setexpire = 1;
+	}
+	else {
+		$setexpire = 0;
+		$expire = time() + 3600 * 24 * 7;
+	}
 } else {
-    $itemid = isset($_POST['itemid']) ? intval($_POST['itemid']) : (isset($_GET['item']) ? intval($_GET['item']) : 0);
-    $couponid = isset($_POST['couponid']) ? intval($_POST['couponid']) : null;
-    $description = isset($_POST['description']) ? $_POST['description'] : "";
-    $publish = isset($_POST['publish']) ? $_POST['publish'] : 0;
-    $image = isset($_POST['image']) ? $_POST['image'] : "";
+	$itemid = isset($_POST['itemid']) ? intval($_POST['itemid']) : (isset($_GET['item']) ? intval($_GET['item']) : 0);
+	$couponid = isset($_POST['couponid']) ? intval($_POST['couponid']) : null;
+	$description = isset($_POST['description']) ? $_POST['description'] : "";
+	$publish = isset($_POST['publish']) ? $_POST['publish'] : 0;
+	$image = isset($_POST['image']) ? $_POST['image'] : "";
 	$expire = isset($_POST['expire']) ? $_POST['expire'] : 0;
-    $heading = isset($_POST['heading']) ? $_POST['heading'] : "";
-    if ($expire > 0) {
-        $setexpire = 1;
-    }
-    else {
-        $setexpire = 0;
-        $expire = time() + 3600 * 24 * 7;
-    }
+	$heading = isset($_POST['heading']) ? $_POST['heading'] : "";
+	if ($expire > 0) {
+		$setexpire = 1;
+	}
+	else {
+		$setexpire = 0;
+		$expire = time() + 3600 * 24 * 7;
+	}
     
 }
 
@@ -115,37 +115,37 @@ 
 if (!empty($_POST['submit'])) {
 	$coupon = new efqCouponHandler();
 	if (isset($_POST['couponid'])) {
-        $couponid = intval($_POST['couponid']);
-        $message = _MD_COUPONEDITED;
-    } else {
-        $coupon->_new = true;
-        $message = _MD_COUPONADDED;
-    }	  
-    if (!$coupon->create()) {
-    	$coupon->message = _MD_ERR_ADDCOUPON;
-    }      
-    redirect_header('listing.php?item='.$itemid, 2, $coupon->message);
-    exit();
+		$couponid = intval($_POST['couponid']);
+		$message = _MD_COUPONEDITED;
+	} else {
+		$coupon->_new = true;
+		$message = _MD_COUPONADDED;
+	}	  
+	if (!$coupon->create()) {
+		$coupon->message = _MD_ERR_ADDCOUPON;
+	}      
+	redirect_header('listing.php?item='.$itemid, 2, $coupon->message);
+	exit();
 
 } elseif (!empty($_POST['delete'])) {
-    if ( !empty($_POST['ok']) ) {
-        if (empty($_POST['couponid'])) {
-            redirect_header('index.php',2,_MD_ERR_COUPONIDMISSING);
-            exit();
-        }
-        $coupon = new efqCouponHandler();
-        $couponid = intval($_POST['couponid']);
-        if ($coupon->delete($couponid)) {
-            redirect_header("listing.php?item=".$itemid,2,_MD_COUPONDELETED);
-            exit();
-        }
-    }
-    else {
-        include XOOPS_ROOT_PATH.'/header.php';
-        xoops_confirm(array('delete' => 'yes', 'couponid' => $couponid, 'ok' => 1), 'addcoupon.php?item='.$itemid.'', _MD_COUPONRUSURE);
-        include_once XOOPS_ROOT_PATH.'/footer.php';
-        exit();
-    }
+	if ( !empty($_POST['ok']) ) {
+		if (empty($_POST['couponid'])) {
+			redirect_header('index.php',2,_MD_ERR_COUPONIDMISSING);
+			exit();
+		}
+		$coupon = new efqCouponHandler();
+		$couponid = intval($_POST['couponid']);
+		if ($coupon->delete($couponid)) {
+			redirect_header("listing.php?item=".$itemid,2,_MD_COUPONDELETED);
+			exit();
+		}
+	}
+	else {
+		include XOOPS_ROOT_PATH.'/header.php';
+		xoops_confirm(array('delete' => 'yes', 'couponid' => $couponid, 'ok' => 1), 'addcoupon.php?item='.$itemid.'', _MD_COUPONRUSURE);
+		include_once XOOPS_ROOT_PATH.'/footer.php';
+		exit();
+	}
 }
 include XOOPS_ROOT_PATH.'/header.php';
 include 'include/couponform.php';

Spacing +6 added lines, -6 removed lines

@@ -36,7 +36,7 @@ 
  */
 
 include "header.php";
-$myts =& MyTextSanitizer::getInstance(); // MyTextSanitizer object
+$myts = & MyTextSanitizer::getInstance(); // MyTextSanitizer object
 include_once XOOPS_ROOT_PATH."/class/xoopstree.php";
 include_once XOOPS_ROOT_PATH."/class/module.errorhandler.php";
 include_once XOOPS_ROOT_PATH."/include/xoopscodes.php";
@@ -48,7 +48,7 @@ 
 $eh = new ErrorHandler; //ErrorHandler object
 
 $moddir = $xoopsModule->getvar("dirname");
-$mytree = new XoopsTree($xoopsDB->prefix("efqdiralpha1_cat"),"cid","pid");
+$mytree = new XoopsTree($xoopsDB->prefix("efqdiralpha1_cat"), "cid", "pid");
 
 //$moddir = $xoopsModule->getvar("dirname");
 $couponid = isset($_GET['couponid']) ? intval($_GET['couponid']) : 0;
@@ -76,7 +76,7 @@ 
     $coupon = new efqCouponHandler();
     $coupon->get($couponid);
     //$couponid = $coupon->couponid;
-    $myts =& MyTextSanitizer::getInstance();
+    $myts = & MyTextSanitizer::getInstance();
     $lbr = $coupon->lbr;
     $description = $coupon->descr;
     $image = $coupon->image;
@@ -128,15 +128,15 @@ 
     exit();
 
 } elseif (!empty($_POST['delete'])) {
-    if ( !empty($_POST['ok']) ) {
+    if (!empty($_POST['ok'])) {
         if (empty($_POST['couponid'])) {
-            redirect_header('index.php',2,_MD_ERR_COUPONIDMISSING);
+            redirect_header('index.php', 2, _MD_ERR_COUPONIDMISSING);
             exit();
         }
         $coupon = new efqCouponHandler();
         $couponid = intval($_POST['couponid']);
         if ($coupon->delete($couponid)) {
-            redirect_header("listing.php?item=".$itemid,2,_MD_COUPONDELETED);
+            redirect_header("listing.php?item=".$itemid, 2, _MD_COUPONDELETED);
             exit();
         }
     }

Braces +3 added lines, -6 removed lines

@@ -87,8 +87,7 @@ 
     $dobr = $lbr;
     if ($expire > 0) {
         $setexpire = 1;
-    }
-    else {
+    } else {
         $setexpire = 0;
         $expire = time() + 3600 * 24 * 7;
     }
@@ -102,8 +101,7 @@ 
     $heading = isset($_POST['heading']) ? $_POST['heading'] : "";
     if ($expire > 0) {
         $setexpire = 1;
-    }
-    else {
+    } else {
         $setexpire = 0;
         $expire = time() + 3600 * 24 * 7;
     }
@@ -139,8 +137,7 @@ 
             redirect_header("listing.php?item=".$itemid,2,_MD_COUPONDELETED);
             exit();
         }
-    }
-    else {
+    } else {
         include XOOPS_ROOT_PATH.'/header.php';
         xoops_confirm(array('delete' => 'yes', 'couponid' => $couponid, 'ok' => 1), 'addcoupon.php?item='.$itemid.'', _MD_COUPONRUSURE);
         include_once XOOPS_ROOT_PATH.'/footer.php';

subscriptions.php

Indentation +2 added lines, -2 removed lines

@@ -42,9 +42,9 @@
 $subscription = new efqSubscription();
 
 if (isset($_GET['op'])) {
-    $op =  $_GET['op'];
+	$op =  $_GET['op'];
 } else if (isset($_POST['op'])) {
-    $op =  $_POST['op'];
+	$op =  $_POST['op'];
 } else {
 	$op = '';
 }

Spacing +31 added lines, -31 removed lines

@@ -30,7 +30,7 @@ 
 //	Based upon the mylinks and the mxDirectory modules						 //
 // ------------------------------------------------------------------------- //
 include 'header.php';
-$myts =& MyTextSanitizer::getInstance();// MyTextSanitizer object
+$myts = & MyTextSanitizer::getInstance(); // MyTextSanitizer object
 include_once XOOPS_ROOT_PATH.'/class/xoopstree.php';
 include_once XOOPS_ROOT_PATH.'/class/module.errorhandler.php';
 include_once XOOPS_ROOT_PATH.'/include/xoopscodes.php';
@@ -42,9 +42,9 @@ 
 $subscription = new efqSubscription();
 
 if (isset($_GET['op'])) {
-    $op =  $_GET['op'];
+    $op = $_GET['op'];
 } else if (isset($_POST['op'])) {
-    $op =  $_POST['op'];
+    $op = $_POST['op'];
 } else {
 	$op = '';
 }
@@ -69,7 +69,7 @@ 
 	$editrights = '1';
 } else {
 	$editrights = '0';
-	redirect_header("listing.php?itemid=$get_itemid",2,_MD_EDITRIGHTS);
+	redirect_header("listing.php?itemid=$get_itemid", 2, _MD_EDITRIGHTS);
 	exit();
 }
 		
@@ -77,8 +77,8 @@ 
 {
 	global $xoopsDB, $eh, $myts, $moddir, $get_itemid, $owner, $xoopsOption, $xoopsTpl, $subscription, $xoopsUser;
 	//Check if item selected.
-	if ( $get_itemid == '0' ) {
-		redirect_header("index.php",2,_MD_NOVALIDITEM);
+	if ($get_itemid == '0') {
+		redirect_header("index.php", 2, _MD_NOVALIDITEM);
 		exit();
 	}
 	
@@ -92,27 +92,27 @@ 
 	$order_exists = false;
 	if ($numrows > 0) {
 		$xoopsTpl->assign('order_table', true);
-		while(list($title, $typeid, $orderid, $offerid, $startdate, $enddate, $billto, $orderstatus, $itemid, $autorenew, $typename, $ref, $paymentstatus) = $xoopsDB->fetchRow($item_result)) {
+		while (list($title, $typeid, $orderid, $offerid, $startdate, $enddate, $billto, $orderstatus, $itemid, $autorenew, $typename, $ref, $paymentstatus) = $xoopsDB->fetchRow($item_result)) {
 			//Assign the text of the label for subscription type.
 			$ordername = $subscription->getOrderItemName($offerid);
 			
-			if ( $paymentstatus == '' ) {
+			if ($paymentstatus == '') {
 				$paymentstatus = _MD_LANG_INCOMPLETE;
 				$terminate_on = '1';
 			} else {
 				$terminate_on = null;
 				$order_exists = true;
 			}
-			if ( $orderstatus == '1' ) {
+			if ($orderstatus == '1') {
 				$defaultstartdate = $billto;
 			}
-			if ( $billto != '' ) {
+			if ($billto != '') {
 				$billto = date('d-M-Y', $billto);
 			}
-			if ( $enddate != '' ) {
+			if ($enddate != '') {
 				$enddate = date('d-M-Y', $enddate);
 			} 
-			if ( $startdate != '' ) {
+			if ($startdate != '') {
 				$startdate = date('d-M-Y', $startdate);
 			}  
 			$xoopsTpl->assign('lang_subscr_offers_header', _MD_LANG_SUBSCR_ACTIVE_ORDERS_HEADER);
@@ -150,7 +150,7 @@ 
 		$form->addElement($itemtype_select, true);
 		//TO DO: Add Auto Renew functionality
 		//$form->addElement(new XoopsFormRadioYN(_MD_AUTORENEWYN, 'autorenewal', '1'),true);
-		$form->addElement(new XoopsFormTextDateSelect(_MD_SELECT_STARTDATE, 'startdate', 15, $defaultstartdate),true);
+		$form->addElement(new XoopsFormTextDateSelect(_MD_SELECT_STARTDATE, 'startdate', 15, $defaultstartdate), true);
 		$form->addElement(new XoopsFormButton('', 'submit', _MD_CONTINUE, 'submit'));
 		$form->addElement(new XoopsFormHidden("op", "orderselect"));
 		$form->addElement(new XoopsFormHidden("uid", $xoopsUser->getVar('uid')));
@@ -165,20 +165,20 @@ 
 function orderselect() {
 	//function to update subscription by creating an order or updating an order.
 	global $xoopsDB, $eh, $myts, $moddir, $get_itemid, $owner, $xoopsOption, $xoopsTpl, $subscription, $xoopsUser;
-	if ( $get_itemid == '0' ) {
-		redirect_header("index.php",2,_MD_NOVALIDITEM);
+	if ($get_itemid == '0') {
+		redirect_header("index.php", 2, _MD_NOVALIDITEM);
 		exit();
 	}
 	$orderid = $subscription->createOrder($get_itemid);
-	if ( $orderid == false ) {
-		redirect_header("subscriptions.php?item=$get_itemid",2,_MD_SUBSCR_TYPE_NOTSELECTED);
+	if ($orderid == false) {
+		redirect_header("subscriptions.php?item=$get_itemid", 2, _MD_SUBSCR_TYPE_NOTSELECTED);
 		exit();	
 	}
-	if ( $orderid != 0 ) {
-		redirect_header("subscriptions.php?item=$get_itemid&op=orderpayment&orderid=$orderid",2,_MD_SAVED);
+	if ($orderid != 0) {
+		redirect_header("subscriptions.php?item=$get_itemid&op=orderpayment&orderid=$orderid", 2, _MD_SAVED);
 		exit();	
 	} else {
-		redirect_header("subscriptions.php?item=$get_itemid",2,_MD_ITEM_NOT_EXIST);
+		redirect_header("subscriptions.php?item=$get_itemid", 2, _MD_ITEM_NOT_EXIST);
 		exit();
 	}
 }
@@ -193,14 +193,14 @@ 
 	if (!empty($_GET['orderid'])) {
 		$get_orderid = intval($_GET['orderid']);
 	} else {
-		redirect_header("index.php",2,_MD_NOVALIDITEM);
+		redirect_header("index.php", 2, _MD_NOVALIDITEM);
 		exit();
 	}
 	$sql = "SELECT o.orderid, o.uid, o.offerid, o.typeid, o.startdate, o.billto, o.status, o.itemid, o.autorenew, f.price, f.currency FROM ".$xoopsDB->prefix("efqdiralpha1_subscr_orders")." o, ".$xoopsDB->prefix("efqdiralpha1_subscr_offers")." f WHERE o.offerid=f.offerid AND o.orderid=".$get_orderid."";
 	$order_result = $xoopsDB->query($sql) or $eh->show("0013");
 	$numrows = $xoopsDB->getRowsNum($order_result);
 	if ($numrows > 0) {
-		while(list($orderid, $uid, $offerid, $typeid, $startdate, $billto, $status, $itemid, $autorenew, $price, $currency) = $xoopsDB->fetchRow($order_result)) {
+		while (list($orderid, $uid, $offerid, $typeid, $startdate, $billto, $status, $itemid, $autorenew, $price, $currency) = $xoopsDB->fetchRow($order_result)) {
 			ob_start();
 				$itemname = $subscription->getOrderItemName($offerid);
 				$form = new XoopsThemeForm(_MD_ORDER_PAYMENT_FORM, 'orderpaymentform', 'process.php');
@@ -241,7 +241,7 @@ 
 		$xoopsTpl->assign('moddir', $moddir);
 	} else {
 		//Else this item cannot be found in the database.
-		redirect_header("listing.php?itemid=$get_itemid",2,_MD_ITEM_NOT_EXIST);
+		redirect_header("listing.php?itemid=$get_itemid", 2, _MD_ITEM_NOT_EXIST);
 		exit();		
 	}
 }
@@ -252,7 +252,7 @@ 
 	if (!empty($_GET['order'])) {
 		$get_orderid = intval($_GET['order']);
 	} else {
-		redirect_header("subscriptions.php?item=$get_itemid",2,_MD_NOVALIDORDER);
+		redirect_header("subscriptions.php?item=$get_itemid", 2, _MD_NOVALIDORDER);
 		exit();
 	}
 	if ($editrights == '1') {
@@ -263,7 +263,7 @@ 
 		$form->addElement(new XoopsFormHidden("orderid", $get_orderid));
 		$form->display();
 	} else {
-		redirect_header("subscriptions.php?itemid=$get_itemid",2,_MD_NORIGHTS);
+		redirect_header("subscriptions.php?itemid=$get_itemid", 2, _MD_NORIGHTS);
 		exit();
 	}
 	
@@ -272,14 +272,14 @@ 
 function terminate_confirm()
 {
 	global $subscription, $get_itemid;
-	if ( isset( $_POST['orderid'] )) {
+	if (isset($_POST['orderid'])) {
 		$post_orderid = intval($_POST['orderid']);
 		if ($subscription->delete($post_orderid)) {
-			redirect_header("subscriptions.php?item=$get_itemid",2,_MD_ORDER_DELETED);
+			redirect_header("subscriptions.php?item=$get_itemid", 2, _MD_ORDER_DELETED);
 			exit();
 		}
 	} else {
-		redirect_header("subscriptions.php?item=$get_itemid",2,_MD_NOVALIDORDER);
+		redirect_header("subscriptions.php?item=$get_itemid", 2, _MD_NOVALIDORDER);
 		exit();
 	}
 }
@@ -290,16 +290,16 @@ 
 	if (!empty($_GET['order'])) {
 		$get_orderid = intval($_GET['order']);
 	} else {
-		redirect_header("index.php",2,_MD_NOVALIDITEM);
+		redirect_header("index.php", 2, _MD_NOVALIDITEM);
 		exit();
 	}
 	if ($editrights == '1') {
-		redirect_header("subscriptions.php?item=$get_itemid&op=orderpayment&orderid=$get_orderid",2,_MD_FORWARDED_PAYMENT_PAGE);
+		redirect_header("subscriptions.php?item=$get_itemid&op=orderpayment&orderid=$get_orderid", 2, _MD_FORWARDED_PAYMENT_PAGE);
 		exit();	
 	}
 }
 
-switch($op) {
+switch ($op) {
 case "upgrade":
 	upgrade();
 	break;