XoopsModules25x / efqdirectory

ipn/ipn_success.php

Indentation +10 added lines, -10 removed lines

@@ -85,18 +85,18 @@
 
 function checkDuplicateTrx($txn_id='0', $payment_status='0') {
 	global $xoopsDB;
-    $block = array();
+	$block = array();
 	$myts =& MyTextSanitizer::getInstance();
 	$userid = 0;
 	$sql = "SELECT txn_id, payment_status FROM ".$xoopsDB->prefix("efqdiralpha1_subscr_payments")." WHERE txn_id='$txn_id' AND payment_status='$payment_status'";
-    $result = $xoopsDB->query($sql);
-    $num_results = $xoopsDB->getRowsNum($result);
-    if (!$result) {
-        return true;
-    } else if ( $num_results == 0 ) {
-    	return true;
-    } else {
-    	return false;
-    }
+	$result = $xoopsDB->query($sql);
+	$num_results = $xoopsDB->getRowsNum($result);
+	if (!$result) {
+		return true;
+	} else if ( $num_results == 0 ) {
+		return true;
+	} else {
+		return false;
+	}
 }
 ?>
\ No newline at end of file

Switch Indentation +17 added lines, -17 removed lines

@@ -44,23 +44,23 @@
 		$date = getdate($current_billto);
 		
 		switch($duration) {
-		case '1':
-			$billto = mktime( $date['hours'], $date['minutes'], $date['seconds'], $date['mon'], $date['mday']+ (1 * $count), $date['year'] );
-			break;
-		case '2':
-			$billto = mktime( $date['hours'], $date['minutes'], $date['seconds'], $date['mon'], $date['mday']+ (7 * $count), $date['year'] );
-			break;
-		case '3':
-			$billto = mktime( $date['hours'], $date['minutes'], $date['seconds'], $date['mon'] + (1 * $count), $date['mday'], $date['year'] );
-			break;
-		case '4':
-			$billto = mktime( $date['hours'], $date['minutes'], $date['seconds'], $date['mon'] + (3 * $count), $date['mday'], $date['year'] );
-			break;
-		case '5':
-			$billto = mktime( $date['hours'], $date['minutes'], $date['seconds'], $date['mon'], $date['mday'], $date['year'] + (1 * $count) );
-			break;
-		default:
-			$billto = '';
+			case '1':
+				$billto = mktime( $date['hours'], $date['minutes'], $date['seconds'], $date['mon'], $date['mday']+ (1 * $count), $date['year'] );
+				break;
+			case '2':
+				$billto = mktime( $date['hours'], $date['minutes'], $date['seconds'], $date['mon'], $date['mday']+ (7 * $count), $date['year'] );
+				break;
+			case '3':
+				$billto = mktime( $date['hours'], $date['minutes'], $date['seconds'], $date['mon'] + (1 * $count), $date['mday'], $date['year'] );
+				break;
+			case '4':
+				$billto = mktime( $date['hours'], $date['minutes'], $date['seconds'], $date['mon'] + (3 * $count), $date['mday'], $date['year'] );
+				break;
+			case '5':
+				$billto = mktime( $date['hours'], $date['minutes'], $date['seconds'], $date['mon'], $date['mday'], $date['year'] + (1 * $count) );
+				break;
+			default:
+				$billto = '';
 		}
 
 		if ( $ordervalues['startdate'] < time() && $ordervalues[billto] == '' ) {

Spacing +17 added lines, -17 removed lines

@@ -14,13 +14,13 @@ 
 //include file - not accessible directly
 
 
-if(isset($paypal['business']))
+if (isset($paypal['business']))
 {
 	//log successful transaction to file or database
 	$now = time();
 	$values = create_local_variables();
 	$orderid = $values['item_number'];
-	if ( checkDuplicateTrx( $values['txn_id'], $values['payment_status'] ) == true ) {
+	if (checkDuplicateTrx($values['txn_id'], $values['payment_status']) == true) {
 		$newid = $xoopsDB->genId($xoopsDB->prefix("efqdiralpha1_subscr_payments")."_id_seq");
 		$sql = "INSERT INTO ".$xoopsDB->prefix("efqdiralpha1_subscr_payments")."
 			(id, txn_id, txn_type, orderid, payer_business_name, address_name, address_street, address_city, address_state, address_zip, address_country, address_status, payer_email, payer_id, payer_status, mc_currency, mc_gross, mc_fee, created, payment_date, ref, payment_status) VALUES 
@@ -33,7 +33,7 @@ 
 		
 		$subscription = new efqSubscription();
 		$ordervalues = $subscription->getOrderVars($orderid);
-		if ( $ordervalues['billto'] == '' ) {
+		if ($ordervalues['billto'] == '') {
 			$current_billto = $ordervalues['startdate'];
 		} else {
 			$current_billto = $ordervalues['billto'];
@@ -43,37 +43,37 @@ 
 		$duration = $offervalues['duration'];
 		$date = getdate($current_billto);
 		
-		switch($duration) {
+		switch ($duration) {
 		case '1':
-			$billto = mktime( $date['hours'], $date['minutes'], $date['seconds'], $date['mon'], $date['mday']+ (1 * $count), $date['year'] );
+			$billto = mktime($date['hours'], $date['minutes'], $date['seconds'], $date['mon'], $date['mday'] + (1 * $count), $date['year']);
 			break;
 		case '2':
-			$billto = mktime( $date['hours'], $date['minutes'], $date['seconds'], $date['mon'], $date['mday']+ (7 * $count), $date['year'] );
+			$billto = mktime($date['hours'], $date['minutes'], $date['seconds'], $date['mon'], $date['mday'] + (7 * $count), $date['year']);
 			break;
 		case '3':
-			$billto = mktime( $date['hours'], $date['minutes'], $date['seconds'], $date['mon'] + (1 * $count), $date['mday'], $date['year'] );
+			$billto = mktime($date['hours'], $date['minutes'], $date['seconds'], $date['mon'] + (1 * $count), $date['mday'], $date['year']);
 			break;
 		case '4':
-			$billto = mktime( $date['hours'], $date['minutes'], $date['seconds'], $date['mon'] + (3 * $count), $date['mday'], $date['year'] );
+			$billto = mktime($date['hours'], $date['minutes'], $date['seconds'], $date['mon'] + (3 * $count), $date['mday'], $date['year']);
 			break;
 		case '5':
-			$billto = mktime( $date['hours'], $date['minutes'], $date['seconds'], $date['mon'], $date['mday'], $date['year'] + (1 * $count) );
+			$billto = mktime($date['hours'], $date['minutes'], $date['seconds'], $date['mon'], $date['mday'], $date['year'] + (1 * $count));
 			break;
 		default:
 			$billto = '';
 		}
 
-		if ( $ordervalues['startdate'] < time() && $ordervalues[billto] == '' ) {
+		if ($ordervalues['startdate'] < time() && $ordervalues[billto] == '') {
 			$subscription->changeItemType($ordervalues[itemid], $ordervalues[typeid]);
-			$subscription->updateOrder( $orderid, '1', time(), $billto );
+			$subscription->updateOrder($orderid, '1', time(), $billto);
 		} else {
-			$subscription->updateOrder( $orderid, '1', $ordervalues['startdate'], $billto );
+			$subscription->updateOrder($orderid, '1', $ordervalues['startdate'], $billto);
 		}
-		redirect_header("subscriptions.php?item=".$values['custom']."",5,_MD_ORDER_PROCESSED);
+		redirect_header("subscriptions.php?item=".$values['custom']."", 5, _MD_ORDER_PROCESSED);
 		exit();
 		
 	} else {
-		redirect_header("subscriptions.php?item=".$values['custom']."",10,_MD_ORDER_ALREADY_PROCESSED);
+		redirect_header("subscriptions.php?item=".$values['custom']."", 10, _MD_ORDER_ALREADY_PROCESSED);
 		exit();
 	}
 
@@ -83,17 +83,17 @@ 
 	die('This page is not directly accessible');
 }
 
-function checkDuplicateTrx($txn_id='0', $payment_status='0') {
+function checkDuplicateTrx($txn_id = '0', $payment_status = '0') {
 	global $xoopsDB;
     $block = array();
-	$myts =& MyTextSanitizer::getInstance();
+	$myts = & MyTextSanitizer::getInstance();
 	$userid = 0;
 	$sql = "SELECT txn_id, payment_status FROM ".$xoopsDB->prefix("efqdiralpha1_subscr_payments")." WHERE txn_id='$txn_id' AND payment_status='$payment_status'";
     $result = $xoopsDB->query($sql);
     $num_results = $xoopsDB->getRowsNum($result);
     if (!$result) {
         return true;
-    } else if ( $num_results == 0 ) {
+    } else if ($num_results == 0) {
     	return true;
     } else {
     	return false;

Braces +1 added lines, -2 removed lines

@@ -77,8 +77,7 @@
 		exit();
 	}
 
-}
-else
+} else
 {
 	die('This page is not directly accessible');
 }

edit.php

Indentation +313 added lines, -313 removed lines

@@ -59,15 +59,15 @@ 
 // If the user is not logged in and anonymous postings are
 // not allowed, redirect and exit.
 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();
 }
 
 // Check if user has adminrights or not;
 if ($xoopsUser && $xoopsUser->isAdmin($xoopsModule->mid())) {
-    $isadmin = true;
+	$isadmin = true;
 } else {
-    $isadmin = false;
+	$isadmin = false;
 }
 
 // Get the user ID;
@@ -76,363 +76,363 @@ 
 // If submit data was posted;
 if (!empty($_POST['submit'])) {
 
-    if (!empty($_POST['itemid'])) {
-        $gpc_itemid = intval($_POST['itemid']);
-    } else {
-        redirect_header("index.php", 2, _MD_NOVALIDITEM_IDMISSING);
-        exit();
-    }
-    if (isset($_POST['op'])) {
-        $op = $_POST['op'];
-    } else {
-        $op = "";
-    }
-    // If option is "submitforapproval", update status to 1;
-    if ($op == 'submitforapproval') {
-        if ($efqListingHandler->updateStatus($gpc_itemid, '1')) {
-            redirect_header("index.php", 2, _MD_SUBMITTED_PUBLICATION);
-        } else {
-            redirect_header("index.php", 2, _MD_ERROR_NOT_SAVED);
-        }
-        exit();
-    } else
-        if ($op == 'publish' and $isadmin and $xoopsModuleConfig['autoapproveadmin'] ==
-            1) {
-            // If option is "publish" and item is submitted by admin user while auto
-            // approve listings submitted by admin user is turned on, update status to 2;
-            if ($efqListingHandler->updateStatus($gpc_itemid, '2')) {
-                redirect_header("index.php", 2, _MD_PUBLISHED);
-            } else {
-                redirect_header("index.php", 2, _MD_ERROR_NOT_SAVED);
-            }
-            exit();
-        }
-    if (!empty($_POST['dirid'])) {
-        $post_dirid = intval($_POST['dirid']);
-    } else {
-        $post_dirid = 0;
-    }
-    if (isset($_POST["itemtitle"])) {
-        $gpc_title = $myts->makeTboxData4Save($_POST["itemtitle"]);
-        $gpc_ini_title = $myts->makeTboxData4Save($_POST["ini_itemtitle"]);
-        // Count number of upload files.
-        $upload_files_count = count($_POST['xoops_upload_file']);
-        $obj_listing = new efqListing();
-        $obj_listing_handler = new efqListingHandler();
-        $obj_listing->setListingVars($obj_listing_handler->getListing($gpc_itemid),"efqListing");
+	if (!empty($_POST['itemid'])) {
+		$gpc_itemid = intval($_POST['itemid']);
+	} else {
+		redirect_header("index.php", 2, _MD_NOVALIDITEM_IDMISSING);
+		exit();
+	}
+	if (isset($_POST['op'])) {
+		$op = $_POST['op'];
+	} else {
+		$op = "";
+	}
+	// If option is "submitforapproval", update status to 1;
+	if ($op == 'submitforapproval') {
+		if ($efqListingHandler->updateStatus($gpc_itemid, '1')) {
+			redirect_header("index.php", 2, _MD_SUBMITTED_PUBLICATION);
+		} else {
+			redirect_header("index.php", 2, _MD_ERROR_NOT_SAVED);
+		}
+		exit();
+	} else
+		if ($op == 'publish' and $isadmin and $xoopsModuleConfig['autoapproveadmin'] ==
+			1) {
+			// If option is "publish" and item is submitted by admin user while auto
+			// approve listings submitted by admin user is turned on, update status to 2;
+			if ($efqListingHandler->updateStatus($gpc_itemid, '2')) {
+				redirect_header("index.php", 2, _MD_PUBLISHED);
+			} else {
+				redirect_header("index.php", 2, _MD_ERROR_NOT_SAVED);
+			}
+			exit();
+		}
+	if (!empty($_POST['dirid'])) {
+		$post_dirid = intval($_POST['dirid']);
+	} else {
+		$post_dirid = 0;
+	}
+	if (isset($_POST["itemtitle"])) {
+		$gpc_title = $myts->makeTboxData4Save($_POST["itemtitle"]);
+		$gpc_ini_title = $myts->makeTboxData4Save($_POST["ini_itemtitle"]);
+		// Count number of upload files.
+		$upload_files_count = count($_POST['xoops_upload_file']);
+		$obj_listing = new efqListing();
+		$obj_listing_handler = new efqListingHandler();
+		$obj_listing->setListingVars($obj_listing_handler->getListing($gpc_itemid),"efqListing");
         
 		if ($upload_files_count > 0) {
-            include_once XOOPS_ROOT_PATH . '/class/uploader.php';
-            $uploader = new XoopsMediaUploader(XOOPS_ROOT_PATH . '/modules/' . $moddir .
-                '/init_uploads', array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png', 'image/jpg'), 500000, 500, 500);
-            $uploader->setPrefix('logo');
-            $err = array();
+			include_once XOOPS_ROOT_PATH . '/class/uploader.php';
+			$uploader = new XoopsMediaUploader(XOOPS_ROOT_PATH . '/modules/' . $moddir .
+				'/init_uploads', array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png', 'image/jpg'), 500000, 500, 500);
+			$uploader->setPrefix('logo');
+			$err = array();
 
-            for ($i = 0; $i < $upload_files_count; $i++) {
-                if ($_POST['xoops_upload_file'][$i] != "") {
-                    $medianame = $_POST['xoops_upload_file'][$i];
-                    if ($uploader->fetchMedia($_POST['xoops_upload_file'][$i])) {
-                        if (!$uploader->upload()) {
+			for ($i = 0; $i < $upload_files_count; $i++) {
+				if ($_POST['xoops_upload_file'][$i] != "") {
+					$medianame = $_POST['xoops_upload_file'][$i];
+					if ($uploader->fetchMedia($_POST['xoops_upload_file'][$i])) {
+						if (!$uploader->upload()) {
 							$err[] = $uploader->getErrors();
-                        } else {
-                            $savedfilename = $uploader->getSavedFileName();
-                            echo 'upload succesful';
+						} else {
+							$savedfilename = $uploader->getSavedFileName();
+							echo 'upload succesful';
 							echo $savedfilename;
-                            //Rename the uploaded file to the same name in a different location that does not have 777 rights or 755.
-                            rename("".XOOPS_ROOT_PATH."/modules/".$moddir."/init_uploads/".$savedfilename."", "".XOOPS_ROOT_PATH."/modules/".$moddir."/uploads/".$savedfilename."");
-                            //Delete the uploaded file from the initial upload folder if it is still present in that folder.
-                            if (file_exists("".XOOPS_ROOT_PATH."/modules/".$moddir."/init_uploads/".$savedfilename . "")) {
-                                unlink("".XOOPS_ROOT_PATH."/modules/".$moddir."/init_uploads/".$savedfilename."");
-                            }
-                        }
-                        $obj_listing->setVar('logourl', $savedfilename);
-                    } else {
-                    	echo 'fetch media failed.';
-                    }
+							//Rename the uploaded file to the same name in a different location that does not have 777 rights or 755.
+							rename("".XOOPS_ROOT_PATH."/modules/".$moddir."/init_uploads/".$savedfilename."", "".XOOPS_ROOT_PATH."/modules/".$moddir."/uploads/".$savedfilename."");
+							//Delete the uploaded file from the initial upload folder if it is still present in that folder.
+							if (file_exists("".XOOPS_ROOT_PATH."/modules/".$moddir."/init_uploads/".$savedfilename . "")) {
+								unlink("".XOOPS_ROOT_PATH."/modules/".$moddir."/init_uploads/".$savedfilename."");
+							}
+						}
+						$obj_listing->setVar('logourl', $savedfilename);
+					} else {
+						echo 'fetch media failed.';
+					}
                     
-                }                
-            }
-        }
-        $err[] = $uploader->getErrors();
-        print_r($err);
+				}                
+			}
+		}
+		$err[] = $uploader->getErrors();
+		print_r($err);
         
-       	if ($gpc_title != $gpc_ini_title) {
-            $obj_listing->setVar('title', $gpc_title);
-        }
+	   	if ($gpc_title != $gpc_ini_title) {
+			$obj_listing->setVar('title', $gpc_title);
+		}
 		$obj_listing->setVar('itemid', $gpc_itemid);
 		if ($obj_listing_handler->updateListing($obj_listing)) {
-            $obj_listing->setUpdated(true);
-        }
+			$obj_listing->setUpdated(true);
+		}
         
         
-    } else {
-        redirect_header("index.php", 2, _MD_NOVALIDITEM_TITLEMISSING);
-        exit();
-    }
+	} else {
+		redirect_header("index.php", 2, _MD_NOVALIDITEM_TITLEMISSING);
+		exit();
+	}
 
-    /** Update description if any */
-    if (isset($_POST['ini_description'])) {
-        $p_ini_description = $myts->makeTareaData4Save($_POST["ini_description"]);
-    } else {
-        $p_ini_description = null;
-    }
-    if (isset($_POST['description'])) {
-        $p_description = $myts->makeTareaData4Save($_POST["description"]);
-    } else {
-        $p_description = null;
-    }
-    if (isset($_POST["description_set"])) {
-        if ($_POST["description_set"] == '1') {
-            if ($p_ini_description != $p_description) {
-                $obj_listing->setVar('description', $p_description);
-                $obj_listing_handler->updateDescription($obj_listing->getVar('itemid'), $obj_listing->getVar('description'));
-            }
-        } else
-            if ($p_description != null or $p_description != "") {
-                $obj_listing->setVar('description', $p_description);
-                $obj_listing_handler->insertDescription($obj_listing->getVar('itemid'), $obj_listing->getVar('description'));
-            }
-    }
+	/** Update description if any */
+	if (isset($_POST['ini_description'])) {
+		$p_ini_description = $myts->makeTareaData4Save($_POST["ini_description"]);
+	} else {
+		$p_ini_description = null;
+	}
+	if (isset($_POST['description'])) {
+		$p_description = $myts->makeTareaData4Save($_POST["description"]);
+	} else {
+		$p_description = null;
+	}
+	if (isset($_POST["description_set"])) {
+		if ($_POST["description_set"] == '1') {
+			if ($p_ini_description != $p_description) {
+				$obj_listing->setVar('description', $p_description);
+				$obj_listing_handler->updateDescription($obj_listing->getVar('itemid'), $obj_listing->getVar('description'));
+			}
+		} else
+			if ($p_description != null or $p_description != "") {
+				$obj_listing->setVar('description', $p_description);
+				$obj_listing_handler->insertDescription($obj_listing->getVar('itemid'), $obj_listing->getVar('description'));
+			}
+	}
 
 	/** Update categories linked to the listing if any */
-    //Get all categories currently linked to the listing
+	//Get all categories currently linked to the listing
 	$linkedcategories = $efqListingHandler->getLinkedCategories($gpc_itemid, $post_dirid);
 	$allcategories =  $efqListingHandler->getAllCategories($post_dirid);
 	$count = 0;
-    foreach ($allcategories as $category) {
-    	if (isset($_POST["selected" . $category . ""])) {
-            if (!in_array($category, $linkedcategories)) {
+	foreach ($allcategories as $category) {
+		if (isset($_POST["selected" . $category . ""])) {
+			if (!in_array($category, $linkedcategories)) {
 				$newid = $xoopsDB->genId($xoopsDB->prefix("efqdiralpha1_item_x_cat") .
-                    "_xid_seq");
-                $sql = sprintf("INSERT INTO %s (xid, cid, itemid, active, created) VALUES (%u, %u, %u, '%s', '%s')",
-                $xoopsDB->prefix("efqdiralpha1_item_x_cat"), $newid, $category, $gpc_itemid, 1, time());
-                $xoopsDB->query($sql) or $eh->show("0013");
-            }
-            $count++;
-        } else {
-            if (in_array($category, $linkedcategories)) {
-                $sql = sprintf("DELETE FROM %s WHERE cid=%u AND itemid=%u", $xoopsDB->prefix("efqdiralpha1_item_x_cat"), $category, $gpc_itemid);
-                $xoopsDB->query($sql) or $eh->show("0013");
-            }
-        }
-    }
-    if ($count == 0) {
-        redirect_header(XOOPS_URL."/modules/$moddir/submit.php?dirid=".$post_dirid."", 2, _MD_NOCATEGORYMATCH);
-        exit();
-    }
+					"_xid_seq");
+				$sql = sprintf("INSERT INTO %s (xid, cid, itemid, active, created) VALUES (%u, %u, %u, '%s', '%s')",
+				$xoopsDB->prefix("efqdiralpha1_item_x_cat"), $newid, $category, $gpc_itemid, 1, time());
+				$xoopsDB->query($sql) or $eh->show("0013");
+			}
+			$count++;
+		} else {
+			if (in_array($category, $linkedcategories)) {
+				$sql = sprintf("DELETE FROM %s WHERE cid=%u AND itemid=%u", $xoopsDB->prefix("efqdiralpha1_item_x_cat"), $category, $gpc_itemid);
+				$xoopsDB->query($sql) or $eh->show("0013");
+			}
+		}
+	}
+	if ($count == 0) {
+		redirect_header(XOOPS_URL."/modules/$moddir/submit.php?dirid=".$post_dirid."", 2, _MD_NOCATEGORYMATCH);
+		exit();
+	}
 
 	/** Get all datatypes that can be associated with this listing */
 	$obj_data_handler = new efqListingDataHandler();
 	$listingdata = $obj_data_handler->getData($gpc_itemid);
 	foreach ($listingdata as $data) {
 		$obj_data = new efqListingData();
-    	$obj_data->setListingData($data);
+		$obj_data->setListingData($data);
 		if (isset($_POST[$data['dtypeid']])) {
-            if (is_array($_POST[$data['dtypeid']])) {
-                $post_value_array = $_POST[$data['dtypeid']];
-                $post_value = "";
-                $options_arr = split("[|]", $data['options']);
-                $options_arr[] = '-';
-                $count_post_value_array = count($post_value_array);
-                for ($i = 0; $i < $count_post_value_array; $i++) {
-                    // Check if posted value is in options.
-                    if (in_array($post_value_array[$i], $options_arr)) {
-                        if ($i == 0) {
-                            $post_value = $post_value_array[$i];
-                        } else {
-                            $post_value .= "|".$post_value_array[$i];
-                        }
-                    }
-                }
-            } else {
-                $post_value = $myts->makeTboxData4Save($_POST[$data['dtypeid']]);
-            }
-        } else {
-            $post_value = "";
-        }
-        if (isset($_POST["custom".$data['dtypeid'].""])) {
-            $post_customtitle = $myts->makeTboxData4Save($_POST['custom'.$data['dtypeid']]);
-        } else {
-            $post_customtitle = "";
-        }
-        if (isset($_POST["url_title".$data['dtypeid'].""])) {
-            $post_urltitle = $myts->makeTboxData4Save($_POST['url_title'.$data['dtypeid']]);
-        } else {
-            $post_urltitle = "";
-        }
-        if (isset($_POST["url_link".$data['dtypeid'].""])) {
-            $post_urllink = $myts->makeTboxData4Save($_POST['url_link'.$data['dtypeid']]);
-        } else {
-            $post_urllink = "";
-        }
-        if ($post_urllink != "") {
-            $post_value = $post_urllink . '|' . $post_urltitle;
-        }
+			if (is_array($_POST[$data['dtypeid']])) {
+				$post_value_array = $_POST[$data['dtypeid']];
+				$post_value = "";
+				$options_arr = split("[|]", $data['options']);
+				$options_arr[] = '-';
+				$count_post_value_array = count($post_value_array);
+				for ($i = 0; $i < $count_post_value_array; $i++) {
+					// Check if posted value is in options.
+					if (in_array($post_value_array[$i], $options_arr)) {
+						if ($i == 0) {
+							$post_value = $post_value_array[$i];
+						} else {
+							$post_value .= "|".$post_value_array[$i];
+						}
+					}
+				}
+			} else {
+				$post_value = $myts->makeTboxData4Save($_POST[$data['dtypeid']]);
+			}
+		} else {
+			$post_value = "";
+		}
+		if (isset($_POST["custom".$data['dtypeid'].""])) {
+			$post_customtitle = $myts->makeTboxData4Save($_POST['custom'.$data['dtypeid']]);
+		} else {
+			$post_customtitle = "";
+		}
+		if (isset($_POST["url_title".$data['dtypeid'].""])) {
+			$post_urltitle = $myts->makeTboxData4Save($_POST['url_title'.$data['dtypeid']]);
+		} else {
+			$post_urltitle = "";
+		}
+		if (isset($_POST["url_link".$data['dtypeid'].""])) {
+			$post_urllink = $myts->makeTboxData4Save($_POST['url_link'.$data['dtypeid']]);
+		} else {
+			$post_urllink = "";
+		}
+		if ($post_urllink != "") {
+			$post_value = $post_urllink . '|' . $post_urltitle;
+		}
         
 		
 		if ($data['fieldtype'] == "gmap") {
 			// Retrieve POST values for google map.
-	        if (isset($_POST["" . $data['dtypeid']."_lon"])) {
-	            $post_gmap_lon = $myts->makeTboxData4Save($_POST["".$data['dtypeid']."_lon"]);
-	        } else {
-	            $post_gmap_lon = "";
-	        }
-	        if (isset($_POST["" . $data['dtypeid']."_lat"])) {
-	            $post_gmap_lat = $myts->makeTboxData4Save($_POST["".$data['dtypeid']."_lat"]);
-	        } else {
-	            $post_gmap_lat = "";
-	        }
-	        if (isset($_POST["" . $data['dtypeid']."_descr"])) {
-	            $post_gmap_descr = $myts->makeTboxData4Save($_POST["".$data['dtypeid']."_descr"]);
-	        } else {
-	            $post_gmap_descr = "";
-	        }
-	        $gmapHandler = new efqGmapHandler();
-            $obj_gmap = new efqGmap();
-            if ($data['value'] != null) {
-            	$obj_gmap->setData($gmapHandler->getByDataId($data['value']));
-            }
-        	$obj_gmap->setVar('lon', $post_gmap_lon);
-        	$obj_gmap->setVar('lat', $post_gmap_lat);
-        	$obj_gmap->setVar('descr', $post_gmap_descr);
-        	if ($data['value'] != null) {
+			if (isset($_POST["" . $data['dtypeid']."_lon"])) {
+				$post_gmap_lon = $myts->makeTboxData4Save($_POST["".$data['dtypeid']."_lon"]);
+			} else {
+				$post_gmap_lon = "";
+			}
+			if (isset($_POST["" . $data['dtypeid']."_lat"])) {
+				$post_gmap_lat = $myts->makeTboxData4Save($_POST["".$data['dtypeid']."_lat"]);
+			} else {
+				$post_gmap_lat = "";
+			}
+			if (isset($_POST["" . $data['dtypeid']."_descr"])) {
+				$post_gmap_descr = $myts->makeTboxData4Save($_POST["".$data['dtypeid']."_descr"]);
+			} else {
+				$post_gmap_descr = "";
+			}
+			$gmapHandler = new efqGmapHandler();
+			$obj_gmap = new efqGmap();
+			if ($data['value'] != null) {
+				$obj_gmap->setData($gmapHandler->getByDataId($data['value']));
+			}
+			$obj_gmap->setVar('lon', $post_gmap_lon);
+			$obj_gmap->setVar('lat', $post_gmap_lat);
+			$obj_gmap->setVar('descr', $post_gmap_descr);
+			if ($data['value'] != null) {
 				if (!$gmapHandler->updateGmap($obj_gmap)) {
-	                echo 'insert new gmap failed';
-	                exit();
-	            } else {
-	            	$post_value = $obj_gmap->getVar('id');	
-	            }
+					echo 'insert new gmap failed';
+					exit();
+				} else {
+					$post_value = $obj_gmap->getVar('id');	
+				}
 	             
-            } else {
+			} else {
 				if (!$gmapHandler->insertGmap($obj_gmap)) {
-	                echo 'update gmap failed';
-	                exit();
-	            } else {
-	            	$post_value = $obj_gmap->getVar('id');
-	            }
-            }			
+					echo 'update gmap failed';
+					exit();
+				} else {
+					$post_value = $obj_gmap->getVar('id');
+				}
+			}			
 		}
      
-        if ($obj_data->getVar('itemid') == null) {
-            // That means there was not any value, so a new record
+		if ($obj_data->getVar('itemid') == null) {
+			// That means there was not any value, so a new record
 			// should be added to the data table.
 			$obj_data->setVar('value', $post_value);
 			$obj_data->setVar('customtitle', $post_customtitle);            
-            $obj_data_handler->insertListingData($obj_data);
-        } else {
+			$obj_data_handler->insertListingData($obj_data);
+		} else {
 			if ($data['value'] != $post_value) {
 				$obj_data->setVar('value', $post_value);
 				$obj_data->setVar('customtitle', $post_customtitle);            
-            	$obj_data_handler->updateListingData($obj_data);
-            }
-        }
-    }
-    redirect_header("edit.php?item=$gpc_itemid", 1, _MD_ITEM_UPDATED);
-    exit();
+				$obj_data_handler->updateListingData($obj_data);
+			}
+		}
+	}
+	redirect_header("edit.php?item=$gpc_itemid", 1, _MD_ITEM_UPDATED);
+	exit();
 } else {
-    // Prepare page for showing listing edit form.
-    if (!empty($_GET['item'])) {
-        $get_itemid = intval($_GET['item']);
-        $get_dirid = getDirIdFromItem($get_itemid);
-    } else {
-        redirect_header("index.php", 2, _MD_NOVALIDITEM_GET_IDMISSING);
-        exit();
-    }
+	// Prepare page for showing listing edit form.
+	if (!empty($_GET['item'])) {
+		$get_itemid = intval($_GET['item']);
+		$get_dirid = getDirIdFromItem($get_itemid);
+	} else {
+		redirect_header("index.php", 2, _MD_NOVALIDITEM_GET_IDMISSING);
+		exit();
+	}
 
-    $xoopsOption['template_main'] = 'efqdiralpha1_editlisting.html';
-    include XOOPS_ROOT_PATH . "/header.php";
-    $xoopsTpl->assign('xoops_module_header', $xoops_module_header);
-    $xoopsTpl->assign('lang_submit', _SUBMIT);
-    $xoopsTpl->assign('lang_cancel', _CANCEL);
+	$xoopsOption['template_main'] = 'efqdiralpha1_editlisting.html';
+	include XOOPS_ROOT_PATH . "/header.php";
+	$xoopsTpl->assign('xoops_module_header', $xoops_module_header);
+	$xoopsTpl->assign('lang_submit', _SUBMIT);
+	$xoopsTpl->assign('lang_cancel', _CANCEL);
 
-    $sql = "SELECT i.itemid, i.logourl, i.uid, i.status, i.created, i.title, i.typeid, i.dirid, t.description FROM ".$xoopsDB->prefix("efqdiralpha1_items")." i LEFT JOIN ".$xoopsDB->prefix("efqdiralpha1_item_text")." t ON (i.itemid=t.itemid) WHERE i.itemid=".$get_itemid."";
-    $item_result = $xoopsDB->query($sql);
-    $numrows = $xoopsDB->getRowsNum($item_result);
+	$sql = "SELECT i.itemid, i.logourl, i.uid, i.status, i.created, i.title, i.typeid, i.dirid, t.description FROM ".$xoopsDB->prefix("efqdiralpha1_items")." i LEFT JOIN ".$xoopsDB->prefix("efqdiralpha1_item_text")." t ON (i.itemid=t.itemid) WHERE i.itemid=".$get_itemid."";
+	$item_result = $xoopsDB->query($sql);
+	$numrows = $xoopsDB->getRowsNum($item_result);
 
-    while (list($itemid, $logourl, $submitter, $status, $created, $itemtitle, $typeid, $dirid, $description) = $xoopsDB->fetchRow($item_result)) {
-        $itemtitle = $myts->makeTboxData4Show($itemtitle);
-        // Only the submitter or the admin are allowed edit a listing, so make sure
-        // all other users are redirected elsewhere.
-        if ($isadmin or $submitter == $userid) {
-            if ($status == 0 and $submitter == $userid) {
-                if ($xoopsModuleConfig['autoapproveadmin'] == 1) {
-                    // If status is not 0 and autoapprove is on, the submitter or
-                    // admin can edit the listing and with the button "view listing"
-                    // Go to the listing page in 'view' mode.
-                    $publish_button = "<form action=\"edit.php\" method=\"post\"><input type=\"hidden\" name=\"op\" value=\"publish\"><input type=\"hidden\" name=\"user\" value=\"$userid\"><input type=\"hidden\" name=\"itemid\" value=\"$get_itemid\"><input type=\"submit\" name=\"submit\" class=\"formButton\" value=\"" .
-                        _MD_PUBLISH_LISTING . "\"></form><br />";
-                    $xoopsTpl->assign('submitview_button', $publish_button);
-                } else {
+	while (list($itemid, $logourl, $submitter, $status, $created, $itemtitle, $typeid, $dirid, $description) = $xoopsDB->fetchRow($item_result)) {
+		$itemtitle = $myts->makeTboxData4Show($itemtitle);
+		// Only the submitter or the admin are allowed edit a listing, so make sure
+		// all other users are redirected elsewhere.
+		if ($isadmin or $submitter == $userid) {
+			if ($status == 0 and $submitter == $userid) {
+				if ($xoopsModuleConfig['autoapproveadmin'] == 1) {
+					// If status is not 0 and autoapprove is on, the submitter or
+					// admin can edit the listing and with the button "view listing"
+					// Go to the listing page in 'view' mode.
+					$publish_button = "<form action=\"edit.php\" method=\"post\"><input type=\"hidden\" name=\"op\" value=\"publish\"><input type=\"hidden\" name=\"user\" value=\"$userid\"><input type=\"hidden\" name=\"itemid\" value=\"$get_itemid\"><input type=\"submit\" name=\"submit\" class=\"formButton\" value=\"" .
+						_MD_PUBLISH_LISTING . "\"></form><br />";
+					$xoopsTpl->assign('submitview_button', $publish_button);
+				} else {
 					// Only the submitter can submit listing for approval when status = 0.
-	                $submit_for_approval_button = "<form action=\"edit.php\" method=\"post\"><input type=\"hidden\" name=\"op\" value=\"submitforapproval\"><input type=\"hidden\" name=\"user\" value=\"$userid\"><input type=\"hidden\" name=\"itemid\" value=\"$get_itemid\"><input type=\"submit\" name=\"submit\" class=\"formButton\" value=\"" .
-	                    _MD_PUBLISH_LISTING . "\"></form><br />";
-	                $xoopsTpl->assign('submitview_button', $submit_for_approval_button);
-	            }
-            } else
-                if ($xoopsModuleConfig['autoapprove'] == 1 and $status == 2) {
-                    // If status is not 0 and autoapprove is on, the submitter or
-                    // admin can edit the listing and with the button "view listing"
-                    // Go to the listing page in 'view' mode.
-                    $view_button = "<form action=\"listing.php\" method=\"get\"><input type=\"hidden\" name=\"item\" value=\"" .
-                        $itemid . "\"><input type=\"submit\" value=\"" . _MD_VIEWITEM . "\"></input></form><br />";
-                    $xoopsTpl->assign('submitview_button', $view_button);
-                } else
-                    if ($xoopsModuleConfig['autoapproveadmin'] == 1 and $status == 1) {
-                        // If status is not 0 and autoapprove is on, the submitter or
-                        // admin can edit the listing and with the button "view listing"
-                        // Go to the listing page in 'view' mode.
-                        $publish_button = "<form action=\"edit.php\" method=\"post\"><input type=\"hidden\" name=\"op\" value=\"publish\"><input type=\"hidden\" name=\"user\" value=\"$userid\"><input type=\"hidden\" name=\"itemid\" value=\"$get_itemid\"><input type=\"submit\" name=\"submit\" class=\"formButton\" value=\"" .
-                            _MD_PUBLISH_LISTING . "\"></form><br />";
-                        $xoopsTpl->assign('submitview_button', $publish_button);
-                    } else
-                        if (!$isadmin) {
-                            // Only admin is allowed to edit a listing after approval (status = 2)
-                            // in case autoapprove is off.
-                            redirect_header("listing.php?item=".$itemid, 2, _MD_ONLYADMIN_ALLOWED_TO_EDIT);
-                            exit();
-                        }
-            if ($logourl != "") {
-                $picture = "uploads/$logourl";
-            } else {
-                $picture = "images/nopicture.gif";
-            }
-            ob_start();
-            $form = new XoopsThemeForm(_MD_EDITITEM_FORM, 'editform', 'edit.php');
-            $form->setExtra('enctype="multipart/form-data"');
-            $form->addElement(new XoopsFormText(_MD_TITLE, "itemtitle", 50, 250, $itemtitle), true);
-            $categories = getCatSelectArea($get_itemid, $dirid);
-            $form_cats = new XoopsFormLabel(_MD_ITEMCATEGORIES, "$categories");
-            $form->addElement($form_cats);
-            $form->addElement(new XoopsFormDhtmlTextArea(_MD_DESCRIPTION, "description", $description, 5, 50));
-            $form->addElement(new XoopsFormFile(_MD_SELECT_PIC, 'image', 30000));
-            $form->addElement(new XoopsFormImage(_MD_CURRENT_PIC, "current_image", null, "$picture", "", ""));
+					$submit_for_approval_button = "<form action=\"edit.php\" method=\"post\"><input type=\"hidden\" name=\"op\" value=\"submitforapproval\"><input type=\"hidden\" name=\"user\" value=\"$userid\"><input type=\"hidden\" name=\"itemid\" value=\"$get_itemid\"><input type=\"submit\" name=\"submit\" class=\"formButton\" value=\"" .
+						_MD_PUBLISH_LISTING . "\"></form><br />";
+					$xoopsTpl->assign('submitview_button', $submit_for_approval_button);
+				}
+			} else
+				if ($xoopsModuleConfig['autoapprove'] == 1 and $status == 2) {
+					// If status is not 0 and autoapprove is on, the submitter or
+					// admin can edit the listing and with the button "view listing"
+					// Go to the listing page in 'view' mode.
+					$view_button = "<form action=\"listing.php\" method=\"get\"><input type=\"hidden\" name=\"item\" value=\"" .
+						$itemid . "\"><input type=\"submit\" value=\"" . _MD_VIEWITEM . "\"></input></form><br />";
+					$xoopsTpl->assign('submitview_button', $view_button);
+				} else
+					if ($xoopsModuleConfig['autoapproveadmin'] == 1 and $status == 1) {
+						// If status is not 0 and autoapprove is on, the submitter or
+						// admin can edit the listing and with the button "view listing"
+						// Go to the listing page in 'view' mode.
+						$publish_button = "<form action=\"edit.php\" method=\"post\"><input type=\"hidden\" name=\"op\" value=\"publish\"><input type=\"hidden\" name=\"user\" value=\"$userid\"><input type=\"hidden\" name=\"itemid\" value=\"$get_itemid\"><input type=\"submit\" name=\"submit\" class=\"formButton\" value=\"" .
+							_MD_PUBLISH_LISTING . "\"></form><br />";
+						$xoopsTpl->assign('submitview_button', $publish_button);
+					} else
+						if (!$isadmin) {
+							// Only admin is allowed to edit a listing after approval (status = 2)
+							// in case autoapprove is off.
+							redirect_header("listing.php?item=".$itemid, 2, _MD_ONLYADMIN_ALLOWED_TO_EDIT);
+							exit();
+						}
+			if ($logourl != "") {
+				$picture = "uploads/$logourl";
+			} else {
+				$picture = "images/nopicture.gif";
+			}
+			ob_start();
+			$form = new XoopsThemeForm(_MD_EDITITEM_FORM, 'editform', 'edit.php');
+			$form->setExtra('enctype="multipart/form-data"');
+			$form->addElement(new XoopsFormText(_MD_TITLE, "itemtitle", 50, 250, $itemtitle), true);
+			$categories = getCatSelectArea($get_itemid, $dirid);
+			$form_cats = new XoopsFormLabel(_MD_ITEMCATEGORIES, "$categories");
+			$form->addElement($form_cats);
+			$form->addElement(new XoopsFormDhtmlTextArea(_MD_DESCRIPTION, "description", $description, 5, 50));
+			$form->addElement(new XoopsFormFile(_MD_SELECT_PIC, 'image', 30000));
+			$form->addElement(new XoopsFormImage(_MD_CURRENT_PIC, "current_image", null, "$picture", "", ""));
 
-            $obj_datafield_handler = new efqDataFieldHandler();
-            $datafields = $obj_datafield_handler->getDataFields($get_itemid);
-            foreach ($datafields as $datafield) {
-                $field = $datafieldmanager->createFieldFromArray($datafield);
-            }
-            $form->addElement(new XoopsFormButton('', 'submit', _MD_SAVE, 'submit'));
-            $form->addElement(new XoopsFormHidden("op", "edit"));
-            $form->addElement(new XoopsFormHidden("itemid", $get_itemid));
-            $form->addElement(new XoopsFormHidden("dirid", $get_dirid));
-            $form->addElement(new XoopsFormHidden("ini_itemtitle", $itemtitle));
+			$obj_datafield_handler = new efqDataFieldHandler();
+			$datafields = $obj_datafield_handler->getDataFields($get_itemid);
+			foreach ($datafields as $datafield) {
+				$field = $datafieldmanager->createFieldFromArray($datafield);
+			}
+			$form->addElement(new XoopsFormButton('', 'submit', _MD_SAVE, 'submit'));
+			$form->addElement(new XoopsFormHidden("op", "edit"));
+			$form->addElement(new XoopsFormHidden("itemid", $get_itemid));
+			$form->addElement(new XoopsFormHidden("dirid", $get_dirid));
+			$form->addElement(new XoopsFormHidden("ini_itemtitle", $itemtitle));
 
-            if ($description != null) {
-                $form->addElement(new XoopsFormHidden("ini_description", $description));
-            }
-            $form->addElement(new XoopsFormHidden("uid", $userid));
-            if ($description != null) {
-                $form->addElement(new XoopsFormHidden("description_set", '1'));
-            } else {
-                $form->addElement(new XoopsFormHidden("description_set", '0'));
-            }
-            $form->display();
-            $xoopsTpl->assign('dtypes_form', ob_get_contents());
-            ob_end_clean();
-        }
+			if ($description != null) {
+				$form->addElement(new XoopsFormHidden("ini_description", $description));
+			}
+			$form->addElement(new XoopsFormHidden("uid", $userid));
+			if ($description != null) {
+				$form->addElement(new XoopsFormHidden("description_set", '1'));
+			} else {
+				$form->addElement(new XoopsFormHidden("description_set", '0'));
+			}
+			$form->display();
+			$xoopsTpl->assign('dtypes_form', ob_get_contents());
+			ob_end_clean();
+		}
 
-    }
+	}
 
 }
 include_once XOOPS_ROOT_PATH . '/footer.php';

Spacing +26 added lines, -26 removed lines

@@ -31,10 +31,10 @@ 
 // ------------------------------------------------------------------------- //
 include 'header.php';
 $myts = &MyTextSanitizer::getInstance(); // MyTextSanitizer object
-include_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
-include_once XOOPS_ROOT_PATH . '/class/module.errorhandler.php';
-include_once XOOPS_ROOT_PATH . '/include/xoopscodes.php';
-include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopstree.php';
+include_once XOOPS_ROOT_PATH.'/class/module.errorhandler.php';
+include_once XOOPS_ROOT_PATH.'/include/xoopscodes.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 include_once 'class/class.datafieldmanager.php';
 include_once 'class/class.datafield.php';
 include_once 'class/class.formimage.php';
@@ -59,7 +59,7 @@ 
 // If the user is not logged in and anonymous postings are
 // not allowed, redirect and exit.
 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();
 }
 
@@ -119,11 +119,11 @@ 
         $upload_files_count = count($_POST['xoops_upload_file']);
         $obj_listing = new efqListing();
         $obj_listing_handler = new efqListingHandler();
-        $obj_listing->setListingVars($obj_listing_handler->getListing($gpc_itemid),"efqListing");
+        $obj_listing->setListingVars($obj_listing_handler->getListing($gpc_itemid), "efqListing");
         
 		if ($upload_files_count > 0) {
-            include_once XOOPS_ROOT_PATH . '/class/uploader.php';
-            $uploader = new XoopsMediaUploader(XOOPS_ROOT_PATH . '/modules/' . $moddir .
+            include_once XOOPS_ROOT_PATH.'/class/uploader.php';
+            $uploader = new XoopsMediaUploader(XOOPS_ROOT_PATH.'/modules/'.$moddir.
                 '/init_uploads', array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png', 'image/jpg'), 500000, 500, 500);
             $uploader->setPrefix('logo');
             $err = array();
@@ -141,7 +141,7 @@ 
                             //Rename the uploaded file to the same name in a different location that does not have 777 rights or 755.
                             rename("".XOOPS_ROOT_PATH."/modules/".$moddir."/init_uploads/".$savedfilename."", "".XOOPS_ROOT_PATH."/modules/".$moddir."/uploads/".$savedfilename."");
                             //Delete the uploaded file from the initial upload folder if it is still present in that folder.
-                            if (file_exists("".XOOPS_ROOT_PATH."/modules/".$moddir."/init_uploads/".$savedfilename . "")) {
+                            if (file_exists("".XOOPS_ROOT_PATH."/modules/".$moddir."/init_uploads/".$savedfilename."")) {
                                 unlink("".XOOPS_ROOT_PATH."/modules/".$moddir."/init_uploads/".$savedfilename."");
                             }
                         }
@@ -197,12 +197,12 @@ 
 	/** Update categories linked to the listing if any */
     //Get all categories currently linked to the listing
 	$linkedcategories = $efqListingHandler->getLinkedCategories($gpc_itemid, $post_dirid);
-	$allcategories =  $efqListingHandler->getAllCategories($post_dirid);
+	$allcategories = $efqListingHandler->getAllCategories($post_dirid);
 	$count = 0;
     foreach ($allcategories as $category) {
-    	if (isset($_POST["selected" . $category . ""])) {
+    	if (isset($_POST["selected".$category.""])) {
             if (!in_array($category, $linkedcategories)) {
-				$newid = $xoopsDB->genId($xoopsDB->prefix("efqdiralpha1_item_x_cat") .
+				$newid = $xoopsDB->genId($xoopsDB->prefix("efqdiralpha1_item_x_cat").
                     "_xid_seq");
                 $sql = sprintf("INSERT INTO %s (xid, cid, itemid, active, created) VALUES (%u, %u, %u, '%s', '%s')",
                 $xoopsDB->prefix("efqdiralpha1_item_x_cat"), $newid, $category, $gpc_itemid, 1, time());
@@ -266,23 +266,23 @@ 
             $post_urllink = "";
         }
         if ($post_urllink != "") {
-            $post_value = $post_urllink . '|' . $post_urltitle;
+            $post_value = $post_urllink.'|'.$post_urltitle;
         }
         
 		
 		if ($data['fieldtype'] == "gmap") {
 			// Retrieve POST values for google map.
-	        if (isset($_POST["" . $data['dtypeid']."_lon"])) {
+	        if (isset($_POST["".$data['dtypeid']."_lon"])) {
 	            $post_gmap_lon = $myts->makeTboxData4Save($_POST["".$data['dtypeid']."_lon"]);
 	        } else {
 	            $post_gmap_lon = "";
 	        }
-	        if (isset($_POST["" . $data['dtypeid']."_lat"])) {
+	        if (isset($_POST["".$data['dtypeid']."_lat"])) {
 	            $post_gmap_lat = $myts->makeTboxData4Save($_POST["".$data['dtypeid']."_lat"]);
 	        } else {
 	            $post_gmap_lat = "";
 	        }
-	        if (isset($_POST["" . $data['dtypeid']."_descr"])) {
+	        if (isset($_POST["".$data['dtypeid']."_descr"])) {
 	            $post_gmap_descr = $myts->makeTboxData4Save($_POST["".$data['dtypeid']."_descr"]);
 	        } else {
 	            $post_gmap_descr = "";
@@ -340,7 +340,7 @@ 
     }
 
     $xoopsOption['template_main'] = 'efqdiralpha1_editlisting.html';
-    include XOOPS_ROOT_PATH . "/header.php";
+    include XOOPS_ROOT_PATH."/header.php";
     $xoopsTpl->assign('xoops_module_header', $xoops_module_header);
     $xoopsTpl->assign('lang_submit', _SUBMIT);
     $xoopsTpl->assign('lang_cancel', _CANCEL);
@@ -359,13 +359,13 @@ 
                     // If status is not 0 and autoapprove is on, the submitter or
                     // admin can edit the listing and with the button "view listing"
                     // Go to the listing page in 'view' mode.
-                    $publish_button = "<form action=\"edit.php\" method=\"post\"><input type=\"hidden\" name=\"op\" value=\"publish\"><input type=\"hidden\" name=\"user\" value=\"$userid\"><input type=\"hidden\" name=\"itemid\" value=\"$get_itemid\"><input type=\"submit\" name=\"submit\" class=\"formButton\" value=\"" .
-                        _MD_PUBLISH_LISTING . "\"></form><br />";
+                    $publish_button = "<form action=\"edit.php\" method=\"post\"><input type=\"hidden\" name=\"op\" value=\"publish\"><input type=\"hidden\" name=\"user\" value=\"$userid\"><input type=\"hidden\" name=\"itemid\" value=\"$get_itemid\"><input type=\"submit\" name=\"submit\" class=\"formButton\" value=\"".
+                        _MD_PUBLISH_LISTING."\"></form><br />";
                     $xoopsTpl->assign('submitview_button', $publish_button);
                 } else {
 					// Only the submitter can submit listing for approval when status = 0.
-	                $submit_for_approval_button = "<form action=\"edit.php\" method=\"post\"><input type=\"hidden\" name=\"op\" value=\"submitforapproval\"><input type=\"hidden\" name=\"user\" value=\"$userid\"><input type=\"hidden\" name=\"itemid\" value=\"$get_itemid\"><input type=\"submit\" name=\"submit\" class=\"formButton\" value=\"" .
-	                    _MD_PUBLISH_LISTING . "\"></form><br />";
+	                $submit_for_approval_button = "<form action=\"edit.php\" method=\"post\"><input type=\"hidden\" name=\"op\" value=\"submitforapproval\"><input type=\"hidden\" name=\"user\" value=\"$userid\"><input type=\"hidden\" name=\"itemid\" value=\"$get_itemid\"><input type=\"submit\" name=\"submit\" class=\"formButton\" value=\"".
+	                    _MD_PUBLISH_LISTING."\"></form><br />";
 	                $xoopsTpl->assign('submitview_button', $submit_for_approval_button);
 	            }
             } else
@@ -373,16 +373,16 @@ 
                     // If status is not 0 and autoapprove is on, the submitter or
                     // admin can edit the listing and with the button "view listing"
                     // Go to the listing page in 'view' mode.
-                    $view_button = "<form action=\"listing.php\" method=\"get\"><input type=\"hidden\" name=\"item\" value=\"" .
-                        $itemid . "\"><input type=\"submit\" value=\"" . _MD_VIEWITEM . "\"></input></form><br />";
+                    $view_button = "<form action=\"listing.php\" method=\"get\"><input type=\"hidden\" name=\"item\" value=\"".
+                        $itemid."\"><input type=\"submit\" value=\""._MD_VIEWITEM."\"></input></form><br />";
                     $xoopsTpl->assign('submitview_button', $view_button);
                 } else
                     if ($xoopsModuleConfig['autoapproveadmin'] == 1 and $status == 1) {
                         // If status is not 0 and autoapprove is on, the submitter or
                         // admin can edit the listing and with the button "view listing"
                         // Go to the listing page in 'view' mode.
-                        $publish_button = "<form action=\"edit.php\" method=\"post\"><input type=\"hidden\" name=\"op\" value=\"publish\"><input type=\"hidden\" name=\"user\" value=\"$userid\"><input type=\"hidden\" name=\"itemid\" value=\"$get_itemid\"><input type=\"submit\" name=\"submit\" class=\"formButton\" value=\"" .
-                            _MD_PUBLISH_LISTING . "\"></form><br />";
+                        $publish_button = "<form action=\"edit.php\" method=\"post\"><input type=\"hidden\" name=\"op\" value=\"publish\"><input type=\"hidden\" name=\"user\" value=\"$userid\"><input type=\"hidden\" name=\"itemid\" value=\"$get_itemid\"><input type=\"submit\" name=\"submit\" class=\"formButton\" value=\"".
+                            _MD_PUBLISH_LISTING."\"></form><br />";
                         $xoopsTpl->assign('submitview_button', $publish_button);
                     } else
                         if (!$isadmin) {
@@ -435,5 +435,5 @@ 
     }
 
 }
-include_once XOOPS_ROOT_PATH . '/footer.php';
+include_once XOOPS_ROOT_PATH.'/footer.php';
 ?>
\ No newline at end of file

listing.php

Spacing +4 added lines, -4 removed lines

@@ -30,7 +30,7 @@ 
 //	Based upon the mylinks and the mxDirectory modules						 //
 // ------------------------------------------------------------------------- //
 include "header.php";
-$myts =& MyTextSanitizer::getInstance();// MyTextSanitizer object
+$myts = & MyTextSanitizer::getInstance(); // MyTextSanitizer object
 include_once XOOPS_ROOT_PATH.'/class/xoopstree.php';
 include_once XOOPS_ROOT_PATH.'/class/module.errorhandler.php';
 
@@ -39,7 +39,7 @@ 
 include_once "class/class.gmap.php";
 include_once "class/class.couponhandler.php";
 
-$mytree = new XoopsTree($xoopsDB->prefix("efqdiralpha1_cat"),"cid","pid");
+$mytree = new XoopsTree($xoopsDB->prefix("efqdiralpha1_cat"), "cid", "pid");
 $datafieldmanager = new efqDataFieldManager();
 $eh = new ErrorHandler;
 
@@ -60,7 +60,7 @@ 
 if (!empty($_GET['item'])) {
 	$get_itemid = intval($_GET['item']);
 } else {
-	redirect_header("index.php",2,_MD_NOVALIDITEM);
+	redirect_header("index.php", 2, _MD_NOVALIDITEM);
 	exit();
 }
 
@@ -90,7 +90,7 @@ 
 	if ($xoopsUser->getVar('uid') == $listing->getVar('uid')) {
 		$islistingowner = true;
 		$xoopsTpl->assign('listingowner', '1');
-		if ( $listing->getVar('status') == '2' and $xoopsModuleConfig['autoapprove'] == 1 ) {
+		if ($listing->getVar('status') == '2' and $xoopsModuleConfig['autoapprove'] == 1) {
 			$editrights = '1';
 		} else {
 			$editrights = '0';

advancedsearch.php

Indentation +30 added lines, -30 removed lines

@@ -49,24 +49,24 @@ 
 
 
 if (isset($_GET['catid'])) {
-        $get_cid = intval($_GET['cid']);
+		$get_cid = intval($_GET['cid']);
 } else {
-        $get_cid = "1";
+		$get_cid = "1";
 }
 if (isset($_GET['dirid'])) {
-        $get_dirid = intval($_GET['dirid']);
+		$get_dirid = intval($_GET['dirid']);
 } else if (isset($_POST['dirid'])) {
-        $get_dirid = intval($_POST['dirid']);
+		$get_dirid = intval($_POST['dirid']);
 }
 if(isset($_GET['orderby'])) {
-        $orderby = convertorderbyin($_GET['orderby']);
+		$orderby = convertorderbyin($_GET['orderby']);
 } else {
-        $orderby = "title ASC";
+		$orderby = "title ASC";
 }
 if(isset($_GET['page'])) {
-        $get_page = intval($_GET['page']);
+		$get_page = intval($_GET['page']);
 } else {
-        $get_page = 1;
+		$get_page = 1;
 }
 
 $xoopsOption['template_main'] = 'efqdiralpha1_search.html';
@@ -505,23 +505,23 @@ 
 
 function getNumberOfResults($searchnum=0, $limit=10) {
 	global $xoopsDB, $eh;
-    $block = array();
+	$block = array();
 	$sql = "SELECT MAX(page), items FROM ".$xoopsDB->prefix("efqdiralpha1_searchresults")." WHERE searchnum = '".$searchnum."' GROUP by page";
 	$result = $xoopsDB->query($sql) or $eh->show("0013");
-    $num_results = $xoopsDB->getRowsNum($result);
-    if (!$result) {
-        return 0;
-        }
-    for ($i=0; $i <$num_results; $i++)
-    {
-        $row = mysql_fetch_array($result);
-        $page = $row['MAX(page)'];
+	$num_results = $xoopsDB->getRowsNum($result);
+	if (!$result) {
+		return 0;
+		}
+	for ($i=0; $i <$num_results; $i++)
+	{
+		$row = mysql_fetch_array($result);
+		$page = $row['MAX(page)'];
 		$items = $row['items'];
-    }
+	}
 	$split_items = split(",",$items);
 	$count_lastpage = count($split_items);
 	$count = ($page * $limit) - ($limit - $count_lastpage);
-    return $count;
+	return $count;
 }
 
 function mod_search_count($queryarray, $andor, $limit, $offset=0, $filter_arr) {
@@ -615,19 +615,19 @@ 
      */
    if (!$strict)
    {
-       foreach ($multiArray as $multiArrayKey => $childArray)
-       {
-           if (array_key_exists($keyName, $childArray) && $childArray[$keyName] == $value) {
+	   foreach ($multiArray as $multiArrayKey => $childArray)
+	   {
+		   if (array_key_exists($keyName, $childArray) && $childArray[$keyName] == $value) {
 			   return $multiArrayKey;
-           }
-       }
+		   }
+	   }
    } else {
-       foreach ($multiArray as $multiArrayKey => $childArray)
-       {
-           if (array_key_exists($keyName, $childArray) && $childArray[$keyName] === $value) {
-               return $multiArrayKey;
-           }
-       }
+	   foreach ($multiArray as $multiArrayKey => $childArray)
+	   {
+		   if (array_key_exists($keyName, $childArray) && $childArray[$keyName] === $value) {
+			   return $multiArrayKey;
+		   }
+	   }
    }
    return false;
 }

Switch Indentation +84 added lines, -84 removed lines

@@ -81,61 +81,61 @@ 
 	$filter_arr = array();
 	while(list($dtypeid, $dtypetitle, $dtypeoptions, $fieldtype) = $xoopsDB->fetchRow($result)) {
 		switch ($fieldtype) {
-		case "textbox":
-			$filter_arr[] = getPostedValue_text($dtypeid);
-			break;
-		case "textarea":
-			$filter_arr[] = getPostedValue_text($dtypeid);
-			break;
-		case "yesno":
-			$filter_arr[] = getPostedValue_text($dtypeid);
-			break;
-		case "radio":
-			$filter_arr[] = getPostedValue_text($dtypeid);
-			break;
-		case "select":
-			$selectarr = getPostedValue_array($dtypeid);
-			$count_arr = count($selectarr);
+			case "textbox":
+				$filter_arr[] = getPostedValue_text($dtypeid);
+				break;
+			case "textarea":
+				$filter_arr[] = getPostedValue_text($dtypeid);
+				break;
+			case "yesno":
+				$filter_arr[] = getPostedValue_text($dtypeid);
+				break;
+			case "radio":
+				$filter_arr[] = getPostedValue_text($dtypeid);
+				break;
+			case "select":
+				$selectarr = getPostedValue_array($dtypeid);
+				$count_arr = count($selectarr);
 			
-			if ($count_arr >= 1) {
-				foreach ($selectarr as $arr) {
-					$selectarray[] = $arr['postvalue'];
+				if ($count_arr >= 1) {
+					foreach ($selectarr as $arr) {
+						$selectarray[] = $arr['postvalue'];
+					}
+					$filter_arr[] = array('dtypeid' => $dtypeid, 'constr' => "equal", 'postvalue' => $selectarr['postvalue'], 'selectfields' => $selectarray, 'addressfields' => 0);
 				}
-				$filter_arr[] = array('dtypeid' => $dtypeid, 'constr' => "equal", 'postvalue' => $selectarr['postvalue'], 'selectfields' => $selectarray, 'addressfields' => 0);
-			}
-			break;
-		case "dhtml":
-			$filter_arr[] = getPostedValue_text($dtypeid);
-			break;
-		case "address":
-			$addressarr = getPostedValue_address($dtypeid);
-			$addressarray = array();
-			//$countarr = count($address
-			if (is_array($addressarray) && count($addressarray) >= 1) {
-				foreach ($addressarr as $arr) {
-					$addressarray[] = array($arr['field'] => $arr['postvalue']);
+				break;
+			case "dhtml":
+				$filter_arr[] = getPostedValue_text($dtypeid);
+				break;
+			case "address":
+				$addressarr = getPostedValue_address($dtypeid);
+				$addressarray = array();
+				//$countarr = count($address
+				if (is_array($addressarray) && count($addressarray) >= 1) {
+					foreach ($addressarr as $arr) {
+						$addressarray[] = array($arr['field'] => $arr['postvalue']);
+					}
+					$filter_arr[] = array('dtypeid' => $dtypeid, 'constr' => "equal", 'postvalue' => $arr['postvalue'], 'selectfields' => 0, 'addressfields' => $addressarray);
 				}
-				$filter_arr[] = array('dtypeid' => $dtypeid, 'constr' => "equal", 'postvalue' => $arr['postvalue'], 'selectfields' => 0, 'addressfields' => $addressarray);
-			}
-			break;
-		case "rating":
-			$selectarr = getPostedValue_array($dtypeid);
-			//$selectarr = getPostedValue_text($dtypeid);
-			$count_arr = count($selectarr);
+				break;
+			case "rating":
+				$selectarr = getPostedValue_array($dtypeid);
+				//$selectarr = getPostedValue_text($dtypeid);
+				$count_arr = count($selectarr);
 			
-			if ($count_arr >= 1) {
-				foreach ($selectarr as $arr) {
-					$selectarray[] = $arr;
+				if ($count_arr >= 1) {
+					foreach ($selectarr as $arr) {
+						$selectarray[] = $arr;
+					}
+					//echo $selectarr['postvalue'];
+					$filter_arr[] = array('dtypeid' => $dtypeid, 'constr' => $selectarr['constr'], 'postvalue' => $selectarr['postvalue'], 'selectfields' => '', 'addressfields' => 0);
 				}
-				//echo $selectarr['postvalue'];
-				$filter_arr[] = array('dtypeid' => $dtypeid, 'constr' => $selectarr['constr'], 'postvalue' => $selectarr['postvalue'], 'selectfields' => '', 'addressfields' => 0);
-			}
-			break;
-		case "date":
-			$filter_arr[] = getPostedValue_text($dtypeid);
-			break;
-		default:
-			break;
+				break;
+			case "date":
+				$filter_arr[] = getPostedValue_text($dtypeid);
+				break;
+			default:
+				break;
 		}
 	}
 	if(isset($_POST['q'])) {
@@ -390,40 +390,40 @@ 
 			${"sql".$n} = "";
 			//$zero_allowed = '1';
 			switch ($constr) {
-			case "equal":
-				${"sql".$n} .= "SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM ".$xoopsDB->prefix("efqdiralpha1_data")." d, ".$xoopsDB->prefix("efqdiralpha1_items")." i LEFT JOIN ".$xoopsDB->prefix("efqdiralpha1_item_text")." t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
-				$constraint = " = '".$postvalue."'";
-				break;
-			case "notequal":
-				${"sql".$n} .= "SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM ".$xoopsDB->prefix("efqdiralpha1_data")." d, ".$xoopsDB->prefix("efqdiralpha1_items")." i LEFT JOIN ".$xoopsDB->prefix("efqdiralpha1_item_text")." t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
-				$constraint = " <> '".$postvalue."'";
-				break;
-			case "contains":
-				${"sql".$n} .= "SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM ".$xoopsDB->prefix("efqdiralpha1_data")." d, ".$xoopsDB->prefix("efqdiralpha1_items")." i LEFT JOIN ".$xoopsDB->prefix("efqdiralpha1_item_text")." t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
-				$constraint = " LIKE '%".$postvalue."%'";
-				break;
-			case "notcontain":
-				${"sql".$n} .= "SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM ".$xoopsDB->prefix("efqdiralpha1_data")." d, ".$xoopsDB->prefix("efqdiralpha1_items")." i LEFT JOIN ".$xoopsDB->prefix("efqdiralpha1_item_text")." t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
-				$constraint = " NOT LIKE '%".$postvalue."%'";
-				break;
-			case "begins":
-				${"sql".$n} .= "SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM ".$xoopsDB->prefix("efqdiralpha1_data")." d, ".$xoopsDB->prefix("efqdiralpha1_items")." i LEFT JOIN ".$xoopsDB->prefix("efqdiralpha1_item_text")." t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
-				$constraint = " LIKE '".$postvalue."%'";
-				break;
-			case "ends":
-				${"sql".$n} .= "SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM ".$xoopsDB->prefix("efqdiralpha1_data")." d, ".$xoopsDB->prefix("efqdiralpha1_items")." i LEFT JOIN ".$xoopsDB->prefix("efqdiralpha1_item_text")." t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
-				$constraint = " LIKE '%".$postvalue."'";
-				break;
-			case "bigger":
-				${"sql".$n} .= "SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM ".$xoopsDB->prefix("efqdiralpha1_data")." d, ".$xoopsDB->prefix("efqdiralpha1_items")." i LEFT JOIN ".$xoopsDB->prefix("efqdiralpha1_item_text")." t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
-				$constraint = " > ".intval($postvalue)."";
-				break;
-			case "smaller":
-				${"sql".$n} .= "SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM ".$xoopsDB->prefix("efqdiralpha1_data")." d, ".$xoopsDB->prefix("efqdiralpha1_items")." i LEFT JOIN ".$xoopsDB->prefix("efqdiralpha1_item_text")." t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
-				$constraint = " < ".intval($postvalue)."";
-				break;
-			default:
-				break;
+				case "equal":
+					${"sql".$n} .= "SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM ".$xoopsDB->prefix("efqdiralpha1_data")." d, ".$xoopsDB->prefix("efqdiralpha1_items")." i LEFT JOIN ".$xoopsDB->prefix("efqdiralpha1_item_text")." t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
+					$constraint = " = '".$postvalue."'";
+					break;
+				case "notequal":
+					${"sql".$n} .= "SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM ".$xoopsDB->prefix("efqdiralpha1_data")." d, ".$xoopsDB->prefix("efqdiralpha1_items")." i LEFT JOIN ".$xoopsDB->prefix("efqdiralpha1_item_text")." t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
+					$constraint = " <> '".$postvalue."'";
+					break;
+				case "contains":
+					${"sql".$n} .= "SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM ".$xoopsDB->prefix("efqdiralpha1_data")." d, ".$xoopsDB->prefix("efqdiralpha1_items")." i LEFT JOIN ".$xoopsDB->prefix("efqdiralpha1_item_text")." t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
+					$constraint = " LIKE '%".$postvalue."%'";
+					break;
+				case "notcontain":
+					${"sql".$n} .= "SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM ".$xoopsDB->prefix("efqdiralpha1_data")." d, ".$xoopsDB->prefix("efqdiralpha1_items")." i LEFT JOIN ".$xoopsDB->prefix("efqdiralpha1_item_text")." t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
+					$constraint = " NOT LIKE '%".$postvalue."%'";
+					break;
+				case "begins":
+					${"sql".$n} .= "SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM ".$xoopsDB->prefix("efqdiralpha1_data")." d, ".$xoopsDB->prefix("efqdiralpha1_items")." i LEFT JOIN ".$xoopsDB->prefix("efqdiralpha1_item_text")." t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
+					$constraint = " LIKE '".$postvalue."%'";
+					break;
+				case "ends":
+					${"sql".$n} .= "SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM ".$xoopsDB->prefix("efqdiralpha1_data")." d, ".$xoopsDB->prefix("efqdiralpha1_items")." i LEFT JOIN ".$xoopsDB->prefix("efqdiralpha1_item_text")." t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
+					$constraint = " LIKE '%".$postvalue."'";
+					break;
+				case "bigger":
+					${"sql".$n} .= "SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM ".$xoopsDB->prefix("efqdiralpha1_data")." d, ".$xoopsDB->prefix("efqdiralpha1_items")." i LEFT JOIN ".$xoopsDB->prefix("efqdiralpha1_item_text")." t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
+					$constraint = " > ".intval($postvalue)."";
+					break;
+				case "smaller":
+					${"sql".$n} .= "SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM ".$xoopsDB->prefix("efqdiralpha1_data")." d, ".$xoopsDB->prefix("efqdiralpha1_items")." i LEFT JOIN ".$xoopsDB->prefix("efqdiralpha1_item_text")." t ON (t.itemid=i.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
+					$constraint = " < ".intval($postvalue)."";
+					break;
+				default:
+					break;
 			}
 			if ($postvalue != '0' ) {
 				${"sql".$n} .= $andor." (d.dtypeid = ".$dtypeid." AND d.value ".$constraint.")";

Spacing +50 added lines, -50 removed lines

@@ -40,7 +40,7 @@ 
 include_once "class/class.efqtree.php";
 include_once "class/class.datafieldmanager.php";
 
-$myts =& MyTextSanitizer::getInstance();
+$myts = & MyTextSanitizer::getInstance();
 $eh = new ErrorHandler;
 $datafieldmanager = new efqDataFieldManager();
 
@@ -58,12 +58,12 @@ 
 } else if (isset($_POST['dirid'])) {
         $get_dirid = intval($_POST['dirid']);
 }
-if(isset($_GET['orderby'])) {
+if (isset($_GET['orderby'])) {
         $orderby = convertorderbyin($_GET['orderby']);
 } else {
         $orderby = "title ASC";
 }
-if(isset($_GET['page'])) {
+if (isset($_GET['page'])) {
         $get_page = intval($_GET['page']);
 } else {
         $get_page = 1;
@@ -74,12 +74,12 @@ 
 $xoopsTpl->assign('xoops_module_header', $xoops_module_header);
 //The advanced search is within a directory
 //First get an array of all datatypes within a directory that has listings linked to them
-if ( isset($_POST['submit']) ) {
+if (isset($_POST['submit'])) {
 	$sql = "SELECT DISTINCT dt.dtypeid, dt.title, dt.options, ft.fieldtype FROM ".$xoopsDB->prefix('efqdiralpha1_fieldtypes')." ft, ".$xoopsDB->prefix('efqdiralpha1_dtypes')." dt, ".$xoopsDB->prefix('efqdiralpha1_dtypes_x_cat')." dxc, ".$xoopsDB->prefix('efqdiralpha1_cat')." c WHERE c.cid=dxc.cid AND dt.dtypeid=dxc.dtypeid AND dt.fieldtypeid=ft.typeid AND c.dirid='$get_dirid' AND dt.activeyn='1'";
 	$result = $xoopsDB->query($sql) or $eh->show("0013");
 	$num_results = $xoopsDB->getRowsNum($result);
 	$filter_arr = array();
-	while(list($dtypeid, $dtypetitle, $dtypeoptions, $fieldtype) = $xoopsDB->fetchRow($result)) {
+	while (list($dtypeid, $dtypetitle, $dtypeoptions, $fieldtype) = $xoopsDB->fetchRow($result)) {
 		switch ($fieldtype) {
 		case "textbox":
 			$filter_arr[] = getPostedValue_text($dtypeid);
@@ -138,20 +138,20 @@ 
 			break;
 		}
 	}
-	if(isset($_POST['q'])) {
+	if (isset($_POST['q'])) {
 		$querystring = mysql_real_escape_string($myts->stripSlashesGPC($_POST['q']));
 	} else {
 		$querystring = "";
 	}
-	$poscount = substr_count($querystring, '"')/2;
+	$poscount = substr_count($querystring, '"') / 2;
 	$specialarr = array();
-	for ($i=0; $i<$poscount; $i++) {
-		$start = strpos($querystring, '"',0);
-		$end = strpos($querystring, '"',$start+1);
+	for ($i = 0; $i < $poscount; $i++) {
+		$start = strpos($querystring, '"', 0);
+		$end = strpos($querystring, '"', $start + 1);
 		if ($end != false) {
-			$specialstring = ltrim(substr($querystring, $start, $end-$start),'"');
+			$specialstring = ltrim(substr($querystring, $start, $end - $start), '"');
 			$specialarr[] = $specialstring;
-			$querystring = ltrim(substr_replace($querystring, "", $start, $end-$start+1));
+			$querystring = ltrim(substr_replace($querystring, "", $start, $end - $start + 1));
 		} else {
 			$querystring = ltrim(substr_replace($querystring, "", $start, 1));
 		}
@@ -175,22 +175,22 @@ 
 	$items_arr_text = "";
 	//Calculate the number of result pages.
 	if ($count_results > $limit) {
-		$count_pages = ceil($count_results/$limit);
+		$count_pages = ceil($count_results / $limit);
 	} else {
 		$count_pages = 1;
 	}
-	$pages_text = sprintf(_MD_LISTINGS_FOUND_ADV,$count_results);
+	$pages_text = sprintf(_MD_LISTINGS_FOUND_ADV, $count_results);
 	
 	if ($count_pages >= 2) {
 		$searchnum = uniqid(rand(), true);
 		$pages_text .= ""._MD_PAGES."<a href=\"advancedsearch.php?ref=".$searchnum."&page=1&dirid=".$get_dirid."\">1</a>";
 	}
-	for ($i=1; $i < $count_pages; $i++) {
+	for ($i = 1; $i < $count_pages; $i++) {
 		$page = $i + 1;
 		$pages_text .= " - <a href=\"advancedsearch.php?ref=".$searchnum."&page=".$page."&dirid=".$get_dirid."\">".$page."</a>";
 	}
-	$pages_text .= sprintf(_MD_NEW_SEARCH_ADV,$get_dirid);
-	$pages_top_text = sprintf(_MD_PAGE_OF_PAGES,$get_page,$count_pages)."<br /><br />";
+	$pages_text .= sprintf(_MD_NEW_SEARCH_ADV, $get_dirid);
+	$pages_top_text = sprintf(_MD_PAGE_OF_PAGES, $get_page, $count_pages)."<br /><br />";
 	
 	ob_start();
 	echo "<div class=\"itemTitleLarge\">"._MD_SEARCHRESULTS_TITLE."</div><br />";
@@ -201,21 +201,21 @@ 
 		$y = 0;
 		$page = 1;
 		foreach ($searchresults as $result) {
-			if ( $y < $limit && $page == 1) {
+			if ($y < $limit && $page == 1) {
 				echo "<div class=\"itemTitle\"><a href=\"".$result['link']."\">".$result['title']."</a></div><div class=\"itemText\">".$result['description']."</div><hr />";
-				if ( $y < $limit && $y > 0 ) {
+				if ($y < $limit && $y > 0) {
 					$items_arr_text .= ",".$result['itemid']."";
 				} else {
 					$items_arr_text = $result['itemid'];
 				}
 				$y++;
-			} else if ( $y < $limit && $y > 0 ) {
+			} else if ($y < $limit && $y > 0) {
 				$items_arr_text .= ",".$result['itemid']."";
 				$y++;
-			} else if ( $y < $limit && $y == 0 ) {
+			} else if ($y < $limit && $y == 0) {
 				$items_arr_text = $result['itemid'];
 				$y++;
-			} else if ( $y == $limit ) {
+			} else if ($y == $limit) {
 				//Save $items_arr_text and $page into DB
 				$newid = $xoopsDB->genId($xoopsDB->prefix("efqdiralpha1_searchresults")."_searchid_seq");
 				$sql = sprintf("INSERT INTO %s (searchid, searchnum, created, page, items, dirid, catid) VALUES (%u, '%s', '%s', %u, '%s', %u, %u)", $xoopsDB->prefix("efqdiralpha1_searchresults"), $newid, $searchnum, time(), $page, $items_arr_text, $get_dirid, $get_cid);
@@ -228,7 +228,7 @@ 
 				$page++;
 			}			
 		}
-		if ( $y != 0 && $page > 1 ) {
+		if ($y != 0 && $page > 1) {
 			$newid = $xoopsDB->genId($xoopsDB->prefix("efqdiralpha1_searchresults")."_searchid_seq");
 			$sql = sprintf("INSERT INTO %s (searchid, searchnum, created, page, items, dirid, catid) VALUES (%u, '%s', '%s', %u, '%s', %u, %u)", $xoopsDB->prefix("efqdiralpha1_searchresults"), $newid, $searchnum, time(), $page, $items_arr_text, $get_dirid, $get_cid);
 			$xoopsDB->query($sql) or $eh->show("0013");
@@ -251,7 +251,7 @@ 
 	
 	$result = $xoopsDB->query($sql) or $eh->show("0013");
 	$num_results = $xoopsDB->getRowsNum($result);
-	while(list($searchid, $searchnum, $created, $page, $items, $dirid, $catid) = $xoopsDB->fetchRow($result)) {
+	while (list($searchid, $searchnum, $created, $page, $items, $dirid, $catid) = $xoopsDB->fetchRow($result)) {
 		//Split items and for each item, get item data.
 		if ($items != "") {
 			$searchresults = get_search_results($items);
@@ -270,28 +270,28 @@ 
 	$offset = ($get_page - 1) * $limit;
 	//Calculate the number of result pages.
 	if ($count_results > $limit) {
-		$count_pages = ceil($count_results/$limit);
+		$count_pages = ceil($count_results / $limit);
 	}
 
 	ob_start();
-	printf(_MD_LISTINGS_FOUND_ADV,$count_results);
+	printf(_MD_LISTINGS_FOUND_ADV, $count_results);
 	$pages_text = ob_get_contents();
 	ob_end_clean();
 	
 	ob_start();
-	printf(_MD_PAGE_OF_PAGES,$get_page,$count_pages)."<br /><br />";
+	printf(_MD_PAGE_OF_PAGES, $get_page, $count_pages)."<br /><br />";
 	$pages_top_text = ob_get_contents();
 	ob_end_clean();
 	
 	if ($count_pages >= 2) {
 		$pages_text .= ""._MD_PAGES."<a href=\"advancedsearch.php?ref=".$get_searchnum."&page=1&dirid=".$get_dirid."\">1</a>";
 	}
-	for ($i=1; $i < $count_pages; $i++) {
+	for ($i = 1; $i < $count_pages; $i++) {
 		$page = $i + 1;
 		$pages_text .= " - <a href=\"advancedsearch.php?ref=".$get_searchnum."&page=".$page."&dirid=".$get_dirid."\">".$page."</a><br />";
 	}	
 	ob_start();
-	printf(_MD_NEW_SEARCH_ADV,$get_dirid);
+	printf(_MD_NEW_SEARCH_ADV, $get_dirid);
 	$pages_text .= ob_get_contents();
 	ob_end_clean();
 	
@@ -322,7 +322,7 @@ 
 	ob_start();
 		$form = new XoopsThemeForm(_MD_ADVSEARCH_FORM, 'advsearchform', 'advancedsearch.php');
 		$form->setExtra('enctype="multipart/form-data"');
-		while(list($dtypeid, $dtypetitle, $dtypeoptions, $fieldtype) = $xoopsDB->fetchRow($result)) {
+		while (list($dtypeid, $dtypetitle, $dtypeoptions, $fieldtype) = $xoopsDB->fetchRow($result)) {
 			$field = $datafieldmanager->createSearchField($dtypetitle, $dtypeid, $fieldtype, "", $dtypeoptions);
 		}
 		$form->addElement(new XoopsFormText(_MD_SEARCHSTRING, "q", 50, 250, ""));
@@ -342,11 +342,11 @@ 
 	$n = 0;
 	${"sql".$n} = "";
 	$items = "";
-	if ( is_array($queryarray) && count($queryarray) >= 1) {
+	if (is_array($queryarray) && count($queryarray) >= 1) {
 		$count = count($queryarray);
 		${"sql".$n} = "SELECT DISTINCT i.itemid, i.title, i.uid, i.created, t.description FROM ".$xoopsDB->prefix("efqdiralpha1_data")." d RIGHT JOIN ".$xoopsDB->prefix("efqdiralpha1_items")." i ON (d.itemid=i.itemid) LEFT JOIN ".$xoopsDB->prefix("efqdiralpha1_item_text")." t ON (t.itemid=i.itemid) WHERE i.status='2'";
 		${"sql".$n} .= " AND ((d.value LIKE '%$queryarray[0]%' OR i.title LIKE '%$queryarray[0]%' OR t.description LIKE '%$queryarray[0]%')";
-		for ($i=1;$i<$count;$i++) {
+		for ($i = 1; $i < $count; $i++) {
 			${"sql".$n} .= " $andor ";
 			${"sql".$n} .= "(d.value LIKE '%$queryarray[$i]%' OR i.title LIKE '%$queryarray[$i]%' OR t.description LIKE '%$queryarray[$i]%')";
 		}
@@ -425,7 +425,7 @@ 
 			default:
 				break;
 			}
-			if ($postvalue != '0' ) {
+			if ($postvalue != '0') {
 				${"sql".$n} .= $andor." (d.dtypeid = ".$dtypeid." AND d.value ".$constraint.")";
 			}
 			${"sql".$n} .= " ORDER BY i.created DESC";
@@ -439,7 +439,7 @@ 
 	$ret = array();
 	$items = array();
 	$intersection = array();
-	for ($i=0;$i<$n;$i++) {
+	for ($i = 0; $i < $n; $i++) {
 		$result = $xoopsDB->query(${"sql".$i}) or $eh->show("0013");
 		$num_results = $xoopsDB->getRowsNum($result);
 		
@@ -456,7 +456,7 @@ 
 					$ret[$z]['link'] = "listing.php?item=".$myrow['itemid']."";
 					$ret[$z]['title'] = $myrow['title'];
 					$ret[$z]['description'] = $myrow['description'];
-					$ret[$z]['time'] =$myrow['created'];
+					$ret[$z]['time'] = $myrow['created'];
 					$ret[$z]['uid'] = $myrow['uid'];
 					$intersection = $items;
 				}
@@ -492,7 +492,7 @@ 
 				$ret[$z]['link'] = "listing.php?item=".$myrow['itemid']."";
 				$ret[$z]['title'] = $myrow['title'];
 				$ret[$z]['description'] = $myrow['description'];
-				$ret[$z]['time'] =$myrow['created'];
+				$ret[$z]['time'] = $myrow['created'];
 				$ret[$z]['uid'] = $myrow['uid'];
 				$z++;
 			}
@@ -503,7 +503,7 @@ 
 	}
 }
 
-function getNumberOfResults($searchnum=0, $limit=10) {
+function getNumberOfResults($searchnum = 0, $limit = 10) {
 	global $xoopsDB, $eh;
     $block = array();
 	$sql = "SELECT MAX(page), items FROM ".$xoopsDB->prefix("efqdiralpha1_searchresults")." WHERE searchnum = '".$searchnum."' GROUP by page";
@@ -512,28 +512,28 @@ 
     if (!$result) {
         return 0;
         }
-    for ($i=0; $i <$num_results; $i++)
+    for ($i = 0; $i < $num_results; $i++)
     {
         $row = mysql_fetch_array($result);
         $page = $row['MAX(page)'];
 		$items = $row['items'];
     }
-	$split_items = split(",",$items);
+	$split_items = split(",", $items);
 	$count_lastpage = count($split_items);
 	$count = ($page * $limit) - ($limit - $count_lastpage);
     return $count;
 }
 
-function mod_search_count($queryarray, $andor, $limit, $offset=0, $filter_arr) {
+function mod_search_count($queryarray, $andor, $limit, $offset = 0, $filter_arr) {
 	global $xoopsDB, $eh;
 	$count = 0;
 	
 	$sql = "SELECT COUNT(DISTINCT i.itemid) FROM ".$xoopsDB->prefix("efqdiralpha1_data")." d, ".$xoopsDB->prefix("efqdiralpha1_items")." i LEFT JOIN ".$xoopsDB->prefix("efqdiralpha1_item_text")." t ON (i.itemid=t.itemid) WHERE d.itemid=i.itemid AND i.status='2'";
 	// because count() returns 1 even if a supplied variable
 	// is not an array, we must check if $queryarray is really an array
-	if ( is_array($queryarray) && $count = count($queryarray) ) {
+	if (is_array($queryarray) && $count = count($queryarray)) {
 		$sql .= " AND ((d.value LIKE '%$queryarray[0]%' OR i.title LIKE '%$queryarray[0]%' OR t.description LIKE '%$queryarray[0]%')";
-		for ($i=1;$i<$count;$i++) {
+		for ($i = 1; $i < $count; $i++) {
 			$sql .= " $andor ";
 			$sql .= "(d.value LIKE '%$queryarray[$i]%' OR i.title LIKE '%$queryarray[$i]%' OR t.description LIKE '%$queryarray[$i]%')";
 		}
@@ -544,11 +544,11 @@ 
 	return $count;
 }
 
-function getPostedValue_text ($dtypeid = 0) {
+function getPostedValue_text($dtypeid = 0) {
 	global $_POST;
 	$postedvalues = array();
-	if ( isset($_POST["$dtypeid"]) ) {
-		if ( isset($_POST[''.$dtypeid.'constr']) ) {
+	if (isset($_POST["$dtypeid"])) {
+		if (isset($_POST[''.$dtypeid.'constr'])) {
 			$constrvalue = $_POST[''.$dtypeid.'constr'];
 		} else {
 			$constrvalue = "";
@@ -558,12 +558,12 @@ 
 	}
 	return $postedvalues;
 }
-function getPostedValue_address ($dtypeid = 0) {
+function getPostedValue_address($dtypeid = 0) {
 	global $_POST;
 	$addressfields = getAddressFields('0');
 	$postedvalues = array();
 	foreach ($addressfields['addressfields'] as $field => $fieldvalue) {
-		if ( isset($_POST["$dtypeid$field"]) ) {
+		if (isset($_POST["$dtypeid$field"])) {
 			$addressfield = $_POST["$dtypeid$field"];
 			if ($addressfield != "") {
 				$postedvalues[] = array('field' => $field, 'postvalue' => $addressfield);
@@ -573,11 +573,11 @@ 
 	return $postedvalues;
 }
 
-function getPostedValue_array ($dtypeid = 0) {
+function getPostedValue_array($dtypeid = 0) {
 	global $_POST;
 	$postvalues_arr = array();
-	if ( isset($_POST["$dtypeid"]) ) {
-		if ( isset($_POST[''.$dtypeid.'constr']) ) {
+	if (isset($_POST["$dtypeid"])) {
+		if (isset($_POST[''.$dtypeid.'constr'])) {
 			$constrvalue = $_POST[''.$dtypeid.'constr'];
 		} else {
 			$constrvalue = "";

index.php

Switch Indentation +12 added lines, -12 removed lines

@@ -360,18 +360,18 @@
 						$level = '0';
 					}
 					switch ($level) {
-					case "0":
-						$class = "itemTableLevel0";
-						break;
-					case "1";
-						$class = "itemTableLevel1";
-						break;
-					case "2";
-						$class = "itemTableLevel2";
-						break;
-					case "3";
-						$class = "itemTableLevel3";
-						break;
+						case "0":
+							$class = "itemTableLevel0";
+							break;
+						case "1";
+							$class = "itemTableLevel1";
+							break;
+						case "2";
+							$class = "itemTableLevel2";
+							break;
+						case "3";
+							$class = "itemTableLevel3";
+							break;
 					}
 					$xoopsTpl->append('listings', array('fields' => $sections, 'id' => $itemid, 'catid' => $get_catid, 'logourl' => $myts->makeTboxData4Show($logourl), 'title' => $myts->makeTboxData4Show($itemtitle).$new.$pop, 'status' => $status, 'created' => formatTimestamp($created,"m"), 'rating' => number_format($rating, 2), 'category' => $path, 'description' => $myts->makeTareaData4Show($description,0), 'adminlink' => $adminlink, 'hits' => $hits, 'rating' => $rating, 'votes' => $votestring, 'class' => $class, 'mail_subject' => rawurlencode(sprintf(_MD_INTERESTING_LISTING,$xoopsConfig['sitename'])), 'mail_body' => rawurlencode(sprintf(_MD_INTERESTING_LISTING_FOUND,$xoopsConfig['sitename']).':  '.XOOPS_URL.'/modules/'.$moddir.'/listing.php?catid='.$get_catid.'&item='.$itemid)));
 				}

Spacing +40 added lines, -40 removed lines

@@ -30,7 +30,7 @@ 
 //	Based upon the mylinks and the mxDirectory modules						 //
 // ------------------------------------------------------------------------- //
 include "header.php";
-$myts =& MyTextSanitizer::getInstance(); // MyTextSanitizer object
+$myts = & MyTextSanitizer::getInstance(); // MyTextSanitizer object
 include_once XOOPS_ROOT_PATH."/class/xoopstree.php";
 include_once XOOPS_ROOT_PATH."/include/xoopscodes.php";
 include_once XOOPS_ROOT_PATH.'/class/module.errorhandler.php';
@@ -42,8 +42,8 @@ 
 $datafieldmanager = new efqDataFieldManager();
 $moddir = $xoopsModule->getvar("dirname");
 $eh = new ErrorHandler;
-$mytree = new XoopsTree($xoopsDB->prefix("efqdiralpha1_cat"),"cid","pid");
-$efqtree = new efqTree($xoopsDB->prefix("efqdiralpha1_cat"),"cid","pid");
+$mytree = new XoopsTree($xoopsDB->prefix("efqdiralpha1_cat"), "cid", "pid");
+$efqtree = new efqTree($xoopsDB->prefix("efqdiralpha1_cat"), "cid", "pid");
 
 //Check if a category is selected.
 if (!empty($_GET['catid'])) {
@@ -61,11 +61,11 @@ 
 
 if ($get_dirid == '0' && $get_catid == '0') {
 	//Show an overview of directories with directory title, image and description for each directory.
-	$result=$xoopsDB->query("SELECT dirid, name, descr, img FROM ".$xoopsDB->prefix("efqdiralpha1_dir")." WHERE open = '1' ORDER BY name") or  $eh->show("0013");
+	$result = $xoopsDB->query("SELECT dirid, name, descr, img FROM ".$xoopsDB->prefix("efqdiralpha1_dir")." WHERE open = '1' ORDER BY name") or $eh->show("0013");
 	$num_results = $xoopsDB->getRowsNum($result);
 	if ($num_results == 1) {
 		if ($xoopsModuleConfig['autoshowonedir'] == 1) {
-			while(list($dirid, $name, $descr, $img) = $xoopsDB->fetchRow($result)) {
+			while (list($dirid, $name, $descr, $img) = $xoopsDB->fetchRow($result)) {
 				$get_dirid = $dirid;
 			}				
 		} else {
@@ -74,8 +74,8 @@ 
 			$xoopsTpl->assign('xoops_module_header', $xoops_module_header);
 			$xoopsTpl->assign('lang_directories', _MD_DIRECTORIES_HEADER);
 			$xoopsTpl->assign('moddir', $moddir);
-			while(list($dirid, $name, $descr, $img) = $xoopsDB->fetchRow($result)) {
-				if ($img != ""){
+			while (list($dirid, $name, $descr, $img) = $xoopsDB->fetchRow($result)) {
+				if ($img != "") {
 					$img = XOOPS_URL."/modules/$moddir/uploads/".$myts->makeTboxData4Show($img);
 				} else {
 					$img = XOOPS_URL."/modules/$moddir/images/nopicture.gif";
@@ -89,8 +89,8 @@ 
 		$xoopsTpl->assign('xoops_module_header', $xoops_module_header);
 		$xoopsTpl->assign('lang_directories', _MD_DIRECTORIES_HEADER);
 		$xoopsTpl->assign('moddir', $moddir);
-		while(list($dirid, $name, $descr, $img) = $xoopsDB->fetchRow($result)) {
-			if ($img != ""){
+		while (list($dirid, $name, $descr, $img) = $xoopsDB->fetchRow($result)) {
+			if ($img != "") {
 				$img = XOOPS_URL."/modules/$moddir/uploads/".$myts->makeTboxData4Show($img);
 			} else {
 				$img = XOOPS_URL."/modules/$moddir/images/nopicture.gif";
@@ -98,7 +98,7 @@ 
 			$xoopsTpl->append('directories', array('image' => $img, 'id' => $dirid, 'title' => $name, 'descr' => $descr));
 		}
 	} else {
-		redirect_header(XOOPS_URL,2,_MD_NOACTIVEDIRECTORIES);
+		redirect_header(XOOPS_URL, 2, _MD_NOACTIVEDIRECTORIES);
 		exit();
 	}
 }
@@ -114,7 +114,7 @@ 
 		$dirid = $get_dirid;
 	}
 	ob_start();
-	printf(_MD_SEARCH_ADV,$dirid);
+	printf(_MD_SEARCH_ADV, $dirid);
 	$lang_adv_search = ob_get_contents();
 	ob_end_clean();
 	$searchform = "<form action=\"search.php\" name=\"search\" id=\"search\" method=\"get\">";
@@ -124,25 +124,25 @@ 
 	$pathstring .= $efqtree->getNicePathFromId($get_catid, "title", "index.php?dirid=".$dirid."&op=");
 	$xoopsTpl->assign('category_path', $pathstring);
 	
-	if (isset($xoopsUser) && $xoopsUser != null ) {
+	if (isset($xoopsUser) && $xoopsUser != null) {
 		$submitlink = "<a href=\"submit.php?dirid=".$dirid."\"><img src=\"".XOOPS_URL."/modules/".$moddir."/images/".$xoopsConfig['language']."/listing-new.gif\" alt=\""._MD_SUBMITLISTING."\" title=\""._MD_SUBMITLISTING."\" /></a>";
 		$xoopsTpl->assign('submit_link', $submitlink);
 	}
 	
 	if ($get_catid == 0) {
-		$result=$xoopsDB->query("SELECT cid, title, img FROM ".$xoopsDB->prefix("efqdiralpha1_cat")." WHERE pid = '0' AND dirid = '".$get_dirid."' ORDER BY title") or  $eh->show("0013");
+		$result = $xoopsDB->query("SELECT cid, title, img FROM ".$xoopsDB->prefix("efqdiralpha1_cat")." WHERE pid = '0' AND dirid = '".$get_dirid."' ORDER BY title") or $eh->show("0013");
 	} else {
-		$result=$xoopsDB->query("SELECT cid, title, img FROM ".$xoopsDB->prefix("efqdiralpha1_cat")." WHERE pid = '".$get_catid."' ORDER BY title") or  $eh->show("0013");
+		$result = $xoopsDB->query("SELECT cid, title, img FROM ".$xoopsDB->prefix("efqdiralpha1_cat")." WHERE pid = '".$get_catid."' ORDER BY title") or $eh->show("0013");
 	}
 	$num_results = mysql_num_rows($result);
 	if ($num_results == 0 && isset($_GET['dirid'])) {
 		$xoopsTpl->assign('lang_noresults', _MD_NORESULTS);
 	} else {
 		$count = 1;
-		while($myrow = $xoopsDB->fetchArray($result)) {
+		while ($myrow = $xoopsDB->fetchArray($result)) {
 			$totallisting = getTotalItems($myrow['cid'], 2);
 			$img = '';
-			if ($myrow['img'] && $myrow['img'] != ""){
+			if ($myrow['img'] && $myrow['img'] != "") {
 				$img = XOOPS_URL."/modules/$moddir/uploads/".$myts->makeTboxData4Show($myrow['img']);
 			}
 			$arr = array();
@@ -150,13 +150,13 @@ 
 			$space = 0;
 			$chcount = 0;
 			$subcategories = '';
-			foreach($arr as $ele){
+			foreach ($arr as $ele) {
 				$chtitle = $myts->makeTboxData4Show($ele['title']);
 				if ($chcount > 5) {
 					$subcategories .= "...";
 					break;
 				}
-				if ($space>0) {
+				if ($space > 0) {
 					$subcategories .= ", ";
 				}
 				$subcategories .= "<a class=\"subcategory\" href=\"".XOOPS_URL."/modules/$moddir/index.php?catid=".$ele['cid']."\">".$chtitle."</a>";
@@ -193,14 +193,14 @@ 
 		$xoopsTpl->assign('lang_lastupdate', _MD_LASTUPDATEC);
 		$xoopsTpl->assign('lang_hits', _MD_HITSC);
 		$xoopsTpl->assign('lang_modify', _MD_MODIFY);
-		$xoopsTpl->assign('lang_listings' , _MD_LATESTLIST);
-		$xoopsTpl->assign('lang_category' , _MD_CATEGORYC);
-		$xoopsTpl->assign('lang_visit' , _MD_VISIT);
+		$xoopsTpl->assign('lang_listings', _MD_LATESTLIST);
+		$xoopsTpl->assign('lang_category', _MD_CATEGORYC);
+		$xoopsTpl->assign('lang_visit', _MD_VISIT);
 		$sections = array();
 		if ($get_catid == 0) {
 			$efqListingHandler = new efqListingHandler();
 			$directorylistings = $efqListingHandler->getListingsByDirectory($get_dirid);
-			while(list($itemid, $logourl, $uid, $status, $created, $ltitle, $hits, $rating, $votes, $type, $dirid, $description) = $xoopsDB->fetchRow($directorylistings)) {
+			while (list($itemid, $logourl, $uid, $status, $created, $ltitle, $hits, $rating, $votes, $type, $dirid, $description) = $xoopsDB->fetchRow($directorylistings)) {
 				if ($isadmin) {
 					$adminlink = '<a href="'.XOOPS_URL.'/modules/'.$moddir.'/admin/index.php?op=edit&amp;item='.$itemid.'"><img src="'.XOOPS_URL.'/modules/'.$moddir.'/images/editicon.gif" border="0" alt="'._MD_EDITTHISLINK.'" /></a>';
 				} else {
@@ -209,7 +209,7 @@ 
 				if ($votes == 1) {
 					$votestring = _MD_ONEVOTE;
 				} else {
-					$votestring = sprintf(_MD_NUMVOTES,$votes);
+					$votestring = sprintf(_MD_NUMVOTES, $votes);
 				}
 				
 				if ($xoopsModuleConfig['showdatafieldsincat'] == '1') {
@@ -241,10 +241,10 @@ 
 				$coupons = $coupon_handler->getCountByLink($itemid);
 				$path = $efqtree->getPathFromId($get_catid, "title");
 				$path = substr($path, 1);
-				$path = str_replace("/"," <img src='".XOOPS_URL."/modules/".$moddir."/images/arrow.gif' board='0' alt=''> ",$path);
+				$path = str_replace("/", " <img src='".XOOPS_URL."/modules/".$moddir."/images/arrow.gif' board='0' alt=''> ", $path);
 				$new = newlinkgraphic($created, $status);
 				$pop = popgraphic($hits);
-				$xoopsTpl->append('listings', array('fields' => $sections, 'coupons' => $coupons, 'catid' => $get_catid, 'id' => $itemid, 'rating' => number_format($rating, 2), 'title' => $myts->makeTboxData4Show($ltitle).$pop, 'type' => $type, 'logourl' => $myts->makeTboxData4Show($logourl), 'description' => $myts->makeTareaData4Show($description,0), 'adminlink' => $adminlink, 'hits' => $hits, 'votes' => $votestring, 'mail_subject' => rawurlencode(sprintf(_MD_INTERESTING_LISTING,$xoopsConfig['sitename'])), 'mail_body' => rawurlencode(sprintf(_MD_INTERESTING_LISTING_FOUND,$xoopsConfig['sitename']).':  '.XOOPS_URL.'/modules/'.$moddir.'/singleitem.php?cid='.$get_catid.'&amp;item='.$itemid)));
+				$xoopsTpl->append('listings', array('fields' => $sections, 'coupons' => $coupons, 'catid' => $get_catid, 'id' => $itemid, 'rating' => number_format($rating, 2), 'title' => $myts->makeTboxData4Show($ltitle).$pop, 'type' => $type, 'logourl' => $myts->makeTboxData4Show($logourl), 'description' => $myts->makeTareaData4Show($description, 0), 'adminlink' => $adminlink, 'hits' => $hits, 'votes' => $votestring, 'mail_subject' => rawurlencode(sprintf(_MD_INTERESTING_LISTING, $xoopsConfig['sitename'])), 'mail_body' => rawurlencode(sprintf(_MD_INTERESTING_LISTING_FOUND, $xoopsConfig['sitename']).':  '.XOOPS_URL.'/modules/'.$moddir.'/singleitem.php?cid='.$get_catid.'&amp;item='.$itemid)));
 			}
 		} else {
 			if (isset($_GET['show'])) {
@@ -254,16 +254,16 @@ 
 			}
 			$min = isset($_GET['min']) ? intval($_GET['min']) : 0;
 			$max = $min + $show;
-			if(isset($_GET['orderby'])) {
+			if (isset($_GET['orderby'])) {
 					$orderby = convertorderbyin($_GET['orderby']);
 			} else {
 					$orderby = "level DESC";
 			}
-			$fullcountresult=$xoopsDB->query("select count(*) from ".$xoopsDB->prefix("efqdiralpha1_items")." i, ".$xoopsDB->prefix("efqdiralpha1_item_x_cat")." x WHERE i.itemid=x.itemid AND x.cid=$get_catid AND i.status='2'");
+			$fullcountresult = $xoopsDB->query("select count(*) from ".$xoopsDB->prefix("efqdiralpha1_items")." i, ".$xoopsDB->prefix("efqdiralpha1_item_x_cat")." x WHERE i.itemid=x.itemid AND x.cid=$get_catid AND i.status='2'");
 			list($numrows) = $xoopsDB->fetchRow($fullcountresult);
 			$totalcount = $numrows;
 			$page_nav = '';
-			if($numrows>0){
+			if ($numrows > 0) {
 				/*if ($xoopsModuleConfig['allowcomments'] == 1) {
 					$xoopsTpl->assign('allowcomments', true);
 					$xoopsTpl->assign('lang_comments' , _COMMENTS);
@@ -280,14 +280,14 @@ 
 					$xoopsTpl->assign('lang_rating', _MD_RATINGC);
 					$xoopsTpl->assign('lang_ratethissite', _MD_RATETHISSITE);
 				}
-				$xoopsTpl->assign('lang_listings' , _MD_LISTINGS);
+				$xoopsTpl->assign('lang_listings', _MD_LISTINGS);
 				$xoopsTpl->assign('category_id', $get_catid);
 				$xoopsTpl->assign('lang_description', _MD_DESCRIPTIONC);
 				$xoopsTpl->assign('lang_lastupdate', _MD_LASTUPDATEC);
 				$xoopsTpl->assign('lang_hits', _MD_HITSC);
 				$xoopsTpl->assign('lang_modify', _MD_MODIFY);
-				$xoopsTpl->assign('lang_category' , _MD_CATEGORYC);
-				$xoopsTpl->assign('lang_visit' , _MD_VISIT);
+				$xoopsTpl->assign('lang_category', _MD_CATEGORYC);
+				$xoopsTpl->assign('lang_visit', _MD_VISIT);
 				$xoopsTpl->assign('show_listings', true);
 				
 				$efqListingHandler = new efqListingHandler();
@@ -295,7 +295,7 @@ 
 				$numrows = $xoopsDB->getRowsNum($categorylistings);
 			
 				//if 2 or more items in result, show the sort menu
-				if($numrows>1){
+				if ($numrows > 1) {
 					
 					$xoopsTpl->assign('show_nav', true);
 					$orderbyTrans = convertorderbytrans($orderby);
@@ -311,7 +311,7 @@ 
 				if ($xoopsModuleConfig['showlinkimages'] == 1) {
 					$xoopsTpl->assign('showlinkimages', 1);
 				}
-				while(list($itemid, $logourl, $uid, $status, $created, $itemtitle, $hits, $rating, $votes, $typeid, $dirid, $level, $description, $cid) = $xoopsDB->fetchRow($categorylistings)) {
+				while (list($itemid, $logourl, $uid, $status, $created, $itemtitle, $hits, $rating, $votes, $typeid, $dirid, $level, $description, $cid) = $xoopsDB->fetchRow($categorylistings)) {
 					if ($isadmin) {
 						if ($xoopsModuleConfig['showlinkimages'] == 1) {
 							$adminlink = '<a href="'.XOOPS_URL.'/modules/'.$moddir.'/admin/index.php?op=edit&amp;item='.$itemid.'"><img src="'.XOOPS_URL.'/modules/'.$moddir.'/images/editicon.gif" border="0" alt="'._MD_EDITTHISLISTING.'" /></a>';
@@ -324,7 +324,7 @@ 
 					if ($votes == 1) {
 						$votestring = _MD_ONEVOTE;
 					} else {
-						$votestring = sprintf(_MD_NUMVOTES,$votes);
+						$votestring = sprintf(_MD_NUMVOTES, $votes);
 					}
 					
 					if ($xoopsModuleConfig['showdatafieldsincat'] == '1') {
@@ -353,7 +353,7 @@ 
 					}					
 					$path = $efqtree->getPathFromId($get_catid, "title");
 					$path = substr($path, 1);
-					$path = str_replace("/"," <img src='".XOOPS_URL."/modules/".$moddir."/images/arrow.gif' board='0' alt=''> ",$path);
+					$path = str_replace("/", " <img src='".XOOPS_URL."/modules/".$moddir."/images/arrow.gif' board='0' alt=''> ", $path);
 					$new = newlinkgraphic($created, $status);
 					$pop = popgraphic($hits);
 					if ($level == NULL) {
@@ -373,22 +373,22 @@ 
 						$class = "itemTableLevel3";
 						break;
 					}
-					$xoopsTpl->append('listings', array('fields' => $sections, 'id' => $itemid, 'catid' => $get_catid, 'logourl' => $myts->makeTboxData4Show($logourl), 'title' => $myts->makeTboxData4Show($itemtitle).$new.$pop, 'status' => $status, 'created' => formatTimestamp($created,"m"), 'rating' => number_format($rating, 2), 'category' => $path, 'description' => $myts->makeTareaData4Show($description,0), 'adminlink' => $adminlink, 'hits' => $hits, 'rating' => $rating, 'votes' => $votestring, 'class' => $class, 'mail_subject' => rawurlencode(sprintf(_MD_INTERESTING_LISTING,$xoopsConfig['sitename'])), 'mail_body' => rawurlencode(sprintf(_MD_INTERESTING_LISTING_FOUND,$xoopsConfig['sitename']).':  '.XOOPS_URL.'/modules/'.$moddir.'/listing.php?catid='.$get_catid.'&amp;item='.$itemid)));
+					$xoopsTpl->append('listings', array('fields' => $sections, 'id' => $itemid, 'catid' => $get_catid, 'logourl' => $myts->makeTboxData4Show($logourl), 'title' => $myts->makeTboxData4Show($itemtitle).$new.$pop, 'status' => $status, 'created' => formatTimestamp($created, "m"), 'rating' => number_format($rating, 2), 'category' => $path, 'description' => $myts->makeTareaData4Show($description, 0), 'adminlink' => $adminlink, 'hits' => $hits, 'rating' => $rating, 'votes' => $votestring, 'class' => $class, 'mail_subject' => rawurlencode(sprintf(_MD_INTERESTING_LISTING, $xoopsConfig['sitename'])), 'mail_body' => rawurlencode(sprintf(_MD_INTERESTING_LISTING_FOUND, $xoopsConfig['sitename']).':  '.XOOPS_URL.'/modules/'.$moddir.'/listing.php?catid='.$get_catid.'&amp;item='.$itemid)));
 				}
 				$orderby = convertorderbyout($orderby);
 				//Calculates how many pages exist.  Which page one should be on, etc...
 				$listingpages = ceil($totalcount / $show);
 				
 				//Page Numbering
-				if ($listingpages!=1 && $listingpages!=0) {
+				if ($listingpages != 1 && $listingpages != 0) {
 					$get_catid = intval($_GET['catid']);
 					$prev = $min - $show;
-					if ($prev>=0) {
+					if ($prev >= 0) {
 						$page_nav .= "<a href='index.php?catid=".$get_catid."&amp;min=$prev&amp;orderby=$orderby&amp;show=$show'><b><u>&laquo;</u></b></a>&nbsp;";
 					}
 					$counter = 1;
 					$currentpage = ($max / $show);
-					while ( $counter<=$listingpages ) {
+					while ($counter <= $listingpages) {
 						$mintemp = ($show * $counter) - $show;
 						if ($counter == $currentpage) {
 							$page_nav .= "<strong>(".$counter.")</strong>&nbsp;";
@@ -397,7 +397,7 @@ 
 						}
 						$counter++;
 					}
-					if ( $numrows>$max ) {
+					if ($numrows > $max) {
 						$page_nav .= "<a href='index.php?catid=".$get_catid."&amp;min=".$max."&amp;orderby=".$orderby."&amp;show=".$show."'>";
 						$page_nav .= "<strong><u>&raquo;</u></strong></a>";
 					}

language/english/blocks.php

Spacing +5 added lines, -5 removed lines

@@ -29,9 +29,9 @@
 //	Purpose: Create a business directory for xoops.		 	 				 //
 //	Based upon the mylinks and the mxDirectory modules						 //
 // ------------------------------------------------------------------------- //
-define("_MB_EFQDIR_MENU","Directories");
-define("_MB_EFQDIR_DISP","Display");
-define("_MB_EFQDIR_LISTINGS","Listings");
-define("_MB_EFQDIR_CHARS","Characters");
-define("_MB_EFQDIR_LENGTH","Lenght");
+define("_MB_EFQDIR_MENU", "Directories");
+define("_MB_EFQDIR_DISP", "Display");
+define("_MB_EFQDIR_LISTINGS", "Listings");
+define("_MB_EFQDIR_CHARS", "Characters");
+define("_MB_EFQDIR_LENGTH", "Lenght");
 ?>

language/english/main.php

Spacing +504 added lines, -504 removed lines

@@ -29,456 +29,456 @@ 
 //	Based upon the mylinks and the mxDirectory modules						 //
 // ------------------------------------------------------------------------- //
 //Submit form
-define("_MD_SELECT","Select yes/no");
-define("_MD_CATEGORIES","Categories");
-define("_MD_ERROR_NOT_SAVED","The record was not saved. Please contact the site administrator.");
-
-define("_MD_THANKSFORINFO","Thanks for the information. We'll look into your request shortly.");
-define("_MD_THANKSFORHELP","Thank you for helping to maintain this directory's integrity.");
-define("_MD_FORSECURITY","For security reasons your user name and IP address will also be temporarily recorded.");
-
-define("_MD_SEARCHFOR","Search for");
-define("_MD_ANY","ANY");
-define("_MD_SEARCH","Search");
-define("_MD_NORESULTS","No results were found.");
-
-define("_MD_MAIN","Main");
-define("_MD_POPULAR","Popular");
-define("_MD_TOPRATED","Top Rated");
-
-define("_MD_EDIT","Edit");
-define("_MD_UPDATE","Update");
-define("_MD_CONTINUE","Continue");
-define("_MD_FINISHED","Finished");
-
-define("_MD_CREATED","Created");
-
-define("_MD_NEWTHISWEEK","New this week");
-define("_MD_UPTHISWEEK","Updated this week");
-
-define("_MD_POPULARITYLTOM","Popularity (Least to Most Hits)");
-define("_MD_POPULARITYMTOL","Popularity (Most to Least Hits)");
-define("_MD_TITLEATOZ","Title (A to Z)");
-define("_MD_TITLEZTOA","Title (Z to A)");
-define("_MD_DATEOLD","Date (Old Links Listed First)");
-define("_MD_DATENEW","Date (New Links Listed First)");
-define("_MD_RATINGLTOH","Rating (Lowest Score to Highest Score)");
-define("_MD_RATINGHTOL","Rating (Highest Score to Lowest Score)");
-
-define("_MD_NOSHOTS","No Screenshots Available");
-define("_MD_EDITTHISLINK","Edit This Link");
-
-define("_MD_DESCRIPTIONC","Description: ");
-define("_MD_EMAILC","Email: ");
-define("_MD_CATEGORYC","Category: ");
-define("_MD_LASTUPDATEC","Last Update: ");
-define("_MD_HITSC","Hits: ");
-define("_MD_RATINGC","Rating: ");
-define("_MD_ONEVOTE","1 vote");
-define("_MD_NUMVOTES","%s votes");
-define("_MD_RATETHISSITE","Rate this listing");
-define("_MD_MODIFY","Modify");
-define("_MD_REPORTBROKEN","Report Broken Link");
-define("_MD_TELLAFRIEND","Tell a Friend");
-define("_MD_SPECIALOFFERS_FOR","Special offers for:");
-
-define("_MD_THEREARE","There are <b>%s</b> Listings in this directory");
-define("_MD_LATESTLIST","Latest Listings");
-
-define("_MD_REQUESTMOD","Request Link Modification");
-define("_MD_LINKID","Link ID: ");
-define("_MD_SITETITLE","Website Title: ");
-define("_MD_SITEURL","Website URL: ");
-define("_MD_OPTIONS:","Options: ");
-define("_MD_OPTIONS","Options");
-define("_MD_OPTIONS_EXPL","Seperate list of options by using the | sign.");
+define("_MD_SELECT", "Select yes/no");
+define("_MD_CATEGORIES", "Categories");
+define("_MD_ERROR_NOT_SAVED", "The record was not saved. Please contact the site administrator.");
+
+define("_MD_THANKSFORINFO", "Thanks for the information. We'll look into your request shortly.");
+define("_MD_THANKSFORHELP", "Thank you for helping to maintain this directory's integrity.");
+define("_MD_FORSECURITY", "For security reasons your user name and IP address will also be temporarily recorded.");
+
+define("_MD_SEARCHFOR", "Search for");
+define("_MD_ANY", "ANY");
+define("_MD_SEARCH", "Search");
+define("_MD_NORESULTS", "No results were found.");
+
+define("_MD_MAIN", "Main");
+define("_MD_POPULAR", "Popular");
+define("_MD_TOPRATED", "Top Rated");
+
+define("_MD_EDIT", "Edit");
+define("_MD_UPDATE", "Update");
+define("_MD_CONTINUE", "Continue");
+define("_MD_FINISHED", "Finished");
+
+define("_MD_CREATED", "Created");
+
+define("_MD_NEWTHISWEEK", "New this week");
+define("_MD_UPTHISWEEK", "Updated this week");
+
+define("_MD_POPULARITYLTOM", "Popularity (Least to Most Hits)");
+define("_MD_POPULARITYMTOL", "Popularity (Most to Least Hits)");
+define("_MD_TITLEATOZ", "Title (A to Z)");
+define("_MD_TITLEZTOA", "Title (Z to A)");
+define("_MD_DATEOLD", "Date (Old Links Listed First)");
+define("_MD_DATENEW", "Date (New Links Listed First)");
+define("_MD_RATINGLTOH", "Rating (Lowest Score to Highest Score)");
+define("_MD_RATINGHTOL", "Rating (Highest Score to Lowest Score)");
+
+define("_MD_NOSHOTS", "No Screenshots Available");
+define("_MD_EDITTHISLINK", "Edit This Link");
+
+define("_MD_DESCRIPTIONC", "Description: ");
+define("_MD_EMAILC", "Email: ");
+define("_MD_CATEGORYC", "Category: ");
+define("_MD_LASTUPDATEC", "Last Update: ");
+define("_MD_HITSC", "Hits: ");
+define("_MD_RATINGC", "Rating: ");
+define("_MD_ONEVOTE", "1 vote");
+define("_MD_NUMVOTES", "%s votes");
+define("_MD_RATETHISSITE", "Rate this listing");
+define("_MD_MODIFY", "Modify");
+define("_MD_REPORTBROKEN", "Report Broken Link");
+define("_MD_TELLAFRIEND", "Tell a Friend");
+define("_MD_SPECIALOFFERS_FOR", "Special offers for:");
+
+define("_MD_THEREARE", "There are <b>%s</b> Listings in this directory");
+define("_MD_LATESTLIST", "Latest Listings");
+
+define("_MD_REQUESTMOD", "Request Link Modification");
+define("_MD_LINKID", "Link ID: ");
+define("_MD_SITETITLE", "Website Title: ");
+define("_MD_SITEURL", "Website URL: ");
+define("_MD_OPTIONS:", "Options: ");
+define("_MD_OPTIONS", "Options");
+define("_MD_OPTIONS_EXPL", "Seperate list of options by using the | sign.");
 define("_MD_NOTIFYAPPROVE", "Notify me when this link is approved");
-define("_MD_SHOTIMAGE","Screenshot Img: ");
-define("_MD_SENDREQUEST","Send Request");
-
-define("_MD_VOTEAPPRE","Your vote is appreciated.");
-define("_MD_THANKURATE","Thank you for taking the time to rate a site here at %s.");
-define("_MD_VOTEFROMYOU","Input from users such as yourself will help other visitors better decide which link to choose.");
-define("_MD_VOTEONCE","Please do not vote for the same resource more than once.");
-define("_MD_RATINGSCALE","The scale is 1 - 10, with 1 being poor and 10 being excellent.");
-define("_MD_BEOBJECTIVE","Please be objective, if everyone receives a 1 or a 10, the ratings aren't very useful.");
-define("_MD_DONOTVOTE","Do not vote for your own resource.");
-define("_MD_RATEIT","Rate It!");
-define("_MD_NORESULTS_PLEASE_CREATE_DIRECTORY","No directories were found. Please create a new directory.");
-
-
-define("_MD_WHENAPPROVED","You'll receive an E-mail when it has been approved.");
-define("_MD_SUBMITONCE","Please submit your link only once.");
-define("_MD_ALLPENDING","All link information is posted pending verification.");
-define("_MD_DONTABUSE","For security reasons your Username and IP will temporarily be recorded.");
-define("_MD_TAKESHOT","It may take several days for your website link to be added to our database.");
-
-define("_MD_RANK","Rank");
-define("_MD_CATEGORY","Category");
-define("_MD_DESCRIPTION","Description");
-define("_MD_HITS","Hits");
-define("_MD_RATING","Rating");
-define("_MD_VOTE","Vote");
-define("_MD_TOP10","%s Top 10"); // %s is a listing category title
-
-define("_MD_SEARCHRESULTS","Search results for <b>%s</b>:"); // %s is search keywords
-define("_MD_SORTBY","Sort by:");
-define("_MD_TITLE","Title");
-define("_MD_DATE","Date");
-define("_MD_POPULARITY","Popularity");
-define("_MD_CURSORTEDBY","Sites currently sorted by: %s");
-define("_MD_PREVIOUS","Previous");
-define("_MD_NEXT","Next");
-define("_MD_NOMATCH","No matches found to your query");
-
-define("_MD_SUBMIT","Submit");
-define("_MD_CANCEL","Cancel");
+define("_MD_SHOTIMAGE", "Screenshot Img: ");
+define("_MD_SENDREQUEST", "Send Request");
+
+define("_MD_VOTEAPPRE", "Your vote is appreciated.");
+define("_MD_THANKURATE", "Thank you for taking the time to rate a site here at %s.");
+define("_MD_VOTEFROMYOU", "Input from users such as yourself will help other visitors better decide which link to choose.");
+define("_MD_VOTEONCE", "Please do not vote for the same resource more than once.");
+define("_MD_RATINGSCALE", "The scale is 1 - 10, with 1 being poor and 10 being excellent.");
+define("_MD_BEOBJECTIVE", "Please be objective, if everyone receives a 1 or a 10, the ratings aren't very useful.");
+define("_MD_DONOTVOTE", "Do not vote for your own resource.");
+define("_MD_RATEIT", "Rate It!");
+define("_MD_NORESULTS_PLEASE_CREATE_DIRECTORY", "No directories were found. Please create a new directory.");
+
+
+define("_MD_WHENAPPROVED", "You'll receive an E-mail when it has been approved.");
+define("_MD_SUBMITONCE", "Please submit your link only once.");
+define("_MD_ALLPENDING", "All link information is posted pending verification.");
+define("_MD_DONTABUSE", "For security reasons your Username and IP will temporarily be recorded.");
+define("_MD_TAKESHOT", "It may take several days for your website link to be added to our database.");
+
+define("_MD_RANK", "Rank");
+define("_MD_CATEGORY", "Category");
+define("_MD_DESCRIPTION", "Description");
+define("_MD_HITS", "Hits");
+define("_MD_RATING", "Rating");
+define("_MD_VOTE", "Vote");
+define("_MD_TOP10", "%s Top 10"); // %s is a listing category title
+
+define("_MD_SEARCHRESULTS", "Search results for <b>%s</b>:"); // %s is search keywords
+define("_MD_SORTBY", "Sort by:");
+define("_MD_TITLE", "Title");
+define("_MD_DATE", "Date");
+define("_MD_POPULARITY", "Popularity");
+define("_MD_CURSORTEDBY", "Sites currently sorted by: %s");
+define("_MD_PREVIOUS", "Previous");
+define("_MD_NEXT", "Next");
+define("_MD_NOMATCH", "No matches found to your query");
+
+define("_MD_SUBMIT", "Submit");
+define("_MD_CANCEL", "Cancel");
 
 /* define("_MD_ALREADYREPORTED","You have already submitted a broken report for this resource."); */
-define("_MD_MUSTREGFIRST","Sorry, you don't have the permission to perform this action.<br />Please register or login first!");
-define("_MD_NORATING","No rating selected.");
-define("_MD_CANTVOTEOWN","You cannot vote on the resource you submitted.<br />All votes are logged and reviewed.");
-define("_MD_VOTEONCE2","Vote for the selected resource only once.<br />All votes are logged and reviewed.");
+define("_MD_MUSTREGFIRST", "Sorry, you don't have the permission to perform this action.<br />Please register or login first!");
+define("_MD_NORATING", "No rating selected.");
+define("_MD_CANTVOTEOWN", "You cannot vote on the resource you submitted.<br />All votes are logged and reviewed.");
+define("_MD_VOTEONCE2", "Vote for the selected resource only once.<br />All votes are logged and reviewed.");
 
 //%%%%%%	Module Name 'efqdirectory' (Admin)	  %%%%%
-define("_MD_MANAGE_SUBSCRIPTION_OFFERS","Manage subscription offers");
-define("_MD_A_MODADMIN_HOME","Module Admin home");
-define("_MD_A_DIRADMIN","Directories Admin");
-define("_MD_A_CATEGORIESADMIN","Manage categories");
-define("_MD_A_FTYPESADMIN","Field types Admin");
-define("_MD_A_ATYPESADMIN","Address types Admin");
-define("_MD_A_ASUBSCRIPTIONSADMIN","Subscriptions Admin");
-define("_MD_CURRENT_PIC","Current picture");
-define("_MD_SAVED","Record saved");
-define("_MD_LISTINGDELETED","Listing deleted");
-define("_MD_LISTINGAPPROVED","Listing approved");
-define("_MD_MANAGEDIRECTORIES","Manage Directories");
-define("_MD_MANAGEFIELDTYPES","Manage Field types");
-define("_MD_MANAGEADDRESSTYPES","Manage Address types");
-define("_MD_LISTINGTITLE","Listing title");
-define("_MD_CHECK_DUPLICATE_DATATYPES","Check duplicate Data types");
-define("_MD_DUPLICATE_DATATYPES","Duplicate Data types");
-define("_MD_MERGE","Merge");
-
-define("_MD_DAYS","Days");
-define("_MD_WEEKS","Weeks");
-define("_MD_QUARTERS","Quarters");
-define("_MD_MONTHS","Months");
-define("_MD_YEARS","Years");
-
-define("_MD_DAY","Day");
-define("_MD_WEEK","Week");
-define("_MD_QUARTER","Quarter");
-define("_MD_MONTH","Month");
-define("_MD_YEAR","Year");
-
-define("_MD_CURR_USD","USD");
-define("_MD_CURR_AUD","AUD");
-define("_MD_CURR_EUR","EUR");
-define("_MD_CURR_GBP","GPB");
-define("_MD_CURR_YEN","YEN");
+define("_MD_MANAGE_SUBSCRIPTION_OFFERS", "Manage subscription offers");
+define("_MD_A_MODADMIN_HOME", "Module Admin home");
+define("_MD_A_DIRADMIN", "Directories Admin");
+define("_MD_A_CATEGORIESADMIN", "Manage categories");
+define("_MD_A_FTYPESADMIN", "Field types Admin");
+define("_MD_A_ATYPESADMIN", "Address types Admin");
+define("_MD_A_ASUBSCRIPTIONSADMIN", "Subscriptions Admin");
+define("_MD_CURRENT_PIC", "Current picture");
+define("_MD_SAVED", "Record saved");
+define("_MD_LISTINGDELETED", "Listing deleted");
+define("_MD_LISTINGAPPROVED", "Listing approved");
+define("_MD_MANAGEDIRECTORIES", "Manage Directories");
+define("_MD_MANAGEFIELDTYPES", "Manage Field types");
+define("_MD_MANAGEADDRESSTYPES", "Manage Address types");
+define("_MD_LISTINGTITLE", "Listing title");
+define("_MD_CHECK_DUPLICATE_DATATYPES", "Check duplicate Data types");
+define("_MD_DUPLICATE_DATATYPES", "Duplicate Data types");
+define("_MD_MERGE", "Merge");
+
+define("_MD_DAYS", "Days");
+define("_MD_WEEKS", "Weeks");
+define("_MD_QUARTERS", "Quarters");
+define("_MD_MONTHS", "Months");
+define("_MD_YEARS", "Years");
+
+define("_MD_DAY", "Day");
+define("_MD_WEEK", "Week");
+define("_MD_QUARTER", "Quarter");
+define("_MD_MONTH", "Month");
+define("_MD_YEAR", "Year");
+
+define("_MD_CURR_USD", "USD");
+define("_MD_CURR_AUD", "AUD");
+define("_MD_CURR_EUR", "EUR");
+define("_MD_CURR_GBP", "GPB");
+define("_MD_CURR_YEN", "YEN");
 
 //Directories management
-define("_MD_INVALID_DIR","Invalid directory.");
-define("_MD_CREATE_NEWDIR","Create a new Directory");
-define("_MD_DIRNAME","Directory name");
-define("_MD_DIROPENYN","Set open?");
-define("_MD_TOTALCATS","Nr. of categories");
-define("_MD_YESNO"," Mark if set to <strong>Yes</strong>, unmark if set to <strong>No</strong>");
-define("_MD_NA","N/A");
-define("_MD_ACTION","Action");
-define("_MD_POSTFIX","Postfix to use for this directory");
-define("_MD_OPENYN","Set this Directory open?");
-define("_MD_DIR_SAVED","Directory saved succesfully.");
-define("_MD_DIR_UPDATED","Directory updated");
-define("_MD_MANAGE_CATS","Manage categories");
-define("_MD_MANAGE_CAT","Manage category");
-define("_MD_EDITDIR","Edit directory");
-define("_MD_EDITDIRFORM","Edit directory form");
-define("_MD_SELECT_PIC","Select picture to upload");
-define("_MD_WITH_SELECTED","With selected");
-define("_MD_STATUS","Status");
-define("_MD_OPEN","Open");
-define("_MD_CLOSE","Close");
-define("_MD_CLOSED","Closed");
-define("_MD_EDIT_BRACKETS"," [ Edit ]");
+define("_MD_INVALID_DIR", "Invalid directory.");
+define("_MD_CREATE_NEWDIR", "Create a new Directory");
+define("_MD_DIRNAME", "Directory name");
+define("_MD_DIROPENYN", "Set open?");
+define("_MD_TOTALCATS", "Nr. of categories");
+define("_MD_YESNO", " Mark if set to <strong>Yes</strong>, unmark if set to <strong>No</strong>");
+define("_MD_NA", "N/A");
+define("_MD_ACTION", "Action");
+define("_MD_POSTFIX", "Postfix to use for this directory");
+define("_MD_OPENYN", "Set this Directory open?");
+define("_MD_DIR_SAVED", "Directory saved succesfully.");
+define("_MD_DIR_UPDATED", "Directory updated");
+define("_MD_MANAGE_CATS", "Manage categories");
+define("_MD_MANAGE_CAT", "Manage category");
+define("_MD_EDITDIR", "Edit directory");
+define("_MD_EDITDIRFORM", "Edit directory form");
+define("_MD_SELECT_PIC", "Select picture to upload");
+define("_MD_WITH_SELECTED", "With selected");
+define("_MD_STATUS", "Status");
+define("_MD_OPEN", "Open");
+define("_MD_CLOSE", "Close");
+define("_MD_CLOSED", "Closed");
+define("_MD_EDIT_BRACKETS", " [ Edit ]");
 
 //Categories management
-define("_MD_CREATE_NEWCAT","Create a new Category");
-define("_MD_EDITCAT","Edit category");
-define("_MD_NEWCATFORM","New category form");
-define("_MD_CATTITLE","Category title");
-define("_MD_CATTEXT_ACTIVE_YN","Show Category text?");
-define("_MD_ACTIVEYN","Set this category active?");
-define("_MD_ACTIVE","Active");
-define("_MD_ALLOWLISTYN","Allow this category to have listings?");
-define("_MD_SHOWPOPULARYN","Show the most popular listings in the startpage of this category?");
-define("_MD_PARENTCAT","Parent category");
-define("_MD_EDITCATFORM","Edit category form");
-define("_MD_EDITDTYPES","Edit data field types");
-define("_MD_ADDDTYPE","Add data field type");
-define("_MD_DTYPE","Data field type");
-define("_MD_DTYPE_TITLE","Data field type title");
-define("_MD_DTYPE_NAME","Data field type name");
-define("_MD_DTYPE_SEQ","Sequence");
-define("_MD_DTYPE_SEQ_ABBR","Seq.");
-define("_MD_DTYPE_ACTIVEYN","Set this data field type active?");
-define("_MD_SECTION","Section");
-define("_MD_FTYPE_NAME","Field type name");
-define("_MD_DEFAULT","Default");
-define("_MD_DTYPE_DEFAULTYN","Set this data field type as default for child categories?");
-define("_MD_IMPORT_DTYPES_FROM_PARENTCAT","Import data field types from parent category");
-define("_MD_IMPORT_DTYPES_FROM_OTHERCAT","Import data field types from other category");
-define("_MD_IMPORT_DTYPES_YN","Automatically import default fields from parent category?");
-define("_MD_NORECORDS","No records found");
-define("_MD_ADD_DTYPE_FORM","Add data field type form");
-define("_MD_CAT_SAVED","Category saved");
-define("_MD_CAT_UPDATED","Category updated");
-define("_MD_DTYPE_ICON","Icon");
-define("_MD_DTYPE_CUSTOM","Custom field y/n");
-define("_MD_SELECT_ICON","Select icon");
-define("_MD_CURRENT_ICON","Current icon");
-define("_MD_CUSTOM","Custom field");
-define("_MD_EDITDTYPE","Edit datatype");
-define("_MD_NOIMAGE","No image selected");
-define("_MD_EDIT_DTYPE_FORM","Edit data field type form");
-define("_MD_DTYPE_UPDATED","Data field type updated");
-define("_MD_EDITCATEGORIES","Edit categories");
-define("_MD_CREATE_NEWSUBCAT","Create new subcategory");
-define("_MD_SUBCATEGORIES","Subcategories");
-define("_MD_NOVALIDDIR","No valid directory selected");
-define("_MD_NORESULTS_PLEASE_CREATE_CATEGORY","No categories were found. Please create a new category.");
-define("_MD_NOFIELDTYPE_SELECTED","No field type was selected. Please select one of the field types before you submit the form.");
-define("_MD_SELECTDIRECTORY","Select directory");
-define("_MD_FORWHICHDIRECTORY_MANAGE_CATEGORIES","For which directory do you want to manage categories?");
-define("_MD_FORWHICHDIRECTORY_MANAGE_FIELDTYPES","For which directory do you want to manage field types?");
-define("_MD_SELECTDIRFORM","Select directory");
+define("_MD_CREATE_NEWCAT", "Create a new Category");
+define("_MD_EDITCAT", "Edit category");
+define("_MD_NEWCATFORM", "New category form");
+define("_MD_CATTITLE", "Category title");
+define("_MD_CATTEXT_ACTIVE_YN", "Show Category text?");
+define("_MD_ACTIVEYN", "Set this category active?");
+define("_MD_ACTIVE", "Active");
+define("_MD_ALLOWLISTYN", "Allow this category to have listings?");
+define("_MD_SHOWPOPULARYN", "Show the most popular listings in the startpage of this category?");
+define("_MD_PARENTCAT", "Parent category");
+define("_MD_EDITCATFORM", "Edit category form");
+define("_MD_EDITDTYPES", "Edit data field types");
+define("_MD_ADDDTYPE", "Add data field type");
+define("_MD_DTYPE", "Data field type");
+define("_MD_DTYPE_TITLE", "Data field type title");
+define("_MD_DTYPE_NAME", "Data field type name");
+define("_MD_DTYPE_SEQ", "Sequence");
+define("_MD_DTYPE_SEQ_ABBR", "Seq.");
+define("_MD_DTYPE_ACTIVEYN", "Set this data field type active?");
+define("_MD_SECTION", "Section");
+define("_MD_FTYPE_NAME", "Field type name");
+define("_MD_DEFAULT", "Default");
+define("_MD_DTYPE_DEFAULTYN", "Set this data field type as default for child categories?");
+define("_MD_IMPORT_DTYPES_FROM_PARENTCAT", "Import data field types from parent category");
+define("_MD_IMPORT_DTYPES_FROM_OTHERCAT", "Import data field types from other category");
+define("_MD_IMPORT_DTYPES_YN", "Automatically import default fields from parent category?");
+define("_MD_NORECORDS", "No records found");
+define("_MD_ADD_DTYPE_FORM", "Add data field type form");
+define("_MD_CAT_SAVED", "Category saved");
+define("_MD_CAT_UPDATED", "Category updated");
+define("_MD_DTYPE_ICON", "Icon");
+define("_MD_DTYPE_CUSTOM", "Custom field y/n");
+define("_MD_SELECT_ICON", "Select icon");
+define("_MD_CURRENT_ICON", "Current icon");
+define("_MD_CUSTOM", "Custom field");
+define("_MD_EDITDTYPE", "Edit datatype");
+define("_MD_NOIMAGE", "No image selected");
+define("_MD_EDIT_DTYPE_FORM", "Edit data field type form");
+define("_MD_DTYPE_UPDATED", "Data field type updated");
+define("_MD_EDITCATEGORIES", "Edit categories");
+define("_MD_CREATE_NEWSUBCAT", "Create new subcategory");
+define("_MD_SUBCATEGORIES", "Subcategories");
+define("_MD_NOVALIDDIR", "No valid directory selected");
+define("_MD_NORESULTS_PLEASE_CREATE_CATEGORY", "No categories were found. Please create a new category.");
+define("_MD_NOFIELDTYPE_SELECTED", "No field type was selected. Please select one of the field types before you submit the form.");
+define("_MD_SELECTDIRECTORY", "Select directory");
+define("_MD_FORWHICHDIRECTORY_MANAGE_CATEGORIES", "For which directory do you want to manage categories?");
+define("_MD_FORWHICHDIRECTORY_MANAGE_FIELDTYPES", "For which directory do you want to manage field types?");
+define("_MD_SELECTDIRFORM", "Select directory");
 
 //Address types management
-define("_MD_ADDRESSTYPE_UPDATED","Address type updated");
-define("_MD_EDIT_ADDRESSTYPES_TITLE","Edit Address types");
-define("_MD_MANAGE_ADDRESS_TYPES","Manage Address types");
-define("_MD_EDIT_ADDRESSTYPE_FIELDS_FORM","Address types form");
-define("_MD_FIELDS","Address fields");
-define("_MD_USELOCYN","Use location manager to update related fields (like city and country)?");
-define("_MD_ADDRESSTYPE_TITLE","Type name");
+define("_MD_ADDRESSTYPE_UPDATED", "Address type updated");
+define("_MD_EDIT_ADDRESSTYPES_TITLE", "Edit Address types");
+define("_MD_MANAGE_ADDRESS_TYPES", "Manage Address types");
+define("_MD_EDIT_ADDRESSTYPE_FIELDS_FORM", "Address types form");
+define("_MD_FIELDS", "Address fields");
+define("_MD_USELOCYN", "Use location manager to update related fields (like city and country)?");
+define("_MD_ADDRESSTYPE_TITLE", "Type name");
 
 //Fieldtypes management
-define("_MD_FIELDTYPE","Field type");
-define("_MD_FTYPECONF","Field types management");
-define("_MD_CREATE_NEWFTYPE","Create new field type");
-define("_MD_VIEW_FIELDTYPE","View field type");
-define("_MD_TYPE","Type");
-define("_MD_EXT","Extension");
-define("_MD_SET_EXT","Extension Manager");
-define("_MD_NEWFTYPEFORM","New field type form");
-define("_MD_EDITFTYPEFORM","Edit field type form");
-define("_MD_FIELDNAMES_CHECKBOX","Checkbox");
-define("_MD_FIELDNAMES_DATE","Date");
-define("_MD_FIELDNAMES_DATETIME","Date/time");
-define("_MD_FIELDNAMES_LONGDATE","Long date");
-define("_MD_FIELDNAMES_GROUP","Group");
-define("_MD_FIELDNAMES_GROUPMULTI","Multi group");
-define("_MD_FIELDNAMES_LANGUAGE","Language");
-define("_MD_FIELDNAMES_RADIO","Radio");
-define("_MD_FIELDNAMES_SELECT","Select");
-define("_MD_FIELDNAMES_SELECTMULTI","Select multi");
-define("_MD_FIELDNAMES_TEXTAREA","Text area");
-define("_MD_FIELDNAMES_DHTMLTEXTAREA","DHTML text area");
-define("_MD_FIELDNAMES_TEXTBOX","Text box");
-define("_MD_FIELDNAMES_TIMEZONE","Time zone");
-define("_MD_FIELDNAMES_YESNO","Yes/No");
-define("_MD_FIELDNAMES_URL_TITLE","Link title");
-define("_MD_FIELDNAMES_URL_LINK","Link address");
-define("_MD_FIELDNAMES_URL","Web link");
-define("_MD_FIELDNAMES_GMAP","Google map");
-
-define("_MD_FIELDNAMES_ADDRESS","Address");
-define("_MD_FIELDNAMES_GALLERY","Image gallery");
-define("_MD_FIELDNAMES_RATING","Rating");
-define("_MD_FIELDNAMES_LOCATIONMAP","Location map");
-
-define("_MD_WIDTH","Width");
-define("_MD_HEIGHT","Height");
-define("_MD_ROWS","Rows");
-define("_MD_COLS","Cols");
-define("_MD_SIZE","Size");
-define("_MD_MAXSIZE","Max size");
-define("_MD_DEFAULTVALUE","Default value");
-define("_MD_MULTIPLE","Multiple");
-define("_MD_CHECKED","Checked");
-define("_MD_DELETE_CAT"," Delete category");
-define("_MD_CONFIRM_DELETECAT_FORM","Confirm deletion of category");
-define("_MD_DELETE_CAT_YN","Are you sure you want to delete this category?");
-define("_MD_CAT_DELETES","Category deleted succesfully");
+define("_MD_FIELDTYPE", "Field type");
+define("_MD_FTYPECONF", "Field types management");
+define("_MD_CREATE_NEWFTYPE", "Create new field type");
+define("_MD_VIEW_FIELDTYPE", "View field type");
+define("_MD_TYPE", "Type");
+define("_MD_EXT", "Extension");
+define("_MD_SET_EXT", "Extension Manager");
+define("_MD_NEWFTYPEFORM", "New field type form");
+define("_MD_EDITFTYPEFORM", "Edit field type form");
+define("_MD_FIELDNAMES_CHECKBOX", "Checkbox");
+define("_MD_FIELDNAMES_DATE", "Date");
+define("_MD_FIELDNAMES_DATETIME", "Date/time");
+define("_MD_FIELDNAMES_LONGDATE", "Long date");
+define("_MD_FIELDNAMES_GROUP", "Group");
+define("_MD_FIELDNAMES_GROUPMULTI", "Multi group");
+define("_MD_FIELDNAMES_LANGUAGE", "Language");
+define("_MD_FIELDNAMES_RADIO", "Radio");
+define("_MD_FIELDNAMES_SELECT", "Select");
+define("_MD_FIELDNAMES_SELECTMULTI", "Select multi");
+define("_MD_FIELDNAMES_TEXTAREA", "Text area");
+define("_MD_FIELDNAMES_DHTMLTEXTAREA", "DHTML text area");
+define("_MD_FIELDNAMES_TEXTBOX", "Text box");
+define("_MD_FIELDNAMES_TIMEZONE", "Time zone");
+define("_MD_FIELDNAMES_YESNO", "Yes/No");
+define("_MD_FIELDNAMES_URL_TITLE", "Link title");
+define("_MD_FIELDNAMES_URL_LINK", "Link address");
+define("_MD_FIELDNAMES_URL", "Web link");
+define("_MD_FIELDNAMES_GMAP", "Google map");
+
+define("_MD_FIELDNAMES_ADDRESS", "Address");
+define("_MD_FIELDNAMES_GALLERY", "Image gallery");
+define("_MD_FIELDNAMES_RATING", "Rating");
+define("_MD_FIELDNAMES_LOCATIONMAP", "Location map");
+
+define("_MD_WIDTH", "Width");
+define("_MD_HEIGHT", "Height");
+define("_MD_ROWS", "Rows");
+define("_MD_COLS", "Cols");
+define("_MD_SIZE", "Size");
+define("_MD_MAXSIZE", "Max size");
+define("_MD_DEFAULTVALUE", "Default value");
+define("_MD_MULTIPLE", "Multiple");
+define("_MD_CHECKED", "Checked");
+define("_MD_DELETE_CAT", " Delete category");
+define("_MD_CONFIRM_DELETECAT_FORM", "Confirm deletion of category");
+define("_MD_DELETE_CAT_YN", "Are you sure you want to delete this category?");
+define("_MD_CAT_DELETES", "Category deleted succesfully");
 
 //Subscription offers management
-define("_MD_SUBSCR_OFFERS","Subscription offers for directory: %s");
-define("_MD_OFFERTITLE","Title");
-define("_MD_ITEMTYPES","Item types");
-define("_MD_ITEMTYPE_NAME","Type name");
-define("_MD_ITEMTYPE_LEVEL","Level");
-define("_MD_ITEMTYPE_DIRECTORY","Directory");
-define("_MD_ITEMTYPE_DELETED","The selected item type was deleted succesfully");
-define("_MD_OFFERDURATION","Duration");
-define("_MD_ADD_SUBSCR_OFFER","Add subscription offer");
-define("_MD_ADD_OFFER_FORM","Add subscription offer form");
-define("_MD_EDIT_OFFER_FORM","Edit subscription offer form");
-define("_MD_ADD_ITEMTYPE_FORM","Add item type form");
-define("_MD_EDIT_ITEMTYPE_FORM","Edit item type form");
-define("_MD_ADD_ITEMTYPE","Add item type");
-define("_MD_OFFER_TITLE","Subscription title");
-define("_MD_SUBSCR_ITEMTYPE","Subscription level");
-define("_MD_SUBSCR_TYPE","Subscription type");
-define("_MD_SUBSCR_FORM","Subscription order form");
-define("_MD_UPDATE_SUBSCR_FORM","Update subscription order form");
-define("_MD_FORWARDED_PAYMENT_PAGE","You are forwarded to the subscription payment form.");
-define("_MD_OFFER_DIRECTORY","Directory");
-define("_MD_OFFER_DURATION","Duration");
-define("_MD_OFFER_COUNT","Count");
-define("_MD_OFFER_PRICE","Price");
-define("_MD_OFFER_ACTIVEYN","Active y/n");
-define("_MD_OFFER_ACTIVE","Active");
-define("_MD_OFFER_DESCR","Description");
-define("_MD_OFFER_CURRENCY","Currency");
-define("_MD_INVALID_OFFERID","This offer ID is not valid. You will be redirected to the main subscriptions page.");
-define("_MD_INVALID_TYPEID","This type ID is not valid. You will be redirected to the main subscriptions page.");
-define("_MD_ERR_ITEMTYPE_DELETE","Something went wrong trying to delete an item type.");
-define("_MD_ERR_ITEMTYPE_LINKED_TO_LISTINGS","This item type is used in one or more offer. Please make sure this item type is not used in any offers before trying to delete it.");
-define("_MD_SELECT_DIRECTORY","Select the directory you would like to manage subscriptions for.");
+define("_MD_SUBSCR_OFFERS", "Subscription offers for directory: %s");
+define("_MD_OFFERTITLE", "Title");
+define("_MD_ITEMTYPES", "Item types");
+define("_MD_ITEMTYPE_NAME", "Type name");
+define("_MD_ITEMTYPE_LEVEL", "Level");
+define("_MD_ITEMTYPE_DIRECTORY", "Directory");
+define("_MD_ITEMTYPE_DELETED", "The selected item type was deleted succesfully");
+define("_MD_OFFERDURATION", "Duration");
+define("_MD_ADD_SUBSCR_OFFER", "Add subscription offer");
+define("_MD_ADD_OFFER_FORM", "Add subscription offer form");
+define("_MD_EDIT_OFFER_FORM", "Edit subscription offer form");
+define("_MD_ADD_ITEMTYPE_FORM", "Add item type form");
+define("_MD_EDIT_ITEMTYPE_FORM", "Edit item type form");
+define("_MD_ADD_ITEMTYPE", "Add item type");
+define("_MD_OFFER_TITLE", "Subscription title");
+define("_MD_SUBSCR_ITEMTYPE", "Subscription level");
+define("_MD_SUBSCR_TYPE", "Subscription type");
+define("_MD_SUBSCR_FORM", "Subscription order form");
+define("_MD_UPDATE_SUBSCR_FORM", "Update subscription order form");
+define("_MD_FORWARDED_PAYMENT_PAGE", "You are forwarded to the subscription payment form.");
+define("_MD_OFFER_DIRECTORY", "Directory");
+define("_MD_OFFER_DURATION", "Duration");
+define("_MD_OFFER_COUNT", "Count");
+define("_MD_OFFER_PRICE", "Price");
+define("_MD_OFFER_ACTIVEYN", "Active y/n");
+define("_MD_OFFER_ACTIVE", "Active");
+define("_MD_OFFER_DESCR", "Description");
+define("_MD_OFFER_CURRENCY", "Currency");
+define("_MD_INVALID_OFFERID", "This offer ID is not valid. You will be redirected to the main subscriptions page.");
+define("_MD_INVALID_TYPEID", "This type ID is not valid. You will be redirected to the main subscriptions page.");
+define("_MD_ERR_ITEMTYPE_DELETE", "Something went wrong trying to delete an item type.");
+define("_MD_ERR_ITEMTYPE_LINKED_TO_LISTINGS", "This item type is used in one or more offer. Please make sure this item type is not used in any offers before trying to delete it.");
+define("_MD_SELECT_DIRECTORY", "Select the directory you would like to manage subscriptions for.");
 
 //Extension manager
-define("_MD_SELECT_FORMTYPE","Please select a field type before using the extension manager.");
-define("_MD_EXTMANAGER","Extension Manager");
+define("_MD_SELECT_FORMTYPE", "Please select a field type before using the extension manager.");
+define("_MD_EXTMANAGER", "Extension Manager");
 
 //Edit item form
-define("_MD_ONLYADMIN_ALLOWED_TO_EDIT","Only the administrator is allowed to edit a listing that has already been approved.");
-define("_MD_EDITITEM_FORM","Edit listing form");
-define("_MD_EDITITEMTYPE_FORM","Edit item type form");
-define("_MD_SELECT_ITEMTYPE","Select item type");
-define("_MD_ITEMCATEGORIES","Linked categories");
-define("_MD_EDIT_CATEGORIES","Edit categories");
-define("_MD_ITEM_UPDATED","Listing updated");
-define("_MD_CATEGORIES_UPDATED","Categories updated");
-define("_MD_VIEWITEM","View listing");
-define("_MD_LANG_EDIT_ITEM","Edit listing");
-define("_MD_CUSTOM_TITLE","Title ");
-define("_MD_CUSTOM_VALUE","Value ");
-define("_MD_EDIT_INVALID_VALUE","Invalid value for address");
-define("_MD_NOVALIDITEM","No valid item selected");
-define("_MD_NOVALIDITEM_IDMISSING","No valid item selected. Item ID is missing.");
-define("_MD_NOVALIDITEM_TITLEMISSING","No valid item selected. Item title is missing.");
-define("_MD_NOVALIDORDER","No valid order selected");
+define("_MD_ONLYADMIN_ALLOWED_TO_EDIT", "Only the administrator is allowed to edit a listing that has already been approved.");
+define("_MD_EDITITEM_FORM", "Edit listing form");
+define("_MD_EDITITEMTYPE_FORM", "Edit item type form");
+define("_MD_SELECT_ITEMTYPE", "Select item type");
+define("_MD_ITEMCATEGORIES", "Linked categories");
+define("_MD_EDIT_CATEGORIES", "Edit categories");
+define("_MD_ITEM_UPDATED", "Listing updated");
+define("_MD_CATEGORIES_UPDATED", "Categories updated");
+define("_MD_VIEWITEM", "View listing");
+define("_MD_LANG_EDIT_ITEM", "Edit listing");
+define("_MD_CUSTOM_TITLE", "Title ");
+define("_MD_CUSTOM_VALUE", "Value ");
+define("_MD_EDIT_INVALID_VALUE", "Invalid value for address");
+define("_MD_NOVALIDITEM", "No valid item selected");
+define("_MD_NOVALIDITEM_IDMISSING", "No valid item selected. Item ID is missing.");
+define("_MD_NOVALIDITEM_TITLEMISSING", "No valid item selected. Item title is missing.");
+define("_MD_NOVALIDORDER", "No valid order selected");
 
 //Confirm delete listing
-define("_MD_CONFIRM_DELETELISTING_FORM","Confirm delete listing form");
-define("_MD_DELETEYN","Are you sure you want to delete this listing?");
+define("_MD_CONFIRM_DELETELISTING_FORM", "Confirm delete listing form");
+define("_MD_DELETEYN", "Are you sure you want to delete this listing?");
 
 
 
 //Submit form frontside
-define("_MD_SELECTCAT_FORM","Select category form"); 
-define("_MD_SUBMITLISTING_FORM","Submit listing form");
-define("_MD_NOCATEGORYMATCH","At least one category should be selected for a new listing");
-define("_MD_NODIRECTORYSELECTED","A directory must be selected prior to submitting a listing.");
-define("_MD_NOACTIVECATEGORIES","There are not any selectable categories in this directory.");
+define("_MD_SELECTCAT_FORM", "Select category form"); 
+define("_MD_SUBMITLISTING_FORM", "Submit listing form");
+define("_MD_NOCATEGORYMATCH", "At least one category should be selected for a new listing");
+define("_MD_NODIRECTORYSELECTED", "A directory must be selected prior to submitting a listing.");
+define("_MD_NOACTIVECATEGORIES", "There are not any selectable categories in this directory.");
 
 
 //Frontside index
-define("_MD_INTERESTING_LISTING","Interesting listing at %s");  // %s is your site name
-define("_MD_INTERESTING_LISTING_FOUND","Here is an interesting listing I have found at %s");  // %s is your site name
-define("_MD_NOACTIVEDIRECTORIES","There are no directories active at this moment.");
-define("_MD_DIRECTORIES_HEADER","Directories");
-define("_MD_LISTINGS","Listings");
-define("_MD_SUBMITLISTING","Submit new listing");
+define("_MD_INTERESTING_LISTING", "Interesting listing at %s"); // %s is your site name
+define("_MD_INTERESTING_LISTING_FOUND", "Here is an interesting listing I have found at %s"); // %s is your site name
+define("_MD_NOACTIVEDIRECTORIES", "There are no directories active at this moment.");
+define("_MD_DIRECTORIES_HEADER", "Directories");
+define("_MD_LISTINGS", "Listings");
+define("_MD_SUBMITLISTING", "Submit new listing");
 
 //Frontside edit
-define("_MD_PUBLISH_LISTING","Publish listing");
-define("_MD_SUBMITTED_PUBLICATION","This listing has been submitted for publication.");
-define("_MD_PUBLISHED","This listing was published succesfully.");
-define("_MD_DF_ADDRESS","Address");
-define("_MD_DF_ADDRESS2","Address2");
-define("_MD_DF_ZIP","Zip code");
-define("_MD_DF_POSTCODE","Postcode");
-define("_MD_DF_LAT","Lattitude");
-define("_MD_DF_LON","Longnitude");
-define("_MD_DF_PHONE","Phone number");
-define("_MD_DF_FAX","Fax number");
-define("_MD_DF_MOBILE","Mobile number");
-define("_MD_DF_CITY","City");
-define("_MD_DF_COUNTRY","Country");
-define("_MD_DF_TYPENAME","Address type name");
+define("_MD_PUBLISH_LISTING", "Publish listing");
+define("_MD_SUBMITTED_PUBLICATION", "This listing has been submitted for publication.");
+define("_MD_PUBLISHED", "This listing was published succesfully.");
+define("_MD_DF_ADDRESS", "Address");
+define("_MD_DF_ADDRESS2", "Address2");
+define("_MD_DF_ZIP", "Zip code");
+define("_MD_DF_POSTCODE", "Postcode");
+define("_MD_DF_LAT", "Lattitude");
+define("_MD_DF_LON", "Longnitude");
+define("_MD_DF_PHONE", "Phone number");
+define("_MD_DF_FAX", "Fax number");
+define("_MD_DF_MOBILE", "Mobile number");
+define("_MD_DF_CITY", "City");
+define("_MD_DF_COUNTRY", "Country");
+define("_MD_DF_TYPENAME", "Address type name");
 define("_MD_DF_USELOCYN", _MD_USELOCYN);
 
 //Frontside listing
-define("_MD_LANG_ITEMTITLE","Title");
-define("_MD_LANG_SUBSCR_OFFERS_HEADER","Subscription offers");
-define("_MD_LANG_SUBSCR_ACTIVE_ORDERS_HEADER","Active subscriptions");
-define("_MD_LANG_CURRENT_SUBSCR","Current subscription");
-define("_MD_LANG_ORDERNAME","Order name");
-define("_MD_LANG_ACTIONS","Actions");
-define("_MD_LANG_TERMINATE_ORDER","Delete this order");
-define("_MD_LANG_TERMINATE_ORDER_ALT","Delete");
-define("_MD_LANG_RENEW_SUBSCRIPTION","Renew this subscription");
-define("_MD_LANG_RENEW_SUBSCRIPTION_ALT","Renew");
-define("_MD_SUBSCR_TYPE_NOTSELECTED","Please select a subscription type first.");
-define("_MD_LANG_STARTDATE","Start date");
-define("_MD_NORIGHTS","You do not have sufficient rights to view this page. Please contact the website administrator if you feel that you should have access rights to this page.");
-define("_MD_CONFIRMATION","Confirmation");
-define("_MD_CONFIRM_TERMINATE_TITLE","Confirm deletion");
-define("_MD_CONFIRM_TERMINATION_TEXT","Please confirm that you wish to delete this order. Press the button 'Continue' to confirm or press the 'Back' button when you wish you cancel this action.");
-define("_MD_LANG_BILLTO","Bill to date");
-define("_MD_LANG_ENDDATE","End date");
-define("_MD_LANG_PAYMENTSTATUS","Payment status");
-define("_MD_LANG_NO_SUBSCR_MOMENT","Currently this listing does not have a subscription.");
-define("_MD_LANG_SUBSCRIBE","Subscribe");
-define("_MD_LANG_INCOMPLETE","Incomplete");
-define("_MD_LANG_ITEMDESCRIPTION","Description");
-define("_MD_EDITTHISLISTING","[Edit this listing]");
-define("_MD_VIEWSUBSCRIPTIONS","View subscription");
-define("_MD_ITEM_NOT_EXIST","This item can not be found.");
-define("_MD_SELECT_STARTDATE","Select start date");
-define("_MD_AUTORENEWYN","Auto renew subscription?");
-define("_MD_ORDER_DELETED","The order has been deleted succesfully.");
-define("_MD_EDIT_LISTING","Edit listing");
+define("_MD_LANG_ITEMTITLE", "Title");
+define("_MD_LANG_SUBSCR_OFFERS_HEADER", "Subscription offers");
+define("_MD_LANG_SUBSCR_ACTIVE_ORDERS_HEADER", "Active subscriptions");
+define("_MD_LANG_CURRENT_SUBSCR", "Current subscription");
+define("_MD_LANG_ORDERNAME", "Order name");
+define("_MD_LANG_ACTIONS", "Actions");
+define("_MD_LANG_TERMINATE_ORDER", "Delete this order");
+define("_MD_LANG_TERMINATE_ORDER_ALT", "Delete");
+define("_MD_LANG_RENEW_SUBSCRIPTION", "Renew this subscription");
+define("_MD_LANG_RENEW_SUBSCRIPTION_ALT", "Renew");
+define("_MD_SUBSCR_TYPE_NOTSELECTED", "Please select a subscription type first.");
+define("_MD_LANG_STARTDATE", "Start date");
+define("_MD_NORIGHTS", "You do not have sufficient rights to view this page. Please contact the website administrator if you feel that you should have access rights to this page.");
+define("_MD_CONFIRMATION", "Confirmation");
+define("_MD_CONFIRM_TERMINATE_TITLE", "Confirm deletion");
+define("_MD_CONFIRM_TERMINATION_TEXT", "Please confirm that you wish to delete this order. Press the button 'Continue' to confirm or press the 'Back' button when you wish you cancel this action.");
+define("_MD_LANG_BILLTO", "Bill to date");
+define("_MD_LANG_ENDDATE", "End date");
+define("_MD_LANG_PAYMENTSTATUS", "Payment status");
+define("_MD_LANG_NO_SUBSCR_MOMENT", "Currently this listing does not have a subscription.");
+define("_MD_LANG_SUBSCRIBE", "Subscribe");
+define("_MD_LANG_INCOMPLETE", "Incomplete");
+define("_MD_LANG_ITEMDESCRIPTION", "Description");
+define("_MD_EDITTHISLISTING", "[Edit this listing]");
+define("_MD_VIEWSUBSCRIPTIONS", "View subscription");
+define("_MD_ITEM_NOT_EXIST", "This item can not be found.");
+define("_MD_SELECT_STARTDATE", "Select start date");
+define("_MD_AUTORENEWYN", "Auto renew subscription?");
+define("_MD_ORDER_DELETED", "The order has been deleted succesfully.");
+define("_MD_EDIT_LISTING", "Edit listing");
 
 //Order payment
-define("_MD_LANG_SUBSCR_PAYMENT","Subscription payment");
-define("_MD_ORDER_PAYMENT_FORM","Order payment form");
-define("_MD_PAY_FIRSTNAME","First name");
-define("_MD_PAY_LASTNAME","Last name");
-define("_MD_PAY_ADDRESS1","Address line 1");
-define("_MD_PAY_ADDRESS2","Address line 2");
-define("_MD_PAY_CITY","City");
-define("_MD_PAY_STATE","State");
-define("_MD_PAY_ZIP","Zip code");
-define("_MD_PAY_EMAIL","E-mail address");
-define("_MD_PAY_PHONE1","Phone number");
-define("_MD_ORDER_PROCESSED","We thank you for your payment. Your order will be processed as soon as possible.");
-define("_MD_ORDER_ALREADY_PROCESSED","This order has already been processed. You will be forwarded to the subscription page.");
-define("_MD_PAY_WITH","Payment with");
+define("_MD_LANG_SUBSCR_PAYMENT", "Subscription payment");
+define("_MD_ORDER_PAYMENT_FORM", "Order payment form");
+define("_MD_PAY_FIRSTNAME", "First name");
+define("_MD_PAY_LASTNAME", "Last name");
+define("_MD_PAY_ADDRESS1", "Address line 1");
+define("_MD_PAY_ADDRESS2", "Address line 2");
+define("_MD_PAY_CITY", "City");
+define("_MD_PAY_STATE", "State");
+define("_MD_PAY_ZIP", "Zip code");
+define("_MD_PAY_EMAIL", "E-mail address");
+define("_MD_PAY_PHONE1", "Phone number");
+define("_MD_ORDER_PROCESSED", "We thank you for your payment. Your order will be processed as soon as possible.");
+define("_MD_ORDER_ALREADY_PROCESSED", "This order has already been processed. You will be forwarded to the subscription page.");
+define("_MD_PAY_WITH", "Payment with");
 
 
 //Frontside search
-define("_MD_SEARCHRESULTS_TITLE","Search results"); 
-define("_MD_LISTINGS_FOUND","listings found"); 
+define("_MD_SEARCHRESULTS_TITLE", "Search results"); 
+define("_MD_LISTINGS_FOUND", "listings found"); 
 
 //Frontside advanced search
-define("_MD_ADVSEARCH_FORM","Advanced search form");
-define("_MD_SEARCHSTRING","Search string");
-define("_MD_EQUAL_TO","Equal to");
-define("_MD_NOT_EQUAL_TO","Not equal to");
-define("_MD_BEGINSWITH","Begins with");
-define("_MD_ENDSWITH","Ends with");
-define("_MD_CONTAINS","Contains");
-define("_MD_NOTCONTAIN","Does not contain");
-define("_MD_SMALLER_THAN","Smaller than");
-define("_MD_GREATER_THAN","Greater than");
-define("_MD_PAGE_OF_PAGES","<div align=\"right\"><strong>Page %s of %s</strong></div>");
-define("_MD_LISTINGS_FOUND_ADV","<div align=\"right\">%s listings found</strong></div>");
-define("_MD_PAGES","<strong>Pages:&nbsp;</strong>");
-define("_MD_NEW_SEARCH_ADV","<div align=\"right\"><strong><a href=\"advancedsearch.php?dirid=%s\">[ New search ]</a></strong></div>");
-define("_MD_SEARCH_ADV","<div align=\"right\"><strong><a href=\"advancedsearch.php?dirid=%s\">[ Advanced search ]</a></strong></div>");
+define("_MD_ADVSEARCH_FORM", "Advanced search form");
+define("_MD_SEARCHSTRING", "Search string");
+define("_MD_EQUAL_TO", "Equal to");
+define("_MD_NOT_EQUAL_TO", "Not equal to");
+define("_MD_BEGINSWITH", "Begins with");
+define("_MD_ENDSWITH", "Ends with");
+define("_MD_CONTAINS", "Contains");
+define("_MD_NOTCONTAIN", "Does not contain");
+define("_MD_SMALLER_THAN", "Smaller than");
+define("_MD_GREATER_THAN", "Greater than");
+define("_MD_PAGE_OF_PAGES", "<div align=\"right\"><strong>Page %s of %s</strong></div>");
+define("_MD_LISTINGS_FOUND_ADV", "<div align=\"right\">%s listings found</strong></div>");
+define("_MD_PAGES", "<strong>Pages:&nbsp;</strong>");
+define("_MD_NEW_SEARCH_ADV", "<div align=\"right\"><strong><a href=\"advancedsearch.php?dirid=%s\">[ New search ]</a></strong></div>");
+define("_MD_SEARCH_ADV", "<div align=\"right\"><strong><a href=\"advancedsearch.php?dirid=%s\">[ Advanced search ]</a></strong></div>");
 
 //Frontside addcoupon
 define("_MD_COUPONHEADER", "Coupon Heading");
@@ -504,105 +504,105 @@ 
 define("_MD_SETEXPIRATION", "Set Expiration date?");
 define("_MD_SAVINGS_IMGTXT", "Special Offers");
 define("_MD_COUPONIMGMGR", "Use ImageManager (in Description Toolbar above) to upload images.");
-define("_MD_COUPSEL","Select Coupon");
-define("_MD_COUPONUPDATED","Coupon updated.");
-
-define("_MD_ADDBUTTON","Add");
-define("_MD_DELBUTTON","Delete");
-define("_MD_LISTINGSCONF","Listings Configuration");
-define("_MD_DIRCONF","Directories Configuration");
-define("_MD_CATCONF","Categories Configuration");
-define("_MD_GENERALSET","EFQ Directory General Settings");
-
-define("_MD_LISTINGSWAITING","Listings Waiting for Validation");
-define("_MD_NONEW_LISTINGS","There are no new listings waiting for approval.");
-define("_MD_BROKENREPORTS","Broken Listing Reports");
-define("_MD_MODREQUESTS","Listing Modification Requests");
-define("_MD_SUBMITTER","Submitter");
-define("_MD_VISIT","Visit");
-define("_MD_SHOTMUST","Screenshot image must be a valid image file under %s directory (ex. shot.gif). Leave it blank if no image file.");
-define("_MD_APPROVE","Approve");
-define("_MD_DELETE","Delete");
-define("_MD_NOSUBMITTED","No New Submitted Links.");
-define("_MD_ADDMAIN","Add a MAIN Category");
-define("_MD_TITLEC","Title: ");
-define("_MD_IMGURL","Image URL (OPTIONAL Image height will be resized to 50): ");
-define("_MD_ADD","Add");
-define("_MD_ADDSUB","Add a SUB-Category");
-define("_MD_IN","in");
-define("_MD_ADDNEWLISTING","Add a New Listing");
-define("_MD_MODCAT","Modify Category");
-define("_MD_MODLISTING","Modify Listing");
-define("_MD_TOTALVOTES","Listing Votes (total votes: %s)");
-define("_MD_USERTOTALVOTES","Registered User Votes (total votes: %s)");
-define("_MD_ANONTOTALVOTES","Anonymous User Votes (total votes: %s)");
-define("_MD_USER","User");
-define("_MD_IP","IP Address");
-define("_MD_USERAVG","User AVG Rating");
-define("_MD_TOTALRATE","Total Ratings");
-define("_MD_NOREGVOTES","No Registered User Votes");
-define("_MD_NOUNREGVOTES","No Unregistered User Votes");
-define("_MD_VOTEDELETED","Vote data deleted.");
-define("_MD_NOBROKEN","No reported broken links.");
-define("_MD_IGNOREDESC","Ignore (Ignores the report and only deletes the <b>broken listing report</b>)");
-define("_MD_DELETEDESC","Delete (Deletes <b>the reported website data</b> and <b>broken listing reports</b> for the link.)");
-define("_MD_REPORTER","Report Sender");
-define("_MD_LISTINGSUBMITTER","Listing Submitter");
-define("_MD_IGNORE","Ignore");
-define("_MD_LINKDELETED","Listing Deleted.");
-define("_MD_BROKENDELETED","Broken listing report deleted.");
-define("_MD_USERMODREQ","User Listing Modification Requests");
-define("_MD_ORIGINAL","Original");
-define("_MD_PROPOSED","Proposed");
-define("_MD_OWNER","Owner: ");
-define("_MD_NOMODREQ","No Listing Modification Request.");
-define("_MD_DBUPDATED","Database Updated Successfully!");
-define("_MD_MODREQDELETED","Modification Request Deleted.");
-define("_MD_IMGURLMAIN","Image URL (OPTIONAL and Only valid for main categories. Image height will be resized to 50): ");
-define("_MD_PARENT","Parent Category:");
-define("_MD_SAVE","Save Changes");
-define("_MD_CATDELETED","Category Deleted.");
-define("_MD_WARNING","WARNING: Are you sure you want to delete this Category and ALL of its Listings and Comments?");
-define("_MD_YES","Yes");
-define("_MD_NO","No");
-define("_MD_NEWCATADDED","New Category Added Successfully!");
-define("_MD_ERROREXIST","ERROR: The Listing you provided is already in the database!");
-define("_MD_ERRORTITLE","ERROR: You need to enter TITLE!");
-define("_MD_ERRORDESC","ERROR: You need to enter DESCRIPTION!");
-define("_MD_NEWLISTINGADDED","New Listing added to the Database.");
+define("_MD_COUPSEL", "Select Coupon");
+define("_MD_COUPONUPDATED", "Coupon updated.");
+
+define("_MD_ADDBUTTON", "Add");
+define("_MD_DELBUTTON", "Delete");
+define("_MD_LISTINGSCONF", "Listings Configuration");
+define("_MD_DIRCONF", "Directories Configuration");
+define("_MD_CATCONF", "Categories Configuration");
+define("_MD_GENERALSET", "EFQ Directory General Settings");
+
+define("_MD_LISTINGSWAITING", "Listings Waiting for Validation");
+define("_MD_NONEW_LISTINGS", "There are no new listings waiting for approval.");
+define("_MD_BROKENREPORTS", "Broken Listing Reports");
+define("_MD_MODREQUESTS", "Listing Modification Requests");
+define("_MD_SUBMITTER", "Submitter");
+define("_MD_VISIT", "Visit");
+define("_MD_SHOTMUST", "Screenshot image must be a valid image file under %s directory (ex. shot.gif). Leave it blank if no image file.");
+define("_MD_APPROVE", "Approve");
+define("_MD_DELETE", "Delete");
+define("_MD_NOSUBMITTED", "No New Submitted Links.");
+define("_MD_ADDMAIN", "Add a MAIN Category");
+define("_MD_TITLEC", "Title: ");
+define("_MD_IMGURL", "Image URL (OPTIONAL Image height will be resized to 50): ");
+define("_MD_ADD", "Add");
+define("_MD_ADDSUB", "Add a SUB-Category");
+define("_MD_IN", "in");
+define("_MD_ADDNEWLISTING", "Add a New Listing");
+define("_MD_MODCAT", "Modify Category");
+define("_MD_MODLISTING", "Modify Listing");
+define("_MD_TOTALVOTES", "Listing Votes (total votes: %s)");
+define("_MD_USERTOTALVOTES", "Registered User Votes (total votes: %s)");
+define("_MD_ANONTOTALVOTES", "Anonymous User Votes (total votes: %s)");
+define("_MD_USER", "User");
+define("_MD_IP", "IP Address");
+define("_MD_USERAVG", "User AVG Rating");
+define("_MD_TOTALRATE", "Total Ratings");
+define("_MD_NOREGVOTES", "No Registered User Votes");
+define("_MD_NOUNREGVOTES", "No Unregistered User Votes");
+define("_MD_VOTEDELETED", "Vote data deleted.");
+define("_MD_NOBROKEN", "No reported broken links.");
+define("_MD_IGNOREDESC", "Ignore (Ignores the report and only deletes the <b>broken listing report</b>)");
+define("_MD_DELETEDESC", "Delete (Deletes <b>the reported website data</b> and <b>broken listing reports</b> for the link.)");
+define("_MD_REPORTER", "Report Sender");
+define("_MD_LISTINGSUBMITTER", "Listing Submitter");
+define("_MD_IGNORE", "Ignore");
+define("_MD_LINKDELETED", "Listing Deleted.");
+define("_MD_BROKENDELETED", "Broken listing report deleted.");
+define("_MD_USERMODREQ", "User Listing Modification Requests");
+define("_MD_ORIGINAL", "Original");
+define("_MD_PROPOSED", "Proposed");
+define("_MD_OWNER", "Owner: ");
+define("_MD_NOMODREQ", "No Listing Modification Request.");
+define("_MD_DBUPDATED", "Database Updated Successfully!");
+define("_MD_MODREQDELETED", "Modification Request Deleted.");
+define("_MD_IMGURLMAIN", "Image URL (OPTIONAL and Only valid for main categories. Image height will be resized to 50): ");
+define("_MD_PARENT", "Parent Category:");
+define("_MD_SAVE", "Save Changes");
+define("_MD_CATDELETED", "Category Deleted.");
+define("_MD_WARNING", "WARNING: Are you sure you want to delete this Category and ALL of its Listings and Comments?");
+define("_MD_YES", "Yes");
+define("_MD_NO", "No");
+define("_MD_NEWCATADDED", "New Category Added Successfully!");
+define("_MD_ERROREXIST", "ERROR: The Listing you provided is already in the database!");
+define("_MD_ERRORTITLE", "ERROR: You need to enter TITLE!");
+define("_MD_ERRORDESC", "ERROR: You need to enter DESCRIPTION!");
+define("_MD_NEWLISTINGADDED", "New Listing added to the Database.");
 //define("_MD_YOURLISTING","Your Website Link at %s");
-define("_MD_YOUCANBROWSE","You can browse our web links at %s");
-define("_MD_HELLO","Hello %s");
-define("_MD_WEAPPROVED","We approved your submitted listing.");
-define("_MD_THANKSSUBMIT","Thanks for your submission!");
-define("_MD_LISTINGUPDATED","The listing was updated succesfully!");
-define("_MD_ISAPPROVED","We approved your listing submission");
+define("_MD_YOUCANBROWSE", "You can browse our web links at %s");
+define("_MD_HELLO", "Hello %s");
+define("_MD_WEAPPROVED", "We approved your submitted listing.");
+define("_MD_THANKSSUBMIT", "Thanks for your submission!");
+define("_MD_LISTINGUPDATED", "The listing was updated succesfully!");
+define("_MD_ISAPPROVED", "We approved your listing submission");
 
 //Scheduler
-define("_MD_NO_DIRECT_ACCESS","This page cannot be accessed directly.");
-define("_MD_LANG_EXPIREWARNING_SUBJECT","Subscription renewal notice.");
-define("_MD_SCHEDULER_FINISHED","Scheduler has finished.");
+define("_MD_NO_DIRECT_ACCESS", "This page cannot be accessed directly.");
+define("_MD_LANG_EXPIREWARNING_SUBJECT", "Subscription renewal notice.");
+define("_MD_SCHEDULER_FINISHED", "Scheduler has finished.");
 
 //Google Maps
-define("_MD_GMAP_LON","Longitude");
-define("_MD_GMAP_LAT","Lattitude");
-define("_MD_GMAP_DESCR","Description of location");
+define("_MD_GMAP_LON", "Longitude");
+define("_MD_GMAP_LAT", "Lattitude");
+define("_MD_GMAP_DESCR", "Description of location");
 
 //Migrate from xDirectory
-define("_MD_MIGRATE_FROM_XDIR","Migrate from the xDirectory module");
-define("_MD_XIDR_MIGRATE_TO_NEWDIR","Enter the name of the new directory.");
-define("_MD_XDIR_CREATE_EMPTY_DIR","Please create a directory before migrating from the xDirectory module. The name of the directory must have at least 1 character");
-define("_MD_XDIR_FIELDTYPE_TEXTBOX","Text box");
-define("_MD_XDIR_FIELDTYPE_EMAIL","e-mail");
-define("_MD_XDIR_FIELDTYPE_URL","URL");
-define("_MD_XDIR_DTYPE_ADDRESS","Address");
-define("_MD_XDIR_DTYPE_ADDRESS2","Address 2");
-define("_MD_XDIR_DTYPE_CITY","City");
-define("_MD_XDIR_DTYPE_STATE","State");
-define("_MD_XDIR_DTYPE_ZIP","ZIP");
-define("_MD_XDIR_DTYPE_COUNTRY","Country");
-define("_MD_XDIR_DTYPE_PHONE","Phone");
-define("_MD_XDIR_DTYPE_FAX","Fax");
-define("_MD_XDIR_DTYPE_EMAIL","E-mail");
-define("_MD_XDIR_DTYPE_URL","URL");
+define("_MD_MIGRATE_FROM_XDIR", "Migrate from the xDirectory module");
+define("_MD_XIDR_MIGRATE_TO_NEWDIR", "Enter the name of the new directory.");
+define("_MD_XDIR_CREATE_EMPTY_DIR", "Please create a directory before migrating from the xDirectory module. The name of the directory must have at least 1 character");
+define("_MD_XDIR_FIELDTYPE_TEXTBOX", "Text box");
+define("_MD_XDIR_FIELDTYPE_EMAIL", "e-mail");
+define("_MD_XDIR_FIELDTYPE_URL", "URL");
+define("_MD_XDIR_DTYPE_ADDRESS", "Address");
+define("_MD_XDIR_DTYPE_ADDRESS2", "Address 2");
+define("_MD_XDIR_DTYPE_CITY", "City");
+define("_MD_XDIR_DTYPE_STATE", "State");
+define("_MD_XDIR_DTYPE_ZIP", "ZIP");
+define("_MD_XDIR_DTYPE_COUNTRY", "Country");
+define("_MD_XDIR_DTYPE_PHONE", "Phone");
+define("_MD_XDIR_DTYPE_FAX", "Fax");
+define("_MD_XDIR_DTYPE_EMAIL", "E-mail");
+define("_MD_XDIR_DTYPE_URL", "URL");
 ?>
\ No newline at end of file

language/english/modinfo.php

Spacing +19 added lines, -19 removed lines

@@ -3,28 +3,28 @@ 
 // Module Info for Listings module
 
 // The name of this module
-define("_MI_EFQDIR_NAME","Listings directory");
+define("_MI_EFQDIR_NAME", "Listings directory");
 
 // A brief description of this module
-define("_MI_EFQDIR_DESC","Creates a listings section where directories of listings can be managed.");
+define("_MI_EFQDIR_DESC", "Creates a listings section where directories of listings can be managed.");
 
 // Names of blocks for this module (Not every module has blocks)
-define("_MI_EFQDIR_BNAME1","Recent Listings");
-define("_MI_EFQDIR_BNAME2","Top Listings");
-define("_MI_EFQDIR_MENU","Directories");
+define("_MI_EFQDIR_BNAME1", "Recent Listings");
+define("_MI_EFQDIR_BNAME2", "Top Listings");
+define("_MI_EFQDIR_MENU", "Directories");
 
 // Sub menu titles
-define("_MI_EFQDIR_SMNAME1","Submit");
-define("_MI_EFQDIR_SMNAME2","Popular");
-define("_MI_EFQDIR_SMNAME3","Top Rated");
+define("_MI_EFQDIR_SMNAME1", "Submit");
+define("_MI_EFQDIR_SMNAME2", "Popular");
+define("_MI_EFQDIR_SMNAME3", "Top Rated");
 
 // Names of admin menu items
-define("_MI_EFQDIR_ADMENU2","Module admin home");
-define("_MI_EFQDIR_ADMENU3","Manage directories");
-define("_MI_EFQDIR_ADMENU4","Manage field types");
-define("_MI_EFQDIR_ADMENU5","Listings waiting for validation");
-define("_MI_EFQDIR_ADMENU6","Manage address types");
-define("_MI_EFQDIR_ADMENU7","Manage categories");
+define("_MI_EFQDIR_ADMENU2", "Module admin home");
+define("_MI_EFQDIR_ADMENU3", "Manage directories");
+define("_MI_EFQDIR_ADMENU4", "Manage field types");
+define("_MI_EFQDIR_ADMENU5", "Listings waiting for validation");
+define("_MI_EFQDIR_ADMENU6", "Manage address types");
+define("_MI_EFQDIR_ADMENU7", "Manage categories");
 
 // Title of config items
 define('_MI_EFQDIR_POPULAR', 'Select the number of hits for listings to be marked as popular');
@@ -32,9 +32,9 @@ 
 define('_MI_EFQDIR_PERPAGE', 'Select the maximum number of listings displayed in each page');
 define('_MI_EFQDIR_USESHOTS', 'Select yes to display screenshot images for each listing');
 define('_MI_EFQDIR_USEDESTMOD', 'Use this module in combination with the destinations module?');
-define('_MI_EFQDIR_ANONPOST','Allow anonymous users to post listings?');
-define('_MI_EFQDIR_AUTOAPPROVE','Auto approve new listings without admin intervention?');
-define('_MI_EFQDIR_AUTOAPPROVEADMIN','Auto approve new listings submitted by administrator?');
+define('_MI_EFQDIR_ANONPOST', 'Allow anonymous users to post listings?');
+define('_MI_EFQDIR_AUTOAPPROVE', 'Auto approve new listings without admin intervention?');
+define('_MI_EFQDIR_AUTOAPPROVEADMIN', 'Auto approve new listings submitted by administrator?');
 define('_MI_EFQDIR_RESULTSPERPAGE', 'Select the number of search results per page.');
 define('_MI_EFQDIR_ANONVOTESWAITDAYS', 'Select the number of days before an anonymous user can vote for a listing again.');
 define('_MI_EFQDIR_AUTOSHOWONEDIR', 'Show directory automatically if there is only one active directory?');
@@ -68,8 +68,8 @@ 
 define('_MI_EFQDIR_PERPAGEDSC', '');
 define('_MI_EFQDIR_USEDESTMODDSC', '');
 define('_MI_EFQDIR_SHOTWIDTHDSC', '');
-define('_MI_EFQDIR_AUTOAPPROVEDSC','');
-define('_MI_EFQDIR_AUTOAPPROVEADMINDSC','');
+define('_MI_EFQDIR_AUTOAPPROVEDSC', '');
+define('_MI_EFQDIR_AUTOAPPROVEADMINDSC', '');
 define('_MI_EFQDIR_RESULTSPERPAGE_DSC', '');
 define('_MI_EFQDIR_ANONVOTESWAITDAYS_DSC', '');
 define('_MI_EFQDIR_AUTOSHOWONEDIR_DSC', '');

printcoupon.php

Indentation +10 added lines, -10 removed lines

@@ -29,20 +29,20 @@
 $mydirname = basename( dirname( __FILE__ ) ) ;
 $coupid = isset($_GET['coupid']) ? intval($_GET['coupid']) : 0;
 if (!($coupid > 0) ) {
-    redirect_header("index.php");
+	redirect_header("index.php");
 }
 
 function PrintPage($coupid)
 {
-    global $xoopsModule, $xoopsTpl, $xoopsModuleConfig, $mydirname;
-    $coupon_handler =& xoops_getmodulehandler('coupon', $mydirname);
-    $coupon_handler->increment($coupid);
-    $coupon = $coupon_handler->getLinkedCoupon($coupid);
-    $coupon_arr = $coupon_handler->prepare2show($coupon);
-    //$xoopsTpl->assign('coupon_footer', $xoopsModuleConfig['coupon_footer']);
-    $xoopsTpl->assign('coupon', $coupon_arr['items']['coupons'][0]);
-    $xoopsTpl->template_dir = XOOPS_ROOT_PATH."/modules/".$xoopsModule->dirname();
-    $xoopsTpl->display('db:efqdiralpha1_print_savings.html');
+	global $xoopsModule, $xoopsTpl, $xoopsModuleConfig, $mydirname;
+	$coupon_handler =& xoops_getmodulehandler('coupon', $mydirname);
+	$coupon_handler->increment($coupid);
+	$coupon = $coupon_handler->getLinkedCoupon($coupid);
+	$coupon_arr = $coupon_handler->prepare2show($coupon);
+	//$xoopsTpl->assign('coupon_footer', $xoopsModuleConfig['coupon_footer']);
+	$xoopsTpl->assign('coupon', $coupon_arr['items']['coupons'][0]);
+	$xoopsTpl->template_dir = XOOPS_ROOT_PATH."/modules/".$xoopsModule->dirname();
+	$xoopsTpl->display('db:efqdiralpha1_print_savings.html');
 }
 	//Smarty directory autodetect
 	$smartydir = $mydirname;

Spacing +3 added lines, -3 removed lines

@@ -26,16 +26,16 @@
 //  ------------------------------------------------------------------------ //
 include '../../mainfile.php';
 include XOOPS_ROOT_PATH."/header.php";
-$mydirname = basename( dirname( __FILE__ ) ) ;
+$mydirname = basename(dirname(__FILE__));
 $coupid = isset($_GET['coupid']) ? intval($_GET['coupid']) : 0;
-if (!($coupid > 0) ) {
+if (!($coupid > 0)) {
     redirect_header("index.php");
 }
 
 function PrintPage($coupid)
 {
     global $xoopsModule, $xoopsTpl, $xoopsModuleConfig, $mydirname;
-    $coupon_handler =& xoops_getmodulehandler('coupon', $mydirname);
+    $coupon_handler = & xoops_getmodulehandler('coupon', $mydirname);
     $coupon_handler->increment($coupid);
     $coupon = $coupon_handler->getLinkedCoupon($coupid);
     $coupon_arr = $coupon_handler->prepare2show($coupon);