@@ -16,23 +16,23 @@ discard block |
||
| 16 | 16 | class base extends \Exception |
| 17 | 17 | { |
| 18 | 18 | /** |
| 19 | - * Null if the message is a string, array if the message was submitted as an array |
|
| 20 | - * @var string|array |
|
| 21 | - */ |
|
| 19 | + * Null if the message is a string, array if the message was submitted as an array |
|
| 20 | + * @var string|array |
|
| 21 | + */ |
|
| 22 | 22 | protected $message_full; |
| 23 | 23 | |
| 24 | 24 | protected $previous; |
| 25 | 25 | |
| 26 | 26 | /** |
| 27 | - * Constructor |
|
| 28 | - * |
|
| 29 | - * Different from normal exceptions in that we do not enforce $message to be a string. |
|
| 30 | - * |
|
| 31 | - * @param string|array $message |
|
| 32 | - * @param int $code |
|
| 33 | - * @param \Exception $previous |
|
| 34 | - * @access public |
|
| 35 | - */ |
|
| 27 | + * Constructor |
|
| 28 | + * |
|
| 29 | + * Different from normal exceptions in that we do not enforce $message to be a string. |
|
| 30 | + * |
|
| 31 | + * @param string|array $message |
|
| 32 | + * @param int $code |
|
| 33 | + * @param \Exception $previous |
|
| 34 | + * @access public |
|
| 35 | + */ |
|
| 36 | 36 | public function __construct($message = null, $code = 0, \Exception $previous = null) |
| 37 | 37 | { |
| 38 | 38 | // We're slightly changing the way exceptions work |
@@ -53,12 +53,12 @@ discard block |
||
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | /** |
| 56 | - * Basic message translation for our exceptions |
|
| 57 | - * |
|
| 58 | - * @param \phpbb\language\language $translator |
|
| 59 | - * @return array|string |
|
| 60 | - * @access public |
|
| 61 | - */ |
|
| 56 | + * Basic message translation for our exceptions |
|
| 57 | + * |
|
| 58 | + * @param \phpbb\language\language $translator |
|
| 59 | + * @return array|string |
|
| 60 | + * @access public |
|
| 61 | + */ |
|
| 62 | 62 | public function get_message(\phpbb\language\language $translator) |
| 63 | 63 | { |
| 64 | 64 | // Make sure our language file has been loaded |
@@ -73,18 +73,18 @@ discard block |
||
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | /** |
| 76 | - * Translate all portions of the message sent to the exception |
|
| 77 | - * |
|
| 78 | - * Goes through each element of the array and tries to translate them |
|
| 79 | - * |
|
| 80 | - * @param \phpbb\language\language $translator |
|
| 81 | - * @param string|array $message_portions The message portions to translate |
|
| 82 | - * @param string|null $parent_message Send a string to translate all of the |
|
| 83 | - * portions with the parent message (typically used to format a string |
|
| 84 | - * with the given message portions). Null to ignore. Default: Null |
|
| 85 | - * @return array|string Array if $parent_message === null else a string |
|
| 86 | - * @access protected |
|
| 87 | - */ |
|
| 76 | + * Translate all portions of the message sent to the exception |
|
| 77 | + * |
|
| 78 | + * Goes through each element of the array and tries to translate them |
|
| 79 | + * |
|
| 80 | + * @param \phpbb\language\language $translator |
|
| 81 | + * @param string|array $message_portions The message portions to translate |
|
| 82 | + * @param string|null $parent_message Send a string to translate all of the |
|
| 83 | + * portions with the parent message (typically used to format a string |
|
| 84 | + * with the given message portions). Null to ignore. Default: Null |
|
| 85 | + * @return array|string Array if $parent_message === null else a string |
|
| 86 | + * @access protected |
|
| 87 | + */ |
|
| 88 | 88 | protected function translate_portions(\phpbb\language\language $translator, $message_portions, $parent_message = null) |
| 89 | 89 | { |
| 90 | 90 | // Make sure our language file has been loaded |
@@ -126,12 +126,12 @@ discard block |
||
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | /** |
| 129 | - * Add our language file |
|
| 130 | - * |
|
| 131 | - * @param \phpbb\language\language $translator |
|
| 132 | - * @return null |
|
| 133 | - * @access public |
|
| 134 | - */ |
|
| 129 | + * Add our language file |
|
| 130 | + * |
|
| 131 | + * @param \phpbb\language\language $translator |
|
| 132 | + * @return null |
|
| 133 | + * @access public |
|
| 134 | + */ |
|
| 135 | 135 | public function add_lang(\phpbb\language\language $translator) |
| 136 | 136 | { |
| 137 | 137 | static $is_loaded = false; |
@@ -150,15 +150,15 @@ discard block |
||
| 150 | 150 | } |
| 151 | 151 | |
| 152 | 152 | /** |
| 153 | - * Output a string of this error message |
|
| 154 | - * |
|
| 155 | - * This will hopefully be never called, always catch the expected exceptions |
|
| 156 | - * and call get_message to translate them into an error that a user can |
|
| 157 | - * understand |
|
| 158 | - * |
|
| 159 | - * @return string |
|
| 160 | - * @access public |
|
| 161 | - */ |
|
| 153 | + * Output a string of this error message |
|
| 154 | + * |
|
| 155 | + * This will hopefully be never called, always catch the expected exceptions |
|
| 156 | + * and call get_message to translate them into an error that a user can |
|
| 157 | + * understand |
|
| 158 | + * |
|
| 159 | + * @return string |
|
| 160 | + * @access public |
|
| 161 | + */ |
|
| 162 | 162 | public function __toString() |
| 163 | 163 | { |
| 164 | 164 | return (is_array($this->message_full)) ? var_export($this->message_full, true) : (string) $this->message_full; |
@@ -1,11 +1,11 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * |
|
| 4 | - * @package sitemaker |
|
| 5 | - * @copyright (c) 2015 Daniel A. (blitze) |
|
| 6 | - * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 |
|
| 7 | - * |
|
| 8 | - */ |
|
| 3 | + * |
|
| 4 | + * @package sitemaker |
|
| 5 | + * @copyright (c) 2015 Daniel A. (blitze) |
|
| 6 | + * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 |
|
| 7 | + * |
|
| 8 | + */ |
|
| 9 | 9 | |
| 10 | 10 | namespace blitze\sitemaker\exception; |
| 11 | 11 | |
@@ -15,12 +15,12 @@ discard block |
||
| 15 | 15 | class unexpected_value extends base |
| 16 | 16 | { |
| 17 | 17 | /** |
| 18 | - * Translate this exception |
|
| 19 | - * |
|
| 20 | - * @param \phpbb\language\language $translator |
|
| 21 | - * @return array|string |
|
| 22 | - * @access public |
|
| 23 | - */ |
|
| 18 | + * Translate this exception |
|
| 19 | + * |
|
| 20 | + * @param \phpbb\language\language $translator |
|
| 21 | + * @return array|string |
|
| 22 | + * @access public |
|
| 23 | + */ |
|
| 24 | 24 | public function get_message(\phpbb\language\language $translator) |
| 25 | 25 | { |
| 26 | 26 | return $this->translate_portions($translator, $this->message_full, 'EXCEPTION_UNEXPECTED_VALUE'); |
@@ -1,11 +1,11 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * |
|
| 4 | - * @package sitemaker |
|
| 5 | - * @copyright (c) 2015 Daniel A. (blitze) |
|
| 6 | - * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 |
|
| 7 | - * |
|
| 8 | - */ |
|
| 3 | + * |
|
| 4 | + * @package sitemaker |
|
| 5 | + * @copyright (c) 2015 Daniel A. (blitze) |
|
| 6 | + * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 |
|
| 7 | + * |
|
| 8 | + */ |
|
| 9 | 9 | |
| 10 | 10 | namespace blitze\sitemaker\exception; |
| 11 | 11 | |
@@ -15,12 +15,12 @@ discard block |
||
| 15 | 15 | class unexpected_value extends base |
| 16 | 16 | { |
| 17 | 17 | /** |
| 18 | - * Translate this exception |
|
| 19 | - * |
|
| 20 | - * @param \phpbb\language\language $translator |
|
| 21 | - * @return array|string |
|
| 22 | - * @access public |
|
| 23 | - */ |
|
| 18 | + * Translate this exception |
|
| 19 | + * |
|
| 20 | + * @param \phpbb\language\language $translator |
|
| 21 | + * @return array|string |
|
| 22 | + * @access public |
|
| 23 | + */ |
|
| 24 | 24 | public function get_message(\phpbb\language\language $translator) |
| 25 | 25 | { |
| 26 | 26 | return $this->translate_portions($translator, $this->message_full, 'EXCEPTION_UNEXPECTED_VALUE'); |
@@ -1,11 +1,11 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * |
|
| 4 | - * @package sitemaker |
|
| 5 | - * @copyright (c) 2015 Daniel A. (blitze) |
|
| 6 | - * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 |
|
| 7 | - * |
|
| 8 | - */ |
|
| 3 | + * |
|
| 4 | + * @package sitemaker |
|
| 5 | + * @copyright (c) 2015 Daniel A. (blitze) |
|
| 6 | + * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 |
|
| 7 | + * |
|
| 8 | + */ |
|
| 9 | 9 | |
| 10 | 10 | namespace blitze\sitemaker\exception; |
| 11 | 11 | |
@@ -15,12 +15,12 @@ discard block |
||
| 15 | 15 | class unexpected_value extends base |
| 16 | 16 | { |
| 17 | 17 | /** |
| 18 | - * Translate this exception |
|
| 19 | - * |
|
| 20 | - * @param \phpbb\language\language $translator |
|
| 21 | - * @return array|string |
|
| 22 | - * @access public |
|
| 23 | - */ |
|
| 18 | + * Translate this exception |
|
| 19 | + * |
|
| 20 | + * @param \phpbb\language\language $translator |
|
| 21 | + * @return array|string |
|
| 22 | + * @access public |
|
| 23 | + */ |
|
| 24 | 24 | public function get_message(\phpbb\language\language $translator) |
| 25 | 25 | { |
| 26 | 26 | return $this->translate_portions($translator, $this->message_full, 'EXCEPTION_UNEXPECTED_VALUE'); |
@@ -1,11 +1,11 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * |
|
| 4 | - * @package sitemaker |
|
| 5 | - * @copyright (c) 2013 Daniel A. (blitze) |
|
| 6 | - * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 |
|
| 7 | - * |
|
| 8 | - */ |
|
| 3 | + * |
|
| 4 | + * @package sitemaker |
|
| 5 | + * @copyright (c) 2013 Daniel A. (blitze) |
|
| 6 | + * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 |
|
| 7 | + * |
|
| 8 | + */ |
|
| 9 | 9 | |
| 10 | 10 | namespace blitze\sitemaker\migrations\converter; |
| 11 | 11 | |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | { |
| 24 | 24 | return !$this->db_tools->sql_column_exists($this->table_prefix . 'modules', 'module_dir'); |
| 25 | 25 | } |
| 26 | - */ |
|
| 26 | + */ |
|
| 27 | 27 | |
| 28 | 28 | public function update_data() |
| 29 | 29 | { |
@@ -1,11 +1,11 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * |
|
| 4 | - * @package sitemaker |
|
| 5 | - * @copyright (c) 2013 Daniel A. (blitze) |
|
| 6 | - * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 |
|
| 7 | - * |
|
| 8 | - */ |
|
| 3 | + * |
|
| 4 | + * @package sitemaker |
|
| 5 | + * @copyright (c) 2013 Daniel A. (blitze) |
|
| 6 | + * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 |
|
| 7 | + * |
|
| 8 | + */ |
|
| 9 | 9 | |
| 10 | 10 | namespace blitze\sitemaker\blocks; |
| 11 | 11 | |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | * @param \phpbb\cache\driver\driver_interface $cache Cache driver interface |
| 38 | 38 | * @param \phpbb\db\driver\driver_interface $db Database object |
| 39 | 39 | * @param \phpbb\request\request_interface $request Request object |
| 40 | - * @param \phpbb\textformatter\s9e\utils $text_formatter_utils Text manipulation utilities |
|
| 40 | + * @param \phpbb\textformatter\s9e\utils $text_formatter_utils Text manipulation utilities |
|
| 41 | 41 | * @param string $cblocks_table Name of custom blocks database table |
| 42 | 42 | */ |
| 43 | 43 | public function __construct(\phpbb\cache\driver\driver_interface $cache, \phpbb\db\driver\driver_interface $db, \phpbb\request\request_interface $request, \phpbb\textformatter\s9e\utils $text_formatter_utils, $cblocks_table) |
@@ -1,11 +1,11 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * |
|
| 4 | - * @package sitemaker |
|
| 5 | - * @copyright (c) 2016 Daniel A. (blitze) |
|
| 6 | - * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 |
|
| 7 | - * |
|
| 8 | - */ |
|
| 3 | + * |
|
| 4 | + * @package sitemaker |
|
| 5 | + * @copyright (c) 2016 Daniel A. (blitze) |
|
| 6 | + * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 |
|
| 7 | + * |
|
| 8 | + */ |
|
| 9 | 9 | |
| 10 | 10 | namespace blitze\sitemaker\services\users; |
| 11 | 11 | |
@@ -336,8 +336,7 @@ discard block |
||
| 336 | 336 | if ($this->settings['display_preview']) |
| 337 | 337 | { |
| 338 | 338 | $post_data = $this->forum->get_post_data($this->settings['display_preview']); |
| 339 | - } |
|
| 340 | - else |
|
| 339 | + } else |
|
| 341 | 340 | { |
| 342 | 341 | $post_data = array_fill_keys(array_keys($topic_data), array(array('post_text' => '', 'bbcode_uid' => '', 'bbcode_bitfield' => ''))); |
| 343 | 342 | } |
@@ -360,8 +359,7 @@ discard block |
||
| 360 | 359 | $this->fields['user_colour'] = 'topic_last_poster_colour'; |
| 361 | 360 | |
| 362 | 361 | $this->ptemplate->assign_var('L_POST_BY_AUTHOR', $this->user->lang('LAST_POST_BY_AUTHOR')); |
| 363 | - } |
|
| 364 | - else |
|
| 362 | + } else |
|
| 365 | 363 | { |
| 366 | 364 | $this->fields['time'] = 'topic_time'; |
| 367 | 365 | $this->fields['user_id'] = 'topic_poster'; |