mambax7 / planet

view.blogs.php

Indentation +110 added lines, -110 removed lines

@@ -29,13 +29,13 @@ 
 include __DIR__ . '/header.php';
 
 if (preg_match("/\/notification_update\.php/i", Request::getUrl('REQUEST_URI', '', 'SERVER'), $matches)) {
-    include XOOPS_ROOT_PATH . '/include/notification_update.php';
-    exit();
+	include XOOPS_ROOT_PATH . '/include/notification_update.php';
+	exit();
 }
 
 if ($REQUEST_URI_parsed = PlanetUtility::planetParseArguments($args_num, $args, $args_str)) {
-    $args['start'] = @$args_num[0];
-    $args['sort']  = @$args_str[0];
+	$args['start'] = @$args_num[0];
+	$args['sort']  = @$args_str[0];
 }
 
 /* Start */
@@ -82,28 +82,28 @@ 
 $blog_prefix = '';
 /* Specific category */
 if ($category_id > 0) {
-    $category_obj = $categoryHandler->get($category_id);
-    $criteria->add(new Criteria('bc.cat_id', $category_id));
-    $uid           = 0;
-    $blog_id       = 0;
-    $category_data = ['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, '>'));
@@ -112,20 +112,20 @@ 
 $order = 'DESC';
 $sort  = empty($sort) ? 'default' : $sort;
 switch ($sort) {
-    case 'marks':
-        $sortby = $blog_prefix . 'blog_marks';
-        break;
-    case 'rating':
-        $sortby = $blog_prefix . 'blog_rating';
-        break;
-    case 'time':
-        $sortby = $blog_prefix . 'blog_time';
-        break;
-    case 'default':
-    default:
-        $sort   = 'default';
-        $sortby = $blog_prefix . 'blog_id';
-        break;
+	case 'marks':
+		$sortby = $blog_prefix . 'blog_marks';
+		break;
+	case 'rating':
+		$sortby = $blog_prefix . 'blog_rating';
+		break;
+	case 'time':
+		$sortby = $blog_prefix . 'blog_time';
+		break;
+	case 'default':
+	default:
+		$sort   = 'default';
+		$sortby = $blog_prefix . 'blog_id';
+		break;
 }
 $criteria->setSort($sortby);
 $criteria->setOrder($order);
@@ -134,93 +134,93 @@ 
 
 $tags = empty($list) ? '' : [$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('&', $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('&', $start_link));
+	$pagenav = $nav->renderNav(4);
 } else {
-    $pagenav = '';
+	$pagenav = '';
 }
 
 $xoopsTpl->assign('xoops_pagetitle', $xoopsOption['xoops_pagetitle']);
 $xoopsTpl->assign('link_home', "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . "/index.php\" title=\"" . planet_constant('MD_HOME') . "\" target=\"_self\">" . planet_constant('MD_HOME') . '</a>');
 
 if ($category_id || $uid) {
-    $xoopsTpl->assign('link_index', "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . "/view.blogs.php\" title=\"" . planet_constant('MD_INDEX') . "\" target=\"_self\">" . planet_constant('MD_INDEX') . '</a>');
+	$xoopsTpl->assign('link_index', "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . "/view.blogs.php\" title=\"" . planet_constant('MD_INDEX') . "\" target=\"_self\">" . planet_constant('MD_INDEX') . '</a>');
 
-    $link_articles = "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . (empty($category_id) ? '' : '/c' . $category_id) . (empty($uid) ? '' : '/u' . $uid) . "\" title=\"" . planet_constant('MD_ARTICLES') . "\">" . planet_constant('MD_ARTICLES') . '</a>';
-    $xoopsTpl->assign('link_articles', $link_articles);
+	$link_articles = "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . (empty($category_id) ? '' : '/c' . $category_id) . (empty($uid) ? '' : '/u' . $uid) . "\" title=\"" . planet_constant('MD_ARTICLES') . "\">" . planet_constant('MD_ARTICLES') . '</a>';
+	$xoopsTpl->assign('link_articles', $link_articles);
 }
 
 $link_switch = "<a href=\""
-               . XOOPS_URL
-               . '/modules/'
-               . $GLOBALS['moddirname']
-               . '/view.blogs.php'
-               . (empty($category_id) ? '' : '/c' . $category_id)
-               . (empty($uid) ? '' : '/u' . $uid)
-               . (empty($list) ? '/l1' : '')
-               . "\" title=\""
-               . (empty($list) ? planet_constant('MD_LISTVIEW') : planet_constant('MD_FULLVIEW'))
-               . "\">"
-               . (empty($list) ? planet_constant('MD_LISTVIEW') : planet_constant('MD_FULLVIEW'))
-               . '</a>';
+			   . XOOPS_URL
+			   . '/modules/'
+			   . $GLOBALS['moddirname']
+			   . '/view.blogs.php'
+			   . (empty($category_id) ? '' : '/c' . $category_id)
+			   . (empty($uid) ? '' : '/u' . $uid)
+			   . (empty($list) ? '/l1' : '')
+			   . "\" title=\""
+			   . (empty($list) ? planet_constant('MD_LISTVIEW') : planet_constant('MD_FULLVIEW'))
+			   . "\">"
+			   . (empty($list) ? planet_constant('MD_LISTVIEW') : planet_constant('MD_FULLVIEW'))
+			   . '</a>';
 $xoopsTpl->assign('link_switch', $link_switch);
 
 if (empty($uid) && is_object($xoopsUser)) {
-    $xoopsTpl->assign('link_bookmark', "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.blogs.php' . URL_DELIMITER . 'u' . $xoopsUser->getVar('uid') . "\" title=\"" . planet_constant('MD_BOOKMARKS') . "\" target=\"_self\">" . planet_constant('MD_BOOKMARKS') . '</a>');
+	$xoopsTpl->assign('link_bookmark', "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.blogs.php' . URL_DELIMITER . 'u' . $xoopsUser->getVar('uid') . "\" title=\"" . planet_constant('MD_BOOKMARKS') . "\" target=\"_self\">" . planet_constant('MD_BOOKMARKS') . '</a>');
 }
 
 if ($xoopsModuleConfig['newblog_submit'] == 1 || is_object($xoopsUser)) {
-    $xoopsTpl->assign('link_submit', "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . "/action.blog.php\" title=\"" . _SUBMIT . "\" target=\"_blank\">" . _SUBMIT . '</a>');
+	$xoopsTpl->assign('link_submit', "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . "/action.blog.php\" title=\"" . _SUBMIT . "\" target=\"_blank\">" . _SUBMIT . '</a>');
 }
 
 $xoopsTpl->assign('pagetitle', $xoopsModule->getVar('name') . '::' . planet_constant('MD_BLOGS'));
@@ -234,35 +234,35 @@ 
 $xoopsTpl->assign('user_level', !is_object($xoopsUser) ? 0 : ($xoopsUser->isAdmin() ? 2 : 1));
 if (empty($xoopsModuleConfig['anonymous_rate']) && !is_object($xoopsUser)) {
 } elseif (!$list) {
-    $xoopsTpl->assign('canrate', 1);
+	$xoopsTpl->assign('canrate', 1);
 }
 
 $sort_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.blogs.php' . URL_DELIMITER;
 $vars      = [];
 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));
 

Spacing +33 added lines, -33 removed lines

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

search.php

Indentation +97 added lines, -97 removed lines

@@ -32,7 +32,7 @@ 
 $configHandler     = xoops_getHandler('config');
 $xoopsConfigSearch = $configHandler->getConfigsByCat(XOOPS_CONF_SEARCH);
 if (empty($xoopsConfigSearch['enable_search'])) {
-    redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php', 2, planet_constant('MD_NOACCESS'));
+	redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php', 2, planet_constant('MD_NOACCESS'));
 }
 
 $xoopsConfig['module_cache'][$xoopsModule->getVar('mid')] = 0;
@@ -50,93 +50,93 @@ 
 $blog     = Request::getInt('blog', Request::getInt('blog', 0, 'GET'), 'POST');//(int)(isset($_POST['blog']) ? $_POST['blog'] : (isset($_GET['blog']) ? $_GET['blog'] : null));
 $uid      = Request::getInt('uid', Request::getInt('uid', 0, 'GET'), 'POST');//(int)(isset($_POST['uid']) ? $_POST['uid'] : (isset($_GET['uid']) ? $_GET['uid'] : null));
 $searchin = Request::getArray(
-    'searchin',
-    0 !== count(Request::getArray('searchin', [], 'GET')) ? explode('|', Request::getArray('searchin', [], 'GET')) : [],
-                              'POST'
+	'searchin',
+	0 !== count(Request::getArray('searchin', [], 'GET')) ? explode('|', Request::getArray('searchin', [], 'GET')) : [],
+							  'POST'
 ); //isset($_POST['searchin']) ? $_POST['searchin'] : (isset($_GET['searchin']) ? explode('|', $_GET['searchin']) : array());
 $sortby   = Request::getString('sortby', Request::getString('sortby', null, 'GET'), 'POST');//isset($_POST['sortby']) ? $_POST['sortby'] : (isset($_GET['sortby']) ? $_GET['sortby'] : null);
 $term     = Request::getString('term', Request::getString('term', '', 'GET'), 'POST');//isset($_POST['term']) ? $_POST['term'] : (isset($_GET['term']) ? $_GET['term'] : '');
 
 $andor  = in_array(strtoupper($andor), ['OR', 'AND', 'EXACT']) ? strtoupper($andor) : 'OR';
 $sortby = in_array(strtolower($sortby), [
-    'a.art_id desc',
-    'a.art_time desc',
-    'a.art_title',
-    'a.blog_id',
-    'b.blog_id',
-    'b.blog_feed',
-    'b.blog_title',
-    'b.blog_time'
+	'a.art_id desc',
+	'a.art_time desc',
+	'a.art_title',
+	'a.blog_id',
+	'b.blog_id',
+	'b.blog_feed',
+	'b.blog_title',
+	'b.blog_time'
 ]) ? strtolower($sortby) : '';
 
 if (!(empty(Request::getString('submit', '', 'POST')) && empty(Request::getString('term', '', 'GET')))) {
-    $next_search['category'] = $category;
-    $next_search['blog']     = $blog;
-    $next_search['uid']      = $uid;
-    $next_search['andor']    = $andor;
+	$next_search['category'] = $category;
+	$next_search['blog']     = $blog;
+	$next_search['uid']      = $uid;
+	$next_search['andor']    = $andor;
 
-    $next_search['term'] = $term;
-    $query               = trim($term);
+	$next_search['term'] = $term;
+	$query               = trim($term);
 
-    if ($andor !== 'EXACT') {
-        $ignored_queries = []; // holds kewords that are shorter than allowed minmum length
-        $temp_queries    = preg_split("/[\s,]+/", $query);
-        foreach ($temp_queries as $q) {
-            $q = trim($q);
-            if (strlen($q) >= $xoopsConfigSearch['keyword_min']) {
-                $queries[] = $myts->addSlashes($q);
-            } else {
-                $ignored_queries[] = $myts->addSlashes($q);
-            }
-        }
-        if (count($queries) == 0) {
-            redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
-        }
-    } else {
-        if (strlen($query) < $xoopsConfigSearch['keyword_min']) {
-            redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
-        }
-        $queries = [$myts->addSlashes($query)];
-    }
+	if ($andor !== 'EXACT') {
+		$ignored_queries = []; // holds kewords that are shorter than allowed minmum length
+		$temp_queries    = preg_split("/[\s,]+/", $query);
+		foreach ($temp_queries as $q) {
+			$q = trim($q);
+			if (strlen($q) >= $xoopsConfigSearch['keyword_min']) {
+				$queries[] = $myts->addSlashes($q);
+			} else {
+				$ignored_queries[] = $myts->addSlashes($q);
+			}
+		}
+		if (count($queries) == 0) {
+			redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
+		}
+	} else {
+		if (strlen($query) < $xoopsConfigSearch['keyword_min']) {
+			redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
+		}
+		$queries = [$myts->addSlashes($query)];
+	}
 
-    $next_search['sortby']   = $sortby;
-    $next_search['searchin'] = implode('|', $searchin);
+	$next_search['sortby']   = $sortby;
+	$next_search['searchin'] = implode('|', $searchin);
 
-    /* To be added: year-month
+	/* To be added: year-month
      * see view.archive.php
      */
-    if (!empty($time)) {
-        $extra = '';
-    } else {
-        $extra = '';
-    }
+	if (!empty($time)) {
+		$extra = '';
+	} else {
+		$extra = '';
+	}
 
-    $results = planet_search($queries, $andor, $limit, $start, $uid, $category, $blog, $sortby, $searchin, $extra);
+	$results = planet_search($queries, $andor, $limit, $start, $uid, $category, $blog, $sortby, $searchin, $extra);
 
-    /*
+	/*
     if ( count($results) < 1 ) {
         redirect_header("javascript:history.go(-1);", 2, _SR_NOMATCH);
     } else
     */
-    {
-        $xoopsTpl->assign('results', $results);
+	{
+		$xoopsTpl->assign('results', $results);
 
-        if (count($next_search) > 0) {
-            $items = [];
-            foreach ($next_search as $para => $val) {
-                if (!empty($val)) {
-                    $items[] = "$para=$val";
-                }
-            }
-            if (count($items) > 0) {
-                $paras = implode('&', $items);
-            }
-            unset($next_search);
-            unset($items);
-        }
-        $search_url = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php?' . $paras;
+		if (count($next_search) > 0) {
+			$items = [];
+			foreach ($next_search as $para => $val) {
+				if (!empty($val)) {
+					$items[] = "$para=$val";
+				}
+			}
+			if (count($items) > 0) {
+				$paras = implode('&', $items);
+			}
+			unset($next_search);
+			unset($items);
+		}
+		$search_url = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php?' . $paras;
 
-        /*
+		/*
          $next_results =& planet_search($queries, $andor, 1, $start + $limit, $uid, $category, $sortby, $searchin, $extra);
       $next_count = count($next_results);
       $has_next = false;
@@ -145,41 +145,41 @@ 
       }
       if (false != $has_next)
       */
-        if (count($results)) {
-            $next            = $start + $limit;
-            $queries         = implode(',', $queries);
-            $search_url_next = $search_url . "&start=$next";
-            $search_next     = "<a href=\"" . htmlspecialchars($search_url_next) . "\">" . _SR_NEXT . '</a>';
-            $xoopsTpl->assign('search_next', $search_next);
-        }
-        if ($start > 0) {
-            $prev            = $start - $limit;
-            $search_url_prev = $search_url . "&start=$prev";
-            $search_prev     = "<a href=\"" . htmlspecialchars($search_url_prev) . "\">" . _SR_PREVIOUS . '</a>';
-            $xoopsTpl->assign('search_prev', $search_prev);
-        }
-    }
+		if (count($results)) {
+			$next            = $start + $limit;
+			$queries         = implode(',', $queries);
+			$search_url_next = $search_url . "&start=$next";
+			$search_next     = "<a href=\"" . htmlspecialchars($search_url_next) . "\">" . _SR_NEXT . '</a>';
+			$xoopsTpl->assign('search_next', $search_next);
+		}
+		if ($start > 0) {
+			$prev            = $start - $limit;
+			$search_url_prev = $search_url . "&start=$prev";
+			$search_prev     = "<a href=\"" . htmlspecialchars($search_url_prev) . "\">" . _SR_PREVIOUS . '</a>';
+			$xoopsTpl->assign('search_prev', $search_prev);
+		}
+	}
 
-    unset($results);
-    $search_info = _SR_KEYWORDS . ': ' . $myts->htmlSpecialChars($term);
-    $xoopsTpl->assign('search_info', $search_info);
+	unset($results);
+	$search_info = _SR_KEYWORDS . ': ' . $myts->htmlSpecialChars($term);
+	$xoopsTpl->assign('search_info', $search_info);
 }
 
 /* type */
 $type_select = "<select name=\"andor\">";
 $type_select .= "<option value=\"OR\"";
 if ('OR' === $andor) {
-    $type_select .= " selected=\"selected\"";
+	$type_select .= " selected=\"selected\"";
 }
 $type_select .= '>' . _SR_ANY . '</option>';
 $type_select .= "<option value=\"AND\"";
 if ('AND' === $andor) {
-    $type_select .= " selected=\"selected\"";
+	$type_select .= " selected=\"selected\"";
 }
 $type_select .= '>' . _SR_ALL . '</option>';
 $type_select .= "<option value=\"EXACT\"";
 if ('exact' === $andor) {
-    $type_select .= " selected=\"selected\"";
+	$type_select .= " selected=\"selected\"";
 }
 $type_select .= '>' . _SR_EXACT . '</option>';
 $type_select .= '</select>';
@@ -188,32 +188,32 @@ 
 $searchin_select = '';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"title\"";
 if (in_array('title', $searchin)) {
-    $searchin_select .= ' checked';
+	$searchin_select .= ' checked';
 }
 $searchin_select .= '>' . planet_constant('MD_TITLE') . '&nbsp;&nbsp;';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"text\"";
 if (in_array('text', $searchin)) {
-    $searchin_select .= ' checked';
+	$searchin_select .= ' checked';
 }
 $searchin_select .= '>' . planet_constant('MD_BODY') . '&nbsp;&nbsp;||&nbsp;&nbsp;';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"blog\"";
 if (in_array('blog', $searchin)) {
-    $searchin_select .= ' checked';
+	$searchin_select .= ' checked';
 }
 $searchin_select .= '>' . planet_constant('MD_BLOG') . '&nbsp;&nbsp;';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"feed\"";
 if (in_array('feed', $searchin)) {
-    $searchin_select .= ' checked';
+	$searchin_select .= ' checked';
 }
 $searchin_select .= '>' . planet_constant('MD_FEED') . '&nbsp;&nbsp;';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"desc\"";
 if (in_array('desc', $searchin)) {
-    $searchin_select .= ' checked';
+	$searchin_select .= ' checked';
 }
 $searchin_select .= '>' . planet_constant('MD_DESC') . '&nbsp;&nbsp;';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"all\"";
 if (empty($searchin)) {
-    $searchin_select .= ' checked';
+	$searchin_select .= ' checked';
 }
 $searchin_select .= '>' . _ALL . '&nbsp;&nbsp;';
 
@@ -221,28 +221,28 @@ 
 $sortby_select = "<select name=\"sortby\">";
 $sortby_select .= "<option value=\"\"";
 if (empty($sortby)) {
-    $sortby_select .= " selected=\"selected\"";
+	$sortby_select .= " selected=\"selected\"";
 }
 $sortby_select .= '>' . _NONE . '</option>';
 $sortby_select .= "<option value=\"a.art_time\"";
 if ('a.art_time' === $sortby) {
-    $sortby_select .= " selected=\"selected\"";
+	$sortby_select .= " selected=\"selected\"";
 }
 $sortby_select .= '>' . planet_constant('MD_TIME') . '</option>';
 $sortby_select .= "<option value=\"a.art_title\"";
 if ('a.art_title' === $sortby) {
-    $sortby_select .= " selected=\"selected\"";
+	$sortby_select .= " selected=\"selected\"";
 }
 $sortby_select .= '>' . planet_constant('MD_TITLE') . '</option>';
 $sortby_select .= "<option value=\"\">&nbsp;&nbsp;----&nbsp;&nbsp;</option>";
 $sortby_select .= "<option value=\"a.blog_title\"";
 if ('a.blog_title' === $sortby) {
-    $sortby_select .= " selected=\"selected\"";
+	$sortby_select .= " selected=\"selected\"";
 }
 $sortby_select .= '>' . planet_constant('MD_BLOG') . '</option>';
 $sortby_select .= "<option value=\"a.blog_time\"";
 if ('b.blog_time' === $sortby) {
-    $sortby_select .= " selected=\"selected\"";
+	$sortby_select .= " selected=\"selected\"";
 }
 $sortby_select .= '>' . planet_constant('MD_UPDATE') . '</option>';
 $sortby_select .= '</select>';
@@ -259,7 +259,7 @@ 
 $xoopsTpl->assign('uid', $uid);
 
 if ($xoopsConfigSearch['keyword_min'] > 0) {
-    $xoopsTpl->assign('search_rule', sprintf(_SR_KEYIGNORE, $xoopsConfigSearch['keyword_min']));
+	$xoopsTpl->assign('search_rule', sprintf(_SR_KEYIGNORE, $xoopsConfigSearch['keyword_min']));
 }
 
 include XOOPS_ROOT_PATH . '/footer.php';

Spacing +45 added lines, -45 removed lines

@@ -27,35 +27,35 @@ 
 use Xmf\Request;
 
 $xoopsOption['pagetype'] = 'search';
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 $xoopsModule->loadLanguage('main');
 $configHandler     = xoops_getHandler('config');
 $xoopsConfigSearch = $configHandler->getConfigsByCat(XOOPS_CONF_SEARCH);
 if (empty($xoopsConfigSearch['enable_search'])) {
-    redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php', 2, planet_constant('MD_NOACCESS'));
+    redirect_header(XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php', 2, planet_constant('MD_NOACCESS'));
 }
 
 $xoopsConfig['module_cache'][$xoopsModule->getVar('mid')] = 0;
 $xoopsOption['template_main']                             = PlanetUtility::planetGetTemplate('search');
-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';
 
-require_once XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/include/search.inc.php';
+require_once XOOPS_ROOT_PATH.'/modules/'.$GLOBALS['moddirname'].'/include/search.inc.php';
 $limit = $xoopsModuleConfig['articles_perpage'];
 
 $queries  = [];
-$andor    = Request::getString('andor', Request::getString('andor', '', 'GET'), 'POST');//isset($_POST['andor']) ? $_POST['andor'] : (isset($_GET['andor']) ? $_GET['andor'] : '');
-$start    = Request::getInt('start', 0, 'GET');//isset($_GET['start']) ? $_GET['start'] : 0;
+$andor    = Request::getString('andor', Request::getString('andor', '', 'GET'), 'POST'); //isset($_POST['andor']) ? $_POST['andor'] : (isset($_GET['andor']) ? $_GET['andor'] : '');
+$start    = Request::getInt('start', 0, 'GET'); //isset($_GET['start']) ? $_GET['start'] : 0;
 $category = Request::getInt('category', Request::getInt('category', 0, 'GET'), 'POST'); //(int)(isset($_POST['category']) ? $_POST['category'] : (isset($_GET['category']) ? $_GET['category'] : null));
-$blog     = Request::getInt('blog', Request::getInt('blog', 0, 'GET'), 'POST');//(int)(isset($_POST['blog']) ? $_POST['blog'] : (isset($_GET['blog']) ? $_GET['blog'] : null));
-$uid      = Request::getInt('uid', Request::getInt('uid', 0, 'GET'), 'POST');//(int)(isset($_POST['uid']) ? $_POST['uid'] : (isset($_GET['uid']) ? $_GET['uid'] : null));
+$blog     = Request::getInt('blog', Request::getInt('blog', 0, 'GET'), 'POST'); //(int)(isset($_POST['blog']) ? $_POST['blog'] : (isset($_GET['blog']) ? $_GET['blog'] : null));
+$uid      = Request::getInt('uid', Request::getInt('uid', 0, 'GET'), 'POST'); //(int)(isset($_POST['uid']) ? $_POST['uid'] : (isset($_GET['uid']) ? $_GET['uid'] : null));
 $searchin = Request::getArray(
     'searchin',
     0 !== count(Request::getArray('searchin', [], 'GET')) ? explode('|', Request::getArray('searchin', [], 'GET')) : [],
                               'POST'
 ); //isset($_POST['searchin']) ? $_POST['searchin'] : (isset($_GET['searchin']) ? explode('|', $_GET['searchin']) : array());
-$sortby   = Request::getString('sortby', Request::getString('sortby', null, 'GET'), 'POST');//isset($_POST['sortby']) ? $_POST['sortby'] : (isset($_GET['sortby']) ? $_GET['sortby'] : null);
-$term     = Request::getString('term', Request::getString('term', '', 'GET'), 'POST');//isset($_POST['term']) ? $_POST['term'] : (isset($_GET['term']) ? $_GET['term'] : '');
+$sortby   = Request::getString('sortby', Request::getString('sortby', null, 'GET'), 'POST'); //isset($_POST['sortby']) ? $_POST['sortby'] : (isset($_GET['sortby']) ? $_GET['sortby'] : null);
+$term     = Request::getString('term', Request::getString('term', '', 'GET'), 'POST'); //isset($_POST['term']) ? $_POST['term'] : (isset($_GET['term']) ? $_GET['term'] : '');
 
 $andor  = in_array(strtoupper($andor), ['OR', 'AND', 'EXACT']) ? strtoupper($andor) : 'OR';
 $sortby = in_array(strtolower($sortby), [
@@ -83,18 +83,18 @@ 
         $temp_queries    = preg_split("/[\s,]+/", $query);
         foreach ($temp_queries as $q) {
             $q = trim($q);
-            if (strlen($q) >= $xoopsConfigSearch['keyword_min']) {
+            if (strlen($q)>=$xoopsConfigSearch['keyword_min']) {
                 $queries[] = $myts->addSlashes($q);
-            } else {
+            }else {
                 $ignored_queries[] = $myts->addSlashes($q);
             }
         }
         if (count($queries) == 0) {
-            redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
+            redirect_header(XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
         }
-    } else {
-        if (strlen($query) < $xoopsConfigSearch['keyword_min']) {
-            redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
+    }else {
+        if (strlen($query)<$xoopsConfigSearch['keyword_min']) {
+            redirect_header(XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
         }
         $queries = [$myts->addSlashes($query)];
     }
@@ -107,7 +107,7 @@ 
      */
     if (!empty($time)) {
         $extra = '';
-    } else {
+    }else {
         $extra = '';
     }
 
@@ -121,20 +121,20 @@ 
     {
         $xoopsTpl->assign('results', $results);
 
-        if (count($next_search) > 0) {
+        if (count($next_search)>0) {
             $items = [];
             foreach ($next_search as $para => $val) {
                 if (!empty($val)) {
                     $items[] = "$para=$val";
                 }
             }
-            if (count($items) > 0) {
+            if (count($items)>0) {
                 $paras = implode('&', $items);
             }
             unset($next_search);
             unset($items);
         }
-        $search_url = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php?' . $paras;
+        $search_url = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/search.php?'.$paras;
 
         /*
          $next_results =& planet_search($queries, $andor, 1, $start + $limit, $uid, $category, $sortby, $searchin, $extra);
@@ -146,22 +146,22 @@ 
       if (false != $has_next)
       */
         if (count($results)) {
-            $next            = $start + $limit;
+            $next            = $start+$limit;
             $queries         = implode(',', $queries);
-            $search_url_next = $search_url . "&start=$next";
-            $search_next     = "<a href=\"" . htmlspecialchars($search_url_next) . "\">" . _SR_NEXT . '</a>';
+            $search_url_next = $search_url."&start=$next";
+            $search_next     = "<a href=\"".htmlspecialchars($search_url_next)."\">"._SR_NEXT.'</a>';
             $xoopsTpl->assign('search_next', $search_next);
         }
-        if ($start > 0) {
-            $prev            = $start - $limit;
-            $search_url_prev = $search_url . "&start=$prev";
-            $search_prev     = "<a href=\"" . htmlspecialchars($search_url_prev) . "\">" . _SR_PREVIOUS . '</a>';
+        if ($start>0) {
+            $prev            = $start-$limit;
+            $search_url_prev = $search_url."&start=$prev";
+            $search_prev     = "<a href=\"".htmlspecialchars($search_url_prev)."\">"._SR_PREVIOUS.'</a>';
             $xoopsTpl->assign('search_prev', $search_prev);
         }
     }
 
     unset($results);
-    $search_info = _SR_KEYWORDS . ': ' . $myts->htmlSpecialChars($term);
+    $search_info = _SR_KEYWORDS.': '.$myts->htmlSpecialChars($term);
     $xoopsTpl->assign('search_info', $search_info);
 }
 
@@ -171,17 +171,17 @@ 
 if ('OR' === $andor) {
     $type_select .= " selected=\"selected\"";
 }
-$type_select .= '>' . _SR_ANY . '</option>';
+$type_select .= '>'._SR_ANY.'</option>';
 $type_select .= "<option value=\"AND\"";
 if ('AND' === $andor) {
     $type_select .= " selected=\"selected\"";
 }
-$type_select .= '>' . _SR_ALL . '</option>';
+$type_select .= '>'._SR_ALL.'</option>';
 $type_select .= "<option value=\"EXACT\"";
 if ('exact' === $andor) {
     $type_select .= " selected=\"selected\"";
 }
-$type_select .= '>' . _SR_EXACT . '</option>';
+$type_select .= '>'._SR_EXACT.'</option>';
 $type_select .= '</select>';
 
 /* scope */
@@ -190,32 +190,32 @@ 
 if (in_array('title', $searchin)) {
     $searchin_select .= ' checked';
 }
-$searchin_select .= '>' . planet_constant('MD_TITLE') . '&nbsp;&nbsp;';
+$searchin_select .= '>'.planet_constant('MD_TITLE').'&nbsp;&nbsp;';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"text\"";
 if (in_array('text', $searchin)) {
     $searchin_select .= ' checked';
 }
-$searchin_select .= '>' . planet_constant('MD_BODY') . '&nbsp;&nbsp;||&nbsp;&nbsp;';
+$searchin_select .= '>'.planet_constant('MD_BODY').'&nbsp;&nbsp;||&nbsp;&nbsp;';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"blog\"";
 if (in_array('blog', $searchin)) {
     $searchin_select .= ' checked';
 }
-$searchin_select .= '>' . planet_constant('MD_BLOG') . '&nbsp;&nbsp;';
+$searchin_select .= '>'.planet_constant('MD_BLOG').'&nbsp;&nbsp;';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"feed\"";
 if (in_array('feed', $searchin)) {
     $searchin_select .= ' checked';
 }
-$searchin_select .= '>' . planet_constant('MD_FEED') . '&nbsp;&nbsp;';
+$searchin_select .= '>'.planet_constant('MD_FEED').'&nbsp;&nbsp;';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"desc\"";
 if (in_array('desc', $searchin)) {
     $searchin_select .= ' checked';
 }
-$searchin_select .= '>' . planet_constant('MD_DESC') . '&nbsp;&nbsp;';
+$searchin_select .= '>'.planet_constant('MD_DESC').'&nbsp;&nbsp;';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"all\"";
 if (empty($searchin)) {
     $searchin_select .= ' checked';
 }
-$searchin_select .= '>' . _ALL . '&nbsp;&nbsp;';
+$searchin_select .= '>'._ALL.'&nbsp;&nbsp;';
 
 /* sortby */
 $sortby_select = "<select name=\"sortby\">";
@@ -223,28 +223,28 @@ 
 if (empty($sortby)) {
     $sortby_select .= " selected=\"selected\"";
 }
-$sortby_select .= '>' . _NONE . '</option>';
+$sortby_select .= '>'._NONE.'</option>';
 $sortby_select .= "<option value=\"a.art_time\"";
 if ('a.art_time' === $sortby) {
     $sortby_select .= " selected=\"selected\"";
 }
-$sortby_select .= '>' . planet_constant('MD_TIME') . '</option>';
+$sortby_select .= '>'.planet_constant('MD_TIME').'</option>';
 $sortby_select .= "<option value=\"a.art_title\"";
 if ('a.art_title' === $sortby) {
     $sortby_select .= " selected=\"selected\"";
 }
-$sortby_select .= '>' . planet_constant('MD_TITLE') . '</option>';
+$sortby_select .= '>'.planet_constant('MD_TITLE').'</option>';
 $sortby_select .= "<option value=\"\">&nbsp;&nbsp;----&nbsp;&nbsp;</option>";
 $sortby_select .= "<option value=\"a.blog_title\"";
 if ('a.blog_title' === $sortby) {
     $sortby_select .= " selected=\"selected\"";
 }
-$sortby_select .= '>' . planet_constant('MD_BLOG') . '</option>';
+$sortby_select .= '>'.planet_constant('MD_BLOG').'</option>';
 $sortby_select .= "<option value=\"a.blog_time\"";
 if ('b.blog_time' === $sortby) {
     $sortby_select .= " selected=\"selected\"";
 }
-$sortby_select .= '>' . planet_constant('MD_UPDATE') . '</option>';
+$sortby_select .= '>'.planet_constant('MD_UPDATE').'</option>';
 $sortby_select .= '</select>';
 
 $xoopsTpl->assign('type_select', $type_select);
@@ -258,8 +258,8 @@ 
 $xoopsTpl->assign('blog', $blog);
 $xoopsTpl->assign('uid', $uid);
 
-if ($xoopsConfigSearch['keyword_min'] > 0) {
+if ($xoopsConfigSearch['keyword_min']>0) {
     $xoopsTpl->assign('search_rule', sprintf(_SR_KEYIGNORE, $xoopsConfigSearch['keyword_min']));
 }
 
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

class/category.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
  */
 
 // defined('XOOPS_ROOT_PATH') || exit('Restricted access.');
-require_once __DIR__ . '/../include/vars.php';
+require_once __DIR__.'/../include/vars.php';
 //mod_loadFunctions('', $GLOBALS['moddirname']);
 
 /**

class/xmlpc.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 // ------------------------------------------------------------------------ //
 
 // defined('XOOPS_ROOT_PATH') || exit('Restricted access.');
-require_once __DIR__ . '/../include/vars.php';
+require_once __DIR__.'/../include/vars.php';
 //mod_loadFunctions('', $GLOBALS['moddirname']);
 
 if (!class_exists('Xmlrpc_client')) {

class/xml.php

Spacing +7 added lines, -7 removed lines

@@ -26,7 +26,7 @@ 
 // ------------------------------------------------------------------------ //
 
 // defined('XOOPS_ROOT_PATH') || exit('Restricted access.');
-require_once __DIR__ . '/../include/vars.php';
+require_once __DIR__.'/../include/vars.php';
 //mod_loadFunctions('', $GLOBALS['moddirname']);
 
 /*** GENERAL USAGE *********************************************************
@@ -64,14 +64,14 @@ 
  */
 
 // your local timezone, set to "" to disable or for GMT
-$server_TZ = abs((int)($GLOBALS['xoopsConfig']['server_TZ'] * 3600.0));
-$prefix    = ($GLOBALS['xoopsConfig']['server_TZ'] < 0) ? '-' : '+';
-$TIME_ZONE = $prefix . date('H:i', $server_TZ);
+$server_TZ = abs((int) ($GLOBALS['xoopsConfig']['server_TZ']*3600.0));
+$prefix    = ($GLOBALS['xoopsConfig']['server_TZ']<0) ? '-' : '+';
+$TIME_ZONE = $prefix.date('H:i', $server_TZ);
 define('TIME_ZONE', $TIME_ZONE);
 // Version string.
 define('FEEDCREATOR_VERSION', 'ARTICLE @ XOOPS powered by FeedCreator');
 
-require_once __DIR__ . '/feedcreator.class.php';
+require_once __DIR__.'/feedcreator.class.php';
 
 /**
  * Description
@@ -95,7 +95,7 @@ 
          */
         public function __construct($version)
         {
-            $this->filename = XOOPS_CACHE_PATH . '/feed.xml';
+            $this->filename = XOOPS_CACHE_PATH.'/feed.xml';
             $this->version  = $version;
         }
 
@@ -122,7 +122,7 @@ 
                 foreach (array_keys($val) as $key) {
                     $val[$key] = $this->convert_encoding($val[$key]);
                 }
-            } else {
+            }else {
                 $val = XoopsLocal::convert_encoding($val, $this->encoding, _CHARSET);
             }
 

class/class-IXR.php

Indentation +993 added lines, -993 removed lines

@@ -14,136 +14,136 @@ 
  */
 class IXR_Value
 {
-    public $data;
-    public $type;
-
-    /**
-     * IXR_Value constructor.
-     * @param      $data
-     * @param bool $type
-     */
-    public function __construct($data, $type = false)
-    {
-        $this->data = $data;
-        if (!$type) {
-            $type = $this->calculateType();
-        }
-        $this->type = $type;
-        if ($type === 'struct') {
-            /* Turn all the values in the array in to new IXR_Value objects */
-            foreach ($this->data as $key => $value) {
-                $this->data[$key] = new IXR_Value($value);
-            }
-        }
-        if ($type === 'array') {
-            for ($i = 0, $j = count($this->data); $i < $j; ++$i) {
-                $this->data[$i] = new IXR_Value($this->data[$i]);
-            }
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function calculateType()
-    {
-        if ($this->data === true || $this->data === false) {
-            return 'boolean';
-        }
-        if (is_int($this->data)) {
-            return 'int';
-        }
-        if (is_float($this->data)) {
-            return 'double';
-        }
-        // Deal with IXR object types base64 and date
-        if (is_object($this->data) && is_a($this->data, 'IXR_Date')) {
-            return 'date';
-        }
-        if (is_object($this->data) && is_a($this->data, 'IXR_Base64')) {
-            return 'base64';
-        }
-        // If it is a normal PHP object convert it in to a struct
-        if (is_object($this->data)) {
-            $this->data = get_object_vars($this->data);
-
-            return 'struct';
-        }
-        if (!is_array($this->data)) {
-            return 'string';
-        }
-        /* We have an array - is it an array or a struct ? */
-        if ($this->isStruct($this->data)) {
-            return 'struct';
-        } else {
-            return 'array';
-        }
-    }
-
-    /**
-     * @return bool|string
-     */
-    public function getXml()
-    {
-        /* Return XML for this value */
-        switch ($this->type) {
-            case 'boolean':
-                return '<boolean>' . ($this->data ? '1' : '0') . '</boolean>';
-                break;
-            case 'int':
-                return '<int>' . $this->data . '</int>';
-                break;
-            case 'double':
-                return '<double>' . $this->data . '</double>';
-                break;
-            case 'string':
-                return '<string>' . htmlspecialchars($this->data) . '</string>';
-                break;
-            case 'array':
-                $return = '<array><data>' . "\n";
-                foreach ($this->data as $item) {
-                    $return .= '  <value>' . $item->getXml() . "</value>\n";
-                }
-                $return .= '</data></array>';
-
-                return $return;
-                break;
-            case 'struct':
-                $return = '<struct>' . "\n";
-                foreach ($this->data as $name => $value) {
-                    $return .= "  <member><name>$name</name><value>";
-                    $return .= $value->getXml() . "</value></member>\n";
-                }
-                $return .= '</struct>';
-
-                return $return;
-                break;
-            case 'date':
-            case 'base64':
-                return $this->data->getXml();
-                break;
-        }
-
-        return false;
-    }
-
-    /**
-     * @param $array
-     * @return bool
-     */
-    public function isStruct($array)
-    {
-        /* Nasty function to check if an array is a struct or not */
-        $expected = 0;
-        foreach ($array as $key => $value) {
-            if ((string)$key != (string)$expected) {
-                return true;
-            }
-            ++$expected;
-        }
-
-        return false;
-    }
+	public $data;
+	public $type;
+
+	/**
+	 * IXR_Value constructor.
+	 * @param      $data
+	 * @param bool $type
+	 */
+	public function __construct($data, $type = false)
+	{
+		$this->data = $data;
+		if (!$type) {
+			$type = $this->calculateType();
+		}
+		$this->type = $type;
+		if ($type === 'struct') {
+			/* Turn all the values in the array in to new IXR_Value objects */
+			foreach ($this->data as $key => $value) {
+				$this->data[$key] = new IXR_Value($value);
+			}
+		}
+		if ($type === 'array') {
+			for ($i = 0, $j = count($this->data); $i < $j; ++$i) {
+				$this->data[$i] = new IXR_Value($this->data[$i]);
+			}
+		}
+	}
+
+	/**
+	 * @return string
+	 */
+	public function calculateType()
+	{
+		if ($this->data === true || $this->data === false) {
+			return 'boolean';
+		}
+		if (is_int($this->data)) {
+			return 'int';
+		}
+		if (is_float($this->data)) {
+			return 'double';
+		}
+		// Deal with IXR object types base64 and date
+		if (is_object($this->data) && is_a($this->data, 'IXR_Date')) {
+			return 'date';
+		}
+		if (is_object($this->data) && is_a($this->data, 'IXR_Base64')) {
+			return 'base64';
+		}
+		// If it is a normal PHP object convert it in to a struct
+		if (is_object($this->data)) {
+			$this->data = get_object_vars($this->data);
+
+			return 'struct';
+		}
+		if (!is_array($this->data)) {
+			return 'string';
+		}
+		/* We have an array - is it an array or a struct ? */
+		if ($this->isStruct($this->data)) {
+			return 'struct';
+		} else {
+			return 'array';
+		}
+	}
+
+	/**
+	 * @return bool|string
+	 */
+	public function getXml()
+	{
+		/* Return XML for this value */
+		switch ($this->type) {
+			case 'boolean':
+				return '<boolean>' . ($this->data ? '1' : '0') . '</boolean>';
+				break;
+			case 'int':
+				return '<int>' . $this->data . '</int>';
+				break;
+			case 'double':
+				return '<double>' . $this->data . '</double>';
+				break;
+			case 'string':
+				return '<string>' . htmlspecialchars($this->data) . '</string>';
+				break;
+			case 'array':
+				$return = '<array><data>' . "\n";
+				foreach ($this->data as $item) {
+					$return .= '  <value>' . $item->getXml() . "</value>\n";
+				}
+				$return .= '</data></array>';
+
+				return $return;
+				break;
+			case 'struct':
+				$return = '<struct>' . "\n";
+				foreach ($this->data as $name => $value) {
+					$return .= "  <member><name>$name</name><value>";
+					$return .= $value->getXml() . "</value></member>\n";
+				}
+				$return .= '</struct>';
+
+				return $return;
+				break;
+			case 'date':
+			case 'base64':
+				return $this->data->getXml();
+				break;
+		}
+
+		return false;
+	}
+
+	/**
+	 * @param $array
+	 * @return bool
+	 */
+	public function isStruct($array)
+	{
+		/* Nasty function to check if an array is a struct or not */
+		$expected = 0;
+		foreach ($array as $key => $value) {
+			if ((string)$key != (string)$expected) {
+				return true;
+			}
+			++$expected;
+		}
+
+		return false;
+	}
 }
 
 /**
@@ -151,189 +151,189 @@ 
  */
 class IXR_Message
 {
-    public $message;
-    public $messageType;  // methodCall / methodResponse / fault
-    public $faultCode;
-    public $faultString;
-    public $methodName;
-    public $params;
-    // Current variable stacks
-    public $_arraystructs      = [];   // The stack used to keep track of the current array/struct
-    public $_arraystructstypes = []; // Stack keeping track of if things are structs or array
-    public $_currentStructName = [];  // A stack as well
-    public $_param;
-    public $_value;
-    public $_currentTag;
-    public $_currentTagContents;
-    // The XML parser
-    public $_parser;
-
-    /**
-     * IXR_Message constructor.
-     * @param $message
-     */
-    public function __construct($message)
-    {
-        $this->message = $message;
-    }
-
-    /**
-     * @return bool
-     */
-    public function parse()
-    {
-        // first remove the XML declaration
-        $this->message = preg_replace('/<\?xml(.*)?\?' . '>/', '', $this->message);
-        if (trim($this->message) == '') {
-            return false;
-        }
-        $this->_parser = xml_parser_create();
-        // Set XML parser to take the case of tags in to account
-        xml_parser_set_option($this->_parser, XML_OPTION_CASE_FOLDING, false);
-        // Set XML parser callback functions
-        xml_set_object($this->_parser, $this);
-        xml_set_elementHandler($this->_parser, 'tag_open', 'tag_close');
-        xml_set_character_dataHandler($this->_parser, 'cdata');
-        if (!xml_parse($this->_parser, $this->message)) {
-            /* die(sprintf('XML error: %s at line %d',
+	public $message;
+	public $messageType;  // methodCall / methodResponse / fault
+	public $faultCode;
+	public $faultString;
+	public $methodName;
+	public $params;
+	// Current variable stacks
+	public $_arraystructs      = [];   // The stack used to keep track of the current array/struct
+	public $_arraystructstypes = []; // Stack keeping track of if things are structs or array
+	public $_currentStructName = [];  // A stack as well
+	public $_param;
+	public $_value;
+	public $_currentTag;
+	public $_currentTagContents;
+	// The XML parser
+	public $_parser;
+
+	/**
+	 * IXR_Message constructor.
+	 * @param $message
+	 */
+	public function __construct($message)
+	{
+		$this->message = $message;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function parse()
+	{
+		// first remove the XML declaration
+		$this->message = preg_replace('/<\?xml(.*)?\?' . '>/', '', $this->message);
+		if (trim($this->message) == '') {
+			return false;
+		}
+		$this->_parser = xml_parser_create();
+		// Set XML parser to take the case of tags in to account
+		xml_parser_set_option($this->_parser, XML_OPTION_CASE_FOLDING, false);
+		// Set XML parser callback functions
+		xml_set_object($this->_parser, $this);
+		xml_set_elementHandler($this->_parser, 'tag_open', 'tag_close');
+		xml_set_character_dataHandler($this->_parser, 'cdata');
+		if (!xml_parse($this->_parser, $this->message)) {
+			/* die(sprintf('XML error: %s at line %d',
                 xml_error_string(xml_get_error_code($this->_parser)),
                 xml_get_current_line_number($this->_parser))); */
 
-            return false;
-        }
-        xml_parser_free($this->_parser);
-        // Grab the error messages, if any
-        if ($this->messageType === 'fault') {
-            $this->faultCode   = $this->params[0]['faultCode'];
-            $this->faultString = $this->params[0]['faultString'];
-        }
-
-        return true;
-    }
-
-    /**
-     * @param $parser
-     * @param $tag
-     * @param $attr
-     */
-    public function tag_open($parser, $tag, $attr)
-    {
-        $this->currentTag = $tag;
-        switch ($tag) {
-            case 'methodCall':
-            case 'methodResponse':
-            case 'fault':
-                $this->messageType = $tag;
-                break;
-            /* Deal with stacks of arrays and structs */
-            case 'data':    // data is to all intents and puposes more interesting than array
-                $this->_arraystructstypes[] = 'array';
-                $this->_arraystructs[]      = [];
-                break;
-            case 'struct':
-                $this->_arraystructstypes[] = 'struct';
-                $this->_arraystructs[]      = [];
-                break;
-        }
-    }
-
-    /**
-     * @param $parser
-     * @param $cdata
-     */
-    public function cdata($parser, $cdata)
-    {
-        $this->_currentTagContents .= $cdata;
-    }
-
-    /**
-     * @param $parser
-     * @param $tag
-     */
-    public function tag_close($parser, $tag)
-    {
-        $valueFlag = false;
-        switch ($tag) {
-            case 'int':
-            case 'i4':
-                $value                     = (int)trim($this->_currentTagContents);
-                $this->_currentTagContents = '';
-                $valueFlag                 = true;
-                break;
-            case 'double':
-                $value                     = (double)trim($this->_currentTagContents);
-                $this->_currentTagContents = '';
-                $valueFlag                 = true;
-                break;
-            case 'string':
-                $value                     = (string)trim($this->_currentTagContents);
-                $this->_currentTagContents = '';
-                $valueFlag                 = true;
-                break;
-            case 'dateTime.iso8601':
-                $value = new IXR_Date(trim($this->_currentTagContents));
-                // $value = $iso->getTimestamp();
-                $this->_currentTagContents = '';
-                $valueFlag                 = true;
-                break;
-            case 'value':
-                // "If no type is indicated, the type is string."
-                if (trim($this->_currentTagContents) != '') {
-                    $value                     = (string)$this->_currentTagContents;
-                    $this->_currentTagContents = '';
-                    $valueFlag                 = true;
-                }
-                break;
-            case 'boolean':
-                $value                     = (boolean)trim($this->_currentTagContents);
-                $this->_currentTagContents = '';
-                $valueFlag                 = true;
-                break;
-            case 'base64':
-                $value                     = base64_decode(trim($this->_currentTagContents));
-                $this->_currentTagContents = '';
-                $valueFlag                 = true;
-                break;
-            /* Deal with stacks of arrays and structs */
-            case 'data':
-            case 'struct':
-                $value = array_pop($this->_arraystructs);
-                array_pop($this->_arraystructstypes);
-                $valueFlag = true;
-                break;
-            case 'member':
-                array_pop($this->_currentStructName);
-                break;
-            case 'name':
-                $this->_currentStructName[] = trim($this->_currentTagContents);
-                $this->_currentTagContents  = '';
-                break;
-            case 'methodName':
-                $this->methodName          = trim($this->_currentTagContents);
-                $this->_currentTagContents = '';
-                break;
-        }
-        if ($valueFlag) {
-            /*
+			return false;
+		}
+		xml_parser_free($this->_parser);
+		// Grab the error messages, if any
+		if ($this->messageType === 'fault') {
+			$this->faultCode   = $this->params[0]['faultCode'];
+			$this->faultString = $this->params[0]['faultString'];
+		}
+
+		return true;
+	}
+
+	/**
+	 * @param $parser
+	 * @param $tag
+	 * @param $attr
+	 */
+	public function tag_open($parser, $tag, $attr)
+	{
+		$this->currentTag = $tag;
+		switch ($tag) {
+			case 'methodCall':
+			case 'methodResponse':
+			case 'fault':
+				$this->messageType = $tag;
+				break;
+			/* Deal with stacks of arrays and structs */
+			case 'data':    // data is to all intents and puposes more interesting than array
+				$this->_arraystructstypes[] = 'array';
+				$this->_arraystructs[]      = [];
+				break;
+			case 'struct':
+				$this->_arraystructstypes[] = 'struct';
+				$this->_arraystructs[]      = [];
+				break;
+		}
+	}
+
+	/**
+	 * @param $parser
+	 * @param $cdata
+	 */
+	public function cdata($parser, $cdata)
+	{
+		$this->_currentTagContents .= $cdata;
+	}
+
+	/**
+	 * @param $parser
+	 * @param $tag
+	 */
+	public function tag_close($parser, $tag)
+	{
+		$valueFlag = false;
+		switch ($tag) {
+			case 'int':
+			case 'i4':
+				$value                     = (int)trim($this->_currentTagContents);
+				$this->_currentTagContents = '';
+				$valueFlag                 = true;
+				break;
+			case 'double':
+				$value                     = (double)trim($this->_currentTagContents);
+				$this->_currentTagContents = '';
+				$valueFlag                 = true;
+				break;
+			case 'string':
+				$value                     = (string)trim($this->_currentTagContents);
+				$this->_currentTagContents = '';
+				$valueFlag                 = true;
+				break;
+			case 'dateTime.iso8601':
+				$value = new IXR_Date(trim($this->_currentTagContents));
+				// $value = $iso->getTimestamp();
+				$this->_currentTagContents = '';
+				$valueFlag                 = true;
+				break;
+			case 'value':
+				// "If no type is indicated, the type is string."
+				if (trim($this->_currentTagContents) != '') {
+					$value                     = (string)$this->_currentTagContents;
+					$this->_currentTagContents = '';
+					$valueFlag                 = true;
+				}
+				break;
+			case 'boolean':
+				$value                     = (boolean)trim($this->_currentTagContents);
+				$this->_currentTagContents = '';
+				$valueFlag                 = true;
+				break;
+			case 'base64':
+				$value                     = base64_decode(trim($this->_currentTagContents));
+				$this->_currentTagContents = '';
+				$valueFlag                 = true;
+				break;
+			/* Deal with stacks of arrays and structs */
+			case 'data':
+			case 'struct':
+				$value = array_pop($this->_arraystructs);
+				array_pop($this->_arraystructstypes);
+				$valueFlag = true;
+				break;
+			case 'member':
+				array_pop($this->_currentStructName);
+				break;
+			case 'name':
+				$this->_currentStructName[] = trim($this->_currentTagContents);
+				$this->_currentTagContents  = '';
+				break;
+			case 'methodName':
+				$this->methodName          = trim($this->_currentTagContents);
+				$this->_currentTagContents = '';
+				break;
+		}
+		if ($valueFlag) {
+			/*
             if (!is_array($value) && !is_object($value)) {
                 $value = trim($value);
             }
             */
-            if (count($this->_arraystructs) > 0) {
-                // Add value to struct or array
-                if ($this->_arraystructstypes[count($this->_arraystructstypes) - 1] === 'struct') {
-                    // Add to struct
-                    $this->_arraystructs[count($this->_arraystructs) - 1][$this->_currentStructName[count($this->_currentStructName) - 1]] = $value;
-                } else {
-                    // Add to array
-                    $this->_arraystructs[count($this->_arraystructs) - 1][] = $value;
-                }
-            } else {
-                // Just add as a paramater
-                $this->params[] = $value;
-            }
-        }
-    }
+			if (count($this->_arraystructs) > 0) {
+				// Add value to struct or array
+				if ($this->_arraystructstypes[count($this->_arraystructstypes) - 1] === 'struct') {
+					// Add to struct
+					$this->_arraystructs[count($this->_arraystructs) - 1][$this->_currentStructName[count($this->_currentStructName) - 1]] = $value;
+				} else {
+					// Add to array
+					$this->_arraystructs[count($this->_arraystructs) - 1][] = $value;
+				}
+			} else {
+				// Just add as a paramater
+				$this->params[] = $value;
+			}
+		}
+	}
 }
 
 /**
@@ -341,55 +341,55 @@ 
  */
 class IXR_Server
 {
-    public $data;
-    public $callbacks = [];
-    public $message;
-    public $capabilities;
-
-    /**
-     * IXR_Server constructor.
-     * @param bool $callbacks
-     * @param bool $data
-     */
-    public function __construct($callbacks = false, $data = false)
-    {
-        $this->setCapabilities();
-        if ($callbacks) {
-            $this->callbacks = $callbacks;
-        }
-        $this->setCallbacks();
-        $this->serve($data);
-    }
-
-    /**
-     * @param bool $data
-     */
-    public function serve($data = false)
-    {
-        if (!$data) {
-            $http_raw_post_data = file_get_contents('php://input');
-            if (!$http_raw_post_data) {
-                die('XML-RPC server accepts POST requests only.');
-            }
-            $data = $http_raw_post_data;
-        }
-        $this->message = new IXR_Message($data);
-        if (!$this->message->parse()) {
-            $this->error(-32700, 'parse error. not well formed');
-        }
-        if ($this->message->messageType !== 'methodCall') {
-            $this->error(-32600, 'server error. invalid xml-rpc. not conforming to spec. Request must be a methodCall');
-        }
-        $result = $this->call($this->message->methodName, $this->message->params);
-        // Is the result an error?
-        if (is_a($result, 'IXR_Error')) {
-            $this->error($result);
-        }
-        // Encode the result
-        $r         = new IXR_Value($result);
-        $resultxml = $r->getXml();
-        // Create the XML
-        $xml = <<<EOD
+	public $data;
+	public $callbacks = [];
+	public $message;
+	public $capabilities;
+
+	/**
+	 * IXR_Server constructor.
+	 * @param bool $callbacks
+	 * @param bool $data
+	 */
+	public function __construct($callbacks = false, $data = false)
+	{
+		$this->setCapabilities();
+		if ($callbacks) {
+			$this->callbacks = $callbacks;
+		}
+		$this->setCallbacks();
+		$this->serve($data);
+	}
+
+	/**
+	 * @param bool $data
+	 */
+	public function serve($data = false)
+	{
+		if (!$data) {
+			$http_raw_post_data = file_get_contents('php://input');
+			if (!$http_raw_post_data) {
+				die('XML-RPC server accepts POST requests only.');
+			}
+			$data = $http_raw_post_data;
+		}
+		$this->message = new IXR_Message($data);
+		if (!$this->message->parse()) {
+			$this->error(-32700, 'parse error. not well formed');
+		}
+		if ($this->message->messageType !== 'methodCall') {
+			$this->error(-32600, 'server error. invalid xml-rpc. not conforming to spec. Request must be a methodCall');
+		}
+		$result = $this->call($this->message->methodName, $this->message->params);
+		// Is the result an error?
+		if (is_a($result, 'IXR_Error')) {
+			$this->error($result);
+		}
+		// Encode the result
+		$r         = new IXR_Value($result);
+		$resultxml = $r->getXml();
+		// Create the XML
+		$xml = <<<EOD
 <methodResponse>
   <params>
     <param>
@@ -401,162 +401,162 @@ 
 </methodResponse>
 
 EOD;
-        // Send it
-        $this->output($xml);
-    }
-
-    /**
-     * @param $methodname
-     * @param $args
-     * @return IXR_Error|mixed
-     */
-    public function call($methodname, $args)
-    {
-        if (!$this->hasMethod($methodname)) {
-            return new IXR_Error(-32601, 'server error. requested method ' . $methodname . ' does not exist.');
-        }
-        $method = $this->callbacks[$methodname];
-        // Perform the callback and send the response
-        if (count($args) == 1) {
-            // If only one paramater just send that instead of the whole array
-            $args = $args[0];
-        }
-        // Are we dealing with a function or a method?
-        if (substr($method, 0, 5) === 'this:') {
-            // It's a class method - check it exists
-            $method = substr($method, 5);
-            if (!method_exists($this, $method)) {
-                return new IXR_Error(-32601, 'server error. requested class method "' . $method . '" does not exist.');
-            }
-            // Call the method
-            $result = $this->$method($args);
-        } else {
-            // It's a function - does it exist?
-            if (is_array($method)) {
-                if (!method_exists($method[0], $method[1])) {
-                    return new IXR_Error(-32601, 'server error. requested object method "' . $method[1] . '" does not exist.');
-                }
-            } elseif (!function_exists($method)) {
-                return new IXR_Error(-32601, 'server error. requested function "' . $method . '" does not exist.');
-            }
-            // Call the function
-            $result = call_user_func($method, $args);
-        }
-
-        return $result;
-    }
-
-    /**
-     * @param      $error
-     * @param bool $message
-     */
-    public function error($error, $message = false)
-    {
-        // Accepts either an error object or an error code and message
-        if ($message && !is_object($error)) {
-            $error = new IXR_Error($error, $message);
-        }
-        $this->output($error->getXml());
-    }
-
-    /**
-     * @param $xml
-     */
-    public function output($xml)
-    {
-        $xml    = '<?xml version="1.0"?>' . "\n" . $xml;
-        $length = strlen($xml);
-        header('Connection: close');
-        header('Content-Length: ' . $length);
-        header('Content-Type: text/xml');
-        header('Date: ' . date('r'));
-        echo $xml;
-        exit;
-    }
-
-    /**
-     * @param $method
-     * @return bool
-     */
-    public function hasMethod($method)
-    {
-        return in_array($method, array_keys($this->callbacks));
-    }
-
-    public function setCapabilities()
-    {
-        // Initialises capabilities array
-        $this->capabilities = [
-            'xmlrpc'           => [
-                'specUrl'     => 'http://www.xmlrpc.com/spec',
-                'specVersion' => 1
-            ],
-            'faults_interop'   => [
-                'specUrl'     => 'http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php',
-                'specVersion' => 20010516
-            ],
-            'system.multicall' => [
-                'specUrl'     => 'http://www.xmlrpc.com/discuss/msgReader$1208',
-                'specVersion' => 1
-            ]
-        ];
-    }
-
-    /**
-     * @param $args
-     * @return mixed
-     */
-    public function getCapabilities($args)
-    {
-        return $this->capabilities;
-    }
-
-    public function setCallbacks()
-    {
-        $this->callbacks['system.getCapabilities'] = 'this:getCapabilities';
-        $this->callbacks['system.listMethods']     = 'this:listMethods';
-        $this->callbacks['system.multicall']       = 'this:multiCall';
-    }
-
-    /**
-     * @param $args
-     * @return array
-     */
-    public function listMethods($args)
-    {
-        // Returns a list of methods - uses array_reverse to ensure user defined
-        // methods are listed before server defined methods
-        return array_reverse(array_keys($this->callbacks));
-    }
-
-    /**
-     * @param $methodcalls
-     * @return array
-     */
-    public function multiCall($methodcalls)
-    {
-        // See http://www.xmlrpc.com/discuss/msgReader$1208
-        $return = [];
-        foreach ($methodcalls as $call) {
-            $method = $call['methodName'];
-            $params = $call['params'];
-            if ($method === 'system.multicall') {
-                $result = new IXR_Error(-32600, 'Recursive calls to system.multicall are forbidden');
-            } else {
-                $result = $this->call($method, $params);
-            }
-            if (is_a($result, 'IXR_Error')) {
-                $return[] = [
-                    'faultCode'   => $result->code,
-                    'faultString' => $result->message
-                ];
-            } else {
-                $return[] = [$result];
-            }
-        }
-
-        return $return;
-    }
+		// Send it
+		$this->output($xml);
+	}
+
+	/**
+	 * @param $methodname
+	 * @param $args
+	 * @return IXR_Error|mixed
+	 */
+	public function call($methodname, $args)
+	{
+		if (!$this->hasMethod($methodname)) {
+			return new IXR_Error(-32601, 'server error. requested method ' . $methodname . ' does not exist.');
+		}
+		$method = $this->callbacks[$methodname];
+		// Perform the callback and send the response
+		if (count($args) == 1) {
+			// If only one paramater just send that instead of the whole array
+			$args = $args[0];
+		}
+		// Are we dealing with a function or a method?
+		if (substr($method, 0, 5) === 'this:') {
+			// It's a class method - check it exists
+			$method = substr($method, 5);
+			if (!method_exists($this, $method)) {
+				return new IXR_Error(-32601, 'server error. requested class method "' . $method . '" does not exist.');
+			}
+			// Call the method
+			$result = $this->$method($args);
+		} else {
+			// It's a function - does it exist?
+			if (is_array($method)) {
+				if (!method_exists($method[0], $method[1])) {
+					return new IXR_Error(-32601, 'server error. requested object method "' . $method[1] . '" does not exist.');
+				}
+			} elseif (!function_exists($method)) {
+				return new IXR_Error(-32601, 'server error. requested function "' . $method . '" does not exist.');
+			}
+			// Call the function
+			$result = call_user_func($method, $args);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * @param      $error
+	 * @param bool $message
+	 */
+	public function error($error, $message = false)
+	{
+		// Accepts either an error object or an error code and message
+		if ($message && !is_object($error)) {
+			$error = new IXR_Error($error, $message);
+		}
+		$this->output($error->getXml());
+	}
+
+	/**
+	 * @param $xml
+	 */
+	public function output($xml)
+	{
+		$xml    = '<?xml version="1.0"?>' . "\n" . $xml;
+		$length = strlen($xml);
+		header('Connection: close');
+		header('Content-Length: ' . $length);
+		header('Content-Type: text/xml');
+		header('Date: ' . date('r'));
+		echo $xml;
+		exit;
+	}
+
+	/**
+	 * @param $method
+	 * @return bool
+	 */
+	public function hasMethod($method)
+	{
+		return in_array($method, array_keys($this->callbacks));
+	}
+
+	public function setCapabilities()
+	{
+		// Initialises capabilities array
+		$this->capabilities = [
+			'xmlrpc'           => [
+				'specUrl'     => 'http://www.xmlrpc.com/spec',
+				'specVersion' => 1
+			],
+			'faults_interop'   => [
+				'specUrl'     => 'http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php',
+				'specVersion' => 20010516
+			],
+			'system.multicall' => [
+				'specUrl'     => 'http://www.xmlrpc.com/discuss/msgReader$1208',
+				'specVersion' => 1
+			]
+		];
+	}
+
+	/**
+	 * @param $args
+	 * @return mixed
+	 */
+	public function getCapabilities($args)
+	{
+		return $this->capabilities;
+	}
+
+	public function setCallbacks()
+	{
+		$this->callbacks['system.getCapabilities'] = 'this:getCapabilities';
+		$this->callbacks['system.listMethods']     = 'this:listMethods';
+		$this->callbacks['system.multicall']       = 'this:multiCall';
+	}
+
+	/**
+	 * @param $args
+	 * @return array
+	 */
+	public function listMethods($args)
+	{
+		// Returns a list of methods - uses array_reverse to ensure user defined
+		// methods are listed before server defined methods
+		return array_reverse(array_keys($this->callbacks));
+	}
+
+	/**
+	 * @param $methodcalls
+	 * @return array
+	 */
+	public function multiCall($methodcalls)
+	{
+		// See http://www.xmlrpc.com/discuss/msgReader$1208
+		$return = [];
+		foreach ($methodcalls as $call) {
+			$method = $call['methodName'];
+			$params = $call['params'];
+			if ($method === 'system.multicall') {
+				$result = new IXR_Error(-32600, 'Recursive calls to system.multicall are forbidden');
+			} else {
+				$result = $this->call($method, $params);
+			}
+			if (is_a($result, 'IXR_Error')) {
+				$return[] = [
+					'faultCode'   => $result->code,
+					'faultString' => $result->message
+				];
+			} else {
+				$return[] = [$result];
+			}
+		}
+
+		return $return;
+	}
 }
 
 /**
@@ -564,50 +564,50 @@ 
  */
 class IXR_Request
 {
-    public $method;
-    public $args;
-    public $xml;
-
-    /**
-     * IXR_Request constructor.
-     * @param $method
-     * @param $args
-     */
-    public function __construct($method, $args)
-    {
-        $this->method = $method;
-        $this->args   = $args;
-        $this->xml    = <<<EOD
+	public $method;
+	public $args;
+	public $xml;
+
+	/**
+	 * IXR_Request constructor.
+	 * @param $method
+	 * @param $args
+	 */
+	public function __construct($method, $args)
+	{
+		$this->method = $method;
+		$this->args   = $args;
+		$this->xml    = <<<EOD
 <?xml version="1.0"?>
 <methodCall>
 <methodName>{$this->method}</methodName>
 <params>
 
 EOD;
-        foreach ($this->args as $arg) {
-            $this->xml .= '<param><value>';
-            $v         = new IXR_Value($arg);
-            $this->xml .= $v->getXml();
-            $this->xml .= "</value></param>\n";
-        }
-        $this->xml .= '</params></methodCall>';
-    }
-
-    /**
-     * @return int
-     */
-    public function getLength()
-    {
-        return strlen($this->xml);
-    }
-
-    /**
-     * @return string
-     */
-    public function getXml()
-    {
-        return $this->xml;
-    }
+		foreach ($this->args as $arg) {
+			$this->xml .= '<param><value>';
+			$v         = new IXR_Value($arg);
+			$this->xml .= $v->getXml();
+			$this->xml .= "</value></param>\n";
+		}
+		$this->xml .= '</params></methodCall>';
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getLength()
+	{
+		return strlen($this->xml);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getXml()
+	{
+		return $this->xml;
+	}
 }
 
 /**
@@ -615,150 +615,150 @@ 
  */
 class IXR_Client
 {
-    public $server;
-    public $port;
-    public $path;
-    public $useragent;
-    public $response;
-    public $timeout;
-    public $vendor  = '';
-    public $message = false;
-    public $debug   = false;
-    // Storage place for an error message
-    public $error = false;
-
-    /**
-     * IXR_Client constructor.
-     * @param        $server
-     * @param bool   $path
-     * @param int    $port
-     * @param int    $timeout
-     * @param string $vendor
-     */
-    public function __construct($server, $path = false, $port = 80, $timeout = 30, $vendor = '')
-    {
-        if (!$path) {
-            // Assume we have been given a URL instead
-            $bits         = parse_url($server);
-            $this->server = $bits['host'];
-            $this->port   = isset($bits['port']) ? $bits['port'] : 80;
-            $this->path   = isset($bits['path']) ? $bits['path'] : '/';
-            // Make absolutely sure we have a path
-            if (!$this->path) {
-                $this->path = '/';
-            }
-        } else {
-            $this->server  = $server;
-            $this->path    = $path;
-            $this->port    = $port;
-            $this->timeout = $timeout;
-        }
-        $this->useragent = 'The Incutio XML-RPC PHP Library';
-    }
-
-    /**
-     * @return bool
-     */
-    public function query()
-    {
-        $args    = func_get_args();
-        $method  = array_shift($args);
-        $request = new IXR_Request($method, $args);
-        $length  = $request->getLength();
-        $xml     = $request->getXml();
-        $r       = "\r\n";
-        $request = "POST {$this->path} HTTP/1.0$r";
-        $request .= "Host: {$this->server}$r";
-        $request .= "Content-Type: text/xml$r";
-        $request .= "User-Agent: {$this->useragent}$r";
-        $request .= "Content-length: {$length}$r$r";
-        $request .= $xml;
-        // Now send the request
-        if ($this->debug) {
-            echo '<pre>' . htmlspecialchars($request) . "\n</pre>\n\n";
-        }
-        $fp = @fsockopen($this->server, $this->port, $errno, $errstr, $this->timeout);
-        if (!$fp) {
-            $this->error = new IXR_Error(-32300, 'transport error - could not open socket');
-
-            return false;
-        }
-        fwrite($fp, $request);
-        $contents       = '';
-        $gotFirstLine   = false;
-        $gettingHeaders = true;
-        while (!feof($fp)) {
-            $line = fgets($fp, 4096);
-            if (!$gotFirstLine) {
-                // Check line for '200'
-                if (false === strpos($line, '200')) {
-                    $this->error = new IXR_Error(-32300, 'transport error - HTTP status code was not 200');
-
-                    return false;
-                }
-                $gotFirstLine = true;
-            }
-            if (trim($line) == '') {
-                $gettingHeaders = false;
-            }
-            if (!$gettingHeaders) {
-                $contents .= trim($line) . "\n";
-            }
-        }
-        if ($this->debug) {
-            echo '<pre>' . htmlspecialchars($contents) . "\n</pre>\n\n";
-        }
-        // Now parse what we've got back
-        $this->message = new IXR_Message($contents);
-        if (!$this->message->parse()) {
-            // XML error
-            $this->error = new IXR_Error(-32700, 'parse error. not well formed');
-
-            return false;
-        }
-        // Is the message a fault?
-        if ($this->message->messageType === 'fault') {
-            $this->error = new IXR_Error($this->message->faultCode, $this->message->faultString);
-
-            return false;
-        }
-
-        // Message must be OK
-        return true;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getResponse()
-    {
-        // methodResponses can only have one param - return that
-        return $this->message->params[0];
-    }
-
-    /**
-     * @return bool
-     */
-    public function isError()
-    {
-        return is_object($this->error);
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getErrorCode()
-    {
-        return $this->error->code;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getErrorMessage()
-    {
-        return $this->error->message;
-    }
+	public $server;
+	public $port;
+	public $path;
+	public $useragent;
+	public $response;
+	public $timeout;
+	public $vendor  = '';
+	public $message = false;
+	public $debug   = false;
+	// Storage place for an error message
+	public $error = false;
+
+	/**
+	 * IXR_Client constructor.
+	 * @param        $server
+	 * @param bool   $path
+	 * @param int    $port
+	 * @param int    $timeout
+	 * @param string $vendor
+	 */
+	public function __construct($server, $path = false, $port = 80, $timeout = 30, $vendor = '')
+	{
+		if (!$path) {
+			// Assume we have been given a URL instead
+			$bits         = parse_url($server);
+			$this->server = $bits['host'];
+			$this->port   = isset($bits['port']) ? $bits['port'] : 80;
+			$this->path   = isset($bits['path']) ? $bits['path'] : '/';
+			// Make absolutely sure we have a path
+			if (!$this->path) {
+				$this->path = '/';
+			}
+		} else {
+			$this->server  = $server;
+			$this->path    = $path;
+			$this->port    = $port;
+			$this->timeout = $timeout;
+		}
+		$this->useragent = 'The Incutio XML-RPC PHP Library';
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function query()
+	{
+		$args    = func_get_args();
+		$method  = array_shift($args);
+		$request = new IXR_Request($method, $args);
+		$length  = $request->getLength();
+		$xml     = $request->getXml();
+		$r       = "\r\n";
+		$request = "POST {$this->path} HTTP/1.0$r";
+		$request .= "Host: {$this->server}$r";
+		$request .= "Content-Type: text/xml$r";
+		$request .= "User-Agent: {$this->useragent}$r";
+		$request .= "Content-length: {$length}$r$r";
+		$request .= $xml;
+		// Now send the request
+		if ($this->debug) {
+			echo '<pre>' . htmlspecialchars($request) . "\n</pre>\n\n";
+		}
+		$fp = @fsockopen($this->server, $this->port, $errno, $errstr, $this->timeout);
+		if (!$fp) {
+			$this->error = new IXR_Error(-32300, 'transport error - could not open socket');
+
+			return false;
+		}
+		fwrite($fp, $request);
+		$contents       = '';
+		$gotFirstLine   = false;
+		$gettingHeaders = true;
+		while (!feof($fp)) {
+			$line = fgets($fp, 4096);
+			if (!$gotFirstLine) {
+				// Check line for '200'
+				if (false === strpos($line, '200')) {
+					$this->error = new IXR_Error(-32300, 'transport error - HTTP status code was not 200');
+
+					return false;
+				}
+				$gotFirstLine = true;
+			}
+			if (trim($line) == '') {
+				$gettingHeaders = false;
+			}
+			if (!$gettingHeaders) {
+				$contents .= trim($line) . "\n";
+			}
+		}
+		if ($this->debug) {
+			echo '<pre>' . htmlspecialchars($contents) . "\n</pre>\n\n";
+		}
+		// Now parse what we've got back
+		$this->message = new IXR_Message($contents);
+		if (!$this->message->parse()) {
+			// XML error
+			$this->error = new IXR_Error(-32700, 'parse error. not well formed');
+
+			return false;
+		}
+		// Is the message a fault?
+		if ($this->message->messageType === 'fault') {
+			$this->error = new IXR_Error($this->message->faultCode, $this->message->faultString);
+
+			return false;
+		}
+
+		// Message must be OK
+		return true;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getResponse()
+	{
+		// methodResponses can only have one param - return that
+		return $this->message->params[0];
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isError()
+	{
+		return is_object($this->error);
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getErrorCode()
+	{
+		return $this->error->code;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getErrorMessage()
+	{
+		return $this->error->message;
+	}
 }
 
 /**
@@ -766,26 +766,26 @@ 
  */
 class IXR_Error
 {
-    public $code;
-    public $message;
-
-    /**
-     * IXR_Error constructor.
-     * @param $code
-     * @param $message
-     */
-    public function __construct($code, $message)
-    {
-        $this->code    = $code;
-        $this->message = $message;
-    }
-
-    /**
-     * @return string
-     */
-    public function getXml()
-    {
-        $xml = <<<EOD
+	public $code;
+	public $message;
+
+	/**
+	 * IXR_Error constructor.
+	 * @param $code
+	 * @param $message
+	 */
+	public function __construct($code, $message)
+	{
+		$this->code    = $code;
+		$this->message = $message;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getXml()
+	{
+		$xml = <<<EOD
 <methodResponse>
   <fault>
     <value>
@@ -805,8 +805,8 @@ 
 
 EOD;
 
-        return $xml;
-    }
+		return $xml;
+	}
 }
 
 /**
@@ -814,78 +814,78 @@ 
  */
 class IXR_Date
 {
-    public $year;
-    public $month;
-    public $day;
-    public $hour;
-    public $minute;
-    public $second;
-    public $timezone;
-
-    /**
-     * IXR_Date constructor.
-     * @param $time
-     */
-    public function __construct($time)
-    {
-        // $time can be a PHP timestamp or an ISO one
-        if (is_numeric($time)) {
-            $this->parseTimestamp($time);
-        } else {
-            $this->parseIso($time);
-        }
-    }
-
-    /**
-     * @param $timestamp
-     */
-    public function parseTimestamp($timestamp)
-    {
-        $this->year   = date('Y', $timestamp);
-        $this->month  = date('Y', $timestamp);
-        $this->day    = date('Y', $timestamp);
-        $this->hour   = date('H', $timestamp);
-        $this->minute = date('i', $timestamp);
-        $this->second = date('s', $timestamp);
-    }
-
-    /**
-     * @param $iso
-     */
-    public function parseIso($iso)
-    {
-        $this->year     = substr($iso, 0, 4);
-        $this->month    = substr($iso, 4, 2);
-        $this->day      = substr($iso, 6, 2);
-        $this->hour     = substr($iso, 9, 2);
-        $this->minute   = substr($iso, 12, 2);
-        $this->second   = substr($iso, 15, 2);
-        $this->timezone = substr($iso, 17);
-    }
-
-    /**
-     * @return string
-     */
-    public function getIso()
-    {
-        return $this->year . $this->month . $this->day . 'T' . $this->hour . ':' . $this->minute . ':' . $this->second . $this->timezone;
-    }
-
-    /**
-     * @return string
-     */
-    public function getXml()
-    {
-        return '<dateTime.iso8601>' . $this->getIso() . '</dateTime.iso8601>';
-    }
-
-    /**
-     * @return int
-     */
-    public function getTimestamp()
-    {
-        return mktime($this->hour, $this->minute, $this->second, $this->month, $this->day, $this->year);
-    }
+	public $year;
+	public $month;
+	public $day;
+	public $hour;
+	public $minute;
+	public $second;
+	public $timezone;
+
+	/**
+	 * IXR_Date constructor.
+	 * @param $time
+	 */
+	public function __construct($time)
+	{
+		// $time can be a PHP timestamp or an ISO one
+		if (is_numeric($time)) {
+			$this->parseTimestamp($time);
+		} else {
+			$this->parseIso($time);
+		}
+	}
+
+	/**
+	 * @param $timestamp
+	 */
+	public function parseTimestamp($timestamp)
+	{
+		$this->year   = date('Y', $timestamp);
+		$this->month  = date('Y', $timestamp);
+		$this->day    = date('Y', $timestamp);
+		$this->hour   = date('H', $timestamp);
+		$this->minute = date('i', $timestamp);
+		$this->second = date('s', $timestamp);
+	}
+
+	/**
+	 * @param $iso
+	 */
+	public function parseIso($iso)
+	{
+		$this->year     = substr($iso, 0, 4);
+		$this->month    = substr($iso, 4, 2);
+		$this->day      = substr($iso, 6, 2);
+		$this->hour     = substr($iso, 9, 2);
+		$this->minute   = substr($iso, 12, 2);
+		$this->second   = substr($iso, 15, 2);
+		$this->timezone = substr($iso, 17);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getIso()
+	{
+		return $this->year . $this->month . $this->day . 'T' . $this->hour . ':' . $this->minute . ':' . $this->second . $this->timezone;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getXml()
+	{
+		return '<dateTime.iso8601>' . $this->getIso() . '</dateTime.iso8601>';
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getTimestamp()
+	{
+		return mktime($this->hour, $this->minute, $this->second, $this->month, $this->day, $this->year);
+	}
 }
 
 /**
@@ -893,24 +893,24 @@ 
  */
 class IXR_Base64
 {
-    public $data;
-
-    /**
-     * IXR_Base64 constructor.
-     * @param $data
-     */
-    public function __construct($data)
-    {
-        $this->data = $data;
-    }
-
-    /**
-     * @return string
-     */
-    public function getXml()
-    {
-        return '<base64>' . base64_encode($this->data) . '</base64>';
-    }
+	public $data;
+
+	/**
+	 * IXR_Base64 constructor.
+	 * @param $data
+	 */
+	public function __construct($data)
+	{
+		$this->data = $data;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getXml()
+	{
+		return '<base64>' . base64_encode($this->data) . '</base64>';
+	}
 }
 
 /**
@@ -918,161 +918,161 @@ 
  */
 class IXR_IntrospectionServer extends IXR_Server
 {
-    public $signatures;
-    public $help;
-
-    /**
-     * IXR_IntrospectionServer constructor.
-     */
-    public function __construct()
-    {
-        $this->setCallbacks();
-        $this->setCapabilities();
-        $this->capabilities['introspection'] = [
-            'specUrl'     => 'http://xmlrpc.usefulinc.com/doc/reserved.html',
-            'specVersion' => 1
-        ];
-        $this->addCallback('system.methodSignature', 'this:methodSignature', ['array', 'string'], 'Returns an array describing the return type and required parameters of a method');
-        $this->addCallback('system.getCapabilities', 'this:getCapabilities', ['struct'], 'Returns a struct describing the XML-RPC specifications supported by this server');
-        $this->addCallback('system.listMethods', 'this:listMethods', ['array'], 'Returns an array of available methods on this server');
-        $this->addCallback('system.methodHelp', 'this:methodHelp', ['string', 'string'], 'Returns a documentation string for the specified method');
-    }
-
-    /**
-     * @param $method
-     * @param $callback
-     * @param $args
-     * @param $help
-     */
-    public function addCallback($method, $callback, $args, $help)
-    {
-        $this->callbacks[$method]  = $callback;
-        $this->signatures[$method] = $args;
-        $this->help[$method]       = $help;
-    }
-
-    /**
-     * @param $methodname
-     * @param $args
-     * @return IXR_Error|mixed
-     */
-    public function call($methodname, $args)
-    {
-        // Make sure it's in an array
-        if ($args && !is_array($args)) {
-            $args = [$args];
-        }
-        // Over-rides default call method, adds signature check
-        if (!$this->hasMethod($methodname)) {
-            return new IXR_Error(-32601, 'server error. requested method "' . $this->message->methodName . '" not specified.');
-        }
-        $method     = $this->callbacks[$methodname];
-        $signature  = $this->signatures[$methodname];
-        $returnType = array_shift($signature);
-        // Check the number of arguments
-        if (count($args) != count($signature)) {
-            // print 'Num of args: '.count($args).' Num in signature: '.count($signature);
-            return new IXR_Error(-32602, 'server error. wrong number of method parameters');
-        }
-        // Check the argument types
-        $ok         = true;
-        $argsbackup = $args;
-        for ($i = 0, $j = count($args); $i < $j; ++$i) {
-            $arg  = array_shift($args);
-            $type = array_shift($signature);
-            switch ($type) {
-                case 'int':
-                case 'i4':
-                    if (is_array($arg) || !is_int($arg)) {
-                        $ok = false;
-                    }
-                    break;
-                case 'base64':
-                case 'string':
-                    if (!is_string($arg)) {
-                        $ok = false;
-                    }
-                    break;
-                case 'boolean':
-                    if ($arg !== false && $arg !== true) {
-                        $ok = false;
-                    }
-                    break;
-                case 'float':
-                case 'double':
-                    if (!is_float($arg)) {
-                        $ok = false;
-                    }
-                    break;
-                case 'date':
-                case 'dateTime.iso8601':
-                    if (!is_a($arg, 'IXR_Date')) {
-                        $ok = false;
-                    }
-                    break;
-            }
-            if (!$ok) {
-                return new IXR_Error(-32602, 'server error. invalid method parameters');
-            }
-        }
-
-        // It passed the test - run the "real" method call
-        return parent::call($methodname, $argsbackup);
-    }
-
-    /**
-     * @param $method
-     * @return array|IXR_Error
-     */
-    public function methodSignature($method)
-    {
-        if (!$this->hasMethod($method)) {
-            return new IXR_Error(-32601, 'server error. requested method "' . $method . '" not specified.');
-        }
-        // We should be returning an array of types
-        $types  = $this->signatures[$method];
-        $return = [];
-        foreach ($types as $type) {
-            switch ($type) {
-                case 'string':
-                    $return[] = 'string';
-                    break;
-                case 'int':
-                case 'i4':
-                    $return[] = 42;
-                    break;
-                case 'double':
-                    $return[] = 3.1415;
-                    break;
-                case 'dateTime.iso8601':
-                    $return[] = new IXR_Date(time());
-                    break;
-                case 'boolean':
-                    $return[] = true;
-                    break;
-                case 'base64':
-                    $return[] = new IXR_Base64('base64');
-                    break;
-                case 'array':
-                    $return[] = ['array'];
-                    break;
-                case 'struct':
-                    $return[] = ['struct' => 'struct'];
-                    break;
-            }
-        }
-
-        return $return;
-    }
-
-    /**
-     * @param $method
-     * @return mixed
-     */
-    public function methodHelp($method)
-    {
-        return $this->help[$method];
-    }
+	public $signatures;
+	public $help;
+
+	/**
+	 * IXR_IntrospectionServer constructor.
+	 */
+	public function __construct()
+	{
+		$this->setCallbacks();
+		$this->setCapabilities();
+		$this->capabilities['introspection'] = [
+			'specUrl'     => 'http://xmlrpc.usefulinc.com/doc/reserved.html',
+			'specVersion' => 1
+		];
+		$this->addCallback('system.methodSignature', 'this:methodSignature', ['array', 'string'], 'Returns an array describing the return type and required parameters of a method');
+		$this->addCallback('system.getCapabilities', 'this:getCapabilities', ['struct'], 'Returns a struct describing the XML-RPC specifications supported by this server');
+		$this->addCallback('system.listMethods', 'this:listMethods', ['array'], 'Returns an array of available methods on this server');
+		$this->addCallback('system.methodHelp', 'this:methodHelp', ['string', 'string'], 'Returns a documentation string for the specified method');
+	}
+
+	/**
+	 * @param $method
+	 * @param $callback
+	 * @param $args
+	 * @param $help
+	 */
+	public function addCallback($method, $callback, $args, $help)
+	{
+		$this->callbacks[$method]  = $callback;
+		$this->signatures[$method] = $args;
+		$this->help[$method]       = $help;
+	}
+
+	/**
+	 * @param $methodname
+	 * @param $args
+	 * @return IXR_Error|mixed
+	 */
+	public function call($methodname, $args)
+	{
+		// Make sure it's in an array
+		if ($args && !is_array($args)) {
+			$args = [$args];
+		}
+		// Over-rides default call method, adds signature check
+		if (!$this->hasMethod($methodname)) {
+			return new IXR_Error(-32601, 'server error. requested method "' . $this->message->methodName . '" not specified.');
+		}
+		$method     = $this->callbacks[$methodname];
+		$signature  = $this->signatures[$methodname];
+		$returnType = array_shift($signature);
+		// Check the number of arguments
+		if (count($args) != count($signature)) {
+			// print 'Num of args: '.count($args).' Num in signature: '.count($signature);
+			return new IXR_Error(-32602, 'server error. wrong number of method parameters');
+		}
+		// Check the argument types
+		$ok         = true;
+		$argsbackup = $args;
+		for ($i = 0, $j = count($args); $i < $j; ++$i) {
+			$arg  = array_shift($args);
+			$type = array_shift($signature);
+			switch ($type) {
+				case 'int':
+				case 'i4':
+					if (is_array($arg) || !is_int($arg)) {
+						$ok = false;
+					}
+					break;
+				case 'base64':
+				case 'string':
+					if (!is_string($arg)) {
+						$ok = false;
+					}
+					break;
+				case 'boolean':
+					if ($arg !== false && $arg !== true) {
+						$ok = false;
+					}
+					break;
+				case 'float':
+				case 'double':
+					if (!is_float($arg)) {
+						$ok = false;
+					}
+					break;
+				case 'date':
+				case 'dateTime.iso8601':
+					if (!is_a($arg, 'IXR_Date')) {
+						$ok = false;
+					}
+					break;
+			}
+			if (!$ok) {
+				return new IXR_Error(-32602, 'server error. invalid method parameters');
+			}
+		}
+
+		// It passed the test - run the "real" method call
+		return parent::call($methodname, $argsbackup);
+	}
+
+	/**
+	 * @param $method
+	 * @return array|IXR_Error
+	 */
+	public function methodSignature($method)
+	{
+		if (!$this->hasMethod($method)) {
+			return new IXR_Error(-32601, 'server error. requested method "' . $method . '" not specified.');
+		}
+		// We should be returning an array of types
+		$types  = $this->signatures[$method];
+		$return = [];
+		foreach ($types as $type) {
+			switch ($type) {
+				case 'string':
+					$return[] = 'string';
+					break;
+				case 'int':
+				case 'i4':
+					$return[] = 42;
+					break;
+				case 'double':
+					$return[] = 3.1415;
+					break;
+				case 'dateTime.iso8601':
+					$return[] = new IXR_Date(time());
+					break;
+				case 'boolean':
+					$return[] = true;
+					break;
+				case 'base64':
+					$return[] = new IXR_Base64('base64');
+					break;
+				case 'array':
+					$return[] = ['array'];
+					break;
+				case 'struct':
+					$return[] = ['struct' => 'struct'];
+					break;
+			}
+		}
+
+		return $return;
+	}
+
+	/**
+	 * @param $method
+	 * @return mixed
+	 */
+	public function methodHelp($method)
+	{
+		return $this->help[$method];
+	}
 }
 
 /**
@@ -1080,37 +1080,37 @@ 
  */
 class IXR_ClientMulticall extends IXR_Client
 {
-    public $calls = [];
-
-    /**
-     * IXR_ClientMulticall constructor.
-     * @param      $server
-     * @param bool $path
-     * @param int  $port
-     */
-    public function __construct($server, $path = false, $port = 80)
-    {
-        parent::IXR_Client($server, $path, $port);
-        $this->useragent = 'The Incutio XML-RPC PHP Library (multicall client)';
-    }
-
-    public function addCall()
-    {
-        $args          = func_get_args();
-        $methodName    = array_shift($args);
-        $struct        = [
-            'methodName' => $methodName,
-            'params'     => $args
-        ];
-        $this->calls[] = $struct;
-    }
-
-    /**
-     * @return bool
-     */
-    public function query()
-    {
-        // Prepare multicall, then call the parent::query() method
-        return parent::query('system.multicall', $this->calls);
-    }
+	public $calls = [];
+
+	/**
+	 * IXR_ClientMulticall constructor.
+	 * @param      $server
+	 * @param bool $path
+	 * @param int  $port
+	 */
+	public function __construct($server, $path = false, $port = 80)
+	{
+		parent::IXR_Client($server, $path, $port);
+		$this->useragent = 'The Incutio XML-RPC PHP Library (multicall client)';
+	}
+
+	public function addCall()
+	{
+		$args          = func_get_args();
+		$methodName    = array_shift($args);
+		$struct        = [
+			'methodName' => $methodName,
+			'params'     => $args
+		];
+		$this->calls[] = $struct;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function query()
+	{
+		// Prepare multicall, then call the parent::query() method
+		return parent::query('system.multicall', $this->calls);
+	}
 }

Spacing +48 added lines, -48 removed lines

@@ -36,7 +36,7 @@ 
             }
         }
         if ($type === 'array') {
-            for ($i = 0, $j = count($this->data); $i < $j; ++$i) {
+            for ($i = 0, $j = count($this->data); $i<$j; ++$i) {
                 $this->data[$i] = new IXR_Value($this->data[$i]);
             }
         }
@@ -75,7 +75,7 @@ 
         /* We have an array - is it an array or a struct ? */
         if ($this->isStruct($this->data)) {
             return 'struct';
-        } else {
+        }else {
             return 'array';
         }
     }
@@ -88,31 +88,31 @@ 
         /* Return XML for this value */
         switch ($this->type) {
             case 'boolean':
-                return '<boolean>' . ($this->data ? '1' : '0') . '</boolean>';
+                return '<boolean>'.($this->data ? '1' : '0').'</boolean>';
                 break;
             case 'int':
-                return '<int>' . $this->data . '</int>';
+                return '<int>'.$this->data.'</int>';
                 break;
             case 'double':
-                return '<double>' . $this->data . '</double>';
+                return '<double>'.$this->data.'</double>';
                 break;
             case 'string':
-                return '<string>' . htmlspecialchars($this->data) . '</string>';
+                return '<string>'.htmlspecialchars($this->data).'</string>';
                 break;
             case 'array':
-                $return = '<array><data>' . "\n";
+                $return = '<array><data>'."\n";
                 foreach ($this->data as $item) {
-                    $return .= '  <value>' . $item->getXml() . "</value>\n";
+                    $return .= '  <value>'.$item->getXml()."</value>\n";
                 }
                 $return .= '</data></array>';
 
                 return $return;
                 break;
             case 'struct':
-                $return = '<struct>' . "\n";
+                $return = '<struct>'."\n";
                 foreach ($this->data as $name => $value) {
                     $return .= "  <member><name>$name</name><value>";
-                    $return .= $value->getXml() . "</value></member>\n";
+                    $return .= $value->getXml()."</value></member>\n";
                 }
                 $return .= '</struct>';
 
@@ -136,7 +136,7 @@ 
         /* Nasty function to check if an array is a struct or not */
         $expected = 0;
         foreach ($array as $key => $value) {
-            if ((string)$key != (string)$expected) {
+            if ((string) $key != (string) $expected) {
                 return true;
             }
             ++$expected;
@@ -152,15 +152,15 @@ 
 class IXR_Message
 {
     public $message;
-    public $messageType;  // methodCall / methodResponse / fault
+    public $messageType; // methodCall / methodResponse / fault
     public $faultCode;
     public $faultString;
     public $methodName;
     public $params;
     // Current variable stacks
-    public $_arraystructs      = [];   // The stack used to keep track of the current array/struct
+    public $_arraystructs      = []; // The stack used to keep track of the current array/struct
     public $_arraystructstypes = []; // Stack keeping track of if things are structs or array
-    public $_currentStructName = [];  // A stack as well
+    public $_currentStructName = []; // A stack as well
     public $_param;
     public $_value;
     public $_currentTag;
@@ -183,7 +183,7 @@ 
     public function parse()
     {
         // first remove the XML declaration
-        $this->message = preg_replace('/<\?xml(.*)?\?' . '>/', '', $this->message);
+        $this->message = preg_replace('/<\?xml(.*)?\?'.'>/', '', $this->message);
         if (trim($this->message) == '') {
             return false;
         }
@@ -256,17 +256,17 @@ 
         switch ($tag) {
             case 'int':
             case 'i4':
-                $value                     = (int)trim($this->_currentTagContents);
+                $value                     = (int) trim($this->_currentTagContents);
                 $this->_currentTagContents = '';
                 $valueFlag                 = true;
                 break;
             case 'double':
-                $value                     = (double)trim($this->_currentTagContents);
+                $value                     = (double) trim($this->_currentTagContents);
                 $this->_currentTagContents = '';
                 $valueFlag                 = true;
                 break;
             case 'string':
-                $value                     = (string)trim($this->_currentTagContents);
+                $value                     = (string) trim($this->_currentTagContents);
                 $this->_currentTagContents = '';
                 $valueFlag                 = true;
                 break;
@@ -279,13 +279,13 @@ 
             case 'value':
                 // "If no type is indicated, the type is string."
                 if (trim($this->_currentTagContents) != '') {
-                    $value                     = (string)$this->_currentTagContents;
+                    $value                     = (string) $this->_currentTagContents;
                     $this->_currentTagContents = '';
                     $valueFlag                 = true;
                 }
                 break;
             case 'boolean':
-                $value                     = (boolean)trim($this->_currentTagContents);
+                $value                     = (boolean) trim($this->_currentTagContents);
                 $this->_currentTagContents = '';
                 $valueFlag                 = true;
                 break;
@@ -319,16 +319,16 @@ 
                 $value = trim($value);
             }
             */
-            if (count($this->_arraystructs) > 0) {
+            if (count($this->_arraystructs)>0) {
                 // Add value to struct or array
-                if ($this->_arraystructstypes[count($this->_arraystructstypes) - 1] === 'struct') {
+                if ($this->_arraystructstypes[count($this->_arraystructstypes)-1] === 'struct') {
                     // Add to struct
-                    $this->_arraystructs[count($this->_arraystructs) - 1][$this->_currentStructName[count($this->_currentStructName) - 1]] = $value;
-                } else {
+                    $this->_arraystructs[count($this->_arraystructs)-1][$this->_currentStructName[count($this->_currentStructName)-1]] = $value;
+                }else {
                     // Add to array
-                    $this->_arraystructs[count($this->_arraystructs) - 1][] = $value;
+                    $this->_arraystructs[count($this->_arraystructs)-1][] = $value;
                 }
-            } else {
+            }else {
                 // Just add as a paramater
                 $this->params[] = $value;
             }
@@ -413,7 +413,7 @@ 
     public function call($methodname, $args)
     {
         if (!$this->hasMethod($methodname)) {
-            return new IXR_Error(-32601, 'server error. requested method ' . $methodname . ' does not exist.');
+            return new IXR_Error(-32601, 'server error. requested method '.$methodname.' does not exist.');
         }
         $method = $this->callbacks[$methodname];
         // Perform the callback and send the response
@@ -426,18 +426,18 @@ 
             // It's a class method - check it exists
             $method = substr($method, 5);
             if (!method_exists($this, $method)) {
-                return new IXR_Error(-32601, 'server error. requested class method "' . $method . '" does not exist.');
+                return new IXR_Error(-32601, 'server error. requested class method "'.$method.'" does not exist.');
             }
             // Call the method
             $result = $this->$method($args);
-        } else {
+        }else {
             // It's a function - does it exist?
             if (is_array($method)) {
                 if (!method_exists($method[0], $method[1])) {
-                    return new IXR_Error(-32601, 'server error. requested object method "' . $method[1] . '" does not exist.');
+                    return new IXR_Error(-32601, 'server error. requested object method "'.$method[1].'" does not exist.');
                 }
             } elseif (!function_exists($method)) {
-                return new IXR_Error(-32601, 'server error. requested function "' . $method . '" does not exist.');
+                return new IXR_Error(-32601, 'server error. requested function "'.$method.'" does not exist.');
             }
             // Call the function
             $result = call_user_func($method, $args);
@@ -464,12 +464,12 @@ 
      */
     public function output($xml)
     {
-        $xml    = '<?xml version="1.0"?>' . "\n" . $xml;
+        $xml    = '<?xml version="1.0"?>'."\n".$xml;
         $length = strlen($xml);
         header('Connection: close');
-        header('Content-Length: ' . $length);
+        header('Content-Length: '.$length);
         header('Content-Type: text/xml');
-        header('Date: ' . date('r'));
+        header('Date: '.date('r'));
         echo $xml;
         exit;
     }
@@ -542,7 +542,7 @@ 
             $params = $call['params'];
             if ($method === 'system.multicall') {
                 $result = new IXR_Error(-32600, 'Recursive calls to system.multicall are forbidden');
-            } else {
+            }else {
                 $result = $this->call($method, $params);
             }
             if (is_a($result, 'IXR_Error')) {
@@ -550,7 +550,7 @@ 
                     'faultCode'   => $result->code,
                     'faultString' => $result->message
                 ];
-            } else {
+            }else {
                 $return[] = [$result];
             }
         }
@@ -586,7 +586,7 @@ 
 EOD;
         foreach ($this->args as $arg) {
             $this->xml .= '<param><value>';
-            $v         = new IXR_Value($arg);
+            $v = new IXR_Value($arg);
             $this->xml .= $v->getXml();
             $this->xml .= "</value></param>\n";
         }
@@ -647,7 +647,7 @@ 
             if (!$this->path) {
                 $this->path = '/';
             }
-        } else {
+        }else {
             $this->server  = $server;
             $this->path    = $path;
             $this->port    = $port;
@@ -675,7 +675,7 @@ 
         $request .= $xml;
         // Now send the request
         if ($this->debug) {
-            echo '<pre>' . htmlspecialchars($request) . "\n</pre>\n\n";
+            echo '<pre>'.htmlspecialchars($request)."\n</pre>\n\n";
         }
         $fp = @fsockopen($this->server, $this->port, $errno, $errstr, $this->timeout);
         if (!$fp) {
@@ -702,11 +702,11 @@ 
                 $gettingHeaders = false;
             }
             if (!$gettingHeaders) {
-                $contents .= trim($line) . "\n";
+                $contents .= trim($line)."\n";
             }
         }
         if ($this->debug) {
-            echo '<pre>' . htmlspecialchars($contents) . "\n</pre>\n\n";
+            echo '<pre>'.htmlspecialchars($contents)."\n</pre>\n\n";
         }
         // Now parse what we've got back
         $this->message = new IXR_Message($contents);
@@ -831,7 +831,7 @@ 
         // $time can be a PHP timestamp or an ISO one
         if (is_numeric($time)) {
             $this->parseTimestamp($time);
-        } else {
+        }else {
             $this->parseIso($time);
         }
     }
@@ -868,7 +868,7 @@ 
      */
     public function getIso()
     {
-        return $this->year . $this->month . $this->day . 'T' . $this->hour . ':' . $this->minute . ':' . $this->second . $this->timezone;
+        return $this->year.$this->month.$this->day.'T'.$this->hour.':'.$this->minute.':'.$this->second.$this->timezone;
     }
 
     /**
@@ -876,7 +876,7 @@ 
      */
     public function getXml()
     {
-        return '<dateTime.iso8601>' . $this->getIso() . '</dateTime.iso8601>';
+        return '<dateTime.iso8601>'.$this->getIso().'</dateTime.iso8601>';
     }
 
     /**
@@ -909,7 +909,7 @@ 
      */
     public function getXml()
     {
-        return '<base64>' . base64_encode($this->data) . '</base64>';
+        return '<base64>'.base64_encode($this->data).'</base64>';
     }
 }
 
@@ -964,7 +964,7 @@ 
         }
         // Over-rides default call method, adds signature check
         if (!$this->hasMethod($methodname)) {
-            return new IXR_Error(-32601, 'server error. requested method "' . $this->message->methodName . '" not specified.');
+            return new IXR_Error(-32601, 'server error. requested method "'.$this->message->methodName.'" not specified.');
         }
         $method     = $this->callbacks[$methodname];
         $signature  = $this->signatures[$methodname];
@@ -977,7 +977,7 @@ 
         // Check the argument types
         $ok         = true;
         $argsbackup = $args;
-        for ($i = 0, $j = count($args); $i < $j; ++$i) {
+        for ($i = 0, $j = count($args); $i<$j; ++$i) {
             $arg  = array_shift($args);
             $type = array_shift($signature);
             switch ($type) {
@@ -1027,7 +1027,7 @@ 
     public function methodSignature($method)
     {
         if (!$this->hasMethod($method)) {
-            return new IXR_Error(-32601, 'server error. requested method "' . $method . '" not specified.');
+            return new IXR_Error(-32601, 'server error. requested method "'.$method.'" not specified.');
         }
         // We should be returning an array of types
         $types  = $this->signatures[$method];

class/rate.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 // ------------------------------------------------------------------------ //
 
 // defined('XOOPS_ROOT_PATH') || exit('Restricted access.');
-require_once __DIR__ . '/../include/vars.php';
+require_once __DIR__.'/../include/vars.php';
 //mod_loadFunctions('', $GLOBALS['moddirname']);
 
 if (!class_exists('Brate')):

class/blog.php

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
  */
 
 // defined('XOOPS_ROOT_PATH') || exit('Restricted access.');
-require_once __DIR__ . '/../include/vars.php';
+require_once __DIR__.'/../include/vars.php';
 //mod_loadFunctions('', $GLOBALS['moddirname']);
 
 /**
@@ -133,7 +133,7 @@ 
         {
             $ave = 3;
             if ($this->getVar('blog_rates')) {
-                $ave = number_format($this->getVar('blog_rating') / $this->getVar('blog_rates'), $decimals);
+                $ave = number_format($this->getVar('blog_rating')/$this->getVar('blog_rates'), $decimals);
             }
 
             return $ave;

class/utility.php

Indentation +518 added lines, -518 removed lines

@@ -30,531 +30,531 @@
 
 $current_path = __FILE__;
 if (DIRECTORY_SEPARATOR !== '/') {
-    $current_path = str_replace(strpos($current_path, '\\\\', 2) ? '\\\\' : DIRECTORY_SEPARATOR, '/', $current_path);
+	$current_path = str_replace(strpos($current_path, '\\\\', 2) ? '\\\\' : DIRECTORY_SEPARATOR, '/', $current_path);
 }
 $url_arr               = explode('/', strstr($current_path, '/modules/'));
 $GLOBALS['moddirname'] = $url_arr[2];
 
 if (!defined('planet_FUNCTIONS')):
-    define('planet_FUNCTIONS', 1);
-
-    require XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/include/vars.php';
-    require_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
-    require_once XOOPS_ROOT_PATH . '/Frameworks/art/functions.php';
-
-    /**
-     * Class PlanetUtility
-     */
-    class PlanetUtility
-    {
-
-        /**
-         * Function to display messages
-         *
-         * @var mixed $messages
-         * @return bool
-         */
-        public static function planetDisplayMessage($message)
-        {
-            return mod_message($message);
-        }
-
-        /**
-         * Function to parse arguments for a page according to $_SERVER['REQUEST_URI']
-         *
-         * @var array $args_numeric array of numeric variable values
-         * @var array $args         array of indexed variables: name and value
-         * @var array $args_string  array of string variable values
-         *
-         * @return bool true on args parsed
-         */
-
-        /* known issues:
+	define('planet_FUNCTIONS', 1);
+
+	require XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/include/vars.php';
+	require_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
+	require_once XOOPS_ROOT_PATH . '/Frameworks/art/functions.php';
+
+	/**
+	 * Class PlanetUtility
+	 */
+	class PlanetUtility
+	{
+
+		/**
+		 * Function to display messages
+		 *
+		 * @var mixed $messages
+		 * @return bool
+		 */
+		public static function planetDisplayMessage($message)
+		{
+			return mod_message($message);
+		}
+
+		/**
+		 * Function to parse arguments for a page according to $_SERVER['REQUEST_URI']
+		 *
+		 * @var array $args_numeric array of numeric variable values
+		 * @var array $args         array of indexed variables: name and value
+		 * @var array $args_string  array of string variable values
+		 *
+		 * @return bool true on args parsed
+		 */
+
+		/* known issues:
          * - "/" in a string
          * - "&" in a string
         */
-        public static function planetParseArguments(&$args_numeric, &$args, &$args_string)
-        {
-            $args_abb     = [
-                'a' => 'article',
-                'b' => 'blog',
-                'c' => 'category',
-                'l' => 'list',
-                'o' => 'sort',
-                's' => 'start',
-                'u' => 'uid'
-            ];
-            $args         = [];
-            $args_numeric = [];
-            $args_string  = [];
-            if (preg_match("/[^\?]*\.php[\/|\?]([^\?]*)/i", Request::getUrl('REQUEST_URI', '', 'SERVER'), $matches)) {
-                $vars = preg_split("/[\/|&]/", $matches[1]);
-                $vars = array_map('trim', $vars);
-                if (count($vars) > 0) {
-                    foreach ($vars as $var) {
-                        if (is_numeric($var)) {
-                            $args_numeric[] = $var;
-                        } elseif (false === strpos($var, '=')) {
-                            if (is_numeric(substr($var, 1))) {
-                                $args[$args_abb[strtolower($var{0})]] = (int)substr($var, 1);
-                            } else {
-                                $args_string[] = urldecode($var);
-                            }
-                        } else {
-                            parse_str($var, $args);
-                        }
-                    }
-                }
-            }
-
-            return (count($args) + count($args_numeric) + count($args_string) == 0) ? null : true;
-        }
-
-        /**
-         * Function to parse class prefix
-         *
-         * @var string $class_string string to be parsed
-         * @var mixed  $pattern
-         * @var mixed  $replacement
-         *
-         * @return bool true on success
-         */
-        public static function planetParseClass($class_string, $pattern = '', $replacement = '')
-        {
-            if (empty($class_string)) {
-                return;
-            }
-            $patterns     = ["/\[CLASS_PREFIX\]/"];
-            $replacements = [ucfirst(strtolower($GLOBALS['moddirname']))];
-            if (!empty($pattern) && !is_array($pattern) && !is_array($replacement)) {
-                $pattern     = [$pattern];
-                $replacement = [$replacement];
-            }
-            if (is_array($pattern) && count($pattern) > 0) {
-                $ii = 0;
-                foreach ($pattern as $pat) {
-                    if (!in_array($pat, $patterns)) {
-                        $patterns[]     = $pat;
-                        $replacements[] = isset($replacement[$ii]) ? $replacement[$ii] : '';
-                    }
-                    ++$ii;
-                }
-            }
-            $class_string = preg_replace($patterns, $replacements, $class_string);
-            eval($class_string);
-
-            return true;
-        }
-
-        /**
-         * Function to parse function prefix
-         *
-         * @var string $function_string string to be parsed
-         * @var mixed  $pattern
-         * @var mixed  $replacement
-         *
-         * @return bool true on success
-         */
-        public static function planetParseFunction($function_string, $pattern = '', $replacement = '')
-        {
-            if (empty($function_string)) {
-                return;
-            }
-            $patterns     = ["/\[DIRNAME\]/", "/\[VAR_PREFIX\]/"];
-            $replacements = [$GLOBALS['moddirname'], $GLOBALS['VAR_PREFIX']];
-            if (!empty($pattern) && !is_array($pattern) && !is_array($replacement)) {
-                $pattern     = [$pattern];
-                $replacement = [$replacement];
-            }
-            if (is_array($pattern) && count($pattern) > 0) {
-                $ii = 0;
-                foreach ($pattern as $pat) {
-                    if (!in_array($pat, $patterns)) {
-                        $patterns[]     = $pat;
-                        $replacements[] = isset($replacement[$ii]) ? $replacement[$ii] : '';
-                    }
-                    ++$ii;
-                }
-            }
-            $function_string = preg_replace($patterns, $replacements, $function_string);
-            eval($function_string);
-
-            return true;
-        }
-
-        /**
-         * Function to convert UNIX time to formatted time string
-         * @param        $time
-         * @param string $format
-         * @return string
-         */
-        public static function planetFormatTimestamp($time, $format = '')
-        {
-            if (empty($time)) {
-                return '';
-            }
-
-            return formatTimestamp($time, $format);
-        }
-
-        /**
-         * Function to a list of user names associated with their user IDs
-         * @param int  $userid
-         * @param int  $usereal
-         * @param bool $linked
-         * @return array
-         */
-        public static function &planetGetUnameFromId($userid, $usereal = 0, $linked = false)
-        {
-            if (!is_array($userid)) {
-                $userid = [$userid];
-            }
-            $users =& mod_getUnameFromIds($userid, $usereal, $linked);
-
-            return $users;
-        }
-
-        /**
-         * Function to parse links, links are delimited by link break, URL and title of a link are delimited by space
-         *
-         * @var string $text raw content
-         *
-         * @return array associative array of link url and title
-         */
-        public static function &planetParseLinks($text)
-        {
-            $myts       = MyTextSanitizer::getInstance();
-            $link_array = preg_split("/(\r\n|\r|\n)( *)/", $text);
-            $links      = [];
-            if (count($link_array) > 0) {
-                foreach ($link_array as $link) {
-                    @list($url, $title) = array_map('trim', preg_split('/ /', $link, 2));
-                    if (empty($url)) {
-                        continue;
-                    }
-                    //if(empty($title)) $title = $url;
-                    $links[] = ['url' => $url, 'title' => $myts->htmlSpecialChars($title)];
-                }
-            }
-
-            return $links;
-        }
-
-        /**
-         * @param $pagename
-         * @return string
-         */
-        public static function planetGetTemplate($pagename)
-        {
-            return $GLOBALS['VAR_PREFIX'] . '_' . $pagename . '.tpl';
-        }
-
-        /**
-         * @param int $currentoption
-         */
-        //public static function planet_adminmenu($currentoption = -1)
-        //{
-        //    loadModuleAdminMenu($currentoption, '');
-        //
-        //    return;
-        //}
-
-        /**
-         * Function to send a trackback
-         *
-         * @param $article
-         * @param $comment
-         * @return bool
-         */
-        public static function planetSendTrackback(&$article, &$comment)
-        {
-            $blogHandler = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
-            $blog_obj    = $blogHandler->get($article->getVar('blog_id'));
-            if (!$pattern = $blog_obj->getVar('blog_trackback')) {
-                return false;
-            }
-
-            @list($pat, $rep) = array_map('trim', preg_split("#[\s]+#", $pattern));
-            $trackback_url = preg_replace('#' . $pat . '#', $rep, $article_obj->getVar('art_link'));
-
-            return static::planetTrackback($trackback_url, $article);
-        }
-
-        /**
-         * @param $trackback_url
-         * @param $article
-         * @return bool
-         */
-        public static function planetTrackback($trackback_url, $article)
-        {
-            global $myts, $xoopsConfig, $xoopsModule, $xoopsModuleConfig;
-
-            $title         = $article->getVar('art_title');
-            $excerpt       = $article->getVar('art_content');
-            $blog_name     = $xoopsConfig['sitename'] . '-' . $xoopsModule->getVar('name');
-            $title         = xoops_utf8_encode($title);
-            $excerpt       = xoops_utf8_encode($excerpt);
-            $blog_name     = xoops_utf8_encode($blog_name);
-            $charset       = 'utf-8';
-            $title1        = urlencode($title);
-            $excerpt1      = urlencode($excerpt);
-            $name1         = urlencode($blog_name);
-            $url           = urlencode(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article->getVar('art_id'));
-            $query_string  = "title=$title1&url=$url&blog_name=$name1&excerpt=$excerpt1&charset=$charset";
-            $trackback_url = parse_url($trackback_url);
-
-            $http_request = 'POST ' . $trackback_url['path'] . ($trackback_url['query'] ? '?' . $trackback_url['query'] : '') . " HTTP/1.0\r\n";
-            $http_request .= 'Host: ' . $trackback_url['host'] . "\r\n";
-            $http_request .= 'Content-Type: application/x-www-form-urlencoded; charset=' . $charset . "\r\n";
-            $http_request .= 'Content-Length: ' . strlen($query_string) . "\r\n";
-            $http_request .= 'User-Agent: XOOPS Blogs/' . XOOPS_VERSION;
-            $http_request .= "\r\n\r\n";
-            $http_request .= $query_string;
-            if ('' == $trackback_url['port']) {
-                $trackback_url['port'] = 80;
-            }
-            $fs = @fsockopen($trackback_url['host'], $trackback_url['port'], $errno, $errstr, 4);
-            @fwrite($fs, $http_request);
-            if ($xoopsModuleConfig['do_debug']) {
-                $debug_file = XOOPS_CACHE_PATH . '/' . $GLOBALS['moddirname'] . '_trackback.log';
-                $fr         = "\n*****\nRequest:\n\n$http_request\n\nResponse:\n\n";
-                $fr         .= "CHARSET:$charset\n";
-                $fr         .= "NAME:$blog_name\n";
-                $fr         .= 'TITLE:' . $title . "\n";
-                $fr         .= "EXCERPT:$excerpt\n\n";
-                while (!@feof($fs)) {
-                    $fr .= @fgets($fs, 4096);
-                }
-                $fr .= "\n\n";
-
-                if ($fp = fopen($debug_file, 'a')) {
-                    fwrite($fp, $fr);
-                    fclose($fp);
-                } else {
-                }
-            }
-            @fclose($fs);
-
-            return true;
-        }
-
-        /**
-         * Function to ping servers
-         * @param $server
-         * @param $id
-         */
-        public static function planetGetPing($server, $id)
-        {
-            if (is_array($server)) {
-                foreach ($server as $serv) {
-                    PlanetUtility::planetGetPing($serv, $id);
-                }
-            }
-            require_once XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/class-IXR.php';
-
-            // using a timeout of 3 seconds should be enough to cover slow servers
-            $client            = new IXR_Client($server, false);
-            $client->timeout   = 3;
-            $client->useragent .= ' -- XOOPS Article/' . XOOPS_VERSION;
-
-            // when set to true, this outputs debug messages by itself
-            $client->debug = false;
-
-            $blogname = xoops_utf8_encode($GLOBALS['xoopsModule']->getVar('name'));
-            $home     = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/';
-            $rss2_url = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/xml.php' . URL_DELIMITER . 'rss2.0/' . $id;
-
-            if (!$client->query('weblogUpdates.extendedPing', $blogname, $home, $rss2_url)) { // then try a normal ping
-                $client->query('weblogUpdates.ping', $blogname, $home);
-            }
-        }
-
-        /**
-         * Function to respond to a trackback
-         * @param int    $error
-         * @param string $error_message
-         */
-        public static function planetRespondToTrackback($error = 0, $error_message = '')
-        {
-            $charset       = 'utf-8';
-            $error_message = xoops_utf8_encode($error_message);
-            header('Content-Type: text/xml; charset="' . $charset . '"');
-            if ($error) {
-                echo '<?xml version="1.0" encoding="' . $charset . '"?' . ">\n";
-                echo "<response>\n";
-                echo "<error>1</error>\n";
-                echo "<message>$error_message</message>\n";
-                echo '</response>';
-                die();
-            } else {
-                echo '<?xml version="1.0" encoding="' . $charset . '"?' . ">\n";
-                echo "<response>\n";
-                echo "<error>0</error>\n";
-                echo '</response>';
-            }
-        }
-
-        /**
-         * Function to set a cookie with module-specified name
-         *
-         * using customized serialization method
-         * @param        $name
-         * @param string $string
-         * @param int    $expire
-         */
-        public static function planetSetCookie($name, $string = '', $expire = 0)
-        {
-            if (is_array($string)) {
-                $value = [];
-                foreach ($string as $key => $val) {
-                    $value[] = $key . '|' . $val;
-                }
-                $string = implode(',', $value);
-            }
-            setcookie($GLOBALS['VAR_PREFIX'] . $name, $string, (int)$expire, '/');
-        }
-
-        /**
-         * @param      $name
-         * @param bool $isArray
-         * @return array|null
-         */
-        public static function planetGetCookie($name, $isArray = false)
-        {
-            $value = isset($_COOKIE[$GLOBALS['VAR_PREFIX'] . $name]) ? $_COOKIE[$GLOBALS['VAR_PREFIX'] . $name] : null;
-            if ($isArray) {
-                $_value = $value ? explode(',', $value) : [];
-                $value  = [];
-                if (count($_value) > 0) {
-                    foreach ($_value as $string) {
-                        $key         = substr($string, 0, strpos($string, '|'));
-                        $val         = substr($string, strpos($string, '|') + 1);
-                        $value[$key] = $val;
-                    }
-                }
-                unset($_value);
-            }
-
-            return $value;
-        }
-
-        /**
-         * Function to filter text
-         *
-         * @param $document
-         * @return string filtered text
-         */
-        public static function &planetHtml2text(&$document)
-        {
-            $document = strip_tags($document);
-
-            return $document;
-        }
-
-        // Adapted from PMA_getIp() [phpmyadmin project]
-
-        /**
-         * @param bool $asString
-         * @return mixed
-         */
-        public static function planetGetIP($asString = false)
-        {
-            return mod_getIP($asString);
-        }
-
-        /**
-         * @param $url
-         * @return bool|mixed|string
-         */
-        public static function planetGetRemoteContent($url)
-        {
-            if ($data = static::planetFetchSnoopy($url)) {
-                return $data;
-            }
-            if ($data = static::planetFetchCURL($url)) {
-                return $data;
-            }
-            if ($data = static::planetFetchFopen($url)) {
-                return $data;
-            }
-
-            return false;
-        }
-
-        /**
-         * @param $url
-         * @return string
-         */
-        public static function planetFetchSnoopy($url)
-        {
-            require_once XOOPS_ROOT_PATH . '/class/snoopy.php';
-            $snoopy = new Snoopy;
-            $data   = '';
-            if (@$snoopy->fetch($url)) {
-                $data = is_array($snoopy->results) ? implode("\n", $snoopy->results) : $snoopy->results;
-            }
-
-            return $data;
-        }
-
-        /**
-         * @param $url
-         * @return bool|mixed
-         */
-        public static function planetFetchCURL($url)
-        {
-            if (!function_exists('curl_init')) {
-                return false;
-            }
-            $ch = curl_init();    // initialize curl handle
-            curl_setopt($ch, CURLOPT_URL, $url); // set url to post to
-            curl_setopt($ch, CURLOPT_FAILONERROR, 1);
-            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);// allow redirects
-            curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); // return into a variable
-            curl_setopt($ch, CURLOPT_TIMEOUT, 30); // times out after 31s
-            $data = curl_exec($ch); // run the whole process
-            curl_close($ch);
-
-            return $data;
-        }
-
-        /**
-         * @param $url
-         * @return bool|string
-         */
-        public static function planetFetchFopen($url)
-        {
-            if (!$fp = @fopen($url, 'r')) {
-                return false;
-            }
-            $data = '';
-            while (!feof($fp)) {
-                $data .= fgets($fp, 1024);
-            }
-            fclose($fp);
-
-            return $data;
-        }
-
-        /**
-         * @param     $haystack
-         * @param     $needle
-         * @param int $offset
-         * @return bool|int
-         */
-        public static function planetStrrPos($haystack, $needle, $offset = 0)
-        {
-            if (substr(PHP_VERSION, 0, 1) == 5) {
-                return strrpos($haystack, $needle, $offset);
-            }
-            $index = strpos(strrev($haystack), strrev($needle));
-            if ($index === false) {
-                return false;
-            }
-            $index = strlen($haystack) - strlen($needle) - $index;
-
-            return $index;
-        }
-    }
+		public static function planetParseArguments(&$args_numeric, &$args, &$args_string)
+		{
+			$args_abb     = [
+				'a' => 'article',
+				'b' => 'blog',
+				'c' => 'category',
+				'l' => 'list',
+				'o' => 'sort',
+				's' => 'start',
+				'u' => 'uid'
+			];
+			$args         = [];
+			$args_numeric = [];
+			$args_string  = [];
+			if (preg_match("/[^\?]*\.php[\/|\?]([^\?]*)/i", Request::getUrl('REQUEST_URI', '', 'SERVER'), $matches)) {
+				$vars = preg_split("/[\/|&]/", $matches[1]);
+				$vars = array_map('trim', $vars);
+				if (count($vars) > 0) {
+					foreach ($vars as $var) {
+						if (is_numeric($var)) {
+							$args_numeric[] = $var;
+						} elseif (false === strpos($var, '=')) {
+							if (is_numeric(substr($var, 1))) {
+								$args[$args_abb[strtolower($var{0})]] = (int)substr($var, 1);
+							} else {
+								$args_string[] = urldecode($var);
+							}
+						} else {
+							parse_str($var, $args);
+						}
+					}
+				}
+			}
+
+			return (count($args) + count($args_numeric) + count($args_string) == 0) ? null : true;
+		}
+
+		/**
+		 * Function to parse class prefix
+		 *
+		 * @var string $class_string string to be parsed
+		 * @var mixed  $pattern
+		 * @var mixed  $replacement
+		 *
+		 * @return bool true on success
+		 */
+		public static function planetParseClass($class_string, $pattern = '', $replacement = '')
+		{
+			if (empty($class_string)) {
+				return;
+			}
+			$patterns     = ["/\[CLASS_PREFIX\]/"];
+			$replacements = [ucfirst(strtolower($GLOBALS['moddirname']))];
+			if (!empty($pattern) && !is_array($pattern) && !is_array($replacement)) {
+				$pattern     = [$pattern];
+				$replacement = [$replacement];
+			}
+			if (is_array($pattern) && count($pattern) > 0) {
+				$ii = 0;
+				foreach ($pattern as $pat) {
+					if (!in_array($pat, $patterns)) {
+						$patterns[]     = $pat;
+						$replacements[] = isset($replacement[$ii]) ? $replacement[$ii] : '';
+					}
+					++$ii;
+				}
+			}
+			$class_string = preg_replace($patterns, $replacements, $class_string);
+			eval($class_string);
+
+			return true;
+		}
+
+		/**
+		 * Function to parse function prefix
+		 *
+		 * @var string $function_string string to be parsed
+		 * @var mixed  $pattern
+		 * @var mixed  $replacement
+		 *
+		 * @return bool true on success
+		 */
+		public static function planetParseFunction($function_string, $pattern = '', $replacement = '')
+		{
+			if (empty($function_string)) {
+				return;
+			}
+			$patterns     = ["/\[DIRNAME\]/", "/\[VAR_PREFIX\]/"];
+			$replacements = [$GLOBALS['moddirname'], $GLOBALS['VAR_PREFIX']];
+			if (!empty($pattern) && !is_array($pattern) && !is_array($replacement)) {
+				$pattern     = [$pattern];
+				$replacement = [$replacement];
+			}
+			if (is_array($pattern) && count($pattern) > 0) {
+				$ii = 0;
+				foreach ($pattern as $pat) {
+					if (!in_array($pat, $patterns)) {
+						$patterns[]     = $pat;
+						$replacements[] = isset($replacement[$ii]) ? $replacement[$ii] : '';
+					}
+					++$ii;
+				}
+			}
+			$function_string = preg_replace($patterns, $replacements, $function_string);
+			eval($function_string);
+
+			return true;
+		}
+
+		/**
+		 * Function to convert UNIX time to formatted time string
+		 * @param        $time
+		 * @param string $format
+		 * @return string
+		 */
+		public static function planetFormatTimestamp($time, $format = '')
+		{
+			if (empty($time)) {
+				return '';
+			}
+
+			return formatTimestamp($time, $format);
+		}
+
+		/**
+		 * Function to a list of user names associated with their user IDs
+		 * @param int  $userid
+		 * @param int  $usereal
+		 * @param bool $linked
+		 * @return array
+		 */
+		public static function &planetGetUnameFromId($userid, $usereal = 0, $linked = false)
+		{
+			if (!is_array($userid)) {
+				$userid = [$userid];
+			}
+			$users =& mod_getUnameFromIds($userid, $usereal, $linked);
+
+			return $users;
+		}
+
+		/**
+		 * Function to parse links, links are delimited by link break, URL and title of a link are delimited by space
+		 *
+		 * @var string $text raw content
+		 *
+		 * @return array associative array of link url and title
+		 */
+		public static function &planetParseLinks($text)
+		{
+			$myts       = MyTextSanitizer::getInstance();
+			$link_array = preg_split("/(\r\n|\r|\n)( *)/", $text);
+			$links      = [];
+			if (count($link_array) > 0) {
+				foreach ($link_array as $link) {
+					@list($url, $title) = array_map('trim', preg_split('/ /', $link, 2));
+					if (empty($url)) {
+						continue;
+					}
+					//if(empty($title)) $title = $url;
+					$links[] = ['url' => $url, 'title' => $myts->htmlSpecialChars($title)];
+				}
+			}
+
+			return $links;
+		}
+
+		/**
+		 * @param $pagename
+		 * @return string
+		 */
+		public static function planetGetTemplate($pagename)
+		{
+			return $GLOBALS['VAR_PREFIX'] . '_' . $pagename . '.tpl';
+		}
+
+		/**
+		 * @param int $currentoption
+		 */
+		//public static function planet_adminmenu($currentoption = -1)
+		//{
+		//    loadModuleAdminMenu($currentoption, '');
+		//
+		//    return;
+		//}
+
+		/**
+		 * Function to send a trackback
+		 *
+		 * @param $article
+		 * @param $comment
+		 * @return bool
+		 */
+		public static function planetSendTrackback(&$article, &$comment)
+		{
+			$blogHandler = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
+			$blog_obj    = $blogHandler->get($article->getVar('blog_id'));
+			if (!$pattern = $blog_obj->getVar('blog_trackback')) {
+				return false;
+			}
+
+			@list($pat, $rep) = array_map('trim', preg_split("#[\s]+#", $pattern));
+			$trackback_url = preg_replace('#' . $pat . '#', $rep, $article_obj->getVar('art_link'));
+
+			return static::planetTrackback($trackback_url, $article);
+		}
+
+		/**
+		 * @param $trackback_url
+		 * @param $article
+		 * @return bool
+		 */
+		public static function planetTrackback($trackback_url, $article)
+		{
+			global $myts, $xoopsConfig, $xoopsModule, $xoopsModuleConfig;
+
+			$title         = $article->getVar('art_title');
+			$excerpt       = $article->getVar('art_content');
+			$blog_name     = $xoopsConfig['sitename'] . '-' . $xoopsModule->getVar('name');
+			$title         = xoops_utf8_encode($title);
+			$excerpt       = xoops_utf8_encode($excerpt);
+			$blog_name     = xoops_utf8_encode($blog_name);
+			$charset       = 'utf-8';
+			$title1        = urlencode($title);
+			$excerpt1      = urlencode($excerpt);
+			$name1         = urlencode($blog_name);
+			$url           = urlencode(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article->getVar('art_id'));
+			$query_string  = "title=$title1&url=$url&blog_name=$name1&excerpt=$excerpt1&charset=$charset";
+			$trackback_url = parse_url($trackback_url);
+
+			$http_request = 'POST ' . $trackback_url['path'] . ($trackback_url['query'] ? '?' . $trackback_url['query'] : '') . " HTTP/1.0\r\n";
+			$http_request .= 'Host: ' . $trackback_url['host'] . "\r\n";
+			$http_request .= 'Content-Type: application/x-www-form-urlencoded; charset=' . $charset . "\r\n";
+			$http_request .= 'Content-Length: ' . strlen($query_string) . "\r\n";
+			$http_request .= 'User-Agent: XOOPS Blogs/' . XOOPS_VERSION;
+			$http_request .= "\r\n\r\n";
+			$http_request .= $query_string;
+			if ('' == $trackback_url['port']) {
+				$trackback_url['port'] = 80;
+			}
+			$fs = @fsockopen($trackback_url['host'], $trackback_url['port'], $errno, $errstr, 4);
+			@fwrite($fs, $http_request);
+			if ($xoopsModuleConfig['do_debug']) {
+				$debug_file = XOOPS_CACHE_PATH . '/' . $GLOBALS['moddirname'] . '_trackback.log';
+				$fr         = "\n*****\nRequest:\n\n$http_request\n\nResponse:\n\n";
+				$fr         .= "CHARSET:$charset\n";
+				$fr         .= "NAME:$blog_name\n";
+				$fr         .= 'TITLE:' . $title . "\n";
+				$fr         .= "EXCERPT:$excerpt\n\n";
+				while (!@feof($fs)) {
+					$fr .= @fgets($fs, 4096);
+				}
+				$fr .= "\n\n";
+
+				if ($fp = fopen($debug_file, 'a')) {
+					fwrite($fp, $fr);
+					fclose($fp);
+				} else {
+				}
+			}
+			@fclose($fs);
+
+			return true;
+		}
+
+		/**
+		 * Function to ping servers
+		 * @param $server
+		 * @param $id
+		 */
+		public static function planetGetPing($server, $id)
+		{
+			if (is_array($server)) {
+				foreach ($server as $serv) {
+					PlanetUtility::planetGetPing($serv, $id);
+				}
+			}
+			require_once XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/class-IXR.php';
+
+			// using a timeout of 3 seconds should be enough to cover slow servers
+			$client            = new IXR_Client($server, false);
+			$client->timeout   = 3;
+			$client->useragent .= ' -- XOOPS Article/' . XOOPS_VERSION;
+
+			// when set to true, this outputs debug messages by itself
+			$client->debug = false;
+
+			$blogname = xoops_utf8_encode($GLOBALS['xoopsModule']->getVar('name'));
+			$home     = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/';
+			$rss2_url = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/xml.php' . URL_DELIMITER . 'rss2.0/' . $id;
+
+			if (!$client->query('weblogUpdates.extendedPing', $blogname, $home, $rss2_url)) { // then try a normal ping
+				$client->query('weblogUpdates.ping', $blogname, $home);
+			}
+		}
+
+		/**
+		 * Function to respond to a trackback
+		 * @param int    $error
+		 * @param string $error_message
+		 */
+		public static function planetRespondToTrackback($error = 0, $error_message = '')
+		{
+			$charset       = 'utf-8';
+			$error_message = xoops_utf8_encode($error_message);
+			header('Content-Type: text/xml; charset="' . $charset . '"');
+			if ($error) {
+				echo '<?xml version="1.0" encoding="' . $charset . '"?' . ">\n";
+				echo "<response>\n";
+				echo "<error>1</error>\n";
+				echo "<message>$error_message</message>\n";
+				echo '</response>';
+				die();
+			} else {
+				echo '<?xml version="1.0" encoding="' . $charset . '"?' . ">\n";
+				echo "<response>\n";
+				echo "<error>0</error>\n";
+				echo '</response>';
+			}
+		}
+
+		/**
+		 * Function to set a cookie with module-specified name
+		 *
+		 * using customized serialization method
+		 * @param        $name
+		 * @param string $string
+		 * @param int    $expire
+		 */
+		public static function planetSetCookie($name, $string = '', $expire = 0)
+		{
+			if (is_array($string)) {
+				$value = [];
+				foreach ($string as $key => $val) {
+					$value[] = $key . '|' . $val;
+				}
+				$string = implode(',', $value);
+			}
+			setcookie($GLOBALS['VAR_PREFIX'] . $name, $string, (int)$expire, '/');
+		}
+
+		/**
+		 * @param      $name
+		 * @param bool $isArray
+		 * @return array|null
+		 */
+		public static function planetGetCookie($name, $isArray = false)
+		{
+			$value = isset($_COOKIE[$GLOBALS['VAR_PREFIX'] . $name]) ? $_COOKIE[$GLOBALS['VAR_PREFIX'] . $name] : null;
+			if ($isArray) {
+				$_value = $value ? explode(',', $value) : [];
+				$value  = [];
+				if (count($_value) > 0) {
+					foreach ($_value as $string) {
+						$key         = substr($string, 0, strpos($string, '|'));
+						$val         = substr($string, strpos($string, '|') + 1);
+						$value[$key] = $val;
+					}
+				}
+				unset($_value);
+			}
+
+			return $value;
+		}
+
+		/**
+		 * Function to filter text
+		 *
+		 * @param $document
+		 * @return string filtered text
+		 */
+		public static function &planetHtml2text(&$document)
+		{
+			$document = strip_tags($document);
+
+			return $document;
+		}
+
+		// Adapted from PMA_getIp() [phpmyadmin project]
+
+		/**
+		 * @param bool $asString
+		 * @return mixed
+		 */
+		public static function planetGetIP($asString = false)
+		{
+			return mod_getIP($asString);
+		}
+
+		/**
+		 * @param $url
+		 * @return bool|mixed|string
+		 */
+		public static function planetGetRemoteContent($url)
+		{
+			if ($data = static::planetFetchSnoopy($url)) {
+				return $data;
+			}
+			if ($data = static::planetFetchCURL($url)) {
+				return $data;
+			}
+			if ($data = static::planetFetchFopen($url)) {
+				return $data;
+			}
+
+			return false;
+		}
+
+		/**
+		 * @param $url
+		 * @return string
+		 */
+		public static function planetFetchSnoopy($url)
+		{
+			require_once XOOPS_ROOT_PATH . '/class/snoopy.php';
+			$snoopy = new Snoopy;
+			$data   = '';
+			if (@$snoopy->fetch($url)) {
+				$data = is_array($snoopy->results) ? implode("\n", $snoopy->results) : $snoopy->results;
+			}
+
+			return $data;
+		}
+
+		/**
+		 * @param $url
+		 * @return bool|mixed
+		 */
+		public static function planetFetchCURL($url)
+		{
+			if (!function_exists('curl_init')) {
+				return false;
+			}
+			$ch = curl_init();    // initialize curl handle
+			curl_setopt($ch, CURLOPT_URL, $url); // set url to post to
+			curl_setopt($ch, CURLOPT_FAILONERROR, 1);
+			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);// allow redirects
+			curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); // return into a variable
+			curl_setopt($ch, CURLOPT_TIMEOUT, 30); // times out after 31s
+			$data = curl_exec($ch); // run the whole process
+			curl_close($ch);
+
+			return $data;
+		}
+
+		/**
+		 * @param $url
+		 * @return bool|string
+		 */
+		public static function planetFetchFopen($url)
+		{
+			if (!$fp = @fopen($url, 'r')) {
+				return false;
+			}
+			$data = '';
+			while (!feof($fp)) {
+				$data .= fgets($fp, 1024);
+			}
+			fclose($fp);
+
+			return $data;
+		}
+
+		/**
+		 * @param     $haystack
+		 * @param     $needle
+		 * @param int $offset
+		 * @return bool|int
+		 */
+		public static function planetStrrPos($haystack, $needle, $offset = 0)
+		{
+			if (substr(PHP_VERSION, 0, 1) == 5) {
+				return strrpos($haystack, $needle, $offset);
+			}
+			$index = strpos(strrev($haystack), strrev($needle));
+			if ($index === false) {
+				return false;
+			}
+			$index = strlen($haystack) - strlen($needle) - $index;
+
+			return $index;
+		}
+	}
 
 endif;

Spacing +42 added lines, -42 removed lines

@@ -38,9 +38,9 @@ 
 if (!defined('planet_FUNCTIONS')):
     define('planet_FUNCTIONS', 1);
 
-    require XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/include/vars.php';
-    require_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
-    require_once XOOPS_ROOT_PATH . '/Frameworks/art/functions.php';
+    require XOOPS_ROOT_PATH.'/modules/'.$GLOBALS['moddirname'].'/include/vars.php';
+    require_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
+    require_once XOOPS_ROOT_PATH.'/Frameworks/art/functions.php';
 
     /**
      * Class PlanetUtility
@@ -75,7 +75,7 @@ 
         */
         public static function planetParseArguments(&$args_numeric, &$args, &$args_string)
         {
-            $args_abb     = [
+            $args_abb = [
                 'a' => 'article',
                 'b' => 'blog',
                 'c' => 'category',
@@ -90,24 +90,24 @@ 
             if (preg_match("/[^\?]*\.php[\/|\?]([^\?]*)/i", Request::getUrl('REQUEST_URI', '', 'SERVER'), $matches)) {
                 $vars = preg_split("/[\/|&]/", $matches[1]);
                 $vars = array_map('trim', $vars);
-                if (count($vars) > 0) {
+                if (count($vars)>0) {
                     foreach ($vars as $var) {
                         if (is_numeric($var)) {
                             $args_numeric[] = $var;
                         } elseif (false === strpos($var, '=')) {
                             if (is_numeric(substr($var, 1))) {
-                                $args[$args_abb[strtolower($var{0})]] = (int)substr($var, 1);
-                            } else {
+                                $args[$args_abb[strtolower($var{0})]] = (int) substr($var, 1);
+                            }else {
                                 $args_string[] = urldecode($var);
                             }
-                        } else {
+                        }else {
                             parse_str($var, $args);
                         }
                     }
                 }
             }
 
-            return (count($args) + count($args_numeric) + count($args_string) == 0) ? null : true;
+            return (count($args)+count($args_numeric)+count($args_string) == 0) ? null : true;
         }
 
         /**
@@ -130,7 +130,7 @@ 
                 $pattern     = [$pattern];
                 $replacement = [$replacement];
             }
-            if (is_array($pattern) && count($pattern) > 0) {
+            if (is_array($pattern) && count($pattern)>0) {
                 $ii = 0;
                 foreach ($pattern as $pat) {
                     if (!in_array($pat, $patterns)) {
@@ -166,7 +166,7 @@ 
                 $pattern     = [$pattern];
                 $replacement = [$replacement];
             }
-            if (is_array($pattern) && count($pattern) > 0) {
+            if (is_array($pattern) && count($pattern)>0) {
                 $ii = 0;
                 foreach ($pattern as $pat) {
                     if (!in_array($pat, $patterns)) {
@@ -209,7 +209,7 @@ 
             if (!is_array($userid)) {
                 $userid = [$userid];
             }
-            $users =& mod_getUnameFromIds($userid, $usereal, $linked);
+            $users = & mod_getUnameFromIds($userid, $usereal, $linked);
 
             return $users;
         }
@@ -226,7 +226,7 @@ 
             $myts       = MyTextSanitizer::getInstance();
             $link_array = preg_split("/(\r\n|\r|\n)( *)/", $text);
             $links      = [];
-            if (count($link_array) > 0) {
+            if (count($link_array)>0) {
                 foreach ($link_array as $link) {
                     @list($url, $title) = array_map('trim', preg_split('/ /', $link, 2));
                     if (empty($url)) {
@@ -246,7 +246,7 @@ 
          */
         public static function planetGetTemplate($pagename)
         {
-            return $GLOBALS['VAR_PREFIX'] . '_' . $pagename . '.tpl';
+            return $GLOBALS['VAR_PREFIX'].'_'.$pagename.'.tpl';
         }
 
         /**
@@ -275,7 +275,7 @@ 
             }
 
             @list($pat, $rep) = array_map('trim', preg_split("#[\s]+#", $pattern));
-            $trackback_url = preg_replace('#' . $pat . '#', $rep, $article_obj->getVar('art_link'));
+            $trackback_url = preg_replace('#'.$pat.'#', $rep, $article_obj->getVar('art_link'));
 
             return static::planetTrackback($trackback_url, $article);
         }
@@ -291,7 +291,7 @@ 
 
             $title         = $article->getVar('art_title');
             $excerpt       = $article->getVar('art_content');
-            $blog_name     = $xoopsConfig['sitename'] . '-' . $xoopsModule->getVar('name');
+            $blog_name     = $xoopsConfig['sitename'].'-'.$xoopsModule->getVar('name');
             $title         = xoops_utf8_encode($title);
             $excerpt       = xoops_utf8_encode($excerpt);
             $blog_name     = xoops_utf8_encode($blog_name);
@@ -299,15 +299,15 @@ 
             $title1        = urlencode($title);
             $excerpt1      = urlencode($excerpt);
             $name1         = urlencode($blog_name);
-            $url           = urlencode(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article->getVar('art_id'));
+            $url           = urlencode(XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php'.URL_DELIMITER.''.$article->getVar('art_id'));
             $query_string  = "title=$title1&url=$url&blog_name=$name1&excerpt=$excerpt1&charset=$charset";
             $trackback_url = parse_url($trackback_url);
 
-            $http_request = 'POST ' . $trackback_url['path'] . ($trackback_url['query'] ? '?' . $trackback_url['query'] : '') . " HTTP/1.0\r\n";
-            $http_request .= 'Host: ' . $trackback_url['host'] . "\r\n";
-            $http_request .= 'Content-Type: application/x-www-form-urlencoded; charset=' . $charset . "\r\n";
-            $http_request .= 'Content-Length: ' . strlen($query_string) . "\r\n";
-            $http_request .= 'User-Agent: XOOPS Blogs/' . XOOPS_VERSION;
+            $http_request = 'POST '.$trackback_url['path'].($trackback_url['query'] ? '?'.$trackback_url['query'] : '')." HTTP/1.0\r\n";
+            $http_request .= 'Host: '.$trackback_url['host']."\r\n";
+            $http_request .= 'Content-Type: application/x-www-form-urlencoded; charset='.$charset."\r\n";
+            $http_request .= 'Content-Length: '.strlen($query_string)."\r\n";
+            $http_request .= 'User-Agent: XOOPS Blogs/'.XOOPS_VERSION;
             $http_request .= "\r\n\r\n";
             $http_request .= $query_string;
             if ('' == $trackback_url['port']) {
@@ -316,11 +316,11 @@ 
             $fs = @fsockopen($trackback_url['host'], $trackback_url['port'], $errno, $errstr, 4);
             @fwrite($fs, $http_request);
             if ($xoopsModuleConfig['do_debug']) {
-                $debug_file = XOOPS_CACHE_PATH . '/' . $GLOBALS['moddirname'] . '_trackback.log';
+                $debug_file = XOOPS_CACHE_PATH.'/'.$GLOBALS['moddirname'].'_trackback.log';
                 $fr         = "\n*****\nRequest:\n\n$http_request\n\nResponse:\n\n";
                 $fr         .= "CHARSET:$charset\n";
                 $fr         .= "NAME:$blog_name\n";
-                $fr         .= 'TITLE:' . $title . "\n";
+                $fr         .= 'TITLE:'.$title."\n";
                 $fr         .= "EXCERPT:$excerpt\n\n";
                 while (!@feof($fs)) {
                     $fr .= @fgets($fs, 4096);
@@ -330,7 +330,7 @@ 
                 if ($fp = fopen($debug_file, 'a')) {
                     fwrite($fp, $fr);
                     fclose($fp);
-                } else {
+                }else {
                 }
             }
             @fclose($fs);
@@ -350,19 +350,19 @@ 
                     PlanetUtility::planetGetPing($serv, $id);
                 }
             }
-            require_once XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/class-IXR.php';
+            require_once XOOPS_ROOT_PATH.'/modules/'.$GLOBALS['moddirname'].'/class-IXR.php';
 
             // using a timeout of 3 seconds should be enough to cover slow servers
             $client            = new IXR_Client($server, false);
             $client->timeout   = 3;
-            $client->useragent .= ' -- XOOPS Article/' . XOOPS_VERSION;
+            $client->useragent .= ' -- XOOPS Article/'.XOOPS_VERSION;
 
             // when set to true, this outputs debug messages by itself
             $client->debug = false;
 
             $blogname = xoops_utf8_encode($GLOBALS['xoopsModule']->getVar('name'));
-            $home     = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/';
-            $rss2_url = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/xml.php' . URL_DELIMITER . 'rss2.0/' . $id;
+            $home     = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/';
+            $rss2_url = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/xml.php'.URL_DELIMITER.'rss2.0/'.$id;
 
             if (!$client->query('weblogUpdates.extendedPing', $blogname, $home, $rss2_url)) { // then try a normal ping
                 $client->query('weblogUpdates.ping', $blogname, $home);
@@ -378,16 +378,16 @@ 
         {
             $charset       = 'utf-8';
             $error_message = xoops_utf8_encode($error_message);
-            header('Content-Type: text/xml; charset="' . $charset . '"');
+            header('Content-Type: text/xml; charset="'.$charset.'"');
             if ($error) {
-                echo '<?xml version="1.0" encoding="' . $charset . '"?' . ">\n";
+                echo '<?xml version="1.0" encoding="'.$charset.'"?'.">\n";
                 echo "<response>\n";
                 echo "<error>1</error>\n";
                 echo "<message>$error_message</message>\n";
                 echo '</response>';
                 die();
-            } else {
-                echo '<?xml version="1.0" encoding="' . $charset . '"?' . ">\n";
+            }else {
+                echo '<?xml version="1.0" encoding="'.$charset.'"?'.">\n";
                 echo "<response>\n";
                 echo "<error>0</error>\n";
                 echo '</response>';
@@ -407,11 +407,11 @@ 
             if (is_array($string)) {
                 $value = [];
                 foreach ($string as $key => $val) {
-                    $value[] = $key . '|' . $val;
+                    $value[] = $key.'|'.$val;
                 }
                 $string = implode(',', $value);
             }
-            setcookie($GLOBALS['VAR_PREFIX'] . $name, $string, (int)$expire, '/');
+            setcookie($GLOBALS['VAR_PREFIX'].$name, $string, (int) $expire, '/');
         }
 
         /**
@@ -421,14 +421,14 @@ 
          */
         public static function planetGetCookie($name, $isArray = false)
         {
-            $value = isset($_COOKIE[$GLOBALS['VAR_PREFIX'] . $name]) ? $_COOKIE[$GLOBALS['VAR_PREFIX'] . $name] : null;
+            $value = isset($_COOKIE[$GLOBALS['VAR_PREFIX'].$name]) ? $_COOKIE[$GLOBALS['VAR_PREFIX'].$name] : null;
             if ($isArray) {
                 $_value = $value ? explode(',', $value) : [];
                 $value  = [];
-                if (count($_value) > 0) {
+                if (count($_value)>0) {
                     foreach ($_value as $string) {
                         $key         = substr($string, 0, strpos($string, '|'));
-                        $val         = substr($string, strpos($string, '|') + 1);
+                        $val         = substr($string, strpos($string, '|')+1);
                         $value[$key] = $val;
                     }
                 }
@@ -487,7 +487,7 @@ 
          */
         public static function planetFetchSnoopy($url)
         {
-            require_once XOOPS_ROOT_PATH . '/class/snoopy.php';
+            require_once XOOPS_ROOT_PATH.'/class/snoopy.php';
             $snoopy = new Snoopy;
             $data   = '';
             if (@$snoopy->fetch($url)) {
@@ -506,10 +506,10 @@ 
             if (!function_exists('curl_init')) {
                 return false;
             }
-            $ch = curl_init();    // initialize curl handle
+            $ch = curl_init(); // initialize curl handle
             curl_setopt($ch, CURLOPT_URL, $url); // set url to post to
             curl_setopt($ch, CURLOPT_FAILONERROR, 1);
-            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);// allow redirects
+            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1); // allow redirects
             curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); // return into a variable
             curl_setopt($ch, CURLOPT_TIMEOUT, 30); // times out after 31s
             $data = curl_exec($ch); // run the whole process
@@ -551,7 +551,7 @@ 
             if ($index === false) {
                 return false;
             }
-            $index = strlen($haystack) - strlen($needle) - $index;
+            $index = strlen($haystack)-strlen($needle)-$index;
 
             return $index;
         }