diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-12-28 10:53:28 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-12-28 10:53:28 +0000 |
| commit | fbaf2baa8d683a2afdd3cf98ea1e7c035369f1a3 (patch) | |
| tree | 9b2d6d27ffde528e54f41be6b0eb51d4f3751692 /phpBB/includes | |
| parent | 0c1c26e2ee7badb434483001eb55d304f6c20bd0 (diff) | |
| download | forums-fbaf2baa8d683a2afdd3cf98ea1e7c035369f1a3.tar forums-fbaf2baa8d683a2afdd3cf98ea1e7c035369f1a3.tar.gz forums-fbaf2baa8d683a2afdd3cf98ea1e7c035369f1a3.tar.bz2 forums-fbaf2baa8d683a2afdd3cf98ea1e7c035369f1a3.tar.xz forums-fbaf2baa8d683a2afdd3cf98ea1e7c035369f1a3.zip | |
document plugin-support
move language path declaration to object instantiation
git-svn-id: file:///svn/phpbb/trunk@9239 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/classes/user.php | 28 | ||||
| -rw-r--r-- | phpBB/includes/core/system_info.php | 3 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 34 |
3 files changed, 45 insertions, 20 deletions
diff --git a/phpBB/includes/classes/user.php b/phpBB/includes/classes/user.php index af425f2299..85a2ee012f 100644 --- a/phpBB/includes/classes/user.php +++ b/phpBB/includes/classes/user.php @@ -106,10 +106,10 @@ class phpbb_user extends phpbb_session * Constructor to set the lang path. Calls parrent::__construct() * * @param string $auth_method The authentication method to use, for example 'db' - * @param string $custom_lang_path An optional language pack path. + * @param string $lang_path Language pack path * @access public */ - public function __construct($auth_method, $custom_lang_path = false) + public function __construct($auth_method, $lang_path) { parent::__construct(); @@ -123,7 +123,13 @@ class phpbb_user extends phpbb_session } // Set language path - $this->lang_path = ($custom_lang_path === false) ? PHPBB_ROOT_PATH . 'language/' : $this->set_custom_lang_path($custom_lang_path); + $this->lang_path = $lang_path; + + // Make sure last character is a directory separator + if (substr($this->lang_path, -1) != DIRECTORY_SEPARATOR) + { + $this->lang_path .= DIRECTORY_SEPARATOR; + } } /** @@ -140,22 +146,6 @@ class phpbb_user extends phpbb_session } /** - * Function to set custom language path (able to use directory outside of phpBB) - * - * @param string $lang_path New language path used. - * @access public - */ - public function set_custom_lang_path($lang_path) - { - $this->lang_path = $lang_path; - - if (substr($this->lang_path, -1) != '/') - { - $this->lang_path .= '/'; - } - } - - /** * Setup basic user-specific items (style, language, ...) * * @param string|array $lang_set Language set to setup. diff --git a/phpBB/includes/core/system_info.php b/phpBB/includes/core/system_info.php index 0069daf826..870ee7895b 100644 --- a/phpBB/includes/core/system_info.php +++ b/phpBB/includes/core/system_info.php @@ -151,7 +151,8 @@ class phpbb_system_info extends phpbb_plugin_support implements ArrayAccess * page: Current page from phpBB root, for example: adm/index.php?i=10&b=2
* forum: Current forum id (determined by {@link request_var() request_var('f', 0)})
*
- * @return array Array containing page information.
+ * @return array Array containing page information.
+ * @plugin-support return
* @access protected
*/
protected function get_page()
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index b1379cdd60..f6ded04431 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -273,6 +273,39 @@ function phpbb_chmod($filename, $perms = phpbb::CHMOD_READ) return $result; } + /** + * Add a secret hash for use in links/GET requests + * @param string $link_name The name of the link; has to match the name used in check_link_hash, otherwise no restrictions apply + * @return string the hash + */ +/* + should use our hashing instead of a "custom" one + + function generate_link_hash($link_name) + { + global $user; + + if (!isset($user->data["hash_$link_name"])) + { + $user->data["hash_$link_name"] = substr(sha1($user->data['user_form_salt'] . $link_name), 0, 8); + } + + return $user->data["hash_$link_name"]; + } +*/ + + /** + * checks a link hash - for GET requests + * @param string $token the submitted token + * @param string $link_name The name of the link + * @return boolean true if all is fine + */ +/* + function check_link_hash($token, $link_name) + { + return $token === generate_link_hash($link_name); + } +*/ // functions used for building option fields /** @@ -2248,6 +2281,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline) /** * Generate page header +* @plugin-support override, default, return */ function page_header($page_title = '', $display_online_list = true) { |