diff options
Diffstat (limited to 'app/class')
| -rw-r--r-- | app/class/controllerfont.php | 2 | ||||
| -rw-r--r-- | app/class/controllerhome.php | 9 | ||||
| -rw-r--r-- | app/class/controllerinfo.php | 25 | ||||
| -rw-r--r-- | app/class/controllermedia.php | 6 | ||||
| -rw-r--r-- | app/class/modelmedia.php | 40 | ||||
| -rw-r--r-- | app/class/routes.php | 4 |
6 files changed, 66 insertions, 20 deletions
diff --git a/app/class/controllerfont.php b/app/class/controllerfont.php index b1cd0d9..7a59cd6 100644 --- a/app/class/controllerfont.php +++ b/app/class/controllerfont.php @@ -14,7 +14,7 @@ class Controllerfont extends Controller public function desktop() { - if($this->user->isadmin()) { + if($this->user->iseditor()) { $fontlist = $this->fontmanager->getfontlist(); diff --git a/app/class/controllerhome.php b/app/class/controllerhome.php index 4d5feb8..1309adb 100644 --- a/app/class/controllerhome.php +++ b/app/class/controllerhome.php @@ -48,6 +48,15 @@ class Controllerhome extends Controller } + public function search() + { + if(isset($_POST['id']) && !empty($_POST['id'])) { + $this->routedirect('artread/', ['art' => $_POST['id']]); + } else { + $this->routedirect('home'); + } + } + diff --git a/app/class/controllerinfo.php b/app/class/controllerinfo.php new file mode 100644 index 0000000..8f8b494 --- /dev/null +++ b/app/class/controllerinfo.php @@ -0,0 +1,25 @@ +<?php + +class Controllerinfo extends Controller +{ + + public function __construct($render) { + parent::__construct($render); + + + } + + public function desktop() + { + if($this->user->iseditor()) { + $this->showtemplate('info', []); + } + } + + + + +} + + +?>
\ No newline at end of file diff --git a/app/class/controllermedia.php b/app/class/controllermedia.php index 48f803b..1fa564b 100644 --- a/app/class/controllermedia.php +++ b/app/class/controllermedia.php @@ -14,7 +14,11 @@ class Controllermedia extends Controller public function desktop() { - + if($this->user->iseditor()) { + $medialist = $this->mediamanager->getlistermedia(Model::MEDIA_DIR); + $faviconlist = $this->mediamanager->getlistermedia(Model::FAVICON_DIR); + $this->showtemplate('media', ['medialist' => $medialist, 'faviconlist' => $faviconlist]); + } } public function addmedia() diff --git a/app/class/modelmedia.php b/app/class/modelmedia.php index a5c48fe..3402a04 100644 --- a/app/class/modelmedia.php +++ b/app/class/modelmedia.php @@ -40,17 +40,20 @@ class Modelmedia extends Model { $fileinfo = pathinfo($entry); - $filepath = $fileinfo['dirname'] . '.' . $fileinfo['extension']; - - $donnees = array( - 'id' => str_replace('.' . $fileinfo['extension'], '', $fileinfo['filename']), - 'path' => $dir, - 'extension' => $fileinfo['extension'] - ); - + if(isset($fileinfo['extension'])) { + $filepath = $fileinfo['dirname'] . '.' . $fileinfo['extension']; + + $datas = array( + 'id' => str_replace('.' . $fileinfo['extension'], '', $fileinfo['filename']), + 'path' => $dir, + 'extension' => $fileinfo['extension'] + ); + return new Media($datas); + } else { + return false; + } - return new Media($donnees); } @@ -63,21 +66,24 @@ class Modelmedia extends Model $media = $this->getmedia($entry, $dir); - - $media->analyse(); - - if (in_array($type, self::MEDIA_TYPES)) { - if ($media->type() == $type) { + if($media != false) { + + $media->analyse(); + + if (in_array($type, self::MEDIA_TYPES)) { + if ($media->type() == $type) { + $list[] = $media; + } + } else { $list[] = $media; } - } else { - $list[] = $media; + } + } } - return $list; } return $list; diff --git a/app/class/routes.php b/app/class/routes.php index 6eb992b..b324e64 100644 --- a/app/class/routes.php +++ b/app/class/routes.php @@ -17,10 +17,12 @@ class Routes ['GET|POST', '/', 'Controllerhome#desktop', 'home'], ['POST', '/!co', 'Controllerconnect#log', 'log'], ['GET', '/!co', 'Controllerconnect#connect', 'connect'], - ['GET', '/!m', 'Controllermedia#desktop', 'media'], + ['POST', '/!search', 'Controllerhome#search', 'search'], + ['GET', '/!media', 'Controllermedia#desktop', 'media'], ['GET', '/!font', 'Controllerfont#desktop', 'font'], ['POST', '/!admin', 'Controlleradmin#update', 'adminupdate'], ['GET', '/!admin', 'Controlleradmin#desktop', 'admin'], + ['GET', '/!info', 'Controllerinfo#desktop', 'info'], ['GET', '/!font/render', 'Controllerfont#render', 'fontrender'], ['POST', '/!font/add', 'Controllerfont#add', 'fontadd'], ['GET', '/[cid:art]/', 'Controllerart#read', 'artread/'], |