@@ -27,10 +27,10 @@ |
||
27 | 27 | include __DIR__ . '/header.php'; |
28 | 28 | $article_id = empty($_GET['article']) ? 0 : (int)$_GET['article']; |
29 | 29 | if (empty($article_id)) { |
30 | - return; |
|
30 | + return; |
|
31 | 31 | } |
32 | 32 | if (planet_getcookie('art_' . $article_id) > 0) { |
33 | - return; |
|
33 | + return; |
|
34 | 34 | } |
35 | 35 | $article_handler = xoops_getModuleHandler('article', $xoopsModule->getVar('dirname')); |
36 | 36 | $article_obj =& $article_handler->get($article_id); |
@@ -24,18 +24,18 @@ |
||
24 | 24 | // URL: http://xoops.org // |
25 | 25 | // Project: Article Project // |
26 | 26 | // ------------------------------------------------------------------------ // |
27 | -include __DIR__ . '/header.php'; |
|
28 | -$article_id = empty($_GET['article']) ? 0 : (int)$_GET['article']; |
|
27 | +include __DIR__.'/header.php'; |
|
28 | +$article_id = empty($_GET['article']) ? 0 : (int) $_GET['article']; |
|
29 | 29 | if (empty($article_id)) { |
30 | 30 | return; |
31 | 31 | } |
32 | -if (planet_getcookie('art_' . $article_id) > 0) { |
|
32 | +if (planet_getcookie('art_'.$article_id)>0) { |
|
33 | 33 | return; |
34 | 34 | } |
35 | 35 | $article_handler = xoops_getModuleHandler('article', $xoopsModule->getVar('dirname')); |
36 | -$article_obj =& $article_handler->get($article_id); |
|
37 | -$article_obj->setVar('art_views', $article_obj->getVar('art_views') + 1, true); |
|
36 | +$article_obj = & $article_handler->get($article_id); |
|
37 | +$article_obj->setVar('art_views', $article_obj->getVar('art_views')+1, true); |
|
38 | 38 | $article_handler->insert($article_obj, true); |
39 | -planet_setcookie('art_' . $article_id, time()); |
|
39 | +planet_setcookie('art_'.$article_id, time()); |
|
40 | 40 | |
41 | 41 | return; |
@@ -24,5 +24,5 @@ |
||
24 | 24 | // URL: http://xoops.org // |
25 | 25 | // Project: Article Project // |
26 | 26 | // ------------------------------------------------------------------------ // |
27 | -include dirname(dirname(__DIR__)) . '/mainfile.php'; |
|
28 | -include XOOPS_ROOT_PATH . '/include/comment_delete.php'; |
|
27 | +include dirname(dirname(__DIR__)).'/mainfile.php'; |
|
28 | +include XOOPS_ROOT_PATH.'/include/comment_delete.php'; |
@@ -32,17 +32,17 @@ discard block |
||
32 | 32 | * |
33 | 33 | */ |
34 | 34 | if (preg_match("/(\/comment_[^\.]*\.php\?.*=.*)/i", $_SERVER['REQUEST_URI'], $matches)) { |
35 | - header('location: ' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . $matches[1]); |
|
36 | - exit(); |
|
35 | + header('location: ' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . $matches[1]); |
|
36 | + exit(); |
|
37 | 37 | } |
38 | 38 | if (preg_match("/\/notification_update\.php/i", $_SERVER['REQUEST_URI'], $matches)) { |
39 | - include XOOPS_ROOT_PATH . '/include/notification_update.php'; |
|
40 | - exit(); |
|
39 | + include XOOPS_ROOT_PATH . '/include/notification_update.php'; |
|
40 | + exit(); |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | if ($REQUEST_URI_parsed = planet_parse_args($args_num, $args, $args_str)) { |
44 | - $args['article'] = @$args_num[0]; |
|
45 | - $args['blog'] = @$args['blog']; |
|
44 | + $args['article'] = @$args_num[0]; |
|
45 | + $args['blog'] = @$args['blog']; |
|
46 | 46 | } |
47 | 47 | |
48 | 48 | $article_id = (int)(empty($_GET['article']) ? @$args['article'] : $_GET['article']); |
@@ -55,8 +55,8 @@ discard block |
||
55 | 55 | |
56 | 56 | // restore $_SERVER['REQUEST_URI'] |
57 | 57 | if (!empty($REQUEST_URI_parsed)) { |
58 | - $_SERVER['REQUEST_URI'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' |
|
59 | - . (empty($article_id) ? '' : '?article=' . $article_id); |
|
58 | + $_SERVER['REQUEST_URI'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' |
|
59 | + . (empty($article_id) ? '' : '?article=' . $article_id); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | $xoopsOption['xoops_pagetitle'] = $xoopsModule->getVar('name') . ' - ' . $article_obj->getVar('art_title'); |
@@ -65,32 +65,32 @@ discard block |
||
65 | 65 | include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php'; |
66 | 66 | |
67 | 67 | $article_data = array( |
68 | - 'id' => $article_id, |
|
69 | - 'title' => $article_obj->getVar('art_title'), |
|
70 | - 'content' => $article_obj->getVar('art_content'), |
|
71 | - 'author' => $article_obj->getVar('art_author'), |
|
72 | - 'time' => $article_obj->getTime(), |
|
73 | - 'link' => $article_obj->getVar('art_link'), |
|
74 | - 'views' => $article_obj->getVar('art_views'), |
|
75 | - 'comments' => $article_obj->getVar('art_comments'), |
|
76 | - 'star' => $article_obj->getStar(), |
|
77 | - 'rates' => $article_obj->getVar('art_rates'), |
|
78 | - 'blog' => array('id' => $article_obj->getVar('blog_id'), 'title' => $blog_obj->getVar('blog_title')) |
|
68 | + 'id' => $article_id, |
|
69 | + 'title' => $article_obj->getVar('art_title'), |
|
70 | + 'content' => $article_obj->getVar('art_content'), |
|
71 | + 'author' => $article_obj->getVar('art_author'), |
|
72 | + 'time' => $article_obj->getTime(), |
|
73 | + 'link' => $article_obj->getVar('art_link'), |
|
74 | + 'views' => $article_obj->getVar('art_views'), |
|
75 | + 'comments' => $article_obj->getVar('art_comments'), |
|
76 | + 'star' => $article_obj->getStar(), |
|
77 | + 'rates' => $article_obj->getVar('art_rates'), |
|
78 | + 'blog' => array('id' => $article_obj->getVar('blog_id'), 'title' => $blog_obj->getVar('blog_title')) |
|
79 | 79 | ); |
80 | 80 | |
81 | 81 | if (!empty($xoopsModuleConfig['do_sibling'])) { |
82 | - $articles_sibling =& $article_handler->getSibling($article_obj, $blog_id); |
|
83 | - if (!empty($articles_sibling['previous'])) { |
|
84 | - $articles_sibling['previous']['url'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' |
|
85 | - . URL_DELIMITER . '' . $articles_sibling['previous']['id'] . '/b' |
|
86 | - . $blog_id; |
|
87 | - $articles_sibling['previous']['title'] = $articles_sibling['previous']['title']; |
|
88 | - } |
|
89 | - if (!empty($articles_sibling['next'])) { |
|
90 | - $articles_sibling['next']['url'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' |
|
91 | - . URL_DELIMITER . '' . $articles_sibling['next']['id'] . '/b' . $blog_id; |
|
92 | - $articles_sibling['next']['title'] = $articles_sibling['next']['title']; |
|
93 | - } |
|
82 | + $articles_sibling =& $article_handler->getSibling($article_obj, $blog_id); |
|
83 | + if (!empty($articles_sibling['previous'])) { |
|
84 | + $articles_sibling['previous']['url'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' |
|
85 | + . URL_DELIMITER . '' . $articles_sibling['previous']['id'] . '/b' |
|
86 | + . $blog_id; |
|
87 | + $articles_sibling['previous']['title'] = $articles_sibling['previous']['title']; |
|
88 | + } |
|
89 | + if (!empty($articles_sibling['next'])) { |
|
90 | + $articles_sibling['next']['url'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' |
|
91 | + . URL_DELIMITER . '' . $articles_sibling['next']['id'] . '/b' . $blog_id; |
|
92 | + $articles_sibling['next']['title'] = $articles_sibling['next']['title']; |
|
93 | + } |
|
94 | 94 | } |
95 | 95 | |
96 | 96 | $xoopsTpl->assign('modulename', $xoopsModule->getVar('name')); |
@@ -101,11 +101,11 @@ discard block |
||
101 | 101 | $xoopsTpl->assign('user_level', !is_object($xoopsUser) ? 0 : ($xoopsUser->isAdmin() ? 2 : 1)); |
102 | 102 | if (empty($xoopsModuleConfig['anonymous_rate']) && !is_object($xoopsUser)) { |
103 | 103 | } else { |
104 | - $xoopsTpl->assign('canrate', 1); |
|
104 | + $xoopsTpl->assign('canrate', 1); |
|
105 | 105 | } |
106 | 106 | |
107 | 107 | if ($transferbar = @include XOOPS_ROOT_PATH . '/Frameworks/transfer/bar.transfer.php') { |
108 | - $xoopsTpl->assign('transfer', $transferbar); |
|
108 | + $xoopsTpl->assign('transfer', $transferbar); |
|
109 | 109 | } |
110 | 110 | |
111 | 111 | // Loading module meta data, NOT THE RIGHT WAY DOING IT |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | // URL: http://xoops.org // |
25 | 25 | // Project: Article Project // |
26 | 26 | // ------------------------------------------------------------------------ // |
27 | -include __DIR__ . '/header.php'; |
|
27 | +include __DIR__.'/header.php'; |
|
28 | 28 | |
29 | 29 | /** |
30 | 30 | * The comment detection scripts should be removed once absolute url is used in comment_view.php |
@@ -32,11 +32,11 @@ discard block |
||
32 | 32 | * |
33 | 33 | */ |
34 | 34 | if (preg_match("/(\/comment_[^\.]*\.php\?.*=.*)/i", $_SERVER['REQUEST_URI'], $matches)) { |
35 | - header('location: ' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . $matches[1]); |
|
35 | + header('location: '.XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].$matches[1]); |
|
36 | 36 | exit(); |
37 | 37 | } |
38 | 38 | if (preg_match("/\/notification_update\.php/i", $_SERVER['REQUEST_URI'], $matches)) { |
39 | - include XOOPS_ROOT_PATH . '/include/notification_update.php'; |
|
39 | + include XOOPS_ROOT_PATH.'/include/notification_update.php'; |
|
40 | 40 | exit(); |
41 | 41 | } |
42 | 42 | |
@@ -45,24 +45,24 @@ discard block |
||
45 | 45 | $args['blog'] = @$args['blog']; |
46 | 46 | } |
47 | 47 | |
48 | -$article_id = (int)(empty($_GET['article']) ? @$args['article'] : $_GET['article']); |
|
49 | -$blog_id = (int)(empty($_GET['blog']) ? @$args['blog'] : $_GET['blog']); |
|
48 | +$article_id = (int) (empty($_GET['article']) ? @$args['article'] : $_GET['article']); |
|
49 | +$blog_id = (int) (empty($_GET['blog']) ? @$args['blog'] : $_GET['blog']); |
|
50 | 50 | |
51 | 51 | $article_handler = xoops_getModuleHandler('article', $GLOBALS['moddirname']); |
52 | 52 | $blog_handler = xoops_getModuleHandler('blog', $GLOBALS['moddirname']); |
53 | -$article_obj =& $article_handler->get($article_id); |
|
54 | -$blog_obj =& $blog_handler->get($article_obj->getVar('blog_id')); |
|
53 | +$article_obj = & $article_handler->get($article_id); |
|
54 | +$blog_obj = & $blog_handler->get($article_obj->getVar('blog_id')); |
|
55 | 55 | |
56 | 56 | // restore $_SERVER['REQUEST_URI'] |
57 | 57 | if (!empty($REQUEST_URI_parsed)) { |
58 | - $_SERVER['REQUEST_URI'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' |
|
59 | - . (empty($article_id) ? '' : '?article=' . $article_id); |
|
58 | + $_SERVER['REQUEST_URI'] = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php' |
|
59 | + . (empty($article_id) ? '' : '?article='.$article_id); |
|
60 | 60 | } |
61 | 61 | |
62 | -$xoopsOption['xoops_pagetitle'] = $xoopsModule->getVar('name') . ' - ' . $article_obj->getVar('art_title'); |
|
62 | +$xoopsOption['xoops_pagetitle'] = $xoopsModule->getVar('name').' - '.$article_obj->getVar('art_title'); |
|
63 | 63 | $xoopsOption['template_main'] = planet_getTemplate('article'); |
64 | -include_once XOOPS_ROOT_PATH . '/header.php'; |
|
65 | -include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php'; |
|
64 | +include_once XOOPS_ROOT_PATH.'/header.php'; |
|
65 | +include XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/include/vars.php'; |
|
66 | 66 | |
67 | 67 | $article_data = array( |
68 | 68 | 'id' => $article_id, |
@@ -79,16 +79,16 @@ discard block |
||
79 | 79 | ); |
80 | 80 | |
81 | 81 | if (!empty($xoopsModuleConfig['do_sibling'])) { |
82 | - $articles_sibling =& $article_handler->getSibling($article_obj, $blog_id); |
|
82 | + $articles_sibling = & $article_handler->getSibling($article_obj, $blog_id); |
|
83 | 83 | if (!empty($articles_sibling['previous'])) { |
84 | - $articles_sibling['previous']['url'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' |
|
85 | - . URL_DELIMITER . '' . $articles_sibling['previous']['id'] . '/b' |
|
84 | + $articles_sibling['previous']['url'] = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php' |
|
85 | + . URL_DELIMITER.''.$articles_sibling['previous']['id'].'/b' |
|
86 | 86 | . $blog_id; |
87 | 87 | $articles_sibling['previous']['title'] = $articles_sibling['previous']['title']; |
88 | 88 | } |
89 | 89 | if (!empty($articles_sibling['next'])) { |
90 | - $articles_sibling['next']['url'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' |
|
91 | - . URL_DELIMITER . '' . $articles_sibling['next']['id'] . '/b' . $blog_id; |
|
90 | + $articles_sibling['next']['url'] = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php' |
|
91 | + . URL_DELIMITER.''.$articles_sibling['next']['id'].'/b'.$blog_id; |
|
92 | 92 | $articles_sibling['next']['title'] = $articles_sibling['next']['title']; |
93 | 93 | } |
94 | 94 | } |
@@ -100,11 +100,11 @@ discard block |
||
100 | 100 | |
101 | 101 | $xoopsTpl->assign('user_level', !is_object($xoopsUser) ? 0 : ($xoopsUser->isAdmin() ? 2 : 1)); |
102 | 102 | if (empty($xoopsModuleConfig['anonymous_rate']) && !is_object($xoopsUser)) { |
103 | -} else { |
|
103 | +}else { |
|
104 | 104 | $xoopsTpl->assign('canrate', 1); |
105 | 105 | } |
106 | 106 | |
107 | -if ($transferbar = @include XOOPS_ROOT_PATH . '/Frameworks/transfer/bar.transfer.php') { |
|
107 | +if ($transferbar = @include XOOPS_ROOT_PATH.'/Frameworks/transfer/bar.transfer.php') { |
|
108 | 108 | $xoopsTpl->assign('transfer', $transferbar); |
109 | 109 | } |
110 | 110 | |
@@ -114,6 +114,6 @@ discard block |
||
114 | 114 | // for comment and notification |
115 | 115 | //$_SERVER['REQUEST_URI'] = XOOPS_URL."/modules/".$GLOBALS["moddirname"]."/view.article.php"; |
116 | 116 | $_GET['article'] = $article_id; |
117 | -include XOOPS_ROOT_PATH . '/include/comment_view.php'; |
|
117 | +include XOOPS_ROOT_PATH.'/include/comment_view.php'; |
|
118 | 118 | |
119 | -include_once __DIR__ . '/footer.php'; |
|
119 | +include_once __DIR__.'/footer.php'; |
@@ -24,5 +24,5 @@ |
||
24 | 24 | // URL: http://xoops.org // |
25 | 25 | // Project: Article Project // |
26 | 26 | // ------------------------------------------------------------------------ // |
27 | -include dirname(dirname(__DIR__)) . '/mainfile.php'; |
|
28 | -include XOOPS_ROOT_PATH . '/include/comment_edit.php'; |
|
27 | +include dirname(dirname(__DIR__)).'/mainfile.php'; |
|
28 | +include XOOPS_ROOT_PATH.'/include/comment_edit.php'; |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | $config_handler = xoops_getHandler('config'); |
32 | 32 | $xoopsConfigSearch =& $config_handler->getConfigsByCat(XOOPS_CONF_SEARCH); |
33 | 33 | if (empty($xoopsConfigSearch['enable_search'])) { |
34 | - redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php', 2, planet_constant('MD_NOACCESS')); |
|
34 | + redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php', 2, planet_constant('MD_NOACCESS')); |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | $xoopsConfig['module_cache'][$xoopsModule->getVar('mid')] = 0; |
@@ -49,92 +49,92 @@ discard block |
||
49 | 49 | $blog = (int)(isset($_POST['blog']) ? $_POST['blog'] : (isset($_GET['blog']) ? $_GET['blog'] : null)); |
50 | 50 | $uid = (int)(isset($_POST['uid']) ? $_POST['uid'] : (isset($_GET['uid']) ? $_GET['uid'] : null)); |
51 | 51 | $searchin = isset($_POST['searchin']) ? $_POST['searchin'] : (isset($_GET['searchin']) ? explode('|', |
52 | - $_GET['searchin']) : array()); |
|
52 | + $_GET['searchin']) : array()); |
|
53 | 53 | $sortby = isset($_POST['sortby']) ? $_POST['sortby'] : (isset($_GET['sortby']) ? $_GET['sortby'] : null); |
54 | 54 | $term = isset($_POST['term']) ? $_POST['term'] : (isset($_GET['term']) ? $_GET['term'] : ''); |
55 | 55 | |
56 | 56 | $andor = in_array(strtoupper($andor), array('OR', 'AND', 'EXACT')) ? strtoupper($andor) : 'OR'; |
57 | 57 | $sortby = in_array(strtolower($sortby), array( |
58 | - 'a.art_id desc', |
|
59 | - 'a.art_time desc', |
|
60 | - 'a.art_title', |
|
61 | - 'a.blog_id', |
|
62 | - 'b.blog_id', |
|
63 | - 'b.blog_feed', |
|
64 | - 'b.blog_title', |
|
65 | - 'b.blog_time' |
|
58 | + 'a.art_id desc', |
|
59 | + 'a.art_time desc', |
|
60 | + 'a.art_title', |
|
61 | + 'a.blog_id', |
|
62 | + 'b.blog_id', |
|
63 | + 'b.blog_feed', |
|
64 | + 'b.blog_title', |
|
65 | + 'b.blog_time' |
|
66 | 66 | )) ? strtolower($sortby) : ''; |
67 | 67 | |
68 | 68 | if (!(empty($_POST['submit']) && empty($_GET['term']))) { |
69 | - $next_search['category'] = $category; |
|
70 | - $next_search['blog'] = $blog; |
|
71 | - $next_search['uid'] = $uid; |
|
72 | - $next_search['andor'] = $andor; |
|
69 | + $next_search['category'] = $category; |
|
70 | + $next_search['blog'] = $blog; |
|
71 | + $next_search['uid'] = $uid; |
|
72 | + $next_search['andor'] = $andor; |
|
73 | 73 | |
74 | - $next_search['term'] = $term; |
|
75 | - $query = trim($term); |
|
74 | + $next_search['term'] = $term; |
|
75 | + $query = trim($term); |
|
76 | 76 | |
77 | - if ($andor !== 'EXACT') { |
|
78 | - $ignored_queries = array(); // holds kewords that are shorter than allowed minmum length |
|
79 | - $temp_queries = preg_split("/[\s,]+/", $query); |
|
80 | - foreach ($temp_queries as $q) { |
|
81 | - $q = trim($q); |
|
82 | - if (strlen($q) >= $xoopsConfigSearch['keyword_min']) { |
|
83 | - $queries[] = $myts->addSlashes($q); |
|
84 | - } else { |
|
85 | - $ignored_queries[] = $myts->addSlashes($q); |
|
86 | - } |
|
87 | - } |
|
88 | - if (count($queries) == 0) { |
|
89 | - redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php', 2, |
|
90 | - sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min'])); |
|
91 | - } |
|
92 | - } else { |
|
93 | - if (strlen($query) < $xoopsConfigSearch['keyword_min']) { |
|
94 | - redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php', 2, |
|
95 | - sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min'])); |
|
96 | - } |
|
97 | - $queries = array($myts->addSlashes($query)); |
|
98 | - } |
|
77 | + if ($andor !== 'EXACT') { |
|
78 | + $ignored_queries = array(); // holds kewords that are shorter than allowed minmum length |
|
79 | + $temp_queries = preg_split("/[\s,]+/", $query); |
|
80 | + foreach ($temp_queries as $q) { |
|
81 | + $q = trim($q); |
|
82 | + if (strlen($q) >= $xoopsConfigSearch['keyword_min']) { |
|
83 | + $queries[] = $myts->addSlashes($q); |
|
84 | + } else { |
|
85 | + $ignored_queries[] = $myts->addSlashes($q); |
|
86 | + } |
|
87 | + } |
|
88 | + if (count($queries) == 0) { |
|
89 | + redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php', 2, |
|
90 | + sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min'])); |
|
91 | + } |
|
92 | + } else { |
|
93 | + if (strlen($query) < $xoopsConfigSearch['keyword_min']) { |
|
94 | + redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php', 2, |
|
95 | + sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min'])); |
|
96 | + } |
|
97 | + $queries = array($myts->addSlashes($query)); |
|
98 | + } |
|
99 | 99 | |
100 | - $next_search['sortby'] = $sortby; |
|
101 | - $next_search['searchin'] = implode('|', $searchin); |
|
100 | + $next_search['sortby'] = $sortby; |
|
101 | + $next_search['searchin'] = implode('|', $searchin); |
|
102 | 102 | |
103 | - /* To be added: year-month |
|
103 | + /* To be added: year-month |
|
104 | 104 | * see view.archive.php |
105 | 105 | */ |
106 | - if (!empty($time)) { |
|
107 | - $extra = ''; |
|
108 | - } else { |
|
109 | - $extra = ''; |
|
110 | - } |
|
106 | + if (!empty($time)) { |
|
107 | + $extra = ''; |
|
108 | + } else { |
|
109 | + $extra = ''; |
|
110 | + } |
|
111 | 111 | |
112 | - $results = planet_search($queries, $andor, $limit, $start, $uid, $category, $blog, $sortby, $searchin, $extra); |
|
112 | + $results = planet_search($queries, $andor, $limit, $start, $uid, $category, $blog, $sortby, $searchin, $extra); |
|
113 | 113 | |
114 | - /* |
|
114 | + /* |
|
115 | 115 | if ( count($results) < 1 ) { |
116 | 116 | redirect_header("javascript:history.go(-1);", 2, _SR_NOMATCH); |
117 | 117 | } else |
118 | 118 | */ |
119 | - { |
|
120 | - $xoopsTpl->assign('results', $results); |
|
119 | + { |
|
120 | + $xoopsTpl->assign('results', $results); |
|
121 | 121 | |
122 | - if (count($next_search) > 0) { |
|
123 | - $items = array(); |
|
124 | - foreach ($next_search as $para => $val) { |
|
125 | - if (!empty($val)) { |
|
126 | - $items[] = "$para=$val"; |
|
127 | - } |
|
128 | - } |
|
129 | - if (count($items) > 0) { |
|
130 | - $paras = implode('&', $items); |
|
131 | - } |
|
132 | - unset($next_search); |
|
133 | - unset($items); |
|
134 | - } |
|
135 | - $search_url = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php?' . $paras; |
|
122 | + if (count($next_search) > 0) { |
|
123 | + $items = array(); |
|
124 | + foreach ($next_search as $para => $val) { |
|
125 | + if (!empty($val)) { |
|
126 | + $items[] = "$para=$val"; |
|
127 | + } |
|
128 | + } |
|
129 | + if (count($items) > 0) { |
|
130 | + $paras = implode('&', $items); |
|
131 | + } |
|
132 | + unset($next_search); |
|
133 | + unset($items); |
|
134 | + } |
|
135 | + $search_url = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php?' . $paras; |
|
136 | 136 | |
137 | - /* |
|
137 | + /* |
|
138 | 138 | $next_results =& planet_search($queries, $andor, 1, $start + $limit, $uid, $category, $sortby, $searchin, $extra); |
139 | 139 | $next_count = count($next_results); |
140 | 140 | $has_next = false; |
@@ -143,41 +143,41 @@ discard block |
||
143 | 143 | } |
144 | 144 | if (false != $has_next) |
145 | 145 | */ |
146 | - if (count($results)) { |
|
147 | - $next = $start + $limit; |
|
148 | - $queries = implode(',', $queries); |
|
149 | - $search_url_next = $search_url . "&start=$next"; |
|
150 | - $search_next = "<a href=\"" . htmlspecialchars($search_url_next) . "\">" . _SR_NEXT . '</a>'; |
|
151 | - $xoopsTpl->assign('search_next', $search_next); |
|
152 | - } |
|
153 | - if ($start > 0) { |
|
154 | - $prev = $start - $limit; |
|
155 | - $search_url_prev = $search_url . "&start=$prev"; |
|
156 | - $search_prev = "<a href=\"" . htmlspecialchars($search_url_prev) . "\">" . _SR_PREVIOUS . '</a>'; |
|
157 | - $xoopsTpl->assign('search_prev', $search_prev); |
|
158 | - } |
|
159 | - } |
|
146 | + if (count($results)) { |
|
147 | + $next = $start + $limit; |
|
148 | + $queries = implode(',', $queries); |
|
149 | + $search_url_next = $search_url . "&start=$next"; |
|
150 | + $search_next = "<a href=\"" . htmlspecialchars($search_url_next) . "\">" . _SR_NEXT . '</a>'; |
|
151 | + $xoopsTpl->assign('search_next', $search_next); |
|
152 | + } |
|
153 | + if ($start > 0) { |
|
154 | + $prev = $start - $limit; |
|
155 | + $search_url_prev = $search_url . "&start=$prev"; |
|
156 | + $search_prev = "<a href=\"" . htmlspecialchars($search_url_prev) . "\">" . _SR_PREVIOUS . '</a>'; |
|
157 | + $xoopsTpl->assign('search_prev', $search_prev); |
|
158 | + } |
|
159 | + } |
|
160 | 160 | |
161 | - unset($results); |
|
162 | - $search_info = _SR_KEYWORDS . ': ' . $myts->htmlSpecialChars($term); |
|
163 | - $xoopsTpl->assign('search_info', $search_info); |
|
161 | + unset($results); |
|
162 | + $search_info = _SR_KEYWORDS . ': ' . $myts->htmlSpecialChars($term); |
|
163 | + $xoopsTpl->assign('search_info', $search_info); |
|
164 | 164 | } |
165 | 165 | |
166 | 166 | /* type */ |
167 | 167 | $type_select = "<select name=\"andor\">"; |
168 | 168 | $type_select .= "<option value=\"OR\""; |
169 | 169 | if ('OR' === $andor) { |
170 | - $type_select .= " selected=\"selected\""; |
|
170 | + $type_select .= " selected=\"selected\""; |
|
171 | 171 | } |
172 | 172 | $type_select .= '>' . _SR_ANY . '</option>'; |
173 | 173 | $type_select .= "<option value=\"AND\""; |
174 | 174 | if ('AND' === $andor) { |
175 | - $type_select .= " selected=\"selected\""; |
|
175 | + $type_select .= " selected=\"selected\""; |
|
176 | 176 | } |
177 | 177 | $type_select .= '>' . _SR_ALL . '</option>'; |
178 | 178 | $type_select .= "<option value=\"EXACT\""; |
179 | 179 | if ('exact' === $andor) { |
180 | - $type_select .= " selected=\"selected\""; |
|
180 | + $type_select .= " selected=\"selected\""; |
|
181 | 181 | } |
182 | 182 | $type_select .= '>' . _SR_EXACT . '</option>'; |
183 | 183 | $type_select .= '</select>'; |
@@ -186,32 +186,32 @@ discard block |
||
186 | 186 | $searchin_select = ''; |
187 | 187 | $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"title\""; |
188 | 188 | if (in_array('title', $searchin)) { |
189 | - $searchin_select .= ' checked'; |
|
189 | + $searchin_select .= ' checked'; |
|
190 | 190 | } |
191 | 191 | $searchin_select .= ' />' . planet_constant('MD_TITLE') . ' '; |
192 | 192 | $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"text\""; |
193 | 193 | if (in_array('text', $searchin)) { |
194 | - $searchin_select .= ' checked'; |
|
194 | + $searchin_select .= ' checked'; |
|
195 | 195 | } |
196 | 196 | $searchin_select .= ' />' . planet_constant('MD_BODY') . ' || '; |
197 | 197 | $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"blog\""; |
198 | 198 | if (in_array('blog', $searchin)) { |
199 | - $searchin_select .= ' checked'; |
|
199 | + $searchin_select .= ' checked'; |
|
200 | 200 | } |
201 | 201 | $searchin_select .= ' />' . planet_constant('MD_BLOG') . ' '; |
202 | 202 | $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"feed\""; |
203 | 203 | if (in_array('feed', $searchin)) { |
204 | - $searchin_select .= ' checked'; |
|
204 | + $searchin_select .= ' checked'; |
|
205 | 205 | } |
206 | 206 | $searchin_select .= ' />' . planet_constant('MD_FEED') . ' '; |
207 | 207 | $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"desc\""; |
208 | 208 | if (in_array('desc', $searchin)) { |
209 | - $searchin_select .= ' checked'; |
|
209 | + $searchin_select .= ' checked'; |
|
210 | 210 | } |
211 | 211 | $searchin_select .= ' />' . planet_constant('MD_DESC') . ' '; |
212 | 212 | $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"all\""; |
213 | 213 | if (empty($searchin)) { |
214 | - $searchin_select .= ' checked'; |
|
214 | + $searchin_select .= ' checked'; |
|
215 | 215 | } |
216 | 216 | $searchin_select .= ' />' . _ALL . ' '; |
217 | 217 | |
@@ -219,28 +219,28 @@ discard block |
||
219 | 219 | $sortby_select = "<select name=\"sortby\">"; |
220 | 220 | $sortby_select .= "<option value=\"\""; |
221 | 221 | if (empty($sortby)) { |
222 | - $sortby_select .= " selected=\"selected\""; |
|
222 | + $sortby_select .= " selected=\"selected\""; |
|
223 | 223 | } |
224 | 224 | $sortby_select .= '>' . _NONE . '</option>'; |
225 | 225 | $sortby_select .= "<option value=\"a.art_time\""; |
226 | 226 | if ('a.art_time' === $sortby) { |
227 | - $sortby_select .= " selected=\"selected\""; |
|
227 | + $sortby_select .= " selected=\"selected\""; |
|
228 | 228 | } |
229 | 229 | $sortby_select .= '>' . planet_constant('MD_TIME') . '</option>'; |
230 | 230 | $sortby_select .= "<option value=\"a.art_title\""; |
231 | 231 | if ('a.art_title' === $sortby) { |
232 | - $sortby_select .= " selected=\"selected\""; |
|
232 | + $sortby_select .= " selected=\"selected\""; |
|
233 | 233 | } |
234 | 234 | $sortby_select .= '>' . planet_constant('MD_TITLE') . '</option>'; |
235 | 235 | $sortby_select .= "<option value=\"\"> ---- </option>"; |
236 | 236 | $sortby_select .= "<option value=\"a.blog_title\""; |
237 | 237 | if ('a.blog_title' === $sortby) { |
238 | - $sortby_select .= " selected=\"selected\""; |
|
238 | + $sortby_select .= " selected=\"selected\""; |
|
239 | 239 | } |
240 | 240 | $sortby_select .= '>' . planet_constant('MD_BLOG') . '</option>'; |
241 | 241 | $sortby_select .= "<option value=\"a.blog_time\""; |
242 | 242 | if ('b.blog_time' === $sortby) { |
243 | - $sortby_select .= " selected=\"selected\""; |
|
243 | + $sortby_select .= " selected=\"selected\""; |
|
244 | 244 | } |
245 | 245 | $sortby_select .= '>' . planet_constant('MD_UPDATE') . '</option>'; |
246 | 246 | $sortby_select .= '</select>'; |
@@ -257,7 +257,7 @@ discard block |
||
257 | 257 | $xoopsTpl->assign('uid', $uid); |
258 | 258 | |
259 | 259 | if ($xoopsConfigSearch['keyword_min'] > 0) { |
260 | - $xoopsTpl->assign('search_rule', sprintf(_SR_KEYIGNORE, $xoopsConfigSearch['keyword_min'])); |
|
260 | + $xoopsTpl->assign('search_rule', sprintf(_SR_KEYIGNORE, $xoopsConfigSearch['keyword_min'])); |
|
261 | 261 | } |
262 | 262 | |
263 | 263 | include XOOPS_ROOT_PATH . '/footer.php'; |
@@ -26,28 +26,28 @@ discard block |
||
26 | 26 | // ------------------------------------------------------------------------ // |
27 | 27 | |
28 | 28 | $xoopsOption['pagetype'] = 'search'; |
29 | -include __DIR__ . '/header.php'; |
|
29 | +include __DIR__.'/header.php'; |
|
30 | 30 | $xoopsModule->loadLanguage('main'); |
31 | 31 | $config_handler = xoops_getHandler('config'); |
32 | -$xoopsConfigSearch =& $config_handler->getConfigsByCat(XOOPS_CONF_SEARCH); |
|
32 | +$xoopsConfigSearch = & $config_handler->getConfigsByCat(XOOPS_CONF_SEARCH); |
|
33 | 33 | if (empty($xoopsConfigSearch['enable_search'])) { |
34 | - redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php', 2, planet_constant('MD_NOACCESS')); |
|
34 | + redirect_header(XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php', 2, planet_constant('MD_NOACCESS')); |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | $xoopsConfig['module_cache'][$xoopsModule->getVar('mid')] = 0; |
38 | 38 | $xoopsOption['template_main'] = planet_getTemplate('search'); |
39 | -include XOOPS_ROOT_PATH . '/header.php'; |
|
40 | -include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php'; |
|
39 | +include XOOPS_ROOT_PATH.'/header.php'; |
|
40 | +include XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/include/vars.php'; |
|
41 | 41 | |
42 | -include_once XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/include/search.inc.php'; |
|
42 | +include_once XOOPS_ROOT_PATH.'/modules/'.$GLOBALS['moddirname'].'/include/search.inc.php'; |
|
43 | 43 | $limit = $xoopsModuleConfig['articles_perpage']; |
44 | 44 | |
45 | 45 | $queries = array(); |
46 | 46 | $andor = isset($_POST['andor']) ? $_POST['andor'] : (isset($_GET['andor']) ? $_GET['andor'] : ''); |
47 | 47 | $start = isset($_GET['start']) ? $_GET['start'] : 0; |
48 | -$category = (int)(isset($_POST['category']) ? $_POST['category'] : (isset($_GET['category']) ? $_GET['category'] : null)); |
|
49 | -$blog = (int)(isset($_POST['blog']) ? $_POST['blog'] : (isset($_GET['blog']) ? $_GET['blog'] : null)); |
|
50 | -$uid = (int)(isset($_POST['uid']) ? $_POST['uid'] : (isset($_GET['uid']) ? $_GET['uid'] : null)); |
|
48 | +$category = (int) (isset($_POST['category']) ? $_POST['category'] : (isset($_GET['category']) ? $_GET['category'] : null)); |
|
49 | +$blog = (int) (isset($_POST['blog']) ? $_POST['blog'] : (isset($_GET['blog']) ? $_GET['blog'] : null)); |
|
50 | +$uid = (int) (isset($_POST['uid']) ? $_POST['uid'] : (isset($_GET['uid']) ? $_GET['uid'] : null)); |
|
51 | 51 | $searchin = isset($_POST['searchin']) ? $_POST['searchin'] : (isset($_GET['searchin']) ? explode('|', |
52 | 52 | $_GET['searchin']) : array()); |
53 | 53 | $sortby = isset($_POST['sortby']) ? $_POST['sortby'] : (isset($_GET['sortby']) ? $_GET['sortby'] : null); |
@@ -79,19 +79,19 @@ discard block |
||
79 | 79 | $temp_queries = preg_split("/[\s,]+/", $query); |
80 | 80 | foreach ($temp_queries as $q) { |
81 | 81 | $q = trim($q); |
82 | - if (strlen($q) >= $xoopsConfigSearch['keyword_min']) { |
|
82 | + if (strlen($q)>=$xoopsConfigSearch['keyword_min']) { |
|
83 | 83 | $queries[] = $myts->addSlashes($q); |
84 | - } else { |
|
84 | + }else { |
|
85 | 85 | $ignored_queries[] = $myts->addSlashes($q); |
86 | 86 | } |
87 | 87 | } |
88 | 88 | if (count($queries) == 0) { |
89 | - redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php', 2, |
|
89 | + redirect_header(XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/search.php', 2, |
|
90 | 90 | sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min'])); |
91 | 91 | } |
92 | - } else { |
|
93 | - if (strlen($query) < $xoopsConfigSearch['keyword_min']) { |
|
94 | - redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php', 2, |
|
92 | + }else { |
|
93 | + if (strlen($query)<$xoopsConfigSearch['keyword_min']) { |
|
94 | + redirect_header(XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/search.php', 2, |
|
95 | 95 | sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min'])); |
96 | 96 | } |
97 | 97 | $queries = array($myts->addSlashes($query)); |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | */ |
106 | 106 | if (!empty($time)) { |
107 | 107 | $extra = ''; |
108 | - } else { |
|
108 | + }else { |
|
109 | 109 | $extra = ''; |
110 | 110 | } |
111 | 111 | |
@@ -119,20 +119,20 @@ discard block |
||
119 | 119 | { |
120 | 120 | $xoopsTpl->assign('results', $results); |
121 | 121 | |
122 | - if (count($next_search) > 0) { |
|
122 | + if (count($next_search)>0) { |
|
123 | 123 | $items = array(); |
124 | 124 | foreach ($next_search as $para => $val) { |
125 | 125 | if (!empty($val)) { |
126 | 126 | $items[] = "$para=$val"; |
127 | 127 | } |
128 | 128 | } |
129 | - if (count($items) > 0) { |
|
129 | + if (count($items)>0) { |
|
130 | 130 | $paras = implode('&', $items); |
131 | 131 | } |
132 | 132 | unset($next_search); |
133 | 133 | unset($items); |
134 | 134 | } |
135 | - $search_url = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php?' . $paras; |
|
135 | + $search_url = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/search.php?'.$paras; |
|
136 | 136 | |
137 | 137 | /* |
138 | 138 | $next_results =& planet_search($queries, $andor, 1, $start + $limit, $uid, $category, $sortby, $searchin, $extra); |
@@ -144,22 +144,22 @@ discard block |
||
144 | 144 | if (false != $has_next) |
145 | 145 | */ |
146 | 146 | if (count($results)) { |
147 | - $next = $start + $limit; |
|
147 | + $next = $start+$limit; |
|
148 | 148 | $queries = implode(',', $queries); |
149 | - $search_url_next = $search_url . "&start=$next"; |
|
150 | - $search_next = "<a href=\"" . htmlspecialchars($search_url_next) . "\">" . _SR_NEXT . '</a>'; |
|
149 | + $search_url_next = $search_url."&start=$next"; |
|
150 | + $search_next = "<a href=\"".htmlspecialchars($search_url_next)."\">"._SR_NEXT.'</a>'; |
|
151 | 151 | $xoopsTpl->assign('search_next', $search_next); |
152 | 152 | } |
153 | - if ($start > 0) { |
|
154 | - $prev = $start - $limit; |
|
155 | - $search_url_prev = $search_url . "&start=$prev"; |
|
156 | - $search_prev = "<a href=\"" . htmlspecialchars($search_url_prev) . "\">" . _SR_PREVIOUS . '</a>'; |
|
153 | + if ($start>0) { |
|
154 | + $prev = $start-$limit; |
|
155 | + $search_url_prev = $search_url."&start=$prev"; |
|
156 | + $search_prev = "<a href=\"".htmlspecialchars($search_url_prev)."\">"._SR_PREVIOUS.'</a>'; |
|
157 | 157 | $xoopsTpl->assign('search_prev', $search_prev); |
158 | 158 | } |
159 | 159 | } |
160 | 160 | |
161 | 161 | unset($results); |
162 | - $search_info = _SR_KEYWORDS . ': ' . $myts->htmlSpecialChars($term); |
|
162 | + $search_info = _SR_KEYWORDS.': '.$myts->htmlSpecialChars($term); |
|
163 | 163 | $xoopsTpl->assign('search_info', $search_info); |
164 | 164 | } |
165 | 165 | |
@@ -169,17 +169,17 @@ discard block |
||
169 | 169 | if ('OR' === $andor) { |
170 | 170 | $type_select .= " selected=\"selected\""; |
171 | 171 | } |
172 | -$type_select .= '>' . _SR_ANY . '</option>'; |
|
172 | +$type_select .= '>'._SR_ANY.'</option>'; |
|
173 | 173 | $type_select .= "<option value=\"AND\""; |
174 | 174 | if ('AND' === $andor) { |
175 | 175 | $type_select .= " selected=\"selected\""; |
176 | 176 | } |
177 | -$type_select .= '>' . _SR_ALL . '</option>'; |
|
177 | +$type_select .= '>'._SR_ALL.'</option>'; |
|
178 | 178 | $type_select .= "<option value=\"EXACT\""; |
179 | 179 | if ('exact' === $andor) { |
180 | 180 | $type_select .= " selected=\"selected\""; |
181 | 181 | } |
182 | -$type_select .= '>' . _SR_EXACT . '</option>'; |
|
182 | +$type_select .= '>'._SR_EXACT.'</option>'; |
|
183 | 183 | $type_select .= '</select>'; |
184 | 184 | |
185 | 185 | /* scope */ |
@@ -188,32 +188,32 @@ discard block |
||
188 | 188 | if (in_array('title', $searchin)) { |
189 | 189 | $searchin_select .= ' checked'; |
190 | 190 | } |
191 | -$searchin_select .= ' />' . planet_constant('MD_TITLE') . ' '; |
|
191 | +$searchin_select .= ' />'.planet_constant('MD_TITLE').' '; |
|
192 | 192 | $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"text\""; |
193 | 193 | if (in_array('text', $searchin)) { |
194 | 194 | $searchin_select .= ' checked'; |
195 | 195 | } |
196 | -$searchin_select .= ' />' . planet_constant('MD_BODY') . ' || '; |
|
196 | +$searchin_select .= ' />'.planet_constant('MD_BODY').' || '; |
|
197 | 197 | $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"blog\""; |
198 | 198 | if (in_array('blog', $searchin)) { |
199 | 199 | $searchin_select .= ' checked'; |
200 | 200 | } |
201 | -$searchin_select .= ' />' . planet_constant('MD_BLOG') . ' '; |
|
201 | +$searchin_select .= ' />'.planet_constant('MD_BLOG').' '; |
|
202 | 202 | $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"feed\""; |
203 | 203 | if (in_array('feed', $searchin)) { |
204 | 204 | $searchin_select .= ' checked'; |
205 | 205 | } |
206 | -$searchin_select .= ' />' . planet_constant('MD_FEED') . ' '; |
|
206 | +$searchin_select .= ' />'.planet_constant('MD_FEED').' '; |
|
207 | 207 | $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"desc\""; |
208 | 208 | if (in_array('desc', $searchin)) { |
209 | 209 | $searchin_select .= ' checked'; |
210 | 210 | } |
211 | -$searchin_select .= ' />' . planet_constant('MD_DESC') . ' '; |
|
211 | +$searchin_select .= ' />'.planet_constant('MD_DESC').' '; |
|
212 | 212 | $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"all\""; |
213 | 213 | if (empty($searchin)) { |
214 | 214 | $searchin_select .= ' checked'; |
215 | 215 | } |
216 | -$searchin_select .= ' />' . _ALL . ' '; |
|
216 | +$searchin_select .= ' />'._ALL.' '; |
|
217 | 217 | |
218 | 218 | /* sortby */ |
219 | 219 | $sortby_select = "<select name=\"sortby\">"; |
@@ -221,28 +221,28 @@ discard block |
||
221 | 221 | if (empty($sortby)) { |
222 | 222 | $sortby_select .= " selected=\"selected\""; |
223 | 223 | } |
224 | -$sortby_select .= '>' . _NONE . '</option>'; |
|
224 | +$sortby_select .= '>'._NONE.'</option>'; |
|
225 | 225 | $sortby_select .= "<option value=\"a.art_time\""; |
226 | 226 | if ('a.art_time' === $sortby) { |
227 | 227 | $sortby_select .= " selected=\"selected\""; |
228 | 228 | } |
229 | -$sortby_select .= '>' . planet_constant('MD_TIME') . '</option>'; |
|
229 | +$sortby_select .= '>'.planet_constant('MD_TIME').'</option>'; |
|
230 | 230 | $sortby_select .= "<option value=\"a.art_title\""; |
231 | 231 | if ('a.art_title' === $sortby) { |
232 | 232 | $sortby_select .= " selected=\"selected\""; |
233 | 233 | } |
234 | -$sortby_select .= '>' . planet_constant('MD_TITLE') . '</option>'; |
|
234 | +$sortby_select .= '>'.planet_constant('MD_TITLE').'</option>'; |
|
235 | 235 | $sortby_select .= "<option value=\"\"> ---- </option>"; |
236 | 236 | $sortby_select .= "<option value=\"a.blog_title\""; |
237 | 237 | if ('a.blog_title' === $sortby) { |
238 | 238 | $sortby_select .= " selected=\"selected\""; |
239 | 239 | } |
240 | -$sortby_select .= '>' . planet_constant('MD_BLOG') . '</option>'; |
|
240 | +$sortby_select .= '>'.planet_constant('MD_BLOG').'</option>'; |
|
241 | 241 | $sortby_select .= "<option value=\"a.blog_time\""; |
242 | 242 | if ('b.blog_time' === $sortby) { |
243 | 243 | $sortby_select .= " selected=\"selected\""; |
244 | 244 | } |
245 | -$sortby_select .= '>' . planet_constant('MD_UPDATE') . '</option>'; |
|
245 | +$sortby_select .= '>'.planet_constant('MD_UPDATE').'</option>'; |
|
246 | 246 | $sortby_select .= '</select>'; |
247 | 247 | |
248 | 248 | $xoopsTpl->assign('type_select', $type_select); |
@@ -256,8 +256,8 @@ discard block |
||
256 | 256 | $xoopsTpl->assign('blog', $blog); |
257 | 257 | $xoopsTpl->assign('uid', $uid); |
258 | 258 | |
259 | -if ($xoopsConfigSearch['keyword_min'] > 0) { |
|
259 | +if ($xoopsConfigSearch['keyword_min']>0) { |
|
260 | 260 | $xoopsTpl->assign('search_rule', sprintf(_SR_KEYIGNORE, $xoopsConfigSearch['keyword_min'])); |
261 | 261 | } |
262 | 262 | |
263 | -include XOOPS_ROOT_PATH . '/footer.php'; |
|
263 | +include XOOPS_ROOT_PATH.'/footer.php'; |
@@ -25,4 +25,4 @@ |
||
25 | 25 | // Project: Article Project // |
26 | 26 | // ------------------------------------------------------------------------ // |
27 | 27 | |
28 | -include_once XOOPS_ROOT_PATH . '/footer.php'; |
|
28 | +include_once XOOPS_ROOT_PATH.'/footer.php'; |
@@ -30,14 +30,14 @@ discard block |
||
30 | 30 | include __DIR__ . '/include/vars.php'; |
31 | 31 | |
32 | 32 | $modversion = array( |
33 | - 'name' => planet_constant('MI_NAME'), |
|
34 | - 'version' => 2.10, |
|
35 | - 'description' => planet_constant('MI_DESC'), |
|
36 | - 'credits' => 'XOOPS Project', |
|
37 | - 'image' => 'assets/images/logoModule.png', |
|
38 | - 'dirname' => $GLOBALS['moddirname'], |
|
39 | - 'author' => 'D.J. (phppp)', |
|
40 | - 'help' => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/readme.html' |
|
33 | + 'name' => planet_constant('MI_NAME'), |
|
34 | + 'version' => 2.10, |
|
35 | + 'description' => planet_constant('MI_DESC'), |
|
36 | + 'credits' => 'XOOPS Project', |
|
37 | + 'image' => 'assets/images/logoModule.png', |
|
38 | + 'dirname' => $GLOBALS['moddirname'], |
|
39 | + 'author' => 'D.J. (phppp)', |
|
40 | + 'help' => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/readme.html' |
|
41 | 41 | ); |
42 | 42 | $modversion['help'] = 'page=help'; |
43 | 43 | $modversion['license'] = 'GNU see LICENSE'; |
@@ -57,19 +57,19 @@ discard block |
||
57 | 57 | $modversion['min_xoops'] = '2.5.8'; |
58 | 58 | $modversion['min_admin'] = '1.2'; |
59 | 59 | $modversion['min_db'] = array( |
60 | - 'mysql' => '5.0.7', |
|
61 | - 'mysqli' => '5.0.7' |
|
60 | + 'mysql' => '5.0.7', |
|
61 | + 'mysqli' => '5.0.7' |
|
62 | 62 | ); |
63 | 63 | |
64 | 64 | // database tables |
65 | 65 | $modversion['sqlfile']['mysql'] = 'sql/mysql.sql'; |
66 | 66 | $modversion['tables'] = array( |
67 | - $GLOBALS['MOD_DB_PREFIX'] . '_category', |
|
68 | - $GLOBALS['MOD_DB_PREFIX'] . '_article', |
|
69 | - $GLOBALS['MOD_DB_PREFIX'] . '_blog', |
|
70 | - $GLOBALS['MOD_DB_PREFIX'] . '_blogcat', |
|
71 | - $GLOBALS['MOD_DB_PREFIX'] . '_bookmark', |
|
72 | - $GLOBALS['MOD_DB_PREFIX'] . '_rate' |
|
67 | + $GLOBALS['MOD_DB_PREFIX'] . '_category', |
|
68 | + $GLOBALS['MOD_DB_PREFIX'] . '_article', |
|
69 | + $GLOBALS['MOD_DB_PREFIX'] . '_blog', |
|
70 | + $GLOBALS['MOD_DB_PREFIX'] . '_blogcat', |
|
71 | + $GLOBALS['MOD_DB_PREFIX'] . '_bookmark', |
|
72 | + $GLOBALS['MOD_DB_PREFIX'] . '_rate' |
|
73 | 73 | ); |
74 | 74 | |
75 | 75 | // Admin things |
@@ -151,162 +151,162 @@ discard block |
||
151 | 151 | // Configs |
152 | 152 | // Config items |
153 | 153 | $modversion['config'][] = array( |
154 | - 'name' => 'do_debug', |
|
155 | - 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_DODEBUG', |
|
156 | - 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_DODEBUG_DESC', |
|
157 | - 'formtype' => 'yesno', |
|
158 | - 'valuetype' => 'int', |
|
159 | - 'default' => 1 |
|
154 | + 'name' => 'do_debug', |
|
155 | + 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_DODEBUG', |
|
156 | + 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_DODEBUG_DESC', |
|
157 | + 'formtype' => 'yesno', |
|
158 | + 'valuetype' => 'int', |
|
159 | + 'default' => 1 |
|
160 | 160 | ); |
161 | 161 | |
162 | 162 | $modversion['config'][] = array( |
163 | - 'name' => 'do_urw', |
|
164 | - 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_DOURLREWRITE', |
|
165 | - 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_DOURLREWRITE_DESC', |
|
166 | - 'formtype' => 'yesno', |
|
167 | - 'valuetype' => 'int', |
|
168 | - 'default' => in_array(php_sapi_name(), array('apache', 'apache2handler')) |
|
163 | + 'name' => 'do_urw', |
|
164 | + 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_DOURLREWRITE', |
|
165 | + 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_DOURLREWRITE_DESC', |
|
166 | + 'formtype' => 'yesno', |
|
167 | + 'valuetype' => 'int', |
|
168 | + 'default' => in_array(php_sapi_name(), array('apache', 'apache2handler')) |
|
169 | 169 | ); |
170 | 170 | |
171 | 171 | $modversion['config'][] = array( |
172 | - 'name' => 'theme_set', |
|
173 | - 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_THEMESET', |
|
174 | - 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_THEMESET_DESC', |
|
175 | - 'formtype' => 'select', |
|
176 | - 'valuetype' => 'text', |
|
177 | - 'options' => array(_NONE => '0'), |
|
178 | - 'default' => '' |
|
172 | + 'name' => 'theme_set', |
|
173 | + 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_THEMESET', |
|
174 | + 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_THEMESET_DESC', |
|
175 | + 'formtype' => 'select', |
|
176 | + 'valuetype' => 'text', |
|
177 | + 'options' => array(_NONE => '0'), |
|
178 | + 'default' => '' |
|
179 | 179 | ); |
180 | 180 | |
181 | 181 | $modversion['config'][] = array( |
182 | - 'name' => 'timeformat', |
|
183 | - 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_TIMEFORMAT', |
|
184 | - 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_TIMEFORMAT_DESC', |
|
185 | - 'formtype' => 'select', |
|
186 | - 'valuetype' => 'text', |
|
187 | - 'options' => array( |
|
188 | - _DATESTRING => 'l', |
|
189 | - _MEDIUMDATESTRING => 'm', |
|
190 | - _SHORTDATESTRING => 's', |
|
191 | - $GLOBALS['VAR_PREFIXU'] . '_MI_TIMEFORMAT_CUSTOM' => 'c' |
|
192 | - ), |
|
193 | - 'default' => 'c' |
|
182 | + 'name' => 'timeformat', |
|
183 | + 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_TIMEFORMAT', |
|
184 | + 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_TIMEFORMAT_DESC', |
|
185 | + 'formtype' => 'select', |
|
186 | + 'valuetype' => 'text', |
|
187 | + 'options' => array( |
|
188 | + _DATESTRING => 'l', |
|
189 | + _MEDIUMDATESTRING => 'm', |
|
190 | + _SHORTDATESTRING => 's', |
|
191 | + $GLOBALS['VAR_PREFIXU'] . '_MI_TIMEFORMAT_CUSTOM' => 'c' |
|
192 | + ), |
|
193 | + 'default' => 'c' |
|
194 | 194 | ); |
195 | 195 | |
196 | 196 | $modversion['config'][] = array( |
197 | - 'name' => 'articles_perpage', |
|
198 | - 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLESPERPAGE', |
|
199 | - 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLESPERPAGE_DESC', |
|
200 | - 'formtype' => 'textbox', |
|
201 | - 'valuetype' => 'int', |
|
202 | - 'default' => 10 |
|
197 | + 'name' => 'articles_perpage', |
|
198 | + 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLESPERPAGE', |
|
199 | + 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLESPERPAGE_DESC', |
|
200 | + 'formtype' => 'textbox', |
|
201 | + 'valuetype' => 'int', |
|
202 | + 'default' => 10 |
|
203 | 203 | ); |
204 | 204 | |
205 | 205 | $modversion['config'][] = array( |
206 | - 'name' => 'list_perpage', |
|
207 | - 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_LISTPERPAGE', |
|
208 | - 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_LISTPERPAGE_DESC', |
|
209 | - 'formtype' => 'textbox', |
|
210 | - 'valuetype' => 'int', |
|
211 | - 'default' => 20 |
|
206 | + 'name' => 'list_perpage', |
|
207 | + 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_LISTPERPAGE', |
|
208 | + 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_LISTPERPAGE_DESC', |
|
209 | + 'formtype' => 'textbox', |
|
210 | + 'valuetype' => 'int', |
|
211 | + 'default' => 20 |
|
212 | 212 | ); |
213 | 213 | |
214 | 214 | $modversion['config'][] = array( |
215 | - 'name' => 'blogs_perupdate', |
|
216 | - 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_BLOGSPERUPDATE', |
|
217 | - 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_BLOGSPERUPDATE_DESC', |
|
218 | - 'formtype' => 'textbox', |
|
219 | - 'valuetype' => 'int', |
|
220 | - 'default' => 10 |
|
215 | + 'name' => 'blogs_perupdate', |
|
216 | + 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_BLOGSPERUPDATE', |
|
217 | + 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_BLOGSPERUPDATE_DESC', |
|
218 | + 'formtype' => 'textbox', |
|
219 | + 'valuetype' => 'int', |
|
220 | + 'default' => 10 |
|
221 | 221 | ); |
222 | 222 | |
223 | 223 | $modversion['config'][] = array( |
224 | - 'name' => 'article_expire', |
|
225 | - 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLE_EXPIRE', |
|
226 | - 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLE_EXPIRE_DESC', |
|
227 | - 'formtype' => 'textbox', |
|
228 | - 'valuetype' => 'int', |
|
229 | - 'default' => 30 |
|
224 | + 'name' => 'article_expire', |
|
225 | + 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLE_EXPIRE', |
|
226 | + 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLE_EXPIRE_DESC', |
|
227 | + 'formtype' => 'textbox', |
|
228 | + 'valuetype' => 'int', |
|
229 | + 'default' => 30 |
|
230 | 230 | ); |
231 | 231 | |
232 | 232 | $modversion['config'][] = array( |
233 | - 'name' => 'display_summary', |
|
234 | - 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_DISPLAY_SUMMARY', |
|
235 | - 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_DISPLAY_SUMMARY_DESC', |
|
236 | - 'formtype' => 'textbox', |
|
237 | - 'valuetype' => 'int', |
|
238 | - 'default' => 0 |
|
233 | + 'name' => 'display_summary', |
|
234 | + 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_DISPLAY_SUMMARY', |
|
235 | + 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_DISPLAY_SUMMARY_DESC', |
|
236 | + 'formtype' => 'textbox', |
|
237 | + 'valuetype' => 'int', |
|
238 | + 'default' => 0 |
|
239 | 239 | ); |
240 | 240 | |
241 | 241 | $modversion['config'][] = array( |
242 | - 'name' => 'do_sibling', |
|
243 | - 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_DOSIBLING', |
|
244 | - 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_DOSIBLING_DESC', |
|
245 | - 'formtype' => 'yesno', |
|
246 | - 'valuetype' => 'int', |
|
247 | - 'default' => 1 |
|
242 | + 'name' => 'do_sibling', |
|
243 | + 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_DOSIBLING', |
|
244 | + 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_DOSIBLING_DESC', |
|
245 | + 'formtype' => 'yesno', |
|
246 | + 'valuetype' => 'int', |
|
247 | + 'default' => 1 |
|
248 | 248 | ); |
249 | 249 | |
250 | 250 | $modversion['config'][] = array( |
251 | - 'name' => 'pings', |
|
252 | - 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_PING', |
|
253 | - 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_PING_DESC', |
|
254 | - 'formtype' => 'textarea', |
|
255 | - 'valuetype' => 'text', |
|
256 | - 'default' => '' |
|
251 | + 'name' => 'pings', |
|
252 | + 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_PING', |
|
253 | + 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_PING_DESC', |
|
254 | + 'formtype' => 'textarea', |
|
255 | + 'valuetype' => 'text', |
|
256 | + 'default' => '' |
|
257 | 257 | ); |
258 | 258 | |
259 | 259 | $modversion['config'][] = array( |
260 | - 'name' => 'trackback_option', |
|
261 | - 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_TRACKBACK_OPTION', |
|
262 | - 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_TRACKBACK_OPTION_DESC', |
|
263 | - 'formtype' => 'select', |
|
264 | - 'valuetype' => 'int', |
|
265 | - 'default' => 0, |
|
266 | - 'options' => array(planet_constant('MI_MODERATION') => 0, _ALL => 1, _NONE => 2) |
|
260 | + 'name' => 'trackback_option', |
|
261 | + 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_TRACKBACK_OPTION', |
|
262 | + 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_TRACKBACK_OPTION_DESC', |
|
263 | + 'formtype' => 'select', |
|
264 | + 'valuetype' => 'int', |
|
265 | + 'default' => 0, |
|
266 | + 'options' => array(planet_constant('MI_MODERATION') => 0, _ALL => 1, _NONE => 2) |
|
267 | 267 | ); |
268 | 268 | |
269 | 269 | $modversion['config'][] = array( |
270 | - 'name' => 'copyright', |
|
271 | - 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_COPYRIGHT', |
|
272 | - 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_COPYRIGHT_DESC', |
|
273 | - 'formtype' => 'textbox', |
|
274 | - 'valuetype' => 'text', |
|
275 | - 'default' => 'Copyright© %s & ' . $xoopsConfig['sitename'] |
|
270 | + 'name' => 'copyright', |
|
271 | + 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_COPYRIGHT', |
|
272 | + 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_COPYRIGHT_DESC', |
|
273 | + 'formtype' => 'textbox', |
|
274 | + 'valuetype' => 'text', |
|
275 | + 'default' => 'Copyright© %s & ' . $xoopsConfig['sitename'] |
|
276 | 276 | ); |
277 | 277 | |
278 | 278 | $modversion['config'][] = array( |
279 | - 'name' => 'newblog_submit', |
|
280 | - 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_NEWBLOG_SUBMIT', |
|
281 | - 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_NEWBLOG_SUBMIT_DESC', |
|
282 | - 'formtype' => 'select', |
|
283 | - 'valuetype' => 'int', |
|
284 | - 'default' => 2, |
|
285 | - 'options' => array( |
|
286 | - _NONE => 0, |
|
287 | - planet_constant('MI_MODERATION') => 1, |
|
288 | - planet_constant('MI_MEMBER') => 2, |
|
289 | - _ALL => 3 |
|
290 | - ) |
|
291 | - // 0 - Only admin; 1 - all but need approval; 2 - members auto approved; 3 - all |
|
279 | + 'name' => 'newblog_submit', |
|
280 | + 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_NEWBLOG_SUBMIT', |
|
281 | + 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_NEWBLOG_SUBMIT_DESC', |
|
282 | + 'formtype' => 'select', |
|
283 | + 'valuetype' => 'int', |
|
284 | + 'default' => 2, |
|
285 | + 'options' => array( |
|
286 | + _NONE => 0, |
|
287 | + planet_constant('MI_MODERATION') => 1, |
|
288 | + planet_constant('MI_MEMBER') => 2, |
|
289 | + _ALL => 3 |
|
290 | + ) |
|
291 | + // 0 - Only admin; 1 - all but need approval; 2 - members auto approved; 3 - all |
|
292 | 292 | ); |
293 | 293 | |
294 | 294 | $modversion['config'][] = array( |
295 | - 'name' => 'anonymous_rate', |
|
296 | - 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_ANONYMOUSRATE', |
|
297 | - 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_ANONYMOUSRATE_DESC', |
|
298 | - 'formtype' => 'yesno', |
|
299 | - 'valuetype' => 'int', |
|
300 | - 'default' => 0 |
|
295 | + 'name' => 'anonymous_rate', |
|
296 | + 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_ANONYMOUSRATE', |
|
297 | + 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_ANONYMOUSRATE_DESC', |
|
298 | + 'formtype' => 'yesno', |
|
299 | + 'valuetype' => 'int', |
|
300 | + 'default' => 0 |
|
301 | 301 | ); |
302 | 302 | |
303 | 303 | $modversion['config'][] = array( |
304 | - 'name' => 'do_pseudocron', |
|
305 | - 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_PSEUDOCRON', |
|
306 | - 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_PSEUDOCRON_DESC', |
|
307 | - 'formtype' => 'yesno', |
|
308 | - 'valuetype' => 'int', |
|
309 | - 'default' => 1 |
|
304 | + 'name' => 'do_pseudocron', |
|
305 | + 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_PSEUDOCRON', |
|
306 | + 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_PSEUDOCRON_DESC', |
|
307 | + 'formtype' => 'yesno', |
|
308 | + 'valuetype' => 'int', |
|
309 | + 'default' => 1 |
|
310 | 310 | ); |
311 | 311 | |
312 | 312 | // Notification |
@@ -27,9 +27,9 @@ discard block |
||
27 | 27 | |
28 | 28 | // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined'); |
29 | 29 | |
30 | -include __DIR__ . '/include/vars.php'; |
|
30 | +include __DIR__.'/include/vars.php'; |
|
31 | 31 | |
32 | -$modversion = array( |
|
32 | +$modversion = array( |
|
33 | 33 | 'name' => planet_constant('MI_NAME'), |
34 | 34 | 'version' => 2.10, |
35 | 35 | 'description' => planet_constant('MI_DESC'), |
@@ -37,11 +37,11 @@ discard block |
||
37 | 37 | 'image' => 'assets/images/logoModule.png', |
38 | 38 | 'dirname' => $GLOBALS['moddirname'], |
39 | 39 | 'author' => 'D.J. (phppp)', |
40 | - 'help' => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/readme.html' |
|
40 | + 'help' => XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/readme.html' |
|
41 | 41 | ); |
42 | 42 | $modversion['help'] = 'page=help'; |
43 | 43 | $modversion['license'] = 'GNU see LICENSE'; |
44 | -$modversion['license_file'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/gpl.txt'; |
|
44 | +$modversion['license_file'] = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/gpl.txt'; |
|
45 | 45 | $modversion['author_word'] = ''; |
46 | 46 | $modversion['module_team'] = ''; |
47 | 47 | |
@@ -64,12 +64,12 @@ discard block |
||
64 | 64 | // database tables |
65 | 65 | $modversion['sqlfile']['mysql'] = 'sql/mysql.sql'; |
66 | 66 | $modversion['tables'] = array( |
67 | - $GLOBALS['MOD_DB_PREFIX'] . '_category', |
|
68 | - $GLOBALS['MOD_DB_PREFIX'] . '_article', |
|
69 | - $GLOBALS['MOD_DB_PREFIX'] . '_blog', |
|
70 | - $GLOBALS['MOD_DB_PREFIX'] . '_blogcat', |
|
71 | - $GLOBALS['MOD_DB_PREFIX'] . '_bookmark', |
|
72 | - $GLOBALS['MOD_DB_PREFIX'] . '_rate' |
|
67 | + $GLOBALS['MOD_DB_PREFIX'].'_category', |
|
68 | + $GLOBALS['MOD_DB_PREFIX'].'_article', |
|
69 | + $GLOBALS['MOD_DB_PREFIX'].'_blog', |
|
70 | + $GLOBALS['MOD_DB_PREFIX'].'_blogcat', |
|
71 | + $GLOBALS['MOD_DB_PREFIX'].'_bookmark', |
|
72 | + $GLOBALS['MOD_DB_PREFIX'].'_rate' |
|
73 | 73 | ); |
74 | 74 | |
75 | 75 | // Admin things |
@@ -95,11 +95,11 @@ discard block |
||
95 | 95 | /** |
96 | 96 | * Templates |
97 | 97 | */ |
98 | -$modversion['templates'][] = array('file' => $GLOBALS['VAR_PREFIX'] . '_index.tpl', 'description' => ''); |
|
99 | -$modversion['templates'][] = array('file' => $GLOBALS['VAR_PREFIX'] . '_article.tpl', 'description' => ''); |
|
100 | -$modversion['templates'][] = array('file' => $GLOBALS['VAR_PREFIX'] . '_archive.tpl', 'description' => ''); |
|
101 | -$modversion['templates'][] = array('file' => $GLOBALS['VAR_PREFIX'] . '_blogs.tpl', 'description' => ''); |
|
102 | -$modversion['templates'][] = array('file' => $GLOBALS['VAR_PREFIX'] . '_search.tpl', 'description' => ''); |
|
98 | +$modversion['templates'][] = array('file' => $GLOBALS['VAR_PREFIX'].'_index.tpl', 'description' => ''); |
|
99 | +$modversion['templates'][] = array('file' => $GLOBALS['VAR_PREFIX'].'_article.tpl', 'description' => ''); |
|
100 | +$modversion['templates'][] = array('file' => $GLOBALS['VAR_PREFIX'].'_archive.tpl', 'description' => ''); |
|
101 | +$modversion['templates'][] = array('file' => $GLOBALS['VAR_PREFIX'].'_blogs.tpl', 'description' => ''); |
|
102 | +$modversion['templates'][] = array('file' => $GLOBALS['VAR_PREFIX'].'_search.tpl', 'description' => ''); |
|
103 | 103 | |
104 | 104 | //module css |
105 | 105 | $modversion['css'] = 'templates/style.css'; |
@@ -111,31 +111,31 @@ discard block |
||
111 | 111 | $modversion['blocks'][$i]['file'] = 'block.php'; |
112 | 112 | $modversion['blocks'][$i]['name'] = planet_constant('MI_ARTICLE'); |
113 | 113 | $modversion['blocks'][$i]['description'] = planet_constant('MI_ARTICLE_DESC'); |
114 | -$modversion['blocks'][$i]['show_func'] = $GLOBALS['VAR_PREFIX'] . '_article_show'; |
|
114 | +$modversion['blocks'][$i]['show_func'] = $GLOBALS['VAR_PREFIX'].'_article_show'; |
|
115 | 115 | $modversion['blocks'][$i]['options'] = 'time|10|0|0'; // type|MaxItems|TitleLength|SummaryLength |
116 | -$modversion['blocks'][$i]['edit_func'] = $GLOBALS['VAR_PREFIX'] . '_article_edit'; |
|
117 | -$modversion['blocks'][$i]['template'] = $GLOBALS['VAR_PREFIX'] . '_block_article.tpl'; |
|
116 | +$modversion['blocks'][$i]['edit_func'] = $GLOBALS['VAR_PREFIX'].'_article_edit'; |
|
117 | +$modversion['blocks'][$i]['template'] = $GLOBALS['VAR_PREFIX'].'_block_article.tpl'; |
|
118 | 118 | |
119 | 119 | ++$i; |
120 | 120 | $modversion['blocks'][$i]['file'] = 'block.php'; |
121 | 121 | $modversion['blocks'][$i]['name'] = planet_constant('MI_CATEGORY'); |
122 | 122 | $modversion['blocks'][$i]['description'] = planet_constant('MI_CATEGORY_DESC'); |
123 | -$modversion['blocks'][$i]['show_func'] = $GLOBALS['VAR_PREFIX'] . '_category_show'; |
|
124 | -$modversion['blocks'][$i]['template'] = $GLOBALS['VAR_PREFIX'] . '_block_category.tpl'; |
|
123 | +$modversion['blocks'][$i]['show_func'] = $GLOBALS['VAR_PREFIX'].'_category_show'; |
|
124 | +$modversion['blocks'][$i]['template'] = $GLOBALS['VAR_PREFIX'].'_block_category.tpl'; |
|
125 | 125 | |
126 | 126 | ++$i; |
127 | 127 | $modversion['blocks'][$i]['file'] = 'block.php'; |
128 | 128 | $modversion['blocks'][$i]['name'] = planet_constant('MI_BLOG'); |
129 | 129 | $modversion['blocks'][$i]['description'] = planet_constant('MI_BLOG_DESC'); |
130 | -$modversion['blocks'][$i]['show_func'] = $GLOBALS['VAR_PREFIX'] . '_blog_show'; |
|
130 | +$modversion['blocks'][$i]['show_func'] = $GLOBALS['VAR_PREFIX'].'_blog_show'; |
|
131 | 131 | $modversion['blocks'][$i]['options'] = 'feature|10|0|1'; // type|MaxItems|TitleLength|ShowDesc |
132 | -$modversion['blocks'][$i]['edit_func'] = $GLOBALS['VAR_PREFIX'] . '_blog_edit'; |
|
133 | -$modversion['blocks'][$i]['template'] = $GLOBALS['VAR_PREFIX'] . '_block_blog.tpl'; |
|
132 | +$modversion['blocks'][$i]['edit_func'] = $GLOBALS['VAR_PREFIX'].'_blog_edit'; |
|
133 | +$modversion['blocks'][$i]['template'] = $GLOBALS['VAR_PREFIX'].'_block_blog.tpl'; |
|
134 | 134 | |
135 | 135 | // Search |
136 | 136 | $modversion['hasSearch'] = 1; |
137 | 137 | $modversion['search']['file'] = 'include/search.inc.php'; |
138 | -$modversion['search']['func'] = $GLOBALS['VAR_PREFIX'] . '_search'; |
|
138 | +$modversion['search']['func'] = $GLOBALS['VAR_PREFIX'].'_search'; |
|
139 | 139 | |
140 | 140 | // Comments |
141 | 141 | $modversion['hasComments'] = 1; |
@@ -145,15 +145,15 @@ discard block |
||
145 | 145 | |
146 | 146 | // Comment callback functions |
147 | 147 | $modversion['comments']['callbackFile'] = 'include/comment.inc.php'; |
148 | -$modversion['comments']['callback']['approve'] = $GLOBALS['VAR_PREFIX'] . '_com_approve'; |
|
149 | -$modversion['comments']['callback']['update'] = $GLOBALS['VAR_PREFIX'] . '_com_update'; |
|
148 | +$modversion['comments']['callback']['approve'] = $GLOBALS['VAR_PREFIX'].'_com_approve'; |
|
149 | +$modversion['comments']['callback']['update'] = $GLOBALS['VAR_PREFIX'].'_com_update'; |
|
150 | 150 | |
151 | 151 | // Configs |
152 | 152 | // Config items |
153 | 153 | $modversion['config'][] = array( |
154 | 154 | 'name' => 'do_debug', |
155 | - 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_DODEBUG', |
|
156 | - 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_DODEBUG_DESC', |
|
155 | + 'title' => $GLOBALS['VAR_PREFIXU'].'_MI_DODEBUG', |
|
156 | + 'description' => $GLOBALS['VAR_PREFIXU'].'_MI_DODEBUG_DESC', |
|
157 | 157 | 'formtype' => 'yesno', |
158 | 158 | 'valuetype' => 'int', |
159 | 159 | 'default' => 1 |
@@ -161,8 +161,8 @@ discard block |
||
161 | 161 | |
162 | 162 | $modversion['config'][] = array( |
163 | 163 | 'name' => 'do_urw', |
164 | - 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_DOURLREWRITE', |
|
165 | - 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_DOURLREWRITE_DESC', |
|
164 | + 'title' => $GLOBALS['VAR_PREFIXU'].'_MI_DOURLREWRITE', |
|
165 | + 'description' => $GLOBALS['VAR_PREFIXU'].'_MI_DOURLREWRITE_DESC', |
|
166 | 166 | 'formtype' => 'yesno', |
167 | 167 | 'valuetype' => 'int', |
168 | 168 | 'default' => in_array(php_sapi_name(), array('apache', 'apache2handler')) |
@@ -170,8 +170,8 @@ discard block |
||
170 | 170 | |
171 | 171 | $modversion['config'][] = array( |
172 | 172 | 'name' => 'theme_set', |
173 | - 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_THEMESET', |
|
174 | - 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_THEMESET_DESC', |
|
173 | + 'title' => $GLOBALS['VAR_PREFIXU'].'_MI_THEMESET', |
|
174 | + 'description' => $GLOBALS['VAR_PREFIXU'].'_MI_THEMESET_DESC', |
|
175 | 175 | 'formtype' => 'select', |
176 | 176 | 'valuetype' => 'text', |
177 | 177 | 'options' => array(_NONE => '0'), |
@@ -180,23 +180,23 @@ discard block |
||
180 | 180 | |
181 | 181 | $modversion['config'][] = array( |
182 | 182 | 'name' => 'timeformat', |
183 | - 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_TIMEFORMAT', |
|
184 | - 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_TIMEFORMAT_DESC', |
|
183 | + 'title' => $GLOBALS['VAR_PREFIXU'].'_MI_TIMEFORMAT', |
|
184 | + 'description' => $GLOBALS['VAR_PREFIXU'].'_MI_TIMEFORMAT_DESC', |
|
185 | 185 | 'formtype' => 'select', |
186 | 186 | 'valuetype' => 'text', |
187 | 187 | 'options' => array( |
188 | 188 | _DATESTRING => 'l', |
189 | 189 | _MEDIUMDATESTRING => 'm', |
190 | 190 | _SHORTDATESTRING => 's', |
191 | - $GLOBALS['VAR_PREFIXU'] . '_MI_TIMEFORMAT_CUSTOM' => 'c' |
|
191 | + $GLOBALS['VAR_PREFIXU'].'_MI_TIMEFORMAT_CUSTOM' => 'c' |
|
192 | 192 | ), |
193 | 193 | 'default' => 'c' |
194 | 194 | ); |
195 | 195 | |
196 | 196 | $modversion['config'][] = array( |
197 | 197 | 'name' => 'articles_perpage', |
198 | - 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLESPERPAGE', |
|
199 | - 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLESPERPAGE_DESC', |
|
198 | + 'title' => $GLOBALS['VAR_PREFIXU'].'_MI_ARTICLESPERPAGE', |
|
199 | + 'description' => $GLOBALS['VAR_PREFIXU'].'_MI_ARTICLESPERPAGE_DESC', |
|
200 | 200 | 'formtype' => 'textbox', |
201 | 201 | 'valuetype' => 'int', |
202 | 202 | 'default' => 10 |
@@ -204,8 +204,8 @@ discard block |
||
204 | 204 | |
205 | 205 | $modversion['config'][] = array( |
206 | 206 | 'name' => 'list_perpage', |
207 | - 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_LISTPERPAGE', |
|
208 | - 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_LISTPERPAGE_DESC', |
|
207 | + 'title' => $GLOBALS['VAR_PREFIXU'].'_MI_LISTPERPAGE', |
|
208 | + 'description' => $GLOBALS['VAR_PREFIXU'].'_MI_LISTPERPAGE_DESC', |
|
209 | 209 | 'formtype' => 'textbox', |
210 | 210 | 'valuetype' => 'int', |
211 | 211 | 'default' => 20 |
@@ -213,8 +213,8 @@ discard block |
||
213 | 213 | |
214 | 214 | $modversion['config'][] = array( |
215 | 215 | 'name' => 'blogs_perupdate', |
216 | - 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_BLOGSPERUPDATE', |
|
217 | - 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_BLOGSPERUPDATE_DESC', |
|
216 | + 'title' => $GLOBALS['VAR_PREFIXU'].'_MI_BLOGSPERUPDATE', |
|
217 | + 'description' => $GLOBALS['VAR_PREFIXU'].'_MI_BLOGSPERUPDATE_DESC', |
|
218 | 218 | 'formtype' => 'textbox', |
219 | 219 | 'valuetype' => 'int', |
220 | 220 | 'default' => 10 |
@@ -222,8 +222,8 @@ discard block |
||
222 | 222 | |
223 | 223 | $modversion['config'][] = array( |
224 | 224 | 'name' => 'article_expire', |
225 | - 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLE_EXPIRE', |
|
226 | - 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLE_EXPIRE_DESC', |
|
225 | + 'title' => $GLOBALS['VAR_PREFIXU'].'_MI_ARTICLE_EXPIRE', |
|
226 | + 'description' => $GLOBALS['VAR_PREFIXU'].'_MI_ARTICLE_EXPIRE_DESC', |
|
227 | 227 | 'formtype' => 'textbox', |
228 | 228 | 'valuetype' => 'int', |
229 | 229 | 'default' => 30 |
@@ -231,8 +231,8 @@ discard block |
||
231 | 231 | |
232 | 232 | $modversion['config'][] = array( |
233 | 233 | 'name' => 'display_summary', |
234 | - 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_DISPLAY_SUMMARY', |
|
235 | - 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_DISPLAY_SUMMARY_DESC', |
|
234 | + 'title' => $GLOBALS['VAR_PREFIXU'].'_MI_DISPLAY_SUMMARY', |
|
235 | + 'description' => $GLOBALS['VAR_PREFIXU'].'_MI_DISPLAY_SUMMARY_DESC', |
|
236 | 236 | 'formtype' => 'textbox', |
237 | 237 | 'valuetype' => 'int', |
238 | 238 | 'default' => 0 |
@@ -240,8 +240,8 @@ discard block |
||
240 | 240 | |
241 | 241 | $modversion['config'][] = array( |
242 | 242 | 'name' => 'do_sibling', |
243 | - 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_DOSIBLING', |
|
244 | - 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_DOSIBLING_DESC', |
|
243 | + 'title' => $GLOBALS['VAR_PREFIXU'].'_MI_DOSIBLING', |
|
244 | + 'description' => $GLOBALS['VAR_PREFIXU'].'_MI_DOSIBLING_DESC', |
|
245 | 245 | 'formtype' => 'yesno', |
246 | 246 | 'valuetype' => 'int', |
247 | 247 | 'default' => 1 |
@@ -249,8 +249,8 @@ discard block |
||
249 | 249 | |
250 | 250 | $modversion['config'][] = array( |
251 | 251 | 'name' => 'pings', |
252 | - 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_PING', |
|
253 | - 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_PING_DESC', |
|
252 | + 'title' => $GLOBALS['VAR_PREFIXU'].'_MI_PING', |
|
253 | + 'description' => $GLOBALS['VAR_PREFIXU'].'_MI_PING_DESC', |
|
254 | 254 | 'formtype' => 'textarea', |
255 | 255 | 'valuetype' => 'text', |
256 | 256 | 'default' => '' |
@@ -258,8 +258,8 @@ discard block |
||
258 | 258 | |
259 | 259 | $modversion['config'][] = array( |
260 | 260 | 'name' => 'trackback_option', |
261 | - 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_TRACKBACK_OPTION', |
|
262 | - 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_TRACKBACK_OPTION_DESC', |
|
261 | + 'title' => $GLOBALS['VAR_PREFIXU'].'_MI_TRACKBACK_OPTION', |
|
262 | + 'description' => $GLOBALS['VAR_PREFIXU'].'_MI_TRACKBACK_OPTION_DESC', |
|
263 | 263 | 'formtype' => 'select', |
264 | 264 | 'valuetype' => 'int', |
265 | 265 | 'default' => 0, |
@@ -268,17 +268,17 @@ discard block |
||
268 | 268 | |
269 | 269 | $modversion['config'][] = array( |
270 | 270 | 'name' => 'copyright', |
271 | - 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_COPYRIGHT', |
|
272 | - 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_COPYRIGHT_DESC', |
|
271 | + 'title' => $GLOBALS['VAR_PREFIXU'].'_MI_COPYRIGHT', |
|
272 | + 'description' => $GLOBALS['VAR_PREFIXU'].'_MI_COPYRIGHT_DESC', |
|
273 | 273 | 'formtype' => 'textbox', |
274 | 274 | 'valuetype' => 'text', |
275 | - 'default' => 'Copyright© %s & ' . $xoopsConfig['sitename'] |
|
275 | + 'default' => 'Copyright© %s & '.$xoopsConfig['sitename'] |
|
276 | 276 | ); |
277 | 277 | |
278 | 278 | $modversion['config'][] = array( |
279 | 279 | 'name' => 'newblog_submit', |
280 | - 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_NEWBLOG_SUBMIT', |
|
281 | - 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_NEWBLOG_SUBMIT_DESC', |
|
280 | + 'title' => $GLOBALS['VAR_PREFIXU'].'_MI_NEWBLOG_SUBMIT', |
|
281 | + 'description' => $GLOBALS['VAR_PREFIXU'].'_MI_NEWBLOG_SUBMIT_DESC', |
|
282 | 282 | 'formtype' => 'select', |
283 | 283 | 'valuetype' => 'int', |
284 | 284 | 'default' => 2, |
@@ -293,8 +293,8 @@ discard block |
||
293 | 293 | |
294 | 294 | $modversion['config'][] = array( |
295 | 295 | 'name' => 'anonymous_rate', |
296 | - 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_ANONYMOUSRATE', |
|
297 | - 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_ANONYMOUSRATE_DESC', |
|
296 | + 'title' => $GLOBALS['VAR_PREFIXU'].'_MI_ANONYMOUSRATE', |
|
297 | + 'description' => $GLOBALS['VAR_PREFIXU'].'_MI_ANONYMOUSRATE_DESC', |
|
298 | 298 | 'formtype' => 'yesno', |
299 | 299 | 'valuetype' => 'int', |
300 | 300 | 'default' => 0 |
@@ -302,8 +302,8 @@ discard block |
||
302 | 302 | |
303 | 303 | $modversion['config'][] = array( |
304 | 304 | 'name' => 'do_pseudocron', |
305 | - 'title' => $GLOBALS['VAR_PREFIXU'] . '_MI_PSEUDOCRON', |
|
306 | - 'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_PSEUDOCRON_DESC', |
|
305 | + 'title' => $GLOBALS['VAR_PREFIXU'].'_MI_PSEUDOCRON', |
|
306 | + 'description' => $GLOBALS['VAR_PREFIXU'].'_MI_PSEUDOCRON_DESC', |
|
307 | 307 | 'formtype' => 'yesno', |
308 | 308 | 'valuetype' => 'int', |
309 | 309 | 'default' => 1 |
@@ -313,7 +313,7 @@ discard block |
||
313 | 313 | |
314 | 314 | $modversion['hasNotification'] = 1; |
315 | 315 | $modversion['notification']['lookup_file'] = 'include/notification.inc.php'; |
316 | -$modversion['notification']['lookup_func'] = $GLOBALS['VAR_PREFIX'] . '_notify_iteminfo'; |
|
316 | +$modversion['notification']['lookup_func'] = $GLOBALS['VAR_PREFIX'].'_notify_iteminfo'; |
|
317 | 317 | |
318 | 318 | $i = 0; |
319 | 319 | ++$i; |
@@ -27,7 +27,7 @@ |
||
27 | 27 | |
28 | 28 | // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined'); |
29 | 29 | |
30 | -include __DIR__ . '/vars.php'; |
|
30 | +include __DIR__.'/vars.php'; |
|
31 | 31 | mod_loadFunctions('', $GLOBALS['moddirname']); |
32 | 32 | |
33 | 33 | planet_parse_function(' |
@@ -27,7 +27,7 @@ |
||
27 | 27 | |
28 | 28 | // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined'); |
29 | 29 | |
30 | -include __DIR__ . '/vars.php'; |
|
30 | +include __DIR__.'/vars.php'; |
|
31 | 31 | mod_loadFunctions('', $GLOBALS['moddirname']); |
32 | 32 | |
33 | 33 | planet_parse_function(' |