r31k/bludit
2
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Delete page images, fix for #869

Browse Source
This commit is contained in:
Diego Najar 2018-11-23 20:15:50 +01:00
parent 8e528ca701
commit 5eb48f9060
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bl-kernel/admin/views/edit-user.php
View File

@ -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'=>''

3
bl-kernel/pages.class.php
View File

@ -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]);

2
bl-kernel/user.class.php
View File

@ -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);
}

2
bl-kernel/users.class.php
View File

@ -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'=>'',