Merge pull request #59 from mambax7/master

4.34 RC1
XoopsModules25x · Feb 9, 2019 · 51f7685 · 51f7685
2 parents e8fe308 + fd500f8
commit 51f7685
Show file tree

Hide file tree

Showing 55 changed files with 36 additions and 31 deletions.
diff --git a/admin/admin_forum_manager.php b/admin/admin_forum_manager.php
@@ -233,7 +233,7 @@
     default:
 
         $categoryHandler  = xoops_getModuleHandler('category', 'newbb');
-        $criteriaCategory = new CriteriaCompo(new criteria('1', 1));
+        $criteriaCategory = new CriteriaCompo(new Criteria('cat_id'));
         $criteriaCategory->setSort('cat_order');
         $categories = $categoryHandler->getList($criteriaCategory);
         if (0 === count($categories)) {
@@ -254,7 +254,7 @@
         $echo .= '</tr>';
 
         $categoryHandler  = xoops_getModuleHandler('category', 'newbb');
-        $criteriaCategory = new CriteriaCompo(new criteria('1', 1));
+        $criteriaCategory = new CriteriaCompo(new Criteria('cat_id'));
         $criteriaCategory->setSort('cat_order');
         $categories = $categoryHandler->getList($criteriaCategory);
         $forums     = $forumHandler->getTree(array_keys($categories), 0, 'all');

diff --git a/admin/admin_forum_reorder.php b/admin/admin_forum_reorder.php
@@ -75,7 +75,7 @@
 
     $forumHandler     = xoops_getModuleHandler('forum', 'newbb');
     $categoryHandler  = xoops_getModuleHandler('category', 'newbb');
-    $criteriaCategory = new CriteriaCompo(new criteria('1', 1));
+    $criteriaCategory = new CriteriaCompo(new Criteria('cat_id'));
     $criteriaCategory->setSort('cat_order');
     $categories = $categoryHandler->getAll($criteriaCategory, ['cat_id', 'cat_order', 'cat_title']);
     $forums     = $forumHandler->getTree(array_keys($categories), 0, 'all', '&nbsp;&nbsp;&nbsp;&nbsp;');

diff --git a/admin/admin_groupmod.php b/admin/admin_groupmod.php
@@ -70,7 +70,7 @@
 echo "<br><br><table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
 echo "<form name='reorder' method='post'>";
 $categoryHandler  = xoops_getModuleHandler('category', 'newbb');
-$criteriaCategory = new CriteriaCompo(new criteria('1', 1));
+$criteriaCategory = new CriteriaCompo(new Criteria('cat_id'));
 $criteriaCategory->setSort('cat_order');
 $categories = $categoryHandler->getAll($criteriaCategory, ['cat_id', 'cat_order', 'cat_title']);
 $forums     = $forumHandler->getTree(array_keys($categories), 0, 'all', '&nbsp;&nbsp;&nbsp;&nbsp;');

diff --git a/admin/admin_permissions.php b/admin/admin_permissions.php
@@ -333,7 +333,7 @@ public function _renderOptionTree(&$tree, $option, $prefix, $parentIds = [])
         $opform->display();
 
         $categoryHandler  = xoops_getModuleHandler('category', 'newbb');
-        $criteriaCategory = new CriteriaCompo(new criteria('1', 1));
+        $criteriaCategory = new CriteriaCompo(new Criteria('cat_id'));
         $criteriaCategory->setSort('cat_order');
         $categories = $categoryHandler->getList($criteriaCategory);
 
@@ -379,7 +379,7 @@ public function _renderOptionTree(&$tree, $option, $prefix, $parentIds = [])
         xoops_cp_header();
 
         $categoryHandler  = xoops_getModuleHandler('category', 'newbb');
-        $criteriaCategory = new CriteriaCompo(new criteria('1', 1));
+        $criteriaCategory = new CriteriaCompo(new Criteria('cat_id'));
         $criteriaCategory->setSort('cat_order');
         $categories = $categoryHandler->getList($criteriaCategory);
 
@@ -448,7 +448,7 @@ public function _renderOptionTree(&$tree, $option, $prefix, $parentIds = [])
         $form = new NewbbXoopsGroupPermForm($fm_options[$op]['title'], $module_id, $fm_options[$op]['item'], $fm_options[$op]['desc'], 'admin/admin_permissions.php', $fm_options[$op]['anonymous']);
 
         $categoryHandler  = xoops_getModuleHandler('category', 'newbb');
-        $criteriaCategory = new CriteriaCompo(new criteria('1', 1));
+        $criteriaCategory = new CriteriaCompo(new Criteria('cat_id'));
         $criteriaCategory->setSort('cat_order');
         $categories = $categoryHandler->getList($criteriaCategory);
         if ('category' === $op) {

diff --git a/admin/admin_type_manager.php b/admin/admin_type_manager.php
@@ -184,7 +184,7 @@
         }
 
         $categoryHandler  = xoops_getModuleHandler('category', 'newbb');
-        $criteriaCategory = new CriteriaCompo(new criteria('1', 1));
+        $criteriaCategory = new CriteriaCompo(new Criteria('cat_id'));
         $criteriaCategory->setSort('cat_order');
         $categories   = $categoryHandler->getList($criteriaCategory);
         $forumHandler = xoops_getModuleHandler('forum', 'newbb');
@@ -274,7 +274,7 @@
 
     case 'forum':
         $categoryHandler  = xoops_getModuleHandler('category', 'newbb');
-        $criteriaCategory = new CriteriaCompo(new criteria('1', 1));
+        $criteriaCategory = new CriteriaCompo(new Criteria('cat_id'));
         $criteriaCategory->setSort('cat_order');
         $categories = $categoryHandler->getList($criteriaCategory);
         if (empty($categories)) {

diff --git a/assets/images/category/newbb.png b/assets/images/category/newbb.png
diff --git a/assets/images/category/topxoops.png b/assets/images/category/topxoops.png
diff --git a/assets/images/filetypes/html.gif b/assets/images/filetypes/html.gif
diff --git a/assets/images/filetypes/wav.gif b/assets/images/filetypes/wav.gif
diff --git a/assets/images/logoModule.png b/assets/images/logoModule.png
diff --git a/assets/images/menu/digest.png b/assets/images/menu/digest.png
diff --git a/assets/images/newbb.png b/assets/images/newbb.png
diff --git a/class/tree.php b/class/tree.php
@@ -148,10 +148,10 @@ public function getAllChild_object($key, &$ret, $depth = 0)
                 return;
             }
 
-            if (isset($this->_tree[$key]['child'])) {
-                foreach ($this->_tree[$key]['child'] as $childkey) {
-                    if (isset($this->_tree[$childkey]['obj'])) {
-                        $ret['child'][$childkey] = $this->_tree[$childkey]['obj'];
+            if (isset($this->tree[$key]['child'])) {
+                foreach ($this->tree[$key]['child'] as $childkey) {
+                    if (isset($this->tree[$childkey]['obj'])) {
+                        $ret['child'][$childkey] = $this->tree[$childkey]['obj'];
                     }
                     $this->getAllChild_object($childkey, $ret['child'][$childkey], $depth);
                 }
@@ -192,15 +192,15 @@ public function getAllChild_array($key, &$ret, array $tags = [], $depth = 0)
                 return;
             }
 
-            if (isset($this->_tree[$key]['child'])) {
-                foreach ($this->_tree[$key]['child'] as $childkey) {
-                    if (isset($this->_tree[$childkey]['obj'])) {
+            if (isset($this->tree[$key]['child'])) {
+                foreach ($this->tree[$key]['child'] as $childkey) {
+                    if (isset($this->tree[$childkey]['obj'])) {
                         if (count($tags) > 0) {
                             foreach ($tags as $tag) {
-                                $ret['child'][$childkey][$tag] = $this->_tree[$childkey]['obj']->getVar($tag);
+                                $ret['child'][$childkey][$tag] = $this->tree[$childkey]['obj']->getVar($tag);
                             }
                         } else {
-                            $ret['child'][$childkey]['forum_name'] = $this->_tree[$childkey]['obj']->getVar('forum_name');
+                            $ret['child'][$childkey]['forum_name'] = $this->tree[$childkey]['obj']->getVar('forum_name');
                         }
                     }
 
@@ -238,11 +238,11 @@ public function &makeArrayTree($key = 0, $tags = null, $depth = 0)
          */
         public function &_getParentForums($key, array $ret = [], $uplevel = 0)
         {
-            if (isset($this->_tree[$key]['parent']) && isset($this->_tree[$this->_tree[$key]['parent']]['obj'])) {
-                $ret[$uplevel] = $this->_tree[$this->_tree[$key]['parent']]['obj'];
-                if ($this->_tree[$key]['parent'] !== $key) {
-                    //$parents = $this->getParentForums($this->_tree[$key]['parent'], $ret, $uplevel+1);
-                    $parents = $this->getParentForums($this->_tree[$key]['parent']);
+            if (isset($this->tree[$key]['parent']) && isset($this->tree[$this->tree[$key]['parent']]['obj'])) {
+                $ret[$uplevel] = $this->tree[$this->tree[$key]['parent']]['obj'];
+                if ($this->tree[$key]['parent'] !== $key) {
+                    //$parents = $this->getParentForums($this->tree[$key]['parent'], $ret, $uplevel+1);
+                    $parents = $this->getParentForums($this->tree[$key]['parent']);
                     foreach (array_keys($parents) as $newkey) {
                         $ret[$newkey] = $parents[$newkey];
                     }
@@ -261,9 +261,9 @@ public function &getParentForums($key, $reverse = true)
         {
             $ret  = [];
             $pids = [];
-            if (isset($this->_tree[$key]['parent']) && isset($this->_tree[$this->_tree[$key]['parent']]['obj'])) {
-                $pids[]  = $this->_tree[$this->_tree[$key]['parent']]['obj']->getVar($this->_myId);
-                $parents = $this->_getParentForums($this->_tree[$key]['parent'], $ret);
+            if (isset($this->tree[$key]['parent']) && isset($this->tree[$this->tree[$key]['parent']]['obj'])) {
+                $pids[]  = $this->tree[$this->tree[$key]['parent']]['obj']->getVar($this->_myId);
+                $parents = $this->_getParentForums($this->tree[$key]['parent'], $ret);
                 foreach (array_keys($parents) as $newkey) {
                     if (!is_object($newkey)) {
                         continue;

diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -1,4 +1,9 @@
-4.33 Final  (XOOPS 2.5.8)      2018-03-24
+4.34 RC1  (XOOPS 2.5.10)      2019-02-09
+===========================================
+- fix for Criteria('1', 1) (geekwright/mamba)
+
+
+4.33 Final  (XOOPS 2.5.8)      2016-11-27
 ===========================================
 - cosmetics (mamba)
 - array short syntax (mamba)

diff --git a/include/functions.forum.php b/include/functions.forum.php
@@ -166,7 +166,7 @@ function newbb_getParentForum($forum_id = 0, $refresh = false)
     function newbb_createParentForumList()
     {
         $forumHandler = xoops_getModuleHandler('forum', 'newbb');
-        $criteria     = new Criteria('1', 1);
+        $criteria     = new Criteria('forum_id');
         $criteria->setSort('parent_forum');
         $criteria->setOrder('ASC');
         $forums_obj = $forumHandler->getObjects($criteria);

diff --git a/templates/images/icon/blank.gif b/templates/images/icon/blank.gif
diff --git a/templates/images/icon/googleplus.png b/templates/images/icon/googleplus.png
diff --git a/templates/images/icon/minus.png b/templates/images/icon/minus.png
diff --git a/templates/images/icon/new_forum.png b/templates/images/icon/new_forum.png
diff --git a/templates/images/icon/plus.png b/templates/images/icon/plus.png
diff --git a/templates/images/language/english/new_forum.png b/templates/images/language/english/new_forum.png
diff --git a/templates/images/language/english/new_subforum.png b/templates/images/language/english/new_subforum.png
diff --git a/templates/images/language/english/p_bann.png b/templates/images/language/english/p_bann.png
diff --git a/templates/images/language/english/t_poll.png b/templates/images/language/english/t_poll.png
diff --git a/templates/images/mime/html.gif b/templates/images/mime/html.gif
diff --git a/templates/images/mime/wav.gif b/templates/images/mime/wav.gif
diff --git a/templates/images/rpg/orange.gif b/templates/images/rpg/orange.gif
diff --git a/templates_fulldiv_opacity/images/icon/blank.gif b/templates_fulldiv_opacity/images/icon/blank.gif
diff --git a/templates_fulldiv_opacity/images/icon/googleplus.png b/templates_fulldiv_opacity/images/icon/googleplus.png
diff --git a/templates_fulldiv_opacity/images/icon/minus.png b/templates_fulldiv_opacity/images/icon/minus.png
diff --git a/templates_fulldiv_opacity/images/icon/new_forum.png b/templates_fulldiv_opacity/images/icon/new_forum.png
diff --git a/templates_fulldiv_opacity/images/icon/plus.png b/templates_fulldiv_opacity/images/icon/plus.png
diff --git a/templates_fulldiv_opacity/images/language/english/new_forum.png b/templates_fulldiv_opacity/images/language/english/new_forum.png
diff --git a/templates_fulldiv_opacity/images/language/english/new_subforum.png b/templates_fulldiv_opacity/images/language/english/new_subforum.png
diff --git a/templates_fulldiv_opacity/images/language/english/p_bann.png b/templates_fulldiv_opacity/images/language/english/p_bann.png
diff --git a/templates_fulldiv_opacity/images/language/english/t_poll.png b/templates_fulldiv_opacity/images/language/english/t_poll.png
diff --git a/templates_fulldiv_opacity/images/language/persian/new_forum.png b/templates_fulldiv_opacity/images/language/persian/new_forum.png
diff --git a/templates_fulldiv_opacity/images/language/persian/new_subforum.png b/templates_fulldiv_opacity/images/language/persian/new_subforum.png
diff --git a/templates_fulldiv_opacity/images/language/persian/offline.png b/templates_fulldiv_opacity/images/language/persian/offline.png
diff --git a/templates_fulldiv_opacity/images/language/persian/online.png b/templates_fulldiv_opacity/images/language/persian/online.png
diff --git a/templates_fulldiv_opacity/images/language/persian/p_bann.png b/templates_fulldiv_opacity/images/language/persian/p_bann.png
diff --git a/templates_fulldiv_opacity/images/language/persian/p_delete.png b/templates_fulldiv_opacity/images/language/persian/p_delete.png
diff --git a/templates_fulldiv_opacity/images/language/persian/p_edit.png b/templates_fulldiv_opacity/images/language/persian/p_edit.png
diff --git a/templates_fulldiv_opacity/images/language/persian/p_quote.png b/templates_fulldiv_opacity/images/language/persian/p_quote.png
diff --git a/templates_fulldiv_opacity/images/language/persian/p_reply.png b/templates_fulldiv_opacity/images/language/persian/p_reply.png
diff --git a/templates_fulldiv_opacity/images/language/persian/p_report.png b/templates_fulldiv_opacity/images/language/persian/p_report.png
diff --git a/templates_fulldiv_opacity/images/language/persian/p_up.png b/templates_fulldiv_opacity/images/language/persian/p_up.png
diff --git a/templates_fulldiv_opacity/images/language/persian/t_new.png b/templates_fulldiv_opacity/images/language/persian/t_new.png
diff --git a/templates_fulldiv_opacity/images/language/persian/t_poll.png b/templates_fulldiv_opacity/images/language/persian/t_poll.png
diff --git a/templates_fulldiv_opacity/images/language/persian/t_qr.png b/templates_fulldiv_opacity/images/language/persian/t_qr.png
diff --git a/templates_fulldiv_opacity/images/language/persian/t_reply.png b/templates_fulldiv_opacity/images/language/persian/t_reply.png
diff --git a/templates_fulldiv_opacity/images/mime/html.gif b/templates_fulldiv_opacity/images/mime/html.gif
diff --git a/templates_fulldiv_opacity/images/mime/wav.gif b/templates_fulldiv_opacity/images/mime/wav.gif
diff --git a/templates_fulldiv_opacity/images/rpg/orange.gif b/templates_fulldiv_opacity/images/rpg/orange.gif
diff --git a/xoops_version.php b/xoops_version.php
@@ -9,9 +9,9 @@
  * @package        module::newbb
  */
 
-$modversion['version']             = 4.33;
-$modversion['module_status']       = 'Final';
-$modversion['release_date']        = '2018/03/24';
+$modversion['version']             = 4.34;
+$modversion['module_status']       = 'RC1';
+$modversion['release_date']        = '2019/02/09';
 $modversion['name']                = _MI_NEWBB_NAME;
 $modversion['description']         = _MI_NEWBB_DESC;
 $modversion['credits']             = 'NewBB 2 developed by Marko Schmuck (predator) / D.J. (phppp) / Alfred(dhcst)';