mambax7 / newbb5

class/CategoryHandler.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
         if (!$valid_ids = $this->getIdsByPermission($permission)) {
             return $categories;
         }
-        $criteria = new \Criteria('cat_id', '(' . implode(', ', $valid_ids) . ')', 'IN');
+        $criteria = new \Criteria('cat_id', '('.implode(', ', $valid_ids).')', 'IN');
         $criteria->setSort('cat_order');
         $categories = $this->getAll($criteria, $tags, $asObject);
 

Indentation +132 added lines, -132 removed lines

@@ -19,136 +19,136 @@
  */
 class CategoryHandler extends \XoopsPersistableObjectHandler
 {
-    /**
-     * @param null|\XoopsDatabase $db
-     */
-    public function __construct(\XoopsDatabase $db)
-    {
-        parent::__construct($db, 'newbb_categories', Category::class, 'cat_id', 'cat_title');
-    }
-
-    /**
-     * @param  string $perm
-     * @return mixed
-     */
-    public function getIdsByPermission($perm = 'access')
-    {
-        /** var Newbb\PermissionHandler $permHandler */
-        $permHandler = Newbb\Helper::getInstance()->getHandler('Permission');
-        return $permHandler->getCategories($perm);
-    }
-
-    /**
-     * @param  string $permission
-     * @param  null   $tags
-     * @param  bool   $asObject
-     * @return array
-     */
-    public function &getByPermission($permission = 'access', $tags = null, $asObject = true)
-    {
-        $categories = [];
-        if (!$valid_ids = $this->getIdsByPermission($permission)) {
-            return $categories;
-        }
-        $criteria = new \Criteria('cat_id', '(' . implode(', ', $valid_ids) . ')', 'IN');
-        $criteria->setSort('cat_order');
-        $categories = $this->getAll($criteria, $tags, $asObject);
-
-        return $categories;
-    }
-
-    /**
-     * @param \XoopsObject $category
-     * @param  bool        $force
-     * @return mixed
-     */
-    public function insert(\XoopsObject $category, $force = true)
-    {
-        $className = Category::class;
-        if (!($category instanceof $className)) {
-            return false;
-        }
-        parent::insert($category, $force);
-        if ($category->isNew()) {
-            $this->applyPermissionTemplate($category);
-        }
-
-        return $category->getVar('cat_id');
-    }
-
-    /**
-     * @param \XoopsObject $category
-     * @param  bool        $force
-     * @return bool|mixed
-     * @internal param Category $category
-     */
-    public function delete(\XoopsObject $category, $force = false)//delete(Category $category)
-    {
-        $className = Category::class;
-        if (!($category instanceof $className)) {
-            return false;
-        }
-        /** @var Newbb\ForumHandler $forumHandler */
-        $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
-        $forumHandler->deleteAll(new \Criteria('cat_id', $category->getVar('cat_id')), true, true);
-        if ($result = parent::delete($category)) {
-            // Delete group permissions
-            return $this->deletePermission($category);
-        } else {
-            $category->setErrors('delete category error');
-
-            return false;
-        }
-    }
-
-    /**
-     * Check permission for a category
-     *
-     * @param  Category|int $category object or id
-     * @param  string       $perm     permission name
-     *
-     * @return bool
-     */
-    public function getPermission($category, $perm = 'access')
-    {
-        if ($GLOBALS['xoopsUserIsAdmin'] && 'newbb' === $GLOBALS['xoopsModule']->getVar('dirname')) {
-            return true;
-        }
-
-        $cat_id = is_object($category) ? $category->getVar('cat_id') : (int)$category;
-        /** @var PermissionHandler $permHandler */
-        $permHandler = Newbb\Helper::getInstance()->getHandler('Permission');
-        return $permHandler->getPermission('category', $perm, $cat_id);
-    }
-
-    /**
-     * @param Category $category
-     * @return mixed
-     */
-    public function deletePermission(Category $category)
-    {
-        /** @var PermissionHandler $permHandler */
-        $permHandler = Newbb\Helper::getInstance()->getHandler('Permission');
-        return $permHandler->deleteByCategory($category->getVar('cat_id'));
-    }
-
-    /**
-     * @param Category $category
-     * @return mixed
-     */
-    public function applyPermissionTemplate(Category $category)
-    {
-        /** @var PermissionHandler $permHandler */
-        $permHandler = Newbb\Helper::getInstance()->getHandler('Permission');
-        return $permHandler->setCategoryPermission($category->getVar('cat_id'));
-    }
-
-    /**
-     * @param  mixed $object
-     * @return bool
-     */
-    public function synchronization($object = null)
-    {
-        return true;
-    }
+	/**
+	 * @param null|\XoopsDatabase $db
+	 */
+	public function __construct(\XoopsDatabase $db)
+	{
+		parent::__construct($db, 'newbb_categories', Category::class, 'cat_id', 'cat_title');
+	}
+
+	/**
+	 * @param  string $perm
+	 * @return mixed
+	 */
+	public function getIdsByPermission($perm = 'access')
+	{
+		/** var Newbb\PermissionHandler $permHandler */
+		$permHandler = Newbb\Helper::getInstance()->getHandler('Permission');
+		return $permHandler->getCategories($perm);
+	}
+
+	/**
+	 * @param  string $permission
+	 * @param  null   $tags
+	 * @param  bool   $asObject
+	 * @return array
+	 */
+	public function &getByPermission($permission = 'access', $tags = null, $asObject = true)
+	{
+		$categories = [];
+		if (!$valid_ids = $this->getIdsByPermission($permission)) {
+			return $categories;
+		}
+		$criteria = new \Criteria('cat_id', '(' . implode(', ', $valid_ids) . ')', 'IN');
+		$criteria->setSort('cat_order');
+		$categories = $this->getAll($criteria, $tags, $asObject);
+
+		return $categories;
+	}
+
+	/**
+	 * @param \XoopsObject $category
+	 * @param  bool        $force
+	 * @return mixed
+	 */
+	public function insert(\XoopsObject $category, $force = true)
+	{
+		$className = Category::class;
+		if (!($category instanceof $className)) {
+			return false;
+		}
+		parent::insert($category, $force);
+		if ($category->isNew()) {
+			$this->applyPermissionTemplate($category);
+		}
+
+		return $category->getVar('cat_id');
+	}
+
+	/**
+	 * @param \XoopsObject $category
+	 * @param  bool        $force
+	 * @return bool|mixed
+	 * @internal param Category $category
+	 */
+	public function delete(\XoopsObject $category, $force = false)//delete(Category $category)
+	{
+		$className = Category::class;
+		if (!($category instanceof $className)) {
+			return false;
+		}
+		/** @var Newbb\ForumHandler $forumHandler */
+		$forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
+		$forumHandler->deleteAll(new \Criteria('cat_id', $category->getVar('cat_id')), true, true);
+		if ($result = parent::delete($category)) {
+			// Delete group permissions
+			return $this->deletePermission($category);
+		} else {
+			$category->setErrors('delete category error');
+
+			return false;
+		}
+	}
+
+	/**
+	 * Check permission for a category
+	 *
+	 * @param  Category|int $category object or id
+	 * @param  string       $perm     permission name
+	 *
+	 * @return bool
+	 */
+	public function getPermission($category, $perm = 'access')
+	{
+		if ($GLOBALS['xoopsUserIsAdmin'] && 'newbb' === $GLOBALS['xoopsModule']->getVar('dirname')) {
+			return true;
+		}
+
+		$cat_id = is_object($category) ? $category->getVar('cat_id') : (int)$category;
+		/** @var PermissionHandler $permHandler */
+		$permHandler = Newbb\Helper::getInstance()->getHandler('Permission');
+		return $permHandler->getPermission('category', $perm, $cat_id);
+	}
+
+	/**
+	 * @param Category $category
+	 * @return mixed
+	 */
+	public function deletePermission(Category $category)
+	{
+		/** @var PermissionHandler $permHandler */
+		$permHandler = Newbb\Helper::getInstance()->getHandler('Permission');
+		return $permHandler->deleteByCategory($category->getVar('cat_id'));
+	}
+
+	/**
+	 * @param Category $category
+	 * @return mixed
+	 */
+	public function applyPermissionTemplate(Category $category)
+	{
+		/** @var PermissionHandler $permHandler */
+		$permHandler = Newbb\Helper::getInstance()->getHandler('Permission');
+		return $permHandler->setCategoryPermission($category->getVar('cat_id'));
+	}
+
+	/**
+	 * @param  mixed $object
+	 * @return bool
+	 */
+	public function synchronization($object = null)
+	{
+		return true;
+	}
 }

class/UserstatsHandler.php

Spacing +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
         if (empty($id)) {
             return null;
         }
-        $sql = 'SELECT * FROM ' . $this->table . ' WHERE ' . $this->keyName . ' = ' . (int)$id;
+        $sql = 'SELECT * FROM '.$this->table.' WHERE '.$this->keyName.' = '.(int)$id;
         if (!$result = $this->db->query($sql)) {
             return null;
         }

Indentation +62 added lines, -62 removed lines

@@ -20,47 +20,47 @@ 
  */
 class UserstatsHandler extends \XoopsPersistableObjectHandler
 {
-    /**
-     * @param \XoopsDatabase $db
-     */
-    public function __construct(\XoopsDatabase $db)
-    {
-        parent::__construct($db, 'newbb_user_stats', Userstats::class, 'uid', '');
-    }
-
-    /**
-     * @param  null $db
-     * @return UserstatsHandler
-     */
-    public static function getInstance($db = null)
-    {
-        static $instance;
-        if (null === $instance) {
-            $instance = new static($db);
-        }
-
-        return $instance;
-    }
-
-    /**
-     * @param  mixed $id
-     * @param  null  $fields
-     * @return null|\XoopsObject
-     */
-    public function get($id = null, $fields = null) //get($id)
-    {
-        $object = null;
-        if (!$id = (int)$id) {
-            return $object;
-        }
-        $object = $this->create(false);
-        $object->setVar($this->keyName, $id);
-        if (!$row = $this->getStats($id)) {
-            return $object;
-        }
-        $object->assignVars($row);
-
-        /*
+	/**
+	 * @param \XoopsDatabase $db
+	 */
+	public function __construct(\XoopsDatabase $db)
+	{
+		parent::__construct($db, 'newbb_user_stats', Userstats::class, 'uid', '');
+	}
+
+	/**
+	 * @param  null $db
+	 * @return UserstatsHandler
+	 */
+	public static function getInstance($db = null)
+	{
+		static $instance;
+		if (null === $instance) {
+			$instance = new static($db);
+		}
+
+		return $instance;
+	}
+
+	/**
+	 * @param  mixed $id
+	 * @param  null  $fields
+	 * @return null|\XoopsObject
+	 */
+	public function get($id = null, $fields = null) //get($id)
+	{
+		$object = null;
+		if (!$id = (int)$id) {
+			return $object;
+		}
+		$object = $this->create(false);
+		$object->setVar($this->keyName, $id);
+		if (!$row = $this->getStats($id)) {
+			return $object;
+		}
+		$object->assignVars($row);
+
+		/*
         $sql = "SELECT * FROM " . $this->table . " WHERE ".$this->keyName." = " . $id;
         if (!$result = $this->db->query($sql)) {
             return $object;
@@ -70,27 +70,27 @@ 
         }
         */
 
-        return $object;
-    }
-
-    /**
-     * @param $id
-     * @return null|array
-     */
-    public function getStats($id)
-    {
-        if (empty($id)) {
-            return null;
-        }
-        $sql = 'SELECT * FROM ' . $this->table . ' WHERE ' . $this->keyName . ' = ' . (int)$id;
-        if (!$result = $this->db->query($sql)) {
-            return null;
-        }
-        $row = $this->db->fetchArray($result);
-
-        return $row;
-    }
-    /*
+		return $object;
+	}
+
+	/**
+	 * @param $id
+	 * @return null|array
+	 */
+	public function getStats($id)
+	{
+		if (empty($id)) {
+			return null;
+		}
+		$sql = 'SELECT * FROM ' . $this->table . ' WHERE ' . $this->keyName . ' = ' . (int)$id;
+		if (!$result = $this->db->query($sql)) {
+			return null;
+		}
+		$row = $this->db->fetchArray($result);
+
+		return $row;
+	}
+	/*
         function insert(\XoopsObject $object, $force = true)
         {
             if (!$object->isDirty()) {

class/ReportHandler.php

Spacing +6 added lines, -6 removed lines

@@ -40,7 +40,7 @@ 
         if (!is_array($posts)) {
             $posts = [$posts];
         }
-        $post_criteria = new \Criteria('post_id', '(' . implode(', ', $posts) . ')', 'IN');
+        $post_criteria = new \Criteria('post_id', '('.implode(', ', $posts).')', 'IN');
         $ret           = $this->getAll($post_criteria);
 
         return $ret;
@@ -79,18 +79,18 @@ 
         if (empty($start)) {
             $start = 0;
         }
-        $result_criteria = ' AND r.report_result = ' . $report_result;
+        $result_criteria = ' AND r.report_result = '.$report_result;
 
         if ($forums) {
             $forumCriteria = '';
         } elseif (!is_array($forums)) {
             $forums        = [$forums];
-            $forumCriteria = ' AND p.forum_id IN (' . implode(',', $forums) . ')';
+            $forumCriteria = ' AND p.forum_id IN ('.implode(',', $forums).')';
         }
-        $tables_criteria = ' FROM ' . $this->db->prefix('newbb_report') . ' r, ' . $this->db->prefix('newbb_posts') . ' p WHERE r.post_id= p.post_id';
+        $tables_criteria = ' FROM '.$this->db->prefix('newbb_report').' r, '.$this->db->prefix('newbb_posts').' p WHERE r.post_id= p.post_id';
 
         if ($report_id) {
-            $result = $this->db->query('SELECT COUNT(*) as report_count' . $tables_criteria . $forumCriteria . $result_criteria . " AND report_id $operator_for_position $report_id" . $order_criteria);
+            $result = $this->db->query('SELECT COUNT(*) as report_count'.$tables_criteria.$forumCriteria.$result_criteria." AND report_id $operator_for_position $report_id".$order_criteria);
             if ($result) {
                 $row = $this->db->fetchArray($result);
             }
@@ -98,7 +98,7 @@ 
             $start    = (int)($position / $perpage) * $perpage;
         }
 
-        $sql    = 'SELECT r.*, p.subject, p.topic_id, p.forum_id' . $tables_criteria . $forumCriteria . $result_criteria . $order_criteria;
+        $sql    = 'SELECT r.*, p.subject, p.topic_id, p.forum_id'.$tables_criteria.$forumCriteria.$result_criteria.$order_criteria;
         $result = $this->db->query($sql, $perpage, $start);
         $ret    = [];
         //$reportHandler =  Newbb\Helper::getInstance()->getHandler('Report');

Indentation +100 added lines, -100 removed lines

@@ -19,114 +19,114 @@
  */
 class ReportHandler extends \XoopsPersistableObjectHandler
 {
-    /**
-     * @param \XoopsDatabase $db
-     */
-    public function __construct(\XoopsDatabase $db)
-    {
-        parent::__construct($db, 'newbb_report', Report::class, 'report_id', '');
-    }
+	/**
+	 * @param \XoopsDatabase $db
+	 */
+	public function __construct(\XoopsDatabase $db)
+	{
+		parent::__construct($db, 'newbb_report', Report::class, 'report_id', '');
+	}
 
-    /**
-     * @param $posts
-     * @return array
-     */
-    public function getByPost($posts)
-    {
-        $ret = [];
-        if (!$posts) {
-            return $ret;
-        }
-        if (!is_array($posts)) {
-            $posts = [$posts];
-        }
-        $post_criteria = new \Criteria('post_id', '(' . implode(', ', $posts) . ')', 'IN');
-        $ret           = $this->getAll($post_criteria);
+	/**
+	 * @param $posts
+	 * @return array
+	 */
+	public function getByPost($posts)
+	{
+		$ret = [];
+		if (!$posts) {
+			return $ret;
+		}
+		if (!is_array($posts)) {
+			$posts = [$posts];
+		}
+		$post_criteria = new \Criteria('post_id', '(' . implode(', ', $posts) . ')', 'IN');
+		$ret           = $this->getAll($post_criteria);
 
-        return $ret;
-    }
+		return $ret;
+	}
 
-    /**
-     * @param  int|array    $forums
-     * @param  string $order
-     * @param  int    $perpage
-     * @param         $start
-     * @param  int    $report_result
-     * @param  int    $report_id
-     * @return array
-     */
-    public function getAllReports(
-        $forums = 0,
-        $order = 'ASC',
-        $perpage = 0,
-        &$start,
-        $report_result = 0,
-        $report_id = 0
-    ) {
-        $forumCriteria = '';
-        $row           = [];
-        if ('DESC' === $order) {
-            $operator_for_position = '>';
-        } else {
-            $order                 = 'ASC';
-            $operator_for_position = '<';
-        }
-        $order_criteria = " ORDER BY r.report_id $order";
+	/**
+	 * @param  int|array    $forums
+	 * @param  string $order
+	 * @param  int    $perpage
+	 * @param         $start
+	 * @param  int    $report_result
+	 * @param  int    $report_id
+	 * @return array
+	 */
+	public function getAllReports(
+		$forums = 0,
+		$order = 'ASC',
+		$perpage = 0,
+		&$start,
+		$report_result = 0,
+		$report_id = 0
+	) {
+		$forumCriteria = '';
+		$row           = [];
+		if ('DESC' === $order) {
+			$operator_for_position = '>';
+		} else {
+			$order                 = 'ASC';
+			$operator_for_position = '<';
+		}
+		$order_criteria = " ORDER BY r.report_id $order";
 
-        if ($perpage <= 0) {
-            $perpage = 10;
-        }
-        if (empty($start)) {
-            $start = 0;
-        }
-        $result_criteria = ' AND r.report_result = ' . $report_result;
+		if ($perpage <= 0) {
+			$perpage = 10;
+		}
+		if (empty($start)) {
+			$start = 0;
+		}
+		$result_criteria = ' AND r.report_result = ' . $report_result;
 
-        if ($forums) {
-            $forumCriteria = '';
-        } elseif (!is_array($forums)) {
-            $forums        = [$forums];
-            $forumCriteria = ' AND p.forum_id IN (' . implode(',', $forums) . ')';
-        }
-        $tables_criteria = ' FROM ' . $this->db->prefix('newbb_report') . ' r, ' . $this->db->prefix('newbb_posts') . ' p WHERE r.post_id= p.post_id';
+		if ($forums) {
+			$forumCriteria = '';
+		} elseif (!is_array($forums)) {
+			$forums        = [$forums];
+			$forumCriteria = ' AND p.forum_id IN (' . implode(',', $forums) . ')';
+		}
+		$tables_criteria = ' FROM ' . $this->db->prefix('newbb_report') . ' r, ' . $this->db->prefix('newbb_posts') . ' p WHERE r.post_id= p.post_id';
 
-        if ($report_id) {
-            $result = $this->db->query('SELECT COUNT(*) as report_count' . $tables_criteria . $forumCriteria . $result_criteria . " AND report_id $operator_for_position $report_id" . $order_criteria);
-            if ($result) {
-                $row = $this->db->fetchArray($result);
-            }
-            $position = $row['report_count'];
-            $start    = (int)($position / $perpage) * $perpage;
-        }
+		if ($report_id) {
+			$result = $this->db->query('SELECT COUNT(*) as report_count' . $tables_criteria . $forumCriteria . $result_criteria . " AND report_id $operator_for_position $report_id" . $order_criteria);
+			if ($result) {
+				$row = $this->db->fetchArray($result);
+			}
+			$position = $row['report_count'];
+			$start    = (int)($position / $perpage) * $perpage;
+		}
 
-        $sql    = 'SELECT r.*, p.subject, p.topic_id, p.forum_id' . $tables_criteria . $forumCriteria . $result_criteria . $order_criteria;
-        $result = $this->db->query($sql, $perpage, $start);
-        $ret    = [];
-        //$reportHandler =  Newbb\Helper::getInstance()->getHandler('Report');
-        while (false !== ($myrow = $this->db->fetchArray($result))) {
-            $ret[] = $myrow; // return as array
-        }
+		$sql    = 'SELECT r.*, p.subject, p.topic_id, p.forum_id' . $tables_criteria . $forumCriteria . $result_criteria . $order_criteria;
+		$result = $this->db->query($sql, $perpage, $start);
+		$ret    = [];
+		//$reportHandler =  Newbb\Helper::getInstance()->getHandler('Report');
+		while (false !== ($myrow = $this->db->fetchArray($result))) {
+			$ret[] = $myrow; // return as array
+		}
 
-        return $ret;
-    }
+		return $ret;
+	}
 
-    /**
-     *
-     */
-    public function synchronization()
-    {
-        //        return;
-    }
+	/**
+	 *
+	 */
+	public function synchronization()
+	{
+		//        return;
+	}
 
-    /**
-     * clean orphan items from database
-     *
-     * @param  string $table_link
-     * @param  string $field_link
-     * @param  string $field_object
-     * @return bool   true on success
-     */
-    public function cleanOrphan($table_link = '', $field_link = '', $field_object = '') //cleanOrphan()
-    {
-        return parent::cleanOrphan($this->db->prefix('newbb_posts'), 'post_id');
-    }
+	/**
+	 * clean orphan items from database
+	 *
+	 * @param  string $table_link
+	 * @param  string $field_link
+	 * @param  string $field_object
+	 * @return bool   true on success
+	 */
+	public function cleanOrphan($table_link = '', $field_link = '', $field_object = '') //cleanOrphan()
+	{
+		return parent::cleanOrphan($this->db->prefix('newbb_posts'), 'post_id');
+	}
 }

class/Common/Breadcrumb.php

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
         require_once $GLOBALS['xoops']->path('class/template.php');
         $breadcrumbTpl = new \XoopsTpl();
         $breadcrumbTpl->assign('breadcrumb', $this->bread);
-        $html = $breadcrumbTpl->fetch('db:' . $this->dirname . '_common_breadcrumb.tpl');
+        $html = $breadcrumbTpl->fetch('db:'.$this->dirname.'_common_breadcrumb.tpl');
         unset($breadcrumbTpl);
 
         return $html;

Indentation +39 added lines, -39 removed lines

@@ -31,49 +31,49 @@
  */
 class Breadcrumb
 {
-    /** @var string */
-    private $dirname;
+	/** @var string */
+	private $dirname;
 
-    /** @var array */
-    private $bread = [];
+	/** @var array */
+	private $bread = [];
 
-    public function __construct()
-    {
-        $this->dirname = basename(dirname(__DIR__));
-    }
+	public function __construct()
+	{
+		$this->dirname = basename(dirname(__DIR__));
+	}
 
-    /**
-     * Add link to breadcrumb
-     *
-     * @param string $title
-     * @param string $link
-     */
-    public function addLink($title = '', $link = '')
-    {
-        $this->bread[] = [
-            'link'  => $link,
-            'title' => $title
-        ];
-    }
+	/**
+	 * Add link to breadcrumb
+	 *
+	 * @param string $title
+	 * @param string $link
+	 */
+	public function addLink($title = '', $link = '')
+	{
+		$this->bread[] = [
+			'link'  => $link,
+			'title' => $title
+		];
+	}
 
-    /**
-     * Render Pedigree BreadCrumb
-     *
-     * @return string
-     */
-    public function render()
-    {
-        if (!isset($GLOBALS['xoTheme']) || !is_object($GLOBALS['xoTheme'])) {
-            require_once $GLOBALS['xoops']->path('class/theme.php');
-            $GLOBALS['xoTheme'] = new \xos_opal_Theme();
-        }
+	/**
+	 * Render Pedigree BreadCrumb
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+		if (!isset($GLOBALS['xoTheme']) || !is_object($GLOBALS['xoTheme'])) {
+			require_once $GLOBALS['xoops']->path('class/theme.php');
+			$GLOBALS['xoTheme'] = new \xos_opal_Theme();
+		}
 
-        require_once $GLOBALS['xoops']->path('class/template.php');
-        $breadcrumbTpl = new \XoopsTpl();
-        $breadcrumbTpl->assign('breadcrumb', $this->bread);
-        $html = $breadcrumbTpl->fetch('db:' . $this->dirname . '_common_breadcrumb.tpl');
-        unset($breadcrumbTpl);
+		require_once $GLOBALS['xoops']->path('class/template.php');
+		$breadcrumbTpl = new \XoopsTpl();
+		$breadcrumbTpl->assign('breadcrumb', $this->bread);
+		$html = $breadcrumbTpl->fetch('db:' . $this->dirname . '_common_breadcrumb.tpl');
+		unset($breadcrumbTpl);
 
-        return $html;
-    }
+		return $html;
+	}
 }

class/Migrate.php

Spacing +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
                 $this->synchronizeTable($tableName);
                 $updateTable = $GLOBALS['xoopsDB']->prefix($tableName);
                 $joinTable   = $GLOBALS['xoopsDB']->prefix($srcTableName);
-                $sql         = "UPDATE `$updateTable` t1 INNER JOIN `$joinTable` t2 ON t1.post_id = t2.post_id \n" . "SET t1.dohtml = t2.dohtml,  t1.dosmiley = t2.dosmiley, t1.doxcode = t2.doxcode\n" . '  , t1.doimage = t2.doimage, t1.dobr = t2.dobr';
+                $sql         = "UPDATE `$updateTable` t1 INNER JOIN `$joinTable` t2 ON t1.post_id = t2.post_id \n"."SET t1.dohtml = t2.dohtml,  t1.dosmiley = t2.dosmiley, t1.doxcode = t2.doxcode\n".'  , t1.doimage = t2.doimage, t1.dobr = t2.dobr';
                 $this->tableHandler->addToQueue($sql);
             }
         }

Indentation +102 added lines, -102 removed lines

@@ -22,111 +22,111 @@
  */
 class Migrate extends \Xmf\Database\Migrate
 {
-    private $renameTables = [
-        'bb_archive'     => 'newbb_archive',
-        'bb_categories'  => 'newbb_categories',
-        'bb_votedata'    => 'newbb_votedata',
-        'bb_forums'      => 'newbb_forums',
-        'bb_posts'       => 'newbb_posts',
-        'bb_posts_text'  => 'newbb_posts_text',
-        'bb_topics'      => 'newbb_topics',
-        'bb_online'      => 'newbb_online',
-        'bb_digest'      => 'newbb_digest',
-        'bb_report'      => 'newbb_report',
-        'bb_attachments' => 'newbb_attachments',
-        'bb_moderates'   => 'newbb_moderates',
-        'bb_reads_forum' => 'newbb_reads_forum',
-        'bb_reads_topic' => 'newbb_reads_topic',
-        'bb_type'        => 'newbb_type',
-        'bb_type_forum'  => 'newbb_type_forum',
-        'bb_stats'       => 'newbb_stats',
-        'bb_user_stats'  => 'newbb_user_stats',
-    ];
+	private $renameTables = [
+		'bb_archive'     => 'newbb_archive',
+		'bb_categories'  => 'newbb_categories',
+		'bb_votedata'    => 'newbb_votedata',
+		'bb_forums'      => 'newbb_forums',
+		'bb_posts'       => 'newbb_posts',
+		'bb_posts_text'  => 'newbb_posts_text',
+		'bb_topics'      => 'newbb_topics',
+		'bb_online'      => 'newbb_online',
+		'bb_digest'      => 'newbb_digest',
+		'bb_report'      => 'newbb_report',
+		'bb_attachments' => 'newbb_attachments',
+		'bb_moderates'   => 'newbb_moderates',
+		'bb_reads_forum' => 'newbb_reads_forum',
+		'bb_reads_topic' => 'newbb_reads_topic',
+		'bb_type'        => 'newbb_type',
+		'bb_type_forum'  => 'newbb_type_forum',
+		'bb_stats'       => 'newbb_stats',
+		'bb_user_stats'  => 'newbb_user_stats',
+	];
 
-    /**
-     * Migrate constructor.
-     * @throws \RuntimeException
-     * @throws \InvalidArgumentException
-     */
-    public function __construct()
-    {
-        parent::__construct('newbb');
-    }
+	/**
+	 * Migrate constructor.
+	 * @throws \RuntimeException
+	 * @throws \InvalidArgumentException
+	 */
+	public function __construct()
+	{
+		parent::__construct('newbb');
+	}
 
-    /**
-     * change table prefix if needed
-     */
-    private function changePrefix()
-    {
-        foreach ($this->renameTables as $oldName => $newName) {
-            if ($this->tableHandler->useTable($oldName)) {
-                $this->tableHandler->renameTable($oldName, $newName);
-            }
-        }
-    }
+	/**
+	 * change table prefix if needed
+	 */
+	private function changePrefix()
+	{
+		foreach ($this->renameTables as $oldName => $newName) {
+			if ($this->tableHandler->useTable($oldName)) {
+				$this->tableHandler->renameTable($oldName, $newName);
+			}
+		}
+	}
 
-    /**
-     * Change integer IPv4 column to varchar IPv6 capable
-     *
-     * @param string $tableName  table to convert
-     * @param string $columnName column with IP address
-     *
-     * @return void
-     */
-    private function convertIPAddresses($tableName, $columnName)
-    {
-        if ($this->tableHandler->useTable($tableName)) {
-            $attributes = $this->tableHandler->getColumnAttributes($tableName, $columnName);
-            if (false !== strpos($attributes, ' int(')) {
-                if (false === strpos($attributes, 'unsigned')) {
-                    $this->tableHandler->alterColumn($tableName, $columnName, " bigint(16) NOT NULL  DEFAULT '0' ");
-                    $this->tableHandler->update($tableName, [$columnName => "4294967296 + $columnName"], "WHERE $columnName < 0", false);
-                }
-                $this->tableHandler->alterColumn($tableName, $columnName, " varchar(45)  NOT NULL  DEFAULT '' ");
-                $this->tableHandler->update($tableName, [$columnName => "INET_NTOA($columnName)"], '', false);
-            }
-        }
-    }
+	/**
+	 * Change integer IPv4 column to varchar IPv6 capable
+	 *
+	 * @param string $tableName  table to convert
+	 * @param string $columnName column with IP address
+	 *
+	 * @return void
+	 */
+	private function convertIPAddresses($tableName, $columnName)
+	{
+		if ($this->tableHandler->useTable($tableName)) {
+			$attributes = $this->tableHandler->getColumnAttributes($tableName, $columnName);
+			if (false !== strpos($attributes, ' int(')) {
+				if (false === strpos($attributes, 'unsigned')) {
+					$this->tableHandler->alterColumn($tableName, $columnName, " bigint(16) NOT NULL  DEFAULT '0' ");
+					$this->tableHandler->update($tableName, [$columnName => "4294967296 + $columnName"], "WHERE $columnName < 0", false);
+				}
+				$this->tableHandler->alterColumn($tableName, $columnName, " varchar(45)  NOT NULL  DEFAULT '' ");
+				$this->tableHandler->update($tableName, [$columnName => "INET_NTOA($columnName)"], '', false);
+			}
+		}
+	}
 
-    /**
-     * Move do* columns from newbb_posts to newbb_posts_text table
-     *
-     * @return void
-     */
-    private function moveDoColumns()
-    {
-        $tableName    = 'newbb_posts_text';
-        $srcTableName = 'newbb_posts';
-        if (false !== $this->tableHandler->useTable($tableName)
-            && false !== $this->tableHandler->useTable($srcTableName)) {
-            $attributes = $this->tableHandler->getColumnAttributes($tableName, 'dohtml');
-            if (false === $attributes) {
-                $this->synchronizeTable($tableName);
-                $updateTable = $GLOBALS['xoopsDB']->prefix($tableName);
-                $joinTable   = $GLOBALS['xoopsDB']->prefix($srcTableName);
-                $sql         = "UPDATE `$updateTable` t1 INNER JOIN `$joinTable` t2 ON t1.post_id = t2.post_id \n" . "SET t1.dohtml = t2.dohtml,  t1.dosmiley = t2.dosmiley, t1.doxcode = t2.doxcode\n" . '  , t1.doimage = t2.doimage, t1.dobr = t2.dobr';
-                $this->tableHandler->addToQueue($sql);
-            }
-        }
-    }
+	/**
+	 * Move do* columns from newbb_posts to newbb_posts_text table
+	 *
+	 * @return void
+	 */
+	private function moveDoColumns()
+	{
+		$tableName    = 'newbb_posts_text';
+		$srcTableName = 'newbb_posts';
+		if (false !== $this->tableHandler->useTable($tableName)
+			&& false !== $this->tableHandler->useTable($srcTableName)) {
+			$attributes = $this->tableHandler->getColumnAttributes($tableName, 'dohtml');
+			if (false === $attributes) {
+				$this->synchronizeTable($tableName);
+				$updateTable = $GLOBALS['xoopsDB']->prefix($tableName);
+				$joinTable   = $GLOBALS['xoopsDB']->prefix($srcTableName);
+				$sql         = "UPDATE `$updateTable` t1 INNER JOIN `$joinTable` t2 ON t1.post_id = t2.post_id \n" . "SET t1.dohtml = t2.dohtml,  t1.dosmiley = t2.dosmiley, t1.doxcode = t2.doxcode\n" . '  , t1.doimage = t2.doimage, t1.dobr = t2.dobr';
+				$this->tableHandler->addToQueue($sql);
+			}
+		}
+	}
 
-    /**
-     * Perform any upfront actions before synchronizing the schema
-     *
-     * Some typical uses include
-     *   table and column renames
-     *   data conversions
-     *
-     * @return void
-     */
-    protected function preSyncActions()
-    {
-        // change 'bb' table prefix to 'newbb'
-        $this->changePrefix();
-        // columns dohtml, dosmiley, doxcode, doimage and dobr moved between tables as some point
-        $this->moveDoColumns();
-        // Convert IP address columns from int to readable varchar(45) for IPv6
-        $this->convertIPAddresses('newbb_posts', 'poster_ip');
-        $this->convertIPAddresses('newbb_report', 'reporter_ip');
-    }
+	/**
+	 * Perform any upfront actions before synchronizing the schema
+	 *
+	 * Some typical uses include
+	 *   table and column renames
+	 *   data conversions
+	 *
+	 * @return void
+	 */
+	protected function preSyncActions()
+	{
+		// change 'bb' table prefix to 'newbb'
+		$this->changePrefix();
+		// columns dohtml, dosmiley, doxcode, doimage and dobr moved between tables as some point
+		$this->moveDoColumns();
+		// Convert IP address columns from int to readable varchar(45) for IPv6
+		$this->convertIPAddresses('newbb_posts', 'poster_ip');
+		$this->convertIPAddresses('newbb_report', 'reporter_ip');
+	}
 }

class/DigestHandler.php

Spacing +8 added lines, -8 removed lines

@@ -86,7 +86,7 @@ 
         //            $start = 0;
         //        }
 
-        $sql    = 'SELECT * FROM ' . $this->db->prefix('newbb_digest') . ' ORDER BY digest_id DESC';
+        $sql    = 'SELECT * FROM '.$this->db->prefix('newbb_digest').' ORDER BY digest_id DESC';
         $result = $this->db->query($sql, $perpage, $start);
         $ret    = [];
         //        $reportHandler =  Newbb\Helper::getInstance()->getHandler('Report');
@@ -102,7 +102,7 @@ 
      */
     public function getDigestCount()
     {
-        $sql    = 'SELECT COUNT(*) AS count FROM ' . $this->db->prefix('newbb_digest');
+        $sql    = 'SELECT COUNT(*) AS count FROM '.$this->db->prefix('newbb_digest');
         $result = $this->db->query($sql);
         if (!$result) {
             return 0;
@@ -115,7 +115,7 @@ 
 
     public function getLastDigest()
     {
-        $sql    = 'SELECT MAX(digest_time) AS last_digest FROM ' . $this->db->prefix('newbb_digest');
+        $sql    = 'SELECT MAX(digest_time) AS last_digest FROM '.$this->db->prefix('newbb_digest');
         $result = $this->db->query($sql);
         if (!$result) {
             $this->last_digest = 0;
@@ -206,9 +206,9 @@ 
         $GLOBALS['xoopsUser'] = $thisUser;
 
         $accessForums    = $forumHandler->getIdsByPermission(); // get all accessible forums
-        $forumCriteria   = ' AND t.forum_id IN (' . implode(',', $accessForums) . ')';
+        $forumCriteria   = ' AND t.forum_id IN ('.implode(',', $accessForums).')';
         $approveCriteria = ' AND t.approved = 1 AND p.approved = 1';
-        $time_criteria   = ' AND t.digest_time > ' . $this->last_digest;
+        $time_criteria   = ' AND t.digest_time > '.$this->last_digest;
 
         $karma_criteria = $GLOBALS['xoopsModuleConfig']['enable_karma'] ? ' AND p.post_karma=0' : '';
         $reply_criteria = $GLOBALS['xoopsModuleConfig']['allow_require_reply'] ? ' AND p.require_reply=0' : '';
@@ -243,7 +243,7 @@ 
         if (count($uids) > 0) {
             /** @var \XoopsMemberHandler $memberHandler */
             $memberHandler = xoops_getHandler('member');
-            $user_criteria = new \Criteria('uid', '(' . implode(',', $uids) . ')', 'IN');
+            $user_criteria = new \Criteria('uid', '('.implode(',', $uids).')', 'IN');
             $users         = $memberHandler->getUsers($user_criteria, true);
         } else {
             $users = [];
@@ -261,8 +261,8 @@ 
                 $topic['uname'] = $topic['poster_name'] ?: $GLOBALS['xoopsConfig']['anonymous'];
             }
             $summary = \Xmf\Metagen::generateDescription($topic['post_text'], SUMMARY_LENGTH);
-            $author  = $topic['uname'] . ' (' . formatTimestamp($topic['topic_time']) . ')';
-            $link    = XOOPS_URL . '/modules/' . $xoopsModule->dirname() . '/viewtopic.php?topic_id=' . $topic['topic_id'] . '&forum=' . $topic['forum_id'];
+            $author  = $topic['uname'].' ('.formatTimestamp($topic['topic_time']).')';
+            $link    = XOOPS_URL.'/modules/'.$xoopsModule->dirname().'/viewtopic.php?topic_id='.$topic['topic_id'].'&forum='.$topic['forum_id'];
             $title   = $topic['topic_title'];
             $digest->addItem($title, $link, $author, $summary);
         }

Indentation +212 added lines, -212 removed lines

@@ -17,139 +17,139 @@ 
  */
 class DigestHandler extends \XoopsPersistableObjectHandler
 {
-    public $last_digest;
+	public $last_digest;
 
-    /**
-     * Constructor
-     *
-     * @param null|\XoopsDatabase $db database connection
-     */
-    public function __construct(\XoopsDatabase $db)
-    {
-        parent::__construct($db, 'newbb_digest', Digest::class, 'digest_id');
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param null|\XoopsDatabase $db database connection
+	 */
+	public function __construct(\XoopsDatabase $db)
+	{
+		parent::__construct($db, 'newbb_digest', Digest::class, 'digest_id');
+	}
 
-    /**
-     * @param  bool $isForced
-     * @return int
-     */
-    public function process($isForced = false)
-    {
-        $this->getLastDigest();
-        if (!$isForced) {
-            $status = $this->checkStatus();
-            if ($status < 1) {
-                return 1;
-            }
-        }
-        $digest = $this->create();
-        $status = $this->buildDigest($digest);
-        if (!$status) {
-            return 2;
-        }
-        $status = $this->insert($digest);
-        if (!$status) {
-            return 3;
-        }
-        $status = $this->notify($digest);
-        if (!$status) {
-            return 4;
-        }
+	/**
+	 * @param  bool $isForced
+	 * @return int
+	 */
+	public function process($isForced = false)
+	{
+		$this->getLastDigest();
+		if (!$isForced) {
+			$status = $this->checkStatus();
+			if ($status < 1) {
+				return 1;
+			}
+		}
+		$digest = $this->create();
+		$status = $this->buildDigest($digest);
+		if (!$status) {
+			return 2;
+		}
+		$status = $this->insert($digest);
+		if (!$status) {
+			return 3;
+		}
+		$status = $this->notify($digest);
+		if (!$status) {
+			return 4;
+		}
 
-        return 0;
-    }
+		return 0;
+	}
 
-    /**
-     * @param \XoopsObject $digest
-     * @return bool
-     */
-    public function notify(\XoopsObject $digest)
-    {
-        //$content                = $digest->getVar('digest_content');
-        /** @var \XoopsNotificationHandler $notificationHandler */
-        $notificationHandler    = xoops_getHandler('notification');
-        $tags['DIGEST_ID']      = $digest->getVar('digest_id');
-        $tags['DIGEST_CONTENT'] = $digest->getVar('digest_content', 'E');
-        $notificationHandler->triggerEvent('global', 0, 'digest', $tags);
+	/**
+	 * @param \XoopsObject $digest
+	 * @return bool
+	 */
+	public function notify(\XoopsObject $digest)
+	{
+		//$content                = $digest->getVar('digest_content');
+		/** @var \XoopsNotificationHandler $notificationHandler */
+		$notificationHandler    = xoops_getHandler('notification');
+		$tags['DIGEST_ID']      = $digest->getVar('digest_id');
+		$tags['DIGEST_CONTENT'] = $digest->getVar('digest_content', 'E');
+		$notificationHandler->triggerEvent('global', 0, 'digest', $tags);
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * @param        $start
-     * @param  int   $perpage
-     * @return array
-     */
-    public function getAllDigests($start = 0, $perpage = 5)
-    {
-        //        if (empty($start)) {
-        //            $start = 0;
-        //        }
+	/**
+	 * @param        $start
+	 * @param  int   $perpage
+	 * @return array
+	 */
+	public function getAllDigests($start = 0, $perpage = 5)
+	{
+		//        if (empty($start)) {
+		//            $start = 0;
+		//        }
 
-        $sql    = 'SELECT * FROM ' . $this->db->prefix('newbb_digest') . ' ORDER BY digest_id DESC';
-        $result = $this->db->query($sql, $perpage, $start);
-        $ret    = [];
-        //        $reportHandler =  Newbb\Helper::getInstance()->getHandler('Report');
-        while (false !== ($myrow = $this->db->fetchArray($result))) {
-            $ret[] = $myrow; // return as array
-        }
+		$sql    = 'SELECT * FROM ' . $this->db->prefix('newbb_digest') . ' ORDER BY digest_id DESC';
+		$result = $this->db->query($sql, $perpage, $start);
+		$ret    = [];
+		//        $reportHandler =  Newbb\Helper::getInstance()->getHandler('Report');
+		while (false !== ($myrow = $this->db->fetchArray($result))) {
+			$ret[] = $myrow; // return as array
+		}
 
-        return $ret;
-    }
+		return $ret;
+	}
 
-    /**
-     * @return int
-     */
-    public function getDigestCount()
-    {
-        $sql    = 'SELECT COUNT(*) AS count FROM ' . $this->db->prefix('newbb_digest');
-        $result = $this->db->query($sql);
-        if (!$result) {
-            return 0;
-        } else {
-            $array = $this->db->fetchArray($result);
+	/**
+	 * @return int
+	 */
+	public function getDigestCount()
+	{
+		$sql    = 'SELECT COUNT(*) AS count FROM ' . $this->db->prefix('newbb_digest');
+		$result = $this->db->query($sql);
+		if (!$result) {
+			return 0;
+		} else {
+			$array = $this->db->fetchArray($result);
 
-            return $array['count'];
-        }
-    }
+			return $array['count'];
+		}
+	}
 
-    public function getLastDigest()
-    {
-        $sql    = 'SELECT MAX(digest_time) AS last_digest FROM ' . $this->db->prefix('newbb_digest');
-        $result = $this->db->query($sql);
-        if (!$result) {
-            $this->last_digest = 0;
-        // echo "<br>no data:".$query;
-        } else {
-            $array             = $this->db->fetchArray($result);
-            $this->last_digest = isset($array['last_digest']) ? $array['last_digest'] : 0;
-        }
-    }
+	public function getLastDigest()
+	{
+		$sql    = 'SELECT MAX(digest_time) AS last_digest FROM ' . $this->db->prefix('newbb_digest');
+		$result = $this->db->query($sql);
+		if (!$result) {
+			$this->last_digest = 0;
+		// echo "<br>no data:".$query;
+		} else {
+			$array             = $this->db->fetchArray($result);
+			$this->last_digest = isset($array['last_digest']) ? $array['last_digest'] : 0;
+		}
+	}
 
-    /**
-     * @return int
-     */
-    public function checkStatus()
-    {
-        if (!isset($this->last_digest)) {
-            $this->getLastDigest();
-        }
-        $deadline  = (1 == $GLOBALS['xoopsModuleConfig']['email_digest']) ? 60 * 60 * 24 : 60 * 60 * 24 * 7;
-        $time_diff = time() - $this->last_digest;
+	/**
+	 * @return int
+	 */
+	public function checkStatus()
+	{
+		if (!isset($this->last_digest)) {
+			$this->getLastDigest();
+		}
+		$deadline  = (1 == $GLOBALS['xoopsModuleConfig']['email_digest']) ? 60 * 60 * 24 : 60 * 60 * 24 * 7;
+		$time_diff = time() - $this->last_digest;
 
-        return $time_diff - $deadline;
-    }
+		return $time_diff - $deadline;
+	}
 
-    /**
-     * @param  \XoopsObject $digest
-     * @param  bool         $force flag to force the query execution despite security settings
-     * @return mixed       object ID or false
-     */
-    public function insert(\XoopsObject $digest, $force = true)
-    {
-        $digest->setVar('digest_time', time());
-        return parent::insert($digest, $force);
-        /*
+	/**
+	 * @param  \XoopsObject $digest
+	 * @param  bool         $force flag to force the query execution despite security settings
+	 * @return mixed       object ID or false
+	 */
+	public function insert(\XoopsObject $digest, $force = true)
+	{
+		$digest->setVar('digest_time', time());
+		return parent::insert($digest, $force);
+		/*
         $content = $digest->getVar('digest_content', 'E');
 
         $id  = $this->db->genId($digest->table . '_digest_id_seq');
@@ -166,108 +166,108 @@ 
 
         return true;
         */
-    }
+	}
 
-    /**
-     * @param \XoopsObject $digest
-     * @param  bool        $force (ignored)
-     * @return bool        FALSE if failed.
-     */
-    public function delete(\XoopsObject $digest, $force = false)
-    {
-        $digest_id = $digest->getVar('digest_id');
+	/**
+	 * @param \XoopsObject $digest
+	 * @param  bool        $force (ignored)
+	 * @return bool        FALSE if failed.
+	 */
+	public function delete(\XoopsObject $digest, $force = false)
+	{
+		$digest_id = $digest->getVar('digest_id');
 
-        if (!isset($this->last_digest)) {
-            $this->getLastDigest();
-        }
-        if ($this->last_digest == $digest_id) {
-            return false;
-        } // It is not allowed to delete the last digest
+		if (!isset($this->last_digest)) {
+			$this->getLastDigest();
+		}
+		if ($this->last_digest == $digest_id) {
+			return false;
+		} // It is not allowed to delete the last digest
 
-        return parent::delete($digest, true);
-    }
+		return parent::delete($digest, true);
+	}
 
-    /**
-     * @param \XoopsObject $digest
-     * @return bool
-     */
-    public function buildDigest(\XoopsObject $digest)
-    {
-        global $xoopsModule;
+	/**
+	 * @param \XoopsObject $digest
+	 * @return bool
+	 */
+	public function buildDigest(\XoopsObject $digest)
+	{
+		global $xoopsModule;
 
-        if (!defined('SUMMARY_LENGTH')) {
-            define('SUMMARY_LENGTH', 100);
-        }
+		if (!defined('SUMMARY_LENGTH')) {
+			define('SUMMARY_LENGTH', 100);
+		}
 
-        /** @var Newbb\ForumHandler $forumHandler */
-        $forumHandler         = Newbb\Helper::getInstance()->getHandler('Forum');
-        $thisUser             = $GLOBALS['xoopsUser'];
-        $GLOBALS['xoopsUser'] = null; // To get posts accessible by anonymous
-        $GLOBALS['xoopsUser'] = $thisUser;
+		/** @var Newbb\ForumHandler $forumHandler */
+		$forumHandler         = Newbb\Helper::getInstance()->getHandler('Forum');
+		$thisUser             = $GLOBALS['xoopsUser'];
+		$GLOBALS['xoopsUser'] = null; // To get posts accessible by anonymous
+		$GLOBALS['xoopsUser'] = $thisUser;
 
-        $accessForums    = $forumHandler->getIdsByPermission(); // get all accessible forums
-        $forumCriteria   = ' AND t.forum_id IN (' . implode(',', $accessForums) . ')';
-        $approveCriteria = ' AND t.approved = 1 AND p.approved = 1';
-        $time_criteria   = ' AND t.digest_time > ' . $this->last_digest;
+		$accessForums    = $forumHandler->getIdsByPermission(); // get all accessible forums
+		$forumCriteria   = ' AND t.forum_id IN (' . implode(',', $accessForums) . ')';
+		$approveCriteria = ' AND t.approved = 1 AND p.approved = 1';
+		$time_criteria   = ' AND t.digest_time > ' . $this->last_digest;
 
-        $karma_criteria = $GLOBALS['xoopsModuleConfig']['enable_karma'] ? ' AND p.post_karma=0' : '';
-        $reply_criteria = $GLOBALS['xoopsModuleConfig']['allow_require_reply'] ? ' AND p.require_reply=0' : '';
+		$karma_criteria = $GLOBALS['xoopsModuleConfig']['enable_karma'] ? ' AND p.post_karma=0' : '';
+		$reply_criteria = $GLOBALS['xoopsModuleConfig']['allow_require_reply'] ? ' AND p.require_reply=0' : '';
 
-        $query = 'SELECT t.topic_id, t.forum_id, t.topic_title, t.topic_time, t.digest_time, p.uid, p.poster_name, pt.post_text FROM '
-                 . $this->db->prefix('newbb_topics')
-                 . ' t, '
-                 . $this->db->prefix('newbb_posts_text')
-                 . ' pt, '
-                 . $this->db->prefix('newbb_posts')
-                 . ' p WHERE t.topic_digest = 1 AND p.topic_id=t.topic_id AND p.pid=0 '
-                 . $forumCriteria
-                 . $approveCriteria
-                 . $time_criteria
-                 . $karma_criteria
-                 . $reply_criteria
-                 . ' AND pt.post_id=p.post_id ORDER BY t.digest_time DESC';
-        if (!$result = $this->db->query($query)) {
-            //echo "<br>No result:<br>$query";
-            return false;
-        }
-        $rows  = [];
-        $users = [];
-        while (false !== ($row = $this->db->fetchArray($result))) {
-            $users[$row['uid']] = 1;
-            $rows[]             = $row;
-        }
-        if (count($rows) < 1) {
-            return false;
-        }
-        $uids = array_keys($users);
-        if (count($uids) > 0) {
-            /** @var \XoopsMemberHandler $memberHandler */
-            $memberHandler = xoops_getHandler('member');
-            $user_criteria = new \Criteria('uid', '(' . implode(',', $uids) . ')', 'IN');
-            $users         = $memberHandler->getUsers($user_criteria, true);
-        } else {
-            $users = [];
-        }
+		$query = 'SELECT t.topic_id, t.forum_id, t.topic_title, t.topic_time, t.digest_time, p.uid, p.poster_name, pt.post_text FROM '
+				 . $this->db->prefix('newbb_topics')
+				 . ' t, '
+				 . $this->db->prefix('newbb_posts_text')
+				 . ' pt, '
+				 . $this->db->prefix('newbb_posts')
+				 . ' p WHERE t.topic_digest = 1 AND p.topic_id=t.topic_id AND p.pid=0 '
+				 . $forumCriteria
+				 . $approveCriteria
+				 . $time_criteria
+				 . $karma_criteria
+				 . $reply_criteria
+				 . ' AND pt.post_id=p.post_id ORDER BY t.digest_time DESC';
+		if (!$result = $this->db->query($query)) {
+			//echo "<br>No result:<br>$query";
+			return false;
+		}
+		$rows  = [];
+		$users = [];
+		while (false !== ($row = $this->db->fetchArray($result))) {
+			$users[$row['uid']] = 1;
+			$rows[]             = $row;
+		}
+		if (count($rows) < 1) {
+			return false;
+		}
+		$uids = array_keys($users);
+		if (count($uids) > 0) {
+			/** @var \XoopsMemberHandler $memberHandler */
+			$memberHandler = xoops_getHandler('member');
+			$user_criteria = new \Criteria('uid', '(' . implode(',', $uids) . ')', 'IN');
+			$users         = $memberHandler->getUsers($user_criteria, true);
+		} else {
+			$users = [];
+		}
 
-        foreach ($rows as $topic) {
-            if ($topic['uid'] > 0) {
-                if (isset($users[$topic['uid']]) && is_object($users[$topic['uid']])
-                    && $users[$topic['uid']]->isActive()) {
-                    $topic['uname'] = $users[$topic['uid']]->getVar('uname');
-                } else {
-                    $topic['uname'] = $GLOBALS['xoopsConfig']['anonymous'];
-                }
-            } else {
-                $topic['uname'] = $topic['poster_name'] ?: $GLOBALS['xoopsConfig']['anonymous'];
-            }
-            $summary = \Xmf\Metagen::generateDescription($topic['post_text'], SUMMARY_LENGTH);
-            $author  = $topic['uname'] . ' (' . formatTimestamp($topic['topic_time']) . ')';
-            $link    = XOOPS_URL . '/modules/' . $xoopsModule->dirname() . '/viewtopic.php?topic_id=' . $topic['topic_id'] . '&amp;forum=' . $topic['forum_id'];
-            $title   = $topic['topic_title'];
-            $digest->addItem($title, $link, $author, $summary);
-        }
-        $digest->buildContent();
+		foreach ($rows as $topic) {
+			if ($topic['uid'] > 0) {
+				if (isset($users[$topic['uid']]) && is_object($users[$topic['uid']])
+					&& $users[$topic['uid']]->isActive()) {
+					$topic['uname'] = $users[$topic['uid']]->getVar('uname');
+				} else {
+					$topic['uname'] = $GLOBALS['xoopsConfig']['anonymous'];
+				}
+			} else {
+				$topic['uname'] = $topic['poster_name'] ?: $GLOBALS['xoopsConfig']['anonymous'];
+			}
+			$summary = \Xmf\Metagen::generateDescription($topic['post_text'], SUMMARY_LENGTH);
+			$author  = $topic['uname'] . ' (' . formatTimestamp($topic['topic_time']) . ')';
+			$link    = XOOPS_URL . '/modules/' . $xoopsModule->dirname() . '/viewtopic.php?topic_id=' . $topic['topic_id'] . '&amp;forum=' . $topic['forum_id'];
+			$title   = $topic['topic_title'];
+			$digest->addItem($title, $link, $author, $summary);
+		}
+		$digest->buildContent();
 
-        return true;
-    }
+		return true;
+	}
 }

language/english/common.php

Spacing +35 added lines, -35 removed lines

@@ -21,49 +21,49 @@
 $moduleDirName      = basename(dirname(dirname(__DIR__)));
 $moduleDirNameUpper = strtoupper($moduleDirName);
 
-define('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS', 'GD library support: ');
-define('CO_' . $moduleDirNameUpper . '_GDLIBVERSION', 'GD Library version: ');
-define('CO_' . $moduleDirNameUpper . '_GDOFF', "<span style='font-weight: bold;'>Disabled</span> (No thumbnails available)");
-define('CO_' . $moduleDirNameUpper . '_GDON', "<span style='font-weight: bold;'>Enabled</span> (Thumbsnails available)");
-define('CO_' . $moduleDirNameUpper . '_IMAGEINFO', 'Server status');
-define('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE', 'Max post size permitted (post_max_size directive in php.ini): ');
-define('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE', 'Max upload size permitted (upload_max_filesize directive in php.ini): ');
-define('CO_' . $moduleDirNameUpper . '_MEMORYLIMIT', 'Memory limit (memory_limit directive in php.ini): ');
-define('CO_' . $moduleDirNameUpper . '_METAVERSION', "<span style='font-weight: bold;'>Downloads meta version:</span> ");
-define('CO_' . $moduleDirNameUpper . '_OFF', "<span style='font-weight: bold;'>OFF</span>");
-define('CO_' . $moduleDirNameUpper . '_ON', "<span style='font-weight: bold;'>ON</span>");
-define('CO_' . $moduleDirNameUpper . '_SERVERPATH', 'Server path to XOOPS root: ');
-define('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS', 'Server uploads status: ');
-define('CO_' . $moduleDirNameUpper . '_SPHPINI', "<span style='font-weight: bold;'>Information taken from PHP ini file:</span>");
-define('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC', 'Note. Upload path *MUST* contain the full server path of your upload folder.');
+define('CO_'.$moduleDirNameUpper.'_GDLIBSTATUS', 'GD library support: ');
+define('CO_'.$moduleDirNameUpper.'_GDLIBVERSION', 'GD Library version: ');
+define('CO_'.$moduleDirNameUpper.'_GDOFF', "<span style='font-weight: bold;'>Disabled</span> (No thumbnails available)");
+define('CO_'.$moduleDirNameUpper.'_GDON', "<span style='font-weight: bold;'>Enabled</span> (Thumbsnails available)");
+define('CO_'.$moduleDirNameUpper.'_IMAGEINFO', 'Server status');
+define('CO_'.$moduleDirNameUpper.'_MAXPOSTSIZE', 'Max post size permitted (post_max_size directive in php.ini): ');
+define('CO_'.$moduleDirNameUpper.'_MAXUPLOADSIZE', 'Max upload size permitted (upload_max_filesize directive in php.ini): ');
+define('CO_'.$moduleDirNameUpper.'_MEMORYLIMIT', 'Memory limit (memory_limit directive in php.ini): ');
+define('CO_'.$moduleDirNameUpper.'_METAVERSION', "<span style='font-weight: bold;'>Downloads meta version:</span> ");
+define('CO_'.$moduleDirNameUpper.'_OFF', "<span style='font-weight: bold;'>OFF</span>");
+define('CO_'.$moduleDirNameUpper.'_ON', "<span style='font-weight: bold;'>ON</span>");
+define('CO_'.$moduleDirNameUpper.'_SERVERPATH', 'Server path to XOOPS root: ');
+define('CO_'.$moduleDirNameUpper.'_SERVERUPLOADSTATUS', 'Server uploads status: ');
+define('CO_'.$moduleDirNameUpper.'_SPHPINI', "<span style='font-weight: bold;'>Information taken from PHP ini file:</span>");
+define('CO_'.$moduleDirNameUpper.'_UPLOADPATHDSC', 'Note. Upload path *MUST* contain the full server path of your upload folder.');
 
-define('CO_' . $moduleDirNameUpper . '_PRINT', "<span style='font-weight: bold;'>Print</span>");
-define('CO_' . $moduleDirNameUpper . '_PDF', "<span style='font-weight: bold;'>Create PDF</span>");
+define('CO_'.$moduleDirNameUpper.'_PRINT', "<span style='font-weight: bold;'>Print</span>");
+define('CO_'.$moduleDirNameUpper.'_PDF', "<span style='font-weight: bold;'>Create PDF</span>");
 
-define('CO_' . $moduleDirNameUpper . '_UPGRADEFAILED0', "Update failed - couldn't rename field '%s'");
-define('CO_' . $moduleDirNameUpper . '_UPGRADEFAILED1', "Update failed - couldn't add new fields");
-define('CO_' . $moduleDirNameUpper . '_UPGRADEFAILED2', "Update failed - couldn't rename table '%s'");
-define('CO_' . $moduleDirNameUpper . '_ERROR_COLUMN', 'Could not create column in database : %s');
-define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS', 'This module requires XOOPS %s+ (%s installed)');
-define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP', 'This module requires PHP version %s+ (%s installed)');
-define('CO_' . $moduleDirNameUpper . '_ERROR_TAG_REMOVAL', 'Could not remove tags from Tag Module');
+define('CO_'.$moduleDirNameUpper.'_UPGRADEFAILED0', "Update failed - couldn't rename field '%s'");
+define('CO_'.$moduleDirNameUpper.'_UPGRADEFAILED1', "Update failed - couldn't add new fields");
+define('CO_'.$moduleDirNameUpper.'_UPGRADEFAILED2', "Update failed - couldn't rename table '%s'");
+define('CO_'.$moduleDirNameUpper.'_ERROR_COLUMN', 'Could not create column in database : %s');
+define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_XOOPS', 'This module requires XOOPS %s+ (%s installed)');
+define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_PHP', 'This module requires PHP version %s+ (%s installed)');
+define('CO_'.$moduleDirNameUpper.'_ERROR_TAG_REMOVAL', 'Could not remove tags from Tag Module');
 
-define('CO_' . $moduleDirNameUpper . '_FOLDERS_DELETED_OK', 'Upload Folders have been deleted');
+define('CO_'.$moduleDirNameUpper.'_FOLDERS_DELETED_OK', 'Upload Folders have been deleted');
 
 // Error Msgs
-define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_DEL_PATH', 'Could not delete %s directory');
-define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_REMOVE', 'Could not delete %s');
-define('CO_' . $moduleDirNameUpper . '_ERROR_NO_PLUGIN', 'Could not load plugin');
+define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_DEL_PATH', 'Could not delete %s directory');
+define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_REMOVE', 'Could not delete %s');
+define('CO_'.$moduleDirNameUpper.'_ERROR_NO_PLUGIN', 'Could not load plugin');
 
 //Help
-define('CO_' . $moduleDirNameUpper . '_DIRNAME', basename(dirname(dirname(__DIR__))));
-define('CO_' . $moduleDirNameUpper . '_HELP_HEADER', __DIR__ . '/help/helpheader.tpl');
-define('CO_' . $moduleDirNameUpper . '_BACK_2_ADMIN', 'Back to Administration of ');
-define('CO_' . $moduleDirNameUpper . '_OVERVIEW', 'Overview');
+define('CO_'.$moduleDirNameUpper.'_DIRNAME', basename(dirname(dirname(__DIR__))));
+define('CO_'.$moduleDirNameUpper.'_HELP_HEADER', __DIR__.'/help/helpheader.tpl');
+define('CO_'.$moduleDirNameUpper.'_BACK_2_ADMIN', 'Back to Administration of ');
+define('CO_'.$moduleDirNameUpper.'_OVERVIEW', 'Overview');
 
 //define('CO_' . $moduleDirNameUpper . '_HELP_DIR', __DIR__);
 
 //help multi-page
-define('CO_' . $moduleDirNameUpper . '_DISCLAIMER', 'Disclaimer');
-define('CO_' . $moduleDirNameUpper . '_LICENSE', 'License');
-define('CO_' . $moduleDirNameUpper . '_SUPPORT', 'Support');
+define('CO_'.$moduleDirNameUpper.'_DISCLAIMER', 'Disclaimer');
+define('CO_'.$moduleDirNameUpper.'_LICENSE', 'License');
+define('CO_'.$moduleDirNameUpper.'_SUPPORT', 'Support');

language/english/admin.php

Spacing +2 added lines, -2 removed lines

@@ -178,8 +178,8 @@
 define('_AM_NEWBB_CAN_ATTACH', 'Can use attachment');
 define('_AM_NEWBB_CAN_NOAPPROVE', 'Can post directly');
 define('_AM_NEWBB_CAN_TYPE', 'Can use topic type');
-define('_AM_NEWBB_CAN_HTML', 'Can use and disable/enable HTML in posts');//irmtfan revised
-define('_AM_NEWBB_CAN_SIGNATURE', 'Can use and disable/enable signature. Default is set in profile module.');//irmtfan revised
+define('_AM_NEWBB_CAN_HTML', 'Can use and disable/enable HTML in posts'); //irmtfan revised
+define('_AM_NEWBB_CAN_SIGNATURE', 'Can use and disable/enable signature. Default is set in profile module.'); //irmtfan revised
 define('_AM_NEWBB_ACTION', 'Action');
 define('_AM_NEWBB_PERM_TEMPLATE', 'Set default permission template');
 define('_AM_NEWBB_PERM_TEMPLATE_DESC', 'Edit the following permission template so that it can be applied to a forum or a couple of forums');

Indentation +16 added lines, -16 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 //
 if (defined('NEWBB_ADMIN_DEFINED')) {
-    return;
+	return;
 } else {
-    define('NEWBB_ADMIN_DEFINED', true);
+	define('NEWBB_ADMIN_DEFINED', true);
 }
 //%%%%%%    File Name  index.php       %%%%%
 define('_AM_NEWBB_FORUMCONF', 'Forum Configuration');
@@ -75,8 +75,8 @@ 
 define('_AM_NEWBB_DIGEST_HELP_3', 'The dispatch is made only to users signed up for notification of digest topics.');
 define('_AM_NEWBB_DIGEST_HELP_4', 'After creating and sending, do not delete the created messages. Otherwise they will be generated again.');
 define(
-    '_AM_NEWBB_DIGEST_HELP_AUTO_DIGEST',
-       'To configure the automatic creation and distribution of Digest topics, you need to create a cron task on your server.<br>For example: * NIX systems: <strong>0 6 * * * wget --post-data \'foo=bar\' https://example.com/modules/newbb/digest.php</strong><br>In this example, the script will run every day at 6.00 and check if there are any new Digest topics. If they are not found, mailing will not be done.<br>If for any reason you do not have the opportunity to create a task, then it is possible to create and make the dispatch on this page manually by clicking on the button above.<br>Please note that it is not recommended to delete created mailings, otherwise they will be created and sent again.'
+	'_AM_NEWBB_DIGEST_HELP_AUTO_DIGEST',
+	   'To configure the automatic creation and distribution of Digest topics, you need to create a cron task on your server.<br>For example: * NIX systems: <strong>0 6 * * * wget --post-data \'foo=bar\' https://example.com/modules/newbb/digest.php</strong><br>In this example, the script will run every day at 6.00 and check if there are any new Digest topics. If they are not found, mailing will not be done.<br>If for any reason you do not have the opportunity to create a task, then it is possible to create and make the dispatch on this page manually by clicking on the button above.<br>Please note that it is not recommended to delete created mailings, otherwise they will be created and sent again.'
 );
 //define('_AM_NEWBB_DIGEST_PAST', '<span style="color:red;">Should be sent out %d minutes ago</span>');
 //define('_AM_NEWBB_DIGEST_NEXT', 'Need to send out in %d minutes');
@@ -324,31 +324,31 @@ 
 
 // Help tab
 define(
-    '_AM_NEWBB_HELP_CATEGORY_TAB',
-       'To create a category, use the button above and fill in all the fields on the form.<br>By default, category images are located: /modules/newbb/assets/images/category/<br>Sponsor link should be written in the following format: https://xoops.org/modules/newbb/ newBB Support. First the link, then the sponsor\'s name or other text.'
+	'_AM_NEWBB_HELP_CATEGORY_TAB',
+	   'To create a category, use the button above and fill in all the fields on the form.<br>By default, category images are located: /modules/newbb/assets/images/category/<br>Sponsor link should be written in the following format: https://xoops.org/modules/newbb/ newBB Support. First the link, then the sponsor\'s name or other text.'
 );
 define(
-    '_AM_NEWBB_HELP_FORUM_TAB',
-       'To create and manage the forums use the buttons with the right<br>To create the forum, use the \'Create forum\' button. Then fill in all the fields of the form. You can also create a subforum.<br>To move the forum between categories, use the \'Move\' button. Follow the further instructions.<br>To merge forums, use the \'Merge\' button. Follow the further instructions.<br>If you have an access rights template, then you can apply it to the forum you are creating.'
+	'_AM_NEWBB_HELP_FORUM_TAB',
+	   'To create and manage the forums use the buttons with the right<br>To create the forum, use the \'Create forum\' button. Then fill in all the fields of the form. You can also create a subforum.<br>To move the forum between categories, use the \'Move\' button. Follow the further instructions.<br>To merge forums, use the \'Merge\' button. Follow the further instructions.<br>If you have an access rights template, then you can apply it to the forum you are creating.'
 );
 define(
-    '_AM_NEWBB_HELP_PERMISSION_TAB',
-       '<strong>When setting permissions, be careful.</strong><br>After you install and apply the settings, you will automatically go to the next permissions tab.<br>Also here it is possible to create a default access rights template and apply it either to one forum or to all forums.'
+	'_AM_NEWBB_HELP_PERMISSION_TAB',
+	   '<strong>When setting permissions, be careful.</strong><br>After you install and apply the settings, you will automatically go to the next permissions tab.<br>Also here it is possible to create a default access rights template and apply it either to one forum or to all forums.'
 );
 define('_AM_NEWBB_HELP_ORDER_TAB', 'Allows you to set the order of categories and forums relative to each other.<br>The order (Weight) is set to 0 - top, 99 (and further) - bottom.');
 define('_AM_NEWBB_HELP_PRUNE_TAB', 'Allows you to clear forums from empty themes, obsolete themes, etc.<br>Also you can not delete topics that you want to clear, but transfer them to a specially created category \'Archive\' or any other.');
 define(
-    '_AM_NEWBB_HELP_REPORT_TAB',
-       'Allows you to process reports that users send to you if they believe that the message on the forum does not comply with forum rules or ethical rules.<br>You can review the report and take action in relation to the message, the author, etc.<br>When a user sends a message, moderators and administrators are notified by e-mail.'
+	'_AM_NEWBB_HELP_REPORT_TAB',
+	   'Allows you to process reports that users send to you if they believe that the message on the forum does not comply with forum rules or ethical rules.<br>You can review the report and take action in relation to the message, the author, etc.<br>When a user sends a message, moderators and administrators are notified by e-mail.'
 );
 define('_AM_NEWBB_HELP_VOTE_TAB', 'If you have the voting function enabled, here you can see the results of the voting.<br>This vote is not associated with other XOOPS modules.');
 define(
-    '_AM_NEWBB_HELP_TYPE_TAB',
-       'Allows you to create tags for highlighting themes. For example:<br><strong style="color:blue;">[Important]</strong> <strong>Topic Title</strong><br><strong style="color:red;">[ATTENTION]</strong> <strong>Topic Title</strong><br>You can set theme types when creating a theme on the user side.'
+	'_AM_NEWBB_HELP_TYPE_TAB',
+	   'Allows you to create tags for highlighting themes. For example:<br><strong style="color:blue;">[Important]</strong> <strong>Topic Title</strong><br><strong style="color:red;">[ATTENTION]</strong> <strong>Topic Title</strong><br>You can set theme types when creating a theme on the user side.'
 );
 define(
-    '_AM_NEWBB_HELP_GROUPMOD_TAB',
-       'Allows you to install users of certain groups as moderators for the entire module, and for individual categories and forums.<br>It is recommended to create separate groups of moderators, for more convenient management of moderators.<br>You can also assign specific users to moderators when creating a forum.'
+	'_AM_NEWBB_HELP_GROUPMOD_TAB',
+	   'Allows you to install users of certain groups as moderators for the entire module, and for individual categories and forums.<br>It is recommended to create separate groups of moderators, for more convenient management of moderators.<br>You can also assign specific users to moderators when creating a forum.'
 );
 define('_AM_NEWBB_HELP_SYNC_TAB', 'If you notice a problem with the message dates, the appearance of blank messages, etc. Here you can synchronize and correct forum data and topics');
 

language/english/main.php

Spacing +5 added lines, -5 removed lines

@@ -35,7 +35,7 @@ 
 define('_MD_NEWBB_NEWPOSTS', 'New posts');
 define('_MD_NEWBB_NONEWPOSTS', 'No new posts');
 define('_MD_NEWBB_PRIVATEFORUM', 'Inactive Forum');
-define('_MD_NEWBB_BY', 'by');// Posted by
+define('_MD_NEWBB_BY', 'by'); // Posted by
 define('_MD_NEWBB_TOSTART', 'To start viewing messages, select the forum that you want to visit from the list below.');
 define('_MD_NEWBB_TOTALTOPICSC', 'Total Topics: ');
 define('_MD_NEWBB_TOTALPOSTSC', 'Total Posts: ');
@@ -274,8 +274,8 @@ 
 define('_MD_NEWBB_TIMEISUP', 'You\'ve reached the time limit for editing your post.');
 define('_MD_NEWBB_TIMEISUPDEL', 'You\'ve reached the time limit for deleting your post.');
 //reply.php
-define('_MD_NEWBB_ON', 'on');//Posted on
-define('_MD_NEWBB_USERWROTE', '%s wrote:');// %s is username
+define('_MD_NEWBB_ON', 'on'); //Posted on
+define('_MD_NEWBB_USERWROTE', '%s wrote:'); // %s is username
 define('_MD_NEWBB_RE', 'Re');
 //post.php
 define('_MD_NEWBB_EDITNOTALLOWED', 'You\'re not allowed to edit this post!');
@@ -284,7 +284,7 @@ 
 define('_MD_NEWBB_THANKSSUBMIT', 'Thanks for your submission!');
 define('_MD_NEWBB_REPLYPOSTED', 'A reply to your topic has been posted.');
 define('_MD_NEWBB_HELLO', 'Hello %s,');
-define('_MD_NEWBB_URRECEIVING', 'You are receiving this email because a message you posted on %s forums has been replied to.');// %s is your site name
+define('_MD_NEWBB_URRECEIVING', 'You are receiving this email because a message you posted on %s forums has been replied to.'); // %s is your site name
 define('_MD_NEWBB_CLICKBELOW', 'Click on the link below to view the thread:');
 define('_MD_NEWBB_WAITFORAPPROVAL', 'Thank you. Your post will be approved before publication.');
 define('_MD_NEWBB_POSTING_LIMITED', 'Why not take a break and come back in %d sec');
@@ -378,7 +378,7 @@ 
 define('_MD_NEWBB_CANTVOTEOWN', 'You cannot vote on the topic you submitted.<br>All votes are logged and reviewed.');
 define('_MD_NEWBB_VOTEONCE', 'Please do not vote for the same topic more than once.');
 define('_MD_NEWBB_VOTEAPPRE', 'Your vote is appreciated.');
-define('_MD_NEWBB_THANKYOU', 'Thank you for taking the time to vote here at %s');// %s is your site name
+define('_MD_NEWBB_THANKYOU', 'Thank you for taking the time to vote here at %s'); // %s is your site name
 define('_MD_NEWBB_VOTES', 'Votes');
 define('_MD_NEWBB_NOVOTERATE', 'You did not rate this Topic');
 // polls.php

Indentation +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 //
 if (defined('NEWBB_MAIN_DEFINED')) {
-    return;
+	return;
 }
 define('NEWBB_MAIN_DEFINED', true);