@@ -235,11 +235,11 @@ |
||
235 | 235 | } |
236 | 236 | |
237 | 237 | /** |
238 | - * Remove albums from watch-list |
|
239 | - * |
|
240 | - * @param mixed $album_ids Array or integer with album_id where we delete from the watch-list. |
|
241 | - * @param mixed $user_ids If not set, it uses the currents user_id |
|
242 | - */ |
|
238 | + * Remove albums from watch-list |
|
239 | + * |
|
240 | + * @param mixed $album_ids Array or integer with album_id where we delete from the watch-list. |
|
241 | + * @param mixed $user_ids If not set, it uses the currents user_id |
|
242 | + */ |
|
243 | 243 | public function remove_albums($album_ids, $user_ids = false) |
244 | 244 | { |
245 | 245 | $album_ids = $this->cast_mixed_int2array($album_ids); |
@@ -106,9 +106,9 @@ |
||
106 | 106 | } |
107 | 107 | |
108 | 108 | /** |
109 | - * Delete logs |
|
110 | - * @param array $mark Logs selected for deletion |
|
111 | - **/ |
|
109 | + * Delete logs |
|
110 | + * @param array $mark Logs selected for deletion |
|
111 | + **/ |
|
112 | 112 | public function delete_logs($mark) |
113 | 113 | { |
114 | 114 | $sql = 'DELETE FROM ' . $this->log_table . ' WHERE ' . $this->db->sql_in_set('log_id', $mark); |
@@ -92,12 +92,12 @@ discard block |
||
92 | 92 | $additional_settings = array(); |
93 | 93 | |
94 | 94 | /** |
95 | - * Event set personal settings |
|
96 | - * |
|
97 | - * @event phpbbgallery.core.ucp.set_settings_submit |
|
98 | - * @var array additional_settings array of additional settings |
|
99 | - * @since 1.2.0 |
|
100 | - */ |
|
95 | + * Event set personal settings |
|
96 | + * |
|
97 | + * @event phpbbgallery.core.ucp.set_settings_submit |
|
98 | + * @var array additional_settings array of additional settings |
|
99 | + * @since 1.2.0 |
|
100 | + */ |
|
101 | 101 | $vars = array('additional_settings'); |
102 | 102 | extract($this->dispatcher->trigger_event('phpbbgallery.core.ucp.set_settings_submit', compact($vars))); |
103 | 103 | |
@@ -118,11 +118,11 @@ discard block |
||
118 | 118 | } |
119 | 119 | |
120 | 120 | /** |
121 | - * Event no submit personal settings |
|
122 | - * |
|
123 | - * @event phpbbgallery.core.ucp.set_settings_nosubmit |
|
124 | - * @since 1.2.0 |
|
125 | - */ |
|
121 | + * Event no submit personal settings |
|
122 | + * |
|
123 | + * @event phpbbgallery.core.ucp.set_settings_nosubmit |
|
124 | + * @since 1.2.0 |
|
125 | + */ |
|
126 | 126 | $this->dispatcher->dispatch('phpbbgallery.core.ucp.set_settings_nosubmit'); |
127 | 127 | |
128 | 128 | $this->template->assign_vars(array( |
@@ -389,10 +389,10 @@ discard block |
||
389 | 389 | generate_text_for_storage($album_data['album_desc'], $album_data['album_desc_uid'], $album_data['album_desc_bitfield'], $album_data['album_desc_options'], $request->variable('desc_parse_bbcode', false), $request->variable('desc_parse_urls', false), $request->variable('desc_parse_smilies', false)); |
390 | 390 | |
391 | 391 | /** |
392 | - * borrowed from phpBB3 |
|
393 | - * @author: phpBB Group |
|
394 | - * @location: acp_forums->manage_forums |
|
395 | - */ |
|
392 | + * borrowed from phpBB3 |
|
393 | + * @author: phpBB Group |
|
394 | + * @location: acp_forums->manage_forums |
|
395 | + */ |
|
396 | 396 | // Parent should always be filled otherwise we use initialise_album() |
397 | 397 | if ($album_data['parent_id']) |
398 | 398 | { |
@@ -833,13 +833,13 @@ discard block |
||
833 | 833 | } |
834 | 834 | |
835 | 835 | /** |
836 | - * Event delete user albums |
|
837 | - * |
|
838 | - * @event phpbbgallery.core.ucp.delete_album |
|
839 | - * @var int album_id Album ID |
|
840 | - * @var array deleted_albums Deleted album IDs |
|
841 | - * @since 1.2.0 |
|
842 | - */ |
|
836 | + * Event delete user albums |
|
837 | + * |
|
838 | + * @event phpbbgallery.core.ucp.delete_album |
|
839 | + * @var int album_id Album ID |
|
840 | + * @var array deleted_albums Deleted album IDs |
|
841 | + * @since 1.2.0 |
|
842 | + */ |
|
843 | 843 | $vars = array('album_id', 'deleted_albums'); |
844 | 844 | extract($phpbb_dispatcher->trigger_event('phpbbgallery.core.ucp.delete_album', compact($vars))); |
845 | 845 |
@@ -58,8 +58,8 @@ discard block |
||
58 | 58 | foreach ($images as $image_src) |
59 | 59 | { |
60 | 60 | /** |
61 | - * Import the images |
|
62 | - */ |
|
61 | + * Import the images |
|
62 | + */ |
|
63 | 63 | |
64 | 64 | $image_src = str_replace("{{$import_schema}}", "'", $image_src); |
65 | 65 | $image_src_full = $gallery_url->path('import') . utf8_decode($image_src); |
@@ -153,21 +153,21 @@ discard block |
||
153 | 153 | $file_link = $gallery_url->path('upload') . $image_filename; |
154 | 154 | |
155 | 155 | /** |
156 | - * Event to trigger before mass update |
|
157 | - * |
|
158 | - * @event phpbbgallery.acpimport.update_image_before |
|
159 | - * @var array additional_sql_data array of additional sql_data |
|
160 | - * @var string file_link String with real file link |
|
161 | - * @since 1.2.0 |
|
162 | - */ |
|
156 | + * Event to trigger before mass update |
|
157 | + * |
|
158 | + * @event phpbbgallery.acpimport.update_image_before |
|
159 | + * @var array additional_sql_data array of additional sql_data |
|
160 | + * @var string file_link String with real file link |
|
161 | + * @since 1.2.0 |
|
162 | + */ |
|
163 | 163 | $vars = array('additional_sql_data', 'file_link'); |
164 | 164 | extract($phpbb_dispatcher->trigger_event('phpbbgallery.acpimport.update_image_before', compact($vars))); |
165 | 165 | |
166 | 166 | if (($filetype[0] > $gallery_config->get('max_width')) || ($filetype[1] > $gallery_config->get('max_height'))) |
167 | 167 | { |
168 | 168 | /** |
169 | - * Resize overside images |
|
170 | - */ |
|
169 | + * Resize overside images |
|
170 | + */ |
|
171 | 171 | if ($gallery_config->get('allow_resize')) |
172 | 172 | { |
173 | 173 | $image_tools->resize_image($gallery_config->get('max_width'), $gallery_config->get('max_height')); |
@@ -180,13 +180,13 @@ discard block |
||
180 | 180 | $file_updated = (bool) $image_tools->resized; |
181 | 181 | |
182 | 182 | /** |
183 | - * Event to trigger before mass update |
|
184 | - * |
|
185 | - * @event phpbbgallery.acpimport.update_image |
|
186 | - * @var array additional_sql_data array of additional sql_data |
|
187 | - * @var bool file_updated is file resized |
|
188 | - * @since 1.2.0 |
|
189 | - */ |
|
183 | + * Event to trigger before mass update |
|
184 | + * |
|
185 | + * @event phpbbgallery.acpimport.update_image |
|
186 | + * @var array additional_sql_data array of additional sql_data |
|
187 | + * @var bool file_updated is file resized |
|
188 | + * @since 1.2.0 |
|
189 | + */ |
|
190 | 190 | $vars = array('additional_sql_data', 'file_updated'); |
191 | 191 | extract($phpbb_dispatcher->trigger_event('phpbbgallery.acpimport.update_image', compact($vars))); |
192 | 192 |
@@ -89,11 +89,11 @@ discard block |
||
89 | 89 | } |
90 | 90 | |
91 | 91 | /** |
92 | - * Delete source files without a database entry. |
|
93 | - * |
|
94 | - * @param array $filenames An array of filenames |
|
95 | - * @return string Language key for the success message. |
|
96 | - */ |
|
92 | + * Delete source files without a database entry. |
|
93 | + * |
|
94 | + * @param array $filenames An array of filenames |
|
95 | + * @return string Language key for the success message. |
|
96 | + */ |
|
97 | 97 | public function delete_files($filenames) |
98 | 98 | { |
99 | 99 | foreach ($filenames as $file) |
@@ -106,11 +106,11 @@ discard block |
||
106 | 106 | } |
107 | 107 | |
108 | 108 | /** |
109 | - * Delete images, where the source file is missing. |
|
110 | - * |
|
111 | - * @param mixed $image_ids Either an array of integers or an integer. |
|
112 | - * @return string Language key for the success message. |
|
113 | - */ |
|
109 | + * Delete images, where the source file is missing. |
|
110 | + * |
|
111 | + * @param mixed $image_ids Either an array of integers or an integer. |
|
112 | + * @return string Language key for the success message. |
|
113 | + */ |
|
114 | 114 | public function delete_images($image_ids) |
115 | 115 | { |
116 | 116 | $this->log->add_log('admin', 'clean_deleteentries', 0, 0, array('LOG_CLEANUP_DELETE_ENTRIES', count($image_ids))); |
@@ -120,11 +120,11 @@ discard block |
||
120 | 120 | } |
121 | 121 | |
122 | 122 | /** |
123 | - * Delete images, where the author is missing. |
|
124 | - * |
|
125 | - * @param mixed $image_ids Either an array of integers or an integer. |
|
126 | - * @return string Language key for the success message. |
|
127 | - */ |
|
123 | + * Delete images, where the author is missing. |
|
124 | + * |
|
125 | + * @param mixed $image_ids Either an array of integers or an integer. |
|
126 | + * @return string Language key for the success message. |
|
127 | + */ |
|
128 | 128 | public function delete_author_images($image_ids) |
129 | 129 | { |
130 | 130 | $this->log->add_log('admin', 'clean_deletenoauthors', 0, 0, array('LOG_CLEANUP_DELETE_NO_AUTHOR', count($image_ids))); |
@@ -134,11 +134,11 @@ discard block |
||
134 | 134 | } |
135 | 135 | |
136 | 136 | /** |
137 | - * Delete comments, where the author is missing. |
|
138 | - * |
|
139 | - * @param mixed $comment_ids Either an array of integers or an integer. |
|
140 | - * @return string Language key for the success message. |
|
141 | - */ |
|
137 | + * Delete comments, where the author is missing. |
|
138 | + * |
|
139 | + * @param mixed $comment_ids Either an array of integers or an integer. |
|
140 | + * @return string Language key for the success message. |
|
141 | + */ |
|
142 | 142 | public function delete_author_comments($comment_ids) |
143 | 143 | { |
144 | 144 | $this->log->add_log('admin', 'clean_deletecna', 0, 0, array('LOG_CLEANUP_COMMENT_DELETE_NO_AUTHOR', count($comment_ids))); |
@@ -148,12 +148,12 @@ discard block |
||
148 | 148 | } |
149 | 149 | |
150 | 150 | /** |
151 | - * Delete unwanted and obsolent personal galleries. |
|
152 | - * |
|
153 | - * @param array $unwanted_pegas User IDs we want to delete the pegas. |
|
154 | - * @param array $obsolent_pegas User IDs we want to delete the pegas. |
|
155 | - * @return array Language keys for the success messages. |
|
156 | - */ |
|
151 | + * Delete unwanted and obsolent personal galleries. |
|
152 | + * |
|
153 | + * @param array $unwanted_pegas User IDs we want to delete the pegas. |
|
154 | + * @param array $obsolent_pegas User IDs we want to delete the pegas. |
|
155 | + * @return array Language keys for the success messages. |
|
156 | + */ |
|
157 | 157 | public function delete_pegas($unwanted_pegas, $obsolent_pegas) |
158 | 158 | { |
159 | 159 | |
@@ -284,8 +284,8 @@ discard block |
||
284 | 284 | } |
285 | 285 | |
286 | 286 | /** |
287 | - * |
|
288 | - */ |
|
287 | + * |
|
288 | + */ |
|
289 | 289 | public function prune($pattern) |
290 | 290 | { |
291 | 291 | $sql_where = ''; |
@@ -329,8 +329,8 @@ discard block |
||
329 | 329 | } |
330 | 330 | |
331 | 331 | /** |
332 | - * |
|
333 | - */ |
|
332 | + * |
|
333 | + */ |
|
334 | 334 | public function lang_prune_pattern($pattern) |
335 | 335 | { |
336 | 336 | if (isset($pattern['image_album_id'])) |
@@ -51,8 +51,8 @@ discard block |
||
51 | 51 | $action = $request->variable('action', ''); |
52 | 52 | |
53 | 53 | /** |
54 | - * All our beautiful permissions |
|
55 | - */ |
|
54 | + * All our beautiful permissions |
|
55 | + */ |
|
56 | 56 | if (!isset($permissions)) |
57 | 57 | { |
58 | 58 | $permissions = new \stdClass(); |
@@ -703,12 +703,12 @@ discard block |
||
703 | 703 | $coal = $gallery_cache->get('albums'); |
704 | 704 | |
705 | 705 | /** |
706 | - * Grab the permissions |
|
707 | - * |
|
708 | - * includes/acp/acp_permissions.php says: |
|
709 | - * // We obtain and check $_POST['setting'][$ug_id][$forum_id] directly and not using request_var() because request_var() |
|
710 | - * // currently does not support the amount of dimensions required. ;) |
|
711 | - */ |
|
706 | + * Grab the permissions |
|
707 | + * |
|
708 | + * includes/acp/acp_permissions.php says: |
|
709 | + * // We obtain and check $_POST['setting'][$ug_id][$forum_id] directly and not using request_var() because request_var() |
|
710 | + * // currently does not support the amount of dimensions required. ;) |
|
711 | + */ |
|
712 | 712 | // $auth_settings = request_var('setting', array(0 => array(0 => array('' => 0)))); |
713 | 713 | $requests = $request->variable('setting', array(0 => array(0 => array('' => 0)))); |
714 | 714 | $p_mask_count = 0; |
@@ -762,8 +762,8 @@ discard block |
||
762 | 762 | } |
763 | 763 | } |
764 | 764 | /** |
765 | - * Inherit the permissions |
|
766 | - */ |
|
765 | + * Inherit the permissions |
|
766 | + */ |
|
767 | 767 | $inherit = $request->variable('setting', array(0 => array('' => 0))); |
768 | 768 | foreach ($inherit as $c_mask => $v_sets) |
769 | 769 | { |
@@ -993,8 +993,8 @@ discard block |
||
993 | 993 | } |
994 | 994 | |
995 | 995 | /** |
996 | - * Handles copying permissions from one album to others |
|
997 | - */ |
|
996 | + * Handles copying permissions from one album to others |
|
997 | + */ |
|
998 | 998 | private function copy_album_permissions() |
999 | 999 | { |
1000 | 1000 | global $cache, $db, $template, $user, $table_prefix, $phpbb_dispatcher, $table_name, $users_table, $phpbb_container; |
@@ -19,12 +19,12 @@ discard block |
||
19 | 19 | protected $table_images; |
20 | 20 | |
21 | 21 | /** |
22 | - * cache constructor. |
|
23 | - * @param \phpbb\cache\service $cache |
|
24 | - * @param \phpbb\db\driver\driver_interface $db |
|
25 | - * @param $albums_table |
|
26 | - * @param $images_table |
|
27 | - */ |
|
22 | + * cache constructor. |
|
23 | + * @param \phpbb\cache\service $cache |
|
24 | + * @param \phpbb\db\driver\driver_interface $db |
|
25 | + * @param $albums_table |
|
26 | + * @param $images_table |
|
27 | + */ |
|
28 | 28 | public function __construct(\phpbb\cache\service $cache, \phpbb\db\driver\driver_interface $db, |
29 | 29 | $albums_table, $images_table) |
30 | 30 | { |
@@ -155,18 +155,18 @@ discard block |
||
155 | 155 | } |
156 | 156 | |
157 | 157 | /** |
158 | - * Destroy images cache - if we had updated image information or we want other set - we will have to destroy cache |
|
159 | - */ |
|
158 | + * Destroy images cache - if we had updated image information or we want other set - we will have to destroy cache |
|
159 | + */ |
|
160 | 160 | public function destroy_images() |
161 | 161 | { |
162 | 162 | $this->phpbb_cache->destroy('_images'); |
163 | 163 | } |
164 | 164 | |
165 | 165 | /** |
166 | - * Destroy album cache |
|
167 | - * Basicly some tests fail due album cache not destroyed ... |
|
168 | - * So lets try it now? |
|
169 | - */ |
|
166 | + * Destroy album cache |
|
167 | + * Basicly some tests fail due album cache not destroyed ... |
|
168 | + * So lets try it now? |
|
169 | + */ |
|
170 | 170 | public function destroy_albums() |
171 | 171 | { |
172 | 172 | $this->phpbb_cache->destroy('_albums'); |
@@ -15,74 +15,74 @@ discard block |
||
15 | 15 | class exif |
16 | 16 | { |
17 | 17 | /** |
18 | - * Default value for new users |
|
19 | - */ |
|
18 | + * Default value for new users |
|
19 | + */ |
|
20 | 20 | const DEFAULT_DISPLAY = true; |
21 | 21 | |
22 | 22 | /** |
23 | - * phpBB will treat the time from the Exif data like UTC. |
|
24 | - * If your images were taken with an other timezone, you can insert an offset here. |
|
25 | - * The offset is than added to the timestamp before it is converted into the users time. |
|
26 | - * |
|
27 | - * Offset must be set in seconds. |
|
28 | - */ |
|
23 | + * phpBB will treat the time from the Exif data like UTC. |
|
24 | + * If your images were taken with an other timezone, you can insert an offset here. |
|
25 | + * The offset is than added to the timestamp before it is converted into the users time. |
|
26 | + * |
|
27 | + * Offset must be set in seconds. |
|
28 | + */ |
|
29 | 29 | const TIME_OFFSET = 0; |
30 | 30 | |
31 | 31 | /** |
32 | - * Constants for the status of the Exif data. |
|
33 | - */ |
|
32 | + * Constants for the status of the Exif data. |
|
33 | + */ |
|
34 | 34 | const UNAVAILABLE = 0; |
35 | 35 | const AVAILABLE = 1; |
36 | 36 | const UNKNOWN = 2; |
37 | 37 | const DBSAVED = 3; |
38 | 38 | |
39 | 39 | /** |
40 | - * Is the function available? |
|
41 | - */ |
|
40 | + * Is the function available? |
|
41 | + */ |
|
42 | 42 | static public $function_exists = null; |
43 | 43 | |
44 | 44 | /** |
45 | - * Exif data array with all allowed groups and keys. |
|
46 | - */ |
|
45 | + * Exif data array with all allowed groups and keys. |
|
46 | + */ |
|
47 | 47 | public $data = array(); |
48 | 48 | |
49 | 49 | /** |
50 | - * Filtered data array. We don't have empty or invalid values here. |
|
51 | - */ |
|
50 | + * Filtered data array. We don't have empty or invalid values here. |
|
51 | + */ |
|
52 | 52 | public $prepared_data = array(); |
53 | 53 | |
54 | 54 | /** |
55 | - * Does the image have exif data? |
|
56 | - * Values see constant declaration at the beginning of the class. |
|
57 | - */ |
|
55 | + * Does the image have exif data? |
|
56 | + * Values see constant declaration at the beginning of the class. |
|
57 | + */ |
|
58 | 58 | public $status = 2; |
59 | 59 | |
60 | 60 | /** |
61 | - * Full data array, but serialized to a string |
|
62 | - */ |
|
61 | + * Full data array, but serialized to a string |
|
62 | + */ |
|
63 | 63 | public $serialized = ''; |
64 | 64 | |
65 | 65 | /** |
66 | - * Full link to the image-file |
|
67 | - */ |
|
66 | + * Full link to the image-file |
|
67 | + */ |
|
68 | 68 | public $file = ''; |
69 | 69 | |
70 | 70 | /** |
71 | - * Original status of the Exif data. |
|
72 | - */ |
|
71 | + * Original status of the Exif data. |
|
72 | + */ |
|
73 | 73 | public $orig_status = null; |
74 | 74 | |
75 | 75 | /** |
76 | - * Image-ID, just needed to update the Exif status |
|
77 | - */ |
|
76 | + * Image-ID, just needed to update the Exif status |
|
77 | + */ |
|
78 | 78 | public $image_id = false; |
79 | 79 | |
80 | 80 | /** |
81 | - * Constructor |
|
82 | - * |
|
83 | - * @param string $file Full link to the image-file |
|
84 | - * @param mixed $image_id False or integer |
|
85 | - */ |
|
81 | + * Constructor |
|
82 | + * |
|
83 | + * @param string $file Full link to the image-file |
|
84 | + * @param mixed $image_id False or integer |
|
85 | + */ |
|
86 | 86 | public function __construct($file, $image_id = false) |
87 | 87 | { |
88 | 88 | if (self::$function_exists === null) |
@@ -98,11 +98,11 @@ discard block |
||
98 | 98 | } |
99 | 99 | |
100 | 100 | /** |
101 | - * Intepret the values from the database, and read the data if we don't have it. |
|
102 | - * |
|
103 | - * @param int $status Value of a status constant (see beginning of the class) |
|
104 | - * @param mixed $data Either an empty string or the serialized array of the Exif from the database |
|
105 | - */ |
|
101 | + * Intepret the values from the database, and read the data if we don't have it. |
|
102 | + * |
|
103 | + * @param int $status Value of a status constant (see beginning of the class) |
|
104 | + * @param mixed $data Either an empty string or the serialized array of the Exif from the database |
|
105 | + */ |
|
106 | 106 | public function interpret($status, $data) |
107 | 107 | { |
108 | 108 | $this->orig_status = $status; |
@@ -118,8 +118,8 @@ discard block |
||
118 | 118 | } |
119 | 119 | |
120 | 120 | /** |
121 | - * Read Exif data from the image |
|
122 | - */ |
|
121 | + * Read Exif data from the image |
|
122 | + */ |
|
123 | 123 | public function read() |
124 | 124 | { |
125 | 125 | if (!self::$function_exists || !$this->file || !file_exists($this->file)) |
@@ -165,8 +165,8 @@ discard block |
||
165 | 165 | } |
166 | 166 | |
167 | 167 | /** |
168 | - * Validate and prepare the data, so we can send it into the template. |
|
169 | - */ |
|
168 | + * Validate and prepare the data, so we can send it into the template. |
|
169 | + */ |
|
170 | 170 | private function prepare_data() |
171 | 171 | { |
172 | 172 | global $user; |
@@ -273,11 +273,11 @@ discard block |
||
273 | 273 | } |
274 | 274 | |
275 | 275 | /** |
276 | - * Sends the Exif into the template |
|
277 | - * |
|
278 | - * @param bool $expand_view Shall we expand the Exif data on page view or collapse? |
|
279 | - * @param string $block Name of the template loop the Exifs are displayed in. |
|
280 | - */ |
|
276 | + * Sends the Exif into the template |
|
277 | + * |
|
278 | + * @param bool $expand_view Shall we expand the Exif data on page view or collapse? |
|
279 | + * @param string $block Name of the template loop the Exifs are displayed in. |
|
280 | + */ |
|
281 | 281 | public function send_to_template($expand_view = true, $block = 'exif_value') |
282 | 282 | { |
283 | 283 | $this->prepare_data(); |
@@ -301,8 +301,8 @@ discard block |
||
301 | 301 | } |
302 | 302 | |
303 | 303 | /** |
304 | - * Save the new Exif status in the database |
|
305 | - */ |
|
304 | + * Save the new Exif status in the database |
|
305 | + */ |
|
306 | 306 | public function set_status() |
307 | 307 | { |
308 | 308 | if (!$this->image_id || ($this->orig_status == $this->status)) |
@@ -320,9 +320,9 @@ discard block |
||
320 | 320 | } |
321 | 321 | |
322 | 322 | /** |
323 | - * There are lots of possible Exif Groups and Values. |
|
324 | - * But you will never heard of the missing ones. so we just allow the most common ones. |
|
325 | - */ |
|
323 | + * There are lots of possible Exif Groups and Values. |
|
324 | + * But you will never heard of the missing ones. so we just allow the most common ones. |
|
325 | + */ |
|
326 | 326 | static private $allowed_groups = array( |
327 | 327 | 'EXIF', |
328 | 328 | 'IFD0', |