Changeset 1069

Timestamp:

10/21/07 23:03:31 (9 months ago)

Author:

Rickard

Message:

Added automatic check for updates and the hotfix extension system. A test hotfix is enabled on the updates service.

Files:

• branches/punbb-1.3-dev/extras/db_update.php (modified) (1 diff)
• branches/punbb-1.3-dev/upload/admin/extensions.php (modified) (7 diffs)
• branches/punbb-1.3-dev/upload/admin/index.php (modified) (3 diffs)
• branches/punbb-1.3-dev/upload/admin/options.php (modified) (2 diffs)
• branches/punbb-1.3-dev/upload/header.php (modified) (2 diffs)
• branches/punbb-1.3-dev/upload/include/cache.php (modified) (1 diff)
• branches/punbb-1.3-dev/upload/include/common.php (modified) (1 diff)
• branches/punbb-1.3-dev/upload/include/functions.php (modified) (1 diff)
• branches/punbb-1.3-dev/upload/install.php (modified) (2 diffs)
• branches/punbb-1.3-dev/upload/lang/English/admin.php (modified) (5 diffs)
• branches/punbb-1.3-dev/upload/lang/English/common.php (modified) (1 diff)

branches/punbb-1.3-dev/extras/db_update.php

@@ -526 +526 @@
-                // Insert new config option o_check_for_updates
-                if (!array_key_exists('o_check_for_updates', $pun_config))
-
+
+
+
+
-
-                // Server timezone is now simply the default timezone

branches/punbb-1.3-dev/upload/admin/extensions.php

@@ -27 +27 @@
-require PUN_ROOT.'include/common.php';
-require PUN_ROOT.'include/common_admin.php';
-
+_once
-
-
@@ -38 +38 @@
-
-// Install an extension
-
+ || isset($_GET['install_hotfix'])
-{
-
+
+
+
+
+
+
+
-
-        // Parse manifest.xml into an array and validate it
-@file_get_contents(PUN_ROOT.'extensions/'.$id.'/manifest.xml')
+$manifest
-        $errors = validate_manifest($ext_data, $id);
-
-        if (!empty($errors))
-$lang_common['Bad request
+isset($_GET['install']) ? $lang_common['Bad request'] : $lang_admin['Hotfix download failed
-
-        // Setup breadcrumbs
@@ -158 +164 @@
-        <div class="b-section b-dataform">
-                <div class="c-section c-form">
- ?>?install=<?php echo 
+.(isset($_GET['install']) ? '?install=' : '?install_hotfix=').
-                        <div class="panel">
-                                <input type="hidden" name="csrf_token" value="<?php echo $pun_user['csrf_token'] ?>" />
@@ -167 +173 @@
-                                        <h3 class="field"><strong class="alabel"><?php echo $lang_admin['Extension title'] ?></strong> <span class="input"><?php echo htmlspecialchars($ext_data['extension']['title']) ?></span></h3>
-                                        <ul class="field">
-
-
+<?php if (strpos($id, 'hotfix_') !== 0): ?>
+<?php endif; ?>
-                                                <li><strong class="alabel"><?php echo $lang_admin['Extension description'] ?></strong> <span class="input"><?php echo htmlspecialchars($ext_data['extension']['description']) ?></span></li>
-                                        </ul>
-                                </div>
-
-
+<?php if (strpos($id, 'hotfix_') !== 0): ?>
+<?php endif; ?>
-                        </div>
-                        </form>
@@ -365 +371 @@
-        $num_exts = 0;
-        $num_failed = 0;
+
+        // Loop through any available hotfixes
+        if (isset($pun_updates['hotfix']))
+        {
+                // If there's only one hotfix, add one layer of arrays so we can foreach over it
+                if (!is_array(current($pun_updates['hotfix'])))
+                        $pun_updates['hotfix'] = array($pun_updates['hotfix']);
+
+                foreach ($pun_updates['hotfix'] as $hotfix)
+                {
+                        if (!array_key_exists($hotfix['attributes']['id'], $inst_exts))
+                        {
+                                echo "\t\t\t\t\t".'<p class="field hotfix"><strong class="alabel"><a href="'.pun_link($pun_url['admin_extensions']).'?install_hotfix='.urlencode($hotfix['attributes']['id']).'">'.$lang_admin['Install'].'</a></strong> <span class="input"><strong>'.htmlspecialchars($hotfix['content']).'</strong></span></p>'."\n";
+                                ++$num_exts;
+                        }
+                }
+        }
+
-        $d = dir(PUN_ROOT.'extensions');
-        while (($entry = $d->read()) !== false)
@@ -403 +427 @@
-                                if (!array_key_exists($entry, $inst_exts) || version_compare($inst_exts[$entry]['version'], $ext_data['extension']['version'], '!='))
-                                {
-' '.$ext_data['extension']['version']
+(strpos($entry, 'hotfix_') !== 0 ? ' '.$ext_data['extension']['version'] : '')
-                                        ++$num_exts;
-                                }
@@ -456 +480 @@
-                                        <h3 class="field"><strong class="alabel"><?php echo $lang_admin['Extension title'] ?><span>:</span></strong> <span class="input"><?php echo htmlspecialchars($ext['title']) ?></span></h3>
-                                        <ul class="field">
-
-
+<?php if (strpos($id, 'hotfix_') !== 0): ?>
+<?php endif; ?>
-<?php if ($ext['description'] != ''): ?>                                                <li><strong class="alabel"><?php echo $lang_admin['Extension description'] ?><span>:</span></strong> <span class="input"><?php echo htmlspecialchars($ext['description']) ?></span></li>
-<?php endif; ?>                                 </ul>

branches/punbb-1.3-dev/upload/admin/index.php

@@ -36 +36 @@
-
-
-$action = isset($_GET['action']) ? $_GET['action'] : null;
-
-// Check for upgrade
-if ($action == 'check_upgrade')
-{
-        $punbb_server = @fsockopen('www.punbb.org', 80, $errno, $errstr, 8);
-        if ($punbb_server)
-        {
-                $out = 'GET /latest_version HTTP/1.0'."\r\n";
-                $out .= 'Host: www.punbb.org'."\r\n";
-                $out .= 'Connection: Close'."\r\n\r\n";
-
-                fwrite($punbb_server, $out);
-
-                while (!feof($punbb_server))
-                        $latest_version = trim(fgets($punbb_server, 16));
-
-                fclose($punbb_server);
-        }
-
-        if ($latest_version == '')
-                message(sprintf($lang_admin['Check upgrade error'], trim($errstr), $errno));
-
-        $cur_version = strtolower($pun_config['o_cur_version']);
-        $latest_version = strtolower($latest_version);
-
-        if (version_compare($cur_version, $latest_version, '>='))
-                message($lang_admin['Latest version message']);
-        else
-                message($lang_admin['New version message'].' <a href="http://www.punbb.org/">PunBB.org</a>.');
-}
-
-
-// Show phpinfo() output
-else if ($action
+if (isset($_GET['action']) && $_GET['action']
-{
-        // Is phpinfo() a disabled function?
@@ -79 +46 @@
-        exit;
-}
+
+
+// Generate check for updates text block
+if ($pun_config['o_check_for_updates'] == '1')
+        $punbb_updates = $lang_admin['Check for updates enabled'];
+else
+{
+        // Get a list of installed hotfix extensions
+        $query = array(
+                'SELECT'        => 'e.id',
+                'FROM'          => 'extensions AS e',
+                'WHERE'         => 'e.id LIKE \'hotfix_%\''
+        );
+
+        ($hook = get_hook('ain_qr_get_hotfixes')) ? eval($hook) : null;
+        $result = $db->query_build($query) or error(__FILE__, __LINE__);
+        $num_hotfixes = $db->num_rows($result);
+
+        $hotfixes = array();
+        for ($i = 0; $i < $num_hotfixes; ++$i)
+                $hotfixes[] = urlencode($db->result($result, $i));
+
+        $punbb_updates = '<a href="http://punbb.org/update/?version='.urlencode($pun_config['o_cur_version']).'&hotfixes='.implode(',', $hotfixes).'">'.$lang_admin['Check for updates manual'].'</a>';
+}
+
-
-// Get the server load averages (if possible)
@@ -206 +198 @@
-                                        <h3 class="alegend"><span><?php echo $lang_admin['PunBB version'] ?></span></h3>
-                                        <ul class="field">
- - <a href="<?php echo pun_link($pun_url['admin_index']) ?>?action=check_upgrade"><?php echo $lang_admin['Check for upgrade'] ?></a>
+
-                                                <li class="input">&copy; Copyright 2002, 2003, 2004, 2005, 2006, 2007 Rickard Andersson</li>
+                                                <li class="input"><?php echo $punbb_updates ?></li>
-                                        </ul>
-                                </div>

branches/punbb-1.3-dev/upload/admin/options.php

@@ -63 +63 @@
-                        $form['timeout_online'] = intval($form['timeout_online']);
-                        $form['redirect_delay'] = intval($form['redirect_delay']);
+
+                        if (!isset($form['check_for_updates']) || $form['check_for_updates'] != '1') $form['check_for_updates'] = '0';
-
-                        if ($form['timeout_online'] >= $form['timeout_visit'])
@@ -395 +397 @@
-                                        </p>
-                                </fieldset>
+                                <fieldset class="checkset">
+                                        <legend><span><?php echo $lang_admin['Updates legend'] ?></span></legend>
+                                        <p class="field">
+<?php if (function_exists('curl_init') || function_exists('fsockopen') || in_array(strtolower(@ini_get('allow_url_fopen')), array('on', 'true', '1'))): ?>                                              <span class="input"><input type="checkbox" id="<?php echo 'fld'.$fld_count ?>" name="form[check_for_updates]" value="1"<?php if ($pun_config['o_check_for_updates'] == '1') echo ' checked="checked"' ?> />&#160;<label for="fs1f2"><?php echo $lang_admin['Auto check for updates'] ?></label><br /> <em class="field-info"><?php echo $lang_admin['Auto check for updates info'] ?></em></span><br />
+<?php else: ?>                                          <span class="input"><em class="field-info"><?php echo $lang_admin['Auto check disabled'] ?></em></span><br />
+<?php endif; ?>                                 </p>
+                                </fieldset>
-                                <fieldset class="textset">
-                                        <legend><span><?php echo $lang_admin['Timeouts legend'] ?></span></legend>

branches/punbb-1.3-dev/upload/header.php

@@ -208 +208 @@
-
-// START SUBST - <!-- pun_alert -->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-?>
@@ -236 +240 @@
-<?php
-
-
-
-
-
+
+
+
-}
-// END SUBST - <!-- pun_alert -->

branches/punbb-1.3-dev/upload/include/cache.php

@@ -220 +220 @@
-        fclose($fh);
-}
+
+
+//
+// Generate the updates cache PHP script
+//
+function generate_updates_cache()
+{
+        global $db, $pun_config;
+
+        // Get a list of installed hotfix extensions
+        $query = array(
+                'SELECT'        => 'e.id',
+                'FROM'          => 'extensions AS e',
+                'WHERE'         => 'e.id LIKE \'hotfix_%\''
+        );
+
+        ($hook = get_hook('ch_qr_get_hotfixes')) ? eval($hook) : null;
+        $result = $db->query_build($query) or error(__FILE__, __LINE__);
+        $num_hotfixes = $db->num_rows($result);
+
+        $hotfixes = array();
+        for ($i = 0; $i < $num_hotfixes; ++$i)
+                $hotfixes[] = urlencode($db->result($result, $i));
+
+        // Contact the punbb.org updates service
+        $result = get_remote_file('http://punbb.org/update/?type=xml&version='.urlencode($pun_config['o_cur_version']).'&hotfixes='.implode(',', $hotfixes), 8);
+
+        // Make sure we got everything we need
+        if ($result != null && strpos($result['content'], '</updates>') !== false)
+        {
+                require PUN_ROOT.'/include/xml.php';
+
+                $output = xml_to_array($result['content']);
+                $output = current($output);
+                $output['cached'] = time();
+                $output['fail'] = false;
+        }       
+        else    // If the update check failed, set the fail flag
+                $output = array('cached' => time(), 'fail' => true);
+
+        // This hook could potentially (and responsibly) be used by an extension to do its own little update check
+        ($hook = get_hook('ch_generate_updates_cache_write')) ? eval($hook) : null;
+
+        // Output update status as PHP code
+        $fh = @fopen(PUN_CACHE_DIR.'cache_updates.php', 'wb');
+        if (!$fh)
+                error('Unable to write updates cache file to cache directory. Please make sure PHP has write access to the directory \'cache\'.', __FILE__, __LINE__);
+
+        fwrite($fh, '<?php'."\n\n".'if (!defined(\'PUN_UPDATES_LOADED\')) define(\'PUN_UPDATES_LOADED\', 1);'."\n\n".'$pun_updates = '.var_export($output, true).';'."\n\n".'?>');
+
+        fclose($fh);
+}

branches/punbb-1.3-dev/upload/include/common.php

@@ -169 +169 @@
-
-
+// Load cached updates info
+if ($pun_user['g_id'] == PUN_ADMIN)
+{
+        if (file_exists(PUN_CACHE_DIR.'cache_updates.php'))
+                include PUN_CACHE_DIR.'cache_updates.php';
+
+        // Regenerate cache only if automatic updates are enabled and if the cache is more than 12 hours old
+        if ($pun_config['o_check_for_updates'] == '1' && (!defined('PUN_UPDATES_LOADED') || $pun_updates['cached'] < (time() - 43200)))
+        {
+                require_once PUN_ROOT.'include/cache.php';
+                generate_updates_cache();
+                require PUN_CACHE_DIR.'cache_updates.php';
+        }
+}
+
+
-// Load cached bans
-if (file_exists(PUN_CACHE_DIR.'cache_bans.php'))

branches/punbb-1.3-dev/upload/include/functions.php

@@ -1761 +1761 @@
-function message($message)
-{
-
+, $pun_updates
-
-        ($hook = get_hook('fn_message_start')) ? eval($hook) : null;

branches/punbb-1.3-dev/upload/install.php

@@ -1377 +1377 @@
-        $db->query('INSERT INTO '.$db_prefix."users (group_id, username, password, email, num_posts, last_post, registered, registration_ip, last_visit, salt) VALUES(1, '".$db->escape($username)."', '".sha1($salt.sha1($password1))."', '$email', 1, ".$now.", ".$now.", '127.0.0.1', ".$now.", '".$db->escape($salt)."')") or error(__FILE__, __LINE__);
-
-
-
-
+
+
+
+
+
-
-        // Insert config data
@@ -1389 +1391 @@
-                'o_time_format'                         => "'H:i:s'",
-                'o_date_format'                         => "'Y-m-d'",
-1
+$check_for_updates
-                'o_timeout_visit'                       => "'1800'",
-                'o_timeout_online'                      => "'300'",

branches/punbb-1.3-dev/upload/lang/English/admin.php

@@ -174 +174 @@
-'Install notes'                                 =>      'Install notes',
-'Uninstall notes'                               =>      'Uninstall notes',
+'Hotfix download failed'                =>      'Download and install of a hotfix extension failed. Please wait a while and try again.',
-
-// admin_forums
@@ -275 +276 @@
-'Forum information head'                =>      'Forum information',
-'PunBB version'                                 =>      'PunBB version',
-
+
+
-'Server load'                                   =>      'Server load',
-'users online'                                  =>      'users online',
@@ -285 +287 @@
-'Rows'                                                  =>      'Rows',
-'Size'                                                  =>      'Size',
-'Check upgrade error'                   =>      'Check for upgrade failed. Possible cause: %s - %s',
-'Latest version message'                =>      'You are running the latest version of PunBB.',
-'New version message'                   =>      'A new version of PunBB has been released. You can download the latest version at',
-'phpinfo disabled'                              =>      'The PHP function phpinfo() has been disabled on this server.',
-'Not available'                                 =>      'Not available',
@@ -315 +314 @@
-'Addressing legend'                             =>      'Board URLs',
-'Board defaults legend'                 =>      'Board defaults',
+'Updates legend'                                =>      'Updates',
-'Timeouts legend'                               =>      'Board timeouts',
-'Board menu legend'                             =>      'Board navigation',
@@ -330 +330 @@
-'Date format'                                   =>      'Date format',
-'Current format'                                =>      'Current format:',
+'Auto check for updates'                =>      'Automatically check for updates',
+'Auto check for updates info'   =>      'When enabled, PunBB will periodically check if there are any important updates to your software. This covers new version releases as well as hotfix extensions.',
+'Auto check disabled'                   =>      'The ability to automatically check for updates has been disabled. In order to support this feature, the PHP environment under which PunBB runs, must support either the <a href="http://www.php.net/manual/en/ref.curl.php">cURL extension</a>, the <a href="http://www.php.net/manual/en/function.fsockopen.php">fsockopen() function</a> or be configured with <a href="http://www.php.net/manual/en/ref.filesystem.php#ini.allow-url-fopen">allow_url_fopen</a> enabled.',
-'Visit timeout'                                 =>      'Visit timeout (seconds)',
-'Visit timeout info'                    =>      'Idle time before last visit data is updated.',

branches/punbb-1.3-dev/upload/lang/English/common.php

@@ -118 +118 @@
-'New reports'                   =>      'New reports',
-'Attention'                             =>      'Attention!',
+
+// Alerts
-'Maintenance mode'              =>      'Maintenance mode is enabled!',
-'Maintenance alert'             =>      'This board is in maintenance mode. DO NOT logout, if you do you will not be able to login.',
+'Updates'                               =>      'PunBB updates',
+'Updates failed'                =>      'The latest attempt at checking for updates against the PunBB.org updates service failed. This probably just means that the service is temporarily overloaded or out of order. However, if this alert does not disappear within a day or two, you should disable the automatic check for updates and check for updates manually in the future.',
+'Updates version n hf'  =>      'A newer version of PunBB, version %s, is available for download at <a href="http://punbb.org/">PunBB.org</a>. Furthermore, one or more hotfix extensions are available for install on the Extensions tab of the admin interface.',
+'Updates version'               =>      'A newer version of PunBB, version %s, is available for download at <a href="http://punbb.org/">PunBB.org</a>.',
+'Updates hf'                    =>      'One or more hotfix extensions are available for install on the Extensions tab of the admin interface.',
-
-// Stuff for Quick Links menu page footer