mambax7 / planet

index.php

Indentation +175 added lines, -175 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 = planet_parse_args($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,34 +51,34 @@ 
 
 // 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));
 }
 
 $xoopsOption['template_main'] = planet_getTemplate('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 . '" />
+								. 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 . '" />
+								. 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 . '" />
+								. 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;
@@ -96,74 +96,74 @@ 
 $article_prefix = '';
 /* Specific category */
 if ($category_id > 0) {
-    $category_obj = $category_handler->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 = $category_handler->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 =& $blog_handler->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;
-        $bookmark_handler = 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 =& $blog_handler->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;
+		$bookmark_handler = 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;
-    $bookmark_handler = xoops_getModuleHandler('bookmark', $GLOBALS['moddirname']);
-    $user_data        = array(
-        'uid'   => $uid,
-        'name'  => XoopsUser::getUnameFromId($uid),
-        'marks' => $bookmark_handler->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;
+	$bookmark_handler = xoops_getModuleHandler('bookmark', $GLOBALS['moddirname']);
+	$user_data        = array(
+		'uid'   => $uid,
+		'name'  => XoopsUser::getUnameFromId($uid),
+		'marks' => $bookmark_handler->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);
@@ -171,120 +171,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  =& $article_handler->getByCategory($criteria, $tags);
-        $count_article = $article_handler->getCountByCategory($criteria);
-        break;
-    case 'bookmark':
-        $articles_obj  =& $article_handler->getByBookmark($criteria, $tags);
-        $count_article = $article_handler->getCountByBookmark($criteria);
-        break;
-    default:
-        $articles_obj  =& $article_handler->getAll($criteria, $tags);
-        $count_article = $article_handler->getCount($criteria);
-        break;
+	case 'category':
+		$articles_obj  =& $article_handler->getByCategory($criteria, $tags);
+		$count_article = $article_handler->getCountByCategory($criteria);
+		break;
+	case 'bookmark':
+		$articles_obj  =& $article_handler->getByBookmark($criteria, $tags);
+		$count_article = $article_handler->getCountByBookmark($criteria);
+		break;
+	default:
+		$articles_obj  =& $article_handler->getAll($criteria, $tags);
+		$count_article = $article_handler->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         = $blog_handler->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         = $blog_handler->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('&amp;', $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('&amp;', $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>';
+			   . (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>';
+			  . (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'));
@@ -298,25 +298,25 @@ 
 $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');
+																											 . $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'));
@@ -325,8 +325,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;
 }
 
 include_once __DIR__ . '/footer.php';

Spacing +68 added lines, -68 removed lines

@@ -24,10 +24,10 @@ 
 // URL: http://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,35 +55,35 @@ 
     $_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));
 }
 
 $xoopsOption['template_main'] = planet_getTemplate('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;
-include_once XOOPS_ROOT_PATH . '/header.php';
-include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
+include_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
 $category_handler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
@@ -95,7 +95,7 @@ 
 $criteria       = new CriteriaCompo();
 $article_prefix = '';
 /* Specific category */
-if ($category_id > 0) {
+if ($category_id>0) {
     $category_obj = $category_handler->get($category_id);
     $criteria->add(new Criteria('bc.cat_id', $category_id));
     $uid            = 0;
@@ -105,8 +105,8 @@ 
     $article_prefix = 'a.';
 }
 /* Specific blog */
-if ($blog_id > 0) {
-    $blog_obj =& $blog_handler->get($blog_id);
+if ($blog_id>0) {
+    $blog_obj = & $blog_handler->get($blog_id);
     if ($blog_obj->getVar('blog_status')
         || (is_object($xoopsUser)
             && $xoopsUser->getVar('uid') == $blog_obj->getVar('blog_submitter'))
@@ -133,7 +133,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;
@@ -152,13 +152,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:
@@ -171,33 +171,33 @@ 
 $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  =& $article_handler->getByCategory($criteria, $tags);
+        $articles_obj  = & $article_handler->getByCategory($criteria, $tags);
         $count_article = $article_handler->getCountByCategory($criteria);
         break;
     case 'bookmark':
-        $articles_obj  =& $article_handler->getByBookmark($criteria, $tags);
+        $articles_obj  = & $article_handler->getByBookmark($criteria, $tags);
         $count_article = $article_handler->getCountByBookmark($criteria);
         break;
     default:
-        $articles_obj  =& $article_handler->getAll($criteria, $tags);
+        $articles_obj  = & $article_handler->getAll($criteria, $tags);
         $count_article = $article_handler->getCount($criteria);
         break;
 }
 
 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         = $blog_handler->getList($criteria_blog);
 }
 
@@ -223,7 +223,7 @@ 
         ));
         if (!empty($xoopsModuleConfig['display_summary'])) {
             $_article['content'] = $articles_obj[$id]->getSummary();
-        } else {
+        }else {
             $_article['content'] = $articles_obj[$id]->getVar('art_content');
         }
     }
@@ -232,24 +232,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 = '';
 }
 
@@ -258,36 +258,36 @@ 
 
 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>');
+                      "<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>';
+$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>';
 $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>');
+                      "<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>');
+                      "<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);
@@ -297,13 +297,13 @@ 
 
 $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'
+$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($uid) ? '' : '/u'.$uid).(empty($blog_id) ? '' : '/b'.$blog_id)
                . (empty($list) ? '' : '/l1');
 $valid_sorts = array(
     'views'   => planet_constant('MD_VIEWS'),
@@ -311,12 +311,12 @@ 
     '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'));
@@ -329,4 +329,4 @@ 
     $_GET['blog'] = $blog_id;
 }
 
-include_once __DIR__ . '/footer.php';
+include_once __DIR__.'/footer.php';

action.blog.php

Indentation +108 added lines, -108 removed lines

@@ -32,15 +32,15 @@ 
 $blog_id = is_array($blog_id) ? array_map('intval', $blog_id) : (int)$blog_id;
 
 if (empty($xoopsModuleConfig['newblog_submit']) && (!is_object($xoopsUser) || !$xoopsUser->isAdmin())) {
-    redirect_header('index.php', 2, _NOPERM);
+	redirect_header('index.php', 2, _NOPERM);
 }
 
 if ($op === 'save' && !empty($_POST['fetch'])) {
-    $op = 'edit';
+	$op = 'edit';
 }
 
 if ($op === 'save' && !$GLOBALS['xoopsSecurity']->check()) {
-    redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_INVALID') . ': security check failed');
+	redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_INVALID') . ': security check failed');
 }
 include XOOPS_ROOT_PATH . '/header.php';
 include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
@@ -49,111 +49,111 @@ 
 $category_handler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
 
 switch ($op) {
-    /* save a single blog */
-    case 'save':
-
-        if ($blog_id) {
-            $blog_obj =& $blog_handler->get($blog_id);
-            if ($xoopsUser->isAdmin()) {
-                $blog_obj->setVar('blog_status', @$_POST['blog_status']);
-            }
-        } else {
-            if ($blog_exists = $blog_handler->getCount(new Criteria('blog_feed',
-                                                                    $myts->addSlashes(trim($_POST['blog_feed']))))
-            ) {
-                redirect_header('index.php', 2, planet_constant('MD_BLOGEXISTS'));
-            }
-
-            $blog_obj =& $blog_handler->create();
-            $blog_obj->setVar('blog_submitter', is_object($xoopsUser) ? $xoopsUser->getVar('uid') : planet_getIP(true));
-
-            switch ($xoopsModuleConfig['newblog_submit']) {
-                case 2:
-                    if (!is_object($xoopsUser)) {
-                        $status = 0;
-                    } else {
-                        $status = 1;
-                    }
-                    break;
-                case 0:
-                case 3:
-                    $status = 1;
-                    break;
-                case 1:
-                default:
-                    if (!is_object($xoopsUser) || !$xoopsUser->isAdmin()) {
-                        $status = 0;
-                    } else {
-                        $status = 1;
-                    }
-                    break;
-            }
-
-            $blog_obj->setVar('blog_status', $status);
-        }
-
-        $blog_obj->setVar('blog_title', $_POST['blog_title']);
-        $blog_obj->setVar('blog_desc', $_POST['blog_desc']);
-        $blog_obj->setVar('blog_image', $_POST['blog_image']);
-        $blog_obj->setVar('blog_feed', $_POST['blog_feed']);
-        $blog_obj->setVar('blog_link', $_POST['blog_link']);
-        $blog_obj->setVar('blog_language', $_POST['blog_language']);
-        $blog_obj->setVar('blog_charset', $_POST['blog_charset']);
-        $blog_obj->setVar('blog_trackback', $_POST['blog_trackback']);
-        if ($blog_obj->isNew()) {
-            $blog_obj->setVar('blog_submitter', is_object($xoopsUser) ? $xoopsUser->getVar('uid') : planet_getIP(true));
-        }
-
-        if (!$blog_handler->insert($blog_obj)) {
-        } elseif (!empty($_POST['categories'])) {
-            $blog_id = $blog_obj->getVar('blog_id');
-            if (in_array(0, $_POST['categories'])) {
-                $_POST['categories'] = array();
-            }
-            $blog_handler->setCategories($blog_id, $_POST['categories']);
-        }
-        $message = planet_constant('MD_DBUPDATED');
-        redirect_header('index.php' . URL_DELIMITER . 'b' . $blog_id, 2, $message);
-
-    /* edit a single blog */
-    case 'edit':
-    default:
-        if (!empty($_POST['fetch'])) {
-            $blog_obj =& $blog_handler->fetch($_POST['blog_feed']);
-            $blog_obj->setVar('blog_id', $blog_id);
-        } else {
-            $blog_obj =& $blog_handler->get($blog_id);
-        }
-        $categories = isset($_POST['categories']) ? $_POST['categories'] : array();
-        if (in_array('-1', $categories)) {
-            $categories = array();
-        }
-        if (empty($categories) && $blog_id > 0) {
-            $crit       = new Criteria('bc.blog_id', $blog_id);
-            $categories = array_keys($category_handler->getByBlog($crit));
-        }
-        if (empty($categories)) {
-            $categories = array(0 => _NONE);
-        }
-
-        echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _EDIT . '</legend>';
-        echo '<br>';
-        if (empty($blog_id) && $blog_obj->getVar('blog_feed')) {
-            $criteria  = new Criteria('blog_feed', $blog_obj->getVar('blog_feed'));
-            $blogs_obj =& $blog_handler->getList($criteria);
-            if (count($blogs_obj) > 0) {
-                echo "<div class=\"errorMsg\">" . planet_constant('MD_BLOGEXISTS');
-                foreach (array_keys($blogs_obj) as $bid) {
-                    echo "<br><a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php'
-                         . URL_DELIMITER . 'b' . $bid . "\" target=\"_blank\">" . $blogs_obj[$bid] . '</a>';
-                }
-                echo '</div>';
-                unset($blogs_obj, $criteria);
-            }
-        }
-        include XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/include/form.blog.php';
-        echo '</fieldset>';
-        break;
+	/* save a single blog */
+	case 'save':
+
+		if ($blog_id) {
+			$blog_obj =& $blog_handler->get($blog_id);
+			if ($xoopsUser->isAdmin()) {
+				$blog_obj->setVar('blog_status', @$_POST['blog_status']);
+			}
+		} else {
+			if ($blog_exists = $blog_handler->getCount(new Criteria('blog_feed',
+																	$myts->addSlashes(trim($_POST['blog_feed']))))
+			) {
+				redirect_header('index.php', 2, planet_constant('MD_BLOGEXISTS'));
+			}
+
+			$blog_obj =& $blog_handler->create();
+			$blog_obj->setVar('blog_submitter', is_object($xoopsUser) ? $xoopsUser->getVar('uid') : planet_getIP(true));
+
+			switch ($xoopsModuleConfig['newblog_submit']) {
+				case 2:
+					if (!is_object($xoopsUser)) {
+						$status = 0;
+					} else {
+						$status = 1;
+					}
+					break;
+				case 0:
+				case 3:
+					$status = 1;
+					break;
+				case 1:
+				default:
+					if (!is_object($xoopsUser) || !$xoopsUser->isAdmin()) {
+						$status = 0;
+					} else {
+						$status = 1;
+					}
+					break;
+			}
+
+			$blog_obj->setVar('blog_status', $status);
+		}
+
+		$blog_obj->setVar('blog_title', $_POST['blog_title']);
+		$blog_obj->setVar('blog_desc', $_POST['blog_desc']);
+		$blog_obj->setVar('blog_image', $_POST['blog_image']);
+		$blog_obj->setVar('blog_feed', $_POST['blog_feed']);
+		$blog_obj->setVar('blog_link', $_POST['blog_link']);
+		$blog_obj->setVar('blog_language', $_POST['blog_language']);
+		$blog_obj->setVar('blog_charset', $_POST['blog_charset']);
+		$blog_obj->setVar('blog_trackback', $_POST['blog_trackback']);
+		if ($blog_obj->isNew()) {
+			$blog_obj->setVar('blog_submitter', is_object($xoopsUser) ? $xoopsUser->getVar('uid') : planet_getIP(true));
+		}
+
+		if (!$blog_handler->insert($blog_obj)) {
+		} elseif (!empty($_POST['categories'])) {
+			$blog_id = $blog_obj->getVar('blog_id');
+			if (in_array(0, $_POST['categories'])) {
+				$_POST['categories'] = array();
+			}
+			$blog_handler->setCategories($blog_id, $_POST['categories']);
+		}
+		$message = planet_constant('MD_DBUPDATED');
+		redirect_header('index.php' . URL_DELIMITER . 'b' . $blog_id, 2, $message);
+
+	/* edit a single blog */
+	case 'edit':
+	default:
+		if (!empty($_POST['fetch'])) {
+			$blog_obj =& $blog_handler->fetch($_POST['blog_feed']);
+			$blog_obj->setVar('blog_id', $blog_id);
+		} else {
+			$blog_obj =& $blog_handler->get($blog_id);
+		}
+		$categories = isset($_POST['categories']) ? $_POST['categories'] : array();
+		if (in_array('-1', $categories)) {
+			$categories = array();
+		}
+		if (empty($categories) && $blog_id > 0) {
+			$crit       = new Criteria('bc.blog_id', $blog_id);
+			$categories = array_keys($category_handler->getByBlog($crit));
+		}
+		if (empty($categories)) {
+			$categories = array(0 => _NONE);
+		}
+
+		echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _EDIT . '</legend>';
+		echo '<br>';
+		if (empty($blog_id) && $blog_obj->getVar('blog_feed')) {
+			$criteria  = new Criteria('blog_feed', $blog_obj->getVar('blog_feed'));
+			$blogs_obj =& $blog_handler->getList($criteria);
+			if (count($blogs_obj) > 0) {
+				echo "<div class=\"errorMsg\">" . planet_constant('MD_BLOGEXISTS');
+				foreach (array_keys($blogs_obj) as $bid) {
+					echo "<br><a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php'
+						 . URL_DELIMITER . 'b' . $bid . "\" target=\"_blank\">" . $blogs_obj[$bid] . '</a>';
+				}
+				echo '</div>';
+				unset($blogs_obj, $criteria);
+			}
+		}
+		include XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/include/form.blog.php';
+		echo '</fieldset>';
+		break;
 }
 
 include XOOPS_ROOT_PATH . '/footer.php';

Spacing +23 added lines, -23 removed lines

@@ -25,11 +25,11 @@ 
 // Project: Article Project                                                 //
 // ------------------------------------------------------------------------ //
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 $op      = !empty($_POST['op']) ? $_POST['op'] : (!empty($_GET['op']) ? $_GET['op'] : '');
 $blog_id = !empty($_POST['blog']) ? $_POST['blog'] : (!empty($_GET['blog']) ? $_GET['blog'] : 0);
-$blog_id = is_array($blog_id) ? array_map('intval', $blog_id) : (int)$blog_id;
+$blog_id = is_array($blog_id) ? array_map('intval', $blog_id) : (int) $blog_id;
 
 if (empty($xoopsModuleConfig['newblog_submit']) && (!is_object($xoopsUser) || !$xoopsUser->isAdmin())) {
     redirect_header('index.php', 2, _NOPERM);
@@ -40,10 +40,10 @@ 
 }
 
 if ($op === 'save' && !$GLOBALS['xoopsSecurity']->check()) {
-    redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_INVALID') . ': security check failed');
+    redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_INVALID').': security check failed');
 }
-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';
 
 $blog_handler     = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
 $category_handler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
@@ -53,25 +53,25 @@ 
     case 'save':
 
         if ($blog_id) {
-            $blog_obj =& $blog_handler->get($blog_id);
+            $blog_obj = & $blog_handler->get($blog_id);
             if ($xoopsUser->isAdmin()) {
                 $blog_obj->setVar('blog_status', @$_POST['blog_status']);
             }
-        } else {
+        }else {
             if ($blog_exists = $blog_handler->getCount(new Criteria('blog_feed',
                                                                     $myts->addSlashes(trim($_POST['blog_feed']))))
             ) {
                 redirect_header('index.php', 2, planet_constant('MD_BLOGEXISTS'));
             }
 
-            $blog_obj =& $blog_handler->create();
+            $blog_obj = & $blog_handler->create();
             $blog_obj->setVar('blog_submitter', is_object($xoopsUser) ? $xoopsUser->getVar('uid') : planet_getIP(true));
 
             switch ($xoopsModuleConfig['newblog_submit']) {
                 case 2:
                     if (!is_object($xoopsUser)) {
                         $status = 0;
-                    } else {
+                    }else {
                         $status = 1;
                     }
                     break;
@@ -83,7 +83,7 @@ 
                 default:
                     if (!is_object($xoopsUser) || !$xoopsUser->isAdmin()) {
                         $status = 0;
-                    } else {
+                    }else {
                         $status = 1;
                     }
                     break;
@@ -113,22 +113,22 @@ 
             $blog_handler->setCategories($blog_id, $_POST['categories']);
         }
         $message = planet_constant('MD_DBUPDATED');
-        redirect_header('index.php' . URL_DELIMITER . 'b' . $blog_id, 2, $message);
+        redirect_header('index.php'.URL_DELIMITER.'b'.$blog_id, 2, $message);
 
     /* edit a single blog */
     case 'edit':
     default:
         if (!empty($_POST['fetch'])) {
-            $blog_obj =& $blog_handler->fetch($_POST['blog_feed']);
+            $blog_obj = & $blog_handler->fetch($_POST['blog_feed']);
             $blog_obj->setVar('blog_id', $blog_id);
-        } else {
-            $blog_obj =& $blog_handler->get($blog_id);
+        }else {
+            $blog_obj = & $blog_handler->get($blog_id);
         }
         $categories = isset($_POST['categories']) ? $_POST['categories'] : array();
         if (in_array('-1', $categories)) {
             $categories = array();
         }
-        if (empty($categories) && $blog_id > 0) {
+        if (empty($categories) && $blog_id>0) {
             $crit       = new Criteria('bc.blog_id', $blog_id);
             $categories = array_keys($category_handler->getByBlog($crit));
         }
@@ -136,24 +136,24 @@ 
             $categories = array(0 => _NONE);
         }
 
-        echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _EDIT . '</legend>';
+        echo "<fieldset><legend style='font-weight: bold; color: #900;'>"._EDIT.'</legend>';
         echo '<br>';
         if (empty($blog_id) && $blog_obj->getVar('blog_feed')) {
             $criteria  = new Criteria('blog_feed', $blog_obj->getVar('blog_feed'));
-            $blogs_obj =& $blog_handler->getList($criteria);
-            if (count($blogs_obj) > 0) {
-                echo "<div class=\"errorMsg\">" . planet_constant('MD_BLOGEXISTS');
+            $blogs_obj = & $blog_handler->getList($criteria);
+            if (count($blogs_obj)>0) {
+                echo "<div class=\"errorMsg\">".planet_constant('MD_BLOGEXISTS');
                 foreach (array_keys($blogs_obj) as $bid) {
-                    echo "<br><a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php'
-                         . URL_DELIMITER . 'b' . $bid . "\" target=\"_blank\">" . $blogs_obj[$bid] . '</a>';
+                    echo "<br><a href=\"".XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'
+                         . URL_DELIMITER.'b'.$bid."\" target=\"_blank\">".$blogs_obj[$bid].'</a>';
                 }
                 echo '</div>';
                 unset($blogs_obj, $criteria);
             }
         }
-        include XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/include/form.blog.php';
+        include XOOPS_ROOT_PATH.'/modules/'.$GLOBALS['moddirname'].'/include/form.blog.php';
         echo '</fieldset>';
         break;
 }
 
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

trackback.php

Indentation +150 added lines, -150 removed lines

@@ -37,167 +37,167 @@
 $charset    = trim($_POST['charset']);
 
 if (empty($xoopsModuleConfig['trackback_option'])) {
-    planet_trackback_response(1, 'Trackback is closed');
+	planet_trackback_response(1, 'Trackback is closed');
 }
 if (!strlen($title . $url . $blog_name)) {
-    planet_trackback_response(1, planet_constant('MD_INVALID'));
+	planet_trackback_response(1, planet_constant('MD_INVALID'));
 }
 
 if (!empty($article_id) && !empty($url)) {
-    $trackback_handler = xoops_getModuleHandler('trackback', $GLOBALS['moddirname']);
-    $criteria          = new CriteriaCompo(new Criteria('art_id', $article_id));
-    $criteria->add(new Criteria('tb_url', $url));
-    if ($trackback_handler->getCount($criteria) > 0) {
-        planet_trackback_response(1, 'We already have a ping from that URI for this article.');
-    }
+	$trackback_handler = xoops_getModuleHandler('trackback', $GLOBALS['moddirname']);
+	$criteria          = new CriteriaCompo(new Criteria('art_id', $article_id));
+	$criteria->add(new Criteria('tb_url', $url));
+	if ($trackback_handler->getCount($criteria) > 0) {
+		planet_trackback_response(1, 'We already have a ping from that URI for this article.');
+	}
 
-    $charset   = empty($charset) ? 'utf-8' : $charset;
-    $title     = XoopsLocal::convert_encoding($title, _CHARSET, $charset);
-    $excerpt   = XoopsLocal::convert_encoding($excerpt, _CHARSET, $charset);
-    $blog_name = XoopsLocal::convert_encoding($blog_name, _CHARSET, $charset);
-    $tb_status = (int)$xoopsModuleConfig['trackback_option'];
+	$charset   = empty($charset) ? 'utf-8' : $charset;
+	$title     = XoopsLocal::convert_encoding($title, _CHARSET, $charset);
+	$excerpt   = XoopsLocal::convert_encoding($excerpt, _CHARSET, $charset);
+	$blog_name = XoopsLocal::convert_encoding($blog_name, _CHARSET, $charset);
+	$tb_status = (int)$xoopsModuleConfig['trackback_option'];
 
-    $com_pid    = 0;
-    $com_itemid = $article_id;
-    $com_rootid = 0;
-    $com_title  = $title;
-    $com_text   = $excerpt;
-    $com_text .= "\n\n[TRACKBACK]" . _POSTEDBY . ': ';
-    if (!empty($url)) {
-        $com_text .= '[url=' . $url . ']' . $blog_name . '[/url]';
-    } else {
-        $com_text .= $blog_name;
-    }
-    $com_modid = $xoopsModule->getVar('mid');
+	$com_pid    = 0;
+	$com_itemid = $article_id;
+	$com_rootid = 0;
+	$com_title  = $title;
+	$com_text   = $excerpt;
+	$com_text .= "\n\n[TRACKBACK]" . _POSTEDBY . ': ';
+	if (!empty($url)) {
+		$com_text .= '[url=' . $url . ']' . $blog_name . '[/url]';
+	} else {
+		$com_text .= $blog_name;
+	}
+	$com_modid = $xoopsModule->getVar('mid');
 
-    $comment_handler = xoops_getHandler('comment');
-    $comment         = $comment_handler->create();
-    $comment->setVar('com_created', time());
-    $comment->setVar('com_pid', $com_pid);
-    $comment->setVar('com_itemid', $com_itemid);
-    $comment->setVar('com_rootid', $com_rootid);
-    $comment->setVar('com_ip', xoops_getenv('REMOTE_ADDR'));
-    switch ($tb_status) {
-        case 2:
-            $comment->setVar('com_status', 2);
-            $call_approvefunc = true;
-            $call_updatefunc  = true;
-            $notify_event     = 'comment';
-            break;
-        case 1:
-        default:
-            $comment->setVar('com_status', 1);
-            $notify_event = 'comment_submit';
-            break;
-    }
-    $comment->setVar('com_uid', 0);
-    $com_title = xoops_trim($com_title);
-    $com_title = empty($com_title) ? _NOTITLE : $com_title;
-    $comment->setVar('com_title', $com_title);
-    $comment->setVar('com_text', $com_text);
-    $comment->setVar('dohtml', 0);
-    $comment->setVar('dosmiley', 0);
-    $comment->setVar('doxcode', 1);
-    $comment->setVar('doimage', 0);
-    $comment->setVar('dobr', 1);
-    $comment->setVar('com_icon', '');
-    $comment->setVar('com_modified', time());
-    $comment->setVar('com_modid', $com_modid);
-    if (false != $comment_handler->insert($comment)) {
-        $newcid = $comment->getVar('com_id');
+	$comment_handler = xoops_getHandler('comment');
+	$comment         = $comment_handler->create();
+	$comment->setVar('com_created', time());
+	$comment->setVar('com_pid', $com_pid);
+	$comment->setVar('com_itemid', $com_itemid);
+	$comment->setVar('com_rootid', $com_rootid);
+	$comment->setVar('com_ip', xoops_getenv('REMOTE_ADDR'));
+	switch ($tb_status) {
+		case 2:
+			$comment->setVar('com_status', 2);
+			$call_approvefunc = true;
+			$call_updatefunc  = true;
+			$notify_event     = 'comment';
+			break;
+		case 1:
+		default:
+			$comment->setVar('com_status', 1);
+			$notify_event = 'comment_submit';
+			break;
+	}
+	$comment->setVar('com_uid', 0);
+	$com_title = xoops_trim($com_title);
+	$com_title = empty($com_title) ? _NOTITLE : $com_title;
+	$comment->setVar('com_title', $com_title);
+	$comment->setVar('com_text', $com_text);
+	$comment->setVar('dohtml', 0);
+	$comment->setVar('dosmiley', 0);
+	$comment->setVar('doxcode', 1);
+	$comment->setVar('doimage', 0);
+	$comment->setVar('dobr', 1);
+	$comment->setVar('com_icon', '');
+	$comment->setVar('com_modified', time());
+	$comment->setVar('com_modid', $com_modid);
+	if (false != $comment_handler->insert($comment)) {
+		$newcid = $comment->getVar('com_id');
 
-        // set own id as root id
-        $com_rootid = $newcid;
-        if (!$comment_handler->updateByField($comment, 'com_rootid', $com_rootid)) {
-            $comment_handler->delete($comment);
-            planet_trackback_response(1, xoops_error());
-        }
+		// set own id as root id
+		$com_rootid = $newcid;
+		if (!$comment_handler->updateByField($comment, 'com_rootid', $com_rootid)) {
+			$comment_handler->delete($comment);
+			planet_trackback_response(1, xoops_error());
+		}
 
-        // call custom approve function if any
-        if (false != $call_approvefunc && isset($comment_config['callback']['approve'])
-            && trim($comment_config['callback']['approve']) != ''
-        ) {
-            $skip = false;
-            if (!function_exists($comment_config['callback']['approve'])) {
-                if (isset($comment_config['callbackFile'])) {
-                    $callbackfile = trim($comment_config['callbackFile']);
-                    if ($callbackfile != ''
-                        && file_exists(XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile)
-                    ) {
-                        include_once XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile;
-                    }
-                    if (!function_exists($comment_config['callback']['approve'])) {
-                        $skip = true;
-                    }
-                } else {
-                    $skip = true;
-                }
-            }
-            if (!$skip) {
-                $comment_config['callback']['approve']($comment);
-            }
-        }
+		// call custom approve function if any
+		if (false != $call_approvefunc && isset($comment_config['callback']['approve'])
+			&& trim($comment_config['callback']['approve']) != ''
+		) {
+			$skip = false;
+			if (!function_exists($comment_config['callback']['approve'])) {
+				if (isset($comment_config['callbackFile'])) {
+					$callbackfile = trim($comment_config['callbackFile']);
+					if ($callbackfile != ''
+						&& file_exists(XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile)
+					) {
+						include_once XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile;
+					}
+					if (!function_exists($comment_config['callback']['approve'])) {
+						$skip = true;
+					}
+				} else {
+					$skip = true;
+				}
+			}
+			if (!$skip) {
+				$comment_config['callback']['approve']($comment);
+			}
+		}
 
-        // call custom update function if any
-        if (false != $call_updatefunc && isset($comment_config['callback']['update'])
-            && trim($comment_config['callback']['update']) != ''
-        ) {
-            $skip = false;
-            if (!function_exists($comment_config['callback']['update'])) {
-                if (isset($comment_config['callbackFile'])) {
-                    $callbackfile = trim($comment_config['callbackFile']);
-                    if ($callbackfile != ''
-                        && file_exists(XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile)
-                    ) {
-                        include_once XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile;
-                    }
-                    if (!function_exists($comment_config['callback']['update'])) {
-                        $skip = true;
-                    }
-                } else {
-                    $skip = true;
-                }
-            }
-            if (!$skip) {
-                $criteria = new CriteriaCompo(new Criteria('com_modid', $com_modid));
-                $criteria->add(new Criteria('com_itemid', $com_itemid));
-                $criteria->add(new Criteria('com_status', XOOPS_COMMENT_ACTIVE));
-                $comment_count = $comment_handler->getCount($criteria);
-                $func          = $comment_config['callback']['update'];
-                call_user_func_array($func, array($com_itemid, $comment_count, $comment->getVar('com_id')));
-            }
-        }
+		// call custom update function if any
+		if (false != $call_updatefunc && isset($comment_config['callback']['update'])
+			&& trim($comment_config['callback']['update']) != ''
+		) {
+			$skip = false;
+			if (!function_exists($comment_config['callback']['update'])) {
+				if (isset($comment_config['callbackFile'])) {
+					$callbackfile = trim($comment_config['callbackFile']);
+					if ($callbackfile != ''
+						&& file_exists(XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile)
+					) {
+						include_once XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile;
+					}
+					if (!function_exists($comment_config['callback']['update'])) {
+						$skip = true;
+					}
+				} else {
+					$skip = true;
+				}
+			}
+			if (!$skip) {
+				$criteria = new CriteriaCompo(new Criteria('com_modid', $com_modid));
+				$criteria->add(new Criteria('com_itemid', $com_itemid));
+				$criteria->add(new Criteria('com_status', XOOPS_COMMENT_ACTIVE));
+				$comment_count = $comment_handler->getCount($criteria);
+				$func          = $comment_config['callback']['update'];
+				call_user_func_array($func, array($com_itemid, $comment_count, $comment->getVar('com_id')));
+			}
+		}
 
-        // RMV-NOTIFY
-        // trigger notification event if necessary
-        if ($notify_event) {
-            $not_modid = $com_modid;
-            include_once XOOPS_ROOT_PATH . '/include/notification_functions.php';
-            $not_catinfo  =& notificationCommentCategoryInfo($not_modid);
-            $not_category = $not_catinfo['name'];
-            $not_itemid   = $com_itemid;
-            $not_event    = $notify_event;
-            // Build an ABSOLUTE URL to view the comment.  Make sure we
-            // point to a viewable page (i.e. not the system administration
-            // module).
-            $comment_tags = array();
-            $not_module   =& $xoopsModule;
-            if (!isset($comment_url)) {
-                $com_config  =& $not_module->getInfo('comments');
-                $comment_url = $com_config['pageName'] . '?';
-                $comment_url .= $com_config['itemName'];
-            }
-            $comment_tags['X_COMMENT_URL'] = XOOPS_URL . '/modules/' . $not_module->getVar('dirname') . '/'
-                                             . $comment_url . '=' . $com_itemid . '&com_id=' . $newcid
-                                             . '&com_rootid=' . $com_rootid . '&com_mode=' . $com_mode
-                                             . '&com_order=' . $com_order . '#comment' . $newcid;
-            $notification_handler          = xoops_getHandler('notification');
-            $notification_handler->triggerEvent($not_category, $not_itemid, $not_event, $comment_tags, false,
-                                                $not_modid);
-        }
+		// RMV-NOTIFY
+		// trigger notification event if necessary
+		if ($notify_event) {
+			$not_modid = $com_modid;
+			include_once XOOPS_ROOT_PATH . '/include/notification_functions.php';
+			$not_catinfo  =& notificationCommentCategoryInfo($not_modid);
+			$not_category = $not_catinfo['name'];
+			$not_itemid   = $com_itemid;
+			$not_event    = $notify_event;
+			// Build an ABSOLUTE URL to view the comment.  Make sure we
+			// point to a viewable page (i.e. not the system administration
+			// module).
+			$comment_tags = array();
+			$not_module   =& $xoopsModule;
+			if (!isset($comment_url)) {
+				$com_config  =& $not_module->getInfo('comments');
+				$comment_url = $com_config['pageName'] . '?';
+				$comment_url .= $com_config['itemName'];
+			}
+			$comment_tags['X_COMMENT_URL'] = XOOPS_URL . '/modules/' . $not_module->getVar('dirname') . '/'
+											 . $comment_url . '=' . $com_itemid . '&com_id=' . $newcid
+											 . '&com_rootid=' . $com_rootid . '&com_mode=' . $com_mode
+											 . '&com_order=' . $com_order . '#comment' . $newcid;
+			$notification_handler          = xoops_getHandler('notification');
+			$notification_handler->triggerEvent($not_category, $not_itemid, $not_event, $comment_tags, false,
+												$not_modid);
+		}
 
-        planet_trackback_response(0);
-    } else {
-        planet_trackback_response(1, xoops_error($comment->getHtmlErrors()));
-    }
+		planet_trackback_response(0);
+	} else {
+		planet_trackback_response(1, xoops_error($comment->getHtmlErrors()));
+	}
 }

Spacing +25 added lines, -25 removed lines

@@ -25,11 +25,11 @@ 
 // Project: Article Project                                                 //
 // ------------------------------------------------------------------------ //
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 // trackback is done by a POST
 $art_id     = explode('/', $_SERVER['REQUEST_URI']);
-$article_id = (int)$art_id[count($art_id) - 1];
+$article_id = (int) $art_id[count($art_id)-1];
 $url        = $_POST['url'];
 $title      = $_POST['title'];
 $excerpt    = $_POST['excerpt'];
@@ -39,7 +39,7 @@ 
 if (empty($xoopsModuleConfig['trackback_option'])) {
     planet_trackback_response(1, 'Trackback is closed');
 }
-if (!strlen($title . $url . $blog_name)) {
+if (!strlen($title.$url.$blog_name)) {
     planet_trackback_response(1, planet_constant('MD_INVALID'));
 }
 
@@ -47,7 +47,7 @@ 
     $trackback_handler = xoops_getModuleHandler('trackback', $GLOBALS['moddirname']);
     $criteria          = new CriteriaCompo(new Criteria('art_id', $article_id));
     $criteria->add(new Criteria('tb_url', $url));
-    if ($trackback_handler->getCount($criteria) > 0) {
+    if ($trackback_handler->getCount($criteria)>0) {
         planet_trackback_response(1, 'We already have a ping from that URI for this article.');
     }
 
@@ -55,17 +55,17 @@ 
     $title     = XoopsLocal::convert_encoding($title, _CHARSET, $charset);
     $excerpt   = XoopsLocal::convert_encoding($excerpt, _CHARSET, $charset);
     $blog_name = XoopsLocal::convert_encoding($blog_name, _CHARSET, $charset);
-    $tb_status = (int)$xoopsModuleConfig['trackback_option'];
+    $tb_status = (int) $xoopsModuleConfig['trackback_option'];
 
     $com_pid    = 0;
     $com_itemid = $article_id;
     $com_rootid = 0;
     $com_title  = $title;
     $com_text   = $excerpt;
-    $com_text .= "\n\n[TRACKBACK]" . _POSTEDBY . ': ';
+    $com_text .= "\n\n[TRACKBACK]"._POSTEDBY.': ';
     if (!empty($url)) {
-        $com_text .= '[url=' . $url . ']' . $blog_name . '[/url]';
-    } else {
+        $com_text .= '[url='.$url.']'.$blog_name.'[/url]';
+    }else {
         $com_text .= $blog_name;
     }
     $com_modid = $xoopsModule->getVar('mid');
@@ -122,14 +122,14 @@ 
                 if (isset($comment_config['callbackFile'])) {
                     $callbackfile = trim($comment_config['callbackFile']);
                     if ($callbackfile != ''
-                        && file_exists(XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile)
+                        && file_exists(XOOPS_ROOT_PATH.'/modules/'.$moddir.'/'.$callbackfile)
                     ) {
-                        include_once XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile;
+                        include_once XOOPS_ROOT_PATH.'/modules/'.$moddir.'/'.$callbackfile;
                     }
                     if (!function_exists($comment_config['callback']['approve'])) {
                         $skip = true;
                     }
-                } else {
+                }else {
                     $skip = true;
                 }
             }
@@ -147,14 +147,14 @@ 
                 if (isset($comment_config['callbackFile'])) {
                     $callbackfile = trim($comment_config['callbackFile']);
                     if ($callbackfile != ''
-                        && file_exists(XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile)
+                        && file_exists(XOOPS_ROOT_PATH.'/modules/'.$moddir.'/'.$callbackfile)
                     ) {
-                        include_once XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile;
+                        include_once XOOPS_ROOT_PATH.'/modules/'.$moddir.'/'.$callbackfile;
                     }
                     if (!function_exists($comment_config['callback']['update'])) {
                         $skip = true;
                     }
-                } else {
+                }else {
                     $skip = true;
                 }
             }
@@ -172,8 +172,8 @@ 
         // trigger notification event if necessary
         if ($notify_event) {
             $not_modid = $com_modid;
-            include_once XOOPS_ROOT_PATH . '/include/notification_functions.php';
-            $not_catinfo  =& notificationCommentCategoryInfo($not_modid);
+            include_once XOOPS_ROOT_PATH.'/include/notification_functions.php';
+            $not_catinfo  = & notificationCommentCategoryInfo($not_modid);
             $not_category = $not_catinfo['name'];
             $not_itemid   = $com_itemid;
             $not_event    = $notify_event;
@@ -181,23 +181,23 @@ 
             // point to a viewable page (i.e. not the system administration
             // module).
             $comment_tags = array();
-            $not_module   =& $xoopsModule;
+            $not_module   = & $xoopsModule;
             if (!isset($comment_url)) {
-                $com_config  =& $not_module->getInfo('comments');
-                $comment_url = $com_config['pageName'] . '?';
+                $com_config  = & $not_module->getInfo('comments');
+                $comment_url = $com_config['pageName'].'?';
                 $comment_url .= $com_config['itemName'];
             }
-            $comment_tags['X_COMMENT_URL'] = XOOPS_URL . '/modules/' . $not_module->getVar('dirname') . '/'
-                                             . $comment_url . '=' . $com_itemid . '&com_id=' . $newcid
-                                             . '&com_rootid=' . $com_rootid . '&com_mode=' . $com_mode
-                                             . '&com_order=' . $com_order . '#comment' . $newcid;
-            $notification_handler          = xoops_getHandler('notification');
+            $comment_tags['X_COMMENT_URL'] = XOOPS_URL.'/modules/'.$not_module->getVar('dirname').'/'
+                                             . $comment_url.'='.$com_itemid.'&com_id='.$newcid
+                                             . '&com_rootid='.$com_rootid.'&com_mode='.$com_mode
+                                             . '&com_order='.$com_order.'#comment'.$newcid;
+            $notification_handler = xoops_getHandler('notification');
             $notification_handler->triggerEvent($not_category, $not_itemid, $not_event, $comment_tags, false,
                                                 $not_modid);
         }
 
         planet_trackback_response(0);
-    } else {
+    }else {
         planet_trackback_response(1, xoops_error($comment->getHtmlErrors()));
     }
 }

view.blogs.php

Indentation +114 added lines, -114 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 = planet_parse_args($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 */
@@ -80,28 +80,28 @@ 
 $blog_prefix = '';
 /* Specific category */
 if ($category_id > 0) {
-    $category_obj = $category_handler->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 = $category_handler->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;
-    $bookmark_handler = xoops_getModuleHandler('bookmark', $GLOBALS['moddirname']);
-    $user_data        = array(
-        'uid'   => $uid,
-        'name'  => XoopsUser::getUnameFromId($uid),
-        'marks' => $bookmark_handler->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;
+	$bookmark_handler = xoops_getModuleHandler('bookmark', $GLOBALS['moddirname']);
+	$user_data        = array(
+		'uid'   => $uid,
+		'name'  => XoopsUser::getUnameFromId($uid),
+		'marks' => $bookmark_handler->getCount(new Criteria('bm_uid', $uid))
+	);
+	$query_type       = 'bookmark';
+	$blog_prefix      = 'b.';
 }
 
 $criteria->add(new Criteria($blog_prefix . 'blog_status', 0, '>'));
@@ -110,20 +110,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);
@@ -132,97 +132,97 @@ 
 
 $tags = empty($list) ? '' : array($blog_prefix . 'blog_title', $blog_prefix . 'blog_time');
 switch ($query_type) {
-    case 'category':
-        $blogs_obj  =& $blog_handler->getByCategory($criteria, $tags);
-        $count_blog = $blog_handler->getCountByCategory($criteria);
-        break;
-    case 'bookmark':
-        $blogs_obj  =& $blog_handler->getByBookmark($criteria, $tags);
-        $count_blog = $blog_handler->getCountByBookmark($criteria);
-        break;
-    default:
-        $blogs_obj  =& $blog_handler->getAll($criteria, $tags);
-        $count_blog = $blog_handler->getCount($criteria);
-        break;
+	case 'category':
+		$blogs_obj  =& $blog_handler->getByCategory($criteria, $tags);
+		$count_blog = $blog_handler->getCountByCategory($criteria);
+		break;
+	case 'bookmark':
+		$blogs_obj  =& $blog_handler->getByBookmark($criteria, $tags);
+		$count_blog = $blog_handler->getCountByBookmark($criteria);
+		break;
+	default:
+		$blogs_obj  =& $blog_handler->getAll($criteria, $tags);
+		$count_blog = $blog_handler->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>');
+							   . 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>';
+			   . (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'));
@@ -236,35 +236,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 +50 added lines, -50 removed lines

@@ -24,10 +24,10 @@ 
 // URL: http://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,15 +37,15 @@ 
 }
 
 /* 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 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)) {
@@ -64,10 +64,10 @@ 
 }
 */
 
-$xoopsOption['xoops_pagetitle'] = $xoopsModule->getVar('name') . ' - ' . planet_constant('MD_BLOGS');
+$xoopsOption['xoops_pagetitle'] = $xoopsModule->getVar('name').' - '.planet_constant('MD_BLOGS');
 $xoopsOption['template_main']   = planet_getTemplate('blogs');
-include_once XOOPS_ROOT_PATH . '/header.php';
-include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
+include_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
 $category_handler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
@@ -79,7 +79,7 @@ 
 $criteria    = new CriteriaCompo();
 $blog_prefix = '';
 /* Specific category */
-if ($category_id > 0) {
+if ($category_id>0) {
     $category_obj = $category_handler->get($category_id);
     $criteria->add(new Criteria('bc.cat_id', $category_id));
     $uid           = 0;
@@ -90,7 +90,7 @@ 
 }
 
 /* User bookmarks(favorites) */
-if ($uid > 0) {
+if ($uid>0) {
     $criteria->add(new Criteria('bm.bm_uid', $uid));
     $category_id      = 0;
     $blog_id          = 0;
@@ -104,25 +104,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);
@@ -130,18 +130,18 @@ 
 $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  =& $blog_handler->getByCategory($criteria, $tags);
+        $blogs_obj  = & $blog_handler->getByCategory($criteria, $tags);
         $count_blog = $blog_handler->getCountByCategory($criteria);
         break;
     case 'bookmark':
-        $blogs_obj  =& $blog_handler->getByBookmark($criteria, $tags);
+        $blogs_obj  = & $blog_handler->getByBookmark($criteria, $tags);
         $count_blog = $blog_handler->getCountByBookmark($criteria);
         break;
     default:
-        $blogs_obj  =& $blog_handler->getAll($criteria, $tags);
+        $blogs_obj  = & $blog_handler->getAll($criteria, $tags);
         $count_blog = $blog_handler->getCount($criteria);
         break;
 }
@@ -170,62 +170,62 @@ 
 }
 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')
+$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>');
+                      "<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);
 }
 
-$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>';
+$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>';
 $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 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>');
+                      "<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);
@@ -239,19 +239,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(
@@ -264,8 +264,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));
 
-include_once __DIR__ . '/footer.php';
+include_once __DIR__.'/footer.php';

comment_new.php

Indentation +4 added lines, -4 removed lines

@@ -27,8 +27,8 @@
 include __DIR__ . '/header.php';
 $com_itemid = isset($_GET['com_itemid']) ? (int)$_GET['com_itemid'] : 0;
 if ($com_itemid > 0) {
-    $article_handler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
-    $article_obj     =& $article_handler->get($com_itemid);
-    $com_replytitle  = $article_obj->getVar('art_title');
-    include_once XOOPS_ROOT_PATH . '/include/comment_new.php';
+	$article_handler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
+	$article_obj     =& $article_handler->get($com_itemid);
+	$com_replytitle  = $article_obj->getVar('art_title');
+	include_once XOOPS_ROOT_PATH . '/include/comment_new.php';
 }

Spacing +5 added lines, -5 removed lines

@@ -24,11 +24,11 @@
 // URL: http://xoops.org                         //
 // Project: Article Project                                                 //
 // ------------------------------------------------------------------------ //
-include __DIR__ . '/header.php';
-$com_itemid = isset($_GET['com_itemid']) ? (int)$_GET['com_itemid'] : 0;
-if ($com_itemid > 0) {
+include __DIR__.'/header.php';
+$com_itemid = isset($_GET['com_itemid']) ? (int) $_GET['com_itemid'] : 0;
+if ($com_itemid>0) {
     $article_handler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
-    $article_obj     =& $article_handler->get($com_itemid);
+    $article_obj     = & $article_handler->get($com_itemid);
     $com_replytitle  = $article_obj->getVar('art_title');
-    include_once XOOPS_ROOT_PATH . '/include/comment_new.php';
+    include_once XOOPS_ROOT_PATH.'/include/comment_new.php';
 }

print.php

Indentation +42 added lines, -42 removed lines

@@ -30,48 +30,48 @@ 
 error_reporting(0);
 
 if (empty($_POST['print_data'])) {
-    if (planet_parse_args($args_num, $args, $args_str)) {
-        $args['article'] = @$args_num[0];
-    }
+	if (planet_parse_args($args_num, $args, $args_str)) {
+		$args['article'] = @$args_num[0];
+	}
 
-    $article_id = (int)(empty($_GET['article']) ? @$args['article'] : $_GET['article']);
+	$article_id = (int)(empty($_GET['article']) ? @$args['article'] : $_GET['article']);
 
-    $article_handler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
-    $article_obj     =& $article_handler->get($article_id);
+	$article_handler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
+	$article_obj     =& $article_handler->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($_POST['print_data']));
+	$print_data = unserialize(base64_decode($_POST['print_data']));
 }
 
 $print_data['image']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/'
-                        . $xoopsModule->getInfo('image');
+						. $xoopsModule->getInfo('image');
 $print_data['module'] = $xoopsModule->getVar('name') . ' V' . $xoopsModule->getInfo('version');
 
 header('Content-Type: text/html; charset=' . _CHARSET);
@@ -99,19 +99,19 @@ 
             </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>\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 +28 added lines, -28 removed lines

@@ -26,7 +26,7 @@ 
 // ------------------------------------------------------------------------ //
 
 error_reporting(0);
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 error_reporting(0);
 
 if (empty($_POST['print_data'])) {
@@ -34,10 +34,10 @@ 
         $args['article'] = @$args_num[0];
     }
 
-    $article_id = (int)(empty($_GET['article']) ? @$args['article'] : $_GET['article']);
+    $article_id = (int) (empty($_GET['article']) ? @$args['article'] : $_GET['article']);
 
     $article_handler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
-    $article_obj     =& $article_handler->get($article_id);
+    $article_obj     = & $article_handler->get($article_id);
 
     $article_data = array();
 
@@ -53,7 +53,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');
@@ -61,28 +61,28 @@ 
     $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') . ': '
+    $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['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($_POST['print_data']));
 }
 
-$print_data['image']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/'
+$print_data['image']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/'
                         . $xoopsModule->getInfo('image');
-$print_data['module'] = $xoopsModule->getVar('name') . ' V' . $xoopsModule->getInfo('version');
+$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;
@@ -100,18 +100,18 @@ 
 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='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"
+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"
+                                               . '<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();

comment_reply.php

Spacing +2 added lines, -2 removed lines

@@ -24,5 +24,5 @@
 // URL: http://xoops.org                         //
 // Project: Article Project                                                 //
 // ------------------------------------------------------------------------ //
-include dirname(dirname(__DIR__)) . '/mainfile.php';
-include XOOPS_ROOT_PATH . '/include/comment_reply.php';
+include dirname(dirname(__DIR__)).'/mainfile.php';
+include XOOPS_ROOT_PATH.'/include/comment_reply.php';

admin/index.php

Spacing +3 added lines, -3 removed lines

@@ -17,8 +17,8 @@ 
  * @author       XOOPS Development Team
  */
 
-require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
-include_once __DIR__ . '/admin_header.php';
+require_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
+include_once __DIR__.'/admin_header.php';
 
 xoops_cp_header();
 
@@ -27,4 +27,4 @@ 
 echo $indexAdmin->addNavigation(basename(__FILE__));
 echo $indexAdmin->renderIndex();
 
-include_once __DIR__ . '/admin_footer.php';
+include_once __DIR__.'/admin_footer.php';

admin/menu.php

Spacing +10 added lines, -10 removed lines

@@ -29,17 +29,17 @@ 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
 $path = dirname(dirname(dirname(__DIR__)));
-include_once $path . '/mainfile.php';
+include_once $path.'/mainfile.php';
 
 $dirname         = basename(dirname(__DIR__));
 $moduleHandler   = xoops_getHandler('module');
 $module          = $moduleHandler->getByDirname($dirname);
 $pathIcon32      = $module->getInfo('icons32');
 $pathModuleAdmin = $module->getInfo('dirmoduleadmin');
-$pathLanguage    = $path . $pathModuleAdmin;
+$pathLanguage    = $path.$pathModuleAdmin;
 
-if (!file_exists($fileinc = $pathLanguage . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) {
-    $fileinc = $pathLanguage . '/language/english/main.php';
+if (!file_exists($fileinc = $pathLanguage.'/language/'.$GLOBALS['xoopsConfig']['language'].'/'.'main.php')) {
+    $fileinc = $pathLanguage.'/language/english/main.php';
 }
 
 include_once $fileinc;
@@ -48,24 +48,24 @@ 
 $i                      = 0;
 $adminmenu[$i]['title'] = _AM_MODULEADMIN_HOME;
 $adminmenu[$i]['link']  = 'admin/index.php';
-$adminmenu[$i]['icon']  = $pathIcon32 . '/home.png';
+$adminmenu[$i]['icon']  = $pathIcon32.'/home.png';
 ++$i;
 $adminmenu[$i]['title'] = planet_constant('MI_ADMENU_INDEX');
 $adminmenu[$i]['link']  = 'admin/main.php';
-$adminmenu[$i]['icon']  = $pathIcon32 . '/manage.png';
+$adminmenu[$i]['icon']  = $pathIcon32.'/manage.png';
 
 ++$i;
 $adminmenu[$i]['title'] = planet_constant('MI_ADMENU_CATEGORY');
 $adminmenu[$i]['link']  = 'admin/admin.category.php';
-$adminmenu[$i]['icon']  = $pathIcon32 . '/category.png';
+$adminmenu[$i]['icon']  = $pathIcon32.'/category.png';
 ++$i;
 $adminmenu[$i]['title'] = planet_constant('MI_ADMENU_BLOG');
 $adminmenu[$i]['link']  = 'admin/admin.blog.php';
-$adminmenu[$i]['icon']  = $pathIcon32 . '/translations.png';
+$adminmenu[$i]['icon']  = $pathIcon32.'/translations.png';
 ++$i;
 $adminmenu[$i]['title'] = planet_constant('MI_ADMENU_ARTICLE');
 $adminmenu[$i]['link']  = 'admin/admin.article.php';
-$adminmenu[$i]['icon']  = $pathIcon32 . '/content.png';
+$adminmenu[$i]['icon']  = $pathIcon32.'/content.png';
 //++$i;
 //$adminmenu[$i]['title'] = planet_constant("MI_ADMENU_BLOCK");
 //$adminmenu[$i]['link'] = "admin/admin.block.php";
@@ -73,4 +73,4 @@ 
 ++$i;
 $adminmenu[$i]['title'] = _AM_MODULEADMIN_ABOUT;
 $adminmenu[$i]['link']  = 'admin/about.php';
-$adminmenu[$i]['icon']  = $pathIcon32 . '/about.png';
+$adminmenu[$i]['icon']  = $pathIcon32.'/about.png';

Indentation +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 $pathLanguage    = $path . $pathModuleAdmin;
 
 if (!file_exists($fileinc = $pathLanguage . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) {
-    $fileinc = $pathLanguage . '/language/english/main.php';
+	$fileinc = $pathLanguage . '/language/english/main.php';
 }
 
 include_once $fileinc;