From e802d5204b96d645ec3d40b81b4a8bdc6e0ee675 Mon Sep 17 00:00:00 2001 From: n-peugnet Date: Mon, 4 Nov 2019 23:31:31 +0100 Subject: refactor: switch to psr-4 autoloading --- app/class/Controllermedia.php | 115 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 app/class/Controllermedia.php (limited to 'app/class/Controllermedia.php') diff --git a/app/class/Controllermedia.php b/app/class/Controllermedia.php new file mode 100644 index 0000000..f596550 --- /dev/null +++ b/app/class/Controllermedia.php @@ -0,0 +1,115 @@ +mediamanager = new Modelmedia; + + } + + public function desktop() + { + if ($this->user->iseditor()) { + + if (!$this->mediamanager->dircheck(Model::MEDIA_DIR)) { + throw new Exception("Media error : Cant create /media folder"); + } + if (!$this->mediamanager->dircheck(Model::FAVICON_DIR)) { + throw new Exception("Media error : Cant create /media/favicon folder"); + } + if (!$this->mediamanager->dircheck(Model::THUMBNAIL_DIR)) { + throw new Exception("Media error : Cant create /media/thumbnail folder"); + } + + + $dir = rtrim($_GET['path'] ?? Model::MEDIA_DIR, DIRECTORY_SEPARATOR); + $sortby = isset($_GET['sortby']) ? $_GET['sortby'] : 'id'; + $order = isset($_GET['order']) ? $_GET['order'] : '1'; + $opt = ['dir' => $dir, 'sortby' => $sortby, 'order' => $order]; + + if(is_dir($dir)) { + $medialist = $this->mediamanager->getlistermedia($dir . DIRECTORY_SEPARATOR); + $faviconlist = $this->mediamanager->getlistermedia(Model::FAVICON_DIR); + + $dirlist = $this->mediamanager->listdir(Model::MEDIA_DIR); + + $pathlist = []; + + $this->mediamanager->listpath($dirlist, '', $pathlist); + + $this->mediamanager->medialistsort($medialist, $sortby, $order); + + $this->showtemplate('media', ['medialist' => $medialist, 'faviconlist' => $faviconlist, 'dirlist' => $dirlist, 'pathlist' =>$pathlist, 'dir' => $dir, 'opt' => $opt]); + } else { + $this->routedirect('media'); + } + + } else { + $this->routedirect('home'); + } + } + + public function upload() + { + if ($this->user->iseditor()) { + $target = $_POST['dir'] ?? Model::MEDIA_DIR; + if (!empty($_FILES['file']['name'][0])) { + $this->mediamanager->multiupload('file', $target); + } + $this->redirect($this->router->generate('media') . '?path=' . $target); + } else { + $this->routedirect('home'); + } + } + + public function folderadd() + { + if ($this->user->iseditor()) { + $dir = $_POST['dir'] ?? Model::MEDIA_DIR; + $name = idclean($_POST['foldername']) ?? 'new-folder'; + $this->mediamanager->adddir($dir, $name); + } + $this->redirect($this->router->generate('media') . '?path=' . $dir . DIRECTORY_SEPARATOR . $name); + + } + + public function folderdelete() + { + if(isset($_POST['dir'])) { + if(isset($_POST['deletefolder']) && intval($_POST['deletefolder']) && $this->user->issupereditor()) { + $this->mediamanager->deletedir($_POST['dir']); + } else { + $this->redirect($this->router->generate('media') . '?path=' . $_POST['dir']); + exit; + } + } + $this->redirect($this->router->generate('media')); + } + + public function edit() + { + if($this->user->issupereditor() && isset($_POST['action']) && isset($_POST['id'])) { + if($_POST['action'] == 'delete') { + $this->mediamanager->multifiledelete($_POST['id']); + } elseif ($_POST['action'] == 'move' && isset($_POST['dir'])) { + $this->mediamanager->multimovefile($_POST['id'], $_POST['dir']); + } + } + $this->redirect($this->router->generate('media') . '?path=' . $_POST['path']); + } + + +} + + +?> \ No newline at end of file -- cgit v1.2.3 From c77fe80b05829fbfd5b94f43a7b709e3f3ec6c0d Mon Sep 17 00:00:00 2001 From: n-peugnet Date: Wed, 6 Nov 2019 01:00:10 +0100 Subject: fix: some missed use statements --- app/class/Controllermedia.php | 2 ++ app/class/Controllerpage.php | 1 + app/class/Element.php | 2 ++ app/class/Modeldb.php | 4 ++-- app/class/Modelpage.php | 1 + app/class/Modelrender.php | 8 +++++--- 6 files changed, 13 insertions(+), 5 deletions(-) (limited to 'app/class/Controllermedia.php') diff --git a/app/class/Controllermedia.php b/app/class/Controllermedia.php index f596550..5958289 100644 --- a/app/class/Controllermedia.php +++ b/app/class/Controllermedia.php @@ -2,6 +2,8 @@ namespace Wcms; +use Exception; + class Controllermedia extends Controller { /** diff --git a/app/class/Controllerpage.php b/app/class/Controllerpage.php index 5ab2928..2a67106 100644 --- a/app/class/Controllerpage.php +++ b/app/class/Controllerpage.php @@ -4,6 +4,7 @@ namespace Wcms; use DateTimeImmutable; use DateTimeZone; +use Exception; class Controllerpage extends Controller { diff --git a/app/class/Element.php b/app/class/Element.php index 09f4e35..72eba8f 100644 --- a/app/class/Element.php +++ b/app/class/Element.php @@ -2,6 +2,8 @@ namespace Wcms; +use Exception; + class Element { protected $fullmatch; diff --git a/app/class/Modeldb.php b/app/class/Modeldb.php index 756fd81..32e12cb 100644 --- a/app/class/Modeldb.php +++ b/app/class/Modeldb.php @@ -2,7 +2,7 @@ namespace Wcms; -use JamesMoss\Flywheel\Config; +use JamesMoss\Flywheel; use Wcms\Flywheel\Formatter\JSON; use Wcms\Flywheel\Query; use Wcms\Flywheel\Repository; @@ -22,7 +22,7 @@ class Modeldb extends Model public function dbinit() { - $this->database = new Config(Model::DATABASE_DIR, [ + $this->database = new Flywheel\Config(Model::DATABASE_DIR, [ 'query_class' => Query::class, 'formatter' => new JSON, ]); diff --git a/app/class/Modelpage.php b/app/class/Modelpage.php index 58bd5d3..9438c96 100644 --- a/app/class/Modelpage.php +++ b/app/class/Modelpage.php @@ -2,6 +2,7 @@ namespace Wcms; +use Exception; use JamesMoss\Flywheel\Document; class Modelpage extends Modeldb diff --git a/app/class/Modelrender.php b/app/class/Modelrender.php index 9f668d4..778b327 100644 --- a/app/class/Modelrender.php +++ b/app/class/Modelrender.php @@ -2,6 +2,9 @@ namespace Wcms; +use Exception; +use Michelf\MarkdownExtra; + class Modelrender extends Modelpage { protected $router; @@ -398,9 +401,8 @@ class Modelrender extends Modelpage } public function markdown($text) - { - //use Michelf\MarkdownExtra; - $fortin = new Michelf\MarkdownExtra; + { + $fortin = new MarkdownExtra; // id in headers // $fortin->header_id_func = function ($header) { // return preg_replace('/[^\w]/', '', strtolower($header)); -- cgit v1.2.3