7 files changed, 58 insertions, 13 deletions

diff --git a/app/class/Controller.php b/app/class/Controller.php
index 56d4dfe..11a2c12 100644
--- a/app/class/Controller.php
+++ b/app/class/Controller.php
@@ -111,6 +111,7 @@ class Controller
     public function redirect($url)
     {
         header('Location: ' . $url);
+        exit;
     }
 
     public function routedirect(string $route, array $vars = [])
diff --git a/app/class/Controllermedia.php b/app/class/Controllermedia.php
index c6e5d6c..0d75de7 100644
--- a/app/class/Controllermedia.php
+++ b/app/class/Controllermedia.php
@@ -3,6 +3,7 @@
 namespace Wcms;
 
 use Exception;
+use InvalidArgumentException;
 use LogicException;
 
 class Controllermedia extends Controller
@@ -116,6 +117,33 @@ class Controllermedia extends Controller
                 $this->mediamanager->multimovefile($_POST['id'], $_POST['dir']);
             }
         }
-        $this->redirect($this->generate('media') . '?path=/' . $_POST['path']);
+        $this->redirect($this->generate('media') . $_POST['route']);
+    }
+
+    public function rename()
+    {
+        if (
+            $this->user->issupereditor()
+            && isset($_POST['oldid'])
+            && isset($_POST['newid'])
+            && isset($_POST['oldextension'])
+            && isset($_POST['newextension'])
+            && isset($_POST['path'])
+        ) {
+            $newid = idclean($_POST['newid']);
+            $newextension = idclean($_POST['newextension']);
+            if (!empty($newid) && !empty($newextension)) {
+                $oldname = $_POST['path'] . $_POST['oldid'] . '.' . $_POST['oldextension'];
+                $newname = $_POST['path'] . $newid . '.' . $newextension;
+                try {
+                    $this->mediamanager->rename($oldname, $newname);
+                } catch (InvalidArgumentException $e) {
+                    Model::sendflashmessage($e->getMessage(), 'error');
+                }
+            } else {
+                Model::sendflashmessage('Invalid name or extension', 'warning');
+            }
+        }
+        $this->redirect($this->generate('media') . $_POST['route']);
     }
 }
diff --git a/app/class/Media.php b/app/class/Media.php
index 312dd31..3a34a04 100644
--- a/app/class/Media.php
+++ b/app/class/Media.php
@@ -97,14 +97,14 @@ class Media extends Item
                 break;
                 
             case 'sound':
-                    $code = '<audio controls src="' . $this->getincludepath() . '"></audio>';
+                    $code = '<audio controls src="' . $this->getincludepath() . '"></audio>';
                 break;
                 
             case 'video':
                 $src = $this->getincludepath();
                 $ext = $this->extension;
-                $code = '<video controls="">';
-                $code .= '<source src="' . $src . '" type="video/' . $ext . '"></video>';
+                $code = '<video controls="">';
+                $code .= '<source src="' . $src . '" type="video/' . $ext . '"></video>';
                 break;
 
             default:
diff --git a/app/class/Model.php b/app/class/Model.php
index 3bf3675..e3b0c17 100644
--- a/app/class/Model.php
+++ b/app/class/Model.php
@@ -98,6 +98,12 @@ abstract class Model
         'error' => 'error'
     ];
 
+    public const SECURE_LEVELS = [
+        0 => 'public',
+        1 => 'private',
+        2 => 'not_published'
+    ];
+
     public const COLUMNS = [
         'id',
         'favicon',
diff --git a/app/class/Modelmedia.php b/app/class/Modelmedia.php
index 0b1d700..4da7707 100644
--- a/app/class/Modelmedia.php
+++ b/app/class/Modelmedia.php
@@ -2,6 +2,8 @@
 
 namespace Wcms;
 
+use Exception;
+use InvalidArgumentException;
 use phpDocumentor\Reflection\Types\Mixed_;
 
 class Modelmedia extends Model
@@ -364,4 +366,19 @@ class Modelmedia extends Model
             return true;
         }
     }
+
+    /**
+     * @param string $oldname
+     * @param string $newname
+     * @throws InvalidArgumentException if cant access file
+     */
+    public function rename(string $oldname, string $newname)
+    {
+        try {
+            accessfile($oldname);
+        } catch (InvalidArgumentException $e) {
+            throw new InvalidArgumentException($e->getMessage());
+        }
+        return rename($oldname, $newname);
+    }
 }
diff --git a/app/class/Page.php b/app/class/Page.php
index b1c6b49..a369aed 100644
--- a/app/class/Page.php
+++ b/app/class/Page.php
@@ -225,15 +225,7 @@ class Page extends Dbitem
     public function secure($type = 'int')
     {
         if ($type == 'string') {
-            if ($this->secure == 0) {
-                $secure = 'public';
-            }
-            if ($this->secure == 1) {
-                $secure = 'private';
-            }
-            if ($this->secure == 2) {
-                $secure = 'not_published';
-            }
+            return Model::SECURE_LEVELS[$this->secure];
         } else {
             return $this->secure;
         }
diff --git a/app/class/Routes.php b/app/class/Routes.php
index 59659ea..13bd2ac 100644
--- a/app/class/Routes.php
+++ b/app/class/Routes.php
@@ -35,6 +35,7 @@ class Routes
             ['POST', '/!media/folderadd', 'Controllermedia#folderadd', 'mediafolderadd'],
             ['POST', '/!media/folderdelete', 'Controllermedia#folderdelete', 'mediafolderdelete'],
             ['POST', '/!media/edit', 'Controllermedia#edit', 'mediaedit'],
+            ['POST', '/!media/rename', 'Controllermedia#rename', 'mediarename'],
             ['GET', '/!font', 'Controllerfont#desktop', 'font'],
             ['GET', '/!font/render', 'Controllerfont#render', 'fontrender'],
             ['POST', '/!font/add', 'Controllerfont#add', 'fontadd'],