Migrate auto_notify

beaver-dev · beaver-dev · commit 21003f7a0da1 · 2016-04-25T20:36:05.000+02:00
diff --git a/featherbb/Controller/Install.php b/featherbb/Controller/Install.php
@@ -241,6 +241,7 @@ public function create_db(array $data)
             'show.sig' => 1,
             'email.setting' => 1,
             'notify_with_post' => 0,
+            'auto_notify' => 0,
         ));
         Container::get('prefs')->setGroup(2, array(
             'post.min_interval' => 0,
diff --git a/featherbb/Model/Install.php b/featherbb/Model/Install.php
@@ -206,7 +206,6 @@ class Install
             `url` varchar(100) DEFAULT NULL,
             `location` varchar(30) DEFAULT NULL,
             `signature` text,
-            `auto_notify` tinyint(1) NOT NULL DEFAULT '0',
             `num_posts` int(10) unsigned NOT NULL DEFAULT '0',
             `last_post` int(10) unsigned DEFAULT NULL,
             `last_search` int(10) unsigned DEFAULT NULL,
diff --git a/featherbb/Model/Post.php b/featherbb/Model/Post.php
@@ -1285,7 +1285,7 @@ public function get_checkboxes($fid, $is_admmod, $is_subscribed)
                     $subscr_checked = (Input::post('subscribe')) ? true : false;
                 }
                 // If auto subscribed
-                elseif (User::get()->auto_notify) {
+                elseif (User::getPref('auto_notify')) {
                     $subscr_checked = true;
                 }
                 // If already subscribed to the topic
diff --git a/featherbb/Model/Profile.php b/featherbb/Model/Profile.php
@@ -870,14 +870,14 @@ public function update_profile($id, $info, $section)
 
             case 'privacy':
             {
-                $form = array(
+                $prefs = array(
                     'email.setting'            => intval(Input::post('form_email_setting')),
                     'notify_with_post'        => Input::post('form_notify_with_post') ? '1' : '0',
                     'auto_notify'            => Input::post('form_auto_notify') ? '1' : '0',
                 );
 
-                if ($form['email_setting'] < 0 || $form['email_setting'] > 2) {
-                    $form['email_setting'] = ForumSettings::get('email.setting');
+                if ($prefs['email.setting'] < 0 || $prefs['email.setting'] > 2) {
+                    $prefs['email.setting'] = ForumSettings::get('email.setting');
                 }
 
                 break;
@@ -1003,7 +1003,7 @@ public function update_profile($id, $info, $section)
 
     public function get_user_info($id)
     {
-        $user['select'] = array('u.id', 'u.group_id', 'u.username', 'u.email', 'u.title', 'u.realname', 'u.url', 'u.location', 'u.signature', 'u.auto_notify', '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');
+        $user['select'] = array('u.id', 'u.group_id', 'u.username', 'u.email', 'u.title', 'u.realname', 'u.url', 'u.location', 'u.signature', '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');
 
         $user = DB::for_table('users')
             ->table_alias('u')
diff --git a/featherbb/View/profile/section_privacy.php b/featherbb/View/profile/section_privacy.php
@@ -43,7 +43,7 @@
                             <div class="rbox">
                                 <label><input type="checkbox" name="form_notify_with_post" value="1"<?php if ($user['prefs']['notify_with_post'] == '1') {echo ' checked="checked"';} ?> /><?php _e('Notify full') ?><br /></label>
 <?php if (ForumSettings::get('o_topic_subscriptions') == '1'): ?>
-                                <label><input type="checkbox" name="form_auto_notify" value="1"<?php if ($user['auto_notify'] == '1') {echo ' checked="checked"';} ?> /><?php _e('Auto notify full') ?><br /></label>
+                                <label><input type="checkbox" name="form_auto_notify" value="1"<?php if ($user['prefs']['auto_notify'] == '1') {echo ' checked="checked"';} ?> /><?php _e('Auto notify full') ?><br /></label>
 <?php endif; ?>
                             </div>
                         </div>
diff --git a/featherbb/View/topic.php b/featherbb/View/topic.php
@@ -140,7 +140,7 @@
                         <input type="hidden" name="form_sent" value="1" />
                         <input type="hidden" name="pid" value="<?= Utils::escape($pid) ?>" />
                         <input type="hidden" name="page" value="<?= Utils::escape($page_number) ?>" />
-<?php if (ForumSettings::get('o_topic_subscriptions') == '1' && (User::get()->auto_notify == '1' || $cur_topic['is_subscribed'])): ?>                        <input type="hidden" name="subscribe" value="1" />
+<?php if (ForumSettings::get('o_topic_subscriptions') == '1' && (User::getPref('auto_notify') == '1' || $cur_topic['is_subscribed'])): ?>                        <input type="hidden" name="subscribe" value="1" />
 <?php endif;
 
     if (User::get()->is_guest) {

Original file line number	Diff line number	Diff line change
`@@ -1285,7 +1285,7 @@ public function get_checkboxes($fid, $is_admmod, $is_subscribed)`
`1285`	`1285`	`$subscr_checked = (Input::post('subscribe')) ? true : false;`
`1286`	`1286`	`}`
`1287`	`1287`	`// If auto subscribed`
`1288`		`- elseif (User::get()->auto_notify) {`
	`1288`	`+ elseif (User::getPref('auto_notify')) {`
`1289`	`1289`	`$subscr_checked = true;`
`1290`	`1290`	`}`
`1291`	`1291`	`// If already subscribed to the topic`