bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2025-06-13 03:17:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'folder1'

Browse Source
This commit is contained in:
SJ
2015-09-18 15:03:40 +02:00
parent 7826f7966b 04a0f2b6ef
commit afbc0f0d54
17 changed files with 167 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webui/controller/folder/list.php
View File

@ -19,7 +19,7 @@ class ControllerFolderList extends Controller {
$this->document->title = $this->data['text_folders'];
if(isset($this->request->post['name']) && $this->request->post['name']) {
$this->model_folder_folder->add_extra_folder($this->request->post['name']);
$this->model_folder_folder->add_folder($this->request->post['name']);
Header("Location: folders.php");
return;
@ -27,7 +27,7 @@ class ControllerFolderList extends Controller {
if(isset($this->request->get['id']) && $this->request->get['id'] > 0) {
$this->model_folder_folder->remove_extra_folder($this->request->get['id']);
$this->model_folder_folder->remove_folder($this->request->get['id']);
Header("Location: folders.php");
return;
@ -36,7 +36,7 @@ class ControllerFolderList extends Controller {
$this->data['page_len'] = get_page_length();
$this->data['extra_folders'] = $this->model_folder_folder->get_extra_folders_for_user();
$this->data['extra_folders'] = $this->model_folder_folder->get_folders_for_user();
$this->render();
}

31
webui/controller/message/folder.php Normal file
View File

@ -0,0 +1,31 @@
<?php
class ControllerMessageFolder extends Controller {
private $error = array();
public function index(){
$this->id = "content";
$this->template = "message/note.tpl";
$this->layout = "common/layout-empty";
$session = Registry::get('session');
$request = Registry::get('request');
$db = Registry::get('db');
$sphx = Registry::get('sphx');
$this->load->model('search/search');
$this->load->model('folder/folder');
if(isset($this->request->post['folder_id']) && isset($this->request->post['id'])) {
if($this->model_search_search->check_your_permission_by_id($this->request->post['id']) == 1) {
$this->model_folder_folder->update_message_folder($this->request->post['id'], $this->request->post['folder_id']);
}
}
}
}
?>

9
webui/controller/message/view.php
View File

@ -19,6 +19,10 @@ class ControllerMessageView extends Controller {
$this->load->model('user/user');
if(ENABLE_FOLDER_RESTRICTIONS == 1) {
$this->load->model('folder/folder');
}
$this->document->title = $this->data['text_message'];
$this->data['id'] = '';
@ -83,6 +87,11 @@ class ControllerMessageView extends Controller {
$this->data['can_download'] = $this->model_audit_audit->can_download();
$this->data['can_restore'] = $this->model_audit_audit->can_restore();
if(ENABLE_FOLDER_RESTRICTIONS == 1) {
$this->data['folders'] = $this->model_folder_folder->get_folders_for_user();
$this->data['folder_id'] = $this->model_folder_folder->get_folder_id_by_id($this->data['id']);
}
foreach($this->data['attachments'] as $a) {
if(preg_match("/image/", $a['type'])) {
$attachment = $this->model_search_message->get_attachment_by_id($a['id']);

4
webui/controller/search/folder.php
View File

@ -14,8 +14,8 @@ class ControllerSearchFolder extends Controller {
$this->load->model('folder/folder');
$this->data['folders'] = $this->model_folder_folder->get_folders_for_user();
$this->data['extra_folders'] = $this->model_folder_folder->get_extra_folders_for_user();
$this->data['extra_folders'] = $this->model_folder_folder->get_folders_for_user();
array_unshift($this->data['extra_folders'], array('id' => 0, 'name' => '---'));
$this->data['folders_by_hier'] = $this->model_folder_folder->get_all_folder_ids_hier($session->get("uid"));