Merge pull request #55 from ggoffy/master

semantic versioning / fixed missing criteria in search

Author: ggoffy

docs/changelog.txt

@@ -1,3 +1,9 @@
+===================================================================
+2021/11/17 Version 1.5.0 RC1
+===================================================================
+ - semantic versioning (mamba/goffy)
+ - fixed missing criteria in search (alain01/goffy)
+ 
 ===================================================================
 2021/03/31 Version 1.04 RC1
 ===================================================================

include/search.inc.php

@@ -21,6 +21,10 @@
  */
 
 use XoopsModules\Wggithub;
+use XoopsModules\Wggithub\ {
+    Helper,
+    Constants
+};
 
 
 /**
@@ -36,7 +40,7 @@
 function wggithub_search($queryarray, $andor, $limit, $offset, $userid)
 {
     $ret = [];
-    $helper = \XoopsModules\Wggithub\Helper::getInstance();
+    $helper = Helper::getInstance();
     $repositoriesHandler = $helper->getHandler('Repositories');
     $directoriesHandler  = $helper->getHandler('Directories');
 
@@ -75,6 +79,10 @@ function wggithub_search($queryarray, $andor, $limit, $offset, $userid)
     if (isset($crUser)) {
         $crSearch->add($crUser, 'AND');
     }
+    if (0 === (int)$helper->getConfig('autoapproved')) {
+        $crSearch->add(new \Criteria('repo_approved', 1));
+    }
+    $crSearch->add(new \Criteria('repo_status', Constants::STATUS_UPTODATE));
     $crSearch->setStart($offset);
     $crSearch->setLimit($limit);
     $crSearch->setSort('repo_datecreated');

xoops_version.php

@@ -29,7 +29,7 @@
 // ------------------- Informations ------------------- //
 $modversion = [
     'name'                => \_MI_WGGITHUB_NAME,
-    'version'             => 1.04,
+    'version'             => '1.5.0',
     'description'         => \_MI_WGGITHUB_DESC,
     'author'              => 'Goffy - XOOPS Development Team',
     'author_mail'         => 'goffy@wedega.com',
@@ -45,7 +45,7 @@
     'manual'              => 'link to manual file',
     'manual_file'         => \XOOPS_URL . '/modules/wggithub/docs/install.txt',
     'min_php'             => '7.3',
-    'min_xoops'           => '2.5.11',
+    'min_xoops'           => '2.5.11 Beta1',
     'min_admin'           => '1.2',
     'min_db'              => ['mysql' => '5.6', 'mysqli' => '5.6'],
     'image'               => 'assets/images/logoModule.png',