feat!: php7.4 (#4)

- Added PHP 7.4 support.

wiki/actions/createwiki.php → actions/createwiki.php

@@ -10,7 +10,7 @@ function createwiki_POST(Web &$w)
     $is_public = $w->request("is_public");
     $type = $w->request("type");
     try {
-        $wiki = $w->Wiki->createWiki($title, $is_public, $type);
+        $wiki = WikiService::getInstance($w)->createWiki($title, $is_public, $type);
     } catch (WikiException $ex) {
         $w->error($ex->getMessage(), "/wiki/createwiki");
     }

wiki/actions/delmember.php → actions/delmember.php

@@ -4,8 +4,8 @@ function delmember_GET(&$w)
 {
     try {
         $pm = $w->pathMatch("wid", "mid");
-        $wiki = $w->Wiki->getWikiById($pm['wid']);
-        if (!$wiki || !$wiki->isOwner($w->Auth->user())) {
+        $wiki = WikiService::getInstance($w)->getWikiById($pm['wid']);
+        if (!$wiki || !$wiki->isOwner(AuthService::getInstance($w)->user())) {
             $w->error("No access to delete this wiki.");
         }
         $mem = $wiki->getUserById($pm['mid']);

wiki/actions/delwiki.php → actions/delwiki.php

@@ -4,8 +4,8 @@ function delwiki_GET(&$w)
 {
     try {
         $pm = $w->pathMatch("wid");
-        $wiki = $w->Wiki->getWikiById($pm['wid']);
-        if ($wiki  && ($wiki->isOwner($w->Auth->user()) || $w->Auth->user()->is_admin)) {
+        $wiki = WikiService::getInstance($w)->getWikiById($pm['wid']);
+        if ($wiki  && ($wiki->isOwner(AuthService::getInstance($w)->user()) || AuthService::getInstance($w)->user()->is_admin)) {
             $wiki->delete();
             $w->msg("Wiki deleted.", "/wiki/");
         } else {

wiki/actions/edit.php → actions/edit.php

@@ -7,7 +7,7 @@ function edit_POST(Web &$w)
 {
     try {
         $pm = $w->pathMatch("wikiname", "pagename");
-        $wiki = $w->Wiki->getWikiByName($pm['wikiname']);
+        $wiki = WikiService::getInstance($w)->getWikiByName($pm['wikiname']);
         if (!$wiki) {
             $w->error("Wiki does not exist.");
         }

wiki/actions/editmember.php → actions/editmember.php

@@ -4,8 +4,8 @@ function editmember_GET(Web &$w)
 {
     try {
         $pm = $w->pathMatch("wid", "mid");
-        $wiki = $w->Wiki->getWikiById($pm['wid']);
-        if (!$wiki || !$wiki->isOwner($w->Auth->user())) {
+        $wiki = WikiService::getInstance($w)->getWikiById($pm['wid']);
+        if (!$wiki || !$wiki->isOwner(AuthService::getInstance($w)->user())) {
             $w->error("No access to this wiki.");
         }
         $mem = $wiki->getUserById($pm['mid']);
@@ -23,8 +23,8 @@ function editmember_POST(&$w)
 {
     try {
         $pm = $w->pathMatch("wid", "mid");
-        $wiki = $w->Wiki->getWikiById($pm['wid']);
-        if (!$wiki || !$wiki->isOwner($w->Auth->user())) {
+        $wiki = WikiService::getInstance($w)->getWikiById($pm['wid']);
+        if (!$wiki || !$wiki->isOwner(AuthService::getInstance($w)->user())) {
             $w->error("No access to this wiki.");
         }
         $mem = $wiki->getUserById($pm['mid']);

wiki/actions/history.php → actions/history.php

@@ -13,7 +13,7 @@ function history_GET(Web &$w)
         }
 
         // Get wiki object and check for existance
-        $wiki = $w->Wiki->getWikiByName($pm['wikiname']);
+        $wiki = WikiService::getInstance($w)->getWikiByName($pm['wikiname']);
         // Register for timelog
 
         if (empty($wiki->id)) {
@@ -30,7 +30,7 @@ function history_GET(Web &$w)
         }
 
         // Set navigation
-        $w->Wiki->navigation($w, $wiki, $pm["pagename"]);
+        WikiService::getInstance($w)->navigation($w, $wiki, $pm["pagename"]);
 
         $w->ctx("wiki", $wiki);
         $w->ctx("page", $wp);

wiki/actions/index.php → actions/index.php

@@ -3,10 +3,10 @@
 function index_ALL(Web $w)
 {
     $wiki = $page = null;
-    $w->Wiki->navigation($w, $wiki, $page);
+    WikiService::getInstance($w)->navigation($w, $wiki, $page);
     History::add("Wiki List");
     try {
-        $w->ctx("wikis", $w->Wiki->getWikis());
+        $w->ctx("wikis", WikiService::getInstance($w)->getWikis());
     } catch (Exception $ex) {
         $w->error($ex->getMessage(), "/");
     }

wiki/actions/pagehistory.php → actions/pagehistory.php

@@ -13,7 +13,7 @@ function pagehistory_GET(Web &$w)
         }
 
         // Get wiki object and check for existance
-        $wiki = $w->Wiki->getWikiByName($pm['wikiname']);
+        $wiki = WikiService::getInstance($w)->getWikiByName($pm['wikiname']);
         // Register for timelog
 
         if (empty($wiki->id)) {
@@ -30,7 +30,7 @@ function pagehistory_GET(Web &$w)
         }
 
         // Set navigation
-        $w->Wiki->navigation($w, $wiki, $pm["pagename"]);
+        WikiService::getInstance($w)->navigation($w, $wiki, $pm["pagename"]);
 
         $w->ctx("wiki", $wiki);
         $w->ctx("page", $wp);

wiki/actions/preview.php → actions/preview.php

@@ -7,7 +7,7 @@ function preview_GET(Web &$w)
 {
     try {
         $pm = $w->pathMatch("wikiname", "pagename");
-        $wiki = $w->Wiki->getWikiByName($pm['wikiname']);
+        $wiki = WikiService::getInstance($w)->getWikiByName($pm['wikiname']);
         if (!$wiki) {
             $w->error("Wiki does not exist.");
         }

wiki/actions/view.php → actions/view.php

@@ -11,7 +11,7 @@ function view_GET(Web &$w)
         }
 
         // Get wiki object and check for existance
-        $wiki = $w->Wiki->getWikiByName($pm['wikiname']);
+        $wiki = WikiService::getInstance($w)->getWikiByName($pm['wikiname']);
 
         if (empty($wiki->id)) {
             $w->error("Wiki does not exist.");
@@ -23,7 +23,7 @@ function view_GET(Web &$w)
         }
         $wp = $wiki->getPage($pm['pagename']);
         // Register for timelog
-        $w->Timelog->registerTrackingObject($wp);
+        TimelogService::getInstance($w)->registerTrackingObject($wp);
 
         if (!$wp) {
             $wp = $wiki->addPage($pm['pagename'], "New Page.");
@@ -38,7 +38,7 @@ function view_GET(Web &$w)
         }
 
         // Set navigation
-        $w->Wiki->navigation($w, $wiki, $pm["pagename"]);
+        WikiService::getInstance($w)->navigation($w, $wiki, $pm["pagename"]);
 
         // Set edt wiki form
         $editForm = [
@@ -64,7 +64,7 @@ function view_GET(Web &$w)
         $w->ctx("wiki_hist", $wiki->getHistory());
         $w->ctx("page_hist", $wp->getHistory());
         $w->ctx("wiki_users", $wiki->getUsers());
-        $w->ctx("attachments", $w->service("File")->getAttachments($wp));
+        $w->ctx("attachments", FileService::getInstance($w)->getAttachments($wp));
         $w->ctx("title", $wiki->title . " - " . $wp->name);
 
         // render form without form tag or buttons (which have been moved into the template) by using the false value for the last parameter

wiki/actions/viewhistoryversion.php → actions/viewhistoryversion.php

@@ -11,7 +11,7 @@ function viewhistoryversion_POST(Web &$w)
         }
 
         // Get wiki object and check for existance
-        $wiki = $w->Wiki->getWikiByName($pm['wikiname']);
+        $wiki = WikiService::getInstance($w)->getWikiByName($pm['wikiname']);
         // Register for timelog
 
         if (empty($wiki->id)) {
@@ -35,9 +35,9 @@ function viewhistoryversion_POST(Web &$w)
         }
 
         // Set navigation
-        $w->Wiki->navigation($w, $wiki, $pm["pagename"]);
+        WikiService::getInstance($w)->navigation($w, $wiki, $pm["pagename"]);
 
-        $wikiHistory = $w->Wiki->getObject("WikiPageHistory", $pm["historyid"]);
+        $wikiHistory = WikiService::getInstance($w)->getObject("WikiPageHistory", $pm["historyid"]);
         if (!$wikiHistory) {
             $w->error('No such history item');
         }
@@ -67,9 +67,9 @@ function viewhistoryversion_GET(Web &$w)
         }
 
         // Get wiki object and check for existance
-        $wiki = $w->Wiki->getWikiByName($pm['wikiname']);
+        $wiki = WikiService::getInstance($w)->getWikiByName($pm['wikiname']);
         // Register for timelog
-        $w->Timelog->registerTrackingObject($wiki);
+        TimelogService::getInstance($w)->registerTrackingObject($wiki);
 
         if (empty($wiki->id)) {
             $w->error("Wiki does not exist.");
@@ -92,9 +92,9 @@ function viewhistoryversion_GET(Web &$w)
         }
 
         // Set navigation
-        $w->Wiki->navigation($w, $wiki, $pm["pagename"]);
+        WikiService::getInstance($w)->navigation($w, $wiki, $pm["pagename"]);
 
-        $wikiHistory = $w->Wiki->getObject("WikiPageHistory", $pm["historyid"]);
+        $wikiHistory = WikiService::getInstance($w)->getObject("WikiPageHistory", $pm["historyid"]);
         if (!$wikiHistory) {
             $w->error('No such history item');
         }

wiki/models/Wiki.php → models/Wiki.php

@@ -109,7 +109,7 @@ public function insert($force_validation = false)
             throw new WikiException("This wiki needs a title.");
         }
         $this->name = $this->getName();
-        $this->owner_id = $this->w->Auth->user()->id;
+        $this->owner_id = AuthService::getInstance($this->w)->user()->id;
 
         // check if wiki of the same name exists!
         $ow = $this->Wiki->getWikiByName($this->getName());
@@ -122,7 +122,7 @@ public function insert($force_validation = false)
         } else {
             $this->addPage("HomePage", "#This is the HomePage");
         }
-        $this->addUser($this->w->Auth->user(), "editor");
+        $this->addUser(AuthService::getInstance($this->w)->user(), "editor");
     }
 
     /*****************************
@@ -185,7 +185,7 @@ public function canView(User $user)
     public function canEdit(User $user)
     {
         $wu = $this->getObject("WikiUser", ["user_id" => $user->id, "wiki_id" => $this->id, "role" => "editor"]);
-        return $this->Auth->user()->is_admin || $this->isOwner($user)  || (!empty($wu) && $wu->role == "editor");
+        return AuthService::getInstance($this->w)->user()->is_admin || $this->isOwner($user)  || (!empty($wu) && $wu->role == "editor");
     }
 
     /*****************************
@@ -194,7 +194,7 @@ public function canEdit(User $user)
      *****************************/
     public function canDelete(User $user)
     {
-        if ($this->isOwner($user) || $this->Auth->user()->is_admin) {
+        if ($this->isOwner($user) || AuthService::getInstance($this->w)->user()->is_admin) {
             return true;
         } else {
             return false;

wiki/models/WikiINode.php → models/WikiINode.php

@@ -15,7 +15,7 @@ function getChildren()
         $children = $this->getDBObject()->getPages();
         if (is_array($children)) {
             foreach ($children as  $object) {
-                if ($object->canList($this->w->Auth->user())) {
+                if ($object->canList(AuthService::getInstance($this->w)->user())) {
                     $iNode = new WikiPageINode($this->w, $object);
                     $result[] = $iNode;
                 }
@@ -33,7 +33,7 @@ public function getChild($name)
         $children = $this->getDBObject()->getPages();
         if (is_array($children)) {
             foreach ($children as $object) {
-                if ($object->canView($this->w->Auth->user())) {
+                if ($object->canView(AuthService::getInstance($this->w)->user())) {
                     if ($object->getSelectOptionTitle() == $name) {
                         $result = new WikiPageINode($this->w, $object);
                     } else {
@@ -48,7 +48,7 @@ public function getChild($name)
             if (is_array($children)) {
                 foreach ($children as  $object) {
                     if ($object->filename == $name) {
-                        if ($object->canView($this->w->Auth->user())) {
+                        if ($object->canView(AuthService::getInstance($this->w)->user())) {
                             $result = new AttachmentINode($this->w, $object);
                         } else {
                             throw new Exception('No access to this attachment');

wiki/models/WikiPage.php → models/WikiPage.php

@@ -120,7 +120,7 @@ public function printSearchListing()
     {
         $txt = "Last Modified: ";
         $txt .= formatDateTime($this->dt_modified);
-        $txt .= " by " . $this->Auth->getUser($this->modifier_id)->getFullName();
+        $txt .= " by " . AuthService::getInstance($this->w)->getUser($this->modifier_id)->getFullName();
         return $txt;
     }
 

wiki/models/WikiService.php → models/WikiService.php

@@ -13,7 +13,7 @@ class WikiService extends DbService
     public function getWikiById($wiki_id)
     {
         $wiki = $this->getObject("Wiki", $wiki_id);
-        if ($wiki && $wiki->canRead($this->w->Auth->user())) {
+        if ($wiki && $wiki->canRead(AuthService::getInstance($this->w)->user())) {
             return $wiki;
         } else {
             throw new WikiNoAccessException("You have no access to this wiki.");
@@ -33,7 +33,7 @@ public function getWikiByName($name)
             return null;
         }
 
-        if ($wiki->canRead($this->w->Auth->user())) {
+        if ($wiki->canRead(AuthService::getInstance($this->w)->user())) {
             return $wiki;
         } else {
             throw new WikiNoAccessException("You have no access to this wiki.");
@@ -48,7 +48,7 @@ public function getWikis()
         $wikis = $this->getObjects("Wiki", ["is_deleted" => 0]);
         if (!empty($wikis)) {
             foreach ($wikis as $wiki) {
-                if ($wiki->canRead($this->w->Auth->user())) {
+                if ($wiki->canRead(AuthService::getInstance($this->w)->user())) {
                     $ret[] = $wiki;
                 }
             }

wiki/models/WikiUser.php → models/WikiUser.php

@@ -7,7 +7,7 @@ class WikiUser extends DbObject
 
     public function getUser()
     {
-        return $this->Auth->getUser($this->user_id);
+        return AuthService::getInstance($this->w)->getUser($this->user_id);
     }
 
     public function getFullName()

wiki/templates/createwiki.tpl.php → templates/createwiki.tpl.php

@@ -1,4 +1,5 @@
 <?php
+
 $lines = [
     "Create Wiki" => [
         [

wiki/templates/editmember.tpl.php → templates/editmember.tpl.php

@@ -1,7 +1,7 @@
 <?php
 
 $lines[] = ["Wiki Member", "section"];
-$lines[] = ["User", "autocomplete", "user_id", $mem->user_id, $w->Auth->getUsersForRole("wiki_user")];
+$lines[] = ["User", "autocomplete", "user_id", $mem->user_id, AuthService::getInstance($w)->getUsersForRole("wiki_user")];
 $lines[] = ["Role", "select", "role", $mem->role, ["reader", "editor"]];
 
 echo Html::form($lines, $w->localUrl("/wiki/editmember/" . $wiki->id . "/" . $mem->id), "POST", "Save");

wiki/templates/history.tpl.php → templates/history.tpl.php

@@ -8,7 +8,7 @@
         $table[] = [
             formatDateTime($wh["dt_created"]),
             Html::a(WEBROOT . "/wiki/viewhistoryversion/" . $wiki->name . "/" . $page->name . "/" . $wh['id'], "<b>" . $page->name . "</b>"),
-            $w->Auth->getUser($wh['creator_id'])->getFullName()
+            AuthService::getInstance($w)->getUser($wh['creator_id'])->getFullName()
         ];
     }
     echo Html::table($table, "history", "tablesorter", true);

wiki/templates/index.tpl.php → templates/index.tpl.php

@@ -14,22 +14,22 @@
     ];
 
     foreach ($wikis as $wi) {
-        if ($wi->canView($w->Auth->user())) {
+        if ($wi->canView(AuthService::getInstance($w)->user())) {
             $wikiCount++;
             $lastModifiedPage = "";
             $lastModifiedPageUser = "";
             $lastModifiedDate = "";
             if ($wi->last_modified_page_id > 0) {
                 $p = $wi->getPageById($wi->last_modified_page_id);
                 if (!empty($p)) {
-                    $wuser = $w->Auth->getUser($p->modifier_id);
-                    $lastModifiedPageUser = empty($wuser) ? '' : $w->Auth->getUser($p->modifier_id)->getFullName();
+                    $wuser = AuthService::getInstance($w)->getUser($p->modifier_id);
+                    $lastModifiedPageUser = empty($wuser) ? '' : AuthService::getInstance($w)->getUser($p->modifier_id)->getFullName();
                     $lastModifiedPage = $p->name;
                     $lastModifiedDate = $p->dt_modified;
                 }
             }
             $delLink = "";
-            if ($wi->canDelete($w->Auth->user())) {
+            if ($wi->canDelete(AuthService::getInstance($w)->user())) {
                 $delLink = Html::ab(WEBROOT . "/wiki/delwiki/" . $wi->id, 'Delete', 'deletebutton', '', 'Do you really want to delete this wiki and all of its pages?');
             }
             $table[] = [