Changeset 1604 for branches/multiuser/update.php

Timestamp:

10/16/06 06:31:35 (2 years ago)

Author:

mdodoo

Message:

Sync with trunk up to (but not including changeset [1585]). I should *definitely* do this more often, because this was really annoying.

Files:

• branches/multiuser/update.php (modified) (3 diffs)

branches/multiuser/update.php

@@ -28 +28 @@
 define ('RSS_NO_CACHE',true);
 require_once('init.php');
+$cline = isset($argv) && !$_REQUEST && isset($argc) && $argc;
+if (!$cline && getConfig('rss.config.restrictrefresh')) {
+    die(__('Sorry, updating from the web is currently not allowed.'));
+}
 rss_require("cls/update.php");
 rss_require("extlib/browser.php");
@@ -50 +54 @@
 
 $browser = new Browser();
-
-$cline = isset($argv) && !$_REQUEST && isset($argc) && $argc;
 $silent = array_key_exists('silent', $_GET) || ($cline && in_array('--silent',$argv));
 $newsonly = array_key_exists('newsonly', $_GET) || ($cline && in_array('--newsonly', $argv));
@@ -57 +59 @@
 
 $GLOBALS['rss'] -> header = new Header(
-            LBL_TITLE_UPDATING, 
+            __('Updating'), 
             LOCATION_UPDATE, 
             null,