Update FeatherBB version in Db after upgrade

beaver-dev · beaver-dev · commit fd29c3d70dbe · 2016-03-15T19:58:45.000+01:00
diff --git a/featherbb/Controller/Admin/Updates.php b/featherbb/Controller/Admin/Updates.php
@@ -79,38 +79,6 @@ public function display($req, $res, $args)
         )->addTemplate('admin/updates.php')->display();
     }
 
-    public function check($req, $res, $args)
-    {
-        Container::get('hooks')->fire('controller.admin.updates.check');
-
-        // Check for upgrade
-        if ($args['action'] == 'check_upgrade') {
-            if (!ini_get('allow_url_fopen')) {
-                throw new Error(__('fopen disabled message'), 500);
-            }
-
-            $latest_version = trim(@file_get_contents('http://featherbb.org/latest_version.html'));
-            if (empty($latest_version)) {
-                throw new Error(__('Upgrade check failed message'), 500);
-            }
-
-            if (version_compare(ForumSettings::get('o_cur_version'), $latest_version, '>=')) {
-                return Router::redirect(Router::pathFor('adminIndex'), __('Running latest version message'));
-            } else {
-                return Router::redirect(Router::pathFor('adminIndex'), sprintf(__('New version available message'), '<a href="http://featherbb.org/">FeatherBB.org</a>'));
-            }
-        }
-
-        AdminUtils::generateAdminMenu('updates');
-
-        return View::setPageInfo(array(
-                'title' => array(Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Updates')),
-                'active_page' => 'admin',
-                'admin_console' => true
-            )
-        )->addTemplate('admin/updates.php')->display();
-    }
-
     public function upgradePlugins($req, $res, $args)
     {
         Container::get('hooks')->fire('controller.admin.updates.upgradePlugins');
@@ -175,7 +143,7 @@ public function upgradeCore($req, $res, $args)
             $upgrade_results[$key]['errors'] = $coreUpdater->getErrors();
         } else {
             $upgrade_results[$key]['message'] = sprintf('Core %s successfull update %s', ForumEnv::get('FORUM_VERSION'), $coreUpdater->getLatestVersion());
-            if (!Database::for_table('config')->set('o_cur_version', ForumEnv::get('FORUM_VERSION'))->save()) {
+            if (!Database::for_table('config')->raw_execute('UPDATE `'.ForumSettings::get('db_prefix').'config` SET `conf_value` = :value WHERE `conf_name` = "o_cur_version"', array('value' => ForumEnv::get('FORUM_VERSION')))) {
                 $coreUpdater->_warnings[] = __('Could not update core version in database');
             }
         }
diff --git a/featherbb/View/admin/index.php b/featherbb/View/admin/index.php
@@ -40,7 +40,7 @@
                 <dl>
                     <dt><?php _e('FeatherBB version label') ?></dt>
                     <dd>
-                        <?php printf(__('FeatherBB version data')."\n", ForumSettings::get('o_cur_version'), '<a href="'.Router::pathFor('adminAction', ['action' => 'check_upgrade']).'">'.__('Check for upgrade').'</a>') ?>
+                        <?php printf(__('FeatherBB version data')."\n", ForumSettings::get('o_cur_version'), '<a href="'.Router::pathFor('adminUpdates').'">'.__('Check for upgrade').'</a>') ?>
                     </dd>
                     <dt><?php _e('Server statistics label') ?></dt>
                     <dd>
diff --git a/featherbb/View/admin/updates.php b/featherbb/View/admin/updates.php
@@ -161,10 +161,6 @@
                                     </td>
                                 </tr>
 <?php endforeach; ?>
-								<!-- <tr><th scope="row"><a href="http://localhost/admin/groups/edit/1" tabindex="5">Edit</a></th><td>Administrators</td></tr>
-								<tr><th scope="row"><a href="http://localhost/admin/groups/edit/2" tabindex="6">Edit</a></th><td>Moderators</td></tr>
-								<tr><th scope="row"><a href="http://localhost/admin/groups/edit/3" tabindex="7">Edit</a></th><td>Guests</td></tr>
-								<tr><th scope="row"><a href="http://localhost/admin/groups/edit/4" tabindex="8">Edit</a></th><td>Members</td></tr> -->
                             </table>
                         </div>
                     </fieldset>
diff --git a/featherbb/routes.php b/featherbb/routes.php
@@ -107,7 +107,6 @@
 
     // Admin updates
     Route::get('/updates', '\FeatherBB\Controller\Admin\Updates:display')->setName('adminUpdates');
-    Route::get('/updates/check', '\FeatherBB\Controller\Admin\Updates:check')->setName('adminCheckUpdates');
     Route::post('/updates/upgrade-core', '\FeatherBB\Controller\Admin\Updates:upgradeCore')->setName('adminUpgradeCore');
     Route::post('/updates/upgrade-plugins', '\FeatherBB\Controller\Admin\Updates:upgradePlugins')->setName('adminUpgradePlugins');
     Route::post('/updates/upgrade-themes', '\FeatherBB\Controller\Admin\Updates:upgradeThemes')->setName('adminUpgradeThemes');

-Original file line number
+Diff line change
                 <dl>
                     <dt><?php _e('FeatherBB version label') ?></dt>
                     <dd>
 -                        <?php printf(__('FeatherBB version data')."\n", ForumSettings::get('o_cur_version'), '<a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3C%2Fspan%3E%27%3C%2Fspan%3E.Router%3A%3A%3Cspan+class%3D"pl-en">pathFor('adminAction', ['action' => 'check_upgrade']).'">'.__('Check for upgrade').'</a>') ?>
 +                        <?php printf(__('FeatherBB version data')."\n", ForumSettings::get('o_cur_version'), '<a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3C%2Fspan%3E%27%3C%2Fspan%3E.Router%3A%3A%3Cspan+class%3D"pl-en">pathFor('adminUpdates').'">'.__('Check for upgrade').'</a>') ?>
                     </dd>
                     <dt><?php _e('Server statistics label') ?></dt>
                     <dd>