| @@ -180,14 +180,14 @@ | ||
| 180 | 180 | } | 
| 181 | 181 | |
| 182 | 182 | /** | 
| 183 | - * Copies attributes permissions from one forum to others | |
| 184 | - * | |
| 185 | - * @param int $src_forum_id The source forum we want to copy permissions from | |
| 186 | - * @param array $dest_forum_ids The destination forum(s) we want to copy to | |
| 187 | - * @param bool $clear_dest_perms True if destination permissions should be deleted | |
| 188 | - * | |
| 189 | - * @return bool False on error | |
| 190 | - */ | |
| 183 | + * Copies attributes permissions from one forum to others | |
| 184 | + * | |
| 185 | + * @param int $src_forum_id The source forum we want to copy permissions from | |
| 186 | + * @param array $dest_forum_ids The destination forum(s) we want to copy to | |
| 187 | + * @param bool $clear_dest_perms True if destination permissions should be deleted | |
| 188 | + * | |
| 189 | + * @return bool False on error | |
| 190 | + */ | |
| 191 | 191 | private function _copy_attribute_permissions($src_forum_id, $dest_forum_ids, $clear_dest_perms) | 
| 192 | 192 |  	{ | 
| 193 | 193 | // Only one forum id specified | 
| @@ -23,11 +23,11 @@ | ||
| 23 | 23 | protected $qte; | 
| 24 | 24 | |
| 25 | 25 | /** | 
| 26 | - * Constructor | |
| 27 | - * | |
| 28 | - * @param \phpbb\request\request $request Request object | |
| 29 | - * @param \ernadoo\qte\qte $qte QTE object | |
| 30 | - */ | |
| 26 | + * Constructor | |
| 27 | + * | |
| 28 | + * @param \phpbb\request\request $request Request object | |
| 29 | + * @param \ernadoo\qte\qte $qte QTE object | |
| 30 | + */ | |
| 31 | 31 | public function __construct(\phpbb\request\request $request, \ernadoo\qte\qte $qte) | 
| 32 | 32 |  	{ | 
| 33 | 33 | $this->request = $request; | 
| @@ -54,19 +54,19 @@ discard block | ||
| 54 | 54 | private $_name = array(); | 
| 55 | 55 | |
| 56 | 56 | /** | 
| 57 | - * Constructor | |
| 58 | - * | |
| 59 | - * @param \phpbb\request\request $request Request object | |
| 60 | - * @param \phpbb\cache\driver\driver_interface $cache Cache object | |
| 61 | - * @param \phpbb\db\driver\driver_interface $db Database object | |
| 62 | - * @param \phpbb\template\template $template Template object | |
| 63 | - * @param \phpbb\user $user User object | |
| 64 | - * @param \phpbb\log\log $log Log object | |
| 65 | - * @param \phpbb\auth\auth $auth Auth object | |
| 66 | - * @param string $root_path phpBB root path | |
| 67 | - * @param string $php_ext phpEx | |
| 68 | - * @param string $table_prefix Prefix tables | |
| 69 | - */ | |
| 57 | + * Constructor | |
| 58 | + * | |
| 59 | + * @param \phpbb\request\request $request Request object | |
| 60 | + * @param \phpbb\cache\driver\driver_interface $cache Cache object | |
| 61 | + * @param \phpbb\db\driver\driver_interface $db Database object | |
| 62 | + * @param \phpbb\template\template $template Template object | |
| 63 | + * @param \phpbb\user $user User object | |
| 64 | + * @param \phpbb\log\log $log Log object | |
| 65 | + * @param \phpbb\auth\auth $auth Auth object | |
| 66 | + * @param string $root_path phpBB root path | |
| 67 | + * @param string $php_ext phpEx | |
| 68 | + * @param string $table_prefix Prefix tables | |
| 69 | + */ | |
| 70 | 70 | public function __construct(\phpbb\request\request $request, \phpbb\cache\driver\driver_interface $cache, \phpbb\db\driver\driver_interface $db, \phpbb\template\template $template, \phpbb\user $user, \phpbb\log\log $log, \phpbb\auth\auth $auth, $root_path, $php_ext, $table_prefix) | 
| 71 | 71 |  	{ | 
| 72 | 72 | $this->request = $request; | 
| @@ -86,12 +86,12 @@ discard block | ||
| 86 | 86 | } | 
| 87 | 87 | |
| 88 | 88 | /** | 
| 89 | - * Get topic attributes username | |
| 90 | - * | |
| 91 | - * @param array $topic_list Topic ids | |
| 92 | - * | |
| 93 | - * @return null | |
| 94 | - */ | |
| 89 | + * Get topic attributes username | |
| 90 | + * | |
| 91 | + * @param array $topic_list Topic ids | |
| 92 | + * | |
| 93 | + * @return null | |
| 94 | + */ | |
| 95 | 95 | public function get_users_by_topic_id($topic_list) | 
| 96 | 96 |  	{ | 
| 97 | 97 | if (!empty($topic_list)) | 
| @@ -116,24 +116,24 @@ discard block | ||
| 116 | 116 | } | 
| 117 | 117 | |
| 118 | 118 | /** | 
| 119 | - * Get attribute name | |
| 120 | - * | |
| 121 | - * @param int $attr_id The attribute id | |
| 122 | - * | |
| 123 | - * @return string | |
| 124 | - */ | |
| 119 | + * Get attribute name | |
| 120 | + * | |
| 121 | + * @param int $attr_id The attribute id | |
| 122 | + * | |
| 123 | + * @return string | |
| 124 | + */ | |
| 125 | 125 | public function get_attr_name_by_id($attr_id) | 
| 126 | 126 |  	{ | 
| 127 | 127 | return $this->_attr[$attr_id]['attr_name']; | 
| 128 | 128 | } | 
| 129 | 129 | |
| 130 | 130 | /** | 
| 131 | - * Get attribute author | |
| 132 | - * | |
| 133 | - * @param int $user_id User id | |
| 134 | - * | |
| 135 | - * @return string | |
| 136 | - */ | |
| 131 | + * Get attribute author | |
| 132 | + * | |
| 133 | + * @param int $user_id User id | |
| 134 | + * | |
| 135 | + * @return string | |
| 136 | + */ | |
| 137 | 137 | public function get_users_by_user_id($user_id) | 
| 138 | 138 |  	{ | 
| 139 | 139 | if (!isset($this->_name[$user_id])) | 
| @@ -156,15 +156,15 @@ discard block | ||
| 156 | 156 | } | 
| 157 | 157 | |
| 158 | 158 | /** | 
| 159 | - * Generate a list of attributes based on permissions | |
| 160 | - * | |
| 161 | - * @param int $forum_id Forum id | |
| 162 | - * @param int $author_id Topic author id | |
| 163 | - * @param int $attribute_id Current attribute id | |
| 164 | - * @param string $viewtopic_url Topic's url | |
| 165 | - * | |
| 166 | - * @return null | |
| 167 | - */ | |
| 159 | + * Generate a list of attributes based on permissions | |
| 160 | + * | |
| 161 | + * @param int $forum_id Forum id | |
| 162 | + * @param int $author_id Topic author id | |
| 163 | + * @param int $attribute_id Current attribute id | |
| 164 | + * @param string $viewtopic_url Topic's url | |
| 165 | + * | |
| 166 | + * @return null | |
| 167 | + */ | |
| 168 | 168 | public function attr_select($forum_id, $author_id = 0, $attribute_id = 0, $viewtopic_url = '') | 
| 169 | 169 |  	{ | 
| 170 | 170 | $show_select = false; | 
| @@ -217,10 +217,10 @@ discard block | ||
| 217 | 217 | } | 
| 218 | 218 | |
| 219 | 219 | /** | 
| 220 | - * Generate a list of all attributes for search page | |
| 221 | - * | |
| 222 | - * @return null | |
| 223 | - */ | |
| 220 | + * Generate a list of all attributes for search page | |
| 221 | + * | |
| 222 | + * @return null | |
| 223 | + */ | |
| 224 | 224 | public function attr_search() | 
| 225 | 225 |  	{ | 
| 226 | 226 | foreach ($this->_attr as $attr) | 
| @@ -240,13 +240,13 @@ discard block | ||
| 240 | 240 | } | 
| 241 | 241 | |
| 242 | 242 | /** | 
| 243 | - * Generate a list of attributes for viewforum page | |
| 244 | - * | |
| 245 | - * @param int $forum_id Forum id | |
| 246 | - * @param int $attribute_id Current attribute id | |
| 247 | - * | |
| 248 | - * @return null | |
| 249 | - */ | |
| 243 | + * Generate a list of attributes for viewforum page | |
| 244 | + * | |
| 245 | + * @param int $forum_id Forum id | |
| 246 | + * @param int $attribute_id Current attribute id | |
| 247 | + * | |
| 248 | + * @return null | |
| 249 | + */ | |
| 250 | 250 | public function attr_sort($forum_id = 0, $attribute_id = 0) | 
| 251 | 251 |  	{ | 
| 252 | 252 | foreach ($this->_attr as $attr) | 
| @@ -268,13 +268,13 @@ discard block | ||
| 268 | 268 | } | 
| 269 | 269 | |
| 270 | 270 | /** | 
| 271 | - * Generate a default attribute list for a forum | |
| 272 | - * | |
| 273 | - * @param int $forum_id Forum id | |
| 274 | - * @param int $attribute_id Current attribute id | |
| 275 | - * | |
| 276 | - * @return null | |
| 277 | - */ | |
| 271 | + * Generate a default attribute list for a forum | |
| 272 | + * | |
| 273 | + * @param int $forum_id Forum id | |
| 274 | + * @param int $attribute_id Current attribute id | |
| 275 | + * | |
| 276 | + * @return null | |
| 277 | + */ | |
| 278 | 278 | public function attr_default($forum_id = 0, $attribute_id = 0) | 
| 279 | 279 |  	{ | 
| 280 | 280 | foreach ($this->_attr as $attr) | 
| @@ -301,14 +301,14 @@ discard block | ||
| 301 | 301 | } | 
| 302 | 302 | |
| 303 | 303 | /** | 
| 304 | - * Generate attribute for topic title | |
| 305 | - * | |
| 306 | - * @param int $attribute_id Current attribute id | |
| 307 | - * @param int $user_id Current attribute user id | |
| 308 | - * @param int $timestamp Attribute timestamp | |
| 309 | - * | |
| 310 | - * @return string Attribute html code | |
| 311 | - */ | |
| 304 | + * Generate attribute for topic title | |
| 305 | + * | |
| 306 | + * @param int $attribute_id Current attribute id | |
| 307 | + * @param int $user_id Current attribute user id | |
| 308 | + * @param int $timestamp Attribute timestamp | |
| 309 | + * | |
| 310 | + * @return string Attribute html code | |
| 311 | + */ | |
| 312 | 312 | public function attr_display($attribute_id = 0, $user_id = 0, $timestamp = 0) | 
| 313 | 313 |  	{ | 
| 314 | 314 | if (empty($attribute_id) || empty($user_id) || empty($timestamp)) | 
| @@ -338,14 +338,14 @@ discard block | ||
| 338 | 338 | } | 
| 339 | 339 | |
| 340 | 340 | /** | 
| 341 | - * Generate attribute for page title | |
| 342 | - * | |
| 343 | - * @param int $attribute_id Current attribute id | |
| 344 | - * @param int $user_id Current attribute user id | |
| 345 | - * @param int $timestamp Attribute timestamp | |
| 346 | - * | |
| 347 | - * @return string attribute html code | |
| 348 | - */ | |
| 341 | + * Generate attribute for page title | |
| 342 | + * | |
| 343 | + * @param int $attribute_id Current attribute id | |
| 344 | + * @param int $user_id Current attribute user id | |
| 345 | + * @param int $timestamp Attribute timestamp | |
| 346 | + * | |
| 347 | + * @return string attribute html code | |
| 348 | + */ | |
| 349 | 349 | public function attr_title($attribute_id = 0, $user_id = 0, $timestamp = 0) | 
| 350 | 350 |  	{ | 
| 351 | 351 | if (empty($attribute_id) || empty($user_id) || empty($timestamp)) | 
| @@ -372,17 +372,17 @@ discard block | ||
| 372 | 372 | |
| 373 | 373 | |
| 374 | 374 | /** | 
| 375 | - * Change topic attribute | |
| 376 | - * | |
| 377 | - * @param int $attribute_id New attribute id | |
| 378 | - * @param int $topic_id The id of the topic | |
| 379 | - * @param int $forum_id The id of the forum | |
| 380 | - * @param int $topic_attribute Current attribute id | |
| 381 | - * @param int $author_id Topic author id | |
| 382 | - * @param string $viewtopic_url URL to the topic page | |
| 383 | - * | |
| 384 | - * @return null | |
| 385 | - */ | |
| 375 | + * Change topic attribute | |
| 376 | + * | |
| 377 | + * @param int $attribute_id New attribute id | |
| 378 | + * @param int $topic_id The id of the topic | |
| 379 | + * @param int $forum_id The id of the forum | |
| 380 | + * @param int $topic_attribute Current attribute id | |
| 381 | + * @param int $author_id Topic author id | |
| 382 | + * @param string $viewtopic_url URL to the topic page | |
| 383 | + * | |
| 384 | + * @return null | |
| 385 | + */ | |
| 386 | 386 | public function attr_apply($attribute_id = 0, $topic_id = 0, $forum_id = 0, $topic_attribute = 0, $author_id = 0, $viewtopic_url = '') | 
| 387 | 387 |  	{ | 
| 388 | 388 | if (empty($topic_id) || empty($forum_id) || empty($attribute_id)) | 
| @@ -456,14 +456,14 @@ discard block | ||
| 456 | 456 | } | 
| 457 | 457 | |
| 458 | 458 | /** | 
| 459 | - * Change topic attribute in mcp | |
| 460 | - * | |
| 461 | - * @param int $attribute_id New attribute id | |
| 462 | - * @param int $forum_id The id of the forum | |
| 463 | - * @param array $topic_ids Topics ids | |
| 464 | - * | |
| 465 | - * @return null | |
| 466 | - */ | |
| 459 | + * Change topic attribute in mcp | |
| 460 | + * | |
| 461 | + * @param int $attribute_id New attribute id | |
| 462 | + * @param int $forum_id The id of the forum | |
| 463 | + * @param array $topic_ids Topics ids | |
| 464 | + * | |
| 465 | + * @return null | |
| 466 | + */ | |
| 467 | 467 | public function mcp_attr_apply($attribute_id = 0, $forum_id = 0, $topic_ids = array()) | 
| 468 | 468 |  	{ | 
| 469 | 469 |  		$can_edit		= $this->auth->acl_get('m_qte_attr_edit', $forum_id); | 
| @@ -549,10 +549,10 @@ discard block | ||
| 549 | 549 | } | 
| 550 | 550 | |
| 551 | 551 | /** | 
| 552 | - * Getter... | |
| 553 | - * | |
| 554 | - * @return array | |
| 555 | - */ | |
| 552 | + * Getter... | |
| 553 | + * | |
| 554 | + * @return array | |
| 555 | + */ | |
| 556 | 556 | public function getAttr() | 
| 557 | 557 |  	{ | 
| 558 | 558 | return $this->_attr; | 
| @@ -565,12 +565,12 @@ discard block | ||
| 565 | 565 | } | 
| 566 | 566 | |
| 567 | 567 | /** | 
| 568 | - * Build class and style attribute | |
| 569 | - * | |
| 570 | - * @param string $a_name Attribute name | |
| 571 | - * @param string $a_colour Attribute color | |
| 572 | - * @return string html code | |
| 573 | - */ | |
| 568 | + * Build class and style attribute | |
| 569 | + * | |
| 570 | + * @param string $a_name Attribute name | |
| 571 | + * @param string $a_colour Attribute color | |
| 572 | + * @return string html code | |
| 573 | + */ | |
| 574 | 574 | public function attr_colour($a_name, $a_colour) | 
| 575 | 575 |  	{ | 
| 576 | 576 | if ($a_name != $this->user->lang($a_name)) | 
| @@ -582,10 +582,10 @@ discard block | ||
| 582 | 582 | } | 
| 583 | 583 | |
| 584 | 584 | /** | 
| 585 | - * Get attributes from database | |
| 586 | - * | |
| 587 | - * @return null | |
| 588 | - */ | |
| 585 | + * Get attributes from database | |
| 586 | + * | |
| 587 | + * @return null | |
| 588 | + */ | |
| 589 | 589 | private function _get_attributes() | 
| 590 | 590 |  	{ | 
| 591 | 591 |  		if (($this->_attr = $this->cache->get('_attr')) === false) | 
| @@ -403,6 +403,9 @@ discard block | ||
| 403 | 403 | return $attr; | 
| 404 | 404 | } | 
| 405 | 405 | |
| 406 | + /** | |
| 407 | + * @return string | |
| 408 | + */ | |
| 406 | 409 | protected function qte_move($attr_row, $action = 'move_up', $steps = 1) | 
| 407 | 410 |  	{ | 
| 408 | 411 | global $db, $table_prefix; | 
| @@ -530,7 +533,7 @@ discard block | ||
| 530 | 533 | * Copy a permission (auth) option | 
| 531 | 534 | * | 
| 532 | 535 | * @param string $auth_option The name of the permission (auth) option | 
| 533 | - * @param int|false $copy_from If set, contains the id of the permission from which to copy the new one. | |
| 536 | + * @param string $copy_from If set, contains the id of the permission from which to copy the new one. | |
| 534 | 537 | * @param bool $clear_dest_perms True if destination permissions should be deleted | 
| 535 | 538 | * @return null | 
| 536 | 539 | */ | 
| @@ -525,15 +525,15 @@ | ||
| 525 | 525 | } | 
| 526 | 526 | |
| 527 | 527 | /** | 
| 528 | - * Permission Copy | |
| 529 | - * | |
| 530 | - * Copy a permission (auth) option | |
| 531 | - * | |
| 532 | - * @param string $auth_option The name of the permission (auth) option | |
| 533 | - * @param int|false $copy_from If set, contains the id of the permission from which to copy the new one. | |
| 534 | - * @param bool $clear_dest_perms True if destination permissions should be deleted | |
| 535 | - * @return null | |
| 536 | - */ | |
| 528 | + * Permission Copy | |
| 529 | + * | |
| 530 | + * Copy a permission (auth) option | |
| 531 | + * | |
| 532 | + * @param string $auth_option The name of the permission (auth) option | |
| 533 | + * @param int|false $copy_from If set, contains the id of the permission from which to copy the new one. | |
| 534 | + * @param bool $clear_dest_perms True if destination permissions should be deleted | |
| 535 | + * @return null | |
| 536 | + */ | |
| 537 | 537 | private function _copy_permission($auth_option, $copy_from = false, $clear_dest_perms = true) | 
| 538 | 538 |  	{ | 
| 539 | 539 | global $db, $phpbb_root_path, $phpEx; |