mambax7 / planet

class/bookmark.php

Indentation +13 added lines, -13 removed lines

@@ -48,19 +48,19 @@
 
 class Bookmark extends ArtObject
 {
-    /**
-     * Constructor
-     */
-    function Bookmark()
-    {
-	    $this->ArtObject();
-        $this->table = planet_DB_prefix("bookmark");
-        $this->initVar("bm_id", XOBJ_DTYPE_INT, null, false);
-        /* user ID */
-        $this->initVar("bm_uid", XOBJ_DTYPE_INT, 0, true);
-        /* blog ID */
-        $this->initVar("blog_id", XOBJ_DTYPE_INT, 0, true);
-    }
+	/**
+	 * Constructor
+	 */
+	function Bookmark()
+	{
+		$this->ArtObject();
+		$this->table = planet_DB_prefix("bookmark");
+		$this->initVar("bm_id", XOBJ_DTYPE_INT, null, false);
+		/* user ID */
+		$this->initVar("bm_uid", XOBJ_DTYPE_INT, 0, true);
+		/* blog ID */
+		$this->initVar("blog_id", XOBJ_DTYPE_INT, 0, true);
+	}
 }
 endif;
 /**

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
  *
  * {@link XoopsObject} 
  **/
-if(!class_exists("Bookmark")):
+if (!class_exists("Bookmark")):
 
 class Bookmark extends ArtObject
 {

counter.php

Spacing +5 added lines, -5 removed lines

@@ -25,11 +25,11 @@
 // Project: Article Project                                                 //
 // ------------------------------------------------------------------------ //
 include "header.php";
-$article_id = empty($_GET['article'])?0:intval($_GET['article']);
-if(empty($article_id)) return;
-if(planet_getcookie("art_".$article_id)>0) return;
-$article_handler =& xoops_getmodulehandler('article', $xoopsModule->getVar("dirname"));
-$article_obj =& $article_handler->get($article_id);
+$article_id = empty($_GET['article']) ? 0 : intval($_GET['article']);
+if (empty($article_id)) return;
+if (planet_getcookie("art_".$article_id)>0) return;
+$article_handler = & xoops_getmodulehandler('article', $xoopsModule->getVar("dirname"));
+$article_obj = & $article_handler->get($article_id);
 $article_obj->setVar("art_views", $article_obj->getVar("art_views")+1, true);
 $article_handler->insert($article_obj, true);
 planet_setcookie("art_".$article_id, time());

Braces +6 added lines, -2 removed lines

@@ -26,8 +26,12 @@
 // ------------------------------------------------------------------------ //
 include "header.php";
 $article_id = empty($_GET['article'])?0:intval($_GET['article']);
-if(empty($article_id)) return;
-if(planet_getcookie("art_".$article_id)>0) return;
+if(empty($article_id)) {
+	return;
+}
+if(planet_getcookie("art_".$article_id)>0) {
+	return;
+}
 $article_handler =& xoops_getmodulehandler('article', $xoopsModule->getVar("dirname"));
 $article_obj =& $article_handler->get($article_id);
 $article_obj->setVar("art_views", $article_obj->getVar("art_views")+1, true);

view.article.php

Spacing +21 added lines, -21 removed lines

@@ -31,37 +31,37 @@ 
  * The notification detection scripts should be removed once absolute url is used in notification_select.php
  *
  */
-if(preg_match("/(\/comment_[^\.]*\.php\?.*=.*)/i", $_SERVER["REQUEST_URI"], $matches)){
+if (preg_match("/(\/comment_[^\.]*\.php\?.*=.*)/i", $_SERVER["REQUEST_URI"], $matches)) {
 	header("location: ".XOOPS_URL."/modules/".$GLOBALS["moddirname"].$matches[1]);
 	exit();
 }
-if(preg_match("/\/notification_update\.php/i", $_SERVER['REQUEST_URI'], $matches)){
+if (preg_match("/\/notification_update\.php/i", $_SERVER['REQUEST_URI'], $matches)) {
 	include XOOPS_ROOT_PATH.'/include/notification_update.php';
 	exit();
 }
 
-if($REQUEST_URI_parsed = planet_parse_args($args_num, $args, $args_str)){
+if ($REQUEST_URI_parsed = planet_parse_args($args_num, $args, $args_str)) {
 	$args["article"] = @$args_num[0];
 	$args["blog"] = @$args["blog"];
 }
 
-$article_id = intval( empty($_GET["article"])?@$args["article"]:$_GET["article"] );
-$blog_id = intval( empty($_GET["blog"])?@$args["blog"]:$_GET["blog"] );
+$article_id = intval(empty($_GET["article"]) ? @$args["article"] : $_GET["article"]);
+$blog_id = intval(empty($_GET["blog"]) ? @$args["blog"] : $_GET["blog"]);
 
-$article_handler =& xoops_getmodulehandler("article", $GLOBALS["moddirname"]);
-$blog_handler =& xoops_getmodulehandler("blog", $GLOBALS["moddirname"]);
-$article_obj =& $article_handler->get($article_id);
-$blog_obj =& $blog_handler->get($article_obj->getVar("blog_id"));
+$article_handler = & xoops_getmodulehandler("article", $GLOBALS["moddirname"]);
+$blog_handler = & xoops_getmodulehandler("blog", $GLOBALS["moddirname"]);
+$article_obj = & $article_handler->get($article_id);
+$blog_obj = & $blog_handler->get($article_obj->getVar("blog_id"));
 
 // restore $_SERVER['REQUEST_URI']
-if(!empty($REQUEST_URI_parsed)){
+if (!empty($REQUEST_URI_parsed)) {
 	$_SERVER['REQUEST_URI'] = XOOPS_URL."/modules/".$GLOBALS["moddirname"]."/view.article.php".
-		(empty($article_id)?"":"?article=".$article_id);
+		(empty($article_id) ? "" : "?article=".$article_id);
 }
 
-$xoopsOption["xoops_pagetitle"] = $xoopsModule->getVar("name"). " - " .$article_obj->getVar("art_title");
+$xoopsOption["xoops_pagetitle"] = $xoopsModule->getVar("name")." - ".$article_obj->getVar("art_title");
 $xoopsOption["template_main"] = planet_getTemplate("article");
-include_once( XOOPS_ROOT_PATH . "/header.php" );
+include_once(XOOPS_ROOT_PATH."/header.php");
 include XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/include/vars.php";
 
 $article_data = array(
@@ -78,13 +78,13 @@ 
 	"blog"=> array("id"=>$article_obj->getVar("blog_id"), "title"=>$blog_obj->getVar("blog_title"))
 	);
 
-if(!empty($xoopsModuleConfig["do_sibling"])){
-	$articles_sibling =& $article_handler->getSibling($article_obj, $blog_id);
-	if(!empty($articles_sibling["previous"])) {
+if (!empty($xoopsModuleConfig["do_sibling"])) {
+	$articles_sibling = & $article_handler->getSibling($article_obj, $blog_id);
+	if (!empty($articles_sibling["previous"])) {
 		$articles_sibling["previous"]["url"] = XOOPS_URL."/modules/".$GLOBALS["moddirname"]."/view.article.php".URL_DELIMITER."".$articles_sibling["previous"]["id"]."/b".$blog_id;
 		$articles_sibling["previous"]["title"] = $articles_sibling["previous"]["title"];
 	}
-	if(!empty($articles_sibling["next"])){
+	if (!empty($articles_sibling["next"])) {
 		$articles_sibling["next"]["url"] = XOOPS_URL."/modules/".$GLOBALS["moddirname"]."/view.article.php".URL_DELIMITER."".$articles_sibling["next"]["id"]."/b".$blog_id;
 		$articles_sibling["next"]["title"] = $articles_sibling["next"]["title"];
 	}
@@ -95,13 +95,13 @@ 
 $xoopsTpl -> assign("article", $article_data);
 $xoopsTpl -> assign("sibling", $articles_sibling);
 
-$xoopsTpl -> assign("user_level", !is_object($xoopsUser)?0:($xoopsUser->isAdmin()?2:1));
-if(empty($xoopsModuleConfig["anonymous_rate"]) && !is_object($xoopsUser)){
-}else{
+$xoopsTpl -> assign("user_level", !is_object($xoopsUser) ? 0 : ($xoopsUser->isAdmin() ? 2 : 1));
+if (empty($xoopsModuleConfig["anonymous_rate"]) && !is_object($xoopsUser)) {
+}else {
 	$xoopsTpl -> assign("canrate", 1);
 }
 
-if($transferbar = @include(XOOPS_ROOT_PATH."/Frameworks/transfer/bar.transfer.php")){
+if ($transferbar = @include(XOOPS_ROOT_PATH."/Frameworks/transfer/bar.transfer.php")) {
 	$xoopsTpl->assign('transfer', $transferbar);
 }
 

Braces +1 added lines, -1 removed lines

@@ -97,7 +97,7 @@
 
 $xoopsTpl -> assign("user_level", !is_object($xoopsUser)?0:($xoopsUser->isAdmin()?2:1));
 if(empty($xoopsModuleConfig["anonymous_rate"]) && !is_object($xoopsUser)){
-}else{
+} else{
 	$xoopsTpl -> assign("canrate", 1);
 }
 

search.php

Indentation +68 added lines, -68 removed lines

@@ -31,8 +31,8 @@ 
 $config_handler =& xoops_gethandler("config");
 $xoopsConfigSearch =& $config_handler->getConfigsByCat(XOOPS_CONF_SEARCH);
 if (empty($xoopsConfigSearch["enable_search"])) {
-    redirect_header(XOOPS_URL."/modules/".$GLOBALS["moddirname"]."/index.php", 2, planet_constant("MD_NOACCESS"));
-    exit();
+	redirect_header(XOOPS_URL."/modules/".$GLOBALS["moddirname"]."/index.php", 2, planet_constant("MD_NOACCESS"));
+	exit();
 }
 
 $xoopsConfig["module_cache"][$xoopsModule->getVar("mid")] = 0;
@@ -57,41 +57,41 @@ 
 $sortby = (in_array(strtolower($sortby), array("a.art_id desc", "a.art_time desc", "a.art_title", "a.blog_id", "b.blog_id", "b.blog_feed", "b.blog_title", "b.blog_time"))) ? strtolower($sortby) :  "";
 
 if ( !( empty($_POST["submit"]) && empty($_GET["term"])) ) {
-    $next_search["category"] = $category;
-    $next_search["blog"] = $blog;
-    $next_search["uid"] = $uid;
-    $next_search["andor"] = $andor;
-
-    $next_search["term"] = $term;
-    $query = trim($term);
-
-    if ( $andor != "EXACT" ) {
-        $ignored_queries = array(); // holds kewords that are shorter than allowed minmum length
-        $temp_queries = preg_split("/[\s,]+/", $query);
-        foreach ($temp_queries as $q) {
-            $q = trim($q);
-            if (strlen($q) >= $xoopsConfigSearch["keyword_min"]) {
-                $queries[] = $myts->addSlashes($q);
-            } else {
-                $ignored_queries[] = $myts->addSlashes($q);
-            }
-        }
-        if (count($queries) == 0) {
-            redirect_header(XOOPS_URL."/modules/".$GLOBALS["moddirname"]."/search.php", 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch["keyword_min"]));
-            exit();
-        }
-    } else {
-        if (strlen($query) < $xoopsConfigSearch["keyword_min"]) {
-            redirect_header(XOOPS_URL."/modules/".$GLOBALS["moddirname"]."/search.php", 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch["keyword_min"]));
-            exit();
-        }
-        $queries = array($myts->addSlashes($query));
-    }
+	$next_search["category"] = $category;
+	$next_search["blog"] = $blog;
+	$next_search["uid"] = $uid;
+	$next_search["andor"] = $andor;
+
+	$next_search["term"] = $term;
+	$query = trim($term);
+
+	if ( $andor != "EXACT" ) {
+		$ignored_queries = array(); // holds kewords that are shorter than allowed minmum length
+		$temp_queries = preg_split("/[\s,]+/", $query);
+		foreach ($temp_queries as $q) {
+			$q = trim($q);
+			if (strlen($q) >= $xoopsConfigSearch["keyword_min"]) {
+				$queries[] = $myts->addSlashes($q);
+			} else {
+				$ignored_queries[] = $myts->addSlashes($q);
+			}
+		}
+		if (count($queries) == 0) {
+			redirect_header(XOOPS_URL."/modules/".$GLOBALS["moddirname"]."/search.php", 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch["keyword_min"]));
+			exit();
+		}
+	} else {
+		if (strlen($query) < $xoopsConfigSearch["keyword_min"]) {
+			redirect_header(XOOPS_URL."/modules/".$GLOBALS["moddirname"]."/search.php", 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch["keyword_min"]));
+			exit();
+		}
+		$queries = array($myts->addSlashes($query));
+	}
 
-    $next_search["sortby"] = $sortby;
-    $next_search["searchin"] = implode("|", $searchin);
+	$next_search["sortby"] = $sortby;
+	$next_search["searchin"] = implode("|", $searchin);
     
-    /* To be added: year-month 
+	/* To be added: year-month 
      * see view.archive.php
      */
 	if (!empty($time)) {
@@ -100,31 +100,31 @@ 
 		$extra = "";
 	}
 
-    $results = planet_search($queries, $andor, $limit, $start, 
-    	$uid, $category, $blog,
-    	$sortby, $searchin, $extra);
+	$results = planet_search($queries, $andor, $limit, $start, 
+		$uid, $category, $blog,
+		$sortby, $searchin, $extra);
 
-    /*
+	/*
     if ( count($results) < 1 ) {
     	redirect_header("javascript:history.go(-1);", 2, _SR_NOMATCH);
     }
     else 
     */
-    {
-        $xoopsTpl->assign("results", $results);
-
-        if(count($next_search)>0){
-	        $items = array();
-	        foreach($next_search as $para => $val){
-		        if(!empty($val)) $items[] = "$para=$val";
-	        }
-	        if(count($items)>0) $paras = implode("&",$items);
-	        unset($next_search);
-	        unset($items);
-        }
-      	$search_url = XOOPS_URL."/modules/".$GLOBALS["moddirname"]."/search.php?".$paras;
-
-      	/*
+	{
+		$xoopsTpl->assign("results", $results);
+
+		if(count($next_search)>0){
+			$items = array();
+			foreach($next_search as $para => $val){
+				if(!empty($val)) $items[] = "$para=$val";
+			}
+			if(count($items)>0) $paras = implode("&",$items);
+			unset($next_search);
+			unset($items);
+		}
+	  	$search_url = XOOPS_URL."/modules/".$GLOBALS["moddirname"]."/search.php?".$paras;
+
+	  	/*
        	$next_results =& planet_search($queries, $andor, 1, $start + $limit, $uid, $category, $sortby, $searchin, $extra);
         $next_count = count($next_results);
         $has_next = false;
@@ -133,23 +133,23 @@ 
         }
         if (false != $has_next)
         */
-        if (count($results))
-        {
-            $next = $start + $limit;
-            $queries = implode(",",$queries);
-            $search_url_next = $search_url."&start=$next";
-            $search_next = "<a href=\"".htmlspecialchars($search_url_next)."\">"._SR_NEXT."</a>";
+		if (count($results))
+		{
+			$next = $start + $limit;
+			$queries = implode(",",$queries);
+			$search_url_next = $search_url."&start=$next";
+			$search_next = "<a href=\"".htmlspecialchars($search_url_next)."\">"._SR_NEXT."</a>";
 			$xoopsTpl->assign("search_next", $search_next);
-        }
-        if ( $start > 0 ) {
-            $prev = $start - $limit;
-            $search_url_prev = $search_url."&start=$prev";
-            $search_prev = "<a href=\"".htmlspecialchars($search_url_prev)."\">"._SR_PREVIOUS."</a>";
+		}
+		if ( $start > 0 ) {
+			$prev = $start - $limit;
+			$search_url_prev = $search_url."&start=$prev";
+			$search_prev = "<a href=\"".htmlspecialchars($search_url_prev)."\">"._SR_PREVIOUS."</a>";
 			$xoopsTpl->assign("search_prev", $search_prev);
-        }
-    }
+		}
+	}
 
-    unset($results);
+	unset($results);
 	$search_info = _SR_KEYWORDS.": ".$myts->htmlSpecialChars($term);
 	$xoopsTpl->assign("search_info", $search_info);
 }

Spacing +37 added lines, -37 removed lines

@@ -28,8 +28,8 @@ 
 $xoopsOption["pagetype"] = "search";
 include "header.php";
 $xoopsModule->loadLanguage("main");
-$config_handler =& xoops_gethandler("config");
-$xoopsConfigSearch =& $config_handler->getConfigsByCat(XOOPS_CONF_SEARCH);
+$config_handler = & xoops_gethandler("config");
+$xoopsConfigSearch = & $config_handler->getConfigsByCat(XOOPS_CONF_SEARCH);
 if (empty($xoopsConfigSearch["enable_search"])) {
     redirect_header(XOOPS_URL."/modules/".$GLOBALS["moddirname"]."/index.php", 2, planet_constant("MD_NOACCESS"));
     exit();
@@ -46,17 +46,17 @@ 
 $queries = array();
 $andor = isset($_POST["andor"]) ? $_POST["andor"] : (isset($_GET["andor"]) ? $_GET["andor"] : "");
 $start = isset($_GET["start"]) ? $_GET["start"] : 0;
-$category = intval( isset($_POST["category"]) ? $_POST["category"] : (isset($_GET["category"]) ? $_GET["category"] : null) );
-$blog = intval( isset($_POST["blog"]) ? $_POST["blog"] : (isset($_GET["blog"]) ? $_GET["blog"] : null) );
-$uid = intval( isset($_POST["uid"]) ? $_POST["uid"] : (isset($_GET["uid"]) ? $_GET["uid"] : null) );
+$category = intval(isset($_POST["category"]) ? $_POST["category"] : (isset($_GET["category"]) ? $_GET["category"] : null));
+$blog = intval(isset($_POST["blog"]) ? $_POST["blog"] : (isset($_GET["blog"]) ? $_GET["blog"] : null));
+$uid = intval(isset($_POST["uid"]) ? $_POST["uid"] : (isset($_GET["uid"]) ? $_GET["uid"] : null));
 $searchin = isset($_POST["searchin"]) ? $_POST["searchin"] : (isset($_GET["searchin"]) ? explode("|", $_GET["searchin"]) : array());
 $sortby = isset($_POST["sortby"]) ? $_POST["sortby"] : (isset($_GET["sortby"]) ? $_GET["sortby"] : null);
 $term = isset($_POST["term"]) ? $_POST["term"] : (isset($_GET["term"]) ? $_GET["term"] : "");
 
-$andor = (in_array(strtoupper($andor), array("OR", "AND", "EXACT")))?strtoupper($andor):"OR";
-$sortby = (in_array(strtolower($sortby), array("a.art_id desc", "a.art_time desc", "a.art_title", "a.blog_id", "b.blog_id", "b.blog_feed", "b.blog_title", "b.blog_time"))) ? strtolower($sortby) :  "";
+$andor = (in_array(strtoupper($andor), array("OR", "AND", "EXACT"))) ? strtoupper($andor) : "OR";
+$sortby = (in_array(strtolower($sortby), array("a.art_id desc", "a.art_time desc", "a.art_title", "a.blog_id", "b.blog_id", "b.blog_feed", "b.blog_title", "b.blog_time"))) ? strtolower($sortby) : "";
 
-if ( !( empty($_POST["submit"]) && empty($_GET["term"])) ) {
+if (!(empty($_POST["submit"]) && empty($_GET["term"]))) {
     $next_search["category"] = $category;
     $next_search["blog"] = $blog;
     $next_search["uid"] = $uid;
@@ -65,14 +65,14 @@ 
     $next_search["term"] = $term;
     $query = trim($term);
 
-    if ( $andor != "EXACT" ) {
+    if ($andor != "EXACT") {
         $ignored_queries = array(); // holds kewords that are shorter than allowed minmum length
         $temp_queries = preg_split("/[\s,]+/", $query);
         foreach ($temp_queries as $q) {
             $q = trim($q);
-            if (strlen($q) >= $xoopsConfigSearch["keyword_min"]) {
+            if (strlen($q)>=$xoopsConfigSearch["keyword_min"]) {
                 $queries[] = $myts->addSlashes($q);
-            } else {
+            }else {
                 $ignored_queries[] = $myts->addSlashes($q);
             }
         }
@@ -80,8 +80,8 @@ 
             redirect_header(XOOPS_URL."/modules/".$GLOBALS["moddirname"]."/search.php", 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch["keyword_min"]));
             exit();
         }
-    } else {
-        if (strlen($query) < $xoopsConfigSearch["keyword_min"]) {
+    }else {
+        if (strlen($query)<$xoopsConfigSearch["keyword_min"]) {
             redirect_header(XOOPS_URL."/modules/".$GLOBALS["moddirname"]."/search.php", 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch["keyword_min"]));
             exit();
         }
@@ -96,7 +96,7 @@ 
      */
 	if (!empty($time)) {
 		$extra = "";
-	}else{
+	}else {
 		$extra = "";
 	}
 
@@ -113,12 +113,12 @@ 
     {
         $xoopsTpl->assign("results", $results);
 
-        if(count($next_search)>0){
+        if (count($next_search)>0) {
 	        $items = array();
-	        foreach($next_search as $para => $val){
-		        if(!empty($val)) $items[] = "$para=$val";
+	        foreach ($next_search as $para => $val) {
+		        if (!empty($val)) $items[] = "$para=$val";
 	        }
-	        if(count($items)>0) $paras = implode("&",$items);
+	        if (count($items)>0) $paras = implode("&", $items);
 	        unset($next_search);
 	        unset($items);
         }
@@ -135,14 +135,14 @@ 
         */
         if (count($results))
         {
-            $next = $start + $limit;
-            $queries = implode(",",$queries);
+            $next = $start+$limit;
+            $queries = implode(",", $queries);
             $search_url_next = $search_url."&start=$next";
             $search_next = "<a href=\"".htmlspecialchars($search_url_next)."\">"._SR_NEXT."</a>";
 			$xoopsTpl->assign("search_next", $search_next);
         }
-        if ( $start > 0 ) {
-            $prev = $start - $limit;
+        if ($start>0) {
+            $prev = $start-$limit;
             $search_url_prev = $search_url."&start=$prev";
             $search_prev = "<a href=\"".htmlspecialchars($search_url_prev)."\">"._SR_PREVIOUS."</a>";
 			$xoopsTpl->assign("search_prev", $search_prev);
@@ -157,54 +157,54 @@ 
 /* type */
 $type_select = "<select name=\"andor\">";
 $type_select .= "<option value=\"OR\"";
-	if("OR" == $andor) $type_select .= " selected=\"selected\"";
+	if ("OR" == $andor) $type_select .= " selected=\"selected\"";
 	$type_select .= ">"._SR_ANY."</option>";
 $type_select .= "<option value=\"AND\"";
-	if("AND" == $andor) $type_select .= " selected=\"selected\"";
+	if ("AND" == $andor) $type_select .= " selected=\"selected\"";
 	$type_select .= ">"._SR_ALL."</option>";
 $type_select .= "<option value=\"EXACT\"";
-	if("exact" == $andor) $type_select .= " selected=\"selected\"";
+	if ("exact" == $andor) $type_select .= " selected=\"selected\"";
 	$type_select .= ">"._SR_EXACT."</option>";
 $type_select .= "</select>";
 
 /* scope */
 $searchin_select = "";
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"title\"";
-	if(in_array("title", $searchin)) $searchin_select .= " checked";
+	if (in_array("title", $searchin)) $searchin_select .= " checked";
 	$searchin_select .= " />".planet_constant("MD_TITLE")."&nbsp;&nbsp;";
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"text\"";
-	if(in_array("text", $searchin)) $searchin_select .= " checked";
+	if (in_array("text", $searchin)) $searchin_select .= " checked";
 	$searchin_select .= " />".planet_constant("MD_BODY")."&nbsp;&nbsp;||&nbsp;&nbsp;";
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"blog\"";
-	if(in_array("blog", $searchin)) $searchin_select .= " checked";
+	if (in_array("blog", $searchin)) $searchin_select .= " checked";
 	$searchin_select .= " />".planet_constant("MD_BLOG")."&nbsp;&nbsp;";
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"feed\"";
-	if(in_array("feed", $searchin)) $searchin_select .= " checked";
+	if (in_array("feed", $searchin)) $searchin_select .= " checked";
 	$searchin_select .= " />".planet_constant("MD_FEED")."&nbsp;&nbsp;";
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"desc\"";
-	if(in_array("desc", $searchin)) $searchin_select .= " checked";
+	if (in_array("desc", $searchin)) $searchin_select .= " checked";
 	$searchin_select .= " />".planet_constant("MD_DESC")."&nbsp;&nbsp;";
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"all\"";
-	if(empty($searchin)) $searchin_select .= " checked";
+	if (empty($searchin)) $searchin_select .= " checked";
 	$searchin_select .= " />"._ALL."&nbsp;&nbsp;";
 
 /* sortby */
 $sortby_select = "<select name=\"sortby\">";
 $sortby_select .= "<option value=\"\"";
-	if(empty($sortby)) $sortby_select .= " selected=\"selected\"";
+	if (empty($sortby)) $sortby_select .= " selected=\"selected\"";
 	$sortby_select .= ">"._NONE."</option>";
 $sortby_select .= "<option value=\"a.art_time\"";
-	if("a.art_time" == $sortby) $sortby_select .= " selected=\"selected\"";
+	if ("a.art_time" == $sortby) $sortby_select .= " selected=\"selected\"";
 	$sortby_select .= ">".planet_constant("MD_TIME")."</option>";
 $sortby_select .= "<option value=\"a.art_title\"";
-	if("a.art_title" == $sortby) $sortby_select .= " selected=\"selected\"";
+	if ("a.art_title" == $sortby) $sortby_select .= " selected=\"selected\"";
 	$sortby_select .= ">".planet_constant("MD_TITLE")."</option>";
 $sortby_select .= "<option value=\"\">&nbsp;&nbsp;----&nbsp;&nbsp;</option>";
 $sortby_select .= "<option value=\"a.blog_title\"";
-	if("a.blog_title" == $sortby) $sortby_select .= " selected=\"selected\"";
+	if ("a.blog_title" == $sortby) $sortby_select .= " selected=\"selected\"";
 	$sortby_select .= ">".planet_constant("MD_BLOG")."</option>";
 $sortby_select .= "<option value=\"a.blog_time\"";
-	if("b.blog_time" == $sortby) $sortby_select .= " selected=\"selected\"";
+	if ("b.blog_time" == $sortby) $sortby_select .= " selected=\"selected\"";
 	$sortby_select .= ">".planet_constant("MD_UPDATE")."</option>";
 $sortby_select .= "</select>";
 
@@ -219,7 +219,7 @@ 
 $xoopsTpl->assign("blog", $blog);
 $xoopsTpl->assign("uid", $uid);
 
-if ($xoopsConfigSearch["keyword_min"] > 0) {
+if ($xoopsConfigSearch["keyword_min"]>0) {
 	$xoopsTpl->assign("search_rule", sprintf(_SR_KEYIGNORE, $xoopsConfigSearch["keyword_min"]));
 }
 

Braces +49 added lines, -17 removed lines

@@ -96,7 +96,7 @@ 
      */
 	if (!empty($time)) {
 		$extra = "";
-	}else{
+	} else{
 		$extra = "";
 	}
 
@@ -116,9 +116,13 @@ 
         if(count($next_search)>0){
 	        $items = array();
 	        foreach($next_search as $para => $val){
-		        if(!empty($val)) $items[] = "$para=$val";
+		        if(!empty($val)) {
+		        	$items[] = "$para=$val";
+		        }
+	        }
+	        if(count($items)>0) {
+	        	$paras = implode("&",$items);
 	        }
-	        if(count($items)>0) $paras = implode("&",$items);
 	        unset($next_search);
 	        unset($items);
         }
@@ -157,54 +161,82 @@ 
 /* type */
 $type_select = "<select name=\"andor\">";
 $type_select .= "<option value=\"OR\"";
-	if("OR" == $andor) $type_select .= " selected=\"selected\"";
+	if("OR" == $andor) {
+		$type_select .= " selected=\"selected\"";
+	}
 	$type_select .= ">"._SR_ANY."</option>";
 $type_select .= "<option value=\"AND\"";
-	if("AND" == $andor) $type_select .= " selected=\"selected\"";
+	if("AND" == $andor) {
+		$type_select .= " selected=\"selected\"";
+	}
 	$type_select .= ">"._SR_ALL."</option>";
 $type_select .= "<option value=\"EXACT\"";
-	if("exact" == $andor) $type_select .= " selected=\"selected\"";
+	if("exact" == $andor) {
+		$type_select .= " selected=\"selected\"";
+	}
 	$type_select .= ">"._SR_EXACT."</option>";
 $type_select .= "</select>";
 
 /* scope */
 $searchin_select = "";
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"title\"";
-	if(in_array("title", $searchin)) $searchin_select .= " checked";
+	if(in_array("title", $searchin)) {
+		$searchin_select .= " checked";
+	}
 	$searchin_select .= " />".planet_constant("MD_TITLE")."&nbsp;&nbsp;";
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"text\"";
-	if(in_array("text", $searchin)) $searchin_select .= " checked";
+	if(in_array("text", $searchin)) {
+		$searchin_select .= " checked";
+	}
 	$searchin_select .= " />".planet_constant("MD_BODY")."&nbsp;&nbsp;||&nbsp;&nbsp;";
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"blog\"";
-	if(in_array("blog", $searchin)) $searchin_select .= " checked";
+	if(in_array("blog", $searchin)) {
+		$searchin_select .= " checked";
+	}
 	$searchin_select .= " />".planet_constant("MD_BLOG")."&nbsp;&nbsp;";
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"feed\"";
-	if(in_array("feed", $searchin)) $searchin_select .= " checked";
+	if(in_array("feed", $searchin)) {
+		$searchin_select .= " checked";
+	}
 	$searchin_select .= " />".planet_constant("MD_FEED")."&nbsp;&nbsp;";
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"desc\"";
-	if(in_array("desc", $searchin)) $searchin_select .= " checked";
+	if(in_array("desc", $searchin)) {
+		$searchin_select .= " checked";
+	}
 	$searchin_select .= " />".planet_constant("MD_DESC")."&nbsp;&nbsp;";
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"all\"";
-	if(empty($searchin)) $searchin_select .= " checked";
+	if(empty($searchin)) {
+		$searchin_select .= " checked";
+	}
 	$searchin_select .= " />"._ALL."&nbsp;&nbsp;";
 
 /* sortby */
 $sortby_select = "<select name=\"sortby\">";
 $sortby_select .= "<option value=\"\"";
-	if(empty($sortby)) $sortby_select .= " selected=\"selected\"";
+	if(empty($sortby)) {
+		$sortby_select .= " selected=\"selected\"";
+	}
 	$sortby_select .= ">"._NONE."</option>";
 $sortby_select .= "<option value=\"a.art_time\"";
-	if("a.art_time" == $sortby) $sortby_select .= " selected=\"selected\"";
+	if("a.art_time" == $sortby) {
+		$sortby_select .= " selected=\"selected\"";
+	}
 	$sortby_select .= ">".planet_constant("MD_TIME")."</option>";
 $sortby_select .= "<option value=\"a.art_title\"";
-	if("a.art_title" == $sortby) $sortby_select .= " selected=\"selected\"";
+	if("a.art_title" == $sortby) {
+		$sortby_select .= " selected=\"selected\"";
+	}
 	$sortby_select .= ">".planet_constant("MD_TITLE")."</option>";
 $sortby_select .= "<option value=\"\">&nbsp;&nbsp;----&nbsp;&nbsp;</option>";
 $sortby_select .= "<option value=\"a.blog_title\"";
-	if("a.blog_title" == $sortby) $sortby_select .= " selected=\"selected\"";
+	if("a.blog_title" == $sortby) {
+		$sortby_select .= " selected=\"selected\"";
+	}
 	$sortby_select .= ">".planet_constant("MD_BLOG")."</option>";
 $sortby_select .= "<option value=\"a.blog_time\"";
-	if("b.blog_time" == $sortby) $sortby_select .= " selected=\"selected\"";
+	if("b.blog_time" == $sortby) {
+		$sortby_select .= " selected=\"selected\"";
+	}
 	$sortby_select .= ">".planet_constant("MD_UPDATE")."</option>";
 $sortby_select .= "</select>";