@@ -1,4 +1,4 @@ discard block |
||
1 | -<h1><?php e(t('Add keywords to') . ' ' . $object->get('name')); ?></h1> |
|
1 | +<h1><?php e(t('Add keywords to').' '.$object->get('name')); ?></h1> |
|
2 | 2 | |
3 | 3 | <?php echo $keyword->error->view(); ?> |
4 | 4 | |
@@ -16,8 +16,8 @@ discard block |
||
16 | 16 | } ?> |
17 | 17 | /> |
18 | 18 | <label for="k<?php e($k["id"]); ?>"> |
19 | - <a href="<?php e(url('../' . $k['id'])); ?>"><?php e($k['keyword']); ?> (#<?php e($k["id"]); ?>)</a></label> |
|
20 | - - <a href="<?php e(url('../'. $k["id"], array('delete'))); ?>" class="confirm"><?php e(t('delete')); ?></a><br /> |
|
19 | + <a href="<?php e(url('../'.$k['id'])); ?>"><?php e($k['keyword']); ?> (#<?php e($k["id"]); ?>)</a></label> |
|
20 | + - <a href="<?php e(url('../'.$k["id"], array('delete'))); ?>" class="confirm"><?php e(t('delete')); ?></a><br /> |
|
21 | 21 | <?php } |
22 | 22 | ?> |
23 | 23 | </fieldset> |
@@ -64,12 +64,12 @@ |
||
64 | 64 | $result = $this->db->createTable($this->table_name, $this->table_definition); |
65 | 65 | |
66 | 66 | if (PEAR::isError($result)) { |
67 | - throw new Exception('create ' . $result->getMessage()); |
|
67 | + throw new Exception('create '.$result->getMessage()); |
|
68 | 68 | } |
69 | 69 | |
70 | 70 | $result = $this->db->createConstraint($this->table_name, 'PRIMARY', $this->definition); |
71 | 71 | if (PEAR::isError($result)) { |
72 | - throw new Exception('primary ' . $result->getMessage()); |
|
72 | + throw new Exception('primary '.$result->getMessage()); |
|
73 | 73 | } |
74 | 74 | } |
75 | 75 |
@@ -6,6 +6,9 @@ discard block |
||
6 | 6 | |
7 | 7 | interface Observer |
8 | 8 | { |
9 | + /** |
|
10 | + * @return boolean |
|
11 | + */ |
|
9 | 12 | function update($code, $msg); |
10 | 13 | } |
11 | 14 | |
@@ -47,6 +50,9 @@ discard block |
||
47 | 50 | } |
48 | 51 | } |
49 | 52 | |
53 | + /** |
|
54 | + * @param string $table |
|
55 | + */ |
|
50 | 56 | function tableExists($table) |
51 | 57 | { |
52 | 58 | $this->db->loadModule('Manager', null, true); |
@@ -58,7 +58,7 @@ |
||
58 | 58 | } |
59 | 59 | echo '<li style="display: inline; margin-left: 20px;"><label for="keyword_'.$value['id'].'"><input type="checkbox" name="keyword[]" value="'.$value['id'].'" id="keyword_'.$value['id'].'" '.$checked.' /> '.$value['keyword'].'</label></li>'; |
60 | 60 | } |
61 | - echo '</ul></div>'; |
|
61 | + echo '</ul></div>'; |
|
62 | 62 | } |
63 | 63 | ?> |
64 | 64 |
@@ -15,9 +15,11 @@ |
||
15 | 15 | <?php if (isset($value['name'])) { |
16 | 16 | echo '<div>'.htmlentities($value['name']).'</div>'; |
17 | 17 | } ?> |
18 | - <?php else : ?> |
|
18 | + <?php else { |
|
19 | + : ?> |
|
19 | 20 | <input type="text" name="name" id="name" value="<?php if (isset($value['name'])) { |
20 | 21 | e($value['name']); |
22 | +} |
|
21 | 23 | } ?>" /> <span><?php e(t('allowed characters')); ?>: a-z 0-9 _ -</span> |
22 | 24 | <?php endif; ?> |
23 | 25 | </div> |
@@ -19,7 +19,7 @@ |
||
19 | 19 | <tr> |
20 | 20 | <td rowspan="5" style="width: 280px;"> |
21 | 21 | <?php if ($this_filemanager->get('is_picture')) : ?> |
22 | - <?php $this_filemanager->createInstance('small');?> |
|
22 | + <?php $this_filemanager->createInstance('small'); ?> |
|
23 | 23 | <img src="<?php e($this_filemanager->instance->get('file_uri')); ?>" alt="" /> |
24 | 24 | <?php else : ?> |
25 | 25 | <img src="<?php e($this_filemanager->get('icon_uri')); ?>" alt="" /> |
@@ -21,8 +21,11 @@ |
||
21 | 21 | <?php if ($this_filemanager->get('is_picture')) : ?> |
22 | 22 | <?php $this_filemanager->createInstance('small');?> |
23 | 23 | <img src="<?php e($this_filemanager->instance->get('file_uri')); ?>" alt="" /> |
24 | - <?php else : ?> |
|
25 | - <img src="<?php e($this_filemanager->get('icon_uri')); ?>" alt="" /> |
|
24 | + <?php else { |
|
25 | + : ?> |
|
26 | + <img src="<?php e($this_filemanager->get('icon_uri')); |
|
27 | +} |
|
28 | +?>" alt="" /> |
|
26 | 29 | <?php endif; ?> |
27 | 30 | </td> |
28 | 31 | </tr> |
@@ -149,7 +149,7 @@ |
||
149 | 149 | if (is_array($keywords) and count($keywords) > 0) { |
150 | 150 | echo '<ul>'; |
151 | 151 | foreach ($keywords as $k) { |
152 | - echo '<li>' . e($k['keyword']) . '</li>'; |
|
152 | + echo '<li>'.e($k['keyword']).'</li>'; |
|
153 | 153 | } |
154 | 154 | echo '</ul>'; |
155 | 155 | } |
@@ -86,8 +86,10 @@ |
||
86 | 86 | <td> |
87 | 87 | <input type="<?php if ($context->multiple_choice) : |
88 | 88 | e('checkbox'); |
89 | -else : |
|
89 | +else { |
|
90 | + : |
|
90 | 91 | print('radio'); |
92 | +} |
|
91 | 93 | endif; ?>" value="<?php echo $file["id"]; ?>" id="<?php echo $file["id"]; ?>" class="input-select_file" name="selected[]" <?php if (in_array($file['id'], $selected_files)) { |
92 | 94 | print("checked=\"checked\""); |
93 | 95 | } ?> /> |
@@ -67,7 +67,7 @@ |
||
67 | 67 | } else { |
68 | 68 | $checked = ""; |
69 | 69 | } |
70 | - echo '<li style="display: inline; margin-left: 20px;"><label for="keyword_'.$value['id'].'"><input type="checkbox" name="keyword[]" value="'.$value['id'].'" id="keyword_'.$value['id'].'" '.$checked.' /> '.$value['keyword'].'</label></li>'; |
|
70 | + echo '<li style="display: inline; margin-left: 20px;"><label for="keyword_'.$value['id'].'"><input type="checkbox" name="keyword[]" value="'.$value['id'].'" id="keyword_'.$value['id'].'" '.$checked.' /> '.$value['keyword'].'</label></li>'; |
|
71 | 71 | } |
72 | 72 | echo '</ul></div>'; |
73 | 73 | } |
@@ -60,7 +60,7 @@ |
||
60 | 60 | |
61 | 61 | <?php |
62 | 62 | if (count($keywords) > 0) { |
63 | - echo '<div>'. e(t('keywords', 'keyword')) . ': <ul style="display: inline;">'; |
|
63 | + echo '<div>'.e(t('keywords', 'keyword')).': <ul style="display: inline;">'; |
|
64 | 64 | foreach ($keywords as $value) { |
65 | 65 | if (in_array($value['id'], $selected_keywords) === true) { |
66 | 66 | $checked = 'checked="checked"'; |
@@ -18,10 +18,13 @@ |
||
18 | 18 | |
19 | 19 | <?php if (empty($files) and !$context->query('search')) : ?> |
20 | 20 | <p><?php e(t('No files uploaded')); ?></p> |
21 | -<?php else : ?> |
|
21 | +<?php else { |
|
22 | + : ?> |
|
22 | 23 | |
23 | 24 | |
24 | -<form method="get" action="<?php e(url('./')); ?>"> |
|
25 | +<form method="get" action="<?php e(url('./')); |
|
26 | +} |
|
27 | +?>"> |
|
25 | 28 | <fieldset> |
26 | 29 | <legend><?php e(t('Search')); ?></legend> |
27 | 30 | <label><?php e(t('Search text')); ?>: |
@@ -145,10 +145,10 @@ |
||
145 | 145 | $this->document->setTitle('Files'); |
146 | 146 | |
147 | 147 | $data = array('filemanager' => $filemanager, |
148 | - 'multiple_choice' => $multiple_choice, |
|
149 | - //'receive_redirect' => $receive_redirect, |
|
150 | - 'files' => $files, |
|
151 | - 'selected_files' => $selected_files |
|
148 | + 'multiple_choice' => $multiple_choice, |
|
149 | + //'receive_redirect' => $receive_redirect, |
|
150 | + 'files' => $files, |
|
151 | + 'selected_files' => $selected_files |
|
152 | 152 | ); |
153 | 153 | |
154 | 154 | $tpl = $this->template->create(dirname(__FILE__) . '/../templates/selectfile'); |
@@ -100,18 +100,18 @@ discard block |
||
100 | 100 | $filemanager->getDBQuery()->setFilter("uploaded_from_date", date("d-m-Y")." 00:00"); |
101 | 101 | break; |
102 | 102 | case 2: |
103 | - $filemanager->getDBQuery()->setFilter("uploaded_from_date", date("d-m-Y", time()-60*60*24)." 00:00"); |
|
104 | - $filemanager->getDBQuery()->setFilter("uploaded_to_date", date("d-m-Y", time()-60*60*24)." 23:59"); |
|
103 | + $filemanager->getDBQuery()->setFilter("uploaded_from_date", date("d-m-Y", time() - 60*60*24)." 00:00"); |
|
104 | + $filemanager->getDBQuery()->setFilter("uploaded_to_date", date("d-m-Y", time() - 60*60*24)." 23:59"); |
|
105 | 105 | break; |
106 | 106 | case 3: |
107 | - $filemanager->getDBQuery()->setFilter("uploaded_from_date", date("d-m-Y", time()-60*60*24*7)." 00:00"); |
|
107 | + $filemanager->getDBQuery()->setFilter("uploaded_from_date", date("d-m-Y", time() - 60*60*24*7)." 00:00"); |
|
108 | 108 | break; |
109 | 109 | case 4: |
110 | 110 | $filemanager->getDBQuery()->setFilter("edited_from_date", date("d-m-Y")." 00:00"); |
111 | 111 | break; |
112 | 112 | case 5: |
113 | - $filemanager->getDBQuery()->setFilter("edited_from_date", date("d-m-Y", time()-60*60*24)." 00:00"); |
|
114 | - $filemanager->getDBQuery()->setFilter("edited_to_date", date("d-m-Y", time()-60*60*24)." 23:59"); |
|
113 | + $filemanager->getDBQuery()->setFilter("edited_from_date", date("d-m-Y", time() - 60*60*24)." 00:00"); |
|
114 | + $filemanager->getDBQuery()->setFilter("edited_to_date", date("d-m-Y", time() - 60*60*24)." 23:59"); |
|
115 | 115 | break; |
116 | 116 | default: |
117 | 117 | // Probaly 0, so nothing happens |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | 'selected_files' => $selected_files |
152 | 152 | ); |
153 | 153 | |
154 | - $tpl = $this->template->create(dirname(__FILE__) . '/../templates/selectfile'); |
|
154 | + $tpl = $this->template->create(dirname(__FILE__).'/../templates/selectfile'); |
|
155 | 155 | return $tpl->render($this, $data); |
156 | 156 | } |
157 | 157 |