aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/class/Application.php (renamed from app/class/application.php)1
-rw-r--r--app/class/Config.php (renamed from app/class/config.php)1
-rw-r--r--app/class/Controller.php (renamed from app/class/controller.php)7
-rw-r--r--app/class/Controlleradmin.php (renamed from app/class/controlleradmin.php)2
-rw-r--r--app/class/Controllerconnect.php (renamed from app/class/controllerconnect.php)2
-rw-r--r--app/class/Controllerfont.php (renamed from app/class/controllerfont.php)2
-rw-r--r--app/class/Controllerhome.php (renamed from app/class/controllerhome.php)2
-rw-r--r--app/class/Controllerinfo.php (renamed from app/class/controllerinfo.php)2
-rw-r--r--app/class/Controllermedia.php (renamed from app/class/controllermedia.php)2
-rw-r--r--app/class/Controllerpage.php (renamed from app/class/controllerpage.php)5
-rw-r--r--app/class/Controllertimeline.php (renamed from app/class/controllertimeline.php)2
-rw-r--r--app/class/Controlleruser.php (renamed from app/class/controlleruser.php)2
-rw-r--r--app/class/Dbitem.php (renamed from app/class/dbitem.php)2
-rw-r--r--app/class/Element.php (renamed from app/class/element.php)2
-rw-r--r--app/class/Event.php (renamed from app/class/event.php)6
-rw-r--r--app/class/Flywheel/Formatter/JSON.php (renamed from app/class/wflywheel/formatter/json.php)2
-rw-r--r--app/class/Flywheel/Predicate.php (renamed from app/class/wflywheel/predicate.php)2
-rw-r--r--app/class/Flywheel/Query.php (renamed from app/class/wflywheel/query.php)2
-rw-r--r--app/class/Flywheel/Repository.php (renamed from app/class/wflywheel/repository.php)2
-rw-r--r--app/class/Media.php (renamed from app/class/media.php)2
-rw-r--r--app/class/Medialist.php (renamed from app/class/medialist.php)2
-rw-r--r--app/class/Model.php (renamed from app/class/model.php)3
-rw-r--r--app/class/Modelanalyse.php (renamed from app/class/modelanalyse.php)2
-rw-r--r--app/class/Modelconfig.php (renamed from app/class/modelconfig.php)2
-rw-r--r--app/class/Modeldb.php45
-rw-r--r--app/class/Modelfont.php (renamed from app/class/modelfont.php)2
-rw-r--r--app/class/Modelhome.php (renamed from app/class/modelhome.php)2
-rw-r--r--app/class/Modelmassedit.php (renamed from app/class/modelmassedit.php)0
-rw-r--r--app/class/Modelmedia.php (renamed from app/class/modelmedia.php)2
-rw-r--r--app/class/Modelpage.php (renamed from app/class/modelpage.php)9
-rw-r--r--app/class/Modelrender.php (renamed from app/class/modelrender.php)2
-rw-r--r--app/class/Modeltimeline.php (renamed from app/class/modeltimeline.php)6
-rw-r--r--app/class/Modeluser.php (renamed from app/class/modeluser.php)6
-rw-r--r--app/class/Opt.php (renamed from app/class/opt.php)3
-rw-r--r--app/class/Optlist.php (renamed from app/class/optlist.php)2
-rw-r--r--app/class/Page.php (renamed from app/class/page.php)6
-rw-r--r--app/class/Quickcss.php (renamed from app/class/quickcss.php)2
-rw-r--r--app/class/Record.php (renamed from app/class/record.php)2
-rw-r--r--app/class/Route.php (renamed from app/class/route.php)2
-rw-r--r--app/class/Routes.php (renamed from app/class/routes.php)5
-rw-r--r--app/class/User.php (renamed from app/class/user.php)5
-rw-r--r--app/class/modeldb.php37
-rw-r--r--app/fn/fn.php11
-rw-r--r--app/view/templates/admin.php58
-rw-r--r--app/view/templates/alert.php26
-rw-r--r--app/view/templates/backtopbar.php14
-rw-r--r--app/view/templates/edit.php4
-rw-r--r--app/view/templates/editleftbar.php2
-rw-r--r--app/view/templates/edittopbar.php6
-rw-r--r--app/view/templates/home.php12
-rw-r--r--app/view/templates/homemenu.php6
-rw-r--r--app/view/templates/layout.php10
-rw-r--r--app/view/templates/media.php4
53 files changed, 221 insertions, 129 deletions
diff --git a/app/class/application.php b/app/class/Application.php
index 784a388..70c899f 100644
--- a/app/class/application.php
+++ b/app/class/Application.php
@@ -1,4 +1,5 @@
<?php
+namespace Wcms;
class Application
{
diff --git a/app/class/config.php b/app/class/Config.php
index 3d67908..1a4bb17 100644
--- a/app/class/config.php
+++ b/app/class/Config.php
@@ -1,6 +1,7 @@
<?php
+namespace Wcms;
abstract class Config
{
diff --git a/app/class/controller.php b/app/class/Controller.php
index a5bd33b..32ffc13 100644
--- a/app/class/controller.php
+++ b/app/class/Controller.php
@@ -1,5 +1,10 @@
<?php
+namespace Wcms;
+
+use DateTimeImmutable;
+use League\Plates\Engine;
+
class Controller
{
/** @var User */
@@ -36,7 +41,7 @@ class Controller
public function initplates()
{
$router = $this->router;
- $this->plates = new League\Plates\Engine(Model::TEMPLATES_DIR);
+ $this->plates = new Engine(Model::TEMPLATES_DIR);
$this->plates->registerFunction('url', function (string $string, array $vars = []) use ($router) {
return $router->generate($string, $vars);
});
diff --git a/app/class/controlleradmin.php b/app/class/Controlleradmin.php
index dda0a54..3935bff 100644
--- a/app/class/controlleradmin.php
+++ b/app/class/Controlleradmin.php
@@ -1,5 +1,7 @@
<?php
+namespace Wcms;
+
class Controlleradmin extends Controller
{
diff --git a/app/class/controllerconnect.php b/app/class/Controllerconnect.php
index 1bd0a5a..592c0ee 100644
--- a/app/class/controllerconnect.php
+++ b/app/class/Controllerconnect.php
@@ -1,5 +1,7 @@
<?php
+namespace Wcms;
+
class Controllerconnect extends Controller
{
diff --git a/app/class/controllerfont.php b/app/class/Controllerfont.php
index 8f87e3a..63b3ced 100644
--- a/app/class/controllerfont.php
+++ b/app/class/Controllerfont.php
@@ -1,5 +1,7 @@
<?php
+namespace Wcms;
+
class Controllerfont extends Controller
{
/**
diff --git a/app/class/controllerhome.php b/app/class/Controllerhome.php
index d263611..003a325 100644
--- a/app/class/controllerhome.php
+++ b/app/class/Controllerhome.php
@@ -1,5 +1,7 @@
<?php
+namespace Wcms;
+
class Controllerhome extends Controllerpage
{
/** @var Modelhome */
diff --git a/app/class/controllerinfo.php b/app/class/Controllerinfo.php
index 82d247d..af81caf 100644
--- a/app/class/controllerinfo.php
+++ b/app/class/Controllerinfo.php
@@ -1,5 +1,7 @@
<?php
+namespace Wcms;
+
class Controllerinfo extends Controller
{
diff --git a/app/class/controllermedia.php b/app/class/Controllermedia.php
index 6cde0ce..f596550 100644
--- a/app/class/controllermedia.php
+++ b/app/class/Controllermedia.php
@@ -1,5 +1,7 @@
<?php
+namespace Wcms;
+
class Controllermedia extends Controller
{
/**
diff --git a/app/class/controllerpage.php b/app/class/Controllerpage.php
index 86aecba..5ab2928 100644
--- a/app/class/controllerpage.php
+++ b/app/class/Controllerpage.php
@@ -1,5 +1,10 @@
<?php
+namespace Wcms;
+
+use DateTimeImmutable;
+use DateTimeZone;
+
class Controllerpage extends Controller
{
/** @var Page */
diff --git a/app/class/controllertimeline.php b/app/class/Controllertimeline.php
index 7e617e1..8fc40d2 100644
--- a/app/class/controllertimeline.php
+++ b/app/class/Controllertimeline.php
@@ -1,5 +1,7 @@
<?php
+namespace Wcms;
+
class Controllertimeline extends Controller
{
/**
diff --git a/app/class/controlleruser.php b/app/class/Controlleruser.php
index d56d999..3856914 100644
--- a/app/class/controlleruser.php
+++ b/app/class/Controlleruser.php
@@ -1,5 +1,7 @@
<?php
+namespace Wcms;
+
class Controlleruser extends Controller
{
diff --git a/app/class/dbitem.php b/app/class/Dbitem.php
index 2035316..fb272b1 100644
--- a/app/class/dbitem.php
+++ b/app/class/Dbitem.php
@@ -1,5 +1,7 @@
<?php
+namespace Wcms;
+
class Dbitem
{
public function hydrate($datas)
diff --git a/app/class/element.php b/app/class/Element.php
index 113daad..09f4e35 100644
--- a/app/class/element.php
+++ b/app/class/Element.php
@@ -1,5 +1,7 @@
<?php
+namespace Wcms;
+
class Element
{
protected $fullmatch;
diff --git a/app/class/event.php b/app/class/Event.php
index ddf177b..8c1e155 100644
--- a/app/class/event.php
+++ b/app/class/Event.php
@@ -1,5 +1,11 @@
<?php
+namespace Wcms;
+
+use DateTime;
+use DateTimeImmutable;
+use DateTimeZone;
+
class Event extends Dbitem
{
protected $id;
diff --git a/app/class/wflywheel/formatter/json.php b/app/class/Flywheel/Formatter/JSON.php
index d015cc1..9659fcb 100644
--- a/app/class/wflywheel/formatter/json.php
+++ b/app/class/Flywheel/Formatter/JSON.php
@@ -1,5 +1,5 @@
<?php
-namespace WFlywheel\Formatter;
+namespace Wcms\Flywheel\Formatter;
class JSON implements \JamesMoss\Flywheel\Formatter\FormatInterface
{
diff --git a/app/class/wflywheel/predicate.php b/app/class/Flywheel/Predicate.php
index 2229461..2922c8d 100644
--- a/app/class/wflywheel/predicate.php
+++ b/app/class/Flywheel/Predicate.php
@@ -1,5 +1,5 @@
<?php
-namespace WFlywheel;
+namespace Wcms\Flywheel;
class Predicate extends \JamesMoss\Flywheel\Predicate
{
diff --git a/app/class/wflywheel/query.php b/app/class/Flywheel/Query.php
index 49aff16..f002080 100644
--- a/app/class/wflywheel/query.php
+++ b/app/class/Flywheel/Query.php
@@ -1,5 +1,5 @@
<?php
-namespace WFlywheel;
+namespace Wcms\Flywheel;
class Query extends \JamesMoss\Flywheel\Query
{
diff --git a/app/class/wflywheel/repository.php b/app/class/Flywheel/Repository.php
index baad42e..d0b68eb 100644
--- a/app/class/wflywheel/repository.php
+++ b/app/class/Flywheel/Repository.php
@@ -1,5 +1,5 @@
<?php
-namespace WFlywheel;
+namespace Wcms\Flywheel;
class Repository extends \JamesMoss\Flywheel\Repository
{
diff --git a/app/class/media.php b/app/class/Media.php
index d458a33..b30b883 100644
--- a/app/class/media.php
+++ b/app/class/Media.php
@@ -1,5 +1,7 @@
<?php
+namespace Wcms;
+
class Media
{
private $id;
diff --git a/app/class/medialist.php b/app/class/Medialist.php
index 156ee2e..da5ba4f 100644
--- a/app/class/medialist.php
+++ b/app/class/Medialist.php
@@ -1,5 +1,7 @@
<?php
+namespace Wcms;
+
class Medialist
{
/** @var string full regex match */
diff --git a/app/class/model.php b/app/class/Model.php
index 45ac2d1..81ad626 100644
--- a/app/class/model.php
+++ b/app/class/Model.php
@@ -1,4 +1,7 @@
<?php
+
+namespace Wcms;
+
abstract class Model
{
diff --git a/app/class/modelanalyse.php b/app/class/Modelanalyse.php
index 66a443e..9f656f5 100644
--- a/app/class/modelanalyse.php
+++ b/app/class/Modelanalyse.php
@@ -1,6 +1,6 @@
<?php
-
+namespace Wcms;
class Modelanalyse extends Modelpage
{
diff --git a/app/class/modelconfig.php b/app/class/Modelconfig.php
index 7c5fc18..518f64e 100644
--- a/app/class/modelconfig.php
+++ b/app/class/Modelconfig.php
@@ -1,5 +1,7 @@
<?php
+namespace Wcms;
+
abstract class Modelconfig extends Model
{
public static function readconfig()
diff --git a/app/class/Modeldb.php b/app/class/Modeldb.php
new file mode 100644
index 0000000..756fd81
--- /dev/null
+++ b/app/class/Modeldb.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Wcms;
+
+use JamesMoss\Flywheel\Config;
+use Wcms\Flywheel\Formatter\JSON;
+use Wcms\Flywheel\Query;
+use Wcms\Flywheel\Repository;
+
+class Modeldb extends Model
+{
+ protected $database;
+ /** @var Repository */
+ protected $repo;
+
+
+ public function __construct()
+ {
+ $this->dbinit();
+ }
+
+
+ public function dbinit()
+ {
+ $this->database = new Config(Model::DATABASE_DIR, [
+ 'query_class' => Query::class,
+ 'formatter' => new JSON,
+ ]);
+ }
+
+ public function storeinit(string $repo)
+ {
+ $this->repo = new Repository($repo, $this->database);
+ }
+
+ public function list()
+ {
+ return $this->repo->getAllIds();
+ }
+
+
+
+
+
+}
diff --git a/app/class/modelfont.php b/app/class/Modelfont.php
index 8e7645e..3f25e21 100644
--- a/app/class/modelfont.php
+++ b/app/class/Modelfont.php
@@ -1,5 +1,7 @@
<?php
+namespace Wcms;
+
class Modelfont extends Model
{
diff --git a/app/class/modelhome.php b/app/class/Modelhome.php
index d90a3d3..f12f7d3 100644
--- a/app/class/modelhome.php
+++ b/app/class/Modelhome.php
@@ -1,5 +1,7 @@
<?php
+namespace Wcms;
+
class Modelhome extends Modelpage
{
diff --git a/app/class/modelmassedit.php b/app/class/Modelmassedit.php
index e69de29..e69de29 100644
--- a/app/class/modelmassedit.php
+++ b/app/class/Modelmassedit.php
diff --git a/app/class/modelmedia.php b/app/class/Modelmedia.php
index 8cd0224..6ac647f 100644
--- a/app/class/modelmedia.php
+++ b/app/class/Modelmedia.php
@@ -1,5 +1,7 @@
<?php
+namespace Wcms;
+
class Modelmedia extends Model
{
diff --git a/app/class/modelpage.php b/app/class/Modelpage.php
index 68ccf23..58bd5d3 100644
--- a/app/class/modelpage.php
+++ b/app/class/Modelpage.php
@@ -1,4 +1,9 @@
<?php
+
+namespace Wcms;
+
+use JamesMoss\Flywheel\Document;
+
class Modelpage extends Modeldb
{
@@ -60,7 +65,7 @@ class Modelpage extends Modeldb
public function add(Page $page)
{
- $pagedata = new \JamesMoss\Flywheel\Document($page->dry());
+ $pagedata = new Document($page->dry());
$pagedata->setId($page->id());
$this->repo->store($pagedata);
}
@@ -148,7 +153,7 @@ class Modelpage extends Modeldb
public function update(Page $page)
{
- $pagedata = new \JamesMoss\Flywheel\Document($page->dry());
+ $pagedata = new Document($page->dry());
$pagedata->setId($page->id());
$this->repo->store($pagedata);
}
diff --git a/app/class/modelrender.php b/app/class/Modelrender.php
index 237d9b5..9f668d4 100644
--- a/app/class/modelrender.php
+++ b/app/class/Modelrender.php
@@ -1,5 +1,7 @@
<?php
+namespace Wcms;
+
class Modelrender extends Modelpage
{
protected $router;
diff --git a/app/class/modeltimeline.php b/app/class/Modeltimeline.php
index fa4f709..248e0f6 100644
--- a/app/class/modeltimeline.php
+++ b/app/class/Modeltimeline.php
@@ -1,5 +1,9 @@
<?php
+namespace Wcms;
+
+use JamesMoss\Flywheel\Document;
+
class Modeltimeline extends Modeldb
{
const EVENT_BASE = ['message'];
@@ -64,7 +68,7 @@ class Modeltimeline extends Modeldb
*/
public function add(Event $event) : bool
{
- $eventdata = new \JamesMoss\Flywheel\Document($event->dry());
+ $eventdata = new Document($event->dry());
$eventdata->setId($event->id());
$result = $this->repo->store($eventdata);
return $result;
diff --git a/app/class/modeluser.php b/app/class/Modeluser.php
index 893a608..c921b4c 100644
--- a/app/class/modeluser.php
+++ b/app/class/Modeluser.php
@@ -1,5 +1,9 @@
<?php
+namespace Wcms;
+
+use JamesMoss\Flywheel\Document;
+
class Modeluser extends Modeldb
{
const ADMIN = 10;
@@ -148,7 +152,7 @@ class Modeluser extends Modeldb
*/
public function add(User $user) : bool
{
- $userdata = new \JamesMoss\Flywheel\Document($user->dry());
+ $userdata = new Document($user->dry());
$userdata->setId($user->id());
return $this->repo->store($userdata);
}
diff --git a/app/class/opt.php b/app/class/Opt.php
index bf732c5..803edce 100644
--- a/app/class/opt.php
+++ b/app/class/Opt.php
@@ -1,4 +1,7 @@
<?php
+
+namespace Wcms;
+
class Opt
{
protected $sortby = 'id';
diff --git a/app/class/optlist.php b/app/class/Optlist.php
index e21e421..d6a9cdb 100644
--- a/app/class/optlist.php
+++ b/app/class/Optlist.php
@@ -1,5 +1,7 @@
<?php
+namespace Wcms;
+
class Optlist extends Opt
{
protected $title = 1;
diff --git a/app/class/page.php b/app/class/Page.php
index a55e7cb..2fa4060 100644
--- a/app/class/page.php
+++ b/app/class/Page.php
@@ -1,5 +1,11 @@
<?php
+namespace Wcms;
+
+use DateTime;
+use DateTimeImmutable;
+use DateTimeZone;
+
class Page
{
protected $id;
diff --git a/app/class/quickcss.php b/app/class/Quickcss.php
index dc7dbac..0173763 100644
--- a/app/class/quickcss.php
+++ b/app/class/Quickcss.php
@@ -1,5 +1,7 @@
<?php
+namespace Wcms;
+
class Quickcss
{
diff --git a/app/class/record.php b/app/class/Record.php
index e488383..381f10a 100644
--- a/app/class/record.php
+++ b/app/class/Record.php
@@ -1,5 +1,7 @@
<?php
+namespace Wcms;
+
class Record
{
private $id;
diff --git a/app/class/route.php b/app/class/Route.php
index 8e58945..4f2a6de 100644
--- a/app/class/route.php
+++ b/app/class/Route.php
@@ -1,5 +1,7 @@
<?php
+namespace Wcms;
+
class Route
{
protected $id = null;
diff --git a/app/class/routes.php b/app/class/Routes.php
index 44f30bd..a803bd6 100644
--- a/app/class/routes.php
+++ b/app/class/Routes.php
@@ -1,5 +1,8 @@
<?php
+namespace Wcms;
+
+use AltoRouter;
class Routes
{
@@ -59,7 +62,7 @@ class Routes
$match = $router->match();
if ($match) {
$callableParts = explode('#', $match['target']);
- $controllerName = $callableParts[0];
+ $controllerName = '\\Wcms\\' . $callableParts[0];
$methodName = $callableParts[1];
$controller = new $controllerName($router);
diff --git a/app/class/user.php b/app/class/User.php
index 3f9c19a..8712c72 100644
--- a/app/class/user.php
+++ b/app/class/User.php
@@ -1,5 +1,10 @@
<?php
+namespace Wcms;
+
+use DateTimeImmutable;
+use DateTimeZone;
+
class User
{
protected $id;
diff --git a/app/class/modeldb.php b/app/class/modeldb.php
deleted file mode 100644
index ef1d351..0000000
--- a/app/class/modeldb.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-class Modeldb extends Model
-{
- protected $database;
- /** @var \WFlywheel\Repository */
- protected $repo;
-
-
- public function __construct()
- {
- $this->dbinit();
- }
-
-
- public function dbinit()
- {
- $this->database = new \JamesMoss\Flywheel\Config(Model::DATABASE_DIR, [
- 'query_class' => "\WFlywheel\Query",
- 'formatter' => new \WFlywheel\Formatter\JSON,
- ]);
- }
-
- public function storeinit(string $repo)
- {
- $this->repo = new \WFlywheel\Repository($repo, $this->database);
- }
-
- public function list()
- {
- return $this->repo->getAllIds();
- }
-
-
-
-
-
-}
diff --git a/app/fn/fn.php b/app/fn/fn.php
index 9c011ef..f462d2d 100644
--- a/app/fn/fn.php
+++ b/app/fn/fn.php
@@ -1,14 +1,5 @@
<?php
-
-function class_autoloader($class)
-{
- require('.'. DIRECTORY_SEPARATOR . 'app' . DIRECTORY_SEPARATOR . 'class' . DIRECTORY_SEPARATOR . strtolower(str_replace('\\', DIRECTORY_SEPARATOR, $class)) . '.php');
-}
-
-
-
-
function readablesize($bytes)
{
$format = ' %d %s';
@@ -76,7 +67,7 @@ function idclean(string $input)
$input = preg_replace('%[^a-z0-9-_+]%', '', strtolower(trim($input)));
- $input = substr($input, 0, Model::MAX_ID_LENGTH);
+ $input = substr($input, 0, Wcms\Model::MAX_ID_LENGTH);
return $input;
}
diff --git a/app/view/templates/admin.php b/app/view/templates/admin.php
index 46e5045..d8255ba 100644
--- a/app/view/templates/admin.php
+++ b/app/view/templates/admin.php
@@ -29,27 +29,27 @@
<p>Here you can set the home-page view for visitors.</p>
<div class="radio">
- <input type="radio" name="homepage" value="default" id="default" <?= Config::homepage() === 'default' ? 'checked' : '' ?>>
+ <input type="radio" name="homepage" value="default" id="default" <?= Wcms\Config::homepage() === 'default' ? 'checked' : '' ?>>
<label for="default">default</label>
</div>
<div class="radio">
- <input type="radio" name="homepage" value="search" id="searchbar" <?= Config::homepage() === 'search' ? 'checked' : '' ?>>
+ <input type="radio" name="homepage" value="search" id="searchbar" <?= Wcms\Config::homepage() === 'search' ? 'checked' : '' ?>>
<label for="searchbar">search bar</label>
</div>
<div class="radio">
- <input type="radio" name="homepage" value="redirect" id="redirect" <?= Config::homepage() === 'redirect' ? 'checked' : '' ?>>
+ <input type="radio" name="homepage" value="redirect" id="redirect" <?= Wcms\Config::homepage() === 'redirect' ? 'checked' : '' ?>>
<label for="redirect">redirect to page</label>
</div>
<select name="homeredirect" id="homeredirect">
- <option value="" <?= Config::homeredirect() === null ? 'selected' : '' ?>>--select page to redirect--</option>
+ <option value="" <?= Wcms\Config::homeredirect() === null ? 'selected' : '' ?>>--select page to redirect--</option>
<?php
foreach ($pagelist as $page) {
?>
- <option value="<?= $page ?>" <?= Config::homeredirect() === $page ? 'selected' : '' ?>><?= $page ?></option>
+ <option value="<?= $page ?>" <?= Wcms\Config::homeredirect() === $page ? 'selected' : '' ?>><?= $page ?></option>
<?php
}
@@ -67,9 +67,9 @@
<label for="defaultprivacy">Default privacy</label>
<select name="defaultprivacy" id="defaultprivacy">
- <option value="0" <?= Config::defaultprivacy() == 0 ? 'selected' : '' ?>>public</option>
- <option value="1" <?= Config::defaultprivacy() == 1 ? 'selected' : '' ?>>private</option>
- <option value="2" <?= Config::defaultprivacy() == 2 ? 'selected' : '' ?>>not published</option>
+ <option value="0" <?= Wcms\Config::defaultprivacy() == 0 ? 'selected' : '' ?>>public</option>
+ <option value="1" <?= Wcms\Config::defaultprivacy() == 1 ? 'selected' : '' ?>>private</option>
+ <option value="2" <?= Wcms\Config::defaultprivacy() == 2 ? 'selected' : '' ?>>not published</option>
</select>
@@ -78,20 +78,20 @@
<label for="defaultpage">Or, create new page BODY based on an already existing one</label>
<select name="defaultpage" id="defaultpage">
- <option value="" <?= Config::defaultpage() === '' || !$defaultpageexist ? 'selected' : '' ?>>--use default BODY element--</option>
+ <option value="" <?= Wcms\Config::defaultpage() === '' || !$defaultpageexist ? 'selected' : '' ?>>--use default BODY element--</option>
<?php
foreach ($pagelist as $page) {
?>
- <option value="<?= $page ?>" <?= Config::defaultpage() === $page ? 'selected' : '' ?>><?= $page ?></option>
+ <option value="<?= $page ?>" <?= Wcms\Config::defaultpage() === $page ? 'selected' : '' ?>><?= $page ?></option>
<?php }
?>
</select>
<?php
- if (empty(!$defaultpageexist || Config::defaultpage())) {
+ if (empty(!$defaultpageexist || Wcms\Config::defaultpage())) {
?>
<label for="defaultbody">Edit default BODY element</label>
- <textarea name="defaultbody" id="defaultbody" cols="30" rows="10"><?= Config::defaultbody() ?></textarea>
+ <textarea name="defaultbody" id="defaultbody" cols="30" rows="10"><?= Wcms\Config::defaultbody() ?></textarea>
<?php
}
?>
@@ -107,23 +107,23 @@
<h4>Common options</h4>
<label for="alerttitle">H1 Title</label>
- <input type="text" name="alerttitle" id="alerttitle" value="<?= Config::alerttitle() ?>">
+ <input type="text" name="alerttitle" id="alerttitle" value="<?= Wcms\Config::alerttitle() ?>">
<label for="alertlink">Link to this page (for visitors)</label>
<select name="alertlink" id="alertlink">
- <option value="" <?= empty(Config::alertlink()) ? 'selected' : '' ?>>--No link--</option>
+ <option value="" <?= empty(Wcms\Config::alertlink()) ? 'selected' : '' ?>>--No link--</option>
<?php
foreach ($pagelist as $page) {
?>
- <option value="<?= $page ?>" <?= Config::alertlink() === $page ? 'selected' : '' ?>><?= $page ?></option>
+ <option value="<?= $page ?>" <?= Wcms\Config::alertlink() === $page ? 'selected' : '' ?>><?= $page ?></option>
<?php }
?>
</select>
<label for="alertlinktext">Link text</label>
- <input type="text" name="alertlinktext" id="alertlinktext" value="<?= Config::alertlinktext() ?>">
+ <input type="text" name="alertlinktext" id="alertlinktext" value="<?= Wcms\Config::alertlinktext() ?>">
@@ -131,33 +131,33 @@
<label for="existnot">Text to show when a page does not exist yet.</label>
<i>This will also be shown as a tooltip over links.</i>
- <input type="text" name="existnot" id="existnot" value="<?= Config::existnot() ?>">
+ <input type="text" name="existnot" id="existnot" value="<?= Wcms\Config::existnot() ?>">
<div class="checkbox">
<input type="hidden" name="existnotpass" value="0">
- <input type="checkbox" name="existnotpass" id="existnotpass" value="1" <?= Config::existnotpass() ? 'checked' : '' ?>>
+ <input type="checkbox" name="existnotpass" id="existnotpass" value="1" <?= Wcms\Config::existnotpass() ? 'checked' : '' ?>>
<label for="existnotpass">Ask for password</label>
</div>
<h4>Private</h4>
<label for="private">Text to show when a page is private.</label>
- <input type="text" name="private" id="private" value="<?= Config::private() ?>">
+ <input type="text" name="private" id="private" value="<?= Wcms\Config::private() ?>">
<div class="checkbox">
<input type="hidden" name="privatepass" value="0">
- <input type="checkbox" name="privatepass" id="privatepass" value="1" <?= Config::privatepass() ? 'checked' : '' ?>>
+ <input type="checkbox" name="privatepass" id="privatepass" value="1" <?= Wcms\Config::privatepass() ? 'checked' : '' ?>>
<label for="privatepass">Ask for password</label>
</div>
<h4>Not published</h4>
<label for="notpublished">Text to show when a page is not published.</label>
- <input type="text" name="notpublished" id="notpublished" value="<?= Config::notpublished() ?>">
+ <input type="text" name="notpublished" id="notpublished" value="<?= Wcms\Config::notpublished() ?>">
<div class="checkbox">
<input type="hidden" name="notpublishedpass" value="0">
- <input type="checkbox" name="notpublishedpass" id="notpublishedpass" value="1" <?= Config::notpublishedpass() ? 'checked' : '' ?>>
+ <input type="checkbox" name="notpublishedpass" id="notpublishedpass" value="1" <?= Wcms\Config::notpublishedpass() ? 'checked' : '' ?>>
<label for="notpublishedpass">Ask for password</label>
</div>
@@ -165,7 +165,7 @@
<div class="checkbox">
<input type="hidden" name="alertcss" value="0">
- <input type="checkbox" name="alertcss" id="alertcss" value="1" <?= Config::alertcss() ? 'checked' : '' ?>>
+ <input type="checkbox" name="alertcss" id="alertcss" value="1" <?= Wcms\Config::alertcss() ? 'checked' : '' ?>>
<label for="alertcss">Use global.css for those page as well</label>
</div>
@@ -183,7 +183,7 @@
<div class="checkbox">
<input type="hidden" name="reccursiverender" value="0">
- <input type="checkbox" name="reccursiverender" id="reccursiverender" value="1" <?= Config::reccursiverender() ? 'checked' : '' ?>>
+ <input type="checkbox" name="reccursiverender" id="reccursiverender" value="1" <?= Wcms\Config::reccursiverender() ? 'checked' : '' ?>>
<label for="reccursiverender">Reccursive render</label>
</div>
@@ -192,13 +192,13 @@
<div class="checkbox">
<input type="hidden" name="externallinkblank" value="0">
- <input type="checkbox" name="externallinkblank" id="externallinkblank" value="1" <?= Config::externallinkblank() ? 'checked' : '' ?>>
+ <input type="checkbox" name="externallinkblank" id="externallinkblank" value="1" <?= Wcms\Config::externallinkblank() ? 'checked' : '' ?>>
<label for="externallinkblank">Open external links in new tab</label>
</div>
<div class="checkbox">
<input type="hidden" name="internallinkblank" value="0">
- <input type="checkbox" name="internallinkblank" id="internallinkblank" value="1" <?= Config::internallinkblank() ? 'checked' : '' ?>>
+ <input type="checkbox" name="internallinkblank" id="internallinkblank" value="1" <?= Wcms\Config::internallinkblank() ? 'checked' : '' ?>>
<label for="internallinkblank">Open internal links in new tab</label>
</div>
@@ -224,7 +224,7 @@
<?php
foreach ($faviconlist as $favicon) {
?>
- <option value="<?= $favicon ?>" <?= Config::defaultfavicon() === $favicon ? 'selected' : '' ?>><?= $favicon ?></option>
+ <option value="<?= $favicon ?>" <?= Wcms\Config::defaultfavicon() === $favicon ? 'selected' : '' ?>><?= $favicon ?></option>
<?php
}
?>
@@ -249,7 +249,7 @@
<?php
foreach ($interfacecsslist as $interfacecss) {
?>
- <option value="<?= $interfacecss ?>" <?= $interfacecss === Config::interfacecss() ? 'selected' : '' ?>><?= $interfacecss ?></option>
+ <option value="<?= $interfacecss ?>" <?= $interfacecss === Wcms\Config::interfacecss() ? 'selected' : '' ?>><?= $interfacecss ?></option>
<?php
}
?>
@@ -266,7 +266,7 @@
<h2>Tracking</h2>
<label for="analytics">Google analytics Tracking ID</label>
- <input type="text" name="analytics" id="analytics" value="<?= Config::analytics() ?>">
+ <input type="text" name="analytics" id="analytics" value="<?= Wcms\Config::analytics() ?>">
<i>(Need rendering to work)</i>
diff --git a/app/view/templates/alert.php b/app/view/templates/alert.php
index c4a54b1..bab6410 100644
--- a/app/view/templates/alert.php
+++ b/app/view/templates/alert.php
@@ -7,7 +7,7 @@ $this->start('head');
?>
<head>
- <?= Config::alertcss() ? '<link href="' . Model::globalpath() . 'global.css" rel="stylesheet" />' : '' ?>
+ <?= Wcms\Config::alertcss() ? '<link href="' . Wcms\Model::globalpath() . 'global.css" rel="stylesheet" />' : '' ?>
</head>
@@ -28,7 +28,7 @@ $this->stop();
- <?= !empty(Config::alerttitle()) ? '<h1>' . Config::alerttitle() . '</h1>' : '' ?>
+ <?= !empty(Wcms\Config::alerttitle()) ? '<h1>' . Wcms\Config::alerttitle() . '</h1>' : '' ?>
<?php
@@ -43,10 +43,10 @@ $this->stop();
if(!$pageexist) {
- if(!empty(Config::existnot())) {
- echo '<h2>' . Config::existnot() . '</h2>';
+ if(!empty(Wcms\Config::existnot())) {
+ echo '<h2>' . Wcms\Config::existnot() . '</h2>';
}
- if(Config::existnotpass() && !$canedit) {
+ if(Wcms\Config::existnotpass() && !$canedit) {
echo $form;
}
} else {
@@ -55,19 +55,19 @@ $this->stop();
switch ($page->secure()) {
case 1:
- if(!empty(Config::private())) {
- echo '<h2>' . Config::private() . '</h2>';
+ if(!empty(Wcms\Config::private())) {
+ echo '<h2>' . Wcms\Config::private() . '</h2>';
}
- if(Config::privatepass()) {
+ if(Wcms\Config::privatepass()) {
echo $form;
}
break;
case 2:
- if(!empty(Config::notpublished())) {
- echo '<h2>' . Config::notpublished() . '</h2>';
+ if(!empty(Wcms\Config::notpublished())) {
+ echo '<h2>' . Wcms\Config::notpublished() . '</h2>';
}
- if(Config::notpublishedpass()) {
+ if(Wcms\Config::notpublishedpass()) {
echo $form;
}
break;
@@ -80,9 +80,9 @@ $this->stop();
?>
<p><a href="<?= $this->upage('pageadd', $page->id()) ?>">⭐ Create</a></p>
<?php
- } elseif(!empty(Config::alertlink())) {
+ } elseif(!empty(Wcms\Config::alertlink())) {
?>
- <p><a href="<?= $this->upage('pageread/', Config::alertlink()) ?>"><?= empty(Config::alertlinktext()) ? Config::alertlink() : Config::alertlinktext() ?></a></p>
+ <p><a href="<?= $this->upage('pageread/', Wcms\Config::alertlink()) ?>"><?= empty(Wcms\Config::alertlinktext()) ? Wcms\Config::alertlink() : Wcms\Config::alertlinktext() ?></a></p>
<?php
}
diff --git a/app/view/templates/backtopbar.php b/app/view/templates/backtopbar.php
index e9266a6..c632d66 100644
--- a/app/view/templates/backtopbar.php
+++ b/app/view/templates/backtopbar.php
@@ -23,22 +23,22 @@
<span id="menu">
<a href="<?= $this->url('home') ?>" <?= $tab == 'home' ? 'class="actualpage"' : '' ?>>
- <img src="<?= Model::iconpath() ?>home.png" alt="" class="icon">
+ <img src="<?= Wcms\Model::iconpath() ?>home.png" alt="" class="icon">
<span class="hidephone">home</span>
</a>
<a href="<?= $this->url('media') ?>" <?= $tab == 'media' ? 'class="actualpage"' : '' ?>>
- <img src="<?= Model::iconpath() ?>media.png" alt="" class="icon">
+ <img src="<?= Wcms\Model::iconpath() ?>media.png" alt="" class="icon">
<span class="hidephone">media</span>
</a>
<a href="<?= $this->url('font') ?>" <?= $tab == 'font' ? 'class="actualpage"' : '' ?>>
- <img src="<?= Model::iconpath() ?>font.png" alt="" class="icon">
+ <img src="<?= Wcms\Model::iconpath() ?>font.png" alt="" class="icon">
<span class="hidephone">font</span>
</a>
<?php
if($user->isadmin()) {
?>
<a href="<?= $this->url('admin') ?>" <?= $tab == 'admin' ? 'class="actualpage"' : '' ?>>
- <img src="<?= Model::iconpath() ?>admin.png" alt="" class="icon">
+ <img src="<?= Wcms\Model::iconpath() ?>admin.png" alt="" class="icon">
<span class="hidephone">admin</span>
</a>
@@ -46,7 +46,7 @@ if($user->isadmin()) {
}
?>
<a href="<?= $this->url('info') ?>" <?= $tab == 'info' ? 'class="actualpage"' : '' ?>>
- <img src="<?= Model::iconpath() ?>info.png" alt="" class="icon">
+ <img src="<?= Wcms\Model::iconpath() ?>info.png" alt="" class="icon">
<span class="hidephone">info</span>
</a>
</span>
@@ -75,11 +75,11 @@ if($user->isadmin()) {
<span>
<a href="<?= $this->url('timeline') ?>" <?= $tab == 'timeline' ? 'class="actualpage"' : '' ?>>
- <img src="<?= Model::iconpath() ?>timeline.png" alt="" class="icon">
+ <img src="<?= Wcms\Model::iconpath() ?>timeline.png" alt="" class="icon">
<span class="hidephone">timeline</span>
</a>
<a href="<?= $this->url('user') ?>" <?= $tab == 'user' ? 'class="actualpage"' : '' ?>>
- <img src="<?= Model::iconpath() ?>user.png" alt="" class="icon">
+ <img src="<?= Wcms\Model::iconpath() ?>user.png" alt="" class="icon">
<span class="hidephone"><?= $user->id() ?></span>
</a>
<i><?= $user->level() ?></i>
diff --git a/app/view/templates/edit.php b/app/view/templates/edit.php
index 28e245f..2de0c9b 100644
--- a/app/view/templates/edit.php
+++ b/app/view/templates/edit.php
@@ -5,7 +5,7 @@
<?php $this->start('page') ?>
-<style>.tabs textarea{font-size: <?= Config::fontsize() ?>px}</style>
+<style>.tabs textarea{font-size: <?= Wcms\Config::fontsize() ?>px}</style>
<body>
<main class="editor">
@@ -30,7 +30,7 @@
<script>
const pageid = '<?= $page->id() ?>';
</script>
-<script src="<?= Model::jspath() ?>edit.bundle.js"></script>
+<script src="<?= Wcms\Model::jspath() ?>edit.bundle.js"></script>
</body>
<?php $this->stop('page') ?> \ No newline at end of file
diff --git a/app/view/templates/editleftbar.php b/app/view/templates/editleftbar.php
index d169473..c901c14 100644
--- a/app/view/templates/editleftbar.php
+++ b/app/view/templates/editleftbar.php
@@ -46,7 +46,7 @@
<div id="thumbnail">
<label for="thumbnail">Thumbnail</label>
<input type="file" id="thumbnail" name="thumbnail" accept=".jpg, .JPG, .jpeg, .JPEG">
- <img src="<?= Model::thumbnailpath() ?><?= $page->id() ?>.jpg" alt="no-thumbnail">
+ <img src="<?= Wcms\Model::thumbnailpath() ?><?= $page->id() ?>.jpg" alt="no-thumbnail">
</div>
diff --git a/app/view/templates/edittopbar.php b/app/view/templates/edittopbar.php
index 13cef96..5aa13ba 100644
--- a/app/view/templates/edittopbar.php
+++ b/app/view/templates/edittopbar.php
@@ -18,7 +18,7 @@
<a href="<?= $this->upage('pageread/', $page->id()) ?>" target="_blank" id="display">
- <img src="<?= Model::iconpath() ?>read.png" class="icon">
+ <img src="<?= Wcms\Model::iconpath() ?>read.png" class="icon">
<span class="hidephone">display</span>
</a>
<span id="headid"><?= $page->id() ?></span>
@@ -27,11 +27,11 @@
<span id="fontsize" class="hidephone">
<label for="fontsize">Font-size</label>
- <input type="number" name="fontsize" value="<?= Config::fontsize() ?>" id="editfontsize" min="5" max="99">
+ <input type="number" name="fontsize" value="<?= Wcms\Config::fontsize() ?>" id="editfontsize" min="5" max="99">
</span>
<span id="download" class="hidephone">
- <a href="<?= $this->upage('pagedownload', $page->id()) ?>"><img src="<?= Model::iconpath() ?>download.png" class="icon"><span class="text">download</span></a>
+ <a href="<?= $this->upage('pagedownload', $page->id()) ?>"><img src="<?= Wcms\Model::iconpath() ?>download.png" class="icon"><span class="text">download</span></a>
</span>
diff --git a/app/view/templates/home.php b/app/view/templates/home.php
index 2ee791a..9758c95 100644
--- a/app/view/templates/home.php
+++ b/app/view/templates/home.php
@@ -87,11 +87,11 @@
<tr>
<td class="hidephone"><input type="checkbox" name="id[]" value="<?= $item->id() ?>" id="id_<?= $item->id() ?>"></td>
<td><label title="<?= $item->title() ?>" for="id_<?= $item->id() ?>"><?= $item->id() ?></label></td>
- <td><a href="<?= $this->upage('pageedit', $item->id()) ?>"><img src="<?= Model::iconpath() ?>edit.png" class="icon"></a></td>
- <td><a href="<?= $this->upage('pageread/', $item->id()) ?>" target="_blank"><img src="<?= Model::iconpath() ?>read.png" class="icon"></a></td>
+ <td><a href="<?= $this->upage('pageedit', $item->id()) ?>"><img src="<?= Wcms\Model::iconpath() ?>edit.png" class="icon"></a></td>
+ <td><a href="<?= $this->upage('pageread/', $item->id()) ?>" target="_blank"><img src="<?= Wcms\Model::iconpath() ?>read.png" class="icon"></a></td>
<td class="delete"><a href="<?= $this->upage('pagedelete', $item->id()) ?>">✖</a></td>
<?php if ($user->issupereditor()) { ?>
- <td class="hidephone"><a href="<?= $this->upage('pagedownload', $item->id()) ?>" download><img src="<?= Model::iconpath() ?>download.png" class="icon"></a></td>
+ <td class="hidephone"><a href="<?= $this->upage('pagedownload', $item->id()) ?>" download><img src="<?= Wcms\Model::iconpath() ?>download.png" class="icon"></a></td>
<?php }
if ($columns['tag']) { ?>
<td class="tag"><a title="<?= $item->tag('string') ?>"><?= $item->tag('sort') ?></a></td>
@@ -141,7 +141,7 @@
</section>
- <?php if($user->display()['bookmark'] && (!empty(Config::bookmark()) || !empty($user->bookmark()))) { ?>
+ <?php if($user->display()['bookmark'] && (!empty(Wcms\Config::bookmark()) || !empty($user->bookmark()))) { ?>
<section class="hidephone" id="bookmark">
<div class="block">
@@ -149,7 +149,7 @@
<div class="scroll">
<strong>Public</strong>
<ul>
- <?php foreach (Config::bookmark() as $id => $query) { ?>
+ <?php foreach (Wcms\Config::bookmark() as $id => $query) { ?>
<li>
<a href="<?= $query ?>"><?= $id ?></a>
</li>
@@ -176,7 +176,7 @@
<?php } ?>
- <script src="<?= Model::jspath() ?>home.bundle.js"></script>
+ <script src="<?= Wcms\Model::jspath() ?>home.bundle.js"></script>
</body>
diff --git a/app/view/templates/homemenu.php b/app/view/templates/homemenu.php
index f807f7c..838ca81 100644
--- a/app/view/templates/homemenu.php
+++ b/app/view/templates/homemenu.php
@@ -159,10 +159,10 @@
<summary>Bookmarks</summary>
<div class="submenu">
<h2>Public</h2>
- <?php if(!empty(Config::bookmark())) { ?>
+ <?php if(!empty(Wcms\Config::bookmark())) { ?>
<form action="<?= $this->url('homebookmark') ?>" method="post">
<ul>
- <?php foreach (Config::bookmark() as $id => $query) { ?>
+ <?php foreach (Wcms\Config::bookmark() as $id => $query) { ?>
<li>
<label for="public-bookmark_<?= $id ?>">
<a href="<?= $query ?>" title="<?= $query ?>"><?= $id ?></a>
@@ -236,7 +236,7 @@
<form action="<?= $this->url('homecolumns') ?>" method="post">
<ul>
<?php
- foreach (Model::COLUMNS as $col) { ?>
+ foreach (Wcms\Model::COLUMNS as $col) { ?>
<li>
<input type="checkbox" name="columns[]" value="<?= $col ?>" id="col_<?= $col ?>" <?= in_array($col, $user->columns()) ? 'checked' : '' ?>>
<label for="col_<?= $col ?>"><?= $col ?></label>
diff --git a/app/view/templates/layout.php b/app/view/templates/layout.php
index 91ae378..85351d6 100644
--- a/app/view/templates/layout.php
+++ b/app/view/templates/layout.php
@@ -7,15 +7,15 @@
<meta name="viewport" content="width=device-width" />
<?php if (!empty($favicon)) {
?>
- <link rel="shortcut icon" href="<?= Model::faviconpath() . $favicon ?>" type="image/x-icon">
- <?php } elseif (!empty(Config::defaultfavicon())) { ?>
- <link rel="shortcut icon" href="<?= Model::faviconpath() . Config::defaultfavicon() ?>" type="image/x-icon">
+ <link rel="shortcut icon" href="<?= Wcms\Model::faviconpath() . $favicon ?>" type="image/x-icon">
+ <?php } elseif (!empty(Wcms\Config::defaultfavicon())) { ?>
+ <link rel="shortcut icon" href="<?= Wcms\Model::faviconpath() . Wcms\Config::defaultfavicon() ?>" type="image/x-icon">
<?php } ?>
<title><?= $title ?></title>
<link rel="stylesheet" href="<?= $css ?>">
<?php
- if (!empty(Config::interfacecss())) {
- echo '<link rel="stylesheet" href="' . Model::csspath() . Config::interfacecss() . '">';
+ if (!empty(Wcms\Config::interfacecss())) {
+ echo '<link rel="stylesheet" href="' . Wcms\Model::csspath() . Wcms\Config::interfacecss() . '">';
}
?>
</head>
diff --git a/app/view/templates/media.php b/app/view/templates/media.php
index ecd61b8..be1ac7f 100644
--- a/app/view/templates/media.php
+++ b/app/view/templates/media.php
@@ -100,10 +100,10 @@ treecount($dirlist, 'media', 0, 'media', $dir, $opt);
<label for="moveto">Selected medias :</label>
<select name="dir" id="moveto" >
<option selected>---select destination---</option>
- <option value="<?= Model::MEDIA_DIR ?>">/</option>
+ <option value="<?= Wcms\Model::MEDIA_DIR ?>">/</option>
<?php
foreach ($pathlist as $path) {
- echo '<option value="' . Model::MEDIA_DIR . $path . '">' . $path . '</option>';
+ echo '<option value="' . Wcms\Model::MEDIA_DIR . $path . '">' . $path . '</option>';
}
?>
</select>
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-22 16:38:59 +0000