mambax7 / planet

action.article.php

Indentation +47 added lines, -47 removed lines

@@ -30,10 +30,10 @@ 
 
 $art_id = Request::getInt('article', Request::getInt('article', 0, 'POST'), 'GET');//(int)(isset($_GET['article']) ? $_GET['article'] : (isset($_POST['article']) ? $_POST['article'] : 0));
 if (empty($art_id)) {
-    redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_INVALID'));
+	redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_INVALID'));
 }
 if (!$xoopsUser->isAdmin()) {
-    redirect_header('javascript:history.go(-1);', 2, _NOPERM);
+	redirect_header('javascript:history.go(-1);', 2, _NOPERM);
 }
 include XOOPS_ROOT_PATH . '/header.php';
 include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
@@ -44,58 +44,58 @@ 
 $op = Request::getCmd('op', 'check', 'POST');//isset($_POST['op']) ? $_POST['op'] : '';
 
 if ($op === 'del' || !empty(Request::getString('del', '', 'POST'))) {
-    $articleHandler->delete($article_obj);
-    $redirect = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php';
-    $message  = planet_constant('MD_SAVED');
-    redirect_header($redirect, 2, $message);
+	$articleHandler->delete($article_obj);
+	$redirect = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php';
+	$message  = planet_constant('MD_SAVED');
+	redirect_header($redirect, 2, $message);
 } elseif ($op === 'save') {
-    if (empty($_POST['art_content'])) {
-        redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_TEXTEMPTY'));
-    }
+	if (empty($_POST['art_content'])) {
+		redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_TEXTEMPTY'));
+	}
 
-    foreach (array(
-                 'art_title',
-                 'art_link',
-                 'art_author',
-                 'art_content'
-             ) as $tag) {
-        if (@Request::getString('tag', '', 'POST') != $article_obj->getVar($tag)) {
-            $article_obj->setVar($tag, @Request::getString('tag', '', 'POST'));
-        }
-    }
+	foreach (array(
+				 'art_title',
+				 'art_link',
+				 'art_author',
+				 'art_content'
+			 ) as $tag) {
+		if (@Request::getString('tag', '', 'POST') != $article_obj->getVar($tag)) {
+			$article_obj->setVar($tag, @Request::getString('tag', '', 'POST'));
+		}
+	}
 
-    $art_id_new = $articleHandler->insert($article_obj);
-    if (!$article_obj->getVar('art_id')) {
-        $redirect = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php';
-        $message  = planet_constant('MD_INSERTERROR');
-    } else {
-        $redirect = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article_obj->getVar('art_id');
-        $message  = planet_constant('MD_SAVED');
-    }
-    redirect_header($redirect, 2, $message);
+	$art_id_new = $articleHandler->insert($article_obj);
+	if (!$article_obj->getVar('art_id')) {
+		$redirect = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php';
+		$message  = planet_constant('MD_INSERTERROR');
+	} else {
+		$redirect = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article_obj->getVar('art_id');
+		$message  = planet_constant('MD_SAVED');
+	}
+	redirect_header($redirect, 2, $message);
 } else {
-    require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+	require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
 
-    $form = new XoopsThemeForm(_EDIT, 'formarticle', xoops_getenv('PHP_SELF'), 'post', true);
+	$form = new XoopsThemeForm(_EDIT, 'formarticle', xoops_getenv('PHP_SELF'), 'post', true);
 
-    $form->addElement(new XoopsFormText(planet_constant('MD_TITLE'), 'art_title', 50, 255, $article_obj->getVar('art_title', 'E')), true);
-    $form->addElement(new XoopsFormText(planet_constant('MD_LINK'), 'art_link', 50, 255, $article_obj->getVar('art_link', 'E')), true);
-    $form->addElement(new XoopsFormText(planet_constant('MD_AUTHOR'), 'art_author', 80, 255, $article_obj->getVar('art_author', 'E')));
-    $form->addElement(new XoopsFormTextArea(planet_constant('MD_CONTENT'), 'art_content', $article_obj->getVar('art_content', 'E')), true);
+	$form->addElement(new XoopsFormText(planet_constant('MD_TITLE'), 'art_title', 50, 255, $article_obj->getVar('art_title', 'E')), true);
+	$form->addElement(new XoopsFormText(planet_constant('MD_LINK'), 'art_link', 50, 255, $article_obj->getVar('art_link', 'E')), true);
+	$form->addElement(new XoopsFormText(planet_constant('MD_AUTHOR'), 'art_author', 80, 255, $article_obj->getVar('art_author', 'E')));
+	$form->addElement(new XoopsFormTextArea(planet_constant('MD_CONTENT'), 'art_content', $article_obj->getVar('art_content', 'E')), true);
 
-    $form->addElement(new XoopsFormHidden('article', $art_id));
-    $form->addElement(new XoopsFormHidden('op', 'save'));
+	$form->addElement(new XoopsFormHidden('article', $art_id));
+	$form->addElement(new XoopsFormHidden('op', 'save'));
 
-    $button_tray = new XoopsFormElementTray('', '');
-    $butt_save   = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
-    $button_tray->addElement($butt_save);
-    $butt_del = new XoopsFormButton('', 'del', _DELETE, 'submit');
-    $butt_del->setExtra("onClick='document.forms.formarticle.op.value=del'");
-    $button_tray->addElement($butt_del);
-    $butt_cancel = new XoopsFormButton('', 'cancel', _CANCEL, 'button');
-    $butt_cancel->setExtra("onclick='window.document.location=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . (int)$art_id . "\"'");
-    $button_tray->addElement($butt_cancel);
-    $form->addElement($button_tray);
-    $form->display();
+	$button_tray = new XoopsFormElementTray('', '');
+	$butt_save   = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
+	$button_tray->addElement($butt_save);
+	$butt_del = new XoopsFormButton('', 'del', _DELETE, 'submit');
+	$butt_del->setExtra("onClick='document.forms.formarticle.op.value=del'");
+	$button_tray->addElement($butt_del);
+	$butt_cancel = new XoopsFormButton('', 'cancel', _CANCEL, 'button');
+	$butt_cancel->setExtra("onclick='window.document.location=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . (int)$art_id . "\"'");
+	$button_tray->addElement($butt_cancel);
+	$form->addElement($button_tray);
+	$form->display();
 }
 include XOOPS_ROOT_PATH . '/footer.php';

Spacing +13 added lines, -13 removed lines

@@ -26,26 +26,26 @@ 
 // ------------------------------------------------------------------------ //
 use Xmf\Request;
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
-$art_id = Request::getInt('article', Request::getInt('article', 0, 'POST'), 'GET');//(int)(isset($_GET['article']) ? $_GET['article'] : (isset($_POST['article']) ? $_POST['article'] : 0));
+$art_id = Request::getInt('article', Request::getInt('article', 0, 'POST'), 'GET'); //(int)(isset($_GET['article']) ? $_GET['article'] : (isset($_POST['article']) ? $_POST['article'] : 0));
 if (empty($art_id)) {
     redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_INVALID'));
 }
 if (!$xoopsUser->isAdmin()) {
     redirect_header('javascript:history.go(-1);', 2, _NOPERM);
 }
-include XOOPS_ROOT_PATH . '/header.php';
-include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
+include XOOPS_ROOT_PATH.'/header.php';
+include XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/include/vars.php';
 
 $articleHandler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
 $article_obj    = $articleHandler->get($art_id);
 
-$op = Request::getCmd('op', 'check', 'POST');//isset($_POST['op']) ? $_POST['op'] : '';
+$op = Request::getCmd('op', 'check', 'POST'); //isset($_POST['op']) ? $_POST['op'] : '';
 
 if ($op === 'del' || !empty(Request::getString('del', '', 'POST'))) {
     $articleHandler->delete($article_obj);
-    $redirect = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php';
+    $redirect = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php';
     $message  = planet_constant('MD_SAVED');
     redirect_header($redirect, 2, $message);
 } elseif ($op === 'save') {
@@ -66,15 +66,15 @@ 
 
     $art_id_new = $articleHandler->insert($article_obj);
     if (!$article_obj->getVar('art_id')) {
-        $redirect = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php';
+        $redirect = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php';
         $message  = planet_constant('MD_INSERTERROR');
-    } else {
-        $redirect = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article_obj->getVar('art_id');
+    }else {
+        $redirect = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php'.URL_DELIMITER.''.$article_obj->getVar('art_id');
         $message  = planet_constant('MD_SAVED');
     }
     redirect_header($redirect, 2, $message);
-} else {
-    require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+}else {
+    require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
     $form = new XoopsThemeForm(_EDIT, 'formarticle', xoops_getenv('PHP_SELF'), 'post', true);
 
@@ -93,9 +93,9 @@ 
     $butt_del->setExtra("onClick='document.forms.formarticle.op.value=del'");
     $button_tray->addElement($butt_del);
     $butt_cancel = new XoopsFormButton('', 'cancel', _CANCEL, 'button');
-    $butt_cancel->setExtra("onclick='window.document.location=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . (int)$art_id . "\"'");
+    $butt_cancel->setExtra("onclick='window.document.location=\"".XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php'.URL_DELIMITER.''.(int) $art_id."\"'");
     $button_tray->addElement($butt_cancel);
     $form->addElement($button_tray);
     $form->display();
 }
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

view.blogs.php

Indentation +110 added lines, -110 removed lines

@@ -29,13 +29,13 @@ 
 include __DIR__ . '/header.php';
 
 if (preg_match("/\/notification_update\.php/i", Request::getUrl('REQUEST_URI', '', 'SERVER'), $matches)) {
-    include XOOPS_ROOT_PATH . '/include/notification_update.php';
-    exit();
+	include XOOPS_ROOT_PATH . '/include/notification_update.php';
+	exit();
 }
 
 if ($REQUEST_URI_parsed = PlanetUtility::planetParseArguments($args_num, $args, $args_str)) {
-    $args['start'] = @$args_num[0];
-    $args['sort']  = @$args_str[0];
+	$args['start'] = @$args_num[0];
+	$args['sort']  = @$args_str[0];
 }
 
 /* Start */
@@ -82,28 +82,28 @@ 
 $blog_prefix = '';
 /* Specific category */
 if ($category_id > 0) {
-    $category_obj = $categoryHandler->get($category_id);
-    $criteria->add(new Criteria('bc.cat_id', $category_id));
-    $uid           = 0;
-    $blog_id       = 0;
-    $category_data = array('id' => $category_id, 'title' => $category_obj->getVar('cat_title'));
-    $query_type    = 'category';
-    $blog_prefix   = 'b.';
+	$category_obj = $categoryHandler->get($category_id);
+	$criteria->add(new Criteria('bc.cat_id', $category_id));
+	$uid           = 0;
+	$blog_id       = 0;
+	$category_data = array('id' => $category_id, 'title' => $category_obj->getVar('cat_title'));
+	$query_type    = 'category';
+	$blog_prefix   = 'b.';
 }
 
 /* User bookmarks(favorites) */
 if ($uid > 0) {
-    $criteria->add(new Criteria('bm.bm_uid', $uid));
-    $category_id     = 0;
-    $blog_id         = 0;
-    $bookmarkHandler = xoops_getModuleHandler('bookmark', $GLOBALS['moddirname']);
-    $user_data       = array(
-        'uid'   => $uid,
-        'name'  => XoopsUser::getUnameFromId($uid),
-        'marks' => $bookmarkHandler->getCount(new Criteria('bm_uid', $uid))
-    );
-    $query_type      = 'bookmark';
-    $blog_prefix     = 'b.';
+	$criteria->add(new Criteria('bm.bm_uid', $uid));
+	$category_id     = 0;
+	$blog_id         = 0;
+	$bookmarkHandler = xoops_getModuleHandler('bookmark', $GLOBALS['moddirname']);
+	$user_data       = array(
+		'uid'   => $uid,
+		'name'  => XoopsUser::getUnameFromId($uid),
+		'marks' => $bookmarkHandler->getCount(new Criteria('bm_uid', $uid))
+	);
+	$query_type      = 'bookmark';
+	$blog_prefix     = 'b.';
 }
 
 $criteria->add(new Criteria($blog_prefix . 'blog_status', 0, '>'));
@@ -112,20 +112,20 @@ 
 $order = 'DESC';
 $sort  = empty($sort) ? 'default' : $sort;
 switch ($sort) {
-    case 'marks':
-        $sortby = $blog_prefix . 'blog_marks';
-        break;
-    case 'rating':
-        $sortby = $blog_prefix . 'blog_rating';
-        break;
-    case 'time':
-        $sortby = $blog_prefix . 'blog_time';
-        break;
-    case 'default':
-    default:
-        $sort   = 'default';
-        $sortby = $blog_prefix . 'blog_id';
-        break;
+	case 'marks':
+		$sortby = $blog_prefix . 'blog_marks';
+		break;
+	case 'rating':
+		$sortby = $blog_prefix . 'blog_rating';
+		break;
+	case 'time':
+		$sortby = $blog_prefix . 'blog_time';
+		break;
+	case 'default':
+	default:
+		$sort   = 'default';
+		$sortby = $blog_prefix . 'blog_id';
+		break;
 }
 $criteria->setSort($sortby);
 $criteria->setOrder($order);
@@ -134,93 +134,93 @@ 
 
 $tags = empty($list) ? '' : array($blog_prefix . 'blog_title', $blog_prefix . 'blog_time');
 switch ($query_type) {
-    case 'category':
-        $blogs_obj  = $blogHandler->getByCategory($criteria, $tags);
-        $count_blog = $blogHandler->getCountByCategory($criteria);
-        break;
-    case 'bookmark':
-        $blogs_obj  = $blogHandler->getByBookmark($criteria, $tags);
-        $count_blog = $blogHandler->getCountByBookmark($criteria);
-        break;
-    default:
-        $blogs_obj  = $blogHandler->getAll($criteria, $tags);
-        $count_blog = $blogHandler->getCount($criteria);
-        break;
+	case 'category':
+		$blogs_obj  = $blogHandler->getByCategory($criteria, $tags);
+		$count_blog = $blogHandler->getCountByCategory($criteria);
+		break;
+	case 'bookmark':
+		$blogs_obj  = $blogHandler->getByBookmark($criteria, $tags);
+		$count_blog = $blogHandler->getCountByBookmark($criteria);
+		break;
+	default:
+		$blogs_obj  = $blogHandler->getAll($criteria, $tags);
+		$count_blog = $blogHandler->getCount($criteria);
+		break;
 }
 
 /* Objects to array */
 $blogs = array();
 foreach (array_keys($blogs_obj) as $id) {
-    $_blog = array(
-        'id'    => $id,
-        'title' => $blogs_obj[$id]->getVar('blog_title'),
-        'time'  => $blogs_obj[$id]->getTime()
-    );
-    if (empty($list)) {
-        $_blog = array_merge($_blog, array(
-            'image' => $blogs_obj[$id]->getImage(),
-            'feed'  => $blogs_obj[$id]->getVar('blog_feed'),
-            'link'  => $blogs_obj[$id]->getVar('blog_link'),
-            'desc'  => $blogs_obj[$id]->getVar('blog_desc'),
-            'star'  => $blogs_obj[$id]->getStar(),
-            'rates' => $blogs_obj[$id]->getVar('blog_rates'),
-            'marks' => $blogs_obj[$id]->getVar('blog_marks')
-        ));
-    }
-    $blogs[] = $_blog;
-    unset($_blog);
+	$_blog = array(
+		'id'    => $id,
+		'title' => $blogs_obj[$id]->getVar('blog_title'),
+		'time'  => $blogs_obj[$id]->getTime()
+	);
+	if (empty($list)) {
+		$_blog = array_merge($_blog, array(
+			'image' => $blogs_obj[$id]->getImage(),
+			'feed'  => $blogs_obj[$id]->getVar('blog_feed'),
+			'link'  => $blogs_obj[$id]->getVar('blog_link'),
+			'desc'  => $blogs_obj[$id]->getVar('blog_desc'),
+			'star'  => $blogs_obj[$id]->getStar(),
+			'rates' => $blogs_obj[$id]->getVar('blog_rates'),
+			'marks' => $blogs_obj[$id]->getVar('blog_marks')
+		));
+	}
+	$blogs[] = $_blog;
+	unset($_blog);
 }
 unset($blogs_obj);
 
 if ($count_blog > $limit) {
-    include XOOPS_ROOT_PATH . '/class/pagenav.php';
-    $start_link = array();
-    if ($sort) {
-        $start_link[] = 'sort=' . $sort;
-    }
-    if ($category_id) {
-        $start_link[] = 'category=' . $category_id;
-    }
-    if ($list) {
-        $start_link[] = 'list=' . $list;
-    }
-    $nav     = new XoopsPageNav($count_blog, $limit, $start, 'start', implode('&', $start_link));
-    $pagenav = $nav->renderNav(4);
+	include XOOPS_ROOT_PATH . '/class/pagenav.php';
+	$start_link = array();
+	if ($sort) {
+		$start_link[] = 'sort=' . $sort;
+	}
+	if ($category_id) {
+		$start_link[] = 'category=' . $category_id;
+	}
+	if ($list) {
+		$start_link[] = 'list=' . $list;
+	}
+	$nav     = new XoopsPageNav($count_blog, $limit, $start, 'start', implode('&', $start_link));
+	$pagenav = $nav->renderNav(4);
 } else {
-    $pagenav = '';
+	$pagenav = '';
 }
 
 $xoopsTpl->assign('xoops_pagetitle', $xoopsOption['xoops_pagetitle']);
 $xoopsTpl->assign('link_home', "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . "/index.php\" title=\"" . planet_constant('MD_HOME') . "\" target=\"_self\">" . planet_constant('MD_HOME') . '</a>');
 
 if ($category_id || $uid) {
-    $xoopsTpl->assign('link_index', "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . "/view.blogs.php\" title=\"" . planet_constant('MD_INDEX') . "\" target=\"_self\">" . planet_constant('MD_INDEX') . '</a>');
+	$xoopsTpl->assign('link_index', "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . "/view.blogs.php\" title=\"" . planet_constant('MD_INDEX') . "\" target=\"_self\">" . planet_constant('MD_INDEX') . '</a>');
 
-    $link_articles = "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . (empty($category_id) ? '' : '/c' . $category_id) . (empty($uid) ? '' : '/u' . $uid) . "\" title=\"" . planet_constant('MD_ARTICLES') . "\">" . planet_constant('MD_ARTICLES') . '</a>';
-    $xoopsTpl->assign('link_articles', $link_articles);
+	$link_articles = "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . (empty($category_id) ? '' : '/c' . $category_id) . (empty($uid) ? '' : '/u' . $uid) . "\" title=\"" . planet_constant('MD_ARTICLES') . "\">" . planet_constant('MD_ARTICLES') . '</a>';
+	$xoopsTpl->assign('link_articles', $link_articles);
 }
 
 $link_switch = "<a href=\""
-               . XOOPS_URL
-               . '/modules/'
-               . $GLOBALS['moddirname']
-               . '/view.blogs.php'
-               . (empty($category_id) ? '' : '/c' . $category_id)
-               . (empty($uid) ? '' : '/u' . $uid)
-               . (empty($list) ? '/l1' : '')
-               . "\" title=\""
-               . (empty($list) ? planet_constant('MD_LISTVIEW') : planet_constant('MD_FULLVIEW'))
-               . "\">"
-               . (empty($list) ? planet_constant('MD_LISTVIEW') : planet_constant('MD_FULLVIEW'))
-               . '</a>';
+			   . XOOPS_URL
+			   . '/modules/'
+			   . $GLOBALS['moddirname']
+			   . '/view.blogs.php'
+			   . (empty($category_id) ? '' : '/c' . $category_id)
+			   . (empty($uid) ? '' : '/u' . $uid)
+			   . (empty($list) ? '/l1' : '')
+			   . "\" title=\""
+			   . (empty($list) ? planet_constant('MD_LISTVIEW') : planet_constant('MD_FULLVIEW'))
+			   . "\">"
+			   . (empty($list) ? planet_constant('MD_LISTVIEW') : planet_constant('MD_FULLVIEW'))
+			   . '</a>';
 $xoopsTpl->assign('link_switch', $link_switch);
 
 if (empty($uid) && is_object($xoopsUser)) {
-    $xoopsTpl->assign('link_bookmark', "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.blogs.php' . URL_DELIMITER . 'u' . $xoopsUser->getVar('uid') . "\" title=\"" . planet_constant('MD_BOOKMARKS') . "\" target=\"_self\">" . planet_constant('MD_BOOKMARKS') . '</a>');
+	$xoopsTpl->assign('link_bookmark', "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.blogs.php' . URL_DELIMITER . 'u' . $xoopsUser->getVar('uid') . "\" title=\"" . planet_constant('MD_BOOKMARKS') . "\" target=\"_self\">" . planet_constant('MD_BOOKMARKS') . '</a>');
 }
 
 if ($xoopsModuleConfig['newblog_submit'] == 1 || is_object($xoopsUser)) {
-    $xoopsTpl->assign('link_submit', "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . "/action.blog.php\" title=\"" . _SUBMIT . "\" target=\"_blank\">" . _SUBMIT . '</a>');
+	$xoopsTpl->assign('link_submit', "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . "/action.blog.php\" title=\"" . _SUBMIT . "\" target=\"_blank\">" . _SUBMIT . '</a>');
 }
 
 $xoopsTpl->assign('pagetitle', $xoopsModule->getVar('name') . '::' . planet_constant('MD_BLOGS'));
@@ -234,35 +234,35 @@ 
 $xoopsTpl->assign('user_level', !is_object($xoopsUser) ? 0 : ($xoopsUser->isAdmin() ? 2 : 1));
 if (empty($xoopsModuleConfig['anonymous_rate']) && !is_object($xoopsUser)) {
 } elseif (!$list) {
-    $xoopsTpl->assign('canrate', 1);
+	$xoopsTpl->assign('canrate', 1);
 }
 
 $sort_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.blogs.php' . URL_DELIMITER;
 $vars      = array();
 if (!empty($category_id)) {
-    $vars[] = 'c' . $category_id;
+	$vars[] = 'c' . $category_id;
 }
 if (!empty($uid)) {
-    $vars[] = 'u' . $uid;
+	$vars[] = 'u' . $uid;
 }
 if (!empty($list)) {
-    $vars[] = 'li';
+	$vars[] = 'li';
 }
 if (!empty($vars)) {
-    $sort_link .= implode('/', $vars) . '/';
+	$sort_link .= implode('/', $vars) . '/';
 }
 $sortlinks   = array();
 $valid_sorts = array(
-    'marks'   => planet_constant('MD_BOOKMARKS'),
-    'rating'  => planet_constant('MD_RATING'),
-    'time'    => planet_constant('MD_TIME'),
-    'default' => planet_constant('MD_DEFAULT')
+	'marks'   => planet_constant('MD_BOOKMARKS'),
+	'rating'  => planet_constant('MD_RATING'),
+	'time'    => planet_constant('MD_TIME'),
+	'default' => planet_constant('MD_DEFAULT')
 );
 foreach ($valid_sorts as $val => $name) {
-    if ($val == $sort) {
-        continue;
-    }
-    $sortlinks[] = "<a href=\"" . $sort_link . $val . "\">" . $name . '</a>';
+	if ($val == $sort) {
+		continue;
+	}
+	$sortlinks[] = "<a href=\"" . $sort_link . $val . "\">" . $name . '</a>';
 }
 $xoopsTpl->assign('link_sort', implode(' | ', $sortlinks));
 

Spacing +33 added lines, -33 removed lines

@@ -26,10 +26,10 @@ 
 // ------------------------------------------------------------------------ //
 use Xmf\Request;
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 if (preg_match("/\/notification_update\.php/i", Request::getUrl('REQUEST_URI', '', 'SERVER'), $matches)) {
-    include XOOPS_ROOT_PATH . '/include/notification_update.php';
+    include XOOPS_ROOT_PATH.'/include/notification_update.php';
     exit();
 }
 
@@ -66,10 +66,10 @@ 
 }
 */
 
-$xoopsOption['xoops_pagetitle'] = $xoopsModule->getVar('name') . ' - ' . planet_constant('MD_BLOGS');
+$xoopsOption['xoops_pagetitle'] = $xoopsModule->getVar('name').' - '.planet_constant('MD_BLOGS');
 $xoopsOption['template_main']   = PlanetUtility::planetGetTemplate('blogs');
-require_once XOOPS_ROOT_PATH . '/header.php';
-include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
+require_once XOOPS_ROOT_PATH.'/header.php';
+include XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/include/vars.php';
 
 // Following part will not be executed after cache
 $categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
@@ -81,7 +81,7 @@ 
 $criteria    = new CriteriaCompo();
 $blog_prefix = '';
 /* Specific category */
-if ($category_id > 0) {
+if ($category_id>0) {
     $category_obj = $categoryHandler->get($category_id);
     $criteria->add(new Criteria('bc.cat_id', $category_id));
     $uid           = 0;
@@ -92,7 +92,7 @@ 
 }
 
 /* User bookmarks(favorites) */
-if ($uid > 0) {
+if ($uid>0) {
     $criteria->add(new Criteria('bm.bm_uid', $uid));
     $category_id     = 0;
     $blog_id         = 0;
@@ -106,25 +106,25 @@ 
     $blog_prefix     = 'b.';
 }
 
-$criteria->add(new Criteria($blog_prefix . 'blog_status', 0, '>'));
+$criteria->add(new Criteria($blog_prefix.'blog_status', 0, '>'));
 
 /* Sort */
 $order = 'DESC';
 $sort  = empty($sort) ? 'default' : $sort;
 switch ($sort) {
     case 'marks':
-        $sortby = $blog_prefix . 'blog_marks';
+        $sortby = $blog_prefix.'blog_marks';
         break;
     case 'rating':
-        $sortby = $blog_prefix . 'blog_rating';
+        $sortby = $blog_prefix.'blog_rating';
         break;
     case 'time':
-        $sortby = $blog_prefix . 'blog_time';
+        $sortby = $blog_prefix.'blog_time';
         break;
     case 'default':
     default:
         $sort   = 'default';
-        $sortby = $blog_prefix . 'blog_id';
+        $sortby = $blog_prefix.'blog_id';
         break;
 }
 $criteria->setSort($sortby);
@@ -132,7 +132,7 @@ 
 $criteria->setStart($start);
 $criteria->setLimit($limit);
 
-$tags = empty($list) ? '' : array($blog_prefix . 'blog_title', $blog_prefix . 'blog_time');
+$tags = empty($list) ? '' : array($blog_prefix.'blog_title', $blog_prefix.'blog_time');
 switch ($query_type) {
     case 'category':
         $blogs_obj  = $blogHandler->getByCategory($criteria, $tags);
@@ -172,31 +172,31 @@ 
 }
 unset($blogs_obj);
 
-if ($count_blog > $limit) {
-    include XOOPS_ROOT_PATH . '/class/pagenav.php';
+if ($count_blog>$limit) {
+    include XOOPS_ROOT_PATH.'/class/pagenav.php';
     $start_link = array();
     if ($sort) {
-        $start_link[] = 'sort=' . $sort;
+        $start_link[] = 'sort='.$sort;
     }
     if ($category_id) {
-        $start_link[] = 'category=' . $category_id;
+        $start_link[] = 'category='.$category_id;
     }
     if ($list) {
-        $start_link[] = 'list=' . $list;
+        $start_link[] = 'list='.$list;
     }
     $nav     = new XoopsPageNav($count_blog, $limit, $start, 'start', implode('&', $start_link));
     $pagenav = $nav->renderNav(4);
-} else {
+}else {
     $pagenav = '';
 }
 
 $xoopsTpl->assign('xoops_pagetitle', $xoopsOption['xoops_pagetitle']);
-$xoopsTpl->assign('link_home', "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . "/index.php\" title=\"" . planet_constant('MD_HOME') . "\" target=\"_self\">" . planet_constant('MD_HOME') . '</a>');
+$xoopsTpl->assign('link_home', "<a href=\"".XOOPS_URL.'/modules/'.$GLOBALS['moddirname']."/index.php\" title=\"".planet_constant('MD_HOME')."\" target=\"_self\">".planet_constant('MD_HOME').'</a>');
 
 if ($category_id || $uid) {
-    $xoopsTpl->assign('link_index', "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . "/view.blogs.php\" title=\"" . planet_constant('MD_INDEX') . "\" target=\"_self\">" . planet_constant('MD_INDEX') . '</a>');
+    $xoopsTpl->assign('link_index', "<a href=\"".XOOPS_URL.'/modules/'.$GLOBALS['moddirname']."/view.blogs.php\" title=\"".planet_constant('MD_INDEX')."\" target=\"_self\">".planet_constant('MD_INDEX').'</a>');
 
-    $link_articles = "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . (empty($category_id) ? '' : '/c' . $category_id) . (empty($uid) ? '' : '/u' . $uid) . "\" title=\"" . planet_constant('MD_ARTICLES') . "\">" . planet_constant('MD_ARTICLES') . '</a>';
+    $link_articles = "<a href=\"".XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'.(empty($category_id) ? '' : '/c'.$category_id).(empty($uid) ? '' : '/u'.$uid)."\" title=\"".planet_constant('MD_ARTICLES')."\">".planet_constant('MD_ARTICLES').'</a>';
     $xoopsTpl->assign('link_articles', $link_articles);
 }
 
@@ -205,8 +205,8 @@ 
                . '/modules/'
                . $GLOBALS['moddirname']
                . '/view.blogs.php'
-               . (empty($category_id) ? '' : '/c' . $category_id)
-               . (empty($uid) ? '' : '/u' . $uid)
+               . (empty($category_id) ? '' : '/c'.$category_id)
+               . (empty($uid) ? '' : '/u'.$uid)
                . (empty($list) ? '/l1' : '')
                . "\" title=\""
                . (empty($list) ? planet_constant('MD_LISTVIEW') : planet_constant('MD_FULLVIEW'))
@@ -216,14 +216,14 @@ 
 $xoopsTpl->assign('link_switch', $link_switch);
 
 if (empty($uid) && is_object($xoopsUser)) {
-    $xoopsTpl->assign('link_bookmark', "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.blogs.php' . URL_DELIMITER . 'u' . $xoopsUser->getVar('uid') . "\" title=\"" . planet_constant('MD_BOOKMARKS') . "\" target=\"_self\">" . planet_constant('MD_BOOKMARKS') . '</a>');
+    $xoopsTpl->assign('link_bookmark', "<a href=\"".XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.blogs.php'.URL_DELIMITER.'u'.$xoopsUser->getVar('uid')."\" title=\"".planet_constant('MD_BOOKMARKS')."\" target=\"_self\">".planet_constant('MD_BOOKMARKS').'</a>');
 }
 
 if ($xoopsModuleConfig['newblog_submit'] == 1 || is_object($xoopsUser)) {
-    $xoopsTpl->assign('link_submit', "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . "/action.blog.php\" title=\"" . _SUBMIT . "\" target=\"_blank\">" . _SUBMIT . '</a>');
+    $xoopsTpl->assign('link_submit', "<a href=\"".XOOPS_URL.'/modules/'.$GLOBALS['moddirname']."/action.blog.php\" title=\""._SUBMIT."\" target=\"_blank\">"._SUBMIT.'</a>');
 }
 
-$xoopsTpl->assign('pagetitle', $xoopsModule->getVar('name') . '::' . planet_constant('MD_BLOGS'));
+$xoopsTpl->assign('pagetitle', $xoopsModule->getVar('name').'::'.planet_constant('MD_BLOGS'));
 $xoopsTpl->assign('category', @$category_data);
 $xoopsTpl->assign('user', @$user_data);
 $xoopsTpl->assign('blogs', $blogs);
@@ -237,19 +237,19 @@ 
     $xoopsTpl->assign('canrate', 1);
 }
 
-$sort_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.blogs.php' . URL_DELIMITER;
+$sort_link = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.blogs.php'.URL_DELIMITER;
 $vars      = array();
 if (!empty($category_id)) {
-    $vars[] = 'c' . $category_id;
+    $vars[] = 'c'.$category_id;
 }
 if (!empty($uid)) {
-    $vars[] = 'u' . $uid;
+    $vars[] = 'u'.$uid;
 }
 if (!empty($list)) {
     $vars[] = 'li';
 }
 if (!empty($vars)) {
-    $sort_link .= implode('/', $vars) . '/';
+    $sort_link .= implode('/', $vars).'/';
 }
 $sortlinks   = array();
 $valid_sorts = array(
@@ -262,8 +262,8 @@ 
     if ($val == $sort) {
         continue;
     }
-    $sortlinks[] = "<a href=\"" . $sort_link . $val . "\">" . $name . '</a>';
+    $sortlinks[] = "<a href=\"".$sort_link.$val."\">".$name.'</a>';
 }
 $xoopsTpl->assign('link_sort', implode(' | ', $sortlinks));
 
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';

print.php

Indentation +57 added lines, -57 removed lines

@@ -31,44 +31,44 @@ 
 error_reporting(0);
 
 if (empty(Request::getString('print_data', '', 'POST'))) {
-    //$_POST['print_data']))
+	//$_POST['print_data']))
 
-    if (PlanetUtility::planetParseArguments($args_num, $args, $args_str)) {
-        $args['article'] = @$args_num[0];
-    }
+	if (PlanetUtility::planetParseArguments($args_num, $args, $args_str)) {
+		$args['article'] = @$args_num[0];
+	}
 
-    $article_id = Request::getInt('article', @$args['article'], 'POST');//(int)(empty($_GET['article']) ? @$args['article'] : $_GET['article']);
+	$article_id = Request::getInt('article', @$args['article'], 'POST');//(int)(empty($_GET['article']) ? @$args['article'] : $_GET['article']);
 
-    $articleHandler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
-    $article_obj    = $articleHandler->get($article_id);
+	$articleHandler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
+	$article_obj    = $articleHandler->get($article_id);
 
-    $article_data = array();
+	$article_data = array();
 
-    // title
-    $article_data['title'] = $article_obj->getVar('art_title');
+	// title
+	$article_data['title'] = $article_obj->getVar('art_title');
 
-    $article_data['author'] = $article_obj->getVar('art_author');
+	$article_data['author'] = $article_obj->getVar('art_author');
 
-    // source
-    $article_data['source'] = $article_obj->getVar('art_link');
+	// source
+	$article_data['source'] = $article_obj->getVar('art_link');
 
-    // publish time
-    $article_data['time'] = $article_obj->getTime('l');
+	// publish time
+	$article_data['time'] = $article_obj->getTime('l');
 
-    // summary
-    $article_data['summary'] =& $article_obj->getSummary();
+	// summary
+	$article_data['summary'] =& $article_obj->getSummary();
 
-    // text of page
-    $article_data['text'] = $article_obj->getVar('art_content');
+	// text of page
+	$article_data['text'] = $article_obj->getVar('art_content');
 
-    $print_data['title']   = $article_data['title'];
-    $print_data['author']  = $article_data['author'];
-    $print_data['date']    = $article_data['time'];
-    $print_data['summary'] = empty($article_data['summary']) ? '' : planet_constant('MD_SUMMARY') . ': ' . $article_data['summary'];
-    $print_data['content'] = $article_data['text'];
-    $print_data['url']     = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/view.article.php' . URL_DELIMITER . 'c' . $category_id . '/' . $article_id . '/p' . $page;
+	$print_data['title']   = $article_data['title'];
+	$print_data['author']  = $article_data['author'];
+	$print_data['date']    = $article_data['time'];
+	$print_data['summary'] = empty($article_data['summary']) ? '' : planet_constant('MD_SUMMARY') . ': ' . $article_data['summary'];
+	$print_data['content'] = $article_data['text'];
+	$print_data['url']     = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/view.article.php' . URL_DELIMITER . 'c' . $category_id . '/' . $article_id . '/p' . $page;
 } else {
-    $print_data = unserialize(base64_decode(Request::getString('print_data', '', 'POST')));//$_POST['print_data']));
+	$print_data = unserialize(base64_decode(Request::getString('print_data', '', 'POST')));//$_POST['print_data']));
 }
 
 $print_data['image']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/' . $xoopsModule->getInfo('image');
@@ -99,36 +99,36 @@ 
             </style>\n";
 echo "</head>\n";
 echo "<body style='background-color:#ffffff; color:#000000; font-family: Arial' onload='window.print()'>\n"
-     . "<div style='float:center; width: 750px; border: 1px solid #000; padding: 20px;'>\n"
-     . "<div style='text-align: center; display: block; margin: 0 0 6px 0; padding: 5px;'>\n"
-     . "<img src='"
-     . $print_data['image']
-     . "' border='0' alt='"
-     . $print_data['module']
-     . "'>\n"
-     . '<h2>'
-     . $print_data['title']
-     . "</h2>\n"
-     . "</div>\n"
-     . "<div style='margin-top: 12px; margin-bottom: 12px; border-top: 2px solid #ccc;'></div>\n";
+	 . "<div style='float:center; width: 750px; border: 1px solid #000; padding: 20px;'>\n"
+	 . "<div style='text-align: center; display: block; margin: 0 0 6px 0; padding: 5px;'>\n"
+	 . "<img src='"
+	 . $print_data['image']
+	 . "' border='0' alt='"
+	 . $print_data['module']
+	 . "'>\n"
+	 . '<h2>'
+	 . $print_data['title']
+	 . "</h2>\n"
+	 . "</div>\n"
+	 . "<div style='margin-top: 12px; margin-bottom: 12px; border-top: 2px solid #ccc;'></div>\n";
 echo(empty($print_data['author']) ? '' : '<div>' . planet_constant('MD_AUTHOR') . ': ' . $print_data['author'] . "</div>\n")
-     . '<div>'
-     . planet_constant('MD_DATE')
-     . ': '
-     . $print_data['date']
-     . "</div>\n"
-     . (empty($article_data['summary']) ? '' : "<div style='margin-top: 12px; margin-bottom: 12px; border-top: 1px solid #ccc;'></div>\n" . '<div>' . $print_data['summary'] . "</div>\n")
-     . "<div style='margin-top: 12px; margin-bottom: 12px; border-top: 1px solid #ccc;'></div>\n"
-     . '<div>'
-     . $print_data['content']
-     . "</div>\n"
-     . "<div style='margin-top: 12px; margin-bottom: 12px; border-top: 2px solid #ccc;'></div>\n"
-     . '<div>'
-     . $print_data['module']
-     . "</div>\n"
-     . '<div>URL: '
-     . $print_data['url']
-     . "</div>\n"
-     . "</div>\n"
-     . "</body>\n</html>\n";
+	 . '<div>'
+	 . planet_constant('MD_DATE')
+	 . ': '
+	 . $print_data['date']
+	 . "</div>\n"
+	 . (empty($article_data['summary']) ? '' : "<div style='margin-top: 12px; margin-bottom: 12px; border-top: 1px solid #ccc;'></div>\n" . '<div>' . $print_data['summary'] . "</div>\n")
+	 . "<div style='margin-top: 12px; margin-bottom: 12px; border-top: 1px solid #ccc;'></div>\n"
+	 . '<div>'
+	 . $print_data['content']
+	 . "</div>\n"
+	 . "<div style='margin-top: 12px; margin-bottom: 12px; border-top: 2px solid #ccc;'></div>\n"
+	 . '<div>'
+	 . $print_data['module']
+	 . "</div>\n"
+	 . '<div>URL: '
+	 . $print_data['url']
+	 . "</div>\n"
+	 . "</div>\n"
+	 . "</body>\n</html>\n";
 exit();

Spacing +18 added lines, -18 removed lines

@@ -27,7 +27,7 @@ 
 use Xmf\Request;
 
 error_reporting(0);
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 error_reporting(0);
 
 if (empty(Request::getString('print_data', '', 'POST'))) {
@@ -37,7 +37,7 @@ 
         $args['article'] = @$args_num[0];
     }
 
-    $article_id = Request::getInt('article', @$args['article'], 'POST');//(int)(empty($_GET['article']) ? @$args['article'] : $_GET['article']);
+    $article_id = Request::getInt('article', @$args['article'], 'POST'); //(int)(empty($_GET['article']) ? @$args['article'] : $_GET['article']);
 
     $articleHandler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
     $article_obj    = $articleHandler->get($article_id);
@@ -56,7 +56,7 @@ 
     $article_data['time'] = $article_obj->getTime('l');
 
     // summary
-    $article_data['summary'] =& $article_obj->getSummary();
+    $article_data['summary'] = & $article_obj->getSummary();
 
     // text of page
     $article_data['text'] = $article_obj->getVar('art_content');
@@ -64,25 +64,25 @@ 
     $print_data['title']   = $article_data['title'];
     $print_data['author']  = $article_data['author'];
     $print_data['date']    = $article_data['time'];
-    $print_data['summary'] = empty($article_data['summary']) ? '' : planet_constant('MD_SUMMARY') . ': ' . $article_data['summary'];
+    $print_data['summary'] = empty($article_data['summary']) ? '' : planet_constant('MD_SUMMARY').': '.$article_data['summary'];
     $print_data['content'] = $article_data['text'];
-    $print_data['url']     = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/view.article.php' . URL_DELIMITER . 'c' . $category_id . '/' . $article_id . '/p' . $page;
-} else {
-    $print_data = unserialize(base64_decode(Request::getString('print_data', '', 'POST')));//$_POST['print_data']));
+    $print_data['url']     = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/view.article.php'.URL_DELIMITER.'c'.$category_id.'/'.$article_id.'/p'.$page;
+}else {
+    $print_data = unserialize(base64_decode(Request::getString('print_data', '', 'POST'))); //$_POST['print_data']));
 }
 
-$print_data['image']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/' . $xoopsModule->getInfo('image');
-$print_data['module'] = $xoopsModule->getVar('name') . ' V' . $xoopsModule->getInfo('version');
+$print_data['image']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/'.$xoopsModule->getInfo('image');
+$print_data['module'] = $xoopsModule->getVar('name').' V'.$xoopsModule->getInfo('version');
 
-header('Content-Type: text/html; charset=' . _CHARSET);
+header('Content-Type: text/html; charset='._CHARSET);
 echo "<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n";
 echo "<html>\n<head>\n";
-echo '<title>' . $xoopsConfig['sitename'] . "</title>\n";
-echo "<meta http-equiv='Content-Type' content='text/html; charset=" . _CHARSET . "'>\n";
-echo "<meta name='AUTHOR' content='" . $myts->htmlSpecialChars($xoopsConfig['sitename']) . "'>\n";
-echo "<meta name='COPYRIGHT' content='Copyright (c) " . date('Y') . ' by ' . $xoopsConfig['sitename'] . "'>\n";
-echo "<meta name='DESCRIPTION' content='" . $myts->htmlSpecialChars($xoopsConfig['slogan']) . "'>\n";
-echo "<meta name='GENERATOR' content='" . XOOPS_VERSION . "'>\n";
+echo '<title>'.$xoopsConfig['sitename']."</title>\n";
+echo "<meta http-equiv='Content-Type' content='text/html; charset="._CHARSET."'>\n";
+echo "<meta name='AUTHOR' content='".$myts->htmlSpecialChars($xoopsConfig['sitename'])."'>\n";
+echo "<meta name='COPYRIGHT' content='Copyright (c) ".date('Y').' by '.$xoopsConfig['sitename']."'>\n";
+echo "<meta name='DESCRIPTION' content='".$myts->htmlSpecialChars($xoopsConfig['slogan'])."'>\n";
+echo "<meta name='GENERATOR' content='".XOOPS_VERSION."'>\n";
 echo "<style type='text/css'>
             body {
                 color:#000000;
@@ -111,13 +111,13 @@ 
      . "</h2>\n"
      . "</div>\n"
      . "<div style='margin-top: 12px; margin-bottom: 12px; border-top: 2px solid #ccc;'></div>\n";
-echo(empty($print_data['author']) ? '' : '<div>' . planet_constant('MD_AUTHOR') . ': ' . $print_data['author'] . "</div>\n")
+echo(empty($print_data['author']) ? '' : '<div>'.planet_constant('MD_AUTHOR').': '.$print_data['author']."</div>\n")
      . '<div>'
      . planet_constant('MD_DATE')
      . ': '
      . $print_data['date']
      . "</div>\n"
-     . (empty($article_data['summary']) ? '' : "<div style='margin-top: 12px; margin-bottom: 12px; border-top: 1px solid #ccc;'></div>\n" . '<div>' . $print_data['summary'] . "</div>\n")
+     . (empty($article_data['summary']) ? '' : "<div style='margin-top: 12px; margin-bottom: 12px; border-top: 1px solid #ccc;'></div>\n".'<div>'.$print_data['summary']."</div>\n")
      . "<div style='margin-top: 12px; margin-bottom: 12px; border-top: 1px solid #ccc;'></div>\n"
      . '<div>'
      . $print_data['content']

notification_update.php

Spacing +2 added lines, -2 removed lines

@@ -17,5 +17,5 @@
  * @author       XOOPS Development Team, Kazumi Ono (AKA onokazu)
  */
 
-include __DIR__ . '/../../mainfile.php';
-include XOOPS_ROOT_PATH . '/include/notification_update.php';
+include __DIR__.'/../../mainfile.php';
+include XOOPS_ROOT_PATH.'/include/notification_update.php';

view.article.php

Indentation +29 added lines, -29 removed lines

@@ -34,17 +34,17 @@ 
  *
  */
 if (preg_match("/(\/comment_[^\.]*\.php\?.*=.*)/i", Request::getUrl('REQUEST_URI', '', 'SERVER'), $matches)) {//$_SERVER['REQUEST_URI']
-    header('location: ' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . $matches[1]);
-    exit();
+	header('location: ' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . $matches[1]);
+	exit();
 }
 if (preg_match("/\/notification_update\.php/i", Request::getUrl('REQUEST_URI', '', 'SERVER'), $matches)) {
-    include XOOPS_ROOT_PATH . '/include/notification_update.php';
-    exit();
+	include XOOPS_ROOT_PATH . '/include/notification_update.php';
+	exit();
 }
 
 if ($REQUEST_URI_parsed = PlanetUtility::planetParseArguments($args_num, $args, $args_str)) {
-    $args['article'] = @$args_num[0];
-    $args['blog']    = @$args['blog'];
+	$args['article'] = @$args_num[0];
+	$args['blog']    = @$args['blog'];
 }
 
 $article_id = Request::getInt('article', @$args['article'], 'POST');//(int)(empty($_GET['article']) ? @$args['article'] : $_GET['article']);
@@ -57,7 +57,7 @@ 
 
 // restore $_SERVER['REQUEST_URI']
 if (!empty($REQUEST_URI_parsed)) {
-    $_SERVER['REQUEST_URI'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . (empty($article_id) ? '' : '?article=' . $article_id);
+	$_SERVER['REQUEST_URI'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . (empty($article_id) ? '' : '?article=' . $article_id);
 }
 
 $xoopsOption['xoops_pagetitle'] = $xoopsModule->getVar('name') . ' - ' . $article_obj->getVar('art_title');
@@ -66,29 +66,29 @@ 
 include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
 
 $article_data = array(
-    'id'       => $article_id,
-    'title'    => $article_obj->getVar('art_title'),
-    'content'  => $article_obj->getVar('art_content'),
-    'author'   => $article_obj->getVar('art_author'),
-    'time'     => $article_obj->getTime(),
-    'link'     => $article_obj->getVar('art_link'),
-    'views'    => $article_obj->getVar('art_views'),
-    'comments' => $article_obj->getVar('art_comments'),
-    'star'     => $article_obj->getStar(),
-    'rates'    => $article_obj->getVar('art_rates'),
-    'blog'     => array('id' => $article_obj->getVar('blog_id'), 'title' => $blog_obj->getVar('blog_title'))
+	'id'       => $article_id,
+	'title'    => $article_obj->getVar('art_title'),
+	'content'  => $article_obj->getVar('art_content'),
+	'author'   => $article_obj->getVar('art_author'),
+	'time'     => $article_obj->getTime(),
+	'link'     => $article_obj->getVar('art_link'),
+	'views'    => $article_obj->getVar('art_views'),
+	'comments' => $article_obj->getVar('art_comments'),
+	'star'     => $article_obj->getStar(),
+	'rates'    => $article_obj->getVar('art_rates'),
+	'blog'     => array('id' => $article_obj->getVar('blog_id'), 'title' => $blog_obj->getVar('blog_title'))
 );
 
 if (!empty($xoopsModuleConfig['do_sibling'])) {
-    $articles_sibling = $articleHandler->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'])) {
-        $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'];
-    }
+	$articles_sibling = $articleHandler->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'])) {
+		$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'];
+	}
 }
 
 $xoopsTpl->assign('modulename', $xoopsModule->getVar('name'));
@@ -99,11 +99,11 @@ 
 $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);
+	$xoopsTpl->assign('canrate', 1);
 }
 
 if ($transferbar = @include XOOPS_ROOT_PATH . '/Frameworks/transfer/bar.transfer.php') {
-    $xoopsTpl->assign('transfer', $transferbar);
+	$xoopsTpl->assign('transfer', $transferbar);
 }
 
 // Loading module meta data, NOT THE RIGHT WAY DOING IT

Spacing +15 added lines, -15 removed lines

@@ -26,7 +26,7 @@ 
 // ------------------------------------------------------------------------ //
 use Xmf\Request;
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 /**
  * The comment detection scripts should be removed once absolute url is used in comment_view.php
@@ -34,11 +34,11 @@ 
  *
  */
 if (preg_match("/(\/comment_[^\.]*\.php\?.*=.*)/i", Request::getUrl('REQUEST_URI', '', 'SERVER'), $matches)) {//$_SERVER['REQUEST_URI']
-    header('location: ' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . $matches[1]);
+    header('location: '.XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].$matches[1]);
     exit();
 }
 if (preg_match("/\/notification_update\.php/i", Request::getUrl('REQUEST_URI', '', 'SERVER'), $matches)) {
-    include XOOPS_ROOT_PATH . '/include/notification_update.php';
+    include XOOPS_ROOT_PATH.'/include/notification_update.php';
     exit();
 }
 
@@ -47,8 +47,8 @@ 
     $args['blog']    = @$args['blog'];
 }
 
-$article_id = Request::getInt('article', @$args['article'], 'POST');//(int)(empty($_GET['article']) ? @$args['article'] : $_GET['article']);
-$blog_id    = Request::getInt('blog', @$args['blog'], 'POST');//(int)(empty($_GET['blog']) ? @$args['blog'] : $_GET['blog']);
+$article_id = Request::getInt('article', @$args['article'], 'POST'); //(int)(empty($_GET['article']) ? @$args['article'] : $_GET['article']);
+$blog_id    = Request::getInt('blog', @$args['blog'], 'POST'); //(int)(empty($_GET['blog']) ? @$args['blog'] : $_GET['blog']);
 
 $articleHandler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
 $blogHandler    = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
@@ -57,13 +57,13 @@ 
 
 // restore $_SERVER['REQUEST_URI']
 if (!empty($REQUEST_URI_parsed)) {
-    $_SERVER['REQUEST_URI'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . (empty($article_id) ? '' : '?article=' . $article_id);
+    $_SERVER['REQUEST_URI'] = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php'.(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']   = PlanetUtility::planetGetTemplate('article');
-require_once XOOPS_ROOT_PATH . '/header.php';
-include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
+require_once XOOPS_ROOT_PATH.'/header.php';
+include XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/include/vars.php';
 
 $article_data = array(
     'id'       => $article_id,
@@ -82,11 +82,11 @@ 
 if (!empty($xoopsModuleConfig['do_sibling'])) {
     $articles_sibling = $articleHandler->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']['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'])) {
-        $articles_sibling['next']['url']   = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $articles_sibling['next']['id'] . '/b' . $blog_id;
+        $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'];
     }
 }
@@ -98,11 +98,11 @@ 
 
 $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);
 }
 
-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);
 }
 
@@ -112,6 +112,6 @@ 
 // for comment and notification
 //$_SERVER['REQUEST_URI'] = XOOPS_URL."/modules/".$GLOBALS["moddirname"]."/view.article.php";
 $_GET['article'] = $article_id;
-include XOOPS_ROOT_PATH . '/include/comment_view.php';
+include XOOPS_ROOT_PATH.'/include/comment_view.php';
 
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';

xml.php

Indentation +125 added lines, -125 removed lines

@@ -30,8 +30,8 @@ 
 include __DIR__ . '/header.php';
 
 if (PlanetUtility::planetParseArguments($args_num, $args, $args_str)) {
-    $args['article'] = @$args_num[0];
-    $args['type']    = @$args_str[0];
+	$args['article'] = @$args_num[0];
+	$args['type']    = @$args_str[0];
 }
 
 /* Specified Article */
@@ -48,14 +48,14 @@ 
 
 $valid_format = array('RSS0.91', 'RSS1.0', 'RSS2.0', 'PIE0.1', 'MBOX', 'OPML', 'ATOM', 'ATOM0.3', 'HTML', 'JS');
 if ($type === 'RDF') {
-    $type = 'RSS1.0';
+	$type = 'RSS1.0';
 }
 if ($type === 'RSS') {
-    $type = 'RSS0.91';
+	$type = 'RSS0.91';
 }
 if (empty($type) || !in_array($type, $valid_format)) {
-    PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_INVALID'));
-    exit();
+	PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_INVALID'));
+	exit();
 }
 
 $categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
@@ -64,30 +64,30 @@ 
 $bookmarkHandler = xoops_getModuleHandler('bookmark', $GLOBALS['moddirname']);
 
 if (!empty($article_id)) {
-    $article_obj = $articleHandler->get($article_id);
-    if (!$article_obj->getVar('art_id')) {
-        PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_EXPIRED'));
-        exit();
-    }
-    $source = 'article';
+	$article_obj = $articleHandler->get($article_id);
+	if (!$article_obj->getVar('art_id')) {
+		PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_EXPIRED'));
+		exit();
+	}
+	$source = 'article';
 } elseif (!empty($blog_id)) {
-    $blog_obj = $blogHandler->get($blog_id);
-    if (!$blog_obj->getVar('blog_id')) {
-        PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_INVALID'));
-        exit();
-    }
-    $source = 'blog';
+	$blog_obj = $blogHandler->get($blog_id);
+	if (!$blog_obj->getVar('blog_id')) {
+		PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_INVALID'));
+		exit();
+	}
+	$source = 'blog';
 } elseif (!empty($category_id)) {
-    $source       = 'category';
-    $category_obj = $categoryHandler->get($category_id);
-    if (!$category_obj->getVar('cat_id')) {
-        PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_INVALID'));
-        exit();
-    }
+	$source       = 'category';
+	$category_obj = $categoryHandler->get($category_id);
+	if (!$category_obj->getVar('cat_id')) {
+		PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_INVALID'));
+		exit();
+	}
 } elseif (!empty($uid)) {
-    $source = 'bookmark';
+	$source = 'bookmark';
 } else {
-    $source = '';
+	$source = '';
 }
 
 $xml_charset = 'UTF-8';
@@ -97,102 +97,102 @@ 
 $tpl->xoops_setCacheTime(3600);
 $xoopsCachedTemplateId = md5($xoopsModule->getVar('mid') . ',' . $article_id . ',' . $category_id . ',' . $blog_id . ',' . $uid . ',' . $type);
 if (!$tpl->is_cached('db:system_dummy.tpl', $xoopsCachedTemplateId)) {
-    $criteria = new CriteriaCompo();
-    $criteria->setLimit($xoopsModuleConfig['articles_perpage']);
-    $articles_obj = array();
-    switch ($source) {
-        case 'article':
-            $pagetitle = planet_constant('MD_ARTICLE');
-            $rssdesc   = planet_constant('MD_XMLDESC_ARTICLE');
-
-            $articles_obj[$article_id] = $article_obj;
-
-            $xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article_obj->getVar('art_id');
-            break;
-
-        case 'category':
-            $pagetitle = planet_constant('MD_CATEGORY');
-            $rssdesc   = sprintf(planet_constant('MD_XMLDESC_CATEGORY'), $category_obj->getVar('cat_title'));
-
-            $criteria->add(new Criteria('bc.cat_id', $category_id));
-            $articles_obj = $articleHandler->getByCategory($criteria);
-
-            $xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'c' . $category_id;
-            break;
-
-        case 'blog':
-            $pagetitle = planet_constant('MD_BLOG');
-            $rssdesc   = sprintf(planet_constant('MD_XMLDESC_BLOG'), $blog_obj->getVar('blog_title'));
-
-            $criteria->add(new Criteria('blog_id', $blog_id));
-            $articles_obj = $articleHandler->getAll($criteria);
-
-            $xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $blog_id;
-            break;
-
-        case 'bookmark':
-            $author_name = XoopsUser::getUnameFromId($uid);
-            $pagetitle   = planet_constant('MD_BOOKMARKS');
-            $rssdesc     = sprintf(planet_constant('MD_XMLDESC_BOOKMARK'), $author_name);
-
-            $criteria->add(new Criteria('bm.bm_uid', $uid));
-            $articles_obj = $articleHandler->getByBookmark($criteria);
-
-            $xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'u' . $uid;
-
-            break;
-
-        default:
-            $pagetitle = planet_constant('MD_INDEX');
-            $rssdesc   = planet_constant('MD_XMLDESC_INDEX');
-
-            $articles_obj = $articleHandler->getAll($criteria);
-
-            $xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php';
-            break;
-    }
-    $items = array();
-    foreach (array_keys($articles_obj) as $id) {
-        $content = $articles_obj[$id]->getVar('art_content');
-        $content .= '<br>' . planet_constant('MD_SOURCE') . ': ' . $articles_obj[$id]->getVar('art_link') . ' ' . $articles_obj[$id]->getVar('art_author');
-        $items[] = array(
-            'title'                     => $articles_obj[$id]->getVar('art_title'),
-            'link'                      => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $articles_obj[$id]->getVar('art_id'),
-            'description'               => $content,
-            'descriptionHtmlSyndicated' => true,
-            'date'                      => $articles_obj[$id]->getTime('rss'),
-            'source'                    => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/',
-            'author'                    => $articles_obj[$id]->getVar('art_author')
-        );
-    }
-    unset($articles_obj, $criteria);
-
-    $xmlHandler = xoops_getModuleHandler('xml', $GLOBALS['moddirname']);
-    $xml        = $xmlHandler->create($type);
-    $xml->setVar('encoding', $xml_charset);
-    $xml->setVar('title', $xoopsConfig['sitename'] . ' :: ' . $pagetitle, 'UTF-8', $xml_charset, true);
-    $xml->setVar('description', $rssdesc, true);
-    $xml->setVar('descriptionHtmlSyndicated', true);
-    $xml->setVar('link', $xml_link);
-    $xml->setVar('syndicationURL', XOOPS_URL . '/' . xoops_getenv('PHP_SELF'), 'post', true);
-    $xml->setVar('webmaster', checkEmail($xoopsConfig['adminmail'], true));
-    $xml->setVar('editor', checkEmail($xoopsConfig['adminmail'], true));
-    $xml->setVar('category', $xoopsModule->getVar('name'), true);
-    $xml->setVar('generator', $xoopsModule->getInfo('version'));
-    $xml->setVar('language', _LANGCODE);
-
-    $dimention = @getimagesize(XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/' . $xoopsModule->getInfo('image'));
-    $image     = array(
-        'width'       => $dimention[0],
-        'height'      => $dimention[1],
-        'title'       => $xoopsConfig['sitename'] . ' :: ' . $pagetitle,
-        'url'         => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/' . $xoopsModule->getInfo('image'),
-        'link'        => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/',
-        'description' => $rssdesc
-    );
-    $xml->setImage($image);
-
-    /*
+	$criteria = new CriteriaCompo();
+	$criteria->setLimit($xoopsModuleConfig['articles_perpage']);
+	$articles_obj = array();
+	switch ($source) {
+		case 'article':
+			$pagetitle = planet_constant('MD_ARTICLE');
+			$rssdesc   = planet_constant('MD_XMLDESC_ARTICLE');
+
+			$articles_obj[$article_id] = $article_obj;
+
+			$xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article_obj->getVar('art_id');
+			break;
+
+		case 'category':
+			$pagetitle = planet_constant('MD_CATEGORY');
+			$rssdesc   = sprintf(planet_constant('MD_XMLDESC_CATEGORY'), $category_obj->getVar('cat_title'));
+
+			$criteria->add(new Criteria('bc.cat_id', $category_id));
+			$articles_obj = $articleHandler->getByCategory($criteria);
+
+			$xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'c' . $category_id;
+			break;
+
+		case 'blog':
+			$pagetitle = planet_constant('MD_BLOG');
+			$rssdesc   = sprintf(planet_constant('MD_XMLDESC_BLOG'), $blog_obj->getVar('blog_title'));
+
+			$criteria->add(new Criteria('blog_id', $blog_id));
+			$articles_obj = $articleHandler->getAll($criteria);
+
+			$xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $blog_id;
+			break;
+
+		case 'bookmark':
+			$author_name = XoopsUser::getUnameFromId($uid);
+			$pagetitle   = planet_constant('MD_BOOKMARKS');
+			$rssdesc     = sprintf(planet_constant('MD_XMLDESC_BOOKMARK'), $author_name);
+
+			$criteria->add(new Criteria('bm.bm_uid', $uid));
+			$articles_obj = $articleHandler->getByBookmark($criteria);
+
+			$xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'u' . $uid;
+
+			break;
+
+		default:
+			$pagetitle = planet_constant('MD_INDEX');
+			$rssdesc   = planet_constant('MD_XMLDESC_INDEX');
+
+			$articles_obj = $articleHandler->getAll($criteria);
+
+			$xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php';
+			break;
+	}
+	$items = array();
+	foreach (array_keys($articles_obj) as $id) {
+		$content = $articles_obj[$id]->getVar('art_content');
+		$content .= '<br>' . planet_constant('MD_SOURCE') . ': ' . $articles_obj[$id]->getVar('art_link') . ' ' . $articles_obj[$id]->getVar('art_author');
+		$items[] = array(
+			'title'                     => $articles_obj[$id]->getVar('art_title'),
+			'link'                      => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $articles_obj[$id]->getVar('art_id'),
+			'description'               => $content,
+			'descriptionHtmlSyndicated' => true,
+			'date'                      => $articles_obj[$id]->getTime('rss'),
+			'source'                    => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/',
+			'author'                    => $articles_obj[$id]->getVar('art_author')
+		);
+	}
+	unset($articles_obj, $criteria);
+
+	$xmlHandler = xoops_getModuleHandler('xml', $GLOBALS['moddirname']);
+	$xml        = $xmlHandler->create($type);
+	$xml->setVar('encoding', $xml_charset);
+	$xml->setVar('title', $xoopsConfig['sitename'] . ' :: ' . $pagetitle, 'UTF-8', $xml_charset, true);
+	$xml->setVar('description', $rssdesc, true);
+	$xml->setVar('descriptionHtmlSyndicated', true);
+	$xml->setVar('link', $xml_link);
+	$xml->setVar('syndicationURL', XOOPS_URL . '/' . xoops_getenv('PHP_SELF'), 'post', true);
+	$xml->setVar('webmaster', checkEmail($xoopsConfig['adminmail'], true));
+	$xml->setVar('editor', checkEmail($xoopsConfig['adminmail'], true));
+	$xml->setVar('category', $xoopsModule->getVar('name'), true);
+	$xml->setVar('generator', $xoopsModule->getInfo('version'));
+	$xml->setVar('language', _LANGCODE);
+
+	$dimention = @getimagesize(XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/' . $xoopsModule->getInfo('image'));
+	$image     = array(
+		'width'       => $dimention[0],
+		'height'      => $dimention[1],
+		'title'       => $xoopsConfig['sitename'] . ' :: ' . $pagetitle,
+		'url'         => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/' . $xoopsModule->getInfo('image'),
+		'link'        => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/',
+		'description' => $rssdesc
+	);
+	$xml->setImage($image);
+
+	/*
     $item = array(
         "title" => $datatitle,
         "link" => $dataurl,
@@ -203,11 +203,11 @@ 
         "author" => $dataauthor
         );
     */
-    $xml->addItems($items);
+	$xml->addItems($items);
 
-    $dummy_content = $xmlHandler->display($xml, XOOPS_CACHE_PATH . '/' . $GLOBALS['moddirname'] . '.xml.tmp');
+	$dummy_content = $xmlHandler->display($xml, XOOPS_CACHE_PATH . '/' . $GLOBALS['moddirname'] . '.xml.tmp');
 
-    $tpl->assign_by_ref('dummy_content', $dummy_content);
+	$tpl->assign_by_ref('dummy_content', $dummy_content);
 }
 //$content = ob_get_contents();
 ob_end_clean();

Spacing +20 added lines, -20 removed lines

@@ -27,7 +27,7 @@ 
 use Xmf\Request;
 
 ob_start();
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 if (PlanetUtility::planetParseArguments($args_num, $args, $args_str)) {
     $args['article'] = @$args_num[0];
@@ -86,16 +86,16 @@ 
     }
 } elseif (!empty($uid)) {
     $source = 'bookmark';
-} else {
+}else {
     $source = '';
 }
 
 $xml_charset = 'UTF-8';
-require_once XOOPS_ROOT_PATH . '/class/template.php';
+require_once XOOPS_ROOT_PATH.'/class/template.php';
 $tpl = new XoopsTpl();
 $tpl->xoops_setCaching(2);
 $tpl->xoops_setCacheTime(3600);
-$xoopsCachedTemplateId = md5($xoopsModule->getVar('mid') . ',' . $article_id . ',' . $category_id . ',' . $blog_id . ',' . $uid . ',' . $type);
+$xoopsCachedTemplateId = md5($xoopsModule->getVar('mid').','.$article_id.','.$category_id.','.$blog_id.','.$uid.','.$type);
 if (!$tpl->is_cached('db:system_dummy.tpl', $xoopsCachedTemplateId)) {
     $criteria = new CriteriaCompo();
     $criteria->setLimit($xoopsModuleConfig['articles_perpage']);
@@ -107,7 +107,7 @@ 
 
             $articles_obj[$article_id] = $article_obj;
 
-            $xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article_obj->getVar('art_id');
+            $xml_link = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php'.URL_DELIMITER.''.$article_obj->getVar('art_id');
             break;
 
         case 'category':
@@ -117,7 +117,7 @@ 
             $criteria->add(new Criteria('bc.cat_id', $category_id));
             $articles_obj = $articleHandler->getByCategory($criteria);
 
-            $xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'c' . $category_id;
+            $xml_link = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'.URL_DELIMITER.'c'.$category_id;
             break;
 
         case 'blog':
@@ -127,7 +127,7 @@ 
             $criteria->add(new Criteria('blog_id', $blog_id));
             $articles_obj = $articleHandler->getAll($criteria);
 
-            $xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $blog_id;
+            $xml_link = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'.URL_DELIMITER.'b'.$blog_id;
             break;
 
         case 'bookmark':
@@ -138,7 +138,7 @@ 
             $criteria->add(new Criteria('bm.bm_uid', $uid));
             $articles_obj = $articleHandler->getByBookmark($criteria);
 
-            $xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'u' . $uid;
+            $xml_link = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'.URL_DELIMITER.'u'.$uid;
 
             break;
 
@@ -148,20 +148,20 @@ 
 
             $articles_obj = $articleHandler->getAll($criteria);
 
-            $xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php';
+            $xml_link = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php';
             break;
     }
     $items = array();
     foreach (array_keys($articles_obj) as $id) {
         $content = $articles_obj[$id]->getVar('art_content');
-        $content .= '<br>' . planet_constant('MD_SOURCE') . ': ' . $articles_obj[$id]->getVar('art_link') . ' ' . $articles_obj[$id]->getVar('art_author');
+        $content .= '<br>'.planet_constant('MD_SOURCE').': '.$articles_obj[$id]->getVar('art_link').' '.$articles_obj[$id]->getVar('art_author');
         $items[] = array(
             'title'                     => $articles_obj[$id]->getVar('art_title'),
-            'link'                      => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $articles_obj[$id]->getVar('art_id'),
+            'link'                      => XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php'.URL_DELIMITER.''.$articles_obj[$id]->getVar('art_id'),
             'description'               => $content,
             'descriptionHtmlSyndicated' => true,
             'date'                      => $articles_obj[$id]->getTime('rss'),
-            'source'                    => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/',
+            'source'                    => XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/',
             'author'                    => $articles_obj[$id]->getVar('art_author')
         );
     }
@@ -170,24 +170,24 @@ 
     $xmlHandler = xoops_getModuleHandler('xml', $GLOBALS['moddirname']);
     $xml        = $xmlHandler->create($type);
     $xml->setVar('encoding', $xml_charset);
-    $xml->setVar('title', $xoopsConfig['sitename'] . ' :: ' . $pagetitle, 'UTF-8', $xml_charset, true);
+    $xml->setVar('title', $xoopsConfig['sitename'].' :: '.$pagetitle, 'UTF-8', $xml_charset, true);
     $xml->setVar('description', $rssdesc, true);
     $xml->setVar('descriptionHtmlSyndicated', true);
     $xml->setVar('link', $xml_link);
-    $xml->setVar('syndicationURL', XOOPS_URL . '/' . xoops_getenv('PHP_SELF'), 'post', true);
+    $xml->setVar('syndicationURL', XOOPS_URL.'/'.xoops_getenv('PHP_SELF'), 'post', true);
     $xml->setVar('webmaster', checkEmail($xoopsConfig['adminmail'], true));
     $xml->setVar('editor', checkEmail($xoopsConfig['adminmail'], true));
     $xml->setVar('category', $xoopsModule->getVar('name'), true);
     $xml->setVar('generator', $xoopsModule->getInfo('version'));
     $xml->setVar('language', _LANGCODE);
 
-    $dimention = @getimagesize(XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/' . $xoopsModule->getInfo('image'));
+    $dimention = @getimagesize(XOOPS_ROOT_PATH.'/modules/'.$GLOBALS['moddirname'].'/'.$xoopsModule->getInfo('image'));
     $image     = array(
         'width'       => $dimention[0],
         'height'      => $dimention[1],
-        'title'       => $xoopsConfig['sitename'] . ' :: ' . $pagetitle,
-        'url'         => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/' . $xoopsModule->getInfo('image'),
-        'link'        => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/',
+        'title'       => $xoopsConfig['sitename'].' :: '.$pagetitle,
+        'url'         => XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/'.$xoopsModule->getInfo('image'),
+        'link'        => XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/',
         'description' => $rssdesc
     );
     $xml->setImage($image);
@@ -205,11 +205,11 @@ 
     */
     $xml->addItems($items);
 
-    $dummy_content = $xmlHandler->display($xml, XOOPS_CACHE_PATH . '/' . $GLOBALS['moddirname'] . '.xml.tmp');
+    $dummy_content = $xmlHandler->display($xml, XOOPS_CACHE_PATH.'/'.$GLOBALS['moddirname'].'.xml.tmp');
 
     $tpl->assign_by_ref('dummy_content', $dummy_content);
 }
 //$content = ob_get_contents();
 ob_end_clean();
-header('Content-Type:text/xml; charset=' . $xml_charset);
+header('Content-Type:text/xml; charset='.$xml_charset);
 $tpl->display('db:system_dummy.tpl', $xoopsCachedTemplateId);

index.php

Indentation +164 added lines, -164 removed lines

@@ -27,13 +27,13 @@ 
 include __DIR__ . '/header.php';
 
 if (preg_match("/\/notification_update\.php/i", $_SERVER['REQUEST_URI'], $matches)) {
-    include XOOPS_ROOT_PATH . '/include/notification_update.php';
-    exit();
+	include XOOPS_ROOT_PATH . '/include/notification_update.php';
+	exit();
 }
 
 if ($REQUEST_URI_parsed = PlanetUtility::planetParseArguments($args_num, $args, $args_str)) {
-    $args['start'] = @$args_num[0];
-    $args['sort']  = @$args_str[0];
+	$args['start'] = @$args_num[0];
+	$args['sort']  = @$args_str[0];
 }
 
 /* Start */
@@ -51,20 +51,20 @@ 
 
 // restore $_SERVER['REQUEST_URI']
 if (!empty($REQUEST_URI_parsed)) {
-    $args_REQUEST_URI = array();
-    $_args            = array('start', 'sort', 'uid', 'list');
-    foreach ($_args as $arg) {
-        if (!empty(${$arg})) {
-            $args_REQUEST_URI[] = $arg . '=' . ${$arg};
-        }
-    }
-    if (!empty($blog_id)) {
-        $args_REQUEST_URI[] = 'blog=' . $blog_id;
-    }
-    if (!empty($category_id)) {
-        $args_REQUEST_URI[] = 'category=' . $category_id;
-    }
-    $_SERVER['REQUEST_URI'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . (empty($args_REQUEST_URI) ? '' : '?' . implode('&', $args_REQUEST_URI));
+	$args_REQUEST_URI = array();
+	$_args            = array('start', 'sort', 'uid', 'list');
+	foreach ($_args as $arg) {
+		if (!empty(${$arg})) {
+			$args_REQUEST_URI[] = $arg . '=' . ${$arg};
+		}
+	}
+	if (!empty($blog_id)) {
+		$args_REQUEST_URI[] = 'blog=' . $blog_id;
+	}
+	if (!empty($category_id)) {
+		$args_REQUEST_URI[] = 'category=' . $category_id;
+	}
+	$_SERVER['REQUEST_URI'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . (empty($args_REQUEST_URI) ? '' : '?' . implode('&', $args_REQUEST_URI));
 }
 
 $GLOBALS['xoopsOption']['template_main'] = PlanetUtility::planetGetTemplate('index');
@@ -89,73 +89,73 @@ 
 $article_prefix = '';
 /* Specific category */
 if ($category_id > 0) {
-    $category_obj = $categoryHandler->get($category_id);
-    $criteria->add(new Criteria('bc.cat_id', $category_id));
-    $uid            = 0;
-    $blog_id        = 0;
-    $category_data  = array('id' => $category_id, 'title' => $category_obj->getVar('cat_title'));
-    $query_type     = 'category';
-    $article_prefix = 'a.';
+	$category_obj = $categoryHandler->get($category_id);
+	$criteria->add(new Criteria('bc.cat_id', $category_id));
+	$uid            = 0;
+	$blog_id        = 0;
+	$category_data  = array('id' => $category_id, 'title' => $category_obj->getVar('cat_title'));
+	$query_type     = 'category';
+	$article_prefix = 'a.';
 }
 /* Specific blog */
 if ($blog_id > 0) {
-    $blog_obj = $blogHandler->get($blog_id);
-    if ($blog_obj->getVar('blog_status')
-        || (is_object($xoopsUser)
-            && $xoopsUser->getVar('uid') == $blog_obj->getVar('blog_submitter'))) {
-        $criteria->add(new Criteria('blog_id', $blog_id));
-        $category_id     = 0;
-        $uid             = 0;
-        $bookmarkHandler = xoops_getModuleHandler('bookmark', $GLOBALS['moddirname']);
-        $blog_data       = array(
-            'id'    => $blog_id,
-            'title' => $blog_obj->getVar('blog_title'),
-            'image' => $blog_obj->getImage(),
-            'title' => $blog_obj->getVar('blog_title'),
-            'feed'  => $blog_obj->getVar('blog_feed'),
-            'link'  => $blog_obj->getVar('blog_link'),
-            'desc'  => $blog_obj->getVar('blog_desc'),
-            'time'  => $blog_obj->getTime(),
-            'star'  => $blog_obj->getStar(),
-            'rates' => $blog_obj->getVar('blog_rates'),
-            'marks' => $blog_obj->getVar('blog_marks')
-        );
-    }
-    $query_type     = 'blog';
-    $article_prefix = '';
+	$blog_obj = $blogHandler->get($blog_id);
+	if ($blog_obj->getVar('blog_status')
+		|| (is_object($xoopsUser)
+			&& $xoopsUser->getVar('uid') == $blog_obj->getVar('blog_submitter'))) {
+		$criteria->add(new Criteria('blog_id', $blog_id));
+		$category_id     = 0;
+		$uid             = 0;
+		$bookmarkHandler = xoops_getModuleHandler('bookmark', $GLOBALS['moddirname']);
+		$blog_data       = array(
+			'id'    => $blog_id,
+			'title' => $blog_obj->getVar('blog_title'),
+			'image' => $blog_obj->getImage(),
+			'title' => $blog_obj->getVar('blog_title'),
+			'feed'  => $blog_obj->getVar('blog_feed'),
+			'link'  => $blog_obj->getVar('blog_link'),
+			'desc'  => $blog_obj->getVar('blog_desc'),
+			'time'  => $blog_obj->getTime(),
+			'star'  => $blog_obj->getStar(),
+			'rates' => $blog_obj->getVar('blog_rates'),
+			'marks' => $blog_obj->getVar('blog_marks')
+		);
+	}
+	$query_type     = 'blog';
+	$article_prefix = '';
 }
 /* User bookmarks(favorites) */
 if ($uid > 0) {
-    $criteria->add(new Criteria('bm.bm_uid', $uid));
-    $category_id     = 0;
-    $blog_id         = 0;
-    $bookmarkHandler = xoops_getModuleHandler('bookmark', $GLOBALS['moddirname']);
-    $user_data       = array(
-        'uid'   => $uid,
-        'name'  => XoopsUser::getUnameFromId($uid),
-        'marks' => $bookmarkHandler->getCount(new Criteria('bm_uid', $uid))
-    );
-    $query_type      = 'bookmark';
-    $article_prefix  = 'a.';
+	$criteria->add(new Criteria('bm.bm_uid', $uid));
+	$category_id     = 0;
+	$blog_id         = 0;
+	$bookmarkHandler = xoops_getModuleHandler('bookmark', $GLOBALS['moddirname']);
+	$user_data       = array(
+		'uid'   => $uid,
+		'name'  => XoopsUser::getUnameFromId($uid),
+		'marks' => $bookmarkHandler->getCount(new Criteria('bm_uid', $uid))
+	);
+	$query_type      = 'bookmark';
+	$article_prefix  = 'a.';
 }
 
 /* Sort */
 $order = 'DESC';
 $sort  = empty($sort) ? 'time' : $sort;
 switch ($sort) {
-    case 'views':
-        $sortby = $article_prefix . 'art_views';
-        break;
-    case 'rating':
-        $sortby = $article_prefix . 'art_rating';
-        break;
-    case 'time':
-        $sortby = $article_prefix . 'art_time';
-        break;
-    case 'default':
-    default:
-        $sortby = '';
-        break;
+	case 'views':
+		$sortby = $article_prefix . 'art_views';
+		break;
+	case 'rating':
+		$sortby = $article_prefix . 'art_rating';
+		break;
+	case 'time':
+		$sortby = $article_prefix . 'art_time';
+		break;
+	case 'default':
+	default:
+		$sortby = '';
+		break;
 }
 $criteria->setSort($sortby);
 $criteria->setOrder($order);
@@ -163,120 +163,120 @@ 
 $criteria->setLimit($limit);
 
 $tags = empty($list) ? '' : array(
-    $article_prefix . 'art_title',
-    $article_prefix . 'blog_id',
-    $article_prefix . 'art_time'
+	$article_prefix . 'art_title',
+	$article_prefix . 'blog_id',
+	$article_prefix . 'art_time'
 );
 switch ($query_type) {
-    case 'category':
-        $articles_obj  = $articleHandler->getByCategory($criteria, $tags);
-        $count_article = $articleHandler->getCountByCategory($criteria);
-        break;
-    case 'bookmark':
-        $articles_obj  = $articleHandler->getByBookmark($criteria, $tags);
-        $count_article = $articleHandler->getCountByBookmark($criteria);
-        break;
-    default:
-        $articles_obj  = $articleHandler->getAll($criteria, $tags);
-        $count_article = $articleHandler->getCount($criteria);
-        break;
+	case 'category':
+		$articles_obj  = $articleHandler->getByCategory($criteria, $tags);
+		$count_article = $articleHandler->getCountByCategory($criteria);
+		break;
+	case 'bookmark':
+		$articles_obj  = $articleHandler->getByBookmark($criteria, $tags);
+		$count_article = $articleHandler->getCountByBookmark($criteria);
+		break;
+	default:
+		$articles_obj  = $articleHandler->getAll($criteria, $tags);
+		$count_article = $articleHandler->getCount($criteria);
+		break;
 }
 
 if (!empty($blog_data)) {
-    $blogs[$blog_data['id']] = $blog_data['title'];
+	$blogs[$blog_data['id']] = $blog_data['title'];
 } else {
-    $blog_array = array();
-    foreach (array_keys($articles_obj) as $id) {
-        $blog_array[$articles_obj[$id]->getVar('blog_id')] = 1;
-    }
-    $criteria_blog = new Criteria('blog_id', '(' . implode(',', array_keys($blog_array)) . ')', 'IN');
-    $blogs         = $blogHandler->getList($criteria_blog);
+	$blog_array = array();
+	foreach (array_keys($articles_obj) as $id) {
+		$blog_array[$articles_obj[$id]->getVar('blog_id')] = 1;
+	}
+	$criteria_blog = new Criteria('blog_id', '(' . implode(',', array_keys($blog_array)) . ')', 'IN');
+	$blogs         = $blogHandler->getList($criteria_blog);
 }
 
 /* Objects to array */
 $articles = array();
 foreach (array_keys($articles_obj) as $id) {
-    $_article = array(
-        'id'    => $id,
-        'title' => $articles_obj[$id]->getVar('art_title'),
-        'time'  => $articles_obj[$id]->getTime(),
-        'blog'  => array(
-            'id'    => $articles_obj[$id]->getVar('blog_id'),
-            'title' => $blogs[$articles_obj[$id]->getVar('blog_id')]
-        )
-    );
-    if (empty($list)) {
-        $_article = array_merge($_article, array(
-            'author'   => $articles_obj[$id]->getVar('art_author'),
-            'views'    => $articles_obj[$id]->getVar('art_views'),
-            'comments' => $articles_obj[$id]->getVar('art_comments'),
-            'star'     => $articles_obj[$id]->getStar(),
-            'rates'    => $articles_obj[$id]->getVar('art_rates')
-        ));
-        if (!empty($xoopsModuleConfig['display_summary'])) {
-            $_article['content'] = $articles_obj[$id]->getSummary();
-        } else {
-            $_article['content'] = $articles_obj[$id]->getVar('art_content');
-        }
-    }
-    $articles[] = $_article;
-    unset($_article);
+	$_article = array(
+		'id'    => $id,
+		'title' => $articles_obj[$id]->getVar('art_title'),
+		'time'  => $articles_obj[$id]->getTime(),
+		'blog'  => array(
+			'id'    => $articles_obj[$id]->getVar('blog_id'),
+			'title' => $blogs[$articles_obj[$id]->getVar('blog_id')]
+		)
+	);
+	if (empty($list)) {
+		$_article = array_merge($_article, array(
+			'author'   => $articles_obj[$id]->getVar('art_author'),
+			'views'    => $articles_obj[$id]->getVar('art_views'),
+			'comments' => $articles_obj[$id]->getVar('art_comments'),
+			'star'     => $articles_obj[$id]->getStar(),
+			'rates'    => $articles_obj[$id]->getVar('art_rates')
+		));
+		if (!empty($xoopsModuleConfig['display_summary'])) {
+			$_article['content'] = $articles_obj[$id]->getSummary();
+		} else {
+			$_article['content'] = $articles_obj[$id]->getVar('art_content');
+		}
+	}
+	$articles[] = $_article;
+	unset($_article);
 }
 unset($articles_obj);
 
 if ($count_article > $limit) {
-    include XOOPS_ROOT_PATH . '/class/pagenav.php';
-    $start_link = array();
-    if ($sort) {
-        $start_link[] = 'sort=' . $sort;
-    }
-    if ($category_id) {
-        $start_link[] = 'category=' . $category_id;
-    }
-    if ($blog_id) {
-        $start_link[] = 'blog=' . $blog_id;
-    }
-    if ($list) {
-        $start_link[] = 'list=' . $list;
-    }
-    $nav     = new XoopsPageNav($count_article, $limit, $start, 'start', implode('&', $start_link));
-    $pagenav = $nav->renderNav(4);
+	include XOOPS_ROOT_PATH . '/class/pagenav.php';
+	$start_link = array();
+	if ($sort) {
+		$start_link[] = 'sort=' . $sort;
+	}
+	if ($category_id) {
+		$start_link[] = 'category=' . $category_id;
+	}
+	if ($blog_id) {
+		$start_link[] = 'blog=' . $blog_id;
+	}
+	if ($list) {
+		$start_link[] = 'list=' . $list;
+	}
+	$nav     = new XoopsPageNav($count_article, $limit, $start, 'start', implode('&', $start_link));
+	$pagenav = $nav->renderNav(4);
 } else {
-    $pagenav = '';
+	$pagenav = '';
 }
 
 $xoopsTpl->assign('xoops_module_header', $xoops_module_header);
 $xoopsTpl->assign('dirname', $GLOBALS['moddirname']);
 
 if ($category_id || $blog_id || $uid) {
-    $xoopsTpl->assign('link_index', "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . "/index.php\" title=\"" . planet_constant('MD_INDEX') . "\" target=\"_self\">" . planet_constant('MD_INDEX') . '</a>');
+	$xoopsTpl->assign('link_index', "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . "/index.php\" title=\"" . planet_constant('MD_INDEX') . "\" target=\"_self\">" . planet_constant('MD_INDEX') . '</a>');
 }
 
 $link_switch = "<a href=\""
-               . XOOPS_URL
-               . '/modules/'
-               . $GLOBALS['moddirname']
-               . '/index.php'
-               . (empty($category_id) ? '' : '/c' . $category_id)
-               . (empty($uid) ? '' : '/u' . $uid)
-               . (empty($blog_id) ? '' : '/b' . $blog_id)
-               . (empty($list) ? '/l1' : '')
-               . "\" title=\""
-               . (empty($list) ? planet_constant('MD_LISTVIEW') : planet_constant('MD_FULLVIEW'))
-               . "\">"
-               . (empty($list) ? planet_constant('MD_LISTVIEW') : planet_constant('MD_FULLVIEW'))
-               . '</a>';
+			   . XOOPS_URL
+			   . '/modules/'
+			   . $GLOBALS['moddirname']
+			   . '/index.php'
+			   . (empty($category_id) ? '' : '/c' . $category_id)
+			   . (empty($uid) ? '' : '/u' . $uid)
+			   . (empty($blog_id) ? '' : '/b' . $blog_id)
+			   . (empty($list) ? '/l1' : '')
+			   . "\" title=\""
+			   . (empty($list) ? planet_constant('MD_LISTVIEW') : planet_constant('MD_FULLVIEW'))
+			   . "\">"
+			   . (empty($list) ? planet_constant('MD_LISTVIEW') : planet_constant('MD_FULLVIEW'))
+			   . '</a>';
 $xoopsTpl->assign('link_switch', $link_switch);
 
 $link_blogs = "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.blogs.php' . (empty($category_id) ? '' : '/c' . $category_id) . (empty($uid) ? '' : '/u' . $uid) . "\" title=\"" . planet_constant('MD_BLOGS') . "\">" . planet_constant('MD_BLOGS') . '</a>';
 $xoopsTpl->assign('link_blogs', $link_blogs);
 
 if (empty($uid) && is_object($xoopsUser)) {
-    $xoopsTpl->assign('link_bookmark', "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'u' . $xoopsUser->getVar('uid') . "\" title=\"" . planet_constant('MD_BOOKMARKS') . "\" target=\"_self\">" . planet_constant('MD_BOOKMARKS') . '</a>');
+	$xoopsTpl->assign('link_bookmark', "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'u' . $xoopsUser->getVar('uid') . "\" title=\"" . planet_constant('MD_BOOKMARKS') . "\" target=\"_self\">" . planet_constant('MD_BOOKMARKS') . '</a>');
 }
 
 if ($xoopsModuleConfig['newblog_submit'] == 1 || is_object($xoopsUser)) {
-    $xoopsTpl->assign('link_submit', "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . "/action.blog.php\" title=\"" . _SUBMIT . "\" target=\"_blank\">" . _SUBMIT . '</a>');
+	$xoopsTpl->assign('link_submit', "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . "/action.blog.php\" title=\"" . _SUBMIT . "\" target=\"_blank\">" . _SUBMIT . '</a>');
 }
 
 $xoopsTpl->assign('pagetitle', $xoopsModule->getVar('name') . '::' . planet_constant('MD_ARTICLES'));
@@ -290,22 +290,22 @@ 
 $xoopsTpl->assign('user_level', !is_object($xoopsUser) ? 0 : ($xoopsUser->isAdmin() ? 2 : 1));
 if (empty($xoopsModuleConfig['anonymous_rate']) && !is_object($xoopsUser)) {
 } elseif ($blog_id > 0) {
-    $xoopsTpl->assign('canrate', 1);
+	$xoopsTpl->assign('canrate', 1);
 }
 
 $sort_link   = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . (empty($category_id) ? '' : '/c' . $category_id) . (empty($uid) ? '' : '/u' . $uid) . (empty($blog_id) ? '' : '/b' . $blog_id) . (empty($list) ? '' : '/l1');
 $valid_sorts = array(
-    'views'   => planet_constant('MD_VIEWS'),
-    'rating'  => planet_constant('MD_RATING'),
-    'time'    => planet_constant('MD_TIME'),
-    'default' => planet_constant('MD_DEFAULT')
+	'views'   => planet_constant('MD_VIEWS'),
+	'rating'  => planet_constant('MD_RATING'),
+	'time'    => planet_constant('MD_TIME'),
+	'default' => planet_constant('MD_DEFAULT')
 );
 $sortlinks   = array();
 foreach ($valid_sorts as $val => $name) {
-    if ($val == $sort) {
-        continue;
-    }
-    $sortlinks[] = "<a href=\"" . $sort_link . '/' . $val . "\">" . $name . '</a>';
+	if ($val == $sort) {
+		continue;
+	}
+	$sortlinks[] = "<a href=\"" . $sort_link . '/' . $val . "\">" . $name . '</a>';
 }
 $xoopsTpl->assign('link_sort', implode(' | ', $sortlinks));
 $xoopsTpl->assign('version', $xoopsModule->getVar('version'));
@@ -314,8 +314,8 @@ 
 
 // for notification
 if (!empty($blog_id)) {
-    //$_SERVER['REQUEST_URI'] = XOOPS_URL."/modules/".$GLOBALS["moddirname"]."/index.php";
-    $_GET['blog'] = $blog_id;
+	//$_SERVER['REQUEST_URI'] = XOOPS_URL."/modules/".$GLOBALS["moddirname"]."/index.php";
+	$_GET['blog'] = $blog_id;
 }
 
 require_once __DIR__ . '/footer.php';

Spacing +48 added lines, -48 removed lines

@@ -24,10 +24,10 @@ 
 // URL: https://xoops.org                         //
 // Project: Article Project                                                 //
 // ------------------------------------------------------------------------ //
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 if (preg_match("/\/notification_update\.php/i", $_SERVER['REQUEST_URI'], $matches)) {
-    include XOOPS_ROOT_PATH . '/include/notification_update.php';
+    include XOOPS_ROOT_PATH.'/include/notification_update.php';
     exit();
 }
 
@@ -37,17 +37,17 @@ 
 }
 
 /* Start */
-$start = (int)(empty($_GET['start']) ? @$args['start'] : $_GET['start']);
+$start = (int) (empty($_GET['start']) ? @$args['start'] : $_GET['start']);
 /* Specified Category */
-$category_id = (int)(empty($_GET['category']) ? @$args['category'] : $_GET['category']);
+$category_id = (int) (empty($_GET['category']) ? @$args['category'] : $_GET['category']);
 /* Specified Blog */
-$blog_id = (int)(empty($_GET['blog']) ? @$args['blog'] : $_GET['blog']);
+$blog_id = (int) (empty($_GET['blog']) ? @$args['blog'] : $_GET['blog']);
 /* Specified Bookmar(Favorite) UID */
-$uid = (int)(empty($_GET['uid']) ? @$args['uid'] : $_GET['uid']);
+$uid = (int) (empty($_GET['uid']) ? @$args['uid'] : $_GET['uid']);
 /* Sort by term */
 $sort = empty($_GET['sort']) ? @$args['sort'] : $_GET['sort'];
 /* Display as list */
-$list = (int)(empty($_GET['list']) ? @$args['list'] : $_GET['list']);
+$list = (int) (empty($_GET['list']) ? @$args['list'] : $_GET['list']);
 
 // restore $_SERVER['REQUEST_URI']
 if (!empty($REQUEST_URI_parsed)) {
@@ -55,28 +55,28 @@ 
     $_args            = array('start', 'sort', 'uid', 'list');
     foreach ($_args as $arg) {
         if (!empty(${$arg})) {
-            $args_REQUEST_URI[] = $arg . '=' . ${$arg};
+            $args_REQUEST_URI[] = $arg.'='.${$arg};
         }
     }
     if (!empty($blog_id)) {
-        $args_REQUEST_URI[] = 'blog=' . $blog_id;
+        $args_REQUEST_URI[] = 'blog='.$blog_id;
     }
     if (!empty($category_id)) {
-        $args_REQUEST_URI[] = 'category=' . $category_id;
+        $args_REQUEST_URI[] = 'category='.$category_id;
     }
-    $_SERVER['REQUEST_URI'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . (empty($args_REQUEST_URI) ? '' : '?' . implode('&', $args_REQUEST_URI));
+    $_SERVER['REQUEST_URI'] = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'.(empty($args_REQUEST_URI) ? '' : '?'.implode('&', $args_REQUEST_URI));
 }
 
 $GLOBALS['xoopsOption']['template_main'] = PlanetUtility::planetGetTemplate('index');
 $xoops_module_header                     = '
-    <link rel="alternate" type="application/rss+xml" title="' . $xoopsModule->getVar('name') . ' rss" href="' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/xml.php".URL_DELIMITER."rss/c' . $category_id . '/b' . $blog_id . '/u' . $uid . '">
-    <link rel="alternate" type="application/rss+xml" title="' . $xoopsModule->getVar('name') . ' rdf" href="' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/xml.php".URL_DELIMITER."rdf/c' . $category_id . '/b' . $blog_id . '/u' . $uid . '">
-    <link rel="alternate" type="application/atom+xml" title="' . $xoopsModule->getVar('name') . ' atom" href="' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/xml.php".URL_DELIMITER."atom/c' . $category_id . '/b' . $blog_id . '/u' . $uid . '">
+    <link rel="alternate" type="application/rss+xml" title="' . $xoopsModule->getVar('name').' rss" href="'.XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/xml.php".URL_DELIMITER."rss/c'.$category_id.'/b'.$blog_id.'/u'.$uid.'">
+    <link rel="alternate" type="application/rss+xml" title="' . $xoopsModule->getVar('name').' rdf" href="'.XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/xml.php".URL_DELIMITER."rdf/c'.$category_id.'/b'.$blog_id.'/u'.$uid.'">
+    <link rel="alternate" type="application/atom+xml" title="' . $xoopsModule->getVar('name').' atom" href="'.XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/xml.php".URL_DELIMITER."atom/c'.$category_id.'/b'.$blog_id.'/u'.$uid.'">
     ';
 
 $xoopsOption['xoops_module_header'] = $xoops_module_header;
-require_once XOOPS_ROOT_PATH . '/header.php';
-include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
+require_once XOOPS_ROOT_PATH.'/header.php';
+include XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/include/vars.php';
 
 // Following part will not be executed after cache
 $categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
@@ -88,7 +88,7 @@ 
 $criteria       = new CriteriaCompo();
 $article_prefix = '';
 /* Specific category */
-if ($category_id > 0) {
+if ($category_id>0) {
     $category_obj = $categoryHandler->get($category_id);
     $criteria->add(new Criteria('bc.cat_id', $category_id));
     $uid            = 0;
@@ -98,7 +98,7 @@ 
     $article_prefix = 'a.';
 }
 /* Specific blog */
-if ($blog_id > 0) {
+if ($blog_id>0) {
     $blog_obj = $blogHandler->get($blog_id);
     if ($blog_obj->getVar('blog_status')
         || (is_object($xoopsUser)
@@ -125,7 +125,7 @@ 
     $article_prefix = '';
 }
 /* User bookmarks(favorites) */
-if ($uid > 0) {
+if ($uid>0) {
     $criteria->add(new Criteria('bm.bm_uid', $uid));
     $category_id     = 0;
     $blog_id         = 0;
@@ -144,13 +144,13 @@ 
 $sort  = empty($sort) ? 'time' : $sort;
 switch ($sort) {
     case 'views':
-        $sortby = $article_prefix . 'art_views';
+        $sortby = $article_prefix.'art_views';
         break;
     case 'rating':
-        $sortby = $article_prefix . 'art_rating';
+        $sortby = $article_prefix.'art_rating';
         break;
     case 'time':
-        $sortby = $article_prefix . 'art_time';
+        $sortby = $article_prefix.'art_time';
         break;
     case 'default':
     default:
@@ -163,9 +163,9 @@ 
 $criteria->setLimit($limit);
 
 $tags = empty($list) ? '' : array(
-    $article_prefix . 'art_title',
-    $article_prefix . 'blog_id',
-    $article_prefix . 'art_time'
+    $article_prefix.'art_title',
+    $article_prefix.'blog_id',
+    $article_prefix.'art_time'
 );
 switch ($query_type) {
     case 'category':
@@ -184,12 +184,12 @@ 
 
 if (!empty($blog_data)) {
     $blogs[$blog_data['id']] = $blog_data['title'];
-} else {
+}else {
     $blog_array = array();
     foreach (array_keys($articles_obj) as $id) {
         $blog_array[$articles_obj[$id]->getVar('blog_id')] = 1;
     }
-    $criteria_blog = new Criteria('blog_id', '(' . implode(',', array_keys($blog_array)) . ')', 'IN');
+    $criteria_blog = new Criteria('blog_id', '('.implode(',', array_keys($blog_array)).')', 'IN');
     $blogs         = $blogHandler->getList($criteria_blog);
 }
 
@@ -215,7 +215,7 @@ 
         ));
         if (!empty($xoopsModuleConfig['display_summary'])) {
             $_article['content'] = $articles_obj[$id]->getSummary();
-        } else {
+        }else {
             $_article['content'] = $articles_obj[$id]->getVar('art_content');
         }
     }
@@ -224,24 +224,24 @@ 
 }
 unset($articles_obj);
 
-if ($count_article > $limit) {
-    include XOOPS_ROOT_PATH . '/class/pagenav.php';
+if ($count_article>$limit) {
+    include XOOPS_ROOT_PATH.'/class/pagenav.php';
     $start_link = array();
     if ($sort) {
-        $start_link[] = 'sort=' . $sort;
+        $start_link[] = 'sort='.$sort;
     }
     if ($category_id) {
-        $start_link[] = 'category=' . $category_id;
+        $start_link[] = 'category='.$category_id;
     }
     if ($blog_id) {
-        $start_link[] = 'blog=' . $blog_id;
+        $start_link[] = 'blog='.$blog_id;
     }
     if ($list) {
-        $start_link[] = 'list=' . $list;
+        $start_link[] = 'list='.$list;
     }
     $nav     = new XoopsPageNav($count_article, $limit, $start, 'start', implode('&amp;', $start_link));
     $pagenav = $nav->renderNav(4);
-} else {
+}else {
     $pagenav = '';
 }
 
@@ -249,7 +249,7 @@ 
 $xoopsTpl->assign('dirname', $GLOBALS['moddirname']);
 
 if ($category_id || $blog_id || $uid) {
-    $xoopsTpl->assign('link_index', "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . "/index.php\" title=\"" . planet_constant('MD_INDEX') . "\" target=\"_self\">" . planet_constant('MD_INDEX') . '</a>');
+    $xoopsTpl->assign('link_index', "<a href=\"".XOOPS_URL.'/modules/'.$GLOBALS['moddirname']."/index.php\" title=\"".planet_constant('MD_INDEX')."\" target=\"_self\">".planet_constant('MD_INDEX').'</a>');
 }
 
 $link_switch = "<a href=\""
@@ -257,9 +257,9 @@ 
                . '/modules/'
                . $GLOBALS['moddirname']
                . '/index.php'
-               . (empty($category_id) ? '' : '/c' . $category_id)
-               . (empty($uid) ? '' : '/u' . $uid)
-               . (empty($blog_id) ? '' : '/b' . $blog_id)
+               . (empty($category_id) ? '' : '/c'.$category_id)
+               . (empty($uid) ? '' : '/u'.$uid)
+               . (empty($blog_id) ? '' : '/b'.$blog_id)
                . (empty($list) ? '/l1' : '')
                . "\" title=\""
                . (empty($list) ? planet_constant('MD_LISTVIEW') : planet_constant('MD_FULLVIEW'))
@@ -268,18 +268,18 @@ 
                . '</a>';
 $xoopsTpl->assign('link_switch', $link_switch);
 
-$link_blogs = "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.blogs.php' . (empty($category_id) ? '' : '/c' . $category_id) . (empty($uid) ? '' : '/u' . $uid) . "\" title=\"" . planet_constant('MD_BLOGS') . "\">" . planet_constant('MD_BLOGS') . '</a>';
+$link_blogs = "<a href=\"".XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.blogs.php'.(empty($category_id) ? '' : '/c'.$category_id).(empty($uid) ? '' : '/u'.$uid)."\" title=\"".planet_constant('MD_BLOGS')."\">".planet_constant('MD_BLOGS').'</a>';
 $xoopsTpl->assign('link_blogs', $link_blogs);
 
 if (empty($uid) && is_object($xoopsUser)) {
-    $xoopsTpl->assign('link_bookmark', "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'u' . $xoopsUser->getVar('uid') . "\" title=\"" . planet_constant('MD_BOOKMARKS') . "\" target=\"_self\">" . planet_constant('MD_BOOKMARKS') . '</a>');
+    $xoopsTpl->assign('link_bookmark', "<a href=\"".XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'.URL_DELIMITER.'u'.$xoopsUser->getVar('uid')."\" title=\"".planet_constant('MD_BOOKMARKS')."\" target=\"_self\">".planet_constant('MD_BOOKMARKS').'</a>');
 }
 
 if ($xoopsModuleConfig['newblog_submit'] == 1 || is_object($xoopsUser)) {
-    $xoopsTpl->assign('link_submit', "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . "/action.blog.php\" title=\"" . _SUBMIT . "\" target=\"_blank\">" . _SUBMIT . '</a>');
+    $xoopsTpl->assign('link_submit', "<a href=\"".XOOPS_URL.'/modules/'.$GLOBALS['moddirname']."/action.blog.php\" title=\""._SUBMIT."\" target=\"_blank\">"._SUBMIT.'</a>');
 }
 
-$xoopsTpl->assign('pagetitle', $xoopsModule->getVar('name') . '::' . planet_constant('MD_ARTICLES'));
+$xoopsTpl->assign('pagetitle', $xoopsModule->getVar('name').'::'.planet_constant('MD_ARTICLES'));
 $xoopsTpl->assign('category', @$category_data);
 $xoopsTpl->assign('blog', @$blog_data);
 $xoopsTpl->assign('user', @$user_data);
@@ -289,23 +289,23 @@ 
 
 $xoopsTpl->assign('user_level', !is_object($xoopsUser) ? 0 : ($xoopsUser->isAdmin() ? 2 : 1));
 if (empty($xoopsModuleConfig['anonymous_rate']) && !is_object($xoopsUser)) {
-} elseif ($blog_id > 0) {
+} elseif ($blog_id>0) {
     $xoopsTpl->assign('canrate', 1);
 }
 
-$sort_link   = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . (empty($category_id) ? '' : '/c' . $category_id) . (empty($uid) ? '' : '/u' . $uid) . (empty($blog_id) ? '' : '/b' . $blog_id) . (empty($list) ? '' : '/l1');
+$sort_link   = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'.(empty($category_id) ? '' : '/c'.$category_id).(empty($uid) ? '' : '/u'.$uid).(empty($blog_id) ? '' : '/b'.$blog_id).(empty($list) ? '' : '/l1');
 $valid_sorts = array(
     'views'   => planet_constant('MD_VIEWS'),
     'rating'  => planet_constant('MD_RATING'),
     'time'    => planet_constant('MD_TIME'),
     'default' => planet_constant('MD_DEFAULT')
 );
-$sortlinks   = array();
+$sortlinks = array();
 foreach ($valid_sorts as $val => $name) {
     if ($val == $sort) {
         continue;
     }
-    $sortlinks[] = "<a href=\"" . $sort_link . '/' . $val . "\">" . $name . '</a>';
+    $sortlinks[] = "<a href=\"".$sort_link.'/'.$val."\">".$name.'</a>';
 }
 $xoopsTpl->assign('link_sort', implode(' | ', $sortlinks));
 $xoopsTpl->assign('version', $xoopsModule->getVar('version'));
@@ -318,4 +318,4 @@ 
     $_GET['blog'] = $blog_id;
 }
 
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';

footer.php

Spacing +1 added lines, -1 removed lines

@@ -25,4 +25,4 @@
 // Project: Article Project                                                 //
 // ------------------------------------------------------------------------ //
 
-require_once XOOPS_ROOT_PATH . '/footer.php';
+require_once XOOPS_ROOT_PATH.'/footer.php';

language/english/modinfo.php

Indentation +2 added lines, -2 removed lines

@@ -8,13 +8,13 @@
 
 $current_path = __FILE__;
 if (DIRECTORY_SEPARATOR !== '/') {
-    $current_path = str_replace(strpos($current_path, "\\\\", 2) ? "\\\\" : DIRECTORY_SEPARATOR, '/', $current_path);
+	$current_path = str_replace(strpos($current_path, "\\\\", 2) ? "\\\\" : DIRECTORY_SEPARATOR, '/', $current_path);
 }
 $url_arr = explode('/', strstr($current_path, '/modules/'));
 include XOOPS_ROOT_PATH . '/modules/' . $url_arr[2] . '/include/vars.php';
 
 if (defined($GLOBALS['VAR_PREFIXU'] . '_LANG_EN_MODINFO')) {
-    return;
+	return;
 }
 define($GLOBALS['VAR_PREFIXU'] . '_LANG_EN_MODINFO', 1);
 

Spacing +111 added lines, -111 removed lines

@@ -11,117 +11,117 @@
     $current_path = str_replace(strpos($current_path, "\\\\", 2) ? "\\\\" : DIRECTORY_SEPARATOR, '/', $current_path);
 }
 $url_arr = explode('/', strstr($current_path, '/modules/'));
-include XOOPS_ROOT_PATH . '/modules/' . $url_arr[2] . '/include/vars.php';
+include XOOPS_ROOT_PATH.'/modules/'.$url_arr[2].'/include/vars.php';
 
-if (defined($GLOBALS['VAR_PREFIXU'] . '_LANG_EN_MODINFO')) {
+if (defined($GLOBALS['VAR_PREFIXU'].'_LANG_EN_MODINFO')) {
     return;
 }
-define($GLOBALS['VAR_PREFIXU'] . '_LANG_EN_MODINFO', 1);
-
-define($GLOBALS['VAR_PREFIXU'] . '_MI_NAME', 'Planet');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_DESC', 'Feed Planet For Xoops');
-
-define($GLOBALS['VAR_PREFIXU'] . '_MI_PAGE_INDEX', 'Index');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_PAGE_ARTICLE', 'Article');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_PAGE_ARCHIVE', 'Archive');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_PAGE_LIST', 'List');
-
-define($GLOBALS['VAR_PREFIXU'] . '_MI_SUBMIT', 'Submit');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLE', 'Articles');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLE_DESC', '');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_CATEGORY', 'Categories');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_CATEGORY_DESC', '');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_BLOG', 'BLogs');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_BLOG_DESC', '');
-
-define($GLOBALS['VAR_PREFIXU'] . '_MI_THEMESET', 'Theme set');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_THEMESET_DESC', "Module-wide, select '" . _NONE . "' will use site-wide theme");
-
-define($GLOBALS['VAR_PREFIXU'] . '_MI_TIMEFORMAT', 'Time format for display');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_TIMEFORMAT_DESC', '');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_TIMEFORMAT_CUSTOM', 'Custom');
-
-define($GLOBALS['VAR_PREFIXU'] . '_MI_DISPLAY_SUMMARY', 'Display summary length on article list');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_DISPLAY_SUMMARY_DESC', '0 for full text');
-
-define($GLOBALS['VAR_PREFIXU'] . '_MI_DODEBUG', 'Enable debug');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_DODEBUG_DESC', '');
-
-define($GLOBALS['VAR_PREFIXU'] . '_MI_DOURLREWRITE', 'Enable URL rewrite');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_DOURLREWRITE_DESC', 'AcceptPathInfo On for Apache2 is required');
-
-define($GLOBALS['VAR_PREFIXU'] . '_MI_DOSIBLING', 'Enable sibling articles');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_DOSIBLING_DESC', '');
-
-define($GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLESPERPAGE', 'Articles on one page');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLESPERPAGE_DESC', '');
-
-define($GLOBALS['VAR_PREFIXU'] . '_MI_LISTPERPAGE', 'Lists on one page');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_LISTPERPAGE_DESC', '');
-
-define($GLOBALS['VAR_PREFIXU'] . '_MI_BLOGSPERUPDATE', 'Blogs for each update');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_BLOGSPERUPDATE_DESC', '');
-
-define($GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLE_EXPIRE', 'Time for article to expire');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLE_EXPIRE_DESC', 'In days');
-
-define($GLOBALS['VAR_PREFIXU'] . '_MI_COPYRIGHT', 'Copyright');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_COPYRIGHT_DESC', '');
-
-define($GLOBALS['VAR_PREFIXU'] . '_MI_PING', 'Pings');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_PING_DESC', 'URLs to ping');
-
-define($GLOBALS['VAR_PREFIXU'] . '_MI_TRACKBACK_OPTION', 'Option for recieved trackbacks');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_TRACKBACK_OPTION_DESC', '');
-
-define($GLOBALS['VAR_PREFIXU'] . '_MI_MODERATION', 'Moderator to approve');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_MEMBER', 'Member atuo-approve');
-
-define($GLOBALS['VAR_PREFIXU'] . '_MI_NEWBLOG_SUBMIT', 'Right for submitting new blog');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_NEWBLOG_SUBMIT_DESC', '');
-
-define($GLOBALS['VAR_PREFIXU'] . '_MI_ANONYMOUSRATE', 'Allow anonymous to rate');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_ANONYMOUSRATE_DESC', '');
-
-define($GLOBALS['VAR_PREFIXU'] . '_MI_PSEUDOCRON', 'Pseudo cron');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_PSEUDOCRON_DESC', 'Use pseudo cron to update blogs');
-
-define($GLOBALS['VAR_PREFIXU'] . '_MI_ADMENU_INDEX', 'Index');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_ADMENU_CATEGORY', 'Category');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_ADMENU_BLOG', 'Blog');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_ADMENU_ARTICLE', 'Article');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_ADMENU_BLOCK', 'Block');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_ADMENU_ABOUT', 'About');
-
-define($GLOBALS['VAR_PREFIXU'] . '_MI_GLOBAL_NOTIFY', 'Global');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_GLOBAL_NOTIFYDSC', 'Global notification options');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_BLOG_NOTIFY', 'Blog');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_BLOG_NOTIFYDSC', 'Blog notification options');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLE_NOTIFY', 'Article');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLE_NOTIFYDSC', 'Article notification options');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_GLOBAL_BLOGSUBMIT_NOTIFY', 'Article submission');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_GLOBAL_BLOGSUBMIT_NOTIFYCAP', 'Notify me of any pending blog');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_GLOBAL_BLOGSUBMIT_NOTIFYDSC', 'Receive notification when a new blog is submitted');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_GLOBAL_BLOGSUBMIT_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} auto-notify : New blog submitted');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_GLOBAL_NEWBLOG_NOTIFY', 'New blog');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_GLOBAL_NEWBLOG_NOTIFYCAP', 'Notify of any new blog published');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_GLOBAL_NEWBLOG_NOTIFYDSC', 'Receive notification when a new blog is published');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_GLOBAL_NEWBLOG_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} auto-notify : New blog published');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_GLOBAL_ARTICLEMONITOR_NOTIFY', 'Article monitor');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_GLOBAL_ARTICLEMONITOR_NOTIFYCAP', 'Notify me of all actions on my articles');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_GLOBAL_ARTICLEMONITOR_NOTIFYDSC', 'Receive notification when an action is taken over my articles');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_GLOBAL_ARTICLEMONITOR_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} auto-notify : New action');
-
-define($GLOBALS['VAR_PREFIXU'] . '_MI_BLOG_BLOGAPPROVE_NOTIFY', 'Blog approved');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_BLOG_BLOGAPPROVE_NOTIFYCAP', 'Notify me of approval of this blog');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_BLOG_BLOGAPPROVE_NOTIFYDSC', 'Receive notification when the blog is approved');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_BLOG_BLOGAPPROVE_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} auto-notify : blog approved');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_BLOG_BLOGUPDATE_NOTIFY', 'Blog updated');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_BLOG_BLOGUPDATE_NOTIFYCAP', 'Notify me of update of this blog');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_BLOG_BLOGUPDATE_NOTIFYDSC', 'Receive notification when the blog is upated');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_BLOG_BLOGUPDATE_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} auto-notify : blog updated');
-
-define($GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLE_ARTICLEMONITOR_NOTIFY', 'Article monitor');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLE_ARTICLEMONITOR_NOTIFYCAP', 'Notify me of any action taken on this article');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLE_ARTICLEMONITOR_NOTIFYDSC', 'Receive notification when an action is taken on this article');
-define($GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLE_ARTICLEMONITOR_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} auto-notify : New article published');
+define($GLOBALS['VAR_PREFIXU'].'_LANG_EN_MODINFO', 1);
+
+define($GLOBALS['VAR_PREFIXU'].'_MI_NAME', 'Planet');
+define($GLOBALS['VAR_PREFIXU'].'_MI_DESC', 'Feed Planet For Xoops');
+
+define($GLOBALS['VAR_PREFIXU'].'_MI_PAGE_INDEX', 'Index');
+define($GLOBALS['VAR_PREFIXU'].'_MI_PAGE_ARTICLE', 'Article');
+define($GLOBALS['VAR_PREFIXU'].'_MI_PAGE_ARCHIVE', 'Archive');
+define($GLOBALS['VAR_PREFIXU'].'_MI_PAGE_LIST', 'List');
+
+define($GLOBALS['VAR_PREFIXU'].'_MI_SUBMIT', 'Submit');
+define($GLOBALS['VAR_PREFIXU'].'_MI_ARTICLE', 'Articles');
+define($GLOBALS['VAR_PREFIXU'].'_MI_ARTICLE_DESC', '');
+define($GLOBALS['VAR_PREFIXU'].'_MI_CATEGORY', 'Categories');
+define($GLOBALS['VAR_PREFIXU'].'_MI_CATEGORY_DESC', '');
+define($GLOBALS['VAR_PREFIXU'].'_MI_BLOG', 'BLogs');
+define($GLOBALS['VAR_PREFIXU'].'_MI_BLOG_DESC', '');
+
+define($GLOBALS['VAR_PREFIXU'].'_MI_THEMESET', 'Theme set');
+define($GLOBALS['VAR_PREFIXU'].'_MI_THEMESET_DESC', "Module-wide, select '"._NONE."' will use site-wide theme");
+
+define($GLOBALS['VAR_PREFIXU'].'_MI_TIMEFORMAT', 'Time format for display');
+define($GLOBALS['VAR_PREFIXU'].'_MI_TIMEFORMAT_DESC', '');
+define($GLOBALS['VAR_PREFIXU'].'_MI_TIMEFORMAT_CUSTOM', 'Custom');
+
+define($GLOBALS['VAR_PREFIXU'].'_MI_DISPLAY_SUMMARY', 'Display summary length on article list');
+define($GLOBALS['VAR_PREFIXU'].'_MI_DISPLAY_SUMMARY_DESC', '0 for full text');
+
+define($GLOBALS['VAR_PREFIXU'].'_MI_DODEBUG', 'Enable debug');
+define($GLOBALS['VAR_PREFIXU'].'_MI_DODEBUG_DESC', '');
+
+define($GLOBALS['VAR_PREFIXU'].'_MI_DOURLREWRITE', 'Enable URL rewrite');
+define($GLOBALS['VAR_PREFIXU'].'_MI_DOURLREWRITE_DESC', 'AcceptPathInfo On for Apache2 is required');
+
+define($GLOBALS['VAR_PREFIXU'].'_MI_DOSIBLING', 'Enable sibling articles');
+define($GLOBALS['VAR_PREFIXU'].'_MI_DOSIBLING_DESC', '');
+
+define($GLOBALS['VAR_PREFIXU'].'_MI_ARTICLESPERPAGE', 'Articles on one page');
+define($GLOBALS['VAR_PREFIXU'].'_MI_ARTICLESPERPAGE_DESC', '');
+
+define($GLOBALS['VAR_PREFIXU'].'_MI_LISTPERPAGE', 'Lists on one page');
+define($GLOBALS['VAR_PREFIXU'].'_MI_LISTPERPAGE_DESC', '');
+
+define($GLOBALS['VAR_PREFIXU'].'_MI_BLOGSPERUPDATE', 'Blogs for each update');
+define($GLOBALS['VAR_PREFIXU'].'_MI_BLOGSPERUPDATE_DESC', '');
+
+define($GLOBALS['VAR_PREFIXU'].'_MI_ARTICLE_EXPIRE', 'Time for article to expire');
+define($GLOBALS['VAR_PREFIXU'].'_MI_ARTICLE_EXPIRE_DESC', 'In days');
+
+define($GLOBALS['VAR_PREFIXU'].'_MI_COPYRIGHT', 'Copyright');
+define($GLOBALS['VAR_PREFIXU'].'_MI_COPYRIGHT_DESC', '');
+
+define($GLOBALS['VAR_PREFIXU'].'_MI_PING', 'Pings');
+define($GLOBALS['VAR_PREFIXU'].'_MI_PING_DESC', 'URLs to ping');
+
+define($GLOBALS['VAR_PREFIXU'].'_MI_TRACKBACK_OPTION', 'Option for recieved trackbacks');
+define($GLOBALS['VAR_PREFIXU'].'_MI_TRACKBACK_OPTION_DESC', '');
+
+define($GLOBALS['VAR_PREFIXU'].'_MI_MODERATION', 'Moderator to approve');
+define($GLOBALS['VAR_PREFIXU'].'_MI_MEMBER', 'Member atuo-approve');
+
+define($GLOBALS['VAR_PREFIXU'].'_MI_NEWBLOG_SUBMIT', 'Right for submitting new blog');
+define($GLOBALS['VAR_PREFIXU'].'_MI_NEWBLOG_SUBMIT_DESC', '');
+
+define($GLOBALS['VAR_PREFIXU'].'_MI_ANONYMOUSRATE', 'Allow anonymous to rate');
+define($GLOBALS['VAR_PREFIXU'].'_MI_ANONYMOUSRATE_DESC', '');
+
+define($GLOBALS['VAR_PREFIXU'].'_MI_PSEUDOCRON', 'Pseudo cron');
+define($GLOBALS['VAR_PREFIXU'].'_MI_PSEUDOCRON_DESC', 'Use pseudo cron to update blogs');
+
+define($GLOBALS['VAR_PREFIXU'].'_MI_ADMENU_INDEX', 'Index');
+define($GLOBALS['VAR_PREFIXU'].'_MI_ADMENU_CATEGORY', 'Category');
+define($GLOBALS['VAR_PREFIXU'].'_MI_ADMENU_BLOG', 'Blog');
+define($GLOBALS['VAR_PREFIXU'].'_MI_ADMENU_ARTICLE', 'Article');
+define($GLOBALS['VAR_PREFIXU'].'_MI_ADMENU_BLOCK', 'Block');
+define($GLOBALS['VAR_PREFIXU'].'_MI_ADMENU_ABOUT', 'About');
+
+define($GLOBALS['VAR_PREFIXU'].'_MI_GLOBAL_NOTIFY', 'Global');
+define($GLOBALS['VAR_PREFIXU'].'_MI_GLOBAL_NOTIFYDSC', 'Global notification options');
+define($GLOBALS['VAR_PREFIXU'].'_MI_BLOG_NOTIFY', 'Blog');
+define($GLOBALS['VAR_PREFIXU'].'_MI_BLOG_NOTIFYDSC', 'Blog notification options');
+define($GLOBALS['VAR_PREFIXU'].'_MI_ARTICLE_NOTIFY', 'Article');
+define($GLOBALS['VAR_PREFIXU'].'_MI_ARTICLE_NOTIFYDSC', 'Article notification options');
+define($GLOBALS['VAR_PREFIXU'].'_MI_GLOBAL_BLOGSUBMIT_NOTIFY', 'Article submission');
+define($GLOBALS['VAR_PREFIXU'].'_MI_GLOBAL_BLOGSUBMIT_NOTIFYCAP', 'Notify me of any pending blog');
+define($GLOBALS['VAR_PREFIXU'].'_MI_GLOBAL_BLOGSUBMIT_NOTIFYDSC', 'Receive notification when a new blog is submitted');
+define($GLOBALS['VAR_PREFIXU'].'_MI_GLOBAL_BLOGSUBMIT_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} auto-notify : New blog submitted');
+define($GLOBALS['VAR_PREFIXU'].'_MI_GLOBAL_NEWBLOG_NOTIFY', 'New blog');
+define($GLOBALS['VAR_PREFIXU'].'_MI_GLOBAL_NEWBLOG_NOTIFYCAP', 'Notify of any new blog published');
+define($GLOBALS['VAR_PREFIXU'].'_MI_GLOBAL_NEWBLOG_NOTIFYDSC', 'Receive notification when a new blog is published');
+define($GLOBALS['VAR_PREFIXU'].'_MI_GLOBAL_NEWBLOG_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} auto-notify : New blog published');
+define($GLOBALS['VAR_PREFIXU'].'_MI_GLOBAL_ARTICLEMONITOR_NOTIFY', 'Article monitor');
+define($GLOBALS['VAR_PREFIXU'].'_MI_GLOBAL_ARTICLEMONITOR_NOTIFYCAP', 'Notify me of all actions on my articles');
+define($GLOBALS['VAR_PREFIXU'].'_MI_GLOBAL_ARTICLEMONITOR_NOTIFYDSC', 'Receive notification when an action is taken over my articles');
+define($GLOBALS['VAR_PREFIXU'].'_MI_GLOBAL_ARTICLEMONITOR_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} auto-notify : New action');
+
+define($GLOBALS['VAR_PREFIXU'].'_MI_BLOG_BLOGAPPROVE_NOTIFY', 'Blog approved');
+define($GLOBALS['VAR_PREFIXU'].'_MI_BLOG_BLOGAPPROVE_NOTIFYCAP', 'Notify me of approval of this blog');
+define($GLOBALS['VAR_PREFIXU'].'_MI_BLOG_BLOGAPPROVE_NOTIFYDSC', 'Receive notification when the blog is approved');
+define($GLOBALS['VAR_PREFIXU'].'_MI_BLOG_BLOGAPPROVE_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} auto-notify : blog approved');
+define($GLOBALS['VAR_PREFIXU'].'_MI_BLOG_BLOGUPDATE_NOTIFY', 'Blog updated');
+define($GLOBALS['VAR_PREFIXU'].'_MI_BLOG_BLOGUPDATE_NOTIFYCAP', 'Notify me of update of this blog');
+define($GLOBALS['VAR_PREFIXU'].'_MI_BLOG_BLOGUPDATE_NOTIFYDSC', 'Receive notification when the blog is upated');
+define($GLOBALS['VAR_PREFIXU'].'_MI_BLOG_BLOGUPDATE_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} auto-notify : blog updated');
+
+define($GLOBALS['VAR_PREFIXU'].'_MI_ARTICLE_ARTICLEMONITOR_NOTIFY', 'Article monitor');
+define($GLOBALS['VAR_PREFIXU'].'_MI_ARTICLE_ARTICLEMONITOR_NOTIFYCAP', 'Notify me of any action taken on this article');
+define($GLOBALS['VAR_PREFIXU'].'_MI_ARTICLE_ARTICLEMONITOR_NOTIFYDSC', 'Receive notification when an action is taken on this article');
+define($GLOBALS['VAR_PREFIXU'].'_MI_ARTICLE_ARTICLEMONITOR_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} auto-notify : New article published');