diff --git a/bl-kernel/admin/views/edit-user.php b/bl-kernel/admin/views/edit-user.php index 99bb64d6..8cf89fa3 100644 --- a/bl-kernel/admin/views/edit-user.php +++ b/bl-kernel/admin/views/edit-user.php @@ -53,7 +53,7 @@ echo Bootstrap::formSelect(array( 'name'=>'role', 'label'=>$L->g('Role'), - 'options'=>array('editor'=>$L->g('Editor'), 'admin'=>$L->g('Administrator')), + 'options'=>array('writer'=>$L->g('Writer'), 'editor'=>$L->g('Editor'), 'admin'=>$L->g('Administrator')), 'selected'=>$user->role(), 'class'=>'', 'tip'=>'' diff --git a/bl-kernel/pages.class.php b/bl-kernel/pages.class.php index a5fb9592..51e9990c 100644 --- a/bl-kernel/pages.class.php +++ b/bl-kernel/pages.class.php @@ -280,6 +280,9 @@ class Pages extends dbJSON { Log::set(__METHOD__.LOG_SEP.'Error occurred when trying to delete the directory '.PATH_PAGES.$key); } + // Delete page images directory; The function already check if exists the directory + Filesystem::deleteRecursive(PATH_UPLOADS_PAGES.$this->db[$key]['uuid']); + // Remove from database unset($this->db[$key]); diff --git a/bl-kernel/user.class.php b/bl-kernel/user.class.php index e5734671..7881c153 100644 --- a/bl-kernel/user.class.php +++ b/bl-kernel/user.class.php @@ -13,7 +13,7 @@ class User { $row = $users->getDefaultFields(); } else { if (Text::isEmpty($username) || !$users->exists($username)) { - $errorMessage = 'User not found in database by username ['.$username.']'; + $errorMessage = 'User not found in the database by username ['.$username.']'; Log::set(__METHOD__.LOG_SEP.$errorMessage); throw new Exception($errorMessage); } diff --git a/bl-kernel/users.class.php b/bl-kernel/users.class.php index fc533d0b..be8db936 100644 --- a/bl-kernel/users.class.php +++ b/bl-kernel/users.class.php @@ -6,7 +6,7 @@ class Users extends dbJSON { 'firstName'=>'', 'lastName'=>'', 'nickname'=>'', - 'role'=>'editor', // admin, editor + 'role'=>'editor', // admin, editor, writer 'password'=>'', 'salt'=>'!Pink Floyd!Welcome to the machine!', 'email'=>'',