Merge branch 'master' into pilot

XoopsX · Oct 23, 2019 · cf15587 · cf15587
2 parents 15226a4 + eb45cd9
commit cf15587
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -48,7 +48,26 @@ set T="../xoops_trust_path";curl xoopsx.github.io/installer/install.sh|sed "s#<T
 
 ***
 
-##Legacy
+# Legacy
+
+# ⚠️ Unmaintained repository !
+
+# 🆕 Development moved to XCL
+
+https://github.com/xoopscube/xcl
+
+## XOOPSCube development branch : 2.3
+
+2019-01-29 Branch 2.3 updated to PHP7
+
+https://github.com/xoopscube/xcl/tree/develop
+
+XCL UI prototype 
+
+https://xoopscube.github.io/
+
+TOC
+====
 
 * [About](#about)
 * [License](#license)
@@ -81,12 +100,12 @@ About
 License
 ====
 
-###XOOPS Cube  
+### XOOPS Cube  
 
 XOOPS Cube was started from scratch and the XOOPS Cube Core source code is released under the BSD licence.
 
 
-###XOOPS Cube Legacy  
+### XOOPS Cube Legacy  
 
 XOOPS Cube Legacy source code which is one of base modules to ensure compatibility with old versions of Xoops 2 is released under a GPL licence.
 
@@ -129,11 +148,11 @@ Language</th>
 </tr>
 </table>
 
-###Software
+### Software
 
 Useful Wikipedia articles with tables comparing general and technical information of Proprietary software, Free and open-source software.  
 
-<img src="http://xoopscube.org/uploads/fckeditor/server_database.png"> <a href="http://en.wikipedia.org/wiki/List_of_AMP_packages"> Local Test Server</a> : List of Apache窶溺ySQL窶撤HP packages  
+<img src="http://xoopscube.org/uploads/fckeditor/server_database.png"> <a href="http://en.wikipedia.org/wiki/List_of_AMP_packages"> Local Test Server</a> : List of Apache–MySQL–PHP packages  
 <img src="http://xoopscube.org/uploads/fckeditor/script_edit.png"> <a href="http://en.wikipedia.org/wiki/Source_code_editor"> Source Code Editor</a> : Some well-known source code editors  
 <img src="http://xoopscube.org/uploads/fckeditor/picture_edit.png"> <a href="http://en.wikipedia.org/wiki/Comparison_of_raster_graphics_editors"> Graphics Editor</a> : Comparison of raster graphics editors  
 <img src="http://xoopscube.org/uploads/fckeditor/computer_go.png"> <a href="http://en.wikipedia.org/wiki/FTP_clients"> FTP Clients</a> : Comparison of FTP client software  
@@ -226,17 +245,17 @@ XOOPS Cube functionality can also be easily extended with Preloads - one file cl
 Modules
 ====
 
-###Xoops X (Ten)  
+### Xoops X (Ten)  
 Modules maintained by the community members
 
 https://github.com/XoopsX
 
-###Xoopscube.jp  
+### Xoopscube.jp  
 Modules up-to-date 
 
 [News, Announcements and Release Notes](http://xoopscube.jp/module/)
 
-###Xoopscube.org  
+### Xoopscube.org  
 
 [Module Compatibility Informations](http://xoopscube.org/modules/pukiwiki/?XOOPSCubeLegacy%2FModuleCompatibility)
 
@@ -259,9 +278,12 @@ http://xoopscube.org/documentation/api
 Site and Support
 ====
 
-http://xoopscube.org
+https://github.com/xoopscube/legacy (uptodate development)
+
+http://xoopscube.jp (uptodate)
+
+http://xoopscube.org (archive)
 
-http://xoopscube.jp
 
 Contribute
 ====

diff --git a/html/modules/legacy/admin/actions/ActSearchAction.class.php b/html/modules/legacy/admin/actions/ActSearchAction.class.php
@@ -127,7 +127,7 @@ public function prepare(&$controller, &$xoopsUser)
         $perm = $db->prefix("group_permission");
         $groups = implode(",", $xoopsUser->getGroups());
 
-        $sql = "SELECT DISTINCT ${mod}.mid FROM ${mod},${perm} " .
+        $sql = "SELECT DISTINCT ${mod}.weight, ${mod}.mid FROM ${mod},${perm} " .
                "WHERE ${mod}.isactive=1 AND ${mod}.mid=${perm}.gperm_itemid AND ${perm}.gperm_name='module_admin' AND ${perm}.gperm_groupid IN (${groups}) " .
                "ORDER BY ${mod}.weight, ${mod}.mid";
 

diff --git a/html/modules/legacy/admin/blocks/AdminSideMenu.class.php b/html/modules/legacy/admin/blocks/AdminSideMenu.class.php
@@ -97,9 +97,9 @@ public function execute()
         // Users who are belong to ADMIN GROUP have every permissions, so we have to prepare two kinds of SQL.
         //
         if ($root->mContext->mUser->isInRole('Site.Owner')) {
-            $sql = "SELECT DISTINCT mid FROM ${mod} WHERE isactive=1 AND hasadmin=1 ORDER BY weight, mid";
+            $sql = "SELECT DISTINCT weight, mid FROM ${mod} WHERE isactive=1 AND hasadmin=1 ORDER BY weight, mid";
         } else {
-            $sql = "SELECT DISTINCT ${mod}.mid FROM ${mod},${perm} " .
+            $sql = "SELECT DISTINCT ${mod}.weight, ${mod}.mid FROM ${mod},${perm} " .
                    "WHERE ${mod}.isactive=1 AND ${mod}.mid=${perm}.gperm_itemid AND ${perm}.gperm_name='module_admin' AND ${perm}.gperm_groupid IN (${groups}) " .
                    "AND ${mod}.hasadmin=1 " .
                    "ORDER BY ${mod}.weight, ${mod}.mid";
@@ -110,7 +110,7 @@ public function execute()
 
         $handler =& xoops_gethandler('module');
 
-        while (list($mid) = $db->fetchRow($result)) {
+        while (list($weight, $mid) = $db->fetchRow($result)) {
             $xoopsModule = & $handler->get($mid);
             $module =& Legacy_Utils::createModule($xoopsModule, false);