mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-03-14 01:19:44 +01:00
Code Issues Releases Wiki Activity

Eliminate conflicting LANs

Browse Source
This commit is contained in:
e107steved 2007-04-24 20:20:17 +00:00
parent 848fdea8e9
commit 0f12bc2a27
4 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
e107_handlers/search/comments_news.php
View File

@ -11,15 +11,15 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_handlers/search/comments_news.php,v $
| $Revision: 1.1.1.1 $
| $Date: 2006-12-02 04:34:05 $
| $Author: mcfly_e107 $
| $Revision: 1.2 $
| $Date: 2007-04-24 20:20:10 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
if (!defined('e107_INIT')) { exit; }
$comments_title = LAN_98;
$comments_title = LAN_SEARCH_98;
$comments_type_id = 0;
$comments_return['news'] = "n.news_title";
$comments_table['news'] = "LEFT JOIN #news AS n ON c.comment_type=0 AND n.news_id = c.comment_item_id";

8
e107_handlers/search/comments_user.php
View File

@ -11,15 +11,15 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_handlers/search/comments_user.php,v $
| $Revision: 1.1.1.1 $
| $Date: 2006-12-02 04:34:05 $
| $Author: mcfly_e107 $
| $Revision: 1.2 $
| $Date: 2007-04-24 20:20:10 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
if (!defined('e107_INIT')) { exit; }
$comments_title = LAN_98;
$comments_title = LAN_SEARCH_98;
$comments_type_id = 'profile';
$comments_return['user'] = "u.user_name";
$comments_table['user'] = "LEFT JOIN #user AS u ON c.comment_type='profile' AND u.user_id = c.comment_item_id";

16
e107_languages/English/lan_search.php
View File

@ -4,16 +4,14 @@
| e107 website system - Language File.
|
| $Source: /cvs_backup/e107_0.8/e107_languages/English/lan_search.php,v $
| $Revision: 1.1.1.1 $
| $Date: 2006-12-02 04:34:39 $
| $Author: mcfly_e107 $
| $Revision: 1.2 $
| $Date: 2007-04-24 20:20:17 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
define("PAGE_NAME", "Search");
define("LAN_98", "News");
define("LAN_99", "Comments");
define("LAN_140", "Members");
define("LAN_180", "Search");
define("LAN_192", "All categories");
@ -25,9 +23,7 @@ define("LAN_196", "matches");
define("LAN_197", "Downloads");
define("LAN_198", "No matches found");
define("LAN_199", "Search For:");
define("LAN_200", "Categories:");
define("LAN_201", "Please redefine your search query");
define("LAN_416", "You must be logged in to access this page");
define("LAN_417", "Search terms must be at least 3 characters.");
@ -116,4 +112,10 @@ define("LAN_SEARCH_75", "Search type");
define("LAN_SEARCH_76", "Posted on page");
define("LAN_SEARCH_77", "Posted on profile page of");
// Following formerly LAN_nnn - renamed to avoid clashes
define("LAN_SEARCH_98", "News");
define("LAN_SEARCH_99", "Comments");
//define("LAN_SEARCH_200", "Categories:"); // Redundant LAN?
define("LAN_SEARCH_201", "Please redefine your search query");
?>

14
search.php
View File

@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/search.php,v $
| $Revision: 1.4 $
| $Date: 2007-03-11 17:43:09 $
| $Author: mcfly_e107 $
| $Revision: 1.5 $
| $Date: 2007-04-24 20:20:10 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
@ -60,13 +60,13 @@ function search_info($id, $type, $plug_require, $info='') {
//core search routines
if ($search_info['news'] = search_info('news', 'core', false, array('sfile' => e_HANDLER.'search/search_news.php', 'qtype' => LAN_98, 'refpage' => 'news.php', 'advanced' => e_HANDLER.'search/advanced_news.php', 'id' => 'news'))) {
if ($search_info['news'] = search_info('news', 'core', false, array('sfile' => e_HANDLER.'search/search_news.php', 'qtype' => LAN_SEARCH_98, 'refpage' => 'news.php', 'advanced' => e_HANDLER.'search/advanced_news.php', 'id' => 'news'))) {
// $search_id++;
} else {
unset($search_info['news']);
}
if ($search_info['comments'] = search_info('comments', 'core', false, array('sfile' => e_HANDLER.'search/search_comment.php', 'qtype' => LAN_99, 'refpage' => 'comment.php', 'advanced' => e_HANDLER.'search/advanced_comment.php', 'id' => 'comment'))) {
if ($search_info['comments'] = search_info('comments', 'core', false, array('sfile' => e_HANDLER.'search/search_comment.php', 'qtype' => LAN_SEARCH_99, 'refpage' => 'comment.php', 'advanced' => e_HANDLER.'search/advanced_comment.php', 'id' => 'comment'))) {
// $search_id++;
} else {
unset($search_info['comments']);
@ -166,11 +166,11 @@ if (isset($_GET['q']) || isset($_GET['in']) || isset($_GET['ex']) || isset($_GET
if (isset($_GET['r']) && !is_numeric($_GET['r'])) {
$perform_search = false;
$SEARCH_MESSAGE = LAN_201;
$SEARCH_MESSAGE = LAN_SEARCH_201;
$result_flag = 0;
} else if (strlen($full_query) == 0) {
$perform_search = false;
$SEARCH_MESSAGE = LAN_201;
$SEARCH_MESSAGE = LAN_SEARCH_201;
} else if (strlen($full_query) < 3) {
$perform_search = false;
$SEARCH_MESSAGE = LAN_417;