Inspection of "Merge pull request #1 from mambax7/imgbot" - mambax7/planet - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( a0a78b...8db6f6 )

by Michael

created 2019-01-19 11:42 UTC

Status

Indentation +29 added lines, -29 removed lines patch added patch discarded remove patch

@@ -37,17 +37,17 @@  discard block
 block discarded – undo
  *
  */
 if (preg_match("/(\/comment_[^\.]*\.php\?.*=.*)/i", Request::getUrl('REQUEST_URI', '', 'SERVER'), $matches)) {//$_SERVER['REQUEST_URI']
-    header('location: ' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . $matches[1]);
-    exit();
+	header('location: ' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . $matches[1]);
+	exit();
 }
 if (preg_match("/\/notification_update\.php/i", Request::getUrl('REQUEST_URI', '', 'SERVER'), $matches)) {
-    include XOOPS_ROOT_PATH . '/include/notification_update.php';
-    exit();
+	include XOOPS_ROOT_PATH . '/include/notification_update.php';
+	exit();
 }
 
 if ($REQUEST_URI_parsed = PlanetUtility::planetParseArguments($args_num, $args, $args_str)) {
-    $args['article'] = @$args_num[0];
-    $args['blog']    = @$args['blog'];
+	$args['article'] = @$args_num[0];
+	$args['blog']    = @$args['blog'];
 }
 
 $article_id = Request::getInt('article', @$args['article'], 'POST');//(int)(empty($_GET['article']) ? @$args['article'] : $_GET['article']);
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
 
 // restore $_SERVER['REQUEST_URI']
 if (!empty($REQUEST_URI_parsed)) {
-    $_SERVER['REQUEST_URI'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . (empty($article_id) ? '' : '?article=' . $article_id);
+	$_SERVER['REQUEST_URI'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . (empty($article_id) ? '' : '?article=' . $article_id);
 }
 
 $xoopsOption['xoops_pagetitle'] = $xoopsModule->getVar('name') . ' - ' . $article_obj->getVar('art_title');
@@ -69,29 +69,29 @@  discard block
 block discarded – undo
 include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
 
 $article_data = [
-    'id'       => $article_id,
-    'title'    => $article_obj->getVar('art_title'),
-    'content'  => $article_obj->getVar('art_content'),
-    'author'   => $article_obj->getVar('art_author'),
-    'time'     => $article_obj->getTime(),
-    'link'     => $article_obj->getVar('art_link'),
-    'views'    => $article_obj->getVar('art_views'),
-    'comments' => $article_obj->getVar('art_comments'),
-    'star'     => $article_obj->getStar(),
-    'rates'    => $article_obj->getVar('art_rates'),
-    'blog'     => ['id' => $article_obj->getVar('blog_id'), 'title' => $blog_obj->getVar('blog_title')]
+	'id'       => $article_id,
+	'title'    => $article_obj->getVar('art_title'),
+	'content'  => $article_obj->getVar('art_content'),
+	'author'   => $article_obj->getVar('art_author'),
+	'time'     => $article_obj->getTime(),
+	'link'     => $article_obj->getVar('art_link'),
+	'views'    => $article_obj->getVar('art_views'),
+	'comments' => $article_obj->getVar('art_comments'),
+	'star'     => $article_obj->getStar(),
+	'rates'    => $article_obj->getVar('art_rates'),
+	'blog'     => ['id' => $article_obj->getVar('blog_id'), 'title' => $blog_obj->getVar('blog_title')]
 ];
 
 if (!empty($helper->getConfig('do_sibling'))) {
-    $articles_sibling = $articleHandler->getSibling($article_obj, $blog_id);
-    if (!empty($articles_sibling['previous'])) {
-        $articles_sibling['previous']['url']   = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $articles_sibling['previous']['id'] . '/b' . $blog_id;
-        $articles_sibling['previous']['title'] = $articles_sibling['previous']['title'];
-    }
-    if (!empty($articles_sibling['next'])) {
-        $articles_sibling['next']['url']   = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $articles_sibling['next']['id'] . '/b' . $blog_id;
-        $articles_sibling['next']['title'] = $articles_sibling['next']['title'];
-    }
+	$articles_sibling = $articleHandler->getSibling($article_obj, $blog_id);
+	if (!empty($articles_sibling['previous'])) {
+		$articles_sibling['previous']['url']   = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $articles_sibling['previous']['id'] . '/b' . $blog_id;
+		$articles_sibling['previous']['title'] = $articles_sibling['previous']['title'];
+	}
+	if (!empty($articles_sibling['next'])) {
+		$articles_sibling['next']['url']   = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $articles_sibling['next']['id'] . '/b' . $blog_id;
+		$articles_sibling['next']['title'] = $articles_sibling['next']['title'];
+	}
 }
 
 $xoopsTpl->assign('modulename', $xoopsModule->getVar('name'));
@@ -102,11 +102,11 @@  discard block
 block discarded – undo
 $xoopsTpl->assign('user_level', !is_object($xoopsUser) ? 0 : ($xoopsUser->isAdmin() ? 2 : 1));
 if (empty($helper->getConfig('anonymous_rate')) && !is_object($xoopsUser)) {
 } else {
-    $xoopsTpl->assign('canrate', 1);
+	$xoopsTpl->assign('canrate', 1);
 }
 
 if ($transferbar = @include XOOPS_ROOT_PATH . '/Frameworks/transfer/bar.transfer.php') {
-    $xoopsTpl->assign('transfer', $transferbar);
+	$xoopsTpl->assign('transfer', $transferbar);
 }
 
 // Loading module meta data, NOT THE RIGHT WAY DOING IT

Please login to merge, or discard this patch.

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -29,7 +29,7 @@  discard block
 block discarded – undo
 /** @var Planet\Helper $helper */
 $helper = Planet\Helper::getInstance();
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 /**
  * The comment detection scripts should be removed once absolute url is used in comment_view.php
@@ -37,11 +37,11 @@  discard block
 block discarded – undo
  *
  */
 if (preg_match("/(\/comment_[^\.]*\.php\?.*=.*)/i", Request::getUrl('REQUEST_URI', '', 'SERVER'), $matches)) {//$_SERVER['REQUEST_URI']
-    header('location: ' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . $matches[1]);
+    header('location: '.XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].$matches[1]);
     exit();
 }
 if (preg_match("/\/notification_update\.php/i", Request::getUrl('REQUEST_URI', '', 'SERVER'), $matches)) {
-    include XOOPS_ROOT_PATH . '/include/notification_update.php';
+    include XOOPS_ROOT_PATH.'/include/notification_update.php';
     exit();
 }
 
@@ -50,8 +50,8 @@  discard block
 block discarded – undo
     $args['blog']    = @$args['blog'];
 }
 
-$article_id = Request::getInt('article', @$args['article'], 'POST');//(int)(empty($_GET['article']) ? @$args['article'] : $_GET['article']);
-$blog_id    = Request::getInt('blog', @$args['blog'], 'POST');//(int)(empty($_GET['blog']) ? @$args['blog'] : $_GET['blog']);
+$article_id = Request::getInt('article', @$args['article'], 'POST'); //(int)(empty($_GET['article']) ? @$args['article'] : $_GET['article']);
+$blog_id    = Request::getInt('blog', @$args['blog'], 'POST'); //(int)(empty($_GET['blog']) ? @$args['blog'] : $_GET['blog']);
 
 $articleHandler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
 $blogHandler    = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
@@ -60,13 +60,13 @@  discard block
 block discarded – undo
 
 // restore $_SERVER['REQUEST_URI']
 if (!empty($REQUEST_URI_parsed)) {
-    $_SERVER['REQUEST_URI'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . (empty($article_id) ? '' : '?article=' . $article_id);
+    $_SERVER['REQUEST_URI'] = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php'.(empty($article_id) ? '' : '?article='.$article_id);
 }
 
-$xoopsOption['xoops_pagetitle'] = $xoopsModule->getVar('name') . ' - ' . $article_obj->getVar('art_title');
+$xoopsOption['xoops_pagetitle'] = $xoopsModule->getVar('name').' - '.$article_obj->getVar('art_title');
 $xoopsOption['template_main']   = PlanetUtility::planetGetTemplate('article');
-require_once XOOPS_ROOT_PATH . '/header.php';
-include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
+require_once XOOPS_ROOT_PATH.'/header.php';
+include XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/include/vars.php';
 
 $article_data = [
     'id'       => $article_id,
@@ -85,11 +85,11 @@  discard block
 block discarded – undo
 if (!empty($helper->getConfig('do_sibling'))) {
     $articles_sibling = $articleHandler->getSibling($article_obj, $blog_id);
     if (!empty($articles_sibling['previous'])) {
-        $articles_sibling['previous']['url']   = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $articles_sibling['previous']['id'] . '/b' . $blog_id;
+        $articles_sibling['previous']['url']   = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php'.URL_DELIMITER.''.$articles_sibling['previous']['id'].'/b'.$blog_id;
         $articles_sibling['previous']['title'] = $articles_sibling['previous']['title'];
     }
     if (!empty($articles_sibling['next'])) {
-        $articles_sibling['next']['url']   = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $articles_sibling['next']['id'] . '/b' . $blog_id;
+        $articles_sibling['next']['url']   = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php'.URL_DELIMITER.''.$articles_sibling['next']['id'].'/b'.$blog_id;
         $articles_sibling['next']['title'] = $articles_sibling['next']['title'];
     }
 }
@@ -101,11 +101,11 @@  discard block
 block discarded – undo
 
 $xoopsTpl->assign('user_level', !is_object($xoopsUser) ? 0 : ($xoopsUser->isAdmin() ? 2 : 1));
 if (empty($helper->getConfig('anonymous_rate')) && !is_object($xoopsUser)) {
-} else {
+}else {
     $xoopsTpl->assign('canrate', 1);
 }
 
-if ($transferbar = @include XOOPS_ROOT_PATH . '/Frameworks/transfer/bar.transfer.php') {
+if ($transferbar = @include XOOPS_ROOT_PATH.'/Frameworks/transfer/bar.transfer.php') {
     $xoopsTpl->assign('transfer', $transferbar);
 }
 
@@ -115,6 +115,6 @@  discard block
 block discarded – undo
 // for comment and notification
 //$_SERVER['REQUEST_URI'] = XOOPS_URL."/modules/".$GLOBALS["moddirname"]."/view.article.php";
 $_GET['article'] = $article_id;
-include XOOPS_ROOT_PATH . '/include/comment_view.php';
+include XOOPS_ROOT_PATH.'/include/comment_view.php';
 
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';

Please login to merge, or discard this patch.

view.blogs.php 2 patches

Indentation +110 added lines, -110 removed lines patch added patch discarded remove patch

@@ -32,13 +32,13 @@  discard block
 block discarded – undo
 include __DIR__ . '/header.php';
 
 if (preg_match("/\/notification_update\.php/i", Request::getUrl('REQUEST_URI', '', 'SERVER'), $matches)) {
-    include XOOPS_ROOT_PATH . '/include/notification_update.php';
-    exit();
+	include XOOPS_ROOT_PATH . '/include/notification_update.php';
+	exit();
 }
 
 if ($REQUEST_URI_parsed = PlanetUtility::planetParseArguments($args_num, $args, $args_str)) {
-    $args['start'] = @$args_num[0];
-    $args['sort']  = @$args_str[0];
+	$args['start'] = @$args_num[0];
+	$args['sort']  = @$args_str[0];
 }
 
 /* Start */
@@ -85,28 +85,28 @@  discard block
 block discarded – undo
 $blog_prefix = '';
 /* Specific category */
 if ($category_id > 0) {
-    $category_obj = $categoryHandler->get($category_id);
-    $criteria->add(new \Criteria('bc.cat_id', $category_id));
-    $uid           = 0;
-    $blog_id       = 0;
-    $category_data = ['id' => $category_id, 'title' => $category_obj->getVar('cat_title')];
-    $query_type    = 'category';
-    $blog_prefix   = 'b.';
+	$category_obj = $categoryHandler->get($category_id);
+	$criteria->add(new \Criteria('bc.cat_id', $category_id));
+	$uid           = 0;
+	$blog_id       = 0;
+	$category_data = ['id' => $category_id, 'title' => $category_obj->getVar('cat_title')];
+	$query_type    = 'category';
+	$blog_prefix   = 'b.';
 }
 
 /* User bookmarks(favorites) */
 if ($uid > 0) {
-    $criteria->add(new \Criteria('bm.bm_uid', $uid));
-    $category_id     = 0;
-    $blog_id         = 0;
-    $bookmarkHandler = xoops_getModuleHandler('bookmark', $GLOBALS['moddirname']);
-    $user_data       = [
-        'uid'   => $uid,
-        'name'  => XoopsUser::getUnameFromId($uid),
-        'marks' => $bookmarkHandler->getCount(new \Criteria('bm_uid', $uid))
-    ];
-    $query_type      = 'bookmark';
-    $blog_prefix     = 'b.';
+	$criteria->add(new \Criteria('bm.bm_uid', $uid));
+	$category_id     = 0;
+	$blog_id         = 0;
+	$bookmarkHandler = xoops_getModuleHandler('bookmark', $GLOBALS['moddirname']);
+	$user_data       = [
+		'uid'   => $uid,
+		'name'  => XoopsUser::getUnameFromId($uid),
+		'marks' => $bookmarkHandler->getCount(new \Criteria('bm_uid', $uid))
+	];
+	$query_type      = 'bookmark';
+	$blog_prefix     = 'b.';
 }
 
 $criteria->add(new \Criteria($blog_prefix . 'blog_status', 0, '>'));
@@ -115,20 +115,20 @@  discard block
 block discarded – undo
 $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);
@@ -137,93 +137,93 @@  discard block
 block discarded – undo
 
 $tags = empty($list) ? '' : [$blog_prefix . 'blog_title', $blog_prefix . 'blog_time'];
 switch ($query_type) {
-    case 'category':
-        $blogs_obj  = $blogHandler->getByCategory($criteria, $tags);
-        $count_blog = $blogHandler->getCountByCategory($criteria);
-        break;
-    case 'bookmark':
-        $blogs_obj  = $blogHandler->getByBookmark($criteria, $tags);
-        $count_blog = $blogHandler->getCountByBookmark($criteria);
-        break;
-    default:
-        $blogs_obj  = $blogHandler->getAll($criteria, $tags);
-        $count_blog = $blogHandler->getCount($criteria);
-        break;
+	case 'category':
+		$blogs_obj  = $blogHandler->getByCategory($criteria, $tags);
+		$count_blog = $blogHandler->getCountByCategory($criteria);
+		break;
+	case 'bookmark':
+		$blogs_obj  = $blogHandler->getByBookmark($criteria, $tags);
+		$count_blog = $blogHandler->getCountByBookmark($criteria);
+		break;
+	default:
+		$blogs_obj  = $blogHandler->getAll($criteria, $tags);
+		$count_blog = $blogHandler->getCount($criteria);
+		break;
 }
 
 /* Objects to array */
 $blogs = [];
 foreach (array_keys($blogs_obj) as $id) {
-    $_blog = [
-        'id'    => $id,
-        'title' => $blogs_obj[$id]->getVar('blog_title'),
-        'time'  => $blogs_obj[$id]->getTime()
-    ];
-    if (empty($list)) {
-        $_blog = array_merge($_blog, [
-            '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 = [
+		'id'    => $id,
+		'title' => $blogs_obj[$id]->getVar('blog_title'),
+		'time'  => $blogs_obj[$id]->getTime()
+	];
+	if (empty($list)) {
+		$_blog = array_merge($_blog, [
+			'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 = [];
-    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('&amp;', $start_link));
-    $pagenav = $nav->renderNav(4);
+	include XOOPS_ROOT_PATH . '/class/pagenav.php';
+	$start_link = [];
+	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('&amp;', $start_link));
+	$pagenav = $nav->renderNav(4);
 } else {
-    $pagenav = '';
+	$pagenav = '';
 }
 
 $xoopsTpl->assign('xoops_pagetitle', $xoopsOption['xoops_pagetitle']);
 $xoopsTpl->assign('link_home', '<a href="' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php" title="' . planet_constant('MD_HOME') . '" target="_self">' . planet_constant('MD_HOME') . '</a>');
 
 if ($category_id || $uid) {
-    $xoopsTpl->assign('link_index', '<a href="' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.blogs.php" title="' . planet_constant('MD_INDEX') . '" target="_self">' . planet_constant('MD_INDEX') . '</a>');
+	$xoopsTpl->assign('link_index', '<a href="' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.blogs.php" title="' . planet_constant('MD_INDEX') . '" target="_self">' . planet_constant('MD_INDEX') . '</a>');
 
-    $link_articles = '<a href="' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . (empty($category_id) ? '' : '/c' . $category_id) . (empty($uid) ? '' : '/u' . $uid) . '" title="' . planet_constant('MD_ARTICLES') . '">' . planet_constant('MD_ARTICLES') . '</a>';
-    $xoopsTpl->assign('link_articles', $link_articles);
+	$link_articles = '<a href="' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . (empty($category_id) ? '' : '/c' . $category_id) . (empty($uid) ? '' : '/u' . $uid) . '" title="' . planet_constant('MD_ARTICLES') . '">' . planet_constant('MD_ARTICLES') . '</a>';
+	$xoopsTpl->assign('link_articles', $link_articles);
 }
 
 $link_switch = '<a href="'
-               . XOOPS_URL
-               . '/modules/'
-               . $GLOBALS['moddirname']
-               . '/view.blogs.php'
-               . (empty($category_id) ? '' : '/c' . $category_id)
-               . (empty($uid) ? '' : '/u' . $uid)
-               . (empty($list) ? '/l1' : '')
-               . '" title="'
-               . (empty($list) ? planet_constant('MD_LISTVIEW') : planet_constant('MD_FULLVIEW'))
-               . '">'
-               . (empty($list) ? planet_constant('MD_LISTVIEW') : planet_constant('MD_FULLVIEW'))
-               . '</a>';
+			   . XOOPS_URL
+			   . '/modules/'
+			   . $GLOBALS['moddirname']
+			   . '/view.blogs.php'
+			   . (empty($category_id) ? '' : '/c' . $category_id)
+			   . (empty($uid) ? '' : '/u' . $uid)
+			   . (empty($list) ? '/l1' : '')
+			   . '" title="'
+			   . (empty($list) ? planet_constant('MD_LISTVIEW') : planet_constant('MD_FULLVIEW'))
+			   . '">'
+			   . (empty($list) ? planet_constant('MD_LISTVIEW') : planet_constant('MD_FULLVIEW'))
+			   . '</a>';
 $xoopsTpl->assign('link_switch', $link_switch);
 
 if (empty($uid) && is_object($xoopsUser)) {
-    $xoopsTpl->assign('link_bookmark', '<a href="' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.blogs.php' . URL_DELIMITER . 'u' . $xoopsUser->getVar('uid') . '" title="' . planet_constant('MD_BOOKMARKS') . '" target="_self">' . planet_constant('MD_BOOKMARKS') . '</a>');
+	$xoopsTpl->assign('link_bookmark', '<a href="' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.blogs.php' . URL_DELIMITER . 'u' . $xoopsUser->getVar('uid') . '" title="' . planet_constant('MD_BOOKMARKS') . '" target="_self">' . planet_constant('MD_BOOKMARKS') . '</a>');
 }
 
 if (1 == $helper->getConfig('newblog_submit') || 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'));
@@ -237,35 +237,35 @@  discard block
 block discarded – undo
 $xoopsTpl->assign('user_level', !is_object($xoopsUser) ? 0 : ($xoopsUser->isAdmin() ? 2 : 1));
 if (empty($helper->getConfig('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      = [];
 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   = [];
 $valid_sorts = [
-    '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));
 

Please login to merge, or discard this patch.

Spacing +33 added lines, -33 removed lines patch added patch discarded remove patch

@@ -29,10 +29,10 @@  discard block
 block discarded – undo
 /** @var Planet\Helper $helper */
 $helper = Planet\Helper::getInstance();
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 if (preg_match("/\/notification_update\.php/i", Request::getUrl('REQUEST_URI', '', 'SERVER'), $matches)) {
-    include XOOPS_ROOT_PATH . '/include/notification_update.php';
+    include XOOPS_ROOT_PATH.'/include/notification_update.php';
     exit();
 }
 
@@ -69,10 +69,10 @@  discard block
 block discarded – undo
 }
 */
 
-$xoopsOption['xoops_pagetitle'] = $xoopsModule->getVar('name') . ' - ' . planet_constant('MD_BLOGS');
+$xoopsOption['xoops_pagetitle'] = $xoopsModule->getVar('name').' - '.planet_constant('MD_BLOGS');
 $xoopsOption['template_main']   = PlanetUtility::planetGetTemplate('blogs');
-require_once XOOPS_ROOT_PATH . '/header.php';
-include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
+require_once XOOPS_ROOT_PATH.'/header.php';
+include XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/include/vars.php';
 
 // Following part will not be executed after cache
 $categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
 $criteria    = new \CriteriaCompo();
 $blog_prefix = '';
 /* Specific category */
-if ($category_id > 0) {
+if ($category_id>0) {
     $category_obj = $categoryHandler->get($category_id);
     $criteria->add(new \Criteria('bc.cat_id', $category_id));
     $uid           = 0;
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
 }
 
 /* User bookmarks(favorites) */
-if ($uid > 0) {
+if ($uid>0) {
     $criteria->add(new \Criteria('bm.bm_uid', $uid));
     $category_id     = 0;
     $blog_id         = 0;
@@ -109,25 +109,25 @@  discard block
 block discarded – undo
     $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);
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
 $criteria->setStart($start);
 $criteria->setLimit($limit);
 
-$tags = empty($list) ? '' : [$blog_prefix . 'blog_title', $blog_prefix . 'blog_time'];
+$tags = empty($list) ? '' : [$blog_prefix.'blog_title', $blog_prefix.'blog_time'];
 switch ($query_type) {
     case 'category':
         $blogs_obj  = $blogHandler->getByCategory($criteria, $tags);
@@ -175,31 +175,31 @@  discard block
 block discarded – undo
 }
 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 = [];
     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('&amp;', $start_link));
     $pagenav = $nav->renderNav(4);
-} else {
+}else {
     $pagenav = '';
 }
 
 $xoopsTpl->assign('xoops_pagetitle', $xoopsOption['xoops_pagetitle']);
-$xoopsTpl->assign('link_home', '<a href="' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php" title="' . planet_constant('MD_HOME') . '" target="_self">' . planet_constant('MD_HOME') . '</a>');
+$xoopsTpl->assign('link_home', '<a href="'.XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php" title="'.planet_constant('MD_HOME').'" target="_self">'.planet_constant('MD_HOME').'</a>');
 
 if ($category_id || $uid) {
-    $xoopsTpl->assign('link_index', '<a href="' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.blogs.php" title="' . planet_constant('MD_INDEX') . '" target="_self">' . planet_constant('MD_INDEX') . '</a>');
+    $xoopsTpl->assign('link_index', '<a href="'.XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.blogs.php" title="'.planet_constant('MD_INDEX').'" target="_self">'.planet_constant('MD_INDEX').'</a>');
 
-    $link_articles = '<a href="' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . (empty($category_id) ? '' : '/c' . $category_id) . (empty($uid) ? '' : '/u' . $uid) . '" title="' . planet_constant('MD_ARTICLES') . '">' . planet_constant('MD_ARTICLES') . '</a>';
+    $link_articles = '<a href="'.XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'.(empty($category_id) ? '' : '/c'.$category_id).(empty($uid) ? '' : '/u'.$uid).'" title="'.planet_constant('MD_ARTICLES').'">'.planet_constant('MD_ARTICLES').'</a>';
     $xoopsTpl->assign('link_articles', $link_articles);
 }
 
@@ -208,8 +208,8 @@  discard block
 block discarded – undo
                . '/modules/'
                . $GLOBALS['moddirname']
                . '/view.blogs.php'
-               . (empty($category_id) ? '' : '/c' . $category_id)
-               . (empty($uid) ? '' : '/u' . $uid)
+               . (empty($category_id) ? '' : '/c'.$category_id)
+               . (empty($uid) ? '' : '/u'.$uid)
                . (empty($list) ? '/l1' : '')
                . '" title="'
                . (empty($list) ? planet_constant('MD_LISTVIEW') : planet_constant('MD_FULLVIEW'))
@@ -219,14 +219,14 @@  discard block
 block discarded – undo
 $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 (1 == $helper->getConfig('newblog_submit') || is_object($xoopsUser)) {
-    $xoopsTpl->assign('link_submit', '<a href="' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/action.blog.php" title="' . _SUBMIT . '" target="_blank">' . _SUBMIT . '</a>');
+    $xoopsTpl->assign('link_submit', '<a href="'.XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/action.blog.php" title="'._SUBMIT.'" target="_blank">'._SUBMIT.'</a>');
 }
 
-$xoopsTpl->assign('pagetitle', $xoopsModule->getVar('name') . '::' . planet_constant('MD_BLOGS'));
+$xoopsTpl->assign('pagetitle', $xoopsModule->getVar('name').'::'.planet_constant('MD_BLOGS'));
 $xoopsTpl->assign('category', @$category_data);
 $xoopsTpl->assign('user', @$user_data);
 $xoopsTpl->assign('blogs', $blogs);
@@ -240,19 +240,19 @@  discard block
 block discarded – undo
     $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      = [];
 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   = [];
 $valid_sorts = [
@@ -265,8 +265,8 @@  discard block
 block discarded – undo
     if ($val == $sort) {
         continue;
     }
-    $sortlinks[] = '<a href="' . $sort_link . $val . '">' . $name . '</a>';
+    $sortlinks[] = '<a href="'.$sort_link.$val.'">'.$name.'</a>';
 }
 $xoopsTpl->assign('link_sort', implode(' | ', $sortlinks));
 
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';

Please login to merge, or discard this patch.

update.php 2 patches

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -34,12 +34,12 @@  discard block
 block discarded – undo
 $blog_id     = Request::getInt('blog', Request::getInt('blog', 0, 'POST'), 'GET'); //(int)(!empty($_POST['blog']) ? $_POST['blog'] : (!empty($_GET['blog']) ? $_GET['blog'] : 0));
 $blogHandler = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
 if ($blog_id > 0) {
-    $blog  = $blogHandler->get($blog_id);
-    $count = $blogHandler->do_update($blog);
-    redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php?blog=' . $blog_id, 2, sprintf(planet_constant('MD_UPDATED'), (int)$count));
+	$blog  = $blogHandler->get($blog_id);
+	$count = $blogHandler->do_update($blog);
+	redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php?blog=' . $blog_id, 2, sprintf(planet_constant('MD_UPDATED'), (int)$count));
 }
 if (planetGetCookie('upd') + 30 * 60 > time()) {
-    return;
+	return;
 }
 PlanetUtility::planetSetCookie('upd', time());
 $start = 0;
@@ -50,15 +50,15 @@  discard block
 block discarded – undo
 $criteria->setLimit($helper->getConfig('blogs_perupdate'));
 $blogs = $blogHandler->getAll($criteria);
 foreach (array_keys($blogs) as $id) {
-    $blogHandler->do_update($blogs[$id]);
+	$blogHandler->do_update($blogs[$id]);
 }
 $start += count($blogs);
 if (count($blogs) < $helper->getConfig('blogs_perupdate')) {
-    $start = 0;
+	$start = 0;
 }
 $fp = fopen(XOOPS_CACHE_PATH . '/' . $xoopsModule->getVar('dirname') . '_update.php', 'w');
 if (!$fp) {
-    return;
+	return;
 }
 fwrite($fp, "<?php\n \$start=" . (int)$start . ";\n?>");
 fclose($fp);

Please login to merge, or discard this patch.

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -29,21 +29,21 @@  discard block
 block discarded – undo
 /** @var Planet\Helper $helper */
 $helper = Planet\Helper::getInstance();
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 $blog_id     = Request::getInt('blog', Request::getInt('blog', 0, 'POST'), 'GET'); //(int)(!empty($_POST['blog']) ? $_POST['blog'] : (!empty($_GET['blog']) ? $_GET['blog'] : 0));
 $blogHandler = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
-if ($blog_id > 0) {
+if ($blog_id>0) {
     $blog  = $blogHandler->get($blog_id);
     $count = $blogHandler->do_update($blog);
-    redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php?blog=' . $blog_id, 2, sprintf(planet_constant('MD_UPDATED'), (int)$count));
+    redirect_header(XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php?blog='.$blog_id, 2, sprintf(planet_constant('MD_UPDATED'), (int) $count));
 }
-if (planetGetCookie('upd') + 30 * 60 > time()) {
+if (planetGetCookie('upd')+30*60>time()) {
     return;
 }
 PlanetUtility::planetSetCookie('upd', time());
 $start = 0;
-@include XOOPS_CACHE_PATH . '/' . $xoopsModule->getVar('dirname') . '_update.php';
+@include XOOPS_CACHE_PATH.'/'.$xoopsModule->getVar('dirname').'_update.php';
 $criteria = new \Criteria('blog_status', 0, '>');
 $criteria->setSort('blog_id');
 $criteria->setStart($start);
@@ -53,12 +53,12 @@  discard block
 block discarded – undo
     $blogHandler->do_update($blogs[$id]);
 }
 $start += count($blogs);
-if (count($blogs) < $helper->getConfig('blogs_perupdate')) {
+if (count($blogs)<$helper->getConfig('blogs_perupdate')) {
     $start = 0;
 }
-$fp = fopen(XOOPS_CACHE_PATH . '/' . $xoopsModule->getVar('dirname') . '_update.php', 'w');
+$fp = fopen(XOOPS_CACHE_PATH.'/'.$xoopsModule->getVar('dirname').'_update.php', 'w');
 if (!$fp) {
     return;
 }
-fwrite($fp, "<?php\n \$start=" . (int)$start . ";\n?>");
+fwrite($fp, "<?php\n \$start=".(int) $start.";\n?>");
 fclose($fp);

Please login to merge, or discard this patch.

testdata/index.php 2 patches

Indentation +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -21,21 +21,21 @@
 block discarded – undo
 $op = \Xmf\Request::getCmd('op', '');
 
 switch ($op) {
-    case 'load':
-        loadSampleData();
-        break;
+	case 'load':
+		loadSampleData();
+		break;
 }
 
 // XMF TableLoad for SAMPLE data
 
 function loadSampleData()
 {
-    //    $moduleDirName = basename(dirname(__DIR__));
-    xoops_loadLanguage('comment');
-    $items = \Xmf\Yaml::readWrapped('quotes_data.yml');
+	//    $moduleDirName = basename(dirname(__DIR__));
+	xoops_loadLanguage('comment');
+	$items = \Xmf\Yaml::readWrapped('quotes_data.yml');
 
-    \Xmf\Database\TableLoad::truncateTable('randomquote_quotes');
-    \Xmf\Database\TableLoad::loadTableFromArray('randomquote_quotes', $items);
+	\Xmf\Database\TableLoad::truncateTable('randomquote_quotes');
+	\Xmf\Database\TableLoad::loadTableFromArray('randomquote_quotes', $items);
 
-    redirect_header('../admin/index.php', 1, _CM_ACTIVE);
+	redirect_header('../admin/index.php', 1, _CM_ACTIVE);
 }

Please login to merge, or discard this patch.

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -15,7 +15,7 @@
 block discarded – undo
  * @author          Michael Beck (aka Mamba)
  */
 
-require_once __DIR__ . '/../../../mainfile.php';
+require_once __DIR__.'/../../../mainfile.php';
 
 
 $op = \Xmf\Request::getCmd('op', '');

Please login to merge, or discard this patch.

include/notification.inc.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -27,7 +27,7 @@
 block discarded – undo
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-include __DIR__ . '/vars.php';
+include __DIR__.'/vars.php';
 //mod_loadFunctions('', $GLOBALS['moddirname']);
 
 PlanetUtility::planetParseFunction('

Please login to merge, or discard this patch.

include/search.inc.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -27,7 +27,7 @@
 block discarded – undo
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-include __DIR__ . '/vars.php';
+include __DIR__.'/vars.php';
 //mod_loadFunctions('', $GLOBALS['moddirname']);
 
 PlanetUtility::planetParseFunction('

Please login to merge, or discard this patch.

include/action.module.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -27,7 +27,7 @@
 block discarded – undo
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-include __DIR__ . '/vars.php';
+include __DIR__.'/vars.php';
 //mod_loadFunctions('', $GLOBALS['moddirname']);
 
 PlanetUtility::planetParseFunction('

Please login to merge, or discard this patch.

		@@ -37,17 +37,17 @@ discard block
		block discarded – undo
37	37	*
38	38	*/
39	39	if (preg_match("/(\/comment_[^\.]\.php\?.=.*)/i", Request::getUrl('REQUEST_URI', '', 'SERVER'), $matches)) {//$_SERVER['REQUEST_URI']
40		- header('location: ' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . $matches[1]);
41		- exit();
	40	+ header('location: ' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . $matches[1]);
	41	+ exit();
42	42	}
43	43	if (preg_match("/\/notification_update\.php/i", Request::getUrl('REQUEST_URI', '', 'SERVER'), $matches)) {
44		- include XOOPS_ROOT_PATH . '/include/notification_update.php';
45		- exit();
	44	+ include XOOPS_ROOT_PATH . '/include/notification_update.php';
	45	+ exit();
46	46	}
47	47
48	48	if ($REQUEST_URI_parsed = PlanetUtility::planetParseArguments($args_num, $args, $args_str)) {
49		- $args['article'] = @$args_num[0];
50		- $args['blog'] = @$args['blog'];
	49	+ $args['article'] = @$args_num[0];
	50	+ $args['blog'] = @$args['blog'];
51	51	}
52	52
53	53	$article_id = Request::getInt('article', @$args['article'], 'POST');//(int)(empty($_GET['article']) ? @$args['article'] : $_GET['article']);
		@@ -60,7 +60,7 @@ discard block
		block discarded – undo
60	60
61	61	// restore $_SERVER['REQUEST_URI']
62	62	if (!empty($REQUEST_URI_parsed)) {
63		- $_SERVER['REQUEST_URI'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . (empty($article_id) ? '' : '?article=' . $article_id);
	63	+ $_SERVER['REQUEST_URI'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . (empty($article_id) ? '' : '?article=' . $article_id);
64	64	}
65	65
66	66	$xoopsOption['xoops_pagetitle'] = $xoopsModule->getVar('name') . ' - ' . $article_obj->getVar('art_title');
		@@ -69,29 +69,29 @@ discard block
		block discarded – undo
69	69	include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
70	70
71	71	$article_data = [
72		- 'id' => $article_id,
73		- 'title' => $article_obj->getVar('art_title'),
74		- 'content' => $article_obj->getVar('art_content'),
75		- 'author' => $article_obj->getVar('art_author'),
76		- 'time' => $article_obj->getTime(),
77		- 'link' => $article_obj->getVar('art_link'),
78		- 'views' => $article_obj->getVar('art_views'),
79		- 'comments' => $article_obj->getVar('art_comments'),
80		- 'star' => $article_obj->getStar(),
81		- 'rates' => $article_obj->getVar('art_rates'),
82		- 'blog' => ['id' => $article_obj->getVar('blog_id'), 'title' => $blog_obj->getVar('blog_title')]
	72	+ 'id' => $article_id,
	73	+ 'title' => $article_obj->getVar('art_title'),
	74	+ 'content' => $article_obj->getVar('art_content'),
	75	+ 'author' => $article_obj->getVar('art_author'),
	76	+ 'time' => $article_obj->getTime(),
	77	+ 'link' => $article_obj->getVar('art_link'),
	78	+ 'views' => $article_obj->getVar('art_views'),
	79	+ 'comments' => $article_obj->getVar('art_comments'),
	80	+ 'star' => $article_obj->getStar(),
	81	+ 'rates' => $article_obj->getVar('art_rates'),
	82	+ 'blog' => ['id' => $article_obj->getVar('blog_id'), 'title' => $blog_obj->getVar('blog_title')]
83	83	];
84	84
85	85	if (!empty($helper->getConfig('do_sibling'))) {
86		- $articles_sibling = $articleHandler->getSibling($article_obj, $blog_id);
87		- if (!empty($articles_sibling['previous'])) {
88		- $articles_sibling['previous']['url'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $articles_sibling['previous']['id'] . '/b' . $blog_id;
89		- $articles_sibling['previous']['title'] = $articles_sibling['previous']['title'];
90		- }
91		- if (!empty($articles_sibling['next'])) {
92		- $articles_sibling['next']['url'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $articles_sibling['next']['id'] . '/b' . $blog_id;
93		- $articles_sibling['next']['title'] = $articles_sibling['next']['title'];
94		- }
	86	+ $articles_sibling = $articleHandler->getSibling($article_obj, $blog_id);
	87	+ if (!empty($articles_sibling['previous'])) {
	88	+ $articles_sibling['previous']['url'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $articles_sibling['previous']['id'] . '/b' . $blog_id;
	89	+ $articles_sibling['previous']['title'] = $articles_sibling['previous']['title'];
	90	+ }
	91	+ if (!empty($articles_sibling['next'])) {
	92	+ $articles_sibling['next']['url'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $articles_sibling['next']['id'] . '/b' . $blog_id;
	93	+ $articles_sibling['next']['title'] = $articles_sibling['next']['title'];
	94	+ }
95	95	}
96	96
97	97	$xoopsTpl->assign('modulename', $xoopsModule->getVar('name'));
		@@ -102,11 +102,11 @@ discard block
		block discarded – undo
102	102	$xoopsTpl->assign('user_level', !is_object($xoopsUser) ? 0 : ($xoopsUser->isAdmin() ? 2 : 1));
103	103	if (empty($helper->getConfig('anonymous_rate')) && !is_object($xoopsUser)) {
104	104	} else {
105		- $xoopsTpl->assign('canrate', 1);
	105	+ $xoopsTpl->assign('canrate', 1);
106	106	}
107	107
108	108	if ($transferbar = @include XOOPS_ROOT_PATH . '/Frameworks/transfer/bar.transfer.php') {
109		- $xoopsTpl->assign('transfer', $transferbar);
	109	+ $xoopsTpl->assign('transfer', $transferbar);
110	110	}
111	111
112	112	// Loading module meta data, NOT THE RIGHT WAY DOING IT

		@@ -29,7 +29,7 @@ discard block
		block discarded – undo
29	29	/** @var Planet\Helper $helper */
30	30	$helper = Planet\Helper::getInstance();
31	31
32		-include __DIR__ . '/header.php';
	32	+include __DIR__.'/header.php';
33	33
34	34	/**
35	35	* The comment detection scripts should be removed once absolute url is used in comment_view.php
		@@ -37,11 +37,11 @@ discard block
		block discarded – undo
37	37	*
38	38	*/
39	39	if (preg_match("/(\/comment_[^\.]\.php\?.=.*)/i", Request::getUrl('REQUEST_URI', '', 'SERVER'), $matches)) {//$_SERVER['REQUEST_URI']
40		- header('location: ' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . $matches[1]);
	40	+ header('location: '.XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].$matches[1]);
41	41	exit();
42	42	}
43	43	if (preg_match("/\/notification_update\.php/i", Request::getUrl('REQUEST_URI', '', 'SERVER'), $matches)) {
44		- include XOOPS_ROOT_PATH . '/include/notification_update.php';
	44	+ include XOOPS_ROOT_PATH.'/include/notification_update.php';
45	45	exit();
46	46	}
47	47
		@@ -50,8 +50,8 @@ discard block
		block discarded – undo
50	50	$args['blog'] = @$args['blog'];
51	51	}
52	52
53		-$article_id = Request::getInt('article', @$args['article'], 'POST');//(int)(empty($_GET['article']) ? @$args['article'] : $_GET['article']);
54		-$blog_id = Request::getInt('blog', @$args['blog'], 'POST');//(int)(empty($_GET['blog']) ? @$args['blog'] : $_GET['blog']);
	53	+$article_id = Request::getInt('article', @$args['article'], 'POST'); //(int)(empty($_GET['article']) ? @$args['article'] : $_GET['article']);
	54	+$blog_id = Request::getInt('blog', @$args['blog'], 'POST'); //(int)(empty($_GET['blog']) ? @$args['blog'] : $_GET['blog']);
55	55
56	56	$articleHandler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
57	57	$blogHandler = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
		@@ -60,13 +60,13 @@ discard block
		block discarded – undo
60	60
61	61	// restore $_SERVER['REQUEST_URI']
62	62	if (!empty($REQUEST_URI_parsed)) {
63		- $_SERVER['REQUEST_URI'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . (empty($article_id) ? '' : '?article=' . $article_id);
	63	+ $_SERVER['REQUEST_URI'] = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php'.(empty($article_id) ? '' : '?article='.$article_id);
64	64	}
65	65
66		-$xoopsOption['xoops_pagetitle'] = $xoopsModule->getVar('name') . ' - ' . $article_obj->getVar('art_title');
	66	+$xoopsOption['xoops_pagetitle'] = $xoopsModule->getVar('name').' - '.$article_obj->getVar('art_title');
67	67	$xoopsOption['template_main'] = PlanetUtility::planetGetTemplate('article');
68		-require_once XOOPS_ROOT_PATH . '/header.php';
69		-include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
	68	+require_once XOOPS_ROOT_PATH.'/header.php';
	69	+include XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/include/vars.php';
70	70
71	71	$article_data = [
72	72	'id' => $article_id,
		@@ -85,11 +85,11 @@ discard block
		block discarded – undo
85	85	if (!empty($helper->getConfig('do_sibling'))) {
86	86	$articles_sibling = $articleHandler->getSibling($article_obj, $blog_id);
87	87	if (!empty($articles_sibling['previous'])) {
88		- $articles_sibling['previous']['url'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $articles_sibling['previous']['id'] . '/b' . $blog_id;
	88	+ $articles_sibling['previous']['url'] = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php'.URL_DELIMITER.''.$articles_sibling['previous']['id'].'/b'.$blog_id;
89	89	$articles_sibling['previous']['title'] = $articles_sibling['previous']['title'];
90	90	}
91	91	if (!empty($articles_sibling['next'])) {
92		- $articles_sibling['next']['url'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $articles_sibling['next']['id'] . '/b' . $blog_id;
	92	+ $articles_sibling['next']['url'] = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php'.URL_DELIMITER.''.$articles_sibling['next']['id'].'/b'.$blog_id;
93	93	$articles_sibling['next']['title'] = $articles_sibling['next']['title'];
94	94	}
95	95	}
		@@ -101,11 +101,11 @@ discard block
		block discarded – undo
101	101
102	102	$xoopsTpl->assign('user_level', !is_object($xoopsUser) ? 0 : ($xoopsUser->isAdmin() ? 2 : 1));
103	103	if (empty($helper->getConfig('anonymous_rate')) && !is_object($xoopsUser)) {
104		-} else {
	104	+}else {
105	105	$xoopsTpl->assign('canrate', 1);
106	106	}
107	107
108		-if ($transferbar = @include XOOPS_ROOT_PATH . '/Frameworks/transfer/bar.transfer.php') {
	108	+if ($transferbar = @include XOOPS_ROOT_PATH.'/Frameworks/transfer/bar.transfer.php') {
109	109	$xoopsTpl->assign('transfer', $transferbar);
110	110	}
111	111
		@@ -115,6 +115,6 @@ discard block
		block discarded – undo
115	115	// for comment and notification
116	116	//$_SERVER['REQUEST_URI'] = XOOPS_URL."/modules/".$GLOBALS["moddirname"]."/view.article.php";
117	117	$_GET['article'] = $article_id;
118		-include XOOPS_ROOT_PATH . '/include/comment_view.php';
	118	+include XOOPS_ROOT_PATH.'/include/comment_view.php';
119	119
120		-require_once __DIR__ . '/footer.php';
	120	+require_once __DIR__.'/footer.php';

		@@ -32,13 +32,13 @@ discard block
		block discarded – undo
32	32	include __DIR__ . '/header.php';
33	33
34	34	if (preg_match("/\/notification_update\.php/i", Request::getUrl('REQUEST_URI', '', 'SERVER'), $matches)) {
35		- include XOOPS_ROOT_PATH . '/include/notification_update.php';
36		- exit();
	35	+ include XOOPS_ROOT_PATH . '/include/notification_update.php';
	36	+ exit();
37	37	}
38	38
39	39	if ($REQUEST_URI_parsed = PlanetUtility::planetParseArguments($args_num, $args, $args_str)) {
40		- $args['start'] = @$args_num[0];
41		- $args['sort'] = @$args_str[0];
	40	+ $args['start'] = @$args_num[0];
	41	+ $args['sort'] = @$args_str[0];
42	42	}
43	43
44	44	/* Start */
		@@ -85,28 +85,28 @@ discard block
		block discarded – undo
85	85	$blog_prefix = '';
86	86	/* Specific category */
87	87	if ($category_id > 0) {
88		- $category_obj = $categoryHandler->get($category_id);
89		- $criteria->add(new \Criteria('bc.cat_id', $category_id));
90		- $uid = 0;
91		- $blog_id = 0;
92		- $category_data = ['id' => $category_id, 'title' => $category_obj->getVar('cat_title')];
93		- $query_type = 'category';
94		- $blog_prefix = 'b.';
	88	+ $category_obj = $categoryHandler->get($category_id);
	89	+ $criteria->add(new \Criteria('bc.cat_id', $category_id));
	90	+ $uid = 0;
	91	+ $blog_id = 0;
	92	+ $category_data = ['id' => $category_id, 'title' => $category_obj->getVar('cat_title')];
	93	+ $query_type = 'category';
	94	+ $blog_prefix = 'b.';
95	95	}
96	96
97	97	/* User bookmarks(favorites) */
98	98	if ($uid > 0) {
99		- $criteria->add(new \Criteria('bm.bm_uid', $uid));
100		- $category_id = 0;
101		- $blog_id = 0;
102		- $bookmarkHandler = xoops_getModuleHandler('bookmark', $GLOBALS['moddirname']);
103		- $user_data = [
104		- 'uid' => $uid,
105		- 'name' => XoopsUser::getUnameFromId($uid),
106		- 'marks' => $bookmarkHandler->getCount(new \Criteria('bm_uid', $uid))
107		- ];
108		- $query_type = 'bookmark';
109		- $blog_prefix = 'b.';
	99	+ $criteria->add(new \Criteria('bm.bm_uid', $uid));
	100	+ $category_id = 0;
	101	+ $blog_id = 0;
	102	+ $bookmarkHandler = xoops_getModuleHandler('bookmark', $GLOBALS['moddirname']);
	103	+ $user_data = [
	104	+ 'uid' => $uid,
	105	+ 'name' => XoopsUser::getUnameFromId($uid),
	106	+ 'marks' => $bookmarkHandler->getCount(new \Criteria('bm_uid', $uid))
	107	+ ];
	108	+ $query_type = 'bookmark';
	109	+ $blog_prefix = 'b.';
110	110	}
111	111
112	112	$criteria->add(new \Criteria($blog_prefix . 'blog_status', 0, '>'));
		@@ -115,20 +115,20 @@ discard block
		block discarded – undo
115	115	$order = 'DESC';
116	116	$sort = empty($sort) ? 'default' : $sort;
117	117	switch ($sort) {
118		- case 'marks':
119		- $sortby = $blog_prefix . 'blog_marks';
120		- break;
121		- case 'rating':
122		- $sortby = $blog_prefix . 'blog_rating';
123		- break;
124		- case 'time':
125		- $sortby = $blog_prefix . 'blog_time';
126		- break;
127		- case 'default':
128		- default:
129		- $sort = 'default';
130		- $sortby = $blog_prefix . 'blog_id';
131		- break;
	118	+ case 'marks':
	119	+ $sortby = $blog_prefix . 'blog_marks';
	120	+ break;
	121	+ case 'rating':
	122	+ $sortby = $blog_prefix . 'blog_rating';
	123	+ break;
	124	+ case 'time':
	125	+ $sortby = $blog_prefix . 'blog_time';
	126	+ break;
	127	+ case 'default':
	128	+ default:
	129	+ $sort = 'default';
	130	+ $sortby = $blog_prefix . 'blog_id';
	131	+ break;
132	132	}
133	133	$criteria->setSort($sortby);
134	134	$criteria->setOrder($order);
		@@ -137,93 +137,93 @@ discard block
		block discarded – undo
137	137
138	138	$tags = empty($list) ? '' : [$blog_prefix . 'blog_title', $blog_prefix . 'blog_time'];
139	139	switch ($query_type) {
140		- case 'category':
141		- $blogs_obj = $blogHandler->getByCategory($criteria, $tags);
142		- $count_blog = $blogHandler->getCountByCategory($criteria);
143		- break;
144		- case 'bookmark':
145		- $blogs_obj = $blogHandler->getByBookmark($criteria, $tags);
146		- $count_blog = $blogHandler->getCountByBookmark($criteria);
147		- break;
148		- default:
149		- $blogs_obj = $blogHandler->getAll($criteria, $tags);
150		- $count_blog = $blogHandler->getCount($criteria);
151		- break;
	140	+ case 'category':
	141	+ $blogs_obj = $blogHandler->getByCategory($criteria, $tags);
	142	+ $count_blog = $blogHandler->getCountByCategory($criteria);
	143	+ break;
	144	+ case 'bookmark':
	145	+ $blogs_obj = $blogHandler->getByBookmark($criteria, $tags);
	146	+ $count_blog = $blogHandler->getCountByBookmark($criteria);
	147	+ break;
	148	+ default:
	149	+ $blogs_obj = $blogHandler->getAll($criteria, $tags);
	150	+ $count_blog = $blogHandler->getCount($criteria);
	151	+ break;
152	152	}
153	153
154	154	/* Objects to array */
155	155	$blogs = [];
156	156	foreach (array_keys($blogs_obj) as $id) {
157		- $_blog = [
158		- 'id' => $id,
159		- 'title' => $blogs_obj[$id]->getVar('blog_title'),
160		- 'time' => $blogs_obj[$id]->getTime()
161		- ];
162		- if (empty($list)) {
163		- $_blog = array_merge($_blog, [
164		- 'image' => $blogs_obj[$id]->getImage(),
165		- 'feed' => $blogs_obj[$id]->getVar('blog_feed'),
166		- 'link' => $blogs_obj[$id]->getVar('blog_link'),
167		- 'desc' => $blogs_obj[$id]->getVar('blog_desc'),
168		- 'star' => $blogs_obj[$id]->getStar(),
169		- 'rates' => $blogs_obj[$id]->getVar('blog_rates'),
170		- 'marks' => $blogs_obj[$id]->getVar('blog_marks')
171		- ]);
172		- }
173		- $blogs[] = $_blog;
174		- unset($_blog);
	157	+ $_blog = [
	158	+ 'id' => $id,
	159	+ 'title' => $blogs_obj[$id]->getVar('blog_title'),
	160	+ 'time' => $blogs_obj[$id]->getTime()
	161	+ ];
	162	+ if (empty($list)) {
	163	+ $_blog = array_merge($_blog, [
	164	+ 'image' => $blogs_obj[$id]->getImage(),
	165	+ 'feed' => $blogs_obj[$id]->getVar('blog_feed'),
	166	+ 'link' => $blogs_obj[$id]->getVar('blog_link'),
	167	+ 'desc' => $blogs_obj[$id]->getVar('blog_desc'),
	168	+ 'star' => $blogs_obj[$id]->getStar(),
	169	+ 'rates' => $blogs_obj[$id]->getVar('blog_rates'),
	170	+ 'marks' => $blogs_obj[$id]->getVar('blog_marks')
	171	+ ]);
	172	+ }
	173	+ $blogs[] = $_blog;
	174	+ unset($_blog);
175	175	}
176	176	unset($blogs_obj);
177	177
178	178	if ($count_blog > $limit) {
179		- include XOOPS_ROOT_PATH . '/class/pagenav.php';
180		- $start_link = [];
181		- if ($sort) {
182		- $start_link[] = 'sort=' . $sort;
183		- }
184		- if ($category_id) {
185		- $start_link[] = 'category=' . $category_id;
186		- }
187		- if ($list) {
188		- $start_link[] = 'list=' . $list;
189		- }
190		- $nav = new \XoopsPageNav($count_blog, $limit, $start, 'start', implode('&', $start_link));
191		- $pagenav = $nav->renderNav(4);
	179	+ include XOOPS_ROOT_PATH . '/class/pagenav.php';
	180	+ $start_link = [];
	181	+ if ($sort) {
	182	+ $start_link[] = 'sort=' . $sort;
	183	+ }
	184	+ if ($category_id) {
	185	+ $start_link[] = 'category=' . $category_id;
	186	+ }
	187	+ if ($list) {
	188	+ $start_link[] = 'list=' . $list;
	189	+ }
	190	+ $nav = new \XoopsPageNav($count_blog, $limit, $start, 'start', implode('&', $start_link));
	191	+ $pagenav = $nav->renderNav(4);
192	192	} else {
193		- $pagenav = '';
	193	+ $pagenav = '';
194	194	}
195	195
196	196	$xoopsTpl->assign('xoops_pagetitle', $xoopsOption['xoops_pagetitle']);
197	197	$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>');
198	198
199	199	if ($category_id \|\| $uid) {
200		- $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>');
	200	+ $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>');
201	201
202		- $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>';
203		- $xoopsTpl->assign('link_articles', $link_articles);
	202	+ $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>';
	203	+ $xoopsTpl->assign('link_articles', $link_articles);
204	204	}
205	205
206	206	$link_switch = '<a href="'
207		- . XOOPS_URL
208		- . '/modules/'
209		- . $GLOBALS['moddirname']
210		- . '/view.blogs.php'
211		- . (empty($category_id) ? '' : '/c' . $category_id)
212		- . (empty($uid) ? '' : '/u' . $uid)
213		- . (empty($list) ? '/l1' : '')
214		- . '" title="'
215		- . (empty($list) ? planet_constant('MD_LISTVIEW') : planet_constant('MD_FULLVIEW'))
216		- . '">'
217		- . (empty($list) ? planet_constant('MD_LISTVIEW') : planet_constant('MD_FULLVIEW'))
218		- . '</a>';
	207	+ . XOOPS_URL
	208	+ . '/modules/'
	209	+ . $GLOBALS['moddirname']
	210	+ . '/view.blogs.php'
	211	+ . (empty($category_id) ? '' : '/c' . $category_id)
	212	+ . (empty($uid) ? '' : '/u' . $uid)
	213	+ . (empty($list) ? '/l1' : '')
	214	+ . '" title="'
	215	+ . (empty($list) ? planet_constant('MD_LISTVIEW') : planet_constant('MD_FULLVIEW'))
	216	+ . '">'
	217	+ . (empty($list) ? planet_constant('MD_LISTVIEW') : planet_constant('MD_FULLVIEW'))
	218	+ . '</a>';
219	219	$xoopsTpl->assign('link_switch', $link_switch);
220	220
221	221	if (empty($uid) && is_object($xoopsUser)) {
222		- $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>');
	222	+ $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>');
223	223	}
224	224
225	225	if (1 == $helper->getConfig('newblog_submit') \|\| is_object($xoopsUser)) {
226		- $xoopsTpl->assign('link_submit', '<a href="' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/action.blog.php" title="' . _SUBMIT . '" target="_blank">' . _SUBMIT . '</a>');
	226	+ $xoopsTpl->assign('link_submit', '<a href="' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/action.blog.php" title="' . _SUBMIT . '" target="_blank">' . _SUBMIT . '</a>');
227	227	}
228	228
229	229	$xoopsTpl->assign('pagetitle', $xoopsModule->getVar('name') . '::' . planet_constant('MD_BLOGS'));
		@@ -237,35 +237,35 @@ discard block
		block discarded – undo
237	237	$xoopsTpl->assign('user_level', !is_object($xoopsUser) ? 0 : ($xoopsUser->isAdmin() ? 2 : 1));
238	238	if (empty($helper->getConfig('anonymous_rate')) && !is_object($xoopsUser)) {
239	239	} elseif (!$list) {
240		- $xoopsTpl->assign('canrate', 1);
	240	+ $xoopsTpl->assign('canrate', 1);
241	241	}
242	242
243	243	$sort_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.blogs.php' . URL_DELIMITER;
244	244	$vars = [];
245	245	if (!empty($category_id)) {
246		- $vars[] = 'c' . $category_id;
	246	+ $vars[] = 'c' . $category_id;
247	247	}
248	248	if (!empty($uid)) {
249		- $vars[] = 'u' . $uid;
	249	+ $vars[] = 'u' . $uid;
250	250	}
251	251	if (!empty($list)) {
252		- $vars[] = 'li';
	252	+ $vars[] = 'li';
253	253	}
254	254	if (!empty($vars)) {
255		- $sort_link .= implode('/', $vars) . '/';
	255	+ $sort_link .= implode('/', $vars) . '/';
256	256	}
257	257	$sortlinks = [];
258	258	$valid_sorts = [
259		- 'marks' => planet_constant('MD_BOOKMARKS'),
260		- 'rating' => planet_constant('MD_RATING'),
261		- 'time' => planet_constant('MD_TIME'),
262		- 'default' => planet_constant('MD_DEFAULT')
	259	+ 'marks' => planet_constant('MD_BOOKMARKS'),
	260	+ 'rating' => planet_constant('MD_RATING'),
	261	+ 'time' => planet_constant('MD_TIME'),
	262	+ 'default' => planet_constant('MD_DEFAULT')
263	263	];
264	264	foreach ($valid_sorts as $val => $name) {
265		- if ($val == $sort) {
266		- continue;
267		- }
268		- $sortlinks[] = '<a href="' . $sort_link . $val . '">' . $name . '</a>';
	265	+ if ($val == $sort) {
	266	+ continue;
	267	+ }
	268	+ $sortlinks[] = '<a href="' . $sort_link . $val . '">' . $name . '</a>';
269	269	}
270	270	$xoopsTpl->assign('link_sort', implode(' \| ', $sortlinks));
271	271

		@@ -29,10 +29,10 @@ discard block
		block discarded – undo
29	29	/** @var Planet\Helper $helper */
30	30	$helper = Planet\Helper::getInstance();
31	31
32		-include __DIR__ . '/header.php';
	32	+include __DIR__.'/header.php';
33	33
34	34	if (preg_match("/\/notification_update\.php/i", Request::getUrl('REQUEST_URI', '', 'SERVER'), $matches)) {
35		- include XOOPS_ROOT_PATH . '/include/notification_update.php';
	35	+ include XOOPS_ROOT_PATH.'/include/notification_update.php';
36	36	exit();
37	37	}
38	38
		@@ -69,10 +69,10 @@ discard block
		block discarded – undo
69	69	}
70	70	*/
71	71
72		-$xoopsOption['xoops_pagetitle'] = $xoopsModule->getVar('name') . ' - ' . planet_constant('MD_BLOGS');
	72	+$xoopsOption['xoops_pagetitle'] = $xoopsModule->getVar('name').' - '.planet_constant('MD_BLOGS');
73	73	$xoopsOption['template_main'] = PlanetUtility::planetGetTemplate('blogs');
74		-require_once XOOPS_ROOT_PATH . '/header.php';
75		-include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
	74	+require_once XOOPS_ROOT_PATH.'/header.php';
	75	+include XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/include/vars.php';
76	76
77	77	// Following part will not be executed after cache
78	78	$categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
		@@ -84,7 +84,7 @@ discard block
		block discarded – undo
84	84	$criteria = new \CriteriaCompo();
85	85	$blog_prefix = '';
86	86	/* Specific category */
87		-if ($category_id > 0) {
	87	+if ($category_id>0) {
88	88	$category_obj = $categoryHandler->get($category_id);
89	89	$criteria->add(new \Criteria('bc.cat_id', $category_id));
90	90	$uid = 0;
		@@ -95,7 +95,7 @@ discard block
		block discarded – undo
95	95	}
96	96
97	97	/* User bookmarks(favorites) */
98		-if ($uid > 0) {
	98	+if ($uid>0) {
99	99	$criteria->add(new \Criteria('bm.bm_uid', $uid));
100	100	$category_id = 0;
101	101	$blog_id = 0;
		@@ -109,25 +109,25 @@ discard block
		block discarded – undo
109	109	$blog_prefix = 'b.';
110	110	}
111	111
112		-$criteria->add(new \Criteria($blog_prefix . 'blog_status', 0, '>'));
	112	+$criteria->add(new \Criteria($blog_prefix.'blog_status', 0, '>'));
113	113
114	114	/* Sort */
115	115	$order = 'DESC';
116	116	$sort = empty($sort) ? 'default' : $sort;
117	117	switch ($sort) {
118	118	case 'marks':
119		- $sortby = $blog_prefix . 'blog_marks';
	119	+ $sortby = $blog_prefix.'blog_marks';
120	120	break;
121	121	case 'rating':
122		- $sortby = $blog_prefix . 'blog_rating';
	122	+ $sortby = $blog_prefix.'blog_rating';
123	123	break;
124	124	case 'time':
125		- $sortby = $blog_prefix . 'blog_time';
	125	+ $sortby = $blog_prefix.'blog_time';
126	126	break;
127	127	case 'default':
128	128	default:
129	129	$sort = 'default';
130		- $sortby = $blog_prefix . 'blog_id';
	130	+ $sortby = $blog_prefix.'blog_id';
131	131	break;
132	132	}
133	133	$criteria->setSort($sortby);
		@@ -135,7 +135,7 @@ discard block
		block discarded – undo
135	135	$criteria->setStart($start);
136	136	$criteria->setLimit($limit);
137	137
138		-$tags = empty($list) ? '' : [$blog_prefix . 'blog_title', $blog_prefix . 'blog_time'];
	138	+$tags = empty($list) ? '' : [$blog_prefix.'blog_title', $blog_prefix.'blog_time'];
139	139	switch ($query_type) {
140	140	case 'category':
141	141	$blogs_obj = $blogHandler->getByCategory($criteria, $tags);
		@@ -175,31 +175,31 @@ discard block
		block discarded – undo
175	175	}
176	176	unset($blogs_obj);
177	177
178		-if ($count_blog > $limit) {
179		- include XOOPS_ROOT_PATH . '/class/pagenav.php';
	178	+if ($count_blog>$limit) {
	179	+ include XOOPS_ROOT_PATH.'/class/pagenav.php';
180	180	$start_link = [];
181	181	if ($sort) {
182		- $start_link[] = 'sort=' . $sort;
	182	+ $start_link[] = 'sort='.$sort;
183	183	}
184	184	if ($category_id) {
185		- $start_link[] = 'category=' . $category_id;
	185	+ $start_link[] = 'category='.$category_id;
186	186	}
187	187	if ($list) {
188		- $start_link[] = 'list=' . $list;
	188	+ $start_link[] = 'list='.$list;
189	189	}
190	190	$nav = new \XoopsPageNav($count_blog, $limit, $start, 'start', implode('&', $start_link));
191	191	$pagenav = $nav->renderNav(4);
192		-} else {
	192	+}else {
193	193	$pagenav = '';
194	194	}
195	195
196	196	$xoopsTpl->assign('xoops_pagetitle', $xoopsOption['xoops_pagetitle']);
197		-$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>');
	197	+$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>');
198	198
199	199	if ($category_id \|\| $uid) {
200		- $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>');
	200	+ $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>');
201	201
202		- $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>';
	202	+ $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>';
203	203	$xoopsTpl->assign('link_articles', $link_articles);
204	204	}
205	205
		@@ -208,8 +208,8 @@ discard block
		block discarded – undo
208	208	. '/modules/'
209	209	. $GLOBALS['moddirname']
210	210	. '/view.blogs.php'
211		- . (empty($category_id) ? '' : '/c' . $category_id)
212		- . (empty($uid) ? '' : '/u' . $uid)
	211	+ . (empty($category_id) ? '' : '/c'.$category_id)
	212	+ . (empty($uid) ? '' : '/u'.$uid)
213	213	. (empty($list) ? '/l1' : '')
214	214	. '" title="'
215	215	. (empty($list) ? planet_constant('MD_LISTVIEW') : planet_constant('MD_FULLVIEW'))
		@@ -219,14 +219,14 @@ discard block
		block discarded – undo
219	219	$xoopsTpl->assign('link_switch', $link_switch);
220	220
221	221	if (empty($uid) && is_object($xoopsUser)) {
222		- $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>');
	222	+ $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>');
223	223	}
224	224
225	225	if (1 == $helper->getConfig('newblog_submit') \|\| is_object($xoopsUser)) {
226		- $xoopsTpl->assign('link_submit', '<a href="' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/action.blog.php" title="' . _SUBMIT . '" target="_blank">' . _SUBMIT . '</a>');
	226	+ $xoopsTpl->assign('link_submit', '<a href="'.XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/action.blog.php" title="'._SUBMIT.'" target="_blank">'._SUBMIT.'</a>');
227	227	}
228	228
229		-$xoopsTpl->assign('pagetitle', $xoopsModule->getVar('name') . '::' . planet_constant('MD_BLOGS'));
	229	+$xoopsTpl->assign('pagetitle', $xoopsModule->getVar('name').'::'.planet_constant('MD_BLOGS'));
230	230	$xoopsTpl->assign('category', @$category_data);
231	231	$xoopsTpl->assign('user', @$user_data);
232	232	$xoopsTpl->assign('blogs', $blogs);
		@@ -240,19 +240,19 @@ discard block
		block discarded – undo
240	240	$xoopsTpl->assign('canrate', 1);
241	241	}
242	242
243		-$sort_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.blogs.php' . URL_DELIMITER;
	243	+$sort_link = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.blogs.php'.URL_DELIMITER;
244	244	$vars = [];
245	245	if (!empty($category_id)) {
246		- $vars[] = 'c' . $category_id;
	246	+ $vars[] = 'c'.$category_id;
247	247	}
248	248	if (!empty($uid)) {
249		- $vars[] = 'u' . $uid;
	249	+ $vars[] = 'u'.$uid;
250	250	}
251	251	if (!empty($list)) {
252	252	$vars[] = 'li';
253	253	}
254	254	if (!empty($vars)) {
255		- $sort_link .= implode('/', $vars) . '/';
	255	+ $sort_link .= implode('/', $vars).'/';
256	256	}
257	257	$sortlinks = [];
258	258	$valid_sorts = [
		@@ -265,8 +265,8 @@ discard block
		block discarded – undo
265	265	if ($val == $sort) {
266	266	continue;
267	267	}
268		- $sortlinks[] = '<a href="' . $sort_link . $val . '">' . $name . '</a>';
	268	+ $sortlinks[] = '<a href="'.$sort_link.$val.'">'.$name.'</a>';
269	269	}
270	270	$xoopsTpl->assign('link_sort', implode(' \| ', $sortlinks));
271	271
272		-require_once __DIR__ . '/footer.php';
	272	+require_once __DIR__.'/footer.php';

		@@ -34,12 +34,12 @@ discard block
		block discarded – undo
34	34	$blog_id = Request::getInt('blog', Request::getInt('blog', 0, 'POST'), 'GET'); //(int)(!empty($_POST['blog']) ? $_POST['blog'] : (!empty($_GET['blog']) ? $_GET['blog'] : 0));
35	35	$blogHandler = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
36	36	if ($blog_id > 0) {
37		- $blog = $blogHandler->get($blog_id);
38		- $count = $blogHandler->do_update($blog);
39		- redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php?blog=' . $blog_id, 2, sprintf(planet_constant('MD_UPDATED'), (int)$count));
	37	+ $blog = $blogHandler->get($blog_id);
	38	+ $count = $blogHandler->do_update($blog);
	39	+ redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php?blog=' . $blog_id, 2, sprintf(planet_constant('MD_UPDATED'), (int)$count));
40	40	}
41	41	if (planetGetCookie('upd') + 30 * 60 > time()) {
42		- return;
	42	+ return;
43	43	}
44	44	PlanetUtility::planetSetCookie('upd', time());
45	45	$start = 0;
		@@ -50,15 +50,15 @@ discard block
		block discarded – undo
50	50	$criteria->setLimit($helper->getConfig('blogs_perupdate'));
51	51	$blogs = $blogHandler->getAll($criteria);
52	52	foreach (array_keys($blogs) as $id) {
53		- $blogHandler->do_update($blogs[$id]);
	53	+ $blogHandler->do_update($blogs[$id]);
54	54	}
55	55	$start += count($blogs);
56	56	if (count($blogs) < $helper->getConfig('blogs_perupdate')) {
57		- $start = 0;
	57	+ $start = 0;
58	58	}
59	59	$fp = fopen(XOOPS_CACHE_PATH . '/' . $xoopsModule->getVar('dirname') . '_update.php', 'w');
60	60	if (!$fp) {
61		- return;
	61	+ return;
62	62	}
63	63	fwrite($fp, "<?php\n \$start=" . (int)$start . ";\n?>");
64	64	fclose($fp);

		@@ -29,21 +29,21 @@ discard block
		block discarded – undo
29	29	/** @var Planet\Helper $helper */
30	30	$helper = Planet\Helper::getInstance();
31	31
32		-include __DIR__ . '/header.php';
	32	+include __DIR__.'/header.php';
33	33
34	34	$blog_id = Request::getInt('blog', Request::getInt('blog', 0, 'POST'), 'GET'); //(int)(!empty($_POST['blog']) ? $_POST['blog'] : (!empty($_GET['blog']) ? $_GET['blog'] : 0));
35	35	$blogHandler = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
36		-if ($blog_id > 0) {
	36	+if ($blog_id>0) {
37	37	$blog = $blogHandler->get($blog_id);
38	38	$count = $blogHandler->do_update($blog);
39		- redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php?blog=' . $blog_id, 2, sprintf(planet_constant('MD_UPDATED'), (int)$count));
	39	+ redirect_header(XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php?blog='.$blog_id, 2, sprintf(planet_constant('MD_UPDATED'), (int) $count));
40	40	}
41		-if (planetGetCookie('upd') + 30 * 60 > time()) {
	41	+if (planetGetCookie('upd')+30*60>time()) {
42	42	return;
43	43	}
44	44	PlanetUtility::planetSetCookie('upd', time());
45	45	$start = 0;
46		-@include XOOPS_CACHE_PATH . '/' . $xoopsModule->getVar('dirname') . '_update.php';
	46	+@include XOOPS_CACHE_PATH.'/'.$xoopsModule->getVar('dirname').'_update.php';
47	47	$criteria = new \Criteria('blog_status', 0, '>');
48	48	$criteria->setSort('blog_id');
49	49	$criteria->setStart($start);
		@@ -53,12 +53,12 @@ discard block
		block discarded – undo
53	53	$blogHandler->do_update($blogs[$id]);
54	54	}
55	55	$start += count($blogs);
56		-if (count($blogs) < $helper->getConfig('blogs_perupdate')) {
	56	+if (count($blogs)<$helper->getConfig('blogs_perupdate')) {
57	57	$start = 0;
58	58	}
59		-$fp = fopen(XOOPS_CACHE_PATH . '/' . $xoopsModule->getVar('dirname') . '_update.php', 'w');
	59	+$fp = fopen(XOOPS_CACHE_PATH.'/'.$xoopsModule->getVar('dirname').'_update.php', 'w');
60	60	if (!$fp) {
61	61	return;
62	62	}
63		-fwrite($fp, "<?php\n \$start=" . (int)$start . ";\n?>");
	63	+fwrite($fp, "<?php\n \$start=".(int) $start.";\n?>");
64	64	fclose($fp);

		@@ -21,21 +21,21 @@
		block discarded – undo
21	21	$op = \Xmf\Request::getCmd('op', '');
22	22
23	23	switch ($op) {
24		- case 'load':
25		- loadSampleData();
26		- break;
	24	+ case 'load':
	25	+ loadSampleData();
	26	+ break;
27	27	}
28	28
29	29	// XMF TableLoad for SAMPLE data
30	30
31	31	function loadSampleData()
32	32	{
33		- // $moduleDirName = basename(dirname(__DIR__));
34		- xoops_loadLanguage('comment');
35		- $items = \Xmf\Yaml::readWrapped('quotes_data.yml');
	33	+ // $moduleDirName = basename(dirname(__DIR__));
	34	+ xoops_loadLanguage('comment');
	35	+ $items = \Xmf\Yaml::readWrapped('quotes_data.yml');
36	36
37		- \Xmf\Database\TableLoad::truncateTable('randomquote_quotes');
38		- \Xmf\Database\TableLoad::loadTableFromArray('randomquote_quotes', $items);
	37	+ \Xmf\Database\TableLoad::truncateTable('randomquote_quotes');
	38	+ \Xmf\Database\TableLoad::loadTableFromArray('randomquote_quotes', $items);
39	39
40		- redirect_header('../admin/index.php', 1, _CM_ACTIVE);
	40	+ redirect_header('../admin/index.php', 1, _CM_ACTIVE);
41	41	}

		@@ -15,7 +15,7 @@
		block discarded – undo
15	15	* @author Michael Beck (aka Mamba)
16	16	*/
17	17
18		-require_once __DIR__ . '/../../../mainfile.php';
	18	+require_once __DIR__.'/../../../mainfile.php';
19	19
20	20
21	21	$op = \Xmf\Request::getCmd('op', '');

		@@ -27,7 +27,7 @@
		block discarded – undo
27	27
28	28	// defined('XOOPS_ROOT_PATH') \|\| die('Restricted access');
29	29
30		-include __DIR__ . '/vars.php';
	30	+include __DIR__.'/vars.php';
31	31	//mod_loadFunctions('', $GLOBALS['moddirname']);
32	32
33	33	PlanetUtility::planetParseFunction('

mambax7 / planet

Push — master ( a0a78b...8db6f6 )

Status

Category

Indentation +29 added lines, -29 removed lines patch added patch discarded remove patch

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

Indentation +110 added lines, -110 removed lines patch added patch discarded remove patch

Spacing +33 added lines, -33 removed lines patch added patch discarded remove patch

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Indentation +9 added lines, -9 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch