mambax7 / planet

include/plugin.transfer.php

Indentation +31 added lines, -31 removed lines

@@ -15,7 +15,7 @@ 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
 if (!@include_once XOOPS_ROOT_PATH . '/Frameworks/transfer/transfer.php') {
-    return null;
+	return null;
 }
 
 // Specify the addons to skip for the module
@@ -28,38 +28,38 @@ 
  */
 class ModuleTransferHandler extends TransferHandler
 {
-    /**
-     * ModuleTransferHandler constructor.
-     */
-    public function __construct() {
-        parent::__construct();
-    }
+	/**
+	 * ModuleTransferHandler constructor.
+	 */
+	public function __construct() {
+		parent::__construct();
+	}
 
-    /**
-     * Get valid addon list
-     *
-     * @param array   $skip Addons to skip
-     * @param boolean $sort To sort the list upon 'level'
-     *                      return  array   $list
-     */
-    public function &getList($skip = array(), $sort = true) {
-        $list = parent::getList($skip, $sort);
+	/**
+	 * Get valid addon list
+	 *
+	 * @param array   $skip Addons to skip
+	 * @param boolean $sort To sort the list upon 'level'
+	 *                      return  array   $list
+	 */
+	public function &getList($skip = array(), $sort = true) {
+		$list = parent::getList($skip, $sort);
 
-        return $list;
-    }
+		return $list;
+	}
 
-    /**
-     * If need change config of an item
-     * 1 parent::load_item
-     * 2 $this->config
-     * 3 $this->do_transfer
-     * @param $item
-     * @param $data
-     * @return
-     */
-    public function do_transfer($item, &$data) {
-        $ret = parent::do_transfer($item, $data);
+	/**
+	 * If need change config of an item
+	 * 1 parent::load_item
+	 * 2 $this->config
+	 * 3 $this->do_transfer
+	 * @param $item
+	 * @param $data
+	 * @return
+	 */
+	public function do_transfer($item, &$data) {
+		$ret = parent::do_transfer($item, $data);
 
-        return $ret;
-    }
+		return $ret;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-if (!@include_once XOOPS_ROOT_PATH . '/Frameworks/transfer/transfer.php') {
+if (!@include_once XOOPS_ROOT_PATH.'/Frameworks/transfer/transfer.php') {
     return null;
 }
 

include/functions.ini.php

Indentation +67 added lines, -67 removed lines

@@ -32,83 +32,83 @@
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 if (!defined('PLANET_INI')) {
-    exit();
+	exit();
 }
 
 if (!defined('PLANET_FUNCTIONS_INI')):
-    define('PLANET_FUNCTIONS_INI', 1);
+	define('PLANET_FUNCTIONS_INI', 1);
 
-    /**
-     * @param $name
-     * @return mixed
-     */
-    function planet_constant($name) {
-        return mod_constant($name);
-    }
+	/**
+	 * @param $name
+	 * @return mixed
+	 */
+	function planet_constant($name) {
+		return mod_constant($name);
+	}
 
-    /**
-     * @param      $name
-     * @param bool $isRel
-     * @return string
-     */
-    function planet_DB_prefix($name, $isRel = false) {
-        return mod_DB_prefix($name, $isRel);
-    }
+	/**
+	 * @param      $name
+	 * @param bool $isRel
+	 * @return string
+	 */
+	function planet_DB_prefix($name, $isRel = false) {
+		return mod_DB_prefix($name, $isRel);
+	}
 
-    /**
-     * @return bool
-     */
-    function planet_load_object() {
-        return load_object();
-    }
+	/**
+	 * @return bool
+	 */
+	function planet_load_object() {
+		return load_object();
+	}
 
-    /**
-     * @return array|mixed
-     */
-    function planet_load_config() {
-        static $moduleConfig;
-        if (isset($moduleConfig)) {
-            return $moduleConfig;
-        }
+	/**
+	 * @return array|mixed
+	 */
+	function planet_load_config() {
+		static $moduleConfig;
+		if (isset($moduleConfig)) {
+			return $moduleConfig;
+		}
 
-        if (is_object($GLOBALS['xoopsModule'])
-            && $GLOBALS['xoopsModule']->getVar('dirname') == $GLOBALS['moddirname']
-        ) {
-            if (isset($GLOBALS['xoopsModuleConfig'])) {
-                $moduleConfig = $GLOBALS['xoopsModuleConfig'];
-            }
-        } else {
-            $moduleHandler = xoops_getHandler('module');
-            $module        = $moduleHandler->getByDirname($GLOBALS['moddirname']);
+		if (is_object($GLOBALS['xoopsModule'])
+			&& $GLOBALS['xoopsModule']->getVar('dirname') == $GLOBALS['moddirname']
+		) {
+			if (isset($GLOBALS['xoopsModuleConfig'])) {
+				$moduleConfig = $GLOBALS['xoopsModuleConfig'];
+			}
+		} else {
+			$moduleHandler = xoops_getHandler('module');
+			$module        = $moduleHandler->getByDirname($GLOBALS['moddirname']);
 
-            $config_handler = xoops_getHandler('config');
-            $criteria       = new CriteriaCompo(new Criteria('conf_modid', $module->getVar('mid')));
-            $configs        = $config_handler->getConfigs($criteria);
-            foreach (array_keys($configs) as $i) {
-                $moduleConfig[$configs[$i]->getVar('conf_name')] = $configs[$i]->getConfValueForOutput();
-            }
-            unset($configs);
-        }
-        if ($customConfig = @include XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/include/plugin.php') {
-            $moduleConfig = array_merge($moduleConfig, $customConfig);
-        }
+			$config_handler = xoops_getHandler('config');
+			$criteria       = new CriteriaCompo(new Criteria('conf_modid', $module->getVar('mid')));
+			$configs        = $config_handler->getConfigs($criteria);
+			foreach (array_keys($configs) as $i) {
+				$moduleConfig[$configs[$i]->getVar('conf_name')] = $configs[$i]->getConfValueForOutput();
+			}
+			unset($configs);
+		}
+		if ($customConfig = @include XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/include/plugin.php') {
+			$moduleConfig = array_merge($moduleConfig, $customConfig);
+		}
 
-        return $moduleConfig;
-    }
+		return $moduleConfig;
+	}
 
-    function planet_define_url_delimiter() {
-        if (defined('URL_DELIMITER')) {
-            if (!in_array(URL_DELIMITER, array('?', '/'))) {
-                die('Exit on security');
-            }
-        } else {
-            $moduleConfig = planet_load_config();
-            if (empty($moduleConfig['do_urw'])) {
-                define('URL_DELIMITER', '?');
-            } else {
-                define('URL_DELIMITER', '/');
-            }
-        }
-    }
+	function planet_define_url_delimiter() {
+		if (defined('URL_DELIMITER')) {
+			if (!in_array(URL_DELIMITER, array('?', '/'))) {
+				die('Exit on security');
+			}
+		} else {
+			$moduleConfig = planet_load_config();
+			if (empty($moduleConfig['do_urw'])) {
+				define('URL_DELIMITER', '?');
+			} else {
+				define('URL_DELIMITER', '/');
+			}
+		}
+	}
 
 endif;

Spacing +4 added lines, -4 removed lines

@@ -77,7 +77,7 @@ 
             if (isset($GLOBALS['xoopsModuleConfig'])) {
                 $moduleConfig = $GLOBALS['xoopsModuleConfig'];
             }
-        } else {
+        }else {
             $moduleHandler = xoops_getHandler('module');
             $module        = $moduleHandler->getByDirname($GLOBALS['moddirname']);
 
@@ -89,7 +89,7 @@ 
             }
             unset($configs);
         }
-        if ($customConfig = @include XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/include/plugin.php') {
+        if ($customConfig = @include XOOPS_ROOT_PATH.'/modules/'.$GLOBALS['moddirname'].'/include/plugin.php') {
             $moduleConfig = array_merge($moduleConfig, $customConfig);
         }
 
@@ -101,11 +101,11 @@ 
             if (!in_array(URL_DELIMITER, array('?', '/'))) {
                 die('Exit on security');
             }
-        } else {
+        }else {
             $moduleConfig = planet_load_config();
             if (empty($moduleConfig['do_urw'])) {
                 define('URL_DELIMITER', '?');
-            } else {
+            }else {
                 define('URL_DELIMITER', '/');
             }
         }

include/vars.php

Indentation +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
 // ------------------------------------------------------------------------ //
 
 if (!defined('PLANET_INI')) {
-    define('PLANET_INI', 1);
+	define('PLANET_INI', 1);
 }
 
 /*
@@ -54,7 +54,7 @@ 
 
 // include customized variables
 if (is_object($GLOBALS['xoopsModule']) && $GLOBALS['moddirname'] == $GLOBALS['xoopsModule']->getVar('dirname', 'n')) {
-    $GLOBALS['xoopsModuleConfig'] = planet_load_config();
+	$GLOBALS['xoopsModuleConfig'] = planet_load_config();
 }
 
 planet_load_object();

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
 $GLOBALS['MOD_DB_PREFIX'] = 'planet';
 
 /* You are not supposed to modify following contents */
-defined('FRAMEWORKS_ART_FUNCTIONS_INI') || require_once XOOPS_ROOT_PATH . '/Frameworks/art/functions.ini.php';
+defined('FRAMEWORKS_ART_FUNCTIONS_INI') || require_once XOOPS_ROOT_PATH.'/Frameworks/art/functions.ini.php';
 $GLOBALS['moddirname'] = mod_getDirname(__FILE__);
 
 /*
@@ -50,7 +50,7 @@ 
  * You can chnage to any term but be capital and unique, no conflict with other modules
  */
 $GLOBALS['VAR_PREFIXU'] = strtoupper($GLOBALS['moddirname']);
-require_once XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/include/functions.ini.php';
+require_once XOOPS_ROOT_PATH.'/modules/'.$GLOBALS['moddirname'].'/include/functions.ini.php';
 
 // include customized variables
 if (is_object($GLOBALS['xoopsModule']) && $GLOBALS['moddirname'] == $GLOBALS['xoopsModule']->getVar('dirname', 'n')) {

include/form.blog.php

Indentation +27 added lines, -27 removed lines

@@ -32,47 +32,47 @@ 
 $form = new XoopsThemeForm(_EDIT, 'formblog', xoops_getenv('PHP_SELF'), 'POST', true);
 
 $form->addElement(new XoopsFormText(planet_constant('MD_FEED'), 'blog_feed', 50, 255,
-                                    $blog_obj->getVar('blog_feed', 'E')), true);
+									$blog_obj->getVar('blog_feed', 'E')), true);
 $form->addElement(new XoopsFormText(planet_constant('MD_TITLE'), 'blog_title', 50, 255,
-                                    $blog_obj->getVar('blog_title', 'E')));
+									$blog_obj->getVar('blog_title', 'E')));
 $form->addElement(new XoopsFormText(planet_constant('MD_DESC'), 'blog_desc', 50, 255,
-                                    $blog_obj->getVar('blog_desc', 'E')));
+									$blog_obj->getVar('blog_desc', 'E')));
 $form->addElement(new XoopsFormText(planet_constant('MD_LINK'), 'blog_link', 50, 255,
-                                    $blog_obj->getVar('blog_link', 'E')));
+									$blog_obj->getVar('blog_link', 'E')));
 $form->addElement(new XoopsFormText(planet_constant('MD_LANGUAGE'), 'blog_language', 50, 255,
-                                    $blog_obj->getVar('blog_language', 'E')));
+									$blog_obj->getVar('blog_language', 'E')));
 $form->addElement(new XoopsFormText(planet_constant('MD_CHARSET'), 'blog_charset', 50, 255,
-                                    $blog_obj->getVar('blog_charset', 'E')));
+									$blog_obj->getVar('blog_charset', 'E')));
 $form->addElement(new XoopsFormText(planet_constant('MD_TRACKBACKPATTERN'), 'blog_trackback', 80, 255,
-                                    $blog_obj->getVar('blog_trackback', 'E')));
+									$blog_obj->getVar('blog_trackback', 'E')));
 $form->addElement(new XoopsFormText(planet_constant('MD_IMAGE'), 'blog_image', 50, 255,
-                                    $blog_obj->getVar('blog_image', 'E')));
+									$blog_obj->getVar('blog_image', 'E')));
 
 $categories_option = $category_handler->getList();
 natsort($categories_option);
 if (count($categories_option)) {
-    $cat_option_tray = new XoopsFormElementTray(planet_constant('MD_CATEGORY'), '<br>');
-    $options         = array(0 => _NONE);
-    foreach ($categories_option as $id => $title) {
-        $options[$id] = $title;
-    }
-    $cat_select = new XoopsFormSelect('', 'categories', $categories, 3, true);
-    $cat_select->addOptionArray($options);
-    $cat_option_tray->addElement($cat_select);
-    $form->addElement($cat_option_tray);
+	$cat_option_tray = new XoopsFormElementTray(planet_constant('MD_CATEGORY'), '<br>');
+	$options         = array(0 => _NONE);
+	foreach ($categories_option as $id => $title) {
+		$options[$id] = $title;
+	}
+	$cat_select = new XoopsFormSelect('', 'categories', $categories, 3, true);
+	$cat_select->addOptionArray($options);
+	$cat_option_tray->addElement($cat_select);
+	$form->addElement($cat_option_tray);
 }
 
 /* For admin only */
 if (is_object($xoopsUser) && $xoopsUser->isAdmin()) {
-    $status_option_tray = new XoopsFormElementTray(planet_constant('MD_STATUS'), '<br>');
-    $status_select      = new XoopsFormSelect('', 'blog_status', $blog_obj->getVar('blog_status'));
-    $status_select->addOptionArray(array(
-                                       '0' => planet_constant('MD_PENDING'),
-                                       '1' => planet_constant('MD_ACTIVE'),
-                                       '2' => planet_constant('MD_FEATURED')
-                                   ));
-    $status_option_tray->addElement($status_select);
-    $form->addElement($status_option_tray);
+	$status_option_tray = new XoopsFormElementTray(planet_constant('MD_STATUS'), '<br>');
+	$status_select      = new XoopsFormSelect('', 'blog_status', $blog_obj->getVar('blog_status'));
+	$status_select->addOptionArray(array(
+									   '0' => planet_constant('MD_PENDING'),
+									   '1' => planet_constant('MD_ACTIVE'),
+									   '2' => planet_constant('MD_FEATURED')
+								   ));
+	$status_option_tray->addElement($status_select);
+	$form->addElement($status_option_tray);
 }
 
 $form->addElement(new XoopsFormHidden('blog', $blog_id));
@@ -85,7 +85,7 @@ 
 $button_tray->addElement($butt_save);
 $butt_cancel = new XoopsFormButton('', 'cancel', _CANCEL, 'button');
 $butt_cancel->setExtra("onclick='window.document.location=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname']
-                       . '/index.php' . URL_DELIMITER . 'b' . (int)$blog_id . "\"'");
+					   . '/index.php' . URL_DELIMITER . 'b' . (int)$blog_id . "\"'");
 $button_tray->addElement($butt_cancel);
 $form->addElement($button_tray);
 $form->display();

Spacing +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
 // ------------------------------------------------------------------------ //
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 $category_handler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
 
 $form = new XoopsThemeForm(_EDIT, 'formblog', xoops_getenv('PHP_SELF'), 'POST', true);
@@ -84,8 +84,8 @@ 
 $butt_save = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
 $button_tray->addElement($butt_save);
 $butt_cancel = new XoopsFormButton('', 'cancel', _CANCEL, 'button');
-$butt_cancel->setExtra("onclick='window.document.location=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname']
-                       . '/index.php' . URL_DELIMITER . 'b' . (int)$blog_id . "\"'");
+$butt_cancel->setExtra("onclick='window.document.location=\"".XOOPS_URL.'/modules/'.$GLOBALS['moddirname']
+                       . '/index.php'.URL_DELIMITER.'b'.(int) $blog_id."\"'");
 $button_tray->addElement($butt_cancel);
 $form->addElement($button_tray);
 $form->display();

include/action.module.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-include __DIR__ . '/vars.php';
+include __DIR__.'/vars.php';
 mod_loadFunctions('', $GLOBALS['moddirname']);
 
 planet_parse_function('

include/search.inc.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-include __DIR__ . '/vars.php';
+include __DIR__.'/vars.php';
 mod_loadFunctions('', $GLOBALS['moddirname']);
 
 planet_parse_function('

include/notification.inc.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 //  ------------------------------------------------------------------------ //
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-include __DIR__ . '/vars.php';
+include __DIR__.'/vars.php';
 mod_loadFunctions('', $GLOBALS['moddirname']);
 
 planet_parse_function('

xml.php

Indentation +132 added lines, -132 removed lines

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

Spacing +34 added lines, -34 removed lines

@@ -25,7 +25,7 @@ 
 // Project: Article Project                                                 //
 // ------------------------------------------------------------------------ //
 ob_start();
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 if (planet_parse_args($args_num, $args, $args_str)) {
     $args['article'] = @$args_num[0];
@@ -33,13 +33,13 @@ 
 }
 
 /* Specified Article */
-$article_id = (int)(empty($_GET['article']) ? @$args['article'] : $_GET['article']);
+$article_id = (int) (empty($_GET['article']) ? @$args['article'] : $_GET['article']);
 /* Specified Category */
-$category_id = (int)(empty($_GET['category']) ? @$args['category'] : $_GET['category']);
+$category_id = (int) (empty($_GET['category']) ? @$args['category'] : $_GET['category']);
 /* Specified Blog */
-$blog_id = (int)(empty($_GET['blog']) ? @$args['blog'] : $_GET['blog']);
+$blog_id = (int) (empty($_GET['blog']) ? @$args['blog'] : $_GET['blog']);
 /* Specified Bookmar(Favorite) UID */
-$uid = (int)(empty($_GET['uid']) ? @$args['uid'] : $_GET['uid']);
+$uid = (int) (empty($_GET['uid']) ? @$args['uid'] : $_GET['uid']);
 
 $type = empty($_GET['type']) ? (empty($_GET['op']) ? @$args['type'] : $_GET['op']) : $_GET['type'];
 $type = strtoupper($type);
@@ -62,14 +62,14 @@ 
 $bookmark_handler = xoops_getModuleHandler('bookmark', $GLOBALS['moddirname']);
 
 if (!empty($article_id)) {
-    $article_obj =& $article_handler->get($article_id);
+    $article_obj = & $article_handler->get($article_id);
     if (!$article_obj->getVar('art_id')) {
         planet_trackback_response(1, planet_constant('MD_EXPIRED'));
         exit();
     }
     $source = 'article';
 } elseif (!empty($blog_id)) {
-    $blog_obj =& $blog_handler->get($blog_id);
+    $blog_obj = & $blog_handler->get($blog_id);
     if (!$blog_obj->getVar('blog_id')) {
         planet_trackback_response(1, planet_constant('MD_INVALID'));
         exit();
@@ -77,24 +77,24 @@ 
     $source = 'blog';
 } elseif (!empty($category_id)) {
     $source       = 'category';
-    $category_obj =& $category_handler->get($category_id);
+    $category_obj = & $category_handler->get($category_id);
     if (!$category_obj->getVar('cat_id')) {
         planet_trackback_response(1, planet_constant('MD_INVALID'));
         exit();
     }
 } elseif (!empty($uid)) {
     $source = 'bookmark';
-} else {
+}else {
     $source = '';
 }
 
 $xml_charset = 'UTF-8';
-include_once XOOPS_ROOT_PATH . '/class/template.php';
+include_once XOOPS_ROOT_PATH.'/class/template.php';
 $tpl = new XoopsTpl();
 $tpl->xoops_setCaching(2);
 $tpl->xoops_setCacheTime(3600);
-$xoopsCachedTemplateId = md5($xoopsModule->getVar('mid') . ',' . $article_id . ',' . $category_id . ',' . $blog_id . ','
-                             . $uid . ',' . $type);
+$xoopsCachedTemplateId = md5($xoopsModule->getVar('mid').','.$article_id.','.$category_id.','.$blog_id.','
+                             . $uid.','.$type);
 if (!$tpl->is_cached('db:system_dummy.tpl', $xoopsCachedTemplateId)) {
     $criteria = new CriteriaCompo();
     $criteria->setLimit($xoopsModuleConfig['articles_perpage']);
@@ -104,9 +104,9 @@ 
             $pagetitle = planet_constant('MD_ARTICLE');
             $rssdesc   = planet_constant('MD_XMLDESC_ARTICLE');
 
-            $articles_obj[$article_id] =& $article_obj;
+            $articles_obj[$article_id] = & $article_obj;
 
-            $xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . ''
+            $xml_link = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php'.URL_DELIMITER.''
                         . $article_obj->getVar('art_id');
             break;
 
@@ -115,9 +115,9 @@ 
             $rssdesc   = sprintf(planet_constant('MD_XMLDESC_CATEGORY'), $category_obj->getVar('cat_title'));
 
             $criteria->add(new Criteria('bc.cat_id', $category_id));
-            $articles_obj =& $article_handler->getByCategory($criteria);
+            $articles_obj = & $article_handler->getByCategory($criteria);
 
-            $xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'c'
+            $xml_link = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'.URL_DELIMITER.'c'
                         . $category_id;
             break;
 
@@ -126,9 +126,9 @@ 
             $rssdesc   = sprintf(planet_constant('MD_XMLDESC_BLOG'), $blog_obj->getVar('blog_title'));
 
             $criteria->add(new Criteria('blog_id', $blog_id));
-            $articles_obj =& $article_handler->getAll($criteria);
+            $articles_obj = & $article_handler->getAll($criteria);
 
-            $xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b'
+            $xml_link = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'.URL_DELIMITER.'b'
                         . $blog_id;
             break;
 
@@ -138,9 +138,9 @@ 
             $rssdesc     = sprintf(planet_constant('MD_XMLDESC_BOOKMARK'), $author_name);
 
             $criteria->add(new Criteria('bm.bm_uid', $uid));
-            $articles_obj =& $article_handler->getByBookmark($criteria);
+            $articles_obj = & $article_handler->getByBookmark($criteria);
 
-            $xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'u' . $uid;
+            $xml_link = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'.URL_DELIMITER.'u'.$uid;
 
             break;
 
@@ -148,24 +148,24 @@ 
             $pagetitle = planet_constant('MD_INDEX');
             $rssdesc   = planet_constant('MD_XMLDESC_INDEX');
 
-            $articles_obj =& $article_handler->getAll($criteria);
+            $articles_obj = & $article_handler->getAll($criteria);
 
-            $xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php';
+            $xml_link = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php';
             break;
     }
     $items = array();
     foreach (array_keys($articles_obj) as $id) {
         $content = $articles_obj[$id]->getVar('art_content');
-        $content .= '<br>' . planet_constant('MD_SOURCE') . ': ' . $articles_obj[$id]->getVar('art_link') . ' '
+        $content .= '<br>'.planet_constant('MD_SOURCE').': '.$articles_obj[$id]->getVar('art_link').' '
                     . $articles_obj[$id]->getVar('art_author');
         $items[] = array(
             'title'                     => $articles_obj[$id]->getVar('art_title'),
-            'link'                      => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php'
-                                           . URL_DELIMITER . '' . $articles_obj[$id]->getVar('art_id'),
+            'link'                      => XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php'
+                                           . URL_DELIMITER.''.$articles_obj[$id]->getVar('art_id'),
             'description'               => $content,
             'descriptionHtmlSyndicated' => true,
             'date'                      => $articles_obj[$id]->getTime('rss'),
-            'source'                    => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/',
+            'source'                    => XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/',
             'author'                    => $articles_obj[$id]->getVar('art_author')
         );
     }
@@ -174,25 +174,25 @@ 
     $xml_handler = xoops_getModuleHandler('xml', $GLOBALS['moddirname']);
     $xml         = $xml_handler->create($type);
     $xml->setVar('encoding', $xml_charset);
-    $xml->setVar('title', $xoopsConfig['sitename'] . ' :: ' . $pagetitle, 'UTF-8', $xml_charset, true);
+    $xml->setVar('title', $xoopsConfig['sitename'].' :: '.$pagetitle, 'UTF-8', $xml_charset, true);
     $xml->setVar('description', $rssdesc, true);
     $xml->setVar('descriptionHtmlSyndicated', true);
     $xml->setVar('link', $xml_link);
-    $xml->setVar('syndicationURL', XOOPS_URL . '/' . xoops_getenv('PHP_SELF'));
+    $xml->setVar('syndicationURL', XOOPS_URL.'/'.xoops_getenv('PHP_SELF'));
     $xml->setVar('webmaster', checkEmail($xoopsConfig['adminmail'], true));
     $xml->setVar('editor', checkEmail($xoopsConfig['adminmail'], true));
     $xml->setVar('category', $xoopsModule->getVar('name'), true);
     $xml->setVar('generator', $xoopsModule->getInfo('version'));
     $xml->setVar('language', _LANGCODE);
 
-    $dimention = @getimagesize(XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/'
+    $dimention = @getimagesize(XOOPS_ROOT_PATH.'/modules/'.$GLOBALS['moddirname'].'/'
                                . $xoopsModule->getInfo('image'));
     $image     = array(
         'width'       => $dimention[0],
         'height'      => $dimention[1],
-        'title'       => $xoopsConfig['sitename'] . ' :: ' . $pagetitle,
-        'url'         => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/' . $xoopsModule->getInfo('image'),
-        'link'        => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/',
+        'title'       => $xoopsConfig['sitename'].' :: '.$pagetitle,
+        'url'         => XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/'.$xoopsModule->getInfo('image'),
+        'link'        => XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/',
         'description' => $rssdesc
     );
     $xml->setImage($image);
@@ -210,11 +210,11 @@ 
     */
     $xml->addItems($items);
 
-    $dummy_content = $xml_handler->display($xml, XOOPS_CACHE_PATH . '/' . $GLOBALS['moddirname'] . '.xml.tmp');
+    $dummy_content = $xml_handler->display($xml, XOOPS_CACHE_PATH.'/'.$GLOBALS['moddirname'].'.xml.tmp');
 
     $tpl->assign_by_ref('dummy_content', $dummy_content);
 }
 //$content = ob_get_contents();
 ob_end_clean();
-header('Content-Type:text/xml; charset=' . $xml_charset);
+header('Content-Type:text/xml; charset='.$xml_charset);
 $tpl->display('db:system_dummy.tpl', $xoopsCachedTemplateId);

blocks/block.php

Indentation +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 
 $current_path = __FILE__;
 if (DIRECTORY_SEPARATOR !== '/') {
-    $current_path = str_replace(strpos($current_path, "\\\\", 2) ? "\\\\" : DIRECTORY_SEPARATOR, '/', $current_path);
+	$current_path = str_replace(strpos($current_path, "\\\\", 2) ? "\\\\" : DIRECTORY_SEPARATOR, '/', $current_path);
 }
 $url_arr = explode('/', strstr($current_path, '/modules/'));
 include XOOPS_ROOT_PATH . '/modules/' . $url_arr[2] . '/include/vars.php';

Spacing +2 added lines, -2 removed lines

@@ -32,8 +32,8 @@
     $current_path = str_replace(strpos($current_path, "\\\\", 2) ? "\\\\" : DIRECTORY_SEPARATOR, '/', $current_path);
 }
 $url_arr = explode('/', strstr($current_path, '/modules/'));
-include XOOPS_ROOT_PATH . '/modules/' . $url_arr[2] . '/include/vars.php';
-include_once XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/include/functions.php';
+include XOOPS_ROOT_PATH.'/modules/'.$url_arr[2].'/include/vars.php';
+include_once XOOPS_ROOT_PATH.'/modules/'.$GLOBALS['moddirname'].'/include/functions.php';
 
 /**
  * Functions handling module blocks