@@ -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 | } |
@@ -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')); ?>: |
@@ -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 |
@@ -148,10 +148,10 @@ |
||
148 | 148 | $this->document->setTitle('Files'); |
149 | 149 | |
150 | 150 | $data = array('filemanager' => $filemanager, |
151 | - 'multiple_choice' => $multiple_choice, |
|
152 | - //'receive_redirect' => $receive_redirect, |
|
153 | - 'files' => $files, |
|
154 | - 'selected_files' => $selected_files |
|
151 | + 'multiple_choice' => $multiple_choice, |
|
152 | + //'receive_redirect' => $receive_redirect, |
|
153 | + 'files' => $files, |
|
154 | + 'selected_files' => $selected_files |
|
155 | 155 | ); |
156 | 156 | |
157 | 157 | $tpl = $this->template->create(dirname(__FILE__) . '/../templates/ckeditor'); |
@@ -47,18 +47,18 @@ discard block |
||
47 | 47 | $gateway->getDBQuery()->setFilter('uploaded_from_date', date('d-m-Y').' 00:00'); |
48 | 48 | break; |
49 | 49 | case 2: |
50 | - $gateway->getDBQuery()->setFilter('uploaded_from_date', date('d-m-Y', time()-60*60*24).' 00:00'); |
|
51 | - $gateway->getDBQuery()->setFilter('uploaded_to_date', date('d-m-Y', time()-60*60*24).' 23:59'); |
|
50 | + $gateway->getDBQuery()->setFilter('uploaded_from_date', date('d-m-Y', time() - 60*60*24).' 00:00'); |
|
51 | + $gateway->getDBQuery()->setFilter('uploaded_to_date', date('d-m-Y', time() - 60*60*24).' 23:59'); |
|
52 | 52 | break; |
53 | 53 | case 3: |
54 | - $gateway->getDBQuery()->setFilter('uploaded_from_date', date('d-m-Y', time()-60*60*24*7).' 00:00'); |
|
54 | + $gateway->getDBQuery()->setFilter('uploaded_from_date', date('d-m-Y', time() - 60*60*24*7).' 00:00'); |
|
55 | 55 | break; |
56 | 56 | case 4: |
57 | 57 | $gateway->getDBQuery()->setFilter('edited_from_date', date('d-m-Y').' 00:00'); |
58 | 58 | break; |
59 | 59 | case 5: |
60 | - $gateway->getDBQuery()->setFilter('edited_from_date', date('d-m-Y', time()-60*60*24).' 00:00'); |
|
61 | - $gateway->getDBQuery()->setFilter('edited_to_date', date('d-m-Y', time()-60*60*24).' 23:59'); |
|
60 | + $gateway->getDBQuery()->setFilter('edited_from_date', date('d-m-Y', time() - 60*60*24).' 00:00'); |
|
61 | + $gateway->getDBQuery()->setFilter('edited_to_date', date('d-m-Y', time() - 60*60*24).' 23:59'); |
|
62 | 62 | break; |
63 | 63 | case 6: |
64 | 64 | $gateway->getDBQuery()->setFilter('accessibility', 'public'); |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | 'selected_keywords' => $selected_keywords, |
98 | 98 | 'keywords' => $keywords); |
99 | 99 | |
100 | - $tpl = $this->template->create(dirname(__FILE__) . '/../templates/index'); |
|
100 | + $tpl = $this->template->create(dirname(__FILE__).'/../templates/index'); |
|
101 | 101 | return $tpl->render($this, $data); |
102 | 102 | } |
103 | 103 |
@@ -73,14 +73,14 @@ |
||
73 | 73 | '&y2=' . ($params['crop_offset_y'] + $params['crop_height'])); |
74 | 74 | |
75 | 75 | $data = array('translation' => $translation, |
76 | - 'type' => $type, |
|
77 | - 'filemanager' => $filemanager, |
|
78 | - 'img_height' => $img_height, |
|
79 | - 'img_width' => $img_width, |
|
80 | - 'editor_img_height' => $editor_img_height, |
|
81 | - 'editor_img_width' => $editor_img_width, |
|
82 | - 'editor_img_uri' => $editor_img_uri, |
|
83 | - 'unlock_ratio' => $unlock_ratio); |
|
76 | + 'type' => $type, |
|
77 | + 'filemanager' => $filemanager, |
|
78 | + 'img_height' => $img_height, |
|
79 | + 'img_width' => $img_width, |
|
80 | + 'editor_img_height' => $editor_img_height, |
|
81 | + 'editor_img_width' => $editor_img_width, |
|
82 | + 'editor_img_uri' => $editor_img_uri, |
|
83 | + 'unlock_ratio' => $unlock_ratio); |
|
84 | 84 | |
85 | 85 | $tpl = $this->template->create(dirname(__FILE__) . '/../templates/crop'); |
86 | 86 | return $tpl->render($this, $data); |
@@ -26,15 +26,15 @@ discard block |
||
26 | 26 | $editor_img_height = $instance->get('height'); |
27 | 27 | $editor_img_width = $instance->get('width'); |
28 | 28 | |
29 | - $size_ratio = $editor_img_width / $img_width; |
|
29 | + $size_ratio = $editor_img_width/$img_width; |
|
30 | 30 | |
31 | 31 | $instance = $filemanager->getInstance($instance_type); |
32 | 32 | $type = $instance->get('instance_properties'); |
33 | 33 | |
34 | 34 | $params = unserialize($instance->get('crop_parameter')); |
35 | 35 | |
36 | - $editor_min_width = $type['max_width'] * $size_ratio; |
|
37 | - $editor_min_height = $type['max_height'] * $size_ratio; |
|
36 | + $editor_min_width = $type['max_width']*$size_ratio; |
|
37 | + $editor_min_height = $type['max_height']*$size_ratio; |
|
38 | 38 | |
39 | 39 | if ($editor_min_width > $editor_img_width) { |
40 | 40 | $editor_min_width = $editor_img_width; |
@@ -57,20 +57,20 @@ discard block |
||
57 | 57 | // make sure that it is with a . and not , |
58 | 58 | $size_ratio = str_replace(',', '.', $size_ratio); |
59 | 59 | |
60 | - $this->document->setTitle('Crop image: ' . $filemanager->get('file_name')); |
|
60 | + $this->document->setTitle('Crop image: '.$filemanager->get('file_name')); |
|
61 | 61 | $this->document->addScript('filehandler/cropper/lib/prototype.js'); |
62 | 62 | $this->document->addScript('filehandler/cropper/lib/scriptaculous.js'); |
63 | 63 | $this->document->addScript('filehandler/cropper/cropper.js'); |
64 | 64 | // @todo HACK only way I can get the link to be correct with a comma |
65 | 65 | $this->document->addScript('filehandler/crop_image.js.php'. |
66 | - '?size_ratio=' . $size_ratio . |
|
67 | - '&max_width=' . round($editor_min_width) . |
|
68 | - '&max_height=' . round($editor_min_height) . |
|
69 | - '&unlock_ratio=' . $unlock_ratio . |
|
70 | - '&x1=' . $params['crop_offset_x'] . |
|
71 | - '&y1=' . $params['crop_offset_y'] . |
|
72 | - '&x2=' . ($params['crop_offset_x'] + $params['crop_width']) . |
|
73 | - '&y2=' . ($params['crop_offset_y'] + $params['crop_height'])); |
|
66 | + '?size_ratio='.$size_ratio. |
|
67 | + '&max_width='.round($editor_min_width). |
|
68 | + '&max_height='.round($editor_min_height). |
|
69 | + '&unlock_ratio='.$unlock_ratio. |
|
70 | + '&x1='.$params['crop_offset_x']. |
|
71 | + '&y1='.$params['crop_offset_y']. |
|
72 | + '&x2='.($params['crop_offset_x'] + $params['crop_width']). |
|
73 | + '&y2='.($params['crop_offset_y'] + $params['crop_height'])); |
|
74 | 74 | |
75 | 75 | $data = array('translation' => $translation, |
76 | 76 | 'type' => $type, |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | 'editor_img_uri' => $editor_img_uri, |
83 | 83 | 'unlock_ratio' => $unlock_ratio); |
84 | 84 | |
85 | - $tpl = $this->template->create(dirname(__FILE__) . '/../templates/crop'); |
|
85 | + $tpl = $this->template->create(dirname(__FILE__).'/../templates/crop'); |
|
86 | 86 | return $tpl->render($this, $data); |
87 | 87 | } |
88 | 88 |
@@ -148,10 +148,10 @@ |
||
148 | 148 | $this->document->setTitle('Files'); |
149 | 149 | |
150 | 150 | $data = array('filemanager' => $filemanager, |
151 | - 'multiple_choice' => $multiple_choice, |
|
152 | - //'receive_redirect' => $receive_redirect, |
|
153 | - 'files' => $files, |
|
154 | - 'selected_files' => $selected_files |
|
151 | + 'multiple_choice' => $multiple_choice, |
|
152 | + //'receive_redirect' => $receive_redirect, |
|
153 | + 'files' => $files, |
|
154 | + 'selected_files' => $selected_files |
|
155 | 155 | ); |
156 | 156 | |
157 | 157 | $tpl = $this->template->create(dirname(__FILE__) . '/../templates/ckeditor'); |
@@ -103,18 +103,18 @@ discard block |
||
103 | 103 | $filemanager->getDBQuery()->setFilter("uploaded_from_date", date("d-m-Y")." 00:00"); |
104 | 104 | break; |
105 | 105 | case 2: |
106 | - $filemanager->getDBQuery()->setFilter("uploaded_from_date", date("d-m-Y", time()-60*60*24)." 00:00"); |
|
107 | - $filemanager->getDBQuery()->setFilter("uploaded_to_date", date("d-m-Y", time()-60*60*24)." 23:59"); |
|
106 | + $filemanager->getDBQuery()->setFilter("uploaded_from_date", date("d-m-Y", time() - 60*60*24)." 00:00"); |
|
107 | + $filemanager->getDBQuery()->setFilter("uploaded_to_date", date("d-m-Y", time() - 60*60*24)." 23:59"); |
|
108 | 108 | break; |
109 | 109 | case 3: |
110 | - $filemanager->getDBQuery()->setFilter("uploaded_from_date", date("d-m-Y", time()-60*60*24*7)." 00:00"); |
|
110 | + $filemanager->getDBQuery()->setFilter("uploaded_from_date", date("d-m-Y", time() - 60*60*24*7)." 00:00"); |
|
111 | 111 | break; |
112 | 112 | case 4: |
113 | 113 | $filemanager->getDBQuery()->setFilter("edited_from_date", date("d-m-Y")." 00:00"); |
114 | 114 | break; |
115 | 115 | case 5: |
116 | - $filemanager->getDBQuery()->setFilter("edited_from_date", date("d-m-Y", time()-60*60*24)." 00:00"); |
|
117 | - $filemanager->getDBQuery()->setFilter("edited_to_date", date("d-m-Y", time()-60*60*24)." 23:59"); |
|
116 | + $filemanager->getDBQuery()->setFilter("edited_from_date", date("d-m-Y", time() - 60*60*24)." 00:00"); |
|
117 | + $filemanager->getDBQuery()->setFilter("edited_to_date", date("d-m-Y", time() - 60*60*24)." 23:59"); |
|
118 | 118 | break; |
119 | 119 | default: |
120 | 120 | // Probaly 0, so nothing happens |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | 'selected_files' => $selected_files |
155 | 155 | ); |
156 | 156 | |
157 | - $tpl = $this->template->create(dirname(__FILE__) . '/../templates/ckeditor'); |
|
157 | + $tpl = $this->template->create(dirname(__FILE__).'/../templates/ckeditor'); |
|
158 | 158 | return new k_HtmlResponse($tpl->render($this, $data)); |
159 | 159 | } |
160 | 160 |
@@ -83,7 +83,7 @@ |
||
83 | 83 | break; |
84 | 84 | case 1: |
85 | 85 | default: |
86 | - return "--\n" . $this->getUser()->getAddress()->get('name') . "\n" . $this->getIntranet()->get('name'); |
|
86 | + return "--\n".$this->getUser()->getAddress()->get('name')."\n".$this->getIntranet()->get('name'); |
|
87 | 87 | break; |
88 | 88 | case 2: |
89 | 89 | return $this->getSetting()->get('user', 'email.custom_signature'); |