Skip to content

Commit 28ffe93

Browse files
beaver-devbeaver-dev
committed
Migrate timezone and dat prefs
1 parent f344d7f commit 28ffe93

File tree

13 files changed

+62
-73
lines changed

13 files changed

+62
-73
lines changed

‎featherbb/Controller/Install.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ public function load_default_config(array $data)
289289
'o_parser_revision' => ForumEnv::get('FORUM_PARSER_REVISION'),
290290
'o_board_title' => $data['title'],
291291
'o_board_desc' => $data['description'],
292-
'o_default_timezone' => 0,
292+
// 'o_default_timezone' => 0,
293293
// 'o_time_format' => 'H:i:s',
294294
// 'o_date_format' => 'Y-m-d',
295295
'o_timeout_visit' => 1800,
@@ -344,7 +344,7 @@ public function load_default_config(array $data)
344344
'o_rules_message' => __('Rules'),
345345
'o_maintenance' => 0,
346346
'o_maintenance_message' => __('Maintenance message'),
347-
'o_default_dst' => 0,
347+
// 'o_default_dst' => 0,
348348
'p_message_bbcode' => 1,
349349
'p_message_img_tag' => 1,
350350
'p_message_all_caps' => 1,

‎featherbb/Controller/Register.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ public function display($req, $res, $args)
4141
throw new Error(__('No new regs'), 403);
4242
}
4343

44-
$user['timezone'] = isset($user['timezone']) ? $user['timezone'] : ForumSettings::get('o_default_timezone');
45-
$user['dst'] = isset($user['dst']) ? $user['dst'] : ForumSettings::get('o_default_dst');
46-
$user['email_setting'] = isset($user['email_setting']) ? $user['email_setting'] : ForumSettings::get('o_default_email_setting');
4744
$user['errors'] = '';
4845

4946
if (Request::isPost()) {

‎featherbb/Core/Utils.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public static function format_time($timestamp, $date_only = false, $date_format
6565
return __('Never');
6666
}
6767

68-
$diff = (User::get()->timezone + User::get()->dst) * 3600;
68+
$diff = (User::getPref('timezone') + User::getPref('dst')) * 3600;
6969
$timestamp += $diff;
7070
$now = time();
7171

‎featherbb/Middleware/Auth.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -226,10 +226,6 @@ private function load_default_user()
226226

227227
$user->disp_topics = ForumSettings::get('o_disp_topics_default');
228228
$user->disp_posts = ForumSettings::get('o_disp_posts_default');
229-
$user->timezone = ForumSettings::get('o_default_timezone');
230-
$user->dst = ForumSettings::get('o_default_dst');
231-
$user->language = ForumSettings::get('language');
232-
$user->style = ForumSettings::get('style');
233229
$user->is_guest = true;
234230
$user->is_admmod = false;
235231

‎featherbb/Model/Admin/Bans.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public function edit_ban_info($id)
127127
throw new Error(__('Bad request'), 404);
128128
}
129129

130-
$diff = (User::get()->timezone + User::get()->dst) * 3600;
130+
$diff = (User::getPref('timezone') + User::getPref('dst')) * 3600;
131131
$ban['expire'] = ($ban['expire'] != '') ? gmdate('Y-m-d', $ban['expire'] + $diff) : '';
132132

133133
$ban['mode'] = 'edit';
@@ -225,7 +225,7 @@ public function insert_ban()
225225
throw new Error(__('Invalid date message').' '.__('Invalid date reasons'), 400);
226226
}
227227

228-
$diff = (User::get()->timezone + User::get()->dst) * 3600;
228+
$diff = (User::getPref('timezone') + User::getPref('dst')) * 3600;
229229
$ban_expire -= $diff;
230230

231231
if ($ban_expire <= time()) {

‎featherbb/Model/Admin/Options.php‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ public function update_options()
2323
'board_title' => Utils::trim(Input::post('form_board_title')),
2424
'board_desc' => Utils::trim(Input::post('form_board_desc')),
2525
'base_url' => Utils::trim(Input::post('form_base_url')),
26-
'default_timezone' => floatval(Input::post('form_default_timezone')),
27-
'default_dst' => Input::post('form_default_dst') != '1' ? '0' : '1',
26+
// 'default_timezone' => floatval(Input::post('form_default_timezone')),
27+
// 'default_dst' => Input::post('form_default_dst') != '1' ? '0' : '1',
2828
// 'default_lang' => Utils::trim(Input::post('form_default_lang')),
2929
// 'default_style' => Utils::trim(Input::post('form_default_style')),
3030
// 'time_format' => Utils::trim(Input::post('form_time_format')),
@@ -81,10 +81,11 @@ public function update_options()
8181
$prefs = array(
8282
'language' => Utils::trim(Input::post('form_default_lang')),
8383
'style' => Utils::trim(Input::post('form_default_style')),
84+
'dst' => Input::post('form_default_dst') != '1' ? '0' : '1',
85+
'timezone' => floatval(Input::post('form_default_timezone')),
8486
'time_format' => Utils::trim(Input::post('form_time_format')),
8587
'date_format' => Utils::trim(Input::post('form_date_format')),
8688
'smilies' => Input::post('form_smilies') != '1' ? '0' : '1',
87-
8889
);
8990

9091
$form = Container::get('hooks')->fire('model.admin.options.update_options.form', $form);
@@ -221,7 +222,8 @@ public function update_options()
221222
Container::get('prefs')->set($prefs);
222223

223224
// Regenerate the config cache
224-
Container::get('cache')->store('config', array_merge(Cache::get_config(), Cache::get_preferences()));
225+
$config = array_merge(Cache::get_config(), Cache::get_preferences());
226+
Container::get('cache')->store('config', $config);
225227

226228
return Router::redirect(Router::pathFor('adminOptions'), __('Options updated redirect'));
227229
}

‎featherbb/Model/Admin/Users.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ public function ban_users()
458458
throw new Error(__('Invalid date message') . ' ' . __('Invalid date reasons'), 400);
459459
}
460460

461-
$diff = (User::get()->timezone + User::get()->dst) * 3600;
461+
$diff = (User::getPref('timezone') + User::getPref('dst')) * 3600;
462462
$ban_expire -= $diff;
463463

464464
if ($ban_expire <= time()) {

‎featherbb/Model/Api/User.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public function display($id)
2020
// Remove sensitive fields for regular users
2121
if (!$this->isAdMod) {
2222
Container::get('hooks')->bind('model.profile.get_user_info', function ($user) {
23-
$user = $user->select_delete_many(array('u.email', 'u.registration_ip', 'u.disp_topics', 'u.disp_posts', 'u.email_setting', 'u.notify_with_post', 'u.auto_notify', 'u.show_img', 'u.show_img_sig', 'u.show_avatars', 'u.show_sig', 'u.timezone', 'u.dst',, 'u.admin_note', 'u.last_visit'));
23+
$user = $user->select_delete_many(array('u.email', 'u.registration_ip', 'u.disp_topics', 'u.disp_posts', 'u.email_setting', 'u.notify_with_post', 'u.auto_notify', 'u.show_img', 'u.show_img_sig', 'u.show_avatars', 'u.show_sig', 'u.admin_note', 'u.last_visit'));
2424
return $user;
2525
});
2626
}

‎featherbb/Model/Install.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,6 @@ class Install
215215
`show_img_sig` tinyint(1) NOT NULL DEFAULT '1',
216216
`show_avatars` tinyint(1) NOT NULL DEFAULT '1',
217217
`show_sig` tinyint(1) NOT NULL DEFAULT '1',
218-
`timezone` float NOT NULL DEFAULT '0',
219-
`dst` tinyint(1) NOT NULL DEFAULT '0',
220218
`num_posts` int(10) unsigned NOT NULL DEFAULT '0',
221219
`last_post` int(10) unsigned DEFAULT NULL,
222220
`last_search` int(10) unsigned DEFAULT NULL,

‎featherbb/Model/Profile.php‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -825,8 +825,8 @@ public function update_profile($id, $info, $section)
825825
case 'display':
826826
{
827827
$form = array(
828-
'disp_topics' => Utils::trim(Input::post('form_disp_topics')),
829-
'disp_posts' => Utils::trim(Input::post('form_disp_posts')),
828+
'disp_topics' => intval(Input::post('form_disp_topics')),
829+
'disp_posts' => intval(Input::post('form_disp_posts')),
830830
'show_smilies' => Input::post('form_show_smilies') ? '1' : '0',
831831
'show_img' => Input::post('form_show_img') ? '1' : '0',
832832
'show_img_sig' => Input::post('form_show_img_sig') ? '1' : '0',
@@ -835,7 +835,6 @@ public function update_profile($id, $info, $section)
835835
);
836836

837837
if ($form['disp_topics'] != '') {
838-
$form['disp_topics'] = intval($form['disp_topics']);
839838
if ($form['disp_topics'] < 3) {
840839
$form['disp_topics'] = 3;
841840
} elseif ($form['disp_topics'] > 75) {
@@ -844,7 +843,6 @@ public function update_profile($id, $info, $section)
844843
}
845844

846845
if ($form['disp_posts'] != '') {
847-
$form['disp_posts'] = intval($form['disp_posts']);
848846
if ($form['disp_posts'] < 3) {
849847
$form['disp_posts'] = 3;
850848
} elseif ($form['disp_posts'] > 75) {
@@ -1000,7 +998,7 @@ public function update_profile($id, $info, $section)
1000998

1001999
public function get_user_info($id)
10021000
{
1003-
$user['select'] = array('u.id', 'u.username', 'u.email', 'u.title', 'u.realname', 'u.url', 'u.location', 'u.signature', 'u.disp_topics', 'u.disp_posts', 'u.email_setting', 'u.notify_with_post', 'u.auto_notify', 'u.show_img', 'u.show_img_sig', 'u.show_avatars', 'u.show_sig', 'u.timezone', 'u.dst', 'u.num_posts', 'u.last_post', 'u.registered', 'u.registration_ip', 'u.admin_note', 'u.last_visit', 'g.g_id', 'g.g_user_title', 'g.g_moderator');
1001+
$user['select'] = array('u.id', 'u.username', 'u.email', 'u.title', 'u.realname', 'u.url', 'u.location', 'u.signature', 'u.disp_topics', 'u.disp_posts', 'u.email_setting', 'u.notify_with_post', 'u.auto_notify', 'u.show_img', 'u.show_img_sig', 'u.show_avatars', 'u.show_sig', 'u.num_posts', 'u.last_post', 'u.registered', 'u.registration_ip', 'u.admin_note', 'u.last_visit', 'g.g_id', 'g.g_user_title', 'g.g_moderator');
10041002

10051003
$user = DB::for_table('users')
10061004
->table_alias('u')

0 commit comments

Comments
 (0)