Merge branch 'master' of https://github.com/iForumModule/iforum

� Conflicts:
�	admin/admin_forum_manager.php
�	class/art/object.php
�	class/art/object.recon.php
�	class/art/object.render.php
�	class/art/object.stats.php
�	class/art/object.write.php
�	class/compat/class/xoopsform/formeditor.php
�	class/compat/class/xoopsform/formselecteditor.php
�	class/compat/kernel/rank.php
�	class/digest.php
�	class/iforumtree.php
�	class/karma.php
�	class/permission.php
�	class/readforum.php
�	class/readtopic.php
�	class/topic.php
�	class/transfer.php
�	class/xmlrss.php
�	icms_version.php
�	post.php

Author: fiammybe

admin/about.php

@@ -1,29 +1,29 @@
-<?php
-/**
-* iForum - a bulletin Board (Forum) for ImpressCMS
-*
-* Based upon CBB 3.08
-*
-* @copyright  http://www.xoops.org/ The XOOPS Project
-* @copyright  http://xoopsforge.com The XOOPS FORGE Project
-* @copyright  http://xoops.org.cn The XOOPS CHINESE Project
-* @copyright  XOOPS_copyrights.txt
-* @copyright  readme.txt
-* @copyright  http://www.impresscms.org/ The ImpressCMS Project
-* @license   GNU General Public License (GPL)
-*     a copy of the GNU license is enclosed.
-* ----------------------------------------------------------------------------------------------------------
-* @package  CBB - XOOPS Community Bulletin Board
-* @since   3.08
-* @author  phppp
-* ----------------------------------------------------------------------------------------------------------
-*     iForum - a bulletin Board (Forum) for ImpressCMS
-* @since   1.00
-* @author  modified by stranger
-* @version  $Id$
-*/
- 
-include_once 'admin_header.php';
-
-$aboutObj = new icms_ipf_About();
+<?php
+/**
+* iForum - a bulletin Board (Forum) for ImpressCMS
+*
+* Based upon CBB 3.08
+*
+* @copyright  http://www.xoops.org/ The XOOPS Project
+* @copyright  http://xoopsforge.com The XOOPS FORGE Project
+* @copyright  http://xoops.org.cn The XOOPS CHINESE Project
+* @copyright  XOOPS_copyrights.txt
+* @copyright  readme.txt
+* @copyright  http://www.impresscms.org/ The ImpressCMS Project
+* @license   GNU General Public License (GPL)
+*     a copy of the GNU license is enclosed.
+* ----------------------------------------------------------------------------------------------------------
+* @package  CBB - XOOPS Community Bulletin Board
+* @since   3.08
+* @author  phppp
+* ----------------------------------------------------------------------------------------------------------
+*     iForum - a bulletin Board (Forum) for ImpressCMS
+* @since   1.00
+* @author  modified by stranger
+* @version  $Id$
+*/
+ 
+include_once 'admin_header.php';
+
+$aboutObj = new icms_ipf_About();
 $aboutObj->render();

admin/admin_blocks.php

@@ -1,27 +1,27 @@
-<?php
-/**
-* iForum - a bulletin Board (Forum) for ImpressCMS
-*
-* Based upon CBB 3.08
-*
-* @copyright  http://www.xoops.org/ The XOOPS Project
-* @copyright  http://xoopsforge.com The XOOPS FORGE Project
-* @copyright  http://xoops.org.cn The XOOPS CHINESE Project
-* @copyright  XOOPS_copyrights.txt
-* @copyright  readme.txt
-* @copyright  http://www.impresscms.org/ The ImpressCMS Project
-* @license   GNU General Public License (GPL)
-*     a copy of the GNU license is enclosed.
-* ----------------------------------------------------------------------------------------------------------
-* @package  CBB - XOOPS Community Bulletin Board
-* @since   3.08
-* @author  phppp
-* ----------------------------------------------------------------------------------------------------------
-*     iForum - a bulletin Board (Forum) for ImpressCMS
-* @since   1.00
-* @author  modified by stranger
-* @version  $Id$
-*/
-
-include "admin_header.php";
-header("Location: " . ICMS_URL . "/modules/system/admin.php?fct=blocksadmin&filtersel=mid&filtersel2=".$icmsModule->getVar("mid"));
+<?php
+/**
+* iForum - a bulletin Board (Forum) for ImpressCMS
+*
+* Based upon CBB 3.08
+*
+* @copyright  http://www.xoops.org/ The XOOPS Project
+* @copyright  http://xoopsforge.com The XOOPS FORGE Project
+* @copyright  http://xoops.org.cn The XOOPS CHINESE Project
+* @copyright  XOOPS_copyrights.txt
+* @copyright  readme.txt
+* @copyright  http://www.impresscms.org/ The ImpressCMS Project
+* @license   GNU General Public License (GPL)
+*     a copy of the GNU license is enclosed.
+* ----------------------------------------------------------------------------------------------------------
+* @package  CBB - XOOPS Community Bulletin Board
+* @since   3.08
+* @author  phppp
+* ----------------------------------------------------------------------------------------------------------
+*     iForum - a bulletin Board (Forum) for ImpressCMS
+* @since   1.00
+* @author  modified by stranger
+* @version  $Id$
+*/
+
+include "admin_header.php";
+header("Location: " . ICMS_URL . "/modules/system/admin.php?fct=blocksadmin&filtersel=mid&filtersel2=".$icmsModule->getVar("mid"));