mirror_php/typecho
1
0
Fork 0
mirror of https://github.com/typecho/typecho.git synced 2025-01-17 04:28:17 +01:00
Code Issues Projects Releases Wiki Activity

replace hash method

Browse Source
This commit is contained in:
祁宁 2014-04-25 09:38:17 +08:00
parent d9ee03df73
commit 10b7d336ba
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/extending.php
View File

@ -8,4 +8,6 @@ if (!isset($panelTable['file']) || !in_array(urlencode($panel), $panelTable['fil
throw new Typecho_Plugin_Exception(_t('页面不存在'), 404);
}
require_once $panel;
list ($pluginName, $file) = explode('/', trim('/', $panel), 2);
require_once $options->pluginDir($pluginName) . '/' . $file;

2
var/Widget/Options/Discussion.php
View File

@ -198,7 +198,7 @@ class Widget_Options_Discussion extends Widget_Abstract_Options implements Widge
$settings['commentsThreaded'] = $this->isEnableByCheckbox($settings['commentsShow'], 'commentsThreaded');
$settings['commentsPageSize'] = intval($settings['commentsPageSize']);
$settings['commentsMaxNestingLevels'] = max(2, intval($settings['commentsMaxNestingLevels']));
$settings['commentsMaxNestingLevels'] = min(7, max(2, intval($settings['commentsMaxNestingLevels'])));
$settings['commentsPageDisplay'] = ('first' == $settings['commentsPageDisplay']) ? 'first' : 'last';
$settings['commentsOrder'] = ('DESC' == $settings['commentsOrder']) ? 'DESC' : 'ASC';
$settings['commentsAvatarRating'] = in_array($settings['commentsAvatarRating'], array('G', 'PG', 'R', 'X'))

2
var/Widget/Options/Reading.php
View File

@ -191,6 +191,8 @@ class Widget_Options_Reading extends Widget_Options_Permalink
$settings['routingTable'] = serialize($routingTable);
}
} else {
$settings['frontArchive'] = 0;
}
foreach ($settings as $name => $value) {

7
var/Widget/Users/Edit.php
View File

@ -206,10 +206,12 @@ class Widget_Users_Edit extends Widget_Abstract_Users implements Widget_Interfac
$this->response->goBack();
}
$hasher = new PasswordHash(8, true);
/** 取出数据 */
$user = $this->request->from('name', 'mail', 'screenName', 'password', 'url', 'group');
$user['screenName'] = empty($user['screenName']) ? $user['name'] : $user['screenName'];
$user['password'] = Typecho_Common::hash($user['password']);
$user['password'] = $hasher->HashPassword($user['password']);
$user['created'] = $this->options->gmtTime;
/** 插入数据 */
@ -243,7 +245,8 @@ class Widget_Users_Edit extends Widget_Abstract_Users implements Widget_Interfac
if (empty($user['password'])) {
unset($user['password']);
} else {
$user['password'] = Typecho_Common::hash($user['password']);
$hasher = new PasswordHash(8, true);
$user['password'] = $hasher->HashPassword($user['password']);
}
/** 更新数据 */

3
var/Widget/Users/Profile.php
View File

@ -314,7 +314,8 @@ class Widget_Users_Profile extends Widget_Users_Edit implements Widget_Interface
$this->response->goBack();
}
$password = Typecho_Common::hash($this->request->password);
$hasher = new PasswordHash(8, true);
$password = $hasher->HashPassword($this->request->password);
/** 更新数据 */
$this->update(array('password' => $password),