diff options
Diffstat (limited to 'app/class')
-rw-r--r-- | app/class/Bookmark.php | 4 | ||||
-rw-r--r-- | app/class/Colors.php | 2 | ||||
-rw-r--r-- | app/class/Controller.php | 2 | ||||
-rw-r--r-- | app/class/Controllerfont.php | 6 | ||||
-rw-r--r-- | app/class/Controllerhome.php | 4 | ||||
-rw-r--r-- | app/class/Controllermedia.php | 6 | ||||
-rw-r--r-- | app/class/Controllerpage.php | 16 | ||||
-rw-r--r-- | app/class/Controlleruser.php | 2 | ||||
-rw-r--r-- | app/class/Item.php | 2 | ||||
-rw-r--r-- | app/class/Media.php | 18 | ||||
-rw-r--r-- | app/class/Model.php | 6 | ||||
-rw-r--r-- | app/class/Modeladmin.php | 2 | ||||
-rw-r--r-- | app/class/Modelfont.php | 2 | ||||
-rw-r--r-- | app/class/Modelhome.php | 8 | ||||
-rw-r--r-- | app/class/Modelmedia.php | 2 | ||||
-rw-r--r-- | app/class/Modelrender.php | 6 | ||||
-rw-r--r-- | app/class/Quickcss.php | 4 | ||||
-rw-r--r-- | app/class/Routes.php | 2 |
18 files changed, 47 insertions, 47 deletions
diff --git a/app/class/Bookmark.php b/app/class/Bookmark.php index 8b4d2f7..36a3fb7 100644 --- a/app/class/Bookmark.php +++ b/app/class/Bookmark.php @@ -40,7 +40,7 @@ class Bookmark extends Item - + // _____________________________ G E T __________________________________ @@ -82,7 +82,7 @@ class Bookmark extends Item } return false; } - + public function setquery($query) { if (is_string($query)) { diff --git a/app/class/Colors.php b/app/class/Colors.php index 731fbac..7c8f4ca 100644 --- a/app/class/Colors.php +++ b/app/class/Colors.php @@ -19,7 +19,7 @@ class Colors extends Item $this->rawcss = $this->readcssfile(); $this->tagcolor = $this->parsetagcss($this->rawcss); } - + if (!empty($taglist)) { $this->tagcolor = $this->removeaddtags($taglist); $this->rawcss = $this->tocss($this->tagcolor); diff --git a/app/class/Controller.php b/app/class/Controller.php index 7fb972c..429b149 100644 --- a/app/class/Controller.php +++ b/app/class/Controller.php @@ -27,7 +27,7 @@ class Controller protected $pagemanager; protected $plates; - + /** @var DateTimeImmutable */ protected $now; diff --git a/app/class/Controllerfont.php b/app/class/Controllerfont.php index 3717359..56ca3ae 100644 --- a/app/class/Controllerfont.php +++ b/app/class/Controllerfont.php @@ -8,7 +8,7 @@ class Controllerfont extends Controller * @var Modelfont */ protected $fontmanager; - + public function __construct($router) { parent::__construct($router); @@ -21,7 +21,7 @@ class Controllerfont extends Controller dircheck(Model::FONT_DIR); $fontlist = $this->fontmanager->getfontlist(); - + $this->showtemplate( 'font', [ @@ -34,7 +34,7 @@ class Controllerfont extends Controller $this->routedirect('home'); } } - + public function render() { $this->fontmanager->renderfontface(); diff --git a/app/class/Controllerhome.php b/app/class/Controllerhome.php index 4dd8227..5c4042b 100644 --- a/app/class/Controllerhome.php +++ b/app/class/Controllerhome.php @@ -52,7 +52,7 @@ class Controllerhome extends Controllerpage $vars['deepsearch'] = $deepsearch['regex']; $vars['searchopt'] = $deepsearch['searchopt']; $vars['display'] = $_GET['display'] ?? 'list'; - + if ($vars['display'] === 'map') { $vars['layout'] = $_GET['layout'] ?? 'cose-bilkent'; $vars['showorphans'] = boolval($_GET['showorphans'] ?? false); @@ -156,7 +156,7 @@ class Controllerhome extends Controllerpage $this->routedirect('home'); } } - + /** * Render every pages in the database */ diff --git a/app/class/Controllermedia.php b/app/class/Controllermedia.php index 678f28e..f377151 100644 --- a/app/class/Controllermedia.php +++ b/app/class/Controllermedia.php @@ -34,7 +34,7 @@ class Controllermedia extends Controller } catch (\InvalidArgumentException $exception) { throw new LogicException($exception->getMessage()); } - + $mediaopt = new Mediaopt($_GET); if (empty($mediaopt->path())) { $mediaopt->setpath(DIRECTORY_SEPARATOR . Model::MEDIA_DIR); @@ -42,7 +42,7 @@ class Controllermedia extends Controller if (is_dir($mediaopt->dir())) { $medialist = $this->mediamanager->medialistopt($mediaopt); - + $dirlist = $this->mediamanager->listdir(Model::MEDIA_DIR); $pathlist = []; @@ -59,7 +59,7 @@ class Controllermedia extends Controller $vars['dirlist'] = $dirlist; $vars['pathlist'] = $pathlist; $vars['mediaopt'] = $mediaopt; - + $this->showtemplate('media', $vars); } else { $this->routedirect('media'); diff --git a/app/class/Controllerpage.php b/app/class/Controllerpage.php index 2e1c285..0bb99a9 100644 --- a/app/class/Controllerpage.php +++ b/app/class/Controllerpage.php @@ -104,7 +104,7 @@ class Controllerpage extends Controller $renderengine->render($page); $page->setdaterender($now); $page->setlinkto($renderengine->linkto()); - + return $page; } @@ -269,7 +269,7 @@ class Controllerpage extends Controller { if ($this->user->isadmin()) { $file = Model::PAGES_DIR . Config::pagetable() . DIRECTORY_SEPARATOR . $id . '.json'; - + if (file_exists($file)) { header('Content-Description: File Transfer'); header('Content-Type: application/json; charset=utf-8'); @@ -297,17 +297,17 @@ class Controllerpage extends Controller if (!empty($_POST['id'])) { $page->setid(idclean($_POST['id'])); } - + if ($_POST['datecreation']) { $page->setdatecreation($this->now); } - + if ($_POST['author']) { $page->setauthors([$this->user->id()]); } - + $page->setdaterender($page->datecreation('date')); - + if ($_POST['erase'] || $this->pagemanager->get($page) === false) { if ($this->pagemanager->add($page)) { Model::sendflashmessage('Page successfully uploaded', 'success'); @@ -401,7 +401,7 @@ class Controllerpage extends Controller $this->pagemanager->update($this->page); - + //$this->showtemplate('updatemerge', $compare); } else { // If the editor session finished during the editing, let's try to reconnect to save the editing @@ -426,7 +426,7 @@ class Controllerpage extends Controller Config::savejson(); } } - + public function pagedirect($id) { $this->routedirect('pageread/', ['page' => idclean($id)]); diff --git a/app/class/Controlleruser.php b/app/class/Controlleruser.php index 1e61c1a..4e9c105 100644 --- a/app/class/Controlleruser.php +++ b/app/class/Controlleruser.php @@ -153,7 +153,7 @@ class Controlleruser extends Controller $this->routedirect('user'); } break; - + case 'confirmdelete': $user = new User($_POST); $this->usermanager->delete($user); diff --git a/app/class/Item.php b/app/class/Item.php index 091516c..81b47e9 100644 --- a/app/class/Item.php +++ b/app/class/Item.php @@ -110,7 +110,7 @@ abstract class Item } return $array; } - + /** * Tool for accessing different view of the same DateTimeImmutable var diff --git a/app/class/Media.php b/app/class/Media.php index 8ecc872..0ab703e 100644 --- a/app/class/Media.php +++ b/app/class/Media.php @@ -101,11 +101,11 @@ class Media extends Item case 'image': $code = ''; break; - + case 'sound': $code = '<audio controls src="' . $src . '"></audio>'; break; - + case 'video': $ext = $this->extension; $code = '<video controls=""><source src="' . $src . '" type="video/' . $ext . '"></video>'; @@ -115,7 +115,7 @@ class Media extends Item $code = '[' . $this->id . '](' . $src . ')'; break; } - + return $code; } @@ -125,27 +125,27 @@ class Media extends Item case 'image': $symbol = "🖼"; break; - + case 'sound': $symbol = "🎵"; break; - + case 'video': $symbol = "🎞"; break; - + case 'document': $symbol = "📓"; break; - + case 'archive': $symbol = "🗜"; break; - + case 'code': $symbol = "📄"; break; - + default: $symbol = "🎲"; break; diff --git a/app/class/Model.php b/app/class/Model.php index e3b0c17..2a9e788 100644 --- a/app/class/Model.php +++ b/app/class/Model.php @@ -40,8 +40,8 @@ abstract class Model 'grid' => 'grid', 'random' => 'random', ]; - - + + public const MEDIA_EXT = [ 'jpg' => 'image', 'jpeg' => 'image', @@ -153,7 +153,7 @@ abstract class Model { return self::dirtopath(Model::RENDER_DIR); } - + public static function csspath() { return self::dirtopath(Model::CSS_DIR); diff --git a/app/class/Modeladmin.php b/app/class/Modeladmin.php index 478bc77..3fe7cc5 100644 --- a/app/class/Modeladmin.php +++ b/app/class/Modeladmin.php @@ -15,7 +15,7 @@ class Modeladmin extends Model { $dblist = glob(self::PAGES_DIR . '*', GLOB_ONLYDIR); $dblist = array_map('basename', $dblist); - + return $dblist; } diff --git a/app/class/Modelfont.php b/app/class/Modelfont.php index 48885be..09cff8e 100644 --- a/app/class/Modelfont.php +++ b/app/class/Modelfont.php @@ -6,7 +6,7 @@ class Modelfont extends Model { protected const FONT_TYPES = ['woff2', 'woff', 'otf', 'ttf', 'eot', 'svg']; - + public function getfontlist() diff --git a/app/class/Modelhome.php b/app/class/Modelhome.php index 680cfa9..5be1e72 100644 --- a/app/class/Modelhome.php +++ b/app/class/Modelhome.php @@ -4,7 +4,7 @@ namespace Wcms; class Modelhome extends Modelpage { - + public function __construct() { parent::__construct(); @@ -23,7 +23,7 @@ class Modelhome extends Modelpage } - + /** * @param array $pagelist of Pages objects as `id => Page` * @param Opt $opt @@ -44,7 +44,7 @@ class Modelhome extends Modelpage return $pagelist; } - + /** * Filter the pages list acording to the options and invert @@ -144,7 +144,7 @@ class Modelhome extends Modelpage } - + /** * Transform list of page into list of nodes and edges * diff --git a/app/class/Modelmedia.php b/app/class/Modelmedia.php index 89a2305..e2e2105 100644 --- a/app/class/Modelmedia.php +++ b/app/class/Modelmedia.php @@ -85,7 +85,7 @@ class Modelmedia extends Model $order = ($order === 1 || $order === -1) ? $order : 1; return usort($medialist, $this->buildsorter($sortby, $order)); } - + public function buildsorter($sortby, $order) { return function ($media1, $media2) use ($sortby, $order) { diff --git a/app/class/Modelrender.php b/app/class/Modelrender.php index b3ecb60..2e59da3 100644 --- a/app/class/Modelrender.php +++ b/app/class/Modelrender.php @@ -337,13 +337,13 @@ class Modelrender extends Modelpage public function bodyparser(string $text) { $text = $this->media($text); - + $text = $this->summary($text); $text = $this->wurl($text); $text = $this->wikiurl($text); - - + + $text = str_replace('href="http', "class=\"external\" $this->externallinkblank href=\"http", $text); diff --git a/app/class/Quickcss.php b/app/class/Quickcss.php index e2ee9f4..4801a16 100644 --- a/app/class/Quickcss.php +++ b/app/class/Quickcss.php @@ -11,7 +11,7 @@ class Quickcss extends Item private $units = []; private $new = []; private $jsoncss = []; - + private $quickcss = []; public const COLOR = ['color', 'background-color', 'border-color', 'text-decoration-color']; @@ -98,7 +98,7 @@ class Quickcss extends Item } } - + public function setjson($jsoncss) { if (!empty($jsoncss) && is_string($jsoncss)) { diff --git a/app/class/Routes.php b/app/class/Routes.php index 0433079..db9b72a 100644 --- a/app/class/Routes.php +++ b/app/class/Routes.php @@ -80,7 +80,7 @@ class Routes $methodName = $callableParts[1]; $controller = new $controllerName($router); - + call_user_func_array(array($controller, $methodName), $match['params']); } else { header($_SERVER["SERVER_PROTOCOL"] . ' 404 Not Found'); |