XoopsModules25x / efqdirectory

addcoupon.php

Indentation +68 added lines, -68 removed lines

@@ -41,90 +41,90 @@
 //$moddir = $xoopsModule->getvar("dirname");
 $couponid = isset($_GET['couponid']) ? (int)$_GET['couponid'] : 0;
 if (isset($_POST['itemid'])) {
-    $itemid = (int)$_POST['itemid'];
+	$itemid = (int)$_POST['itemid'];
 } elseif (isset($_GET['item'])) {
-    $itemid = (int)$_GET['item'];
+	$itemid = (int)$_GET['item'];
 } else {
-    $itemid = 0;
+	$itemid = 0;
 }
 
 if (empty($xoopsUser) || !$xoopsUser->isAdmin($xoopsModule->mid()) || ($itemid == 0 && empty($_POST['delete']))) {
-    redirect_header('index.php', 3, _NOPERM);
-    exit();
+	redirect_header('index.php', 3, _NOPERM);
+	exit();
 }
 
 if (isset($_POST['lbr'])) {
-    $lbr = (int)$_POST['lbr'];
+	$lbr = (int)$_POST['lbr'];
 } else {
-    $lbr = 0;
+	$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']) ? (int)$_POST['itemid'] : (isset($_GET['item']) ? (int)$_GET['item'] : 0);
-    $couponid    = isset($_POST['couponid']) ? (int)$_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;
-    }
+	$itemid      = isset($_POST['itemid']) ? (int)$_POST['itemid'] : (isset($_GET['item']) ? (int)$_GET['item'] : 0);
+	$couponid    = isset($_POST['couponid']) ? (int)$_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;
+	}
 }
 
 if (!empty($_POST['submit'])) {
-    $coupon = new efqCouponHandler();
-    if (isset($_POST['couponid'])) {
-        $couponid = (int)$_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();
+	$coupon = new efqCouponHandler();
+	if (isset($_POST['couponid'])) {
+		$couponid = (int)$_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 = (int)$_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);
-        require_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 = (int)$_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);
+		require_once XOOPS_ROOT_PATH . '/footer.php';
+		exit();
+	}
 }
 include XOOPS_ROOT_PATH . '/header.php';
 include __DIR__ . '/include/couponform.php';

Spacing +25 added lines, -25 removed lines

@@ -23,27 +23,27 @@ 
 * Accessible to listing owners and administrators only.
 */
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 $myts = MyTextSanitizer::getInstance(); // MyTextSanitizer object
-require_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
-require_once XOOPS_ROOT_PATH . '/class/module.errorhandler.php';
-require_once XOOPS_ROOT_PATH . '/include/xoopscodes.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-require_once __DIR__ . '/class/class.formimage.php';
-require_once __DIR__ . '/class/class.image.php';
-require_once __DIR__ . '/class/class.couponhandler.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopstree.php';
+require_once XOOPS_ROOT_PATH.'/class/module.errorhandler.php';
+require_once XOOPS_ROOT_PATH.'/include/xoopscodes.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
+require_once __DIR__.'/class/class.formimage.php';
+require_once __DIR__.'/class/class.image.php';
+require_once __DIR__.'/class/class.couponhandler.php';
 
 $eh = new ErrorHandler; //ErrorHandler object
 
 $moddir = $xoopsModule->getVar('dirname');
-$mytree = new XoopsTree($xoopsDB->prefix($module->getVar('dirname', 'n') . '_cat'), 'cid', 'pid');
+$mytree = new XoopsTree($xoopsDB->prefix($module->getVar('dirname', 'n').'_cat'), 'cid', 'pid');
 
 //$moddir = $xoopsModule->getvar("dirname");
-$couponid = isset($_GET['couponid']) ? (int)$_GET['couponid'] : 0;
+$couponid = isset($_GET['couponid']) ? (int) $_GET['couponid'] : 0;
 if (isset($_POST['itemid'])) {
-    $itemid = (int)$_POST['itemid'];
+    $itemid = (int) $_POST['itemid'];
 } elseif (isset($_GET['item'])) {
-    $itemid = (int)$_GET['item'];
+    $itemid = (int) $_GET['item'];
 } else {
     $itemid = 0;
 }
@@ -54,7 +54,7 @@ 
 }
 
 if (isset($_POST['lbr'])) {
-    $lbr = (int)$_POST['lbr'];
+    $lbr = (int) $_POST['lbr'];
 } else {
     $lbr = 0;
 }
@@ -78,8 +78,8 @@ 
         $expire    = time() + 3600 * 24 * 7;
     }
 } else {
-    $itemid      = isset($_POST['itemid']) ? (int)$_POST['itemid'] : (isset($_GET['item']) ? (int)$_GET['item'] : 0);
-    $couponid    = isset($_POST['couponid']) ? (int)$_POST['couponid'] : null;
+    $itemid      = isset($_POST['itemid']) ? (int) $_POST['itemid'] : (isset($_GET['item']) ? (int) $_GET['item'] : 0);
+    $couponid    = isset($_POST['couponid']) ? (int) $_POST['couponid'] : null;
     $description = isset($_POST['description']) ? $_POST['description'] : '';
     $publish     = isset($_POST['publish']) ? $_POST['publish'] : 0;
     $image       = isset($_POST['image']) ? $_POST['image'] : '';
@@ -96,7 +96,7 @@ 
 if (!empty($_POST['submit'])) {
     $coupon = new efqCouponHandler();
     if (isset($_POST['couponid'])) {
-        $couponid = (int)$_POST['couponid'];
+        $couponid = (int) $_POST['couponid'];
         $message  = _MD_COUPONEDITED;
     } else {
         $coupon->_new = true;
@@ -105,7 +105,7 @@ 
     if (!$coupon->create()) {
         $coupon->message = _MD_ERR_ADDCOUPON;
     }
-    redirect_header('listing.php?item=' . $itemid, 2, $coupon->message);
+    redirect_header('listing.php?item='.$itemid, 2, $coupon->message);
     exit();
 } elseif (!empty($_POST['delete'])) {
     if (!empty($_POST['ok'])) {
@@ -114,18 +114,18 @@ 
             exit();
         }
         $coupon   = new efqCouponHandler();
-        $couponid = (int)$_POST['couponid'];
+        $couponid = (int) $_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();
         }
     } else {
-        include XOOPS_ROOT_PATH . '/header.php';
-        xoops_confirm(array('delete' => 'yes', 'couponid' => $couponid, 'ok' => 1), 'addcoupon.php?item=' . $itemid . '', _MD_COUPONRUSURE);
-        require_once XOOPS_ROOT_PATH . '/footer.php';
+        include XOOPS_ROOT_PATH.'/header.php';
+        xoops_confirm(array('delete' => 'yes', 'couponid' => $couponid, 'ok' => 1), 'addcoupon.php?item='.$itemid.'', _MD_COUPONRUSURE);
+        require_once XOOPS_ROOT_PATH.'/footer.php';
         exit();
     }
 }
-include XOOPS_ROOT_PATH . '/header.php';
-include __DIR__ . '/include/couponform.php';
-require_once XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/header.php';
+include __DIR__.'/include/couponform.php';
+require_once XOOPS_ROOT_PATH.'/footer.php';

xoops_version.php

Indentation +33 added lines, -33 removed lines

@@ -50,35 +50,35 @@ 
 
 // Tables created by sql file (without prefix!)
 $modversion['tables'] = array(
-    $moduleDirName . '_' . 'cat',
-    $moduleDirName . '_' . 'cat_txt',
-    $moduleDirName . '_' . 'data',
-    $moduleDirName . '_' . 'dir',
-    $moduleDirName . '_' . 'item_x_cat',
-    $moduleDirName . '_' . 'item_x_loc',
-    $moduleDirName . '_' . 'items',
-    $moduleDirName . '_' . 'item_text',
-    $moduleDirName . '_' . 'item_img',
-    $moduleDirName . '_' . 'itemtypes',
-    $moduleDirName . '_' . 'fieldtypes',
-    $moduleDirName . '_' . 'dtypes',
-    $moduleDirName . '_' . 'dtypes_x_cat',
-    $moduleDirName . '_' . 'coupon',
-    $moduleDirName . '_' . 'loc',//In case not used in combo with destinations mod.
-    $moduleDirName . '_' . 'loc_types',//In case not used in combo with destinations mod.
-    $moduleDirName . '_' . 'loc_x_loctype',//In case not used in combo with destinations mod.
-    $moduleDirName . '_' . 'votedata',
-    //$moduleDirName . '_' . = "loc_x_address_types",
-    $moduleDirName . '_' . 'form_options',
-    $moduleDirName . '_' . 'address_types',
-    $moduleDirName . '_' . 'searchresults',
-    $moduleDirName . '_' . 'subscr_offers',
-    $moduleDirName . '_' . 'subscr_orders',
-    $moduleDirName . '_' . 'subscr_payments',
-    $moduleDirName . '_' . 'subscr_scheduler',
-    $moduleDirName . '_' . 'subscr_notify',
-    $moduleDirName . '_' . 'cat_tpl',
-    $moduleDirName . '_' . 'tpl',
+	$moduleDirName . '_' . 'cat',
+	$moduleDirName . '_' . 'cat_txt',
+	$moduleDirName . '_' . 'data',
+	$moduleDirName . '_' . 'dir',
+	$moduleDirName . '_' . 'item_x_cat',
+	$moduleDirName . '_' . 'item_x_loc',
+	$moduleDirName . '_' . 'items',
+	$moduleDirName . '_' . 'item_text',
+	$moduleDirName . '_' . 'item_img',
+	$moduleDirName . '_' . 'itemtypes',
+	$moduleDirName . '_' . 'fieldtypes',
+	$moduleDirName . '_' . 'dtypes',
+	$moduleDirName . '_' . 'dtypes_x_cat',
+	$moduleDirName . '_' . 'coupon',
+	$moduleDirName . '_' . 'loc',//In case not used in combo with destinations mod.
+	$moduleDirName . '_' . 'loc_types',//In case not used in combo with destinations mod.
+	$moduleDirName . '_' . 'loc_x_loctype',//In case not used in combo with destinations mod.
+	$moduleDirName . '_' . 'votedata',
+	//$moduleDirName . '_' . = "loc_x_address_types",
+	$moduleDirName . '_' . 'form_options',
+	$moduleDirName . '_' . 'address_types',
+	$moduleDirName . '_' . 'searchresults',
+	$moduleDirName . '_' . 'subscr_offers',
+	$moduleDirName . '_' . 'subscr_orders',
+	$moduleDirName . '_' . 'subscr_payments',
+	$moduleDirName . '_' . 'subscr_scheduler',
+	$moduleDirName . '_' . 'subscr_notify',
+	$moduleDirName . '_' . 'cat_tpl',
+	$moduleDirName . '_' . 'tpl',
 );
 
 // Admin things
@@ -89,10 +89,10 @@ 
 
 // ------------------- Help files ------------------- //
 $modversion['helpsection'] = array(
-    ['name' => _MI_EFQDIR_OVERVIEW, 'link' => 'page=help'],
-    ['name' => _MI_EFQDIR_DISCLAIMER, 'link' => 'page=disclaimer'],
-    ['name' => _MI_EFQDIR_LICENSE, 'link' => 'page=license'],
-    ['name' => _MI_EFQDIR_SUPPORT, 'link' => 'page=support'],
+	['name' => _MI_EFQDIR_OVERVIEW, 'link' => 'page=help'],
+	['name' => _MI_EFQDIR_DISCLAIMER, 'link' => 'page=disclaimer'],
+	['name' => _MI_EFQDIR_LICENSE, 'link' => 'page=license'],
+	['name' => _MI_EFQDIR_SUPPORT, 'link' => 'page=support'],
 );
 
 // Blocks

Spacing +28 added lines, -28 removed lines

@@ -50,35 +50,35 @@
 
 // Tables created by sql file (without prefix!)
 $modversion['tables'] = array(
-    $moduleDirName . '_' . 'cat',
-    $moduleDirName . '_' . 'cat_txt',
-    $moduleDirName . '_' . 'data',
-    $moduleDirName . '_' . 'dir',
-    $moduleDirName . '_' . 'item_x_cat',
-    $moduleDirName . '_' . 'item_x_loc',
-    $moduleDirName . '_' . 'items',
-    $moduleDirName . '_' . 'item_text',
-    $moduleDirName . '_' . 'item_img',
-    $moduleDirName . '_' . 'itemtypes',
-    $moduleDirName . '_' . 'fieldtypes',
-    $moduleDirName . '_' . 'dtypes',
-    $moduleDirName . '_' . 'dtypes_x_cat',
-    $moduleDirName . '_' . 'coupon',
-    $moduleDirName . '_' . 'loc',//In case not used in combo with destinations mod.
-    $moduleDirName . '_' . 'loc_types',//In case not used in combo with destinations mod.
-    $moduleDirName . '_' . 'loc_x_loctype',//In case not used in combo with destinations mod.
-    $moduleDirName . '_' . 'votedata',
+    $moduleDirName.'_'.'cat',
+    $moduleDirName.'_'.'cat_txt',
+    $moduleDirName.'_'.'data',
+    $moduleDirName.'_'.'dir',
+    $moduleDirName.'_'.'item_x_cat',
+    $moduleDirName.'_'.'item_x_loc',
+    $moduleDirName.'_'.'items',
+    $moduleDirName.'_'.'item_text',
+    $moduleDirName.'_'.'item_img',
+    $moduleDirName.'_'.'itemtypes',
+    $moduleDirName.'_'.'fieldtypes',
+    $moduleDirName.'_'.'dtypes',
+    $moduleDirName.'_'.'dtypes_x_cat',
+    $moduleDirName.'_'.'coupon',
+    $moduleDirName.'_'.'loc', //In case not used in combo with destinations mod.
+    $moduleDirName.'_'.'loc_types', //In case not used in combo with destinations mod.
+    $moduleDirName.'_'.'loc_x_loctype', //In case not used in combo with destinations mod.
+    $moduleDirName.'_'.'votedata',
     //$moduleDirName . '_' . = "loc_x_address_types",
-    $moduleDirName . '_' . 'form_options',
-    $moduleDirName . '_' . 'address_types',
-    $moduleDirName . '_' . 'searchresults',
-    $moduleDirName . '_' . 'subscr_offers',
-    $moduleDirName . '_' . 'subscr_orders',
-    $moduleDirName . '_' . 'subscr_payments',
-    $moduleDirName . '_' . 'subscr_scheduler',
-    $moduleDirName . '_' . 'subscr_notify',
-    $moduleDirName . '_' . 'cat_tpl',
-    $moduleDirName . '_' . 'tpl',
+    $moduleDirName.'_'.'form_options',
+    $moduleDirName.'_'.'address_types',
+    $moduleDirName.'_'.'searchresults',
+    $moduleDirName.'_'.'subscr_offers',
+    $moduleDirName.'_'.'subscr_orders',
+    $moduleDirName.'_'.'subscr_payments',
+    $moduleDirName.'_'.'subscr_scheduler',
+    $moduleDirName.'_'.'subscr_notify',
+    $moduleDirName.'_'.'cat_tpl',
+    $moduleDirName.'_'.'tpl',
 );
 
 // Admin things

ratelisting.php

Indentation +95 added lines, -95 removed lines

@@ -24,108 +24,108 @@
 $moddir = $xoopsModule->getVar('dirname');
 
 if (!empty($_POST['submit'])) {
-    $eh = new ErrorHandler; //ErrorHandler object
-    if (empty($xoopsUser)) {
-        $ratinguser = 0;
-    } else {
-        $ratinguser = $xoopsUser->getVar('uid');
-    }
+	$eh = new ErrorHandler; //ErrorHandler object
+	if (empty($xoopsUser)) {
+		$ratinguser = 0;
+	} else {
+		$ratinguser = $xoopsUser->getVar('uid');
+	}
 
-    //Make sure only 1 anonymous from an IP in a single day.
-    $anonwaitdays = $xoopsModuleConfig['anonvotes_waitdays'];
-    $ip           = getenv('REMOTE_ADDR');
-    $p_itemid     = (int)$_POST['item'];
-    $p_catid      = (int)$_POST['catid'];
-    $p_rating     = (int)$_POST['rating'];
+	//Make sure only 1 anonymous from an IP in a single day.
+	$anonwaitdays = $xoopsModuleConfig['anonvotes_waitdays'];
+	$ip           = getenv('REMOTE_ADDR');
+	$p_itemid     = (int)$_POST['item'];
+	$p_catid      = (int)$_POST['catid'];
+	$p_rating     = (int)$_POST['rating'];
 
-    // Check if Rating is Null
-    if ($p_rating == '--') {
-        redirect_header('ratelisting.php?catid=' . $p_catid . '&item=' . $itemid . '', 2, _MD_NORATING);
-        exit();
-    }
+	// Check if Rating is Null
+	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($module->getVar('dirname', 'n') . '_items') . " where itemid=$p_itemid");
-        while (list($ratinguserDB) = $xoopsDB->fetchRow($result)) {
-            if ($ratinguserDB == $ratinguser) {
-                redirect_header('index.php', 4, _MD_CANTVOTEOWN);
-                exit();
-            }
-        }
+	// Check if Link POSTER is voting (UNLESS Anonymous users allowed to post)
+	if ($ratinguser != 0) {
+		$result = $xoopsDB->query('select submitter from ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_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.
-        $result = $xoopsDB->query('select ratinguser from ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_votedata') . " where itemid=$p_itemid");
-        while (list($ratinguserDB) = $xoopsDB->fetchRow($result)) {
-            if ($ratinguserDB == $ratinguser) {
-                redirect_header('index.php', 4, _MD_VOTEONCE2);
-                exit();
-            }
-        }
-    } else {
+		// Check if REG user is trying to vote twice.
+		$result = $xoopsDB->query('select ratinguser from ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_votedata') . " where itemid=$p_itemid");
+		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($module->getVar('dirname', 'n') . '_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;
-    }
+		// 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($module->getVar('dirname', 'n') . '_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.
-    $newid    = $xoopsDB->genId($xoopsDB->prefix($module->getVar('dirname', 'n') . '_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($module->getVar('dirname', 'n') . '_votedata'), $newid, $p_itemid, $ratinguser, $p_rating, $ip, $datetime);
-    $xoopsDB->query($sql) or $eh->show('0013');
+	//Add to Line Item Rate to DB.
+	$newid    = $xoopsDB->genId($xoopsDB->prefix($module->getVar('dirname', 'n') . '_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($module->getVar('dirname', 'n') . '_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);
-    if (!empty($_POST['catid'])) {
-        $p_catid = (int)$_POST['catid'];
-    } else {
-        $p_catid = 0;
-    }
-    if (!empty($_POST['dirid'])) {
-        $p_dirid = (int)$_POST['dirid'];
-    } else {
-        $p_dirid = 0;
-    }
-    if ($p_dirid == 0) {
-        $dirid = getDirIdFromItem($p_itemid);
-    } else {
-        $dirid = $p_dirid;
-    }
-    $ratemessage = _MD_VOTEAPPRE . '<br>' . sprintf(_MD_THANKURATE, $xoopsConfig['sitename']);
-    redirect_header('index.php?dirid=' . $dirid . '', 2, $ratemessage);
-    exit();
+	//Calculate Score & Add to Summary (for quick retrieval & sorting) to DB.
+	updaterating($p_itemid);
+	if (!empty($_POST['catid'])) {
+		$p_catid = (int)$_POST['catid'];
+	} else {
+		$p_catid = 0;
+	}
+	if (!empty($_POST['dirid'])) {
+		$p_dirid = (int)$_POST['dirid'];
+	} else {
+		$p_dirid = 0;
+	}
+	if ($p_dirid == 0) {
+		$dirid = getDirIdFromItem($p_itemid);
+	} else {
+		$dirid = $p_dirid;
+	}
+	$ratemessage = _MD_VOTEAPPRE . '<br>' . sprintf(_MD_THANKURATE, $xoopsConfig['sitename']);
+	redirect_header('index.php?dirid=' . $dirid . '', 2, $ratemessage);
+	exit();
 } else {
-    $GLOBALS['xoopsOption']['template_main'] = 'efqdiralpha1_ratelisting.tpl';
-    include XOOPS_ROOT_PATH . '/header.php';
-    if (isset($_GET['item'])) {
-        $get_itemid = (int)$_GET['item'];
-    } else {
-        $get_itemid = '0';
-    }
-    if (isset($_GET['catid'])) {
-        $get_catid = (int)$_GET['catid'];
-    } else {
-        $get_catid = '0';
-    }
+	$GLOBALS['xoopsOption']['template_main'] = 'efqdiralpha1_ratelisting.tpl';
+	include XOOPS_ROOT_PATH . '/header.php';
+	if (isset($_GET['item'])) {
+		$get_itemid = (int)$_GET['item'];
+	} else {
+		$get_itemid = '0';
+	}
+	if (isset($_GET['catid'])) {
+		$get_catid = (int)$_GET['catid'];
+	} else {
+		$get_catid = '0';
+	}
 
-    $result = $xoopsDB->query('select title from ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_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);
-    $xoopsTpl->assign('lang_voteonce', _MD_VOTEONCE);
-    $xoopsTpl->assign('lang_ratingscale', _MD_RATINGSCALE);
-    $xoopsTpl->assign('lang_beobjective', _MD_BEOBJECTIVE);
-    $xoopsTpl->assign('lang_donotvote', _MD_DONOTVOTE);
-    $xoopsTpl->assign('lang_rateit', _MD_RATEIT);
-    $xoopsTpl->assign('lang_cancel', _CANCEL);
-    include XOOPS_ROOT_PATH . '/footer.php';
+	$result = $xoopsDB->query('select title from ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_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);
+	$xoopsTpl->assign('lang_voteonce', _MD_VOTEONCE);
+	$xoopsTpl->assign('lang_ratingscale', _MD_RATINGSCALE);
+	$xoopsTpl->assign('lang_beobjective', _MD_BEOBJECTIVE);
+	$xoopsTpl->assign('lang_donotvote', _MD_DONOTVOTE);
+	$xoopsTpl->assign('lang_rateit', _MD_RATEIT);
+	$xoopsTpl->assign('lang_cancel', _CANCEL);
+	include XOOPS_ROOT_PATH . '/footer.php';
 }

Spacing +20 added lines, -20 removed lines

@@ -18,8 +18,8 @@ 
  * @author       XOOPS Development Team,
  */
 
-include __DIR__ . '/header.php';
-require_once XOOPS_ROOT_PATH . '/class/module.errorhandler.php';
+include __DIR__.'/header.php';
+require_once XOOPS_ROOT_PATH.'/class/module.errorhandler.php';
 $myts   = MyTextSanitizer::getInstance(); // MyTextSanitizer object
 $moddir = $xoopsModule->getVar('dirname');
 
@@ -34,19 +34,19 @@ 
     //Make sure only 1 anonymous from an IP in a single day.
     $anonwaitdays = $xoopsModuleConfig['anonvotes_waitdays'];
     $ip           = getenv('REMOTE_ADDR');
-    $p_itemid     = (int)$_POST['item'];
-    $p_catid      = (int)$_POST['catid'];
-    $p_rating     = (int)$_POST['rating'];
+    $p_itemid     = (int) $_POST['item'];
+    $p_catid      = (int) $_POST['catid'];
+    $p_rating     = (int) $_POST['rating'];
 
     // Check if Rating is Null
     if ($p_rating == '--') {
-        redirect_header('ratelisting.php?catid=' . $p_catid . '&item=' . $itemid . '', 2, _MD_NORATING);
+        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($module->getVar('dirname', 'n') . '_items') . " where itemid=$p_itemid");
+        $result = $xoopsDB->query('select submitter from '.$xoopsDB->prefix($module->getVar('dirname', 'n').'_items')." where itemid=$p_itemid");
         while (list($ratinguserDB) = $xoopsDB->fetchRow($result)) {
             if ($ratinguserDB == $ratinguser) {
                 redirect_header('index.php', 4, _MD_CANTVOTEOWN);
@@ -55,7 +55,7 @@ 
         }
 
         // Check if REG user is trying to vote twice.
-        $result = $xoopsDB->query('select ratinguser from ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_votedata') . " where itemid=$p_itemid");
+        $result = $xoopsDB->query('select ratinguser from '.$xoopsDB->prefix($module->getVar('dirname', 'n').'_votedata')." where itemid=$p_itemid");
         while (list($ratinguserDB) = $xoopsDB->fetchRow($result)) {
             if ($ratinguserDB == $ratinguser) {
                 redirect_header('index.php', 4, _MD_VOTEONCE2);
@@ -66,7 +66,7 @@ 
 
         // 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($module->getVar('dirname', 'n') . '_votedata') . " WHERE itemid=$p_itemid AND ratinguser=0 AND ratinghostname = '$ip' AND ratingtimestamp > $yesterday");
+        $result    = $xoopsDB->query('select count(*) FROM '.$xoopsDB->prefix($module->getVar('dirname', 'n').'_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);
@@ -78,20 +78,20 @@ 
     }
 
     //Add to Line Item Rate to DB.
-    $newid    = $xoopsDB->genId($xoopsDB->prefix($module->getVar('dirname', 'n') . '_votedata') . '_ratingid_seq');
+    $newid    = $xoopsDB->genId($xoopsDB->prefix($module->getVar('dirname', 'n').'_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($module->getVar('dirname', 'n') . '_votedata'), $newid, $p_itemid, $ratinguser, $p_rating, $ip, $datetime);
+    $sql      = sprintf("INSERT INTO %s (ratingid, itemid, ratinguser, rating, ratinghostname, ratingtimestamp) VALUES (%u, %u, %u, %u, '%s', %u)", $xoopsDB->prefix($module->getVar('dirname', 'n').'_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);
     if (!empty($_POST['catid'])) {
-        $p_catid = (int)$_POST['catid'];
+        $p_catid = (int) $_POST['catid'];
     } else {
         $p_catid = 0;
     }
     if (!empty($_POST['dirid'])) {
-        $p_dirid = (int)$_POST['dirid'];
+        $p_dirid = (int) $_POST['dirid'];
     } else {
         $p_dirid = 0;
     }
@@ -100,24 +100,24 @@ 
     } 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 {
     $GLOBALS['xoopsOption']['template_main'] = 'efqdiralpha1_ratelisting.tpl';
-    include XOOPS_ROOT_PATH . '/header.php';
+    include XOOPS_ROOT_PATH.'/header.php';
     if (isset($_GET['item'])) {
-        $get_itemid = (int)$_GET['item'];
+        $get_itemid = (int) $_GET['item'];
     } else {
         $get_itemid = '0';
     }
     if (isset($_GET['catid'])) {
-        $get_catid = (int)$_GET['catid'];
+        $get_catid = (int) $_GET['catid'];
     } else {
         $get_catid = '0';
     }
 
-    $result = $xoopsDB->query('select title from ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_listings') . " where itemid=$get_itemid");
+    $result = $xoopsDB->query('select title from '.$xoopsDB->prefix($module->getVar('dirname', 'n').'_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);
@@ -127,5 +127,5 @@ 
     $xoopsTpl->assign('lang_donotvote', _MD_DONOTVOTE);
     $xoopsTpl->assign('lang_rateit', _MD_RATEIT);
     $xoopsTpl->assign('lang_cancel', _CANCEL);
-    include XOOPS_ROOT_PATH . '/footer.php';
+    include XOOPS_ROOT_PATH.'/footer.php';
 }

paypal_includes/global_config.inc.php

Indentation +140 added lines, -140 removed lines

@@ -19,69 +19,69 @@ 
  */
 function create_local_variables()
 {
-    $array_name = array();
-    $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',
-        'payment_type',
-        'for_auction',
-        'auction_buyer_id',
-        'auction_closing_date',
-        'auction_multi_item',
-        'first_name',
-        'last_name',
-        'payer_business_name',
-        'address_name',
-        'address_street',
-        'address_city',
-        'address_state',
-        'address_zip',
-        'address_country',
-        'address_status',
-        'payer_email',
-        'payer_id',
-        'payer_status',
-        'notify_version',
-        'verify_sign'
-    );
-
-    foreach ($variables as $k => $v) {
-        if (isset($_POST[$v])) {
-            $array_name[$v] = "$_POST[$v]";
-        } else {
-            $array_name[$v] = '';
-        }
-    }
-
-    //print_r($array_name);
-    return $array_name;
+	$array_name = array();
+	$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',
+		'payment_type',
+		'for_auction',
+		'auction_buyer_id',
+		'auction_closing_date',
+		'auction_multi_item',
+		'first_name',
+		'last_name',
+		'payer_business_name',
+		'address_name',
+		'address_street',
+		'address_city',
+		'address_state',
+		'address_zip',
+		'address_country',
+		'address_status',
+		'payer_email',
+		'payer_id',
+		'payer_status',
+		'notify_version',
+		'verify_sign'
+	);
+
+	foreach ($variables as $k => $v) {
+		if (isset($_POST[$v])) {
+			$array_name[$v] = "$_POST[$v]";
+		} else {
+			$array_name[$v] = '';
+		}
+	}
+
+	//print_r($array_name);
+	return $array_name;
 }
 
 //post transaction data using curl
@@ -93,23 +93,23 @@ 
  */
 function curlPost($url, $data)
 {
-    global $paypal, $info;
+	global $paypal, $info;
 
-    //build post string
+	//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
+	//execute curl on the command line
 
-    exec("$paypal[curl_location] -d \"$postdata\" $url", $info);
+	exec("$paypal[curl_location] -d \"$postdata\" $url", $info);
 
-    $info = implode(',', $info);
+	$info = implode(',', $info);
 
-    return $info;
+	return $info;
 }
 
 //posts transaction data using libCurl
@@ -121,33 +121,33 @@ 
  */
 function libCurlPost($url, $data)
 {
-    //build post string
+	//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';
 
-    $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);
+	//Start ob to prevent curl_exec from displaying stuff.
+	ob_start();
+	curl_exec($ch);
 
-    //Get contents of output buffer
-    $info = ob_get_contents();
-    curl_close($ch);
+	//Get contents of output buffer
+	$info = ob_get_contents();
+	curl_close($ch);
 
-    //End ob and erase contents.
-    ob_end_clean();
+	//End ob and erase contents.
+	ob_end_clean();
 
-    return $info;
+	return $info;
 }
 
 //posts transaction data using fsockopen.
@@ -158,60 +158,60 @@ 
  */
 function fsockPost($url, $data)
 {
-    //Parse url
-    $web = parse_url($url);
-
-    $postdata = '';
-    //build post string
-    foreach ($data as $i => $v) {
-        $postdata .= $i . '=' . urlencode($v) . '&';
-    }
-
-    $postdata .= 'cmd=_notify-validate';
-
-    //Set the port number
-    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);
-
-    //Error checking
-    if (!$fp) {
-        echo "$errnum: $errstr";
-    } //Post Data
-    else {
-        fwrite($fp, "POST $web[path] HTTP/1.1\r\n");
-        fwrite($fp, "Host: $web[host]\r\n");
-        fwrite($fp, "Content-type: application/x-www-form-urlencoded\r\n");
-        fwrite($fp, 'Content-length: ' . strlen($postdata) . "\r\n");
-        fwrite($fp, "Connection: close\r\n\r\n");
-        fwrite($fp, $postdata . "\r\n\r\n");
-
-        //loop through the response from the server
-        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);
-    }
-
-    return $info;
+	//Parse url
+	$web = parse_url($url);
+
+	$postdata = '';
+	//build post string
+	foreach ($data as $i => $v) {
+		$postdata .= $i . '=' . urlencode($v) . '&';
+	}
+
+	$postdata .= 'cmd=_notify-validate';
+
+	//Set the port number
+	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);
+
+	//Error checking
+	if (!$fp) {
+		echo "$errnum: $errstr";
+	} //Post Data
+	else {
+		fwrite($fp, "POST $web[path] HTTP/1.1\r\n");
+		fwrite($fp, "Host: $web[host]\r\n");
+		fwrite($fp, "Content-type: application/x-www-form-urlencoded\r\n");
+		fwrite($fp, 'Content-length: ' . strlen($postdata) . "\r\n");
+		fwrite($fp, "Connection: close\r\n\r\n");
+		fwrite($fp, $postdata . "\r\n\r\n");
+
+		//loop through the response from the server
+		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);
+	}
+
+	return $info;
 }
 
 //Display Paypal Hidden Variables
 
 function showVariables()
 {
-    global $paypal; ?>
+	global $paypal; ?>
 
     <!-- PayPal Configuration -->
     <input type="hidden" name="business" value="<?= $paypal['business'] ?>">

Spacing +6 added lines, -6 removed lines

@@ -98,7 +98,7 @@ 
     //build post string
 
     foreach ($data as $i => $v) {
-        $postdata .= $i . '=' . urlencode($v) . '&';
+        $postdata .= $i.'='.urlencode($v).'&';
     }
 
     $postdata .= 'cmd=_notify-validate';
@@ -124,7 +124,7 @@ 
     //build post string
 
     foreach ($data as $i => $v) {
-        $postdata .= $i . '=' . urlencode($v) . '&';
+        $postdata .= $i.'='.urlencode($v).'&';
     }
 
     $postdata .= 'cmd=_notify-validate';
@@ -164,7 +164,7 @@ 
     $postdata = '';
     //build post string
     foreach ($data as $i => $v) {
-        $postdata .= $i . '=' . urlencode($v) . '&';
+        $postdata .= $i.'='.urlencode($v).'&';
     }
 
     $postdata .= 'cmd=_notify-validate';
@@ -178,7 +178,7 @@ 
     }
 
     //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) {
@@ -188,9 +188,9 @@ 
         fwrite($fp, "POST $web[path] HTTP/1.1\r\n");
         fwrite($fp, "Host: $web[host]\r\n");
         fwrite($fp, "Content-type: application/x-www-form-urlencoded\r\n");
-        fwrite($fp, 'Content-length: ' . strlen($postdata) . "\r\n");
+        fwrite($fp, 'Content-length: '.strlen($postdata)."\r\n");
         fwrite($fp, "Connection: close\r\n\r\n");
-        fwrite($fp, $postdata . "\r\n\r\n");
+        fwrite($fp, $postdata."\r\n\r\n");
 
         //loop through the response from the server
         while (!feof($fp)) {

paypal_includes/config.inc.php

Indentation +33 added lines, -33 removed lines

@@ -13,41 +13,41 @@ 
  */
 
 $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'
+	'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'
 );
 
 $paypal = array();
 
 foreach ($vars as $k => $v) {
-    if (isset($_POST[$v])) {
-        $paypal[$v] = "$_POST[$v]";
-    } else {
-        $paypal[$v] = '';
-    }
+	if (isset($_POST[$v])) {
+		$paypal[$v] = "$_POST[$v]";
+	} else {
+		$paypal[$v] = '';
+	}
 }
 
 //Configuration Settings
@@ -63,11 +63,11 @@ 
 $paypal['lc']            = 'US';
 
 if ($xoopsModuleConfig['paypal_test'] == '1') {
-    $paypal['url'] = 'https://www.sandbox.paypal.com/cgi-bin/webscr';
+	$paypal['url'] = 'https://www.sandbox.paypal.com/cgi-bin/webscr';
 } elseif ($xoopsModuleConfig['paypal_secure_yn'] == '0') {
-    $paypal['url'] = 'http://www.paypal.com/cgi-bin/webscr';
+	$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

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
 
 //Configuration Settings
 $paypal['business']    = $xoopsModuleConfig['paypal_business_mail'];
-$paypal['site_url']    = '' . XOOPS_URL . '/modules/' . $moddir . '/';
+$paypal['site_url']    = ''.XOOPS_URL.'/modules/'.$moddir.'/';
 $paypal['image_url']   = '';
 $paypal['success_url'] = 'ipn.php';
 //$paypal[success_url]="php_paypal/ipn/ipn.php";

submit.php

Indentation +105 added lines, -105 removed lines

@@ -27,67 +27,67 @@ 
 
 $moddir = $xoopsModule->getVar('dirname');
 if (isset($_POST['dirid'])) {
-    $dirid = (int)$_POST['dirid'];
+	$dirid = (int)$_POST['dirid'];
 } elseif (isset($_GET['dirid'])) {
-    $dirid = (int)$_GET['dirid'];
+	$dirid = (int)$_GET['dirid'];
 }
 
 $eh = new ErrorHandler; //ErrorHandler object
 
 if (isset($_GET['op'])) {
-    $op = $_GET['op'];
+	$op = $_GET['op'];
 } elseif (isset($_POST['op'])) {
-    $op = $_POST['op'];
+	$op = $_POST['op'];
 }
 
 if (empty($xoopsUser) and !$xoopsModuleConfig['anonpost']) {
-    redirect_header(XOOPS_URL . '/user.php', 2, _MD_MUSTREGFIRST);
-    exit();
+	redirect_header(XOOPS_URL . '/user.php', 2, _MD_MUSTREGFIRST);
+	exit();
 }
 
 if (!empty($_POST['submit'])) {
-    //Get all selectable categories and put the prefix 'selectcat' in front of the catid.
-    //With all results check if the result has a corresponding $_POST value.
-    if ($_POST['title'] === '') {
-        $eh->show('1001');
-    }
-    $title = $myts->makeTboxData4Save($_POST['title']);
-    $date  = time();
-    $newid = $xoopsDB->genId($xoopsDB->prefix($module->getVar('dirname', 'n') . '_items') . '_itemid_seq');
-    if ($xoopsModuleConfig['autoapprove'] == 1) {
-        $status = 1;
-    } else {
-        $status = 0;
-    }
-    //itemtype = bronze, silver, gold etc., start with 0 as default.
-    $submitter = $xoopsUser->getVar('uid');
-    $newid     = $xoopsDB->genId($xoopsDB->prefix($module->getVar('dirname', 'n') . '_items') . '_itemid_seq');
-    $sql       = sprintf("INSERT INTO %s (itemid, uid, STATUS, created, title, hits, rating, votes, typeid, dirid) VALUES (%u, %u, %u, '%s', '%s', %u, %u, %u, '%s', %u)", $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items'), $newid, $submitter, $status, time(), $title, 0, 0, 0, 0, $dirid);
-    $xoopsDB->query($sql) or $eh->show('0013');
-    if ($newid == 0) {
-        $itemid = $xoopsDB->getInsertId();
-    }
-    $allcatsresult = $xoopsDB->query('SELECT cid FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_cat') . " WHERE dirid='" . $dirid . '\' AND active=\'1\'');
-    $numrows       = $xoopsDB->getRowsNum($allcatsresult);
-    $count         = 0;
-    if ($numrows > 0) {
-        while (list($cid) = $xoopsDB->fetchRow($allcatsresult)) {
-            if (isset($_POST['selected' . $cid . ''])) {
-                $sql = sprintf("INSERT INTO %s (xid, cid, itemid, active, created) VALUES (%u, %u, %u, '%s', '%s')", $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_x_cat'), $newid, $cid, $itemid, 1, time());
-                $xoopsDB->query($sql) or $eh->show('0013');
-                ++$count;
-            }
-        }
-        if ($count == 0) {
-            redirect_header(XOOPS_URL . "/modules/$moddir/submit.php?dirid=" . $post_dirid . '', 2, _MD_NOCATEGORYMATCH);
-            exit();
-        }
-    } else {
-        redirect_header(XOOPS_URL . "/modules/$moddir/submit.php?dirid=" . $post_dirid . '', 2, _MD_NOCATEGORIESAVAILABLE);
-        exit();
-    }
+	//Get all selectable categories and put the prefix 'selectcat' in front of the catid.
+	//With all results check if the result has a corresponding $_POST value.
+	if ($_POST['title'] === '') {
+		$eh->show('1001');
+	}
+	$title = $myts->makeTboxData4Save($_POST['title']);
+	$date  = time();
+	$newid = $xoopsDB->genId($xoopsDB->prefix($module->getVar('dirname', 'n') . '_items') . '_itemid_seq');
+	if ($xoopsModuleConfig['autoapprove'] == 1) {
+		$status = 1;
+	} else {
+		$status = 0;
+	}
+	//itemtype = bronze, silver, gold etc., start with 0 as default.
+	$submitter = $xoopsUser->getVar('uid');
+	$newid     = $xoopsDB->genId($xoopsDB->prefix($module->getVar('dirname', 'n') . '_items') . '_itemid_seq');
+	$sql       = sprintf("INSERT INTO %s (itemid, uid, STATUS, created, title, hits, rating, votes, typeid, dirid) VALUES (%u, %u, %u, '%s', '%s', %u, %u, %u, '%s', %u)", $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items'), $newid, $submitter, $status, time(), $title, 0, 0, 0, 0, $dirid);
+	$xoopsDB->query($sql) or $eh->show('0013');
+	if ($newid == 0) {
+		$itemid = $xoopsDB->getInsertId();
+	}
+	$allcatsresult = $xoopsDB->query('SELECT cid FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_cat') . " WHERE dirid='" . $dirid . '\' AND active=\'1\'');
+	$numrows       = $xoopsDB->getRowsNum($allcatsresult);
+	$count         = 0;
+	if ($numrows > 0) {
+		while (list($cid) = $xoopsDB->fetchRow($allcatsresult)) {
+			if (isset($_POST['selected' . $cid . ''])) {
+				$sql = sprintf("INSERT INTO %s (xid, cid, itemid, active, created) VALUES (%u, %u, %u, '%s', '%s')", $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_x_cat'), $newid, $cid, $itemid, 1, time());
+				$xoopsDB->query($sql) or $eh->show('0013');
+				++$count;
+			}
+		}
+		if ($count == 0) {
+			redirect_header(XOOPS_URL . "/modules/$moddir/submit.php?dirid=" . $post_dirid . '', 2, _MD_NOCATEGORYMATCH);
+			exit();
+		}
+	} else {
+		redirect_header(XOOPS_URL . "/modules/$moddir/submit.php?dirid=" . $post_dirid . '', 2, _MD_NOCATEGORIESAVAILABLE);
+		exit();
+	}
 
-    /* // RMV-NEW
+	/* // RMV-NEW
     // Notify of new listing (anywhere). To be completed.
     $notificationHandler = xoops_getHandler('notification');
     $tags = array();
@@ -106,65 +106,65 @@ 
     redirect_header(XOOPS_URL."/modules/$moddir/edit.php?item=".$itemid."",2,_MD_SAVED);
     }*/
 
-    redirect_header(XOOPS_URL . "/modules/$moddir/edit.php?item=" . $itemid . '', 2, _MD_SAVED);
-    exit();
+	redirect_header(XOOPS_URL . "/modules/$moddir/edit.php?item=" . $itemid . '', 2, _MD_SAVED);
+	exit();
 } else {
-    if (isset($_GET['dirid'])) {
-        $get_dirid = (int)$_GET['dirid'];
-    } else {
-        redirect_header(XOOPS_URL . "/modules/$moddir/index.php", 2, _MD_NODIRECTORYSELECTED);
-    }
-    $GLOBALS['xoopsOption']['template_main'] = 'efqdiralpha1_submit.tpl';
-    include XOOPS_ROOT_PATH . '/header.php';
-    $xoopsTpl->assign('xoops_module_header', $xoops_module_header);
-    //Query datatypes that match the categories selected. If not category selected.
-    ob_start();
-    $form = new XoopsThemeForm(_MD_SUBMITLISTING_FORM, 'submitform', 'submit.php');
-    $form->setExtra('enctype="multipart/form-data"');
-    $editor = !empty($_REQUEST['editor']) ? $_REQUEST['editor'] : '';
-    if (!empty($editor)) {
-        setcookie('editor', $editor); // save to cookie
-    } else {
-        // Or use user pre-selected editor through profile
-        if (is_object($xoopsUser)) {
-            $editor = @ $xoopsUser->getVar('editor'); // Need set through user profile
-        }
-    }
-    $editor           = 'koivi';
-    $options['name']  = 'link_description';
-    $options['value'] = empty($_REQUEST['message']) ? '' : $_REQUEST['message'];
-    $options['value'] = '';
-    //optional configs
-    $options['rows']   = 25; // default value = 5
-    $options['cols']   = 60; // default value = 50
-    $options['width']  = '100%'; // default value = 100%
-    $options['height'] = '400px'; // default value = 400px
-    $options['small']  = true;
-    $options['smiles'] = false;
+	if (isset($_GET['dirid'])) {
+		$get_dirid = (int)$_GET['dirid'];
+	} else {
+		redirect_header(XOOPS_URL . "/modules/$moddir/index.php", 2, _MD_NODIRECTORYSELECTED);
+	}
+	$GLOBALS['xoopsOption']['template_main'] = 'efqdiralpha1_submit.tpl';
+	include XOOPS_ROOT_PATH . '/header.php';
+	$xoopsTpl->assign('xoops_module_header', $xoops_module_header);
+	//Query datatypes that match the categories selected. If not category selected.
+	ob_start();
+	$form = new XoopsThemeForm(_MD_SUBMITLISTING_FORM, 'submitform', 'submit.php');
+	$form->setExtra('enctype="multipart/form-data"');
+	$editor = !empty($_REQUEST['editor']) ? $_REQUEST['editor'] : '';
+	if (!empty($editor)) {
+		setcookie('editor', $editor); // save to cookie
+	} else {
+		// Or use user pre-selected editor through profile
+		if (is_object($xoopsUser)) {
+			$editor = @ $xoopsUser->getVar('editor'); // Need set through user profile
+		}
+	}
+	$editor           = 'koivi';
+	$options['name']  = 'link_description';
+	$options['value'] = empty($_REQUEST['message']) ? '' : $_REQUEST['message'];
+	$options['value'] = '';
+	//optional configs
+	$options['rows']   = 25; // default value = 5
+	$options['cols']   = 60; // default value = 50
+	$options['width']  = '100%'; // default value = 100%
+	$options['height'] = '400px'; // default value = 400px
+	$options['small']  = true;
+	$options['smiles'] = false;
 
-    // "textarea": if the selected editor with name of $editor can not be created, the editor "textarea" will be used
-    // if no $onFailure is set, then the first available editor will be used
-    // If dohtml is disabled, set $noHtml to true
-    $form->addElement(new XoopsFormText(_MD_TITLE, 'title', 50, 250, ''), true);
-    $category_tray = new XoopsFormElementTray(_MD_CATEGORIES, '', 'cid');
-    $catselarea    = getCatSelectArea2();
-    $category_tray->addElement(new XoopsFormLabel('', $catselarea));
-    $form->addElement($category_tray, true);
-    $form->addElement(new XoopsFormButton('', 'submit', _MD_CONTINUE, 'submit'));
-    $form->addElement(new XoopsFormHidden('uid', $xoopsUser->getVar('uid')));
-    $form->addElement(new XoopsFormHidden('op', 'selectcat'));
-    $form->addElement(new XoopsFormHidden('dirid', $get_dirid));
-    $form->display();
-    $xoopsTpl->assign('submit_form', ob_get_contents());
-    ob_end_clean();
+	// "textarea": if the selected editor with name of $editor can not be created, the editor "textarea" will be used
+	// if no $onFailure is set, then the first available editor will be used
+	// If dohtml is disabled, set $noHtml to true
+	$form->addElement(new XoopsFormText(_MD_TITLE, 'title', 50, 250, ''), true);
+	$category_tray = new XoopsFormElementTray(_MD_CATEGORIES, '', 'cid');
+	$catselarea    = getCatSelectArea2();
+	$category_tray->addElement(new XoopsFormLabel('', $catselarea));
+	$form->addElement($category_tray, true);
+	$form->addElement(new XoopsFormButton('', 'submit', _MD_CONTINUE, 'submit'));
+	$form->addElement(new XoopsFormHidden('uid', $xoopsUser->getVar('uid')));
+	$form->addElement(new XoopsFormHidden('op', 'selectcat'));
+	$form->addElement(new XoopsFormHidden('dirid', $get_dirid));
+	$form->display();
+	$xoopsTpl->assign('submit_form', ob_get_contents());
+	ob_end_clean();
 
-    $xoopsTpl->assign('notify_show', !empty($xoopsUser) && !$xoopsModuleConfig['autoapprove'] ? 1 : 0);
-    $xoopsTpl->assign('lang_sitetitle', _MD_SITETITLE);
-    $xoopsTpl->assign('lang_siteurl', _MD_SITEURL);
-    $xoopsTpl->assign('lang_category', _MD_CATEGORYC);
-    $xoopsTpl->assign('lang_options', _MD_OPTIONS);
-    $xoopsTpl->assign('lang_notify', _MD_NOTIFYAPPROVE);
-    $xoopsTpl->assign('lang_description', _MD_DESCRIPTIONC);
-    $xoopsTpl->assign('lang_cancel', _CANCEL);
-    include XOOPS_ROOT_PATH . '/footer.php';
+	$xoopsTpl->assign('notify_show', !empty($xoopsUser) && !$xoopsModuleConfig['autoapprove'] ? 1 : 0);
+	$xoopsTpl->assign('lang_sitetitle', _MD_SITETITLE);
+	$xoopsTpl->assign('lang_siteurl', _MD_SITEURL);
+	$xoopsTpl->assign('lang_category', _MD_CATEGORYC);
+	$xoopsTpl->assign('lang_options', _MD_OPTIONS);
+	$xoopsTpl->assign('lang_notify', _MD_NOTIFYAPPROVE);
+	$xoopsTpl->assign('lang_description', _MD_DESCRIPTIONC);
+	$xoopsTpl->assign('lang_cancel', _CANCEL);
+	include XOOPS_ROOT_PATH . '/footer.php';
 }

Spacing +22 added lines, -22 removed lines

@@ -18,18 +18,18 @@ 
  * @author       XOOPS Development Team,
  */
 
-include __DIR__ . '/header.php';
-$myts = MyTextSanitizer::getInstance();// MyTextSanitizer object
-require_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
-require_once XOOPS_ROOT_PATH . '/class/module.errorhandler.php';
-require_once XOOPS_ROOT_PATH . '/include/xoopscodes.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+include __DIR__.'/header.php';
+$myts = MyTextSanitizer::getInstance(); // MyTextSanitizer object
+require_once XOOPS_ROOT_PATH.'/class/xoopstree.php';
+require_once XOOPS_ROOT_PATH.'/class/module.errorhandler.php';
+require_once XOOPS_ROOT_PATH.'/include/xoopscodes.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
 $moddir = $xoopsModule->getVar('dirname');
 if (isset($_POST['dirid'])) {
-    $dirid = (int)$_POST['dirid'];
+    $dirid = (int) $_POST['dirid'];
 } elseif (isset($_GET['dirid'])) {
-    $dirid = (int)$_GET['dirid'];
+    $dirid = (int) $_GET['dirid'];
 }
 
 $eh = new ErrorHandler; //ErrorHandler object
@@ -41,7 +41,7 @@ 
 }
 
 if (empty($xoopsUser) and !$xoopsModuleConfig['anonpost']) {
-    redirect_header(XOOPS_URL . '/user.php', 2, _MD_MUSTREGFIRST);
+    redirect_header(XOOPS_URL.'/user.php', 2, _MD_MUSTREGFIRST);
     exit();
 }
 
@@ -53,7 +53,7 @@ 
     }
     $title = $myts->makeTboxData4Save($_POST['title']);
     $date  = time();
-    $newid = $xoopsDB->genId($xoopsDB->prefix($module->getVar('dirname', 'n') . '_items') . '_itemid_seq');
+    $newid = $xoopsDB->genId($xoopsDB->prefix($module->getVar('dirname', 'n').'_items').'_itemid_seq');
     if ($xoopsModuleConfig['autoapprove'] == 1) {
         $status = 1;
     } else {
@@ -61,29 +61,29 @@ 
     }
     //itemtype = bronze, silver, gold etc., start with 0 as default.
     $submitter = $xoopsUser->getVar('uid');
-    $newid     = $xoopsDB->genId($xoopsDB->prefix($module->getVar('dirname', 'n') . '_items') . '_itemid_seq');
-    $sql       = sprintf("INSERT INTO %s (itemid, uid, STATUS, created, title, hits, rating, votes, typeid, dirid) VALUES (%u, %u, %u, '%s', '%s', %u, %u, %u, '%s', %u)", $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items'), $newid, $submitter, $status, time(), $title, 0, 0, 0, 0, $dirid);
+    $newid     = $xoopsDB->genId($xoopsDB->prefix($module->getVar('dirname', 'n').'_items').'_itemid_seq');
+    $sql       = sprintf("INSERT INTO %s (itemid, uid, STATUS, created, title, hits, rating, votes, typeid, dirid) VALUES (%u, %u, %u, '%s', '%s', %u, %u, %u, '%s', %u)", $xoopsDB->prefix($module->getVar('dirname', 'n').'_items'), $newid, $submitter, $status, time(), $title, 0, 0, 0, 0, $dirid);
     $xoopsDB->query($sql) or $eh->show('0013');
     if ($newid == 0) {
         $itemid = $xoopsDB->getInsertId();
     }
-    $allcatsresult = $xoopsDB->query('SELECT cid FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_cat') . " WHERE dirid='" . $dirid . '\' AND active=\'1\'');
+    $allcatsresult = $xoopsDB->query('SELECT cid FROM '.$xoopsDB->prefix($module->getVar('dirname', 'n').'_cat')." WHERE dirid='".$dirid.'\' AND active=\'1\'');
     $numrows       = $xoopsDB->getRowsNum($allcatsresult);
     $count         = 0;
     if ($numrows > 0) {
         while (list($cid) = $xoopsDB->fetchRow($allcatsresult)) {
-            if (isset($_POST['selected' . $cid . ''])) {
-                $sql = sprintf("INSERT INTO %s (xid, cid, itemid, active, created) VALUES (%u, %u, %u, '%s', '%s')", $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_x_cat'), $newid, $cid, $itemid, 1, time());
+            if (isset($_POST['selected'.$cid.''])) {
+                $sql = sprintf("INSERT INTO %s (xid, cid, itemid, active, created) VALUES (%u, %u, %u, '%s', '%s')", $xoopsDB->prefix($module->getVar('dirname', 'n').'_item_x_cat'), $newid, $cid, $itemid, 1, time());
                 $xoopsDB->query($sql) or $eh->show('0013');
                 ++$count;
             }
         }
         if ($count == 0) {
-            redirect_header(XOOPS_URL . "/modules/$moddir/submit.php?dirid=" . $post_dirid . '', 2, _MD_NOCATEGORYMATCH);
+            redirect_header(XOOPS_URL."/modules/$moddir/submit.php?dirid=".$post_dirid.'', 2, _MD_NOCATEGORYMATCH);
             exit();
         }
     } else {
-        redirect_header(XOOPS_URL . "/modules/$moddir/submit.php?dirid=" . $post_dirid . '', 2, _MD_NOCATEGORIESAVAILABLE);
+        redirect_header(XOOPS_URL."/modules/$moddir/submit.php?dirid=".$post_dirid.'', 2, _MD_NOCATEGORIESAVAILABLE);
         exit();
     }
 
@@ -106,16 +106,16 @@ 
     redirect_header(XOOPS_URL."/modules/$moddir/edit.php?item=".$itemid."",2,_MD_SAVED);
     }*/
 
-    redirect_header(XOOPS_URL . "/modules/$moddir/edit.php?item=" . $itemid . '', 2, _MD_SAVED);
+    redirect_header(XOOPS_URL."/modules/$moddir/edit.php?item=".$itemid.'', 2, _MD_SAVED);
     exit();
 } else {
     if (isset($_GET['dirid'])) {
-        $get_dirid = (int)$_GET['dirid'];
+        $get_dirid = (int) $_GET['dirid'];
     } else {
-        redirect_header(XOOPS_URL . "/modules/$moddir/index.php", 2, _MD_NODIRECTORYSELECTED);
+        redirect_header(XOOPS_URL."/modules/$moddir/index.php", 2, _MD_NODIRECTORYSELECTED);
     }
     $GLOBALS['xoopsOption']['template_main'] = 'efqdiralpha1_submit.tpl';
-    include XOOPS_ROOT_PATH . '/header.php';
+    include XOOPS_ROOT_PATH.'/header.php';
     $xoopsTpl->assign('xoops_module_header', $xoops_module_header);
     //Query datatypes that match the categories selected. If not category selected.
     ob_start();
@@ -166,5 +166,5 @@ 
     $xoopsTpl->assign('lang_notify', _MD_NOTIFYAPPROVE);
     $xoopsTpl->assign('lang_description', _MD_DESCRIPTIONC);
     $xoopsTpl->assign('lang_cancel', _CANCEL);
-    include XOOPS_ROOT_PATH . '/footer.php';
+    include XOOPS_ROOT_PATH.'/footer.php';
 }

include/couponform.php

Spacing +6 added lines, -6 removed lines

@@ -18,23 +18,23 @@
  * @author       XOOPS Development Team,
  */
 
-require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
 
 $uploaddirectory = '/uploads/';
 
 $coupform      = new XoopsThemeForm(_MD_COUPONFORM, 'couponform', $_SERVER['PHP_SELF'], 'POST', true);
-$linkimg_array = XoopsLists::getImgListAsArray(XOOPS_ROOT_PATH . '/uploads/');
+$linkimg_array = XoopsLists::getImgListAsArray(XOOPS_ROOT_PATH.'/uploads/');
 $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>');
 
-$image_option->setExtra("onchange='showImgSelected(\"imagex\", \"image\", \"" . $uploaddirectory . '", "", "' . XOOPS_URL . "\")'");
+$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=\'\'>'));
+$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 +539 added lines, -539 removed lines

@@ -22,35 +22,35 @@ 
 
 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;
-    }
-
-    return $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;
+	}
+
+	return $orderby;
 }
 
 /**
@@ -59,33 +59,33 @@ 
  */
 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 . '';
-    }
-
-    return $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;
 }
 
 /**
@@ -94,32 +94,32 @@ 
  */
 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;
 }
 
 /**
@@ -129,19 +129,19 @@ 
  */
 function newlinkgraphic($time, $status)
 {
-    global $moddir;
-    $count     = 7;
-    $new       = '';
-    $startdate = (time() - (86400 * $count));
-    if ($startdate < $time) {
-        if ($status == 2) {
-            $new = '&nbsp;<img src="' . XOOPS_URL . "/modules/$moddir/assets/images/newred.gif\" alt=\"" . _MD_NEWTHISWEEK . '">';
-        } elseif ($status == 3) {
-            $new = '&nbsp;<img src="' . XOOPS_URL . "/modules/$moddir/assets/images/update.gif\" alt=\"" . _MD_UPTHISWEEK . '">';
-        }
-    }
-
-    return $new;
+	global $moddir;
+	$count     = 7;
+	$new       = '';
+	$startdate = (time() - (86400 * $count));
+	if ($startdate < $time) {
+		if ($status == 2) {
+			$new = '&nbsp;<img src="' . XOOPS_URL . "/modules/$moddir/assets/images/newred.gif\" alt=\"" . _MD_NEWTHISWEEK . '">';
+		} elseif ($status == 3) {
+			$new = '&nbsp;<img src="' . XOOPS_URL . "/modules/$moddir/assets/images/update.gif\" alt=\"" . _MD_UPTHISWEEK . '">';
+		}
+	}
+
+	return $new;
 }
 
 /**
@@ -150,12 +150,12 @@ 
  */
 function popgraphic($hits)
 {
-    global $xoopsModuleConfig, $moddir;
-    if ($hits >= $xoopsModuleConfig['popular']) {
-        return '&nbsp;<img src="' . XOOPS_URL . "/modules/$moddir/assets/images/pop.gif\" alt=\"" . _MD_POPULAR . '">';
-    }
+	global $xoopsModuleConfig, $moddir;
+	if ($hits >= $xoopsModuleConfig['popular']) {
+		return '&nbsp;<img src="' . XOOPS_URL . "/modules/$moddir/assets/images/pop.gif\" alt=\"" . _MD_POPULAR . '">';
+	}
 
-    return '';
+	return '';
 }
 
 /**
@@ -165,40 +165,40 @@ 
  */
 function getTotalItems($sel_id, $status = 0)
 {
-    global $xoopsDB, $mytree;
-    $count = 0;
-    $arr   = array();
-    $query = 'SELECT DISTINCT l.itemid FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items') . ' l, ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_x_cat') . ' x WHERE x.itemid=l.itemid AND x.cid=' . $sel_id . '';
-    if ($status !== '') {
-        $query .= " AND l.status>='$status'";
-    } else {
-        $query .= '';
-    }
-    $query  .= " AND x.active >= '1'";
-    $result = $xoopsDB->query($query);
-    //print_r($xoopsDB->fetchArray($result));
-    if (!$result) {
-        $count = 0;
-    } else {
-        $num_results = $GLOBALS['xoopsDB']->getRowsNum($result);
-        $count       = $num_results;
-    }
-    $arr  = $mytree->getAllChildId($sel_id);
-    $size = count($arr);
-    for ($i = 0; $i < $size; ++$i) {
-        $query2 = 'SELECT DISTINCT l.itemid FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items') . ' l, ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_x_cat') . ' x WHERE l.itemid=x.itemid AND x.cid=' . $arr[$i] . '';
-        if ($status !== '') {
-            $query2 .= " AND l.status>='$status'";
-        } else {
-            $query2 .= '';
-        }
-        $query2       .= " AND x.active >= '1'";
-        $result2      = $xoopsDB->query($query2);
-        $num_results2 = $GLOBALS['xoopsDB']->getRowsNum($result2);
-        $count        += $num_results2;
-    }
-
-    return $count;
+	global $xoopsDB, $mytree;
+	$count = 0;
+	$arr   = array();
+	$query = 'SELECT DISTINCT l.itemid FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items') . ' l, ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_x_cat') . ' x WHERE x.itemid=l.itemid AND x.cid=' . $sel_id . '';
+	if ($status !== '') {
+		$query .= " AND l.status>='$status'";
+	} else {
+		$query .= '';
+	}
+	$query  .= " AND x.active >= '1'";
+	$result = $xoopsDB->query($query);
+	//print_r($xoopsDB->fetchArray($result));
+	if (!$result) {
+		$count = 0;
+	} else {
+		$num_results = $GLOBALS['xoopsDB']->getRowsNum($result);
+		$count       = $num_results;
+	}
+	$arr  = $mytree->getAllChildId($sel_id);
+	$size = count($arr);
+	for ($i = 0; $i < $size; ++$i) {
+		$query2 = 'SELECT DISTINCT l.itemid FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items') . ' l, ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_x_cat') . ' x WHERE l.itemid=x.itemid AND x.cid=' . $arr[$i] . '';
+		if ($status !== '') {
+			$query2 .= " AND l.status>='$status'";
+		} else {
+			$query2 .= '';
+		}
+		$query2       .= " AND x.active >= '1'";
+		$result2      = $xoopsDB->query($query2);
+		$num_results2 = $GLOBALS['xoopsDB']->getRowsNum($result2);
+		$count        += $num_results2;
+	}
+
+	return $count;
 }
 
 /**
@@ -209,31 +209,31 @@ 
  */
 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 !== '') {
-        $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;
+	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;
 }
 
 /**
@@ -242,19 +242,19 @@ 
  */
 function getDirNameFromId($dirid = 0)
 {
-    global $xoopsDB;
-    $myts        = MyTextSanitizer::getInstance();
-    $result      = $xoopsDB->query('SELECT name FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_dir') . " WHERE dirid = '" . $dirid . '\'');
-    $num_results = $GLOBALS['xoopsDB']->getRowsNum($result);
-    if (!$result) {
-        return 0;
-    }
-    for ($i = 0; $i < $num_results; ++$i) {
-        $row     = $GLOBALS['xoopsDB']->fetchBoth($result);
-        $dirname = $row['name'];
-    }
-
-    return $dirname;
+	global $xoopsDB;
+	$myts        = MyTextSanitizer::getInstance();
+	$result      = $xoopsDB->query('SELECT name FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_dir') . " WHERE dirid = '" . $dirid . '\'');
+	$num_results = $GLOBALS['xoopsDB']->getRowsNum($result);
+	if (!$result) {
+		return 0;
+	}
+	for ($i = 0; $i < $num_results; ++$i) {
+		$row     = $GLOBALS['xoopsDB']->fetchBoth($result);
+		$dirname = $row['name'];
+	}
+
+	return $dirname;
 }
 
 /**
@@ -263,20 +263,20 @@ 
  */
 function getCatTitleFromId($cid = 0)
 {
-    global $xoopsDB;
-    //$block = array();
-    $myts        = MyTextSanitizer::getInstance();
-    $result      = $xoopsDB->query('SELECT title FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_cat') . " WHERE cid = '" . $cid . '\'');
-    $num_results = $GLOBALS['xoopsDB']->getRowsNum($result);
-    if (!$result) {
-        return 0;
-    }
-    for ($i = 0; $i < $num_results; ++$i) {
-        $row      = $GLOBALS['xoopsDB']->fetchBoth($result);
-        $cattitle = $row['title'];
-    }
-
-    return $cattitle;
+	global $xoopsDB;
+	//$block = array();
+	$myts        = MyTextSanitizer::getInstance();
+	$result      = $xoopsDB->query('SELECT title FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_cat') . " WHERE cid = '" . $cid . '\'');
+	$num_results = $GLOBALS['xoopsDB']->getRowsNum($result);
+	if (!$result) {
+		return 0;
+	}
+	for ($i = 0; $i < $num_results; ++$i) {
+		$row      = $GLOBALS['xoopsDB']->fetchBoth($result);
+		$cattitle = $row['title'];
+	}
+
+	return $cattitle;
 }
 
 /**
@@ -285,32 +285,32 @@ 
  */
 function getCategoriesPaths($get_itemid)
 {
-    global $efqtree, $xoopsDB, $get_itemid, $get_dirid, $xoopsUser, $xoopsModule;
-    if ($xoopsUser && $xoopsUser->isAdmin($xoopsModule->mid())) {
-        $isadmin = true;
-    } else {
-        $isadmin = false;
-    }
-    $result      = $xoopsDB->query('SELECT xid, cid, itemid FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_x_cat') . ' WHERE itemid = ' . $get_itemid . " AND active='1'");
-    $num_results = $GLOBALS['xoopsDB']->getRowsNum($result);
-    if (!$result) {
-        return 0;
-    }
-    $output = '';
-    for ($i = 0; $i < $num_results; ++$i) {
-        $row    = $GLOBALS['xoopsDB']->fetchBoth($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;
+	global $efqtree, $xoopsDB, $get_itemid, $get_dirid, $xoopsUser, $xoopsModule;
+	if ($xoopsUser && $xoopsUser->isAdmin($xoopsModule->mid())) {
+		$isadmin = true;
+	} else {
+		$isadmin = false;
+	}
+	$result      = $xoopsDB->query('SELECT xid, cid, itemid FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_x_cat') . ' WHERE itemid = ' . $get_itemid . " AND active='1'");
+	$num_results = $GLOBALS['xoopsDB']->getRowsNum($result);
+	if (!$result) {
+		return 0;
+	}
+	$output = '';
+	for ($i = 0; $i < $num_results; ++$i) {
+		$row    = $GLOBALS['xoopsDB']->fetchBoth($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;
 }
 
 /**
@@ -319,41 +319,41 @@ 
  */
 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] . ';
         text-decoration: none; ">' . _MD_A_DIRADMIN . '</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[2] . ';
         text-decoration: none; ">' . _MD_A_FTYPESADMIN . '</a></li>';
-    // echo "<li style=\"list-style: none; margin: 0; display: inline; \">
-    //         <a href=\"addresstypes.php\" style=\"padding: 3px 0.5em;
-    //         margin-left: 3px;
-    //         border: 1px solid #778; background: ".$tblColors[3].";
-    //         text-decoration: none; \">"._MD_A_ATYPESADMIN."</a></li>";
-    echo '<li style="list-style: none; margin: 0; display: inline; ">
+	// echo "<li style=\"list-style: none; margin: 0; display: inline; \">
+	//         <a href=\"addresstypes.php\" style=\"padding: 3px 0.5em;
+	//         margin-left: 3px;
+	//         border: 1px solid #778; background: ".$tblColors[3].";
+	//         text-decoration: none; \">"._MD_A_ATYPESADMIN."</a></li>";
+	echo '<li style="list-style: none; margin: 0; display: inline; ">
         <a href="subscriptions.php" style="padding: 3px 0.5em;
         margin-left: 3px;
         border: 1px solid #778; background: ' . $tblColors[4] . ';
         text-decoration: none; ">' . _MD_A_ASUBSCRIPTIONSADMIN . '</a></li>';
-    echo '</div></ul>';
+	echo '</div></ul>';
 }
 
 /**
@@ -362,20 +362,20 @@ 
  */
 function getTypeFromId($typeid = '0')
 {
-    global $xoopsDB;
-    $myts        = MyTextSanitizer::getInstance();
-    $result      = $xoopsDB->query('SELECT typename  FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_itemtypes') . " WHERE typeid = '" . $typeid . '\'');
-    $num_results = $xoopsDB->getRowsNum($result);
-    $typename    = '';
-    if (!$result) {
-        return 0;
-    }
-    for ($i = 0; $i < $num_results; ++$i) {
-        $row      = $GLOBALS['xoopsDB']->fetchBoth($result);
-        $typename = $row['typename'];
-    }
-
-    return $typename;
+	global $xoopsDB;
+	$myts        = MyTextSanitizer::getInstance();
+	$result      = $xoopsDB->query('SELECT typename  FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_itemtypes') . " WHERE typeid = '" . $typeid . '\'');
+	$num_results = $xoopsDB->getRowsNum($result);
+	$typename    = '';
+	if (!$result) {
+		return 0;
+	}
+	for ($i = 0; $i < $num_results; ++$i) {
+		$row      = $GLOBALS['xoopsDB']->fetchBoth($result);
+		$typename = $row['typename'];
+	}
+
+	return $typename;
 }
 
 /**
@@ -384,20 +384,20 @@ 
  */
 function getDirId($catid = '0')
 {
-    global $xoopsDB;
-    $myts        = MyTextSanitizer::getInstance();
-    $result      = $xoopsDB->query('SELECT dirid  FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_cat') . " WHERE cid = '" . $catid . '\'');
-    $num_results = $xoopsDB->getRowsNum($result);
-    $dirid       = 0;
-    if (!$result) {
-        return 0;
-    }
-    for ($i = 0; $i < $num_results; ++$i) {
-        $row   = $GLOBALS['xoopsDB']->fetchBoth($result);
-        $dirid = $row['dirid'];
-    }
-
-    return $dirid;
+	global $xoopsDB;
+	$myts        = MyTextSanitizer::getInstance();
+	$result      = $xoopsDB->query('SELECT dirid  FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_cat') . " WHERE cid = '" . $catid . '\'');
+	$num_results = $xoopsDB->getRowsNum($result);
+	$dirid       = 0;
+	if (!$result) {
+		return 0;
+	}
+	for ($i = 0; $i < $num_results; ++$i) {
+		$row   = $GLOBALS['xoopsDB']->fetchBoth($result);
+		$dirid = $row['dirid'];
+	}
+
+	return $dirid;
 }
 
 /**
@@ -406,20 +406,20 @@ 
  */
 function checkDescription($catid = '0')
 {
-    global $xoopsDB;
-    $myts        = MyTextSanitizer::getInstance();
-    $result      = $xoopsDB->query('SELECT txtid FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_cat_txt') . " WHERE cid = '" . $catid . '\'');
-    $num_results = $xoopsDB->getRowsNum($result);
-    $txtid       = false;
-    if (!$result) {
-        return false;
-    }
-    for ($i = 0; $i < $num_results; ++$i) {
-        $row   = $GLOBALS['xoopsDB']->fetchBoth($result);
-        $txtid = $row['txtid'];
-    }
-
-    return $txtid;
+	global $xoopsDB;
+	$myts        = MyTextSanitizer::getInstance();
+	$result      = $xoopsDB->query('SELECT txtid FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_cat_txt') . " WHERE cid = '" . $catid . '\'');
+	$num_results = $xoopsDB->getRowsNum($result);
+	$txtid       = false;
+	if (!$result) {
+		return false;
+	}
+	for ($i = 0; $i < $num_results; ++$i) {
+		$row   = $GLOBALS['xoopsDB']->fetchBoth($result);
+		$txtid = $row['txtid'];
+	}
+
+	return $txtid;
 }
 
 /**
@@ -428,20 +428,20 @@ 
  */
 function getTemplateFromCatid($get_catid = '0')
 {
-    global $xoopsDB;
-    $myts        = MyTextSanitizer::getInstance();
-    $result      = $xoopsDB->query('SELECT c.tplid, t.name  FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_cat_tpl') . ' c, ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_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     = $GLOBALS['xoopsDB']->fetchBoth($result);
-        $tplname = $row['name'];
-    }
-
-    return $tplname;
+	global $xoopsDB;
+	$myts        = MyTextSanitizer::getInstance();
+	$result      = $xoopsDB->query('SELECT c.tplid, t.name  FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_cat_tpl') . ' c, ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_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     = $GLOBALS['xoopsDB']->fetchBoth($result);
+		$tplname = $row['name'];
+	}
+
+	return $tplname;
 }
 
 /**
@@ -451,45 +451,45 @@ 
  */
 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($module->getVar('dirname', 'n') . '_cat')
-                  . ' c LEFT JOIN '
-                  . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_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) {
-        $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)) {
-            //For each cid, get all 'first children' using getFirstChildId() function
-            if ($allowlist != '0') {
-                if ($active == '1') {
-                    $checked = ' checked';
-                } else {
-                    $checked = '';
-                }
-                $checkbox = '<input type="checkbox" name="selected' . $cid . "\"$checked";
-            } else {
-                $checkbox = '&nbsp;';
-            }
-            $output .= '<tr><td><strong>' . $tab . '' . $title . "</strong></td><td>&nbsp;</td><td>$checkbox</td></tr>\n";
-            $output .= getCatSelectAreaChildren($cid, 0, $dirid);
-        }
-    } else {
-        $output .= '<tr><td>' . _MD_NORESULTS . '</td></tr>';
-    }
-    $output .= '</table>';
-
-    return $output;
+	global $xoopsDB, $myts, $eh, $mytree, $moddir, $get_itemid;
+	$sql        = 'SELECT c.cid, c.title, c.pid, c.allowlist, x.active FROM '
+				  . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_cat')
+				  . ' c LEFT JOIN '
+				  . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_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) {
+		$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)) {
+			//For each cid, get all 'first children' using getFirstChildId() function
+			if ($allowlist != '0') {
+				if ($active == '1') {
+					$checked = ' checked';
+				} else {
+					$checked = '';
+				}
+				$checkbox = '<input type="checkbox" name="selected' . $cid . "\"$checked";
+			} else {
+				$checkbox = '&nbsp;';
+			}
+			$output .= '<tr><td><strong>' . $tab . '' . $title . "</strong></td><td>&nbsp;</td><td>$checkbox</td></tr>\n";
+			$output .= getCatSelectAreaChildren($cid, 0, $dirid);
+		}
+	} else {
+		$output .= '<tr><td>' . _MD_NORESULTS . '</td></tr>';
+	}
+	$output .= '</table>';
+
+	return $output;
 }
 
 /**
@@ -499,46 +499,46 @@ 
  */
 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) {
-        $tab .= '&nbsp;&nbsp;&nbsp;&nbsp;';
-    }
-    $sql         = 'SELECT DISTINCT c.cid, c.title, c.pid, c.allowlist, x.active FROM '
-                   . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_cat')
-                   . ' c LEFT JOIN '
-                   . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_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 ($allowlist != '0') {
-                if ($active == '1') {
-                    $checked = ' checked';
-                } else {
-                    $checked = '';
-                }
-                $checkbox = '<input type="checkbox" name="selected' . $cid . "\"$checked";
-            } else {
-                $checkbox = '&nbsp;';
-            }
-            $output   .= '<tr><td><strong>' . $tab . '' . $plus . '&nbsp;' . $title . "</td><td>&nbsp;</strong></td><td align=\"center\">$checkbox</td></tr>\n";
-            $newlevel = $level + 1;
-            $output   .= getCatSelectAreaChildren($cid, $newlevel);
-        }
-    }
-
-    return $output;
+	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) {
+		$tab .= '&nbsp;&nbsp;&nbsp;&nbsp;';
+	}
+	$sql         = 'SELECT DISTINCT c.cid, c.title, c.pid, c.allowlist, x.active FROM '
+				   . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_cat')
+				   . ' c LEFT JOIN '
+				   . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_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 ($allowlist != '0') {
+				if ($active == '1') {
+					$checked = ' checked';
+				} else {
+					$checked = '';
+				}
+				$checkbox = '<input type="checkbox" name="selected' . $cid . "\"$checked";
+			} else {
+				$checkbox = '&nbsp;';
+			}
+			$output   .= '<tr><td><strong>' . $tab . '' . $plus . '&nbsp;' . $title . "</td><td>&nbsp;</strong></td><td align=\"center\">$checkbox</td></tr>\n";
+			$newlevel = $level + 1;
+			$output   .= getCatSelectAreaChildren($cid, $newlevel);
+		}
+	}
+
+	return $output;
 }
 
 /**
@@ -547,21 +547,21 @@ 
  */
 function getDirIdFromItem($item = 0)
 {
-    global $xoopsDB;
-    $block       = array();
-    $myts        = MyTextSanitizer::getInstance();
-    $dirid       = 0;
-    $result      = $xoopsDB->query('SELECT dirid FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items') . ' WHERE itemid = ' . $item . '');
-    $num_results = $xoopsDB->getRowsNum($result);
-    if (!$result) {
-        return 0;
-    }
-    for ($i = 0; $i < $num_results; ++$i) {
-        $row   = $GLOBALS['xoopsDB']->fetchBoth($result);
-        $dirid = $row['dirid'];
-    }
-
-    return $dirid;
+	global $xoopsDB;
+	$block       = array();
+	$myts        = MyTextSanitizer::getInstance();
+	$dirid       = 0;
+	$result      = $xoopsDB->query('SELECT dirid FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items') . ' WHERE itemid = ' . $item . '');
+	$num_results = $xoopsDB->getRowsNum($result);
+	if (!$result) {
+		return 0;
+	}
+	for ($i = 0; $i < $num_results; ++$i) {
+		$row   = $GLOBALS['xoopsDB']->fetchBoth($result);
+		$dirid = $row['dirid'];
+	}
+
+	return $dirid;
 }
 
 /**
@@ -570,21 +570,21 @@ 
  */
 function getUserIdFromItem($item = 0)
 {
-    global $xoopsDB;
-    $block       = array();
-    $myts        = MyTextSanitizer::getInstance();
-    $userid      = 0;
-    $result      = $xoopsDB->query('SELECT uid FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items') . ' WHERE itemid = ' . $item . '');
-    $num_results = $xoopsDB->getRowsNum($result);
-    if (!$result) {
-        return 0;
-    }
-    for ($i = 0; $i < $num_results; ++$i) {
-        $row    = $GLOBALS['xoopsDB']->fetchBoth($result);
-        $userid = $row['uid'];
-    }
-
-    return $userid;
+	global $xoopsDB;
+	$block       = array();
+	$myts        = MyTextSanitizer::getInstance();
+	$userid      = 0;
+	$result      = $xoopsDB->query('SELECT uid FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items') . ' WHERE itemid = ' . $item . '');
+	$num_results = $xoopsDB->getRowsNum($result);
+	if (!$result) {
+		return 0;
+	}
+	for ($i = 0; $i < $num_results; ++$i) {
+		$row    = $GLOBALS['xoopsDB']->fetchBoth($result);
+		$userid = $row['uid'];
+	}
+
+	return $userid;
 }
 
 //updates rating data in itemtable for a given item
@@ -593,18 +593,18 @@ 
  */
 function updaterating($sel_id)
 {
-    global $xoopsDB;
-    $query       = 'SELECT rating FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_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($module->getVar('dirname', 'n') . '_items') . " SET rating=$finalrating, votes=$votesDB WHERE itemid = $sel_id";
-    $xoopsDB->query($query) or exit();
+	global $xoopsDB;
+	$query       = 'SELECT rating FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_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($module->getVar('dirname', 'n') . '_items') . " SET rating=$finalrating, votes=$votesDB WHERE itemid = $sel_id";
+	$xoopsDB->query($query) or exit();
 }
 
 /**
@@ -613,42 +613,42 @@ 
  */
 function getAddressFields($typeid = '0')
 {
-    global $xoopsDB;
-    $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($module->getVar('dirname', 'n') . '_address_types') . " WHERE defaultyn = '1'");
-    } else {
-        $result = $xoopsDB->query('SELECT typeid, address, address2, zip, postcode, lat, lon, phone, fax, mobile, city, country, typename, uselocyn FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_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)) {
-        $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;
+	global $xoopsDB;
+	$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($module->getVar('dirname', 'n') . '_address_types') . " WHERE defaultyn = '1'");
+	} else {
+		$result = $xoopsDB->query('SELECT typeid, address, address2, zip, postcode, lat, lon, phone, fax, mobile, city, country, typename, uselocyn FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_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)) {
+		$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;
 }
 
 /**
@@ -657,31 +657,31 @@ 
  */
 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($module->getVar('dirname', 'n') . '_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)) {
-        $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;
+	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($module->getVar('dirname', 'n') . '_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)) {
+		$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;
 }
 
 /**
@@ -689,54 +689,54 @@ 
  */
 function getCatSelectArea2()
 {
-    global $xoopsDB, $myts, $eh, $mytree, $get_dirid, $moddir, $xoopsUser, $xoopsModule;
-    if ($xoopsUser && $xoopsUser->isAdmin($xoopsModule->mid())) {
-        $isadmin = true;
-    } else {
-        $isadmin = false;
-    }
-    $sql        = 'SELECT cid, title, pid, allowlist FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_cat') . " WHERE dirid='" . $get_dirid . '\' AND pid=\'0\' AND active=\'1\'';
-    $mainresult = $xoopsDB->query($sql);
-    $numrows    = $xoopsDB->getRowsNum($mainresult);
-    $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)) {
-            //For each cid, get all 'first children' using getFirstChildId() function
-            if ($allowlist != '0') {
-                $checkbox      = '<input type="checkbox" name="selected' . $cid . '"';
-                $selectablecat = true;
-                //$checked = "";
-            } else {
-                //$checked = " checked=checked";
-                $checkbox = '&nbsp;';
-            }
-            //$cats .= $cid."|";
-            $output .= '<tr><td><strong>' . $tab . '' . $title . "</strong></td><td>&nbsp;</td><td align=\"center\">$checkbox</td></tr>\n";
-            $output .= getCatSelectAreaChildren2($cid);
-            if ($output !== '') {
-                $selectablecat = true;
-            }
-        }
-    } else {
-        redirect_header(XOOPS_URL . "/modules/$moddir/index.php?dirid=$get_dirid", 2, _MD_NOACTIVECATEGORIES);
-        exit();
-        //$output = ""._MD_NORESULTS."";
-    }
-    if ($isadmin) {
-        $output .= '<tr><td><br><a href="admin/categories.php?dirid=' . $get_dirid . '">' . _MD_EDITCATEGORIES . '</a></td></tr>';
-    }
-    $output .= '</table>';
-    if ($selectablecat === false) {
-        redirect_header(XOOPS_URL . "/modules/$moddir/index.php?dirid=$get_dirid", 2, _MD_NOACTIVECATEGORIES);
-        exit();
-    }
-
-    return $output;
+	global $xoopsDB, $myts, $eh, $mytree, $get_dirid, $moddir, $xoopsUser, $xoopsModule;
+	if ($xoopsUser && $xoopsUser->isAdmin($xoopsModule->mid())) {
+		$isadmin = true;
+	} else {
+		$isadmin = false;
+	}
+	$sql        = 'SELECT cid, title, pid, allowlist FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_cat') . " WHERE dirid='" . $get_dirid . '\' AND pid=\'0\' AND active=\'1\'';
+	$mainresult = $xoopsDB->query($sql);
+	$numrows    = $xoopsDB->getRowsNum($mainresult);
+	$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)) {
+			//For each cid, get all 'first children' using getFirstChildId() function
+			if ($allowlist != '0') {
+				$checkbox      = '<input type="checkbox" name="selected' . $cid . '"';
+				$selectablecat = true;
+				//$checked = "";
+			} else {
+				//$checked = " checked=checked";
+				$checkbox = '&nbsp;';
+			}
+			//$cats .= $cid."|";
+			$output .= '<tr><td><strong>' . $tab . '' . $title . "</strong></td><td>&nbsp;</td><td align=\"center\">$checkbox</td></tr>\n";
+			$output .= getCatSelectAreaChildren2($cid);
+			if ($output !== '') {
+				$selectablecat = true;
+			}
+		}
+	} else {
+		redirect_header(XOOPS_URL . "/modules/$moddir/index.php?dirid=$get_dirid", 2, _MD_NOACTIVECATEGORIES);
+		exit();
+		//$output = ""._MD_NORESULTS."";
+	}
+	if ($isadmin) {
+		$output .= '<tr><td><br><a href="admin/categories.php?dirid=' . $get_dirid . '">' . _MD_EDITCATEGORIES . '</a></td></tr>';
+	}
+	$output .= '</table>';
+	if ($selectablecat === false) {
+		redirect_header(XOOPS_URL . "/modules/$moddir/index.php?dirid=$get_dirid", 2, _MD_NOACTIVECATEGORIES);
+		exit();
+	}
+
+	return $output;
 }
 
 /**
@@ -746,29 +746,29 @@ 
  */
 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) {
-        $tab .= '&nbsp;&nbsp;&nbsp;&nbsp;';
-    }
-    $sql         = 'SELECT cid, title, pid, allowlist FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_cat') . " WHERE dirid='" . (int)$get_dirid . '\' AND pid=\'' . (int)$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 ($allowlist != '0') {
-                $checkbox = '<input type="checkbox" name="selected' . $cid . '"';
-            } else {
-                $checkbox = '&nbsp;';
-            }
-            $output   .= '<tr><td><strong>' . $tab . '' . $plus . '&nbsp;' . $title . "</td><td>&nbsp;</strong></td><td align=\"center\">$checkbox</td></tr>\n";
-            $newlevel = $level + 1;
-            $output   .= getCatSelectAreaChildren($cid, $newlevel, $get_dirid);
-        }
-    }
-
-    return $output;
+	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) {
+		$tab .= '&nbsp;&nbsp;&nbsp;&nbsp;';
+	}
+	$sql         = 'SELECT cid, title, pid, allowlist FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_cat') . " WHERE dirid='" . (int)$get_dirid . '\' AND pid=\'' . (int)$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 ($allowlist != '0') {
+				$checkbox = '<input type="checkbox" name="selected' . $cid . '"';
+			} else {
+				$checkbox = '&nbsp;';
+			}
+			$output   .= '<tr><td><strong>' . $tab . '' . $plus . '&nbsp;' . $title . "</td><td>&nbsp;</strong></td><td align=\"center\">$checkbox</td></tr>\n";
+			$newlevel = $level + 1;
+			$output   .= getCatSelectAreaChildren($cid, $newlevel, $get_dirid);
+		}
+	}
+
+	return $output;
 }

Spacing +64 added lines, -64 removed lines

@@ -61,28 +61,28 @@ 
 {
     $orderbyTrans = '';
     if ($orderby === 'hits ASC') {
-        $orderbyTrans = '' . _MD_POPULARITYLTOM . '';
+        $orderbyTrans = ''._MD_POPULARITYLTOM.'';
     }
     if ($orderby === 'hits DESC') {
-        $orderbyTrans = '' . _MD_POPULARITYMTOL . '';
+        $orderbyTrans = ''._MD_POPULARITYMTOL.'';
     }
     if ($orderby === 'title ASC') {
-        $orderbyTrans = '' . _MD_TITLEATOZ . '';
+        $orderbyTrans = ''._MD_TITLEATOZ.'';
     }
     if ($orderby === 'title DESC') {
-        $orderbyTrans = '' . _MD_TITLEZTOA . '';
+        $orderbyTrans = ''._MD_TITLEZTOA.'';
     }
     if ($orderby === 'date ASC') {
-        $orderbyTrans = '' . _MD_DATEOLD . '';
+        $orderbyTrans = ''._MD_DATEOLD.'';
     }
     if ($orderby === 'date DESC') {
-        $orderbyTrans = '' . _MD_DATENEW . '';
+        $orderbyTrans = ''._MD_DATENEW.'';
     }
     if ($orderby === 'rating ASC') {
-        $orderbyTrans = '' . _MD_RATINGLTOH . '';
+        $orderbyTrans = ''._MD_RATINGLTOH.'';
     }
     if ($orderby === 'rating DESC') {
-        $orderbyTrans = '' . _MD_RATINGHTOL . '';
+        $orderbyTrans = ''._MD_RATINGHTOL.'';
     }
 
     return $orderbyTrans;
@@ -135,9 +135,9 @@ 
     $startdate = (time() - (86400 * $count));
     if ($startdate < $time) {
         if ($status == 2) {
-            $new = '&nbsp;<img src="' . XOOPS_URL . "/modules/$moddir/assets/images/newred.gif\" alt=\"" . _MD_NEWTHISWEEK . '">';
+            $new = '&nbsp;<img src="'.XOOPS_URL."/modules/$moddir/assets/images/newred.gif\" alt=\""._MD_NEWTHISWEEK.'">';
         } elseif ($status == 3) {
-            $new = '&nbsp;<img src="' . XOOPS_URL . "/modules/$moddir/assets/images/update.gif\" alt=\"" . _MD_UPTHISWEEK . '">';
+            $new = '&nbsp;<img src="'.XOOPS_URL."/modules/$moddir/assets/images/update.gif\" alt=\""._MD_UPTHISWEEK.'">';
         }
     }
 
@@ -152,7 +152,7 @@ 
 {
     global $xoopsModuleConfig, $moddir;
     if ($hits >= $xoopsModuleConfig['popular']) {
-        return '&nbsp;<img src="' . XOOPS_URL . "/modules/$moddir/assets/images/pop.gif\" alt=\"" . _MD_POPULAR . '">';
+        return '&nbsp;<img src="'.XOOPS_URL."/modules/$moddir/assets/images/pop.gif\" alt=\""._MD_POPULAR.'">';
     }
 
     return '';
@@ -168,13 +168,13 @@ 
     global $xoopsDB, $mytree;
     $count = 0;
     $arr   = array();
-    $query = 'SELECT DISTINCT l.itemid FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items') . ' l, ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_x_cat') . ' x WHERE x.itemid=l.itemid AND x.cid=' . $sel_id . '';
+    $query = 'SELECT DISTINCT l.itemid FROM '.$xoopsDB->prefix($module->getVar('dirname', 'n').'_items').' l, '.$xoopsDB->prefix($module->getVar('dirname', 'n').'_item_x_cat').' x WHERE x.itemid=l.itemid AND x.cid='.$sel_id.'';
     if ($status !== '') {
         $query .= " AND l.status>='$status'";
     } else {
         $query .= '';
     }
-    $query  .= " AND x.active >= '1'";
+    $query .= " AND x.active >= '1'";
     $result = $xoopsDB->query($query);
     //print_r($xoopsDB->fetchArray($result));
     if (!$result) {
@@ -186,7 +186,7 @@ 
     $arr  = $mytree->getAllChildId($sel_id);
     $size = count($arr);
     for ($i = 0; $i < $size; ++$i) {
-        $query2 = 'SELECT DISTINCT l.itemid FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items') . ' l, ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_x_cat') . ' x WHERE l.itemid=x.itemid AND x.cid=' . $arr[$i] . '';
+        $query2 = 'SELECT DISTINCT l.itemid FROM '.$xoopsDB->prefix($module->getVar('dirname', 'n').'_items').' l, '.$xoopsDB->prefix($module->getVar('dirname', 'n').'_item_x_cat').' x WHERE l.itemid=x.itemid AND x.cid='.$arr[$i].'';
         if ($status !== '') {
             $query2 .= " AND l.status>='$status'";
         } else {
@@ -212,7 +212,7 @@ 
     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 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 !== '') {
@@ -224,7 +224,7 @@ 
     $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] . '';
+        $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";
         }
@@ -244,7 +244,7 @@ 
 {
     global $xoopsDB;
     $myts        = MyTextSanitizer::getInstance();
-    $result      = $xoopsDB->query('SELECT name FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_dir') . " WHERE dirid = '" . $dirid . '\'');
+    $result      = $xoopsDB->query('SELECT name FROM '.$xoopsDB->prefix($module->getVar('dirname', 'n').'_dir')." WHERE dirid = '".$dirid.'\'');
     $num_results = $GLOBALS['xoopsDB']->getRowsNum($result);
     if (!$result) {
         return 0;
@@ -266,7 +266,7 @@ 
     global $xoopsDB;
     //$block = array();
     $myts        = MyTextSanitizer::getInstance();
-    $result      = $xoopsDB->query('SELECT title FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_cat') . " WHERE cid = '" . $cid . '\'');
+    $result      = $xoopsDB->query('SELECT title FROM '.$xoopsDB->prefix($module->getVar('dirname', 'n').'_cat')." WHERE cid = '".$cid.'\'');
     $num_results = $GLOBALS['xoopsDB']->getRowsNum($result);
     if (!$result) {
         return 0;
@@ -291,7 +291,7 @@ 
     } else {
         $isadmin = false;
     }
-    $result      = $xoopsDB->query('SELECT xid, cid, itemid FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_x_cat') . ' WHERE itemid = ' . $get_itemid . " AND active='1'");
+    $result      = $xoopsDB->query('SELECT xid, cid, itemid FROM '.$xoopsDB->prefix($module->getVar('dirname', 'n').'_item_x_cat').' WHERE itemid = '.$get_itemid." AND active='1'");
     $num_results = $GLOBALS['xoopsDB']->getRowsNum($result);
     if (!$result) {
         return 0;
@@ -306,7 +306,7 @@ 
         $output .= $path;
     }
     if ($isadmin) {
-        $output .= '<br><a href="admin/categories.php?dirid=' . $get_dirid . '">' . _MD_EDITCATEGORIES . '</a>';
+        $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>";
@@ -324,25 +324,25 @@ 
     $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>
+        <font size=2>" . $xoopsModule->name().':'.$breadcrumb.'</font>
         </td></tr></table><br>';
     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; ">
         <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>';
+        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; ">
         <a href="directories.php" style="padding: 3px 0.5em;
         margin-left: 3px;
-        border: 1px solid #778; background: ' . $tblColors[1] . ';
-        text-decoration: none; ">' . _MD_A_DIRADMIN . '</a></li>';
+        border: 1px solid #778; background: ' . $tblColors[1].';
+        text-decoration: none; ">' . _MD_A_DIRADMIN.'</a></li>';
     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[2] . ';
-        text-decoration: none; ">' . _MD_A_FTYPESADMIN . '</a></li>';
+        border: 1px solid #778; background: ' . $tblColors[2].';
+        text-decoration: none; ">' . _MD_A_FTYPESADMIN.'</a></li>';
     // echo "<li style=\"list-style: none; margin: 0; display: inline; \">
     //         <a href=\"addresstypes.php\" style=\"padding: 3px 0.5em;
     //         margin-left: 3px;
@@ -351,8 +351,8 @@ 
     echo '<li style="list-style: none; margin: 0; display: inline; ">
         <a href="subscriptions.php" style="padding: 3px 0.5em;
         margin-left: 3px;
-        border: 1px solid #778; background: ' . $tblColors[4] . ';
-        text-decoration: none; ">' . _MD_A_ASUBSCRIPTIONSADMIN . '</a></li>';
+        border: 1px solid #778; background: ' . $tblColors[4].';
+        text-decoration: none; ">' . _MD_A_ASUBSCRIPTIONSADMIN.'</a></li>';
     echo '</div></ul>';
 }
 
@@ -364,7 +364,7 @@ 
 {
     global $xoopsDB;
     $myts        = MyTextSanitizer::getInstance();
-    $result      = $xoopsDB->query('SELECT typename  FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_itemtypes') . " WHERE typeid = '" . $typeid . '\'');
+    $result      = $xoopsDB->query('SELECT typename  FROM '.$xoopsDB->prefix($module->getVar('dirname', 'n').'_itemtypes')." WHERE typeid = '".$typeid.'\'');
     $num_results = $xoopsDB->getRowsNum($result);
     $typename    = '';
     if (!$result) {
@@ -386,7 +386,7 @@ 
 {
     global $xoopsDB;
     $myts        = MyTextSanitizer::getInstance();
-    $result      = $xoopsDB->query('SELECT dirid  FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_cat') . " WHERE cid = '" . $catid . '\'');
+    $result      = $xoopsDB->query('SELECT dirid  FROM '.$xoopsDB->prefix($module->getVar('dirname', 'n').'_cat')." WHERE cid = '".$catid.'\'');
     $num_results = $xoopsDB->getRowsNum($result);
     $dirid       = 0;
     if (!$result) {
@@ -408,7 +408,7 @@ 
 {
     global $xoopsDB;
     $myts        = MyTextSanitizer::getInstance();
-    $result      = $xoopsDB->query('SELECT txtid FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_cat_txt') . " WHERE cid = '" . $catid . '\'');
+    $result      = $xoopsDB->query('SELECT txtid FROM '.$xoopsDB->prefix($module->getVar('dirname', 'n').'_cat_txt')." WHERE cid = '".$catid.'\'');
     $num_results = $xoopsDB->getRowsNum($result);
     $txtid       = false;
     if (!$result) {
@@ -430,7 +430,7 @@ 
 {
     global $xoopsDB;
     $myts        = MyTextSanitizer::getInstance();
-    $result      = $xoopsDB->query('SELECT c.tplid, t.name  FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_cat_tpl') . ' c, ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_tpl') . " t WHERE c.tplid=t.tplid AND c.catid = '" . $get_catid . '\'');
+    $result      = $xoopsDB->query('SELECT c.tplid, t.name  FROM '.$xoopsDB->prefix($module->getVar('dirname', 'n').'_cat_tpl').' c, '.$xoopsDB->prefix($module->getVar('dirname', 'n').'_tpl')." t WHERE c.tplid=t.tplid AND c.catid = '".$get_catid.'\'');
     $num_results = $xoopsDB->getRowsNum($result);
     $tplname     = '';
     if (!$result) {
@@ -452,10 +452,10 @@ 
 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($module->getVar('dirname', 'n') . '_cat')
+    $sql = 'SELECT c.cid, c.title, c.pid, c.allowlist, x.active FROM '
+                  . $xoopsDB->prefix($module->getVar('dirname', 'n').'_cat')
                   . ' c LEFT JOIN '
-                  . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_x_cat')
+                  . $xoopsDB->prefix($module->getVar('dirname', 'n').'_item_x_cat')
                   . ' x ON (c.cid=x.cid AND x.itemid='
                   . $item
                   . ")  WHERE c.dirid='"
@@ -466,7 +466,7 @@ 
     $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";
+        $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)) {
@@ -477,15 +477,15 @@ 
                 } else {
                     $checked = '';
                 }
-                $checkbox = '<input type="checkbox" name="selected' . $cid . "\"$checked";
+                $checkbox = '<input type="checkbox" name="selected'.$cid."\"$checked";
             } else {
                 $checkbox = '&nbsp;';
             }
-            $output .= '<tr><td><strong>' . $tab . '' . $title . "</strong></td><td>&nbsp;</td><td>$checkbox</td></tr>\n";
+            $output .= '<tr><td><strong>'.$tab.''.$title."</strong></td><td>&nbsp;</td><td>$checkbox</td></tr>\n";
             $output .= getCatSelectAreaChildren($cid, 0, $dirid);
         }
     } else {
-        $output .= '<tr><td>' . _MD_NORESULTS . '</td></tr>';
+        $output .= '<tr><td>'._MD_NORESULTS.'</td></tr>';
     }
     $output .= '</table>';
 
@@ -503,14 +503,14 @@ 
     $tab    = '&nbsp;';
     $level  = $level;
     $output = '';
-    $plus   = '<img src="' . XOOPS_URL . '/images/arrow.gif">';
+    $plus   = '<img src="'.XOOPS_URL.'/images/arrow.gif">';
     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($module->getVar('dirname', 'n') . '_cat')
+    $sql = 'SELECT DISTINCT c.cid, c.title, c.pid, c.allowlist, x.active FROM '
+                   . $xoopsDB->prefix($module->getVar('dirname', 'n').'_cat')
                    . ' c LEFT JOIN '
-                   . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_item_x_cat')
+                   . $xoopsDB->prefix($module->getVar('dirname', 'n').'_item_x_cat')
                    . " x ON (c.cid=x.cid AND x.itemid='"
                    . $get_itemid
                    . '\')  WHERE c.dirid=\''
@@ -528,11 +528,11 @@ 
                 } else {
                     $checked = '';
                 }
-                $checkbox = '<input type="checkbox" name="selected' . $cid . "\"$checked";
+                $checkbox = '<input type="checkbox" name="selected'.$cid."\"$checked";
             } else {
                 $checkbox = '&nbsp;';
             }
-            $output   .= '<tr><td><strong>' . $tab . '' . $plus . '&nbsp;' . $title . "</td><td>&nbsp;</strong></td><td align=\"center\">$checkbox</td></tr>\n";
+            $output   .= '<tr><td><strong>'.$tab.''.$plus.'&nbsp;'.$title."</td><td>&nbsp;</strong></td><td align=\"center\">$checkbox</td></tr>\n";
             $newlevel = $level + 1;
             $output   .= getCatSelectAreaChildren($cid, $newlevel);
         }
@@ -551,7 +551,7 @@ 
     $block       = array();
     $myts        = MyTextSanitizer::getInstance();
     $dirid       = 0;
-    $result      = $xoopsDB->query('SELECT dirid FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items') . ' WHERE itemid = ' . $item . '');
+    $result      = $xoopsDB->query('SELECT dirid FROM '.$xoopsDB->prefix($module->getVar('dirname', 'n').'_items').' WHERE itemid = '.$item.'');
     $num_results = $xoopsDB->getRowsNum($result);
     if (!$result) {
         return 0;
@@ -574,7 +574,7 @@ 
     $block       = array();
     $myts        = MyTextSanitizer::getInstance();
     $userid      = 0;
-    $result      = $xoopsDB->query('SELECT uid FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items') . ' WHERE itemid = ' . $item . '');
+    $result      = $xoopsDB->query('SELECT uid FROM '.$xoopsDB->prefix($module->getVar('dirname', 'n').'_items').' WHERE itemid = '.$item.'');
     $num_results = $xoopsDB->getRowsNum($result);
     if (!$result) {
         return 0;
@@ -594,7 +594,7 @@ 
 function updaterating($sel_id)
 {
     global $xoopsDB;
-    $query       = 'SELECT rating FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_votedata') . ' WHERE itemid = ' . $sel_id . '';
+    $query       = 'SELECT rating FROM '.$xoopsDB->prefix($module->getVar('dirname', 'n').'_votedata').' WHERE itemid = '.$sel_id.'';
     $voteresult  = $xoopsDB->query($query);
     $votesDB     = $xoopsDB->getRowsNum($voteresult);
     $totalrating = 0;
@@ -603,7 +603,7 @@ 
     }
     $finalrating = $totalrating / $votesDB;
     $finalrating = number_format($finalrating, 4);
-    $query       = 'UPDATE ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_items') . " SET rating=$finalrating, votes=$votesDB WHERE itemid = $sel_id";
+    $query       = 'UPDATE '.$xoopsDB->prefix($module->getVar('dirname', 'n').'_items')." SET rating=$finalrating, votes=$votesDB WHERE itemid = $sel_id";
     $xoopsDB->query($query) or exit();
 }
 
@@ -619,9 +619,9 @@ 
     $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($module->getVar('dirname', 'n') . '_address_types') . " WHERE defaultyn = '1'");
+        $result = $xoopsDB->query('SELECT typeid, address, address2, zip, postcode, lat, lon, phone, fax, mobile, city, country, typename, uselocyn FROM '.$xoopsDB->prefix($module->getVar('dirname', 'n').'_address_types')." WHERE defaultyn = '1'");
     } else {
-        $result = $xoopsDB->query('SELECT typeid, address, address2, zip, postcode, lat, lon, phone, fax, mobile, city, country, typename, uselocyn FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_address_types') . " WHERE typeid = '$typeid'");
+        $result = $xoopsDB->query('SELECT typeid, address, address2, zip, postcode, lat, lon, phone, fax, mobile, city, country, typename, uselocyn FROM '.$xoopsDB->prefix($module->getVar('dirname', 'n').'_address_types')." WHERE typeid = '$typeid'");
     }
     $num_results = $xoopsDB->getRowsNum($result);
     if (!$result) {
@@ -660,7 +660,7 @@ 
     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($module->getVar('dirname', 'n') . '_addresses') . " WHERE addrid = '$addrid'");
+    $result       = $xoopsDB->query('SELECT address, address2, zip, postcode, lat, lon, phone, fax, mobile, city, country FROM '.$xoopsDB->prefix($module->getVar('dirname', 'n').'_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' => '');
@@ -695,20 +695,20 @@ 
     } else {
         $isadmin = false;
     }
-    $sql        = 'SELECT cid, title, pid, allowlist FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_cat') . " WHERE dirid='" . $get_dirid . '\' AND pid=\'0\' AND active=\'1\'';
+    $sql        = 'SELECT cid, title, pid, allowlist FROM '.$xoopsDB->prefix($module->getVar('dirname', 'n').'_cat')." WHERE dirid='".$get_dirid.'\' AND pid=\'0\' AND active=\'1\'';
     $mainresult = $xoopsDB->query($sql);
     $numrows    = $xoopsDB->getRowsNum($mainresult);
     $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";
+        $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)) {
             //For each cid, get all 'first children' using getFirstChildId() function
             if ($allowlist != '0') {
-                $checkbox      = '<input type="checkbox" name="selected' . $cid . '"';
+                $checkbox      = '<input type="checkbox" name="selected'.$cid.'"';
                 $selectablecat = true;
                 //$checked = "";
             } else {
@@ -716,23 +716,23 @@ 
                 $checkbox = '&nbsp;';
             }
             //$cats .= $cid."|";
-            $output .= '<tr><td><strong>' . $tab . '' . $title . "</strong></td><td>&nbsp;</td><td align=\"center\">$checkbox</td></tr>\n";
+            $output .= '<tr><td><strong>'.$tab.''.$title."</strong></td><td>&nbsp;</td><td align=\"center\">$checkbox</td></tr>\n";
             $output .= getCatSelectAreaChildren2($cid);
             if ($output !== '') {
                 $selectablecat = true;
             }
         }
     } 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."";
     }
     if ($isadmin) {
-        $output .= '<tr><td><br><a href="admin/categories.php?dirid=' . $get_dirid . '">' . _MD_EDITCATEGORIES . '</a></td></tr>';
+        $output .= '<tr><td><br><a href="admin/categories.php?dirid='.$get_dirid.'">'._MD_EDITCATEGORIES.'</a></td></tr>';
     }
     $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();
     }
 
@@ -750,21 +750,21 @@ 
     $tab    = '&nbsp;';
     $level  = $level;
     $output = '';
-    $plus   = '<img src="' . XOOPS_URL . '/images/arrow.gif">';
+    $plus   = '<img src="'.XOOPS_URL.'/images/arrow.gif">';
     for ($i = 0; $i < $level; ++$i) {
         $tab .= '&nbsp;&nbsp;&nbsp;&nbsp;';
     }
-    $sql         = 'SELECT cid, title, pid, allowlist FROM ' . $xoopsDB->prefix($module->getVar('dirname', 'n') . '_cat') . " WHERE dirid='" . (int)$get_dirid . '\' AND pid=\'' . (int)$childid . '\' AND active=\'1\'';
+    $sql         = 'SELECT cid, title, pid, allowlist FROM '.$xoopsDB->prefix($module->getVar('dirname', 'n').'_cat')." WHERE dirid='".(int) $get_dirid.'\' AND pid=\''.(int) $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 ($allowlist != '0') {
-                $checkbox = '<input type="checkbox" name="selected' . $cid . '"';
+                $checkbox = '<input type="checkbox" name="selected'.$cid.'"';
             } else {
                 $checkbox = '&nbsp;';
             }
-            $output   .= '<tr><td><strong>' . $tab . '' . $plus . '&nbsp;' . $title . "</td><td>&nbsp;</strong></td><td align=\"center\">$checkbox</td></tr>\n";
+            $output   .= '<tr><td><strong>'.$tab.''.$plus.'&nbsp;'.$title."</td><td>&nbsp;</strong></td><td align=\"center\">$checkbox</td></tr>\n";
             $newlevel = $level + 1;
             $output   .= getCatSelectAreaChildren($cid, $newlevel, $get_dirid);
         }

admin/fieldtypes.php

Indentation +253 added lines, -253 removed lines

@@ -34,310 +34,310 @@
 $moddir = $xoopsModule->getVar('dirname');
 
 if (isset($_GET['dirid'])) {
-    $get_dirid = (int)$_GET['dirid'];
+	$get_dirid = (int)$_GET['dirid'];
 }
 if (isset($_GET['typeid'])) {
-    $get_typeid = (int)$_GET['typeid'];
+	$get_typeid = (int)$_GET['typeid'];
 }
 $fieldtypes = array(
-    '0'        => '---',
-    'textbox'  => _MD_FIELDNAMES_TEXTBOX,
-    'textarea' => _MD_FIELDNAMES_TEXTAREA,
-    'dhtml'    => _MD_FIELDNAMES_DHTMLTEXTAREA,
-    'select'   => _MD_FIELDNAMES_SELECT,
-    'checkbox' => _MD_FIELDNAMES_CHECKBOX,
-    'radio'    => _MD_FIELDNAMES_RADIO,
-    'yesno'    => _MD_FIELDNAMES_YESNO,
-    'date'     => _MD_FIELDNAMES_DATE,
-    'datetime' => _MD_FIELDNAMES_DATETIME, //'address' => _MD_FIELDNAMES_ADDRESS, //EDIT-RC10
-    //'locationmap' => _MD_FIELDNAMES_LOCATIONMAP,
-    'rating'   => _MD_FIELDNAMES_RATING,
-    'url'      => _MD_FIELDNAMES_URL
-    //'gallery' => _MD_FIELDNAMES_GALLERY
+	'0'        => '---',
+	'textbox'  => _MD_FIELDNAMES_TEXTBOX,
+	'textarea' => _MD_FIELDNAMES_TEXTAREA,
+	'dhtml'    => _MD_FIELDNAMES_DHTMLTEXTAREA,
+	'select'   => _MD_FIELDNAMES_SELECT,
+	'checkbox' => _MD_FIELDNAMES_CHECKBOX,
+	'radio'    => _MD_FIELDNAMES_RADIO,
+	'yesno'    => _MD_FIELDNAMES_YESNO,
+	'date'     => _MD_FIELDNAMES_DATE,
+	'datetime' => _MD_FIELDNAMES_DATETIME, //'address' => _MD_FIELDNAMES_ADDRESS, //EDIT-RC10
+	//'locationmap' => _MD_FIELDNAMES_LOCATIONMAP,
+	'rating'   => _MD_FIELDNAMES_RATING,
+	'url'      => _MD_FIELDNAMES_URL
+	//'gallery' => _MD_FIELDNAMES_GALLERY
 );
 
 function fieldtypesConfig()
 {
-    global $xoopsDB, $xoopsModule, $xoopsUser, $moddir, $myts, $eh, $fieldtypes;
-    xoops_cp_header();
-    $adminObject = \Xmf\Module\Admin::getInstance();
-    $adminObject->displayNavigation(basename(__FILE__));
-    //adminmenu(2, _MD_A_FTYPESADMIN);
-    echo '<h4>' . _MD_FTYPECONF . '</h4>';
-    echo "<table width='100%' border='0' cellspacing='1' class='outer'>";
-    $result  = $xoopsDB->query('SELECT typeid, title, fieldtype, descr, ext, activeyn FROM ' . $xoopsDB->prefix($xoopsModule->getVar('dirname', 'n') . '_fieldtypes') . ' ORDER BY fieldtype ASC') or $eh->show('0013');
-    $numrows = $xoopsDB->getRowsNum($result);
-    echo '<tr><th>' . _MD_TITLE . '</th><th>' . _MD_TYPE . '</th><th>' . _MD_EXT . '</th><th>' . _MD_ACTIVE . "</th></tr>\n";
-    if ($numrows > 0) {
-        while (list($typeid, $title, $type, $descr, $ext, $status) = $xoopsDB->fetchRow($result)) {
-            if ($status != '0') {
-                $statusyn = '' . _MD_YES . '';
-            } else {
-                $statusyn = '' . _MD_NO . '';
-            }
-            echo '<tr><td class="even" valign="top"><a href="'
-                 . XOOPS_URL
-                 . '/modules/'
-                 . $moddir
-                 . "/admin/fieldtypes.php?op=view&typeid=$typeid\">$title</a></td><td class=\"even\" valign=\"top\">$type</td><td class=\"even\" valign=\"top\">$ext</td><td class=\"even\" valign=\"top\">$statusyn</td>";
-            echo "</td></tr>\n";
-        }
-    } else {
-        echo '<tr><td>' . _MD_NORESULTS . '</td></tr>';
-    }
-    echo '</table>';
-    echo '<br>';
-    echo '<h4>' . _MD_CREATE_NEWFTYPE . '</h4>';
-    echo "<table width='100%' border='0' cellspacing='1' class='outer'><tr><td>";
-    $form = new XoopsThemeForm(_MD_NEWFTYPEFORM, 'submitform', 'fieldtypes.php');
+	global $xoopsDB, $xoopsModule, $xoopsUser, $moddir, $myts, $eh, $fieldtypes;
+	xoops_cp_header();
+	$adminObject = \Xmf\Module\Admin::getInstance();
+	$adminObject->displayNavigation(basename(__FILE__));
+	//adminmenu(2, _MD_A_FTYPESADMIN);
+	echo '<h4>' . _MD_FTYPECONF . '</h4>';
+	echo "<table width='100%' border='0' cellspacing='1' class='outer'>";
+	$result  = $xoopsDB->query('SELECT typeid, title, fieldtype, descr, ext, activeyn FROM ' . $xoopsDB->prefix($xoopsModule->getVar('dirname', 'n') . '_fieldtypes') . ' ORDER BY fieldtype ASC') or $eh->show('0013');
+	$numrows = $xoopsDB->getRowsNum($result);
+	echo '<tr><th>' . _MD_TITLE . '</th><th>' . _MD_TYPE . '</th><th>' . _MD_EXT . '</th><th>' . _MD_ACTIVE . "</th></tr>\n";
+	if ($numrows > 0) {
+		while (list($typeid, $title, $type, $descr, $ext, $status) = $xoopsDB->fetchRow($result)) {
+			if ($status != '0') {
+				$statusyn = '' . _MD_YES . '';
+			} else {
+				$statusyn = '' . _MD_NO . '';
+			}
+			echo '<tr><td class="even" valign="top"><a href="'
+				 . XOOPS_URL
+				 . '/modules/'
+				 . $moddir
+				 . "/admin/fieldtypes.php?op=view&typeid=$typeid\">$title</a></td><td class=\"even\" valign=\"top\">$type</td><td class=\"even\" valign=\"top\">$ext</td><td class=\"even\" valign=\"top\">$statusyn</td>";
+			echo "</td></tr>\n";
+		}
+	} else {
+		echo '<tr><td>' . _MD_NORESULTS . '</td></tr>';
+	}
+	echo '</table>';
+	echo '<br>';
+	echo '<h4>' . _MD_CREATE_NEWFTYPE . '</h4>';
+	echo "<table width='100%' border='0' cellspacing='1' class='outer'><tr><td>";
+	$form = new XoopsThemeForm(_MD_NEWFTYPEFORM, 'submitform', 'fieldtypes.php');
 
-    $form->addElement(new XoopsFormText(_MD_TITLE, 'title', 100, 150, ''), true);
-    //TO DO: change type field to drop down field, based on available types.
-    $element_select = new XoopsFormSelect(_MD_FIELDTYPE, 'field_type');
-    $element_select->addOptionArray($fieldtypes);
-    //$form->addElement($type_select);
-    $form->addElement($element_select);
-    $ext_tray = new XoopsFormElementTray(_MD_EXT, '');
-    $ext_text = new XoopsFormText('', 'ext', 80, 150, '');
-    $ext_text->setExtra('disabled=true');
-    $ext_text->setExtra('style=\'background-color:lightgrey\'');
-    $ext_button = new XoopsFormLabel('', '<INPUT type="button" value="' . _MD_SET_EXT . "\", onClick=\"openExtManager('submitform','" . XOOPS_URL . '/modules/' . $moddir . "/admin/extensionmanager.php','field_type', '" . _MD_SELECT_FORMTYPE . '\')">');
-    $ext_tray->addElement($ext_text);
-    $ext_tray->addElement($ext_button);
-    $form->addElement($ext_tray);
-    $form->addElement(new XoopsFormTextArea(_MD_DESCRIPTION, 'descr', '', 8, 50, ''), true);
-    $form_txtactive = new XoopsFormCheckBox(_MD_ACTIVE, 'status', 0);
-    $form_txtactive->addOption(1, _MD_YESNO);
-    $form->addElement($form_txtactive);
-    $form->addElement(new XoopsFormButton('', 'submit', _MD_SUBMIT, 'submit'));
-    $form->addElement(new XoopsFormHidden('op', 'addFieldtype'));
-    $form->addElement(new XoopsFormHidden('uid', $xoopsUser->getVar('uid')));
-    $form->display();
+	$form->addElement(new XoopsFormText(_MD_TITLE, 'title', 100, 150, ''), true);
+	//TO DO: change type field to drop down field, based on available types.
+	$element_select = new XoopsFormSelect(_MD_FIELDTYPE, 'field_type');
+	$element_select->addOptionArray($fieldtypes);
+	//$form->addElement($type_select);
+	$form->addElement($element_select);
+	$ext_tray = new XoopsFormElementTray(_MD_EXT, '');
+	$ext_text = new XoopsFormText('', 'ext', 80, 150, '');
+	$ext_text->setExtra('disabled=true');
+	$ext_text->setExtra('style=\'background-color:lightgrey\'');
+	$ext_button = new XoopsFormLabel('', '<INPUT type="button" value="' . _MD_SET_EXT . "\", onClick=\"openExtManager('submitform','" . XOOPS_URL . '/modules/' . $moddir . "/admin/extensionmanager.php','field_type', '" . _MD_SELECT_FORMTYPE . '\')">');
+	$ext_tray->addElement($ext_text);
+	$ext_tray->addElement($ext_button);
+	$form->addElement($ext_tray);
+	$form->addElement(new XoopsFormTextArea(_MD_DESCRIPTION, 'descr', '', 8, 50, ''), true);
+	$form_txtactive = new XoopsFormCheckBox(_MD_ACTIVE, 'status', 0);
+	$form_txtactive->addOption(1, _MD_YESNO);
+	$form->addElement($form_txtactive);
+	$form->addElement(new XoopsFormButton('', 'submit', _MD_SUBMIT, 'submit'));
+	$form->addElement(new XoopsFormHidden('op', 'addFieldtype'));
+	$form->addElement(new XoopsFormHidden('uid', $xoopsUser->getVar('uid')));
+	$form->display();
 
-    //Javascript function to check if field type is selected. If not, then warn the user. Otherwise
-    //open the extension manager window.
-    $js = '';
-    $js .= "\n<!-- Start Extension Manager JavaScript //-->\n<script type='text/javascript'>\n<!--//\n";
-    $js .= "function openExtManager(formname,url,ele,warning) {\n";
-    $js .= "myform = window.document.submitform;\n";
-    $js .= "var typeid = myform.field_type.value;\n";
-    $js .= "if (typeid == 0) {
+	//Javascript function to check if field type is selected. If not, then warn the user. Otherwise
+	//open the extension manager window.
+	$js = '';
+	$js .= "\n<!-- Start Extension Manager JavaScript //-->\n<script type='text/javascript'>\n<!--//\n";
+	$js .= "function openExtManager(formname,url,ele,warning) {\n";
+	$js .= "myform = window.document.submitform;\n";
+	$js .= "var typeid = myform.field_type.value;\n";
+	$js .= "if (typeid == 0) {
         alert([warning]);
         } else {
         window.open([url],'ext_window','width=600,height=450');
         }\n";
-    $js .= "}\n";
-    $js .= "//--></script>\n<!-- End Extension Manager JavaScript //-->\n";
-    echo $js;
+	$js .= "}\n";
+	$js .= "//--></script>\n<!-- End Extension Manager JavaScript //-->\n";
+	echo $js;
 
-    echo '</td></tr></table>';
-    xoops_cp_footer();
+	echo '</td></tr></table>';
+	xoops_cp_footer();
 }
 
 function viewFieldtype()
 {
-    global $xoopsDB, $mytree, $mytree2, $xoopsUser, $get_typeid, $moddir, $eh, $fieldtypes;
-    xoops_cp_header();
-    //adminmenu(2, _MD_A_FTYPESADMIN);
-    echo '<h4>' . _MD_VIEW_FIELDTYPE . '</h4>';
-    echo "<table width='100%' border='0' cellspacing='1' class='outer'><tr><td>";
-    $result  = $xoopsDB->query('SELECT typeid, title, fieldtype, descr, ext, activeyn FROM ' . $xoopsDB->prefix($xoopsModule->getVar('dirname', 'n') . '_fieldtypes') . " WHERE typeid='" . $get_typeid . '\'') or $eh->show('0013');
-    $numrows = $xoopsDB->getRowsNum($result);
-    if ($numrows > 0) {
-        while (list($typeid, $title, $fieldtype, $descr, $ext, $activeyn) = $xoopsDB->fetchRow($result)) {
-            $form = new XoopsThemeForm(_MD_EDITFTYPEFORM, 'submitform', 'fieldtypes.php');
-            $form->addElement(new XoopsFormText(_MD_TITLE, 'title', 100, 150, "$title"), true);
-            //TO DO: change type field to drop down field, based on available types.
-            $element_select = new XoopsFormSelect(_MD_FIELDTYPE, 'field_type', $fieldtype);
-            $element_select->addOptionArray($fieldtypes);
+	global $xoopsDB, $mytree, $mytree2, $xoopsUser, $get_typeid, $moddir, $eh, $fieldtypes;
+	xoops_cp_header();
+	//adminmenu(2, _MD_A_FTYPESADMIN);
+	echo '<h4>' . _MD_VIEW_FIELDTYPE . '</h4>';
+	echo "<table width='100%' border='0' cellspacing='1' class='outer'><tr><td>";
+	$result  = $xoopsDB->query('SELECT typeid, title, fieldtype, descr, ext, activeyn FROM ' . $xoopsDB->prefix($xoopsModule->getVar('dirname', 'n') . '_fieldtypes') . " WHERE typeid='" . $get_typeid . '\'') or $eh->show('0013');
+	$numrows = $xoopsDB->getRowsNum($result);
+	if ($numrows > 0) {
+		while (list($typeid, $title, $fieldtype, $descr, $ext, $activeyn) = $xoopsDB->fetchRow($result)) {
+			$form = new XoopsThemeForm(_MD_EDITFTYPEFORM, 'submitform', 'fieldtypes.php');
+			$form->addElement(new XoopsFormText(_MD_TITLE, 'title', 100, 150, "$title"), true);
+			//TO DO: change type field to drop down field, based on available types.
+			$element_select = new XoopsFormSelect(_MD_FIELDTYPE, 'field_type', $fieldtype);
+			$element_select->addOptionArray($fieldtypes);
 
-            //$form->addElement($type_select);
-            $form->addElement($element_select);
-            $ext_tray = new XoopsFormElementTray(_MD_EXT, '');
-            $ext_text = new XoopsFormText('', 'ext', 80, 150, "$ext");
-            $ext_text->setExtra('style=\'background-color:lightgrey\'');
-            $ext_button = new XoopsFormLabel('', '<INPUT type="button" value="' . _MD_SET_EXT . "\", onClick=\"openExtManager('submitform','" . XOOPS_URL . '/modules/' . $moddir . "/admin/extensionmanager.php','field_type', '" . _MD_SELECT_FORMTYPE . '\')">');
-            $ext_tray->addElement($ext_text);
-            $ext_tray->addElement($ext_button);
-            $form->addElement($ext_tray);
-            $form->addElement(new XoopsFormTextArea(_MD_DESCRIPTION, 'descr', "$descr", 8, 50, ''), true);
-            $form_txtactive = new XoopsFormCheckBox(_MD_ACTIVE, 'status', $activeyn);
-            $form_txtactive->addOption(1, _MD_YESNO);
-            $form->addElement($form_txtactive);
-            $form->addElement(new XoopsFormButton('', 'submit', _MD_SUBMIT, 'submit'));
-            $form->addElement(new XoopsFormHidden('op', 'editFieldtype'));
-            $form->addElement(new XoopsFormHidden('typeid', $get_typeid));
-            $form->addElement(new XoopsFormHidden('uid', $xoopsUser->getVar('uid')));
-            $form->display();
+			//$form->addElement($type_select);
+			$form->addElement($element_select);
+			$ext_tray = new XoopsFormElementTray(_MD_EXT, '');
+			$ext_text = new XoopsFormText('', 'ext', 80, 150, "$ext");
+			$ext_text->setExtra('style=\'background-color:lightgrey\'');
+			$ext_button = new XoopsFormLabel('', '<INPUT type="button" value="' . _MD_SET_EXT . "\", onClick=\"openExtManager('submitform','" . XOOPS_URL . '/modules/' . $moddir . "/admin/extensionmanager.php','field_type', '" . _MD_SELECT_FORMTYPE . '\')">');
+			$ext_tray->addElement($ext_text);
+			$ext_tray->addElement($ext_button);
+			$form->addElement($ext_tray);
+			$form->addElement(new XoopsFormTextArea(_MD_DESCRIPTION, 'descr', "$descr", 8, 50, ''), true);
+			$form_txtactive = new XoopsFormCheckBox(_MD_ACTIVE, 'status', $activeyn);
+			$form_txtactive->addOption(1, _MD_YESNO);
+			$form->addElement($form_txtactive);
+			$form->addElement(new XoopsFormButton('', 'submit', _MD_SUBMIT, 'submit'));
+			$form->addElement(new XoopsFormHidden('op', 'editFieldtype'));
+			$form->addElement(new XoopsFormHidden('typeid', $get_typeid));
+			$form->addElement(new XoopsFormHidden('uid', $xoopsUser->getVar('uid')));
+			$form->display();
 
-            //Javascript function to check if field type is selected. If not, then warn the user. Otherwise
-            //open the extension manager window.
-            $js = '';
-            $js .= "\n<!-- Start Extension Manager JavaScript //-->\n<script type='text/javascript'>\n<!--//\n";
-            $js .= "function openExtManager(formname,url,ele,warning) {\n";
-            $js .= "myform = window.document.submitform;\n";
-            $js .= "var typeid = myform.field_type.value;\n";
-            $js .= "if (typeid == 0) {
+			//Javascript function to check if field type is selected. If not, then warn the user. Otherwise
+			//open the extension manager window.
+			$js = '';
+			$js .= "\n<!-- Start Extension Manager JavaScript //-->\n<script type='text/javascript'>\n<!--//\n";
+			$js .= "function openExtManager(formname,url,ele,warning) {\n";
+			$js .= "myform = window.document.submitform;\n";
+			$js .= "var typeid = myform.field_type.value;\n";
+			$js .= "if (typeid == 0) {
                 alert([warning]);
                 } else {
                 window.open([url],'ext_window','width=600,height=450');
                 }\n";
-            $js .= "}\n";
-            $js .= "//--></script>\n<!-- End Extension Manager JavaScript //-->\n";
-            echo $js;
-        }
-    }
-    echo '</td></tr></table>';
-    //echo "<form name=\"deleteFieldTypeForm\" action=\"\"
-    xoops_cp_footer();
+			$js .= "}\n";
+			$js .= "//--></script>\n<!-- End Extension Manager JavaScript //-->\n";
+			echo $js;
+		}
+	}
+	echo '</td></tr></table>';
+	//echo "<form name=\"deleteFieldTypeForm\" action=\"\"
+	xoops_cp_footer();
 }
 
 function addFieldtype()
 {
-    global $xoopsDB, $_POST, $myts, $eh, $xoopsModule;
-    $p_title     = $myts->makeTboxData4Save($_POST['title']);
-    $p_fieldtype = $_POST['field_type'];
-    $p_descr     = $myts->makeTareaData4Save($_POST['descr']);
-    if (isset($_POST['ext'])) {
-        $p_ext = $_POST['ext'];
-    } else {
-        $p_ext = '';
-    }
-    if (isset($_POST['status'])) {
-        $p_status = (int)$_POST['status'];
-    } else {
-        $p_status = 0;
-    }
-    $newid = $xoopsDB->genId($xoopsDB->prefix($xoopsModule->getVar('dirname', 'n') . '_fieldtypes') . '_typeid_seq');
-    $sql   = sprintf("INSERT INTO %s (typeid, title, fieldtype, descr, ext, activeyn) VALUES (%u, '%s', '%s', '%s', '%s', '%s')", $xoopsDB->prefix($xoopsModule->getVar('dirname', 'n') . '_fieldtypes'), $newid, $p_title, $p_fieldtype, $p_descr, $p_ext, $p_status);
-    $xoopsDB->query($sql) or $eh->show('0013');
-    redirect_header('fieldtypes.php', 2, _MD_SAVED);
-    exit();
+	global $xoopsDB, $_POST, $myts, $eh, $xoopsModule;
+	$p_title     = $myts->makeTboxData4Save($_POST['title']);
+	$p_fieldtype = $_POST['field_type'];
+	$p_descr     = $myts->makeTareaData4Save($_POST['descr']);
+	if (isset($_POST['ext'])) {
+		$p_ext = $_POST['ext'];
+	} else {
+		$p_ext = '';
+	}
+	if (isset($_POST['status'])) {
+		$p_status = (int)$_POST['status'];
+	} else {
+		$p_status = 0;
+	}
+	$newid = $xoopsDB->genId($xoopsDB->prefix($xoopsModule->getVar('dirname', 'n') . '_fieldtypes') . '_typeid_seq');
+	$sql   = sprintf("INSERT INTO %s (typeid, title, fieldtype, descr, ext, activeyn) VALUES (%u, '%s', '%s', '%s', '%s', '%s')", $xoopsDB->prefix($xoopsModule->getVar('dirname', 'n') . '_fieldtypes'), $newid, $p_title, $p_fieldtype, $p_descr, $p_ext, $p_status);
+	$xoopsDB->query($sql) or $eh->show('0013');
+	redirect_header('fieldtypes.php', 2, _MD_SAVED);
+	exit();
 }
 
 function editFieldtype()
 {
-    global $xoopsDB, $_POST, $myts, $eh;
-    if (isset($_POST['typeid'])) {
-        $p_typeid = (int)$_POST['typeid'];
-    } else {
-        exit();
-    }
-    $p_title     = $myts->makeTboxData4Save($_POST['title']);
-    $p_fieldtype = $_POST['field_type'];
-    $p_descr     = $myts->makeTareaData4Save($_POST['descr']);
-    if (isset($_POST['ext'])) {
-        $p_ext = $_POST['ext'];
-    } else {
-        $p_ext = '';
-    }
-    if (isset($_POST['status'])) {
-        $p_status = (int)$_POST['status'];
-    } else {
-        $p_status = 0;
-    }
-    $sql = 'UPDATE ' . $xoopsDB->prefix($xoopsModule->getVar('dirname', 'n') . '_fieldtypes') . " SET title = '$p_title', fieldtype='$p_fieldtype', ext='$p_ext', activeyn='$p_status' WHERE typeid = $p_typeid";
-    $xoopsDB->query($sql) or $eh->show('0013');
-    redirect_header("fieldtypes.php?op=view&typeid=$p_typeid", 2, _MD_SAVED);
-    exit();
+	global $xoopsDB, $_POST, $myts, $eh;
+	if (isset($_POST['typeid'])) {
+		$p_typeid = (int)$_POST['typeid'];
+	} else {
+		exit();
+	}
+	$p_title     = $myts->makeTboxData4Save($_POST['title']);
+	$p_fieldtype = $_POST['field_type'];
+	$p_descr     = $myts->makeTareaData4Save($_POST['descr']);
+	if (isset($_POST['ext'])) {
+		$p_ext = $_POST['ext'];
+	} else {
+		$p_ext = '';
+	}
+	if (isset($_POST['status'])) {
+		$p_status = (int)$_POST['status'];
+	} else {
+		$p_status = 0;
+	}
+	$sql = 'UPDATE ' . $xoopsDB->prefix($xoopsModule->getVar('dirname', 'n') . '_fieldtypes') . " SET title = '$p_title', fieldtype='$p_fieldtype', ext='$p_ext', activeyn='$p_status' WHERE typeid = $p_typeid";
+	$xoopsDB->query($sql) or $eh->show('0013');
+	redirect_header("fieldtypes.php?op=view&typeid=$p_typeid", 2, _MD_SAVED);
+	exit();
 }
 
 function newCat()
 {
-    global $xoopsDB, $myts, $eh;
-    if (isset($_POST['dirid'])) {
-        $p_dirid = (int)$_POST['dirid'];
-    } else {
-        exit();
-    }
-    $p_title       = $myts->makeTboxData4Save($_POST['title']);
-    $p_active      = (int)$_POST['active'];
-    $p_pid         = (int)$_POST['pid'];
-    $p_allowlist   = (int)$_POST['allowlist'];
-    $p_showpopular = (int)$_POST['showpopular'];
-    if (isset($_POST['descr'])) {
-        $p_descr = $myts->makeTareaData4Save($_POST['descr']);
-    } else {
-        $p_descr = '';
-    }
-    $newid = $xoopsDB->genId($xoopsDB->prefix($xoopsModule->getVar('dirname', 'n') . '_cat') . '_cid_seq');
-    $sql   = sprintf("INSERT INTO %s (cid, dirid, title, active, pid) VALUES (%u, %u, '%s', %u, %u)", $xoopsDB->prefix($xoopsModule->getVar('dirname', 'n') . '_cat'), $newid, $p_dirid, $p_title, $p_active, $p_pid);
-    //echo $sql;
-    $xoopsDB->query($sql) or $eh->show('0013');
-    if ($newid == 0) {
-        $cid = $xoopsDB->getInsertId();
-    }
-    $newid = $xoopsDB->genId($xoopsDB->prefix($xoopsModule->getVar('dirname', 'n') . '_cat_txt') . '_txtid_seq');
-    $sql2  = sprintf("INSERT INTO %s (txtid, cid, TEXT, active, created) VALUES (%u, %u, '%s', %u, '%s')", $xoopsDB->prefix($xoopsModule->getVar('dirname', 'n') . '_cat_txt'), $newid, $cid, $p_descr, '1', time());
-    //echo $sql2;
-    $xoopsDB->query($sql2) or $eh->show('0013');
-    redirect_header("categories.php?op=edit&cid=$newid", 0, _MD_CAT_UPDATED);
-    exit();
+	global $xoopsDB, $myts, $eh;
+	if (isset($_POST['dirid'])) {
+		$p_dirid = (int)$_POST['dirid'];
+	} else {
+		exit();
+	}
+	$p_title       = $myts->makeTboxData4Save($_POST['title']);
+	$p_active      = (int)$_POST['active'];
+	$p_pid         = (int)$_POST['pid'];
+	$p_allowlist   = (int)$_POST['allowlist'];
+	$p_showpopular = (int)$_POST['showpopular'];
+	if (isset($_POST['descr'])) {
+		$p_descr = $myts->makeTareaData4Save($_POST['descr']);
+	} else {
+		$p_descr = '';
+	}
+	$newid = $xoopsDB->genId($xoopsDB->prefix($xoopsModule->getVar('dirname', 'n') . '_cat') . '_cid_seq');
+	$sql   = sprintf("INSERT INTO %s (cid, dirid, title, active, pid) VALUES (%u, %u, '%s', %u, %u)", $xoopsDB->prefix($xoopsModule->getVar('dirname', 'n') . '_cat'), $newid, $p_dirid, $p_title, $p_active, $p_pid);
+	//echo $sql;
+	$xoopsDB->query($sql) or $eh->show('0013');
+	if ($newid == 0) {
+		$cid = $xoopsDB->getInsertId();
+	}
+	$newid = $xoopsDB->genId($xoopsDB->prefix($xoopsModule->getVar('dirname', 'n') . '_cat_txt') . '_txtid_seq');
+	$sql2  = sprintf("INSERT INTO %s (txtid, cid, TEXT, active, created) VALUES (%u, %u, '%s', %u, '%s')", $xoopsDB->prefix($xoopsModule->getVar('dirname', 'n') . '_cat_txt'), $newid, $cid, $p_descr, '1', time());
+	//echo $sql2;
+	$xoopsDB->query($sql2) or $eh->show('0013');
+	redirect_header("categories.php?op=edit&cid=$newid", 0, _MD_CAT_UPDATED);
+	exit();
 }
 
 if (!isset($_POST['op'])) {
-    $op = isset($_GET['op']) ? $_GET['op'] : 'main';
+	$op = isset($_GET['op']) ? $_GET['op'] : 'main';
 } else {
-    $op = $_POST['op'];
+	$op = $_POST['op'];
 }
 switch ($op) {
-    case 'view':
-        viewFieldtype();
-        break;
-    case 'editFieldtype':
-        editFieldtype();
-        break;
-    case 'addFieldtype':
-        addFieldtype();
-        break;
-    default:
-        fieldtypesConfig();
-        break;
+	case 'view':
+		viewFieldtype();
+		break;
+	case 'editFieldtype':
+		editFieldtype();
+		break;
+	case 'addFieldtype':
+		addFieldtype();
+		break;
+	default:
+		fieldtypesConfig();
+		break;
 }
 
 function getCatOverview()
 {
-    global $xoopsDB, $myts, $eh, $mytree, $get_dirid, $moddir;
-    $mainresult = $xoopsDB->query('SELECT cid, title, active, pid FROM ' . $xoopsDB->prefix($xoopsModule->getVar('dirname', 'n') . '_cat') . " WHERE dirid='" . $get_dirid . '\' AND pid=\'0\'');
-    $numrows    = $xoopsDB->getRowsNum($mainresult);
-    $output     = '';
-    if ($numrows > 0) {
-        $output = '<th>' . _MD_CATTITLE . '</th><th>' . _MD_ACTIVEYN . '</th><th>' . _MD_PARENTCAT . "</th>\n";
-        $brench = 0;
-        $tab    = '';
-        while (list($cid, $title, $activeyn, $pid) = $xoopsDB->fetchRow($mainresult)) {
-            $output .= '<tr><td>' . $tab . '<a href="' . XOOPS_URL . "/modules/$moddir/admin/categories.php?op=edit&cid=$cid\">" . $title . '</a></td><td>' . $activeyn . "</td></tr>\n";
-            $output .= getChildrenCategories($cid);
-        }
-    } else {
-        $output = '' . _MD_NORESULTS . '';
-    }
+	global $xoopsDB, $myts, $eh, $mytree, $get_dirid, $moddir;
+	$mainresult = $xoopsDB->query('SELECT cid, title, active, pid FROM ' . $xoopsDB->prefix($xoopsModule->getVar('dirname', 'n') . '_cat') . " WHERE dirid='" . $get_dirid . '\' AND pid=\'0\'');
+	$numrows    = $xoopsDB->getRowsNum($mainresult);
+	$output     = '';
+	if ($numrows > 0) {
+		$output = '<th>' . _MD_CATTITLE . '</th><th>' . _MD_ACTIVEYN . '</th><th>' . _MD_PARENTCAT . "</th>\n";
+		$brench = 0;
+		$tab    = '';
+		while (list($cid, $title, $activeyn, $pid) = $xoopsDB->fetchRow($mainresult)) {
+			$output .= '<tr><td>' . $tab . '<a href="' . XOOPS_URL . "/modules/$moddir/admin/categories.php?op=edit&cid=$cid\">" . $title . '</a></td><td>' . $activeyn . "</td></tr>\n";
+			$output .= getChildrenCategories($cid);
+		}
+	} else {
+		$output = '' . _MD_NORESULTS . '';
+	}
 
-    return $output;
+	return $output;
 }
 
 function getChildrenCategories($childid = '0', $level = '1')
 {
-    global $xoopsDB, $myts, $eh, $mytree;
-    $firstchildcats = $mytree->getFirstChildId($childid);
-    $tab            = '';
-    $output         = '';
-    $plus           = '<img src="' . XOOPS_URL . "\images\arrow.jpg\">";
-    for ($i = 0; $i < $level; ++$i) {
-        $tab .= '&nbsp;&nbsp;';
-    }
-    foreach ($firstchildcats as $childid) {
-        $childresult = $xoopsDB->query('SELECT cid, title, active, pid FROM ' . $xoopsDB->prefix($xoopsModule->getVar('dirname', 'n') . '_cat') . " WHERE pid='" . $childid . '\'');
-        //$childresult = $xoopsDB->query("SELECT cid, title, active, pid FROM ".$xoopsDB->prefix("efqdiralpha1_cat")." WHERE dirid='".$dirid."' AND pid='".$childid."'");
-        $numrows = $xoopsDB->getRowsNum($childresult);
-        if ($numrows > 0) {
-            while (list($cid, $title, $activeyn, $pid) = $xoopsDB->fetchRow($childresult)) {
-                $output   .= '<tr><td>' . $tab . '' . $plus . '</td><td>' . $title . '</td><td>' . $activeyn . "</td></tr>\n";
-                $newlevel = ++$level;
-                $output   .= getChildrenCategories($cid, $newlevel);
-            }
-        }
-    }
+	global $xoopsDB, $myts, $eh, $mytree;
+	$firstchildcats = $mytree->getFirstChildId($childid);
+	$tab            = '';
+	$output         = '';
+	$plus           = '<img src="' . XOOPS_URL . "\images\arrow.jpg\">";
+	for ($i = 0; $i < $level; ++$i) {
+		$tab .= '&nbsp;&nbsp;';
+	}
+	foreach ($firstchildcats as $childid) {
+		$childresult = $xoopsDB->query('SELECT cid, title, active, pid FROM ' . $xoopsDB->prefix($xoopsModule->getVar('dirname', 'n') . '_cat') . " WHERE pid='" . $childid . '\'');
+		//$childresult = $xoopsDB->query("SELECT cid, title, active, pid FROM ".$xoopsDB->prefix("efqdiralpha1_cat")." WHERE dirid='".$dirid."' AND pid='".$childid."'");
+		$numrows = $xoopsDB->getRowsNum($childresult);
+		if ($numrows > 0) {
+			while (list($cid, $title, $activeyn, $pid) = $xoopsDB->fetchRow($childresult)) {
+				$output   .= '<tr><td>' . $tab . '' . $plus . '</td><td>' . $title . '</td><td>' . $activeyn . "</td></tr>\n";
+				$newlevel = ++$level;
+				$output   .= getChildrenCategories($cid, $newlevel);
+			}
+		}
+	}
 
-    return $output;
+	return $output;
 }

Switch Indentation +12 added lines, -12 removed lines

@@ -281,18 +281,18 @@
     $op = $_POST['op'];
 }
 switch ($op) {
-    case 'view':
-        viewFieldtype();
-        break;
-    case 'editFieldtype':
-        editFieldtype();
-        break;
-    case 'addFieldtype':
-        addFieldtype();
-        break;
-    default:
-        fieldtypesConfig();
-        break;
+    	case 'view':
+        	viewFieldtype();
+        	break;
+    	case 'editFieldtype':
+        	editFieldtype();
+        	break;
+    	case 'addFieldtype':
+        	addFieldtype();
+        	break;
+    	default:
+        	fieldtypesConfig();
+        	break;
 }
 
 function getCatOverview()

Spacing +43 added lines, -43 removed lines

@@ -18,26 +18,26 @@ 
  * @author       XOOPS Development Team,
  */
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 //include __DIR__ . '/../../../include/cp_header.php';
 
-include __DIR__ . '/../include/functions.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
-require_once XOOPS_ROOT_PATH . '/include/xoopscodes.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-require_once XOOPS_ROOT_PATH . '/class/module.errorhandler.php';
+include __DIR__.'/../include/functions.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopstree.php';
+require_once XOOPS_ROOT_PATH.'/include/xoopscodes.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
+require_once XOOPS_ROOT_PATH.'/class/module.errorhandler.php';
 $myts    = MyTextSanitizer::getInstance();
 $eh      = new ErrorHandler;
-$mytree  = new XoopsTree($xoopsDB->prefix($xoopsModule->getVar('dirname', 'n') . '_cat'), 'cid', 'pid');
-$mytree2 = new XoopsTree($xoopsDB->prefix($xoopsModule->getVar('dirname', 'n') . '_fieldtypes'), 'typeid', 0);
+$mytree  = new XoopsTree($xoopsDB->prefix($xoopsModule->getVar('dirname', 'n').'_cat'), 'cid', 'pid');
+$mytree2 = new XoopsTree($xoopsDB->prefix($xoopsModule->getVar('dirname', 'n').'_fieldtypes'), 'typeid', 0);
 
 $moddir = $xoopsModule->getVar('dirname');
 
 if (isset($_GET['dirid'])) {
-    $get_dirid = (int)$_GET['dirid'];
+    $get_dirid = (int) $_GET['dirid'];
 }
 if (isset($_GET['typeid'])) {
-    $get_typeid = (int)$_GET['typeid'];
+    $get_typeid = (int) $_GET['typeid'];
 }
 $fieldtypes = array(
     '0'        => '---',
@@ -63,17 +63,17 @@ 
     $adminObject = \Xmf\Module\Admin::getInstance();
     $adminObject->displayNavigation(basename(__FILE__));
     //adminmenu(2, _MD_A_FTYPESADMIN);
-    echo '<h4>' . _MD_FTYPECONF . '</h4>';
+    echo '<h4>'._MD_FTYPECONF.'</h4>';
     echo "<table width='100%' border='0' cellspacing='1' class='outer'>";
-    $result  = $xoopsDB->query('SELECT typeid, title, fieldtype, descr, ext, activeyn FROM ' . $xoopsDB->prefix($xoopsModule->getVar('dirname', 'n') . '_fieldtypes') . ' ORDER BY fieldtype ASC') or $eh->show('0013');
+    $result  = $xoopsDB->query('SELECT typeid, title, fieldtype, descr, ext, activeyn FROM '.$xoopsDB->prefix($xoopsModule->getVar('dirname', 'n').'_fieldtypes').' ORDER BY fieldtype ASC') or $eh->show('0013');
     $numrows = $xoopsDB->getRowsNum($result);
-    echo '<tr><th>' . _MD_TITLE . '</th><th>' . _MD_TYPE . '</th><th>' . _MD_EXT . '</th><th>' . _MD_ACTIVE . "</th></tr>\n";
+    echo '<tr><th>'._MD_TITLE.'</th><th>'._MD_TYPE.'</th><th>'._MD_EXT.'</th><th>'._MD_ACTIVE."</th></tr>\n";
     if ($numrows > 0) {
         while (list($typeid, $title, $type, $descr, $ext, $status) = $xoopsDB->fetchRow($result)) {
             if ($status != '0') {
-                $statusyn = '' . _MD_YES . '';
+                $statusyn = ''._MD_YES.'';
             } else {
-                $statusyn = '' . _MD_NO . '';
+                $statusyn = ''._MD_NO.'';
             }
             echo '<tr><td class="even" valign="top"><a href="'
                  . XOOPS_URL
@@ -83,11 +83,11 @@ 
             echo "</td></tr>\n";
         }
     } else {
-        echo '<tr><td>' . _MD_NORESULTS . '</td></tr>';
+        echo '<tr><td>'._MD_NORESULTS.'</td></tr>';
     }
     echo '</table>';
     echo '<br>';
-    echo '<h4>' . _MD_CREATE_NEWFTYPE . '</h4>';
+    echo '<h4>'._MD_CREATE_NEWFTYPE.'</h4>';
     echo "<table width='100%' border='0' cellspacing='1' class='outer'><tr><td>";
     $form = new XoopsThemeForm(_MD_NEWFTYPEFORM, 'submitform', 'fieldtypes.php');
 
@@ -101,7 +101,7 @@ 
     $ext_text = new XoopsFormText('', 'ext', 80, 150, '');
     $ext_text->setExtra('disabled=true');
     $ext_text->setExtra('style=\'background-color:lightgrey\'');
-    $ext_button = new XoopsFormLabel('', '<INPUT type="button" value="' . _MD_SET_EXT . "\", onClick=\"openExtManager('submitform','" . XOOPS_URL . '/modules/' . $moddir . "/admin/extensionmanager.php','field_type', '" . _MD_SELECT_FORMTYPE . '\')">');
+    $ext_button = new XoopsFormLabel('', '<INPUT type="button" value="'._MD_SET_EXT."\", onClick=\"openExtManager('submitform','".XOOPS_URL.'/modules/'.$moddir."/admin/extensionmanager.php','field_type', '"._MD_SELECT_FORMTYPE.'\')">');
     $ext_tray->addElement($ext_text);
     $ext_tray->addElement($ext_button);
     $form->addElement($ext_tray);
@@ -139,9 +139,9 @@ 
     global $xoopsDB, $mytree, $mytree2, $xoopsUser, $get_typeid, $moddir, $eh, $fieldtypes;
     xoops_cp_header();
     //adminmenu(2, _MD_A_FTYPESADMIN);
-    echo '<h4>' . _MD_VIEW_FIELDTYPE . '</h4>';
+    echo '<h4>'._MD_VIEW_FIELDTYPE.'</h4>';
     echo "<table width='100%' border='0' cellspacing='1' class='outer'><tr><td>";
-    $result  = $xoopsDB->query('SELECT typeid, title, fieldtype, descr, ext, activeyn FROM ' . $xoopsDB->prefix($xoopsModule->getVar('dirname', 'n') . '_fieldtypes') . " WHERE typeid='" . $get_typeid . '\'') or $eh->show('0013');
+    $result  = $xoopsDB->query('SELECT typeid, title, fieldtype, descr, ext, activeyn FROM '.$xoopsDB->prefix($xoopsModule->getVar('dirname', 'n').'_fieldtypes')." WHERE typeid='".$get_typeid.'\'') or $eh->show('0013');
     $numrows = $xoopsDB->getRowsNum($result);
     if ($numrows > 0) {
         while (list($typeid, $title, $fieldtype, $descr, $ext, $activeyn) = $xoopsDB->fetchRow($result)) {
@@ -156,7 +156,7 @@ 
             $ext_tray = new XoopsFormElementTray(_MD_EXT, '');
             $ext_text = new XoopsFormText('', 'ext', 80, 150, "$ext");
             $ext_text->setExtra('style=\'background-color:lightgrey\'');
-            $ext_button = new XoopsFormLabel('', '<INPUT type="button" value="' . _MD_SET_EXT . "\", onClick=\"openExtManager('submitform','" . XOOPS_URL . '/modules/' . $moddir . "/admin/extensionmanager.php','field_type', '" . _MD_SELECT_FORMTYPE . '\')">');
+            $ext_button = new XoopsFormLabel('', '<INPUT type="button" value="'._MD_SET_EXT."\", onClick=\"openExtManager('submitform','".XOOPS_URL.'/modules/'.$moddir."/admin/extensionmanager.php','field_type', '"._MD_SELECT_FORMTYPE.'\')">');
             $ext_tray->addElement($ext_text);
             $ext_tray->addElement($ext_button);
             $form->addElement($ext_tray);
@@ -204,12 +204,12 @@ 
         $p_ext = '';
     }
     if (isset($_POST['status'])) {
-        $p_status = (int)$_POST['status'];
+        $p_status = (int) $_POST['status'];
     } else {
         $p_status = 0;
     }
-    $newid = $xoopsDB->genId($xoopsDB->prefix($xoopsModule->getVar('dirname', 'n') . '_fieldtypes') . '_typeid_seq');
-    $sql   = sprintf("INSERT INTO %s (typeid, title, fieldtype, descr, ext, activeyn) VALUES (%u, '%s', '%s', '%s', '%s', '%s')", $xoopsDB->prefix($xoopsModule->getVar('dirname', 'n') . '_fieldtypes'), $newid, $p_title, $p_fieldtype, $p_descr, $p_ext, $p_status);
+    $newid = $xoopsDB->genId($xoopsDB->prefix($xoopsModule->getVar('dirname', 'n').'_fieldtypes').'_typeid_seq');
+    $sql   = sprintf("INSERT INTO %s (typeid, title, fieldtype, descr, ext, activeyn) VALUES (%u, '%s', '%s', '%s', '%s', '%s')", $xoopsDB->prefix($xoopsModule->getVar('dirname', 'n').'_fieldtypes'), $newid, $p_title, $p_fieldtype, $p_descr, $p_ext, $p_status);
     $xoopsDB->query($sql) or $eh->show('0013');
     redirect_header('fieldtypes.php', 2, _MD_SAVED);
     exit();
@@ -219,7 +219,7 @@ 
 {
     global $xoopsDB, $_POST, $myts, $eh;
     if (isset($_POST['typeid'])) {
-        $p_typeid = (int)$_POST['typeid'];
+        $p_typeid = (int) $_POST['typeid'];
     } else {
         exit();
     }
@@ -232,11 +232,11 @@ 
         $p_ext = '';
     }
     if (isset($_POST['status'])) {
-        $p_status = (int)$_POST['status'];
+        $p_status = (int) $_POST['status'];
     } else {
         $p_status = 0;
     }
-    $sql = 'UPDATE ' . $xoopsDB->prefix($xoopsModule->getVar('dirname', 'n') . '_fieldtypes') . " SET title = '$p_title', fieldtype='$p_fieldtype', ext='$p_ext', activeyn='$p_status' WHERE typeid = $p_typeid";
+    $sql = 'UPDATE '.$xoopsDB->prefix($xoopsModule->getVar('dirname', 'n').'_fieldtypes')." SET title = '$p_title', fieldtype='$p_fieldtype', ext='$p_ext', activeyn='$p_status' WHERE typeid = $p_typeid";
     $xoopsDB->query($sql) or $eh->show('0013');
     redirect_header("fieldtypes.php?op=view&typeid=$p_typeid", 2, _MD_SAVED);
     exit();
@@ -246,29 +246,29 @@ 
 {
     global $xoopsDB, $myts, $eh;
     if (isset($_POST['dirid'])) {
-        $p_dirid = (int)$_POST['dirid'];
+        $p_dirid = (int) $_POST['dirid'];
     } else {
         exit();
     }
     $p_title       = $myts->makeTboxData4Save($_POST['title']);
-    $p_active      = (int)$_POST['active'];
-    $p_pid         = (int)$_POST['pid'];
-    $p_allowlist   = (int)$_POST['allowlist'];
-    $p_showpopular = (int)$_POST['showpopular'];
+    $p_active      = (int) $_POST['active'];
+    $p_pid         = (int) $_POST['pid'];
+    $p_allowlist   = (int) $_POST['allowlist'];
+    $p_showpopular = (int) $_POST['showpopular'];
     if (isset($_POST['descr'])) {
         $p_descr = $myts->makeTareaData4Save($_POST['descr']);
     } else {
         $p_descr = '';
     }
-    $newid = $xoopsDB->genId($xoopsDB->prefix($xoopsModule->getVar('dirname', 'n') . '_cat') . '_cid_seq');
-    $sql   = sprintf("INSERT INTO %s (cid, dirid, title, active, pid) VALUES (%u, %u, '%s', %u, %u)", $xoopsDB->prefix($xoopsModule->getVar('dirname', 'n') . '_cat'), $newid, $p_dirid, $p_title, $p_active, $p_pid);
+    $newid = $xoopsDB->genId($xoopsDB->prefix($xoopsModule->getVar('dirname', 'n').'_cat').'_cid_seq');
+    $sql   = sprintf("INSERT INTO %s (cid, dirid, title, active, pid) VALUES (%u, %u, '%s', %u, %u)", $xoopsDB->prefix($xoopsModule->getVar('dirname', 'n').'_cat'), $newid, $p_dirid, $p_title, $p_active, $p_pid);
     //echo $sql;
     $xoopsDB->query($sql) or $eh->show('0013');
     if ($newid == 0) {
         $cid = $xoopsDB->getInsertId();
     }
-    $newid = $xoopsDB->genId($xoopsDB->prefix($xoopsModule->getVar('dirname', 'n') . '_cat_txt') . '_txtid_seq');
-    $sql2  = sprintf("INSERT INTO %s (txtid, cid, TEXT, active, created) VALUES (%u, %u, '%s', %u, '%s')", $xoopsDB->prefix($xoopsModule->getVar('dirname', 'n') . '_cat_txt'), $newid, $cid, $p_descr, '1', time());
+    $newid = $xoopsDB->genId($xoopsDB->prefix($xoopsModule->getVar('dirname', 'n').'_cat_txt').'_txtid_seq');
+    $sql2  = sprintf("INSERT INTO %s (txtid, cid, TEXT, active, created) VALUES (%u, %u, '%s', %u, '%s')", $xoopsDB->prefix($xoopsModule->getVar('dirname', 'n').'_cat_txt'), $newid, $cid, $p_descr, '1', time());
     //echo $sql2;
     $xoopsDB->query($sql2) or $eh->show('0013');
     redirect_header("categories.php?op=edit&cid=$newid", 0, _MD_CAT_UPDATED);
@@ -298,19 +298,19 @@ 
 function getCatOverview()
 {
     global $xoopsDB, $myts, $eh, $mytree, $get_dirid, $moddir;
-    $mainresult = $xoopsDB->query('SELECT cid, title, active, pid FROM ' . $xoopsDB->prefix($xoopsModule->getVar('dirname', 'n') . '_cat') . " WHERE dirid='" . $get_dirid . '\' AND pid=\'0\'');
+    $mainresult = $xoopsDB->query('SELECT cid, title, active, pid FROM '.$xoopsDB->prefix($xoopsModule->getVar('dirname', 'n').'_cat')." WHERE dirid='".$get_dirid.'\' AND pid=\'0\'');
     $numrows    = $xoopsDB->getRowsNum($mainresult);
     $output     = '';
     if ($numrows > 0) {
-        $output = '<th>' . _MD_CATTITLE . '</th><th>' . _MD_ACTIVEYN . '</th><th>' . _MD_PARENTCAT . "</th>\n";
+        $output = '<th>'._MD_CATTITLE.'</th><th>'._MD_ACTIVEYN.'</th><th>'._MD_PARENTCAT."</th>\n";
         $brench = 0;
         $tab    = '';
         while (list($cid, $title, $activeyn, $pid) = $xoopsDB->fetchRow($mainresult)) {
-            $output .= '<tr><td>' . $tab . '<a href="' . XOOPS_URL . "/modules/$moddir/admin/categories.php?op=edit&cid=$cid\">" . $title . '</a></td><td>' . $activeyn . "</td></tr>\n";
+            $output .= '<tr><td>'.$tab.'<a href="'.XOOPS_URL."/modules/$moddir/admin/categories.php?op=edit&cid=$cid\">".$title.'</a></td><td>'.$activeyn."</td></tr>\n";
             $output .= getChildrenCategories($cid);
         }
     } else {
-        $output = '' . _MD_NORESULTS . '';
+        $output = ''._MD_NORESULTS.'';
     }
 
     return $output;
@@ -322,17 +322,17 @@ 
     $firstchildcats = $mytree->getFirstChildId($childid);
     $tab            = '';
     $output         = '';
-    $plus           = '<img src="' . XOOPS_URL . "\images\arrow.jpg\">";
+    $plus           = '<img src="'.XOOPS_URL."\images\arrow.jpg\">";
     for ($i = 0; $i < $level; ++$i) {
         $tab .= '&nbsp;&nbsp;';
     }
     foreach ($firstchildcats as $childid) {
-        $childresult = $xoopsDB->query('SELECT cid, title, active, pid FROM ' . $xoopsDB->prefix($xoopsModule->getVar('dirname', 'n') . '_cat') . " WHERE pid='" . $childid . '\'');
+        $childresult = $xoopsDB->query('SELECT cid, title, active, pid FROM '.$xoopsDB->prefix($xoopsModule->getVar('dirname', 'n').'_cat')." WHERE pid='".$childid.'\'');
         //$childresult = $xoopsDB->query("SELECT cid, title, active, pid FROM ".$xoopsDB->prefix("efqdiralpha1_cat")." WHERE dirid='".$dirid."' AND pid='".$childid."'");
         $numrows = $xoopsDB->getRowsNum($childresult);
         if ($numrows > 0) {
             while (list($cid, $title, $activeyn, $pid) = $xoopsDB->fetchRow($childresult)) {
-                $output   .= '<tr><td>' . $tab . '' . $plus . '</td><td>' . $title . '</td><td>' . $activeyn . "</td></tr>\n";
+                $output   .= '<tr><td>'.$tab.''.$plus.'</td><td>'.$title.'</td><td>'.$activeyn."</td></tr>\n";
                 $newlevel = ++$level;
                 $output   .= getChildrenCategories($cid, $newlevel);
             }