removed some php8 warnings

diff --git a/webclient/api.php b/webclient/api.php
index f39ef221abc025ce69fc18675e257f37deeda712..7e4ab49d3153337b76546d23a54f3df1c8a629f5 100644 (file)
--- a/webclient/api.php
+++ b/webclient/api.php
@@ -53,11 +53,6 @@ require_once 'lib/mancubus.class.php';
 require_once 'lib/manageentry.class.php';
 require_once 'lib/trite.class.php';
 
-## main vars
-# database object
-$DB = false;
-$Spectre = false;
-
 ## DB connection
 $DB = new mysqli(DB_HOST, DB_USERNAME,DB_PASSWORD, DB_NAME);
 $driver = new mysqli_driver();
@@ -78,10 +73,10 @@ if(isset($_GET['p']) && !empty($_GET['p'])) {
 
        if(!$Spectre->allowedRequests($_requestMode)) $_requestMode = "default";
 }
-$_authKey = false;
+$_authKey = '';
 if(isset($_GET['authKey']) && !empty($_GET['authKey'])) {
        $_authKey = trim($_GET['authKey']);
-       $_authKey = Summoner::validate($_authKey,'nospace') ? $_authKey : false;
+       $_authKey = Summoner::validate($_authKey,'nospace') ? $_authKey : '';
 }
 
 $_apiResult = array(

diff --git a/webclient/index.php b/webclient/index.php
index 04e110924e2634575a1c13cb1b34b60bab401eb6..3c2423af31a30b3c2086d54e02786d32be025c2c 100644 (file)
--- a/webclient/index.php
+++ b/webclient/index.php
@@ -53,8 +53,6 @@ require_once 'lib/gorenest.class.php';
 
 
 ## main vars
-# database object
-$DB = false;
 # the template data as an array
 # and some defaults
 $TemplateData = array();

diff --git a/webclient/view/default/advancedsearch/advancedsearch.php b/webclient/view/default/advancedsearch/advancedsearch.php
index 45ea518cb62d0b14fb7b5b9c72288e727f3b0506..362543186c1b714f72e52547d3bbaea8a863f1cf 100644 (file)
--- a/webclient/view/default/advancedsearch/advancedsearch.php
+++ b/webclient/view/default/advancedsearch/advancedsearch.php
@@ -21,10 +21,10 @@ $Trite = new Trite($DB,$Doomguy);
 require_once 'lib/mancubus.class.php';
 $Mancubus = new Mancubus($DB,$Doomguy);
 
-$_collection = false;
+$_collection = '';
 if(isset($_GET['collection']) && !empty($_GET['collection'])) {
        $_collection = trim($_GET['collection']);
-       $_collection = Summoner::validate($_collection,'digit') ? $_collection : false;
+       $_collection = Summoner::validate($_collection,'digit') ? $_collection : '';
 }
 
 $TemplateData['pageTitle'] = 'Advanced search';

diff --git a/webclient/view/default/bulkedit/bulkedit.php b/webclient/view/default/bulkedit/bulkedit.php
index 73f788010026d38577f93fbf0e0fb46b872a8cfb..eb7d222b4bf664fbb8191ef53cf9a83785117770 100644 (file)
--- a/webclient/view/default/bulkedit/bulkedit.php
+++ b/webclient/view/default/bulkedit/bulkedit.php
@@ -21,10 +21,10 @@ $Trite = new Trite($DB,$Doomguy);
 require_once 'lib/manageentry.class.php';
 $ManageEntry = new Manageentry($DB,$Doomguy);
 
-$_collection = false;
+$_collection = '';
 if(isset($_GET['collection']) && !empty($_GET['collection'])) {
        $_collection = trim($_GET['collection']);
-       $_collection = Summoner::validate($_collection,'digit') ? $_collection : false;
+       $_collection = Summoner::validate($_collection,'digit') ? $_collection : '';
 }
 
 $TemplateData['loadedCollection'] = array();

diff --git a/webclient/view/default/dashboard/dashboard.php b/webclient/view/default/dashboard/dashboard.php
index 098daa5f49e9d836440214ce39533b4104455a8d..cff4d5bf0ac5820f10ad8137483288706c412387 100644 (file)
--- a/webclient/view/default/dashboard/dashboard.php
+++ b/webclient/view/default/dashboard/dashboard.php
@@ -22,10 +22,10 @@ $Mancubus = new Mancubus($DB,$Doomguy);
 $TemplateData['search'] = false;
 $TemplateData['searchAction'] = 'index.php';
 
-$_search = false;
+$_search = '';
 if(isset($_POST['navSearch'])) {
        $_search = trim($_POST['navSearch']);
-       $_search = Summoner::validate($_search,'text') ? $_search :  false;
+       $_search = Summoner::validate($_search,'text') ? $_search : '';
 }
 
 $TemplateData['latest'] = $Mancubus->getLatest(5,5,$_search);

diff --git a/webclient/view/default/entry/entry.php b/webclient/view/default/entry/entry.php
index f6e775273439b36edb668126d8eea8cd6ff216b1..89e180d4441385ad285cd74dabd919961d4febf4 100644 (file)
--- a/webclient/view/default/entry/entry.php
+++ b/webclient/view/default/entry/entry.php
@@ -23,16 +23,16 @@ $ManageEntry = new Manageentry($DB,$Doomguy);
 require_once 'lib/trite.class.php';
 $Trite = new Trite($DB,$Doomguy);
 
-$_collection = false;
+$_collection = '';
 if(isset($_GET['collection']) && !empty($_GET['collection'])) {
        $_collection = trim($_GET['collection']);
-       $_collection = Summoner::validate($_collection,'digit') ? $_collection : false;
+       $_collection = Summoner::validate($_collection,'digit') ? $_collection : '';
 }
 
-$_id = false;
+$_id = '';
 if(isset($_GET['id']) && !empty($_GET['id'])) {
        $_id = trim($_GET['id']);
-       $_id = Summoner::validate($_id,'digit') ? $_id : false;
+       $_id = Summoner::validate($_id,'digit') ? $_id : '';
 }
 
 $TemplateData['pageTitle'] = '?';

diff --git a/webclient/view/default/managecollectionfields/managecollectionfields.php b/webclient/view/default/managecollectionfields/managecollectionfields.php
index 8ef81258e66bcff20cacfa73e0084103ab95df79..b8f08b79c239c9d39ab0696ce445717ef2a861c3 100644 (file)
--- a/webclient/view/default/managecollectionfields/managecollectionfields.php
+++ b/webclient/view/default/managecollectionfields/managecollectionfields.php
@@ -29,10 +29,10 @@ $TemplateData['existingFields'] = array();
 
 $TemplateData['pageTitle'] = 'Manage collection fields';
 
-$_id = false;
+$_id = '';
 if(isset($_GET['id']) && !empty($_GET['id'])) {
        $_id = trim($_GET['id']);
-       $_id = Summoner::validate($_id,'digit') ? $_id : false;
+       $_id = Summoner::validate($_id,'digit') ? $_id : '';
 }
 
 if(!empty($_id)) {

diff --git a/webclient/view/default/managecolletions/managecolletions.php b/webclient/view/default/managecolletions/managecolletions.php
index 58864e101a675dc4009b53b9c1052ecd82ae5e9f..6f0c4c4d5a77fa1b0ef815b81b6682133f7e1885 100644 (file)
--- a/webclient/view/default/managecolletions/managecolletions.php
+++ b/webclient/view/default/managecolletions/managecolletions.php
@@ -42,10 +42,10 @@ if(isset($_GET['m']) && !empty($_GET['m'])) {
        }
 }
 
-$_id = false;
+$_id ='';
 if(isset($_GET['id']) && !empty($_GET['id'])) {
        $_id = trim($_GET['id']);
-       $_id = Summoner::validate($_id,'digit') ? $_id : false;
+       $_id = Summoner::validate($_id,'digit') ? $_id : '';
 }
 
 if($_editMode === true && !empty($_id)) {

diff --git a/webclient/view/default/manageentry/manageentry.php b/webclient/view/default/manageentry/manageentry.php
index b6fe15de048a58e2ae387f39e11ee91a4512eabd..b5bf291194598be123e401fb95fad211882e8f2e 100644 (file)
--- a/webclient/view/default/manageentry/manageentry.php
+++ b/webclient/view/default/manageentry/manageentry.php
@@ -30,16 +30,16 @@ $TemplateData['existingCollections'] = array();
 
 $TemplateData['_editFieldViewDefault'] = Summoner::themefile('manageentry/field-unknown.html', UI_THEME);
 
-$_collection = false;
+$_collection = '';
 if(isset($_GET['collection']) && !empty($_GET['collection'])) {
        $_collection = trim($_GET['collection']);
-       $_collection = Summoner::validate($_collection,'digit') ? $_collection : false;
+       $_collection = Summoner::validate($_collection,'digit') ? $_collection : '';
 }
 
-$_id = false;
+$_id = '';
 if(isset($_GET['id']) && !empty($_GET['id'])) {
        $_id = trim($_GET['id']);
-       $_id = Summoner::validate($_id,'digit') ? $_id : false;
+       $_id = Summoner::validate($_id,'digit') ? $_id : '';
 }
 
 if(!empty($_collection)) {

diff --git a/webclient/view/default/managegroups/managegroups.php b/webclient/view/default/managegroups/managegroups.php
index 2936ffb8e6d11bf6bcad2486c45cfea93ad4b5d6..9ba3e7a787135629f18d8e39a2e803f3db818367 100644 (file)
--- a/webclient/view/default/managegroups/managegroups.php
+++ b/webclient/view/default/managegroups/managegroups.php
@@ -18,14 +18,14 @@
 require_once 'lib/possessed.class.php';
 $Possessed = new Possessed($DB, $Doomguy);
 $TemplateData['existingGroups'] = $Possessed->getGroups();
-$TemplateData['editData'] = false;
+$TemplateData['editData'] = array();
 
 $TemplateData['pageTitle'] = 'Manage groups';
 
-$_id = false;
+$_id = '';
 if(isset($_GET['id']) && !empty($_GET['id'])) {
        $_id = trim($_GET['id']);
-       $_id = Summoner::validate($_id,'digit') ? $_id : false;
+       $_id = Summoner::validate($_id,'digit') ? $_id : '';
 }
 
 if(!empty($_id)) {

diff --git a/webclient/view/default/managetags/managetags.php b/webclient/view/default/managetags/managetags.php
index 329b57d3fed330470224143cadebf04aa6e22061..a2841c379a879fb7bab4ce382e1b89fd53ebc5f2 100644 (file)
--- a/webclient/view/default/managetags/managetags.php
+++ b/webclient/view/default/managetags/managetags.php
@@ -21,16 +21,16 @@ $Trite = new Trite($DB,$Doomguy);
 require_once 'lib/managetags.class.php';
 $ManageTags = new ManageTags($DB,$Doomguy);
 
-$_collection = false;
+$_collection = '';
 if(isset($_GET['collection']) && !empty($_GET['collection'])) {
        $_collection = trim($_GET['collection']);
-       $_collection = Summoner::validate($_collection,'digit') ? $_collection : false;
+       $_collection = Summoner::validate($_collection,'digit') ? $_collection : '';
 }
 
-$_id = false;
+$_id = '';
 if(isset($_GET['id']) && !empty($_GET['id'])) {
        $_id = trim($_GET['id']);
-       $_id = Summoner::validate($_id,'digit') ? $_id : false;
+       $_id = Summoner::validate($_id,'digit') ? $_id : '';
 }
 
 $TemplateData['loadedCollection'] = array();

diff --git a/webclient/view/default/manageusers/manageusers.php b/webclient/view/default/manageusers/manageusers.php
index 7c431ffd5343b378accbe472363afbf529f843e8..3fadd6dd7b0c52317a3f94ef924aa08259b731d4 100644 (file)
--- a/webclient/view/default/manageusers/manageusers.php
+++ b/webclient/view/default/manageusers/manageusers.php
@@ -19,14 +19,14 @@ require_once 'lib/possessed.class.php';
 $Possessed = new Possessed($DB, $Doomguy);
 $TemplateData['existingGroups'] = $Possessed->getGroups();
 $TemplateData['existingUsers'] = $Possessed->getUsers();
-$TemplateData['editData'] = false;
+$TemplateData['editData'] = array();
 $TemplateData['editData']['groups'] = array();
 $TemplateData['pageTitle'] = 'Manage users';
 
-$_id = false;
+$_id = '';
 if(isset($_GET['id']) && !empty($_GET['id'])) {
        $_id = trim($_GET['id']);
-       $_id = Summoner::validate($_id,'digit') ? $_id : false;
+       $_id = Summoner::validate($_id,'digit') ? $_id : '';
 }
 
 if(!empty($_id)) {

diff --git a/webclient/view/default/sysinfo/sysinfo.html b/webclient/view/default/sysinfo/sysinfo.html
index 873b3388f7fac012fb1cbcc13349ae07790d1350..7612fc5266b47825c3ad5ecca6e46a25af66b59c 100644 (file)
--- a/webclient/view/default/sysinfo/sysinfo.html
+++ b/webclient/view/default/sysinfo/sysinfo.html
@@ -19,6 +19,8 @@
                        <?php } ?>
                </div>
        </div>
+</div>
+<div class="uk-grid-small uk-grid-row-small" uk-grid>
        <div class="uk-width-1-2">
                <ul>
                        <li>Bibliotheca: <code><?php echo $TemplateData['bibVersion']; ?></code></li>

diff --git a/webclient/view/default/tool/tool.php b/webclient/view/default/tool/tool.php
index cb568f5c585086fc07862b859bcccf598330d26a..96d5958b089c0e6335bc4fe9e4913b7569c1460b 100644 (file)
--- a/webclient/view/default/tool/tool.php
+++ b/webclient/view/default/tool/tool.php
@@ -31,22 +31,22 @@ $TemplateData['tool']['viewFile'] = '';
 $TemplateData['collection'] = array();
 $TemplateData['editEntry'] = array();
 
-$_collection = false;
+$_collection = '';
 if(isset($_GET['collection']) && !empty($_GET['collection'])) {
        $_collection = trim($_GET['collection']);
-       $_collection = Summoner::validate($_collection,'digit') ? $_collection : false;
+       $_collection = Summoner::validate($_collection,'digit') ? $_collection : '';
 }
 
-$_id = false;
+$_id = '';
 if(isset($_GET['id']) && !empty($_GET['id'])) {
        $_id = trim($_GET['id']);
-       $_id = Summoner::validate($_id,'digit') ? $_id : false;
+       $_id = Summoner::validate($_id,'digit') ? $_id : '';
 }
 
-$_t = false;
+$_t = '';
 if(isset($_GET['t']) && !empty($_GET['t'])) {
        $_t = trim($_GET['t']);
-       $_t = Summoner::validate($_t,'nospace') ? $_t : false;
+       $_t = Summoner::validate($_t,'nospace') ? $_t : '';
 }
 
 if(!empty($_collection) && !empty($_t)) {