Changeset 1581

Timestamp:

09/14/06 21:30:34 (2 years ago)

Author:

mbonetti

Message:

Applied Sam Johnston's patch for #440

Location:

trunk/gregarius

Files:

• cls/nav.php (modified) (1 diff)
• schema.php (modified) (1 diff)
• update.php (modified) (2 diffs)

trunk/gregarius/cls/nav.php

@@ -61 +61 @@
     
         $this->appendNavItem(getPath(),__('<span>H</span>ome'),LOCATION_HOME);
-        $this->appendNavItem(getPath().'update.php',__('<span>R</span>efresh'),LOCATION_UPDATE);
+        if (!getConfig("rss.config.restrictrefresh")) {
+            $this->appendNavItem(getPath().'update.php',__('<span>R</span>efresh'),LOCATION_UPDATE);
+        }
         $this->appendNavItem(getPath().'search.php',__('<span>S</span>earch'),LOCATION_SEARCH);
         $this->appendNavItem(getPath().'admin/',__('A<span>d</span>min'),LOCATION_ADMIN);

trunk/gregarius/schema.php

@@ -476 +476 @@
         "rss.config.defaultdashboard"           => array('true','true','boolean','If the first page seen when entering the admin section should be the dashboard',NULL),
         "rss.config.deadthreshhold" =>  array('24', '24', 'num', 'Sets the threshold for when a feed is marked as dead, in hours', NULL),
-        "rss.search.maxitems" => array(500, 500, 'num', 'Sets the maximum number of items returned on a search', NULL)
+        "rss.search.maxitems" => array(500, 500, 'num', 'Sets the maximum number of items returned on a search', NULL),
+        "rss.config.restrictrefresh"    => array("false","false","boolean","Restrict refresh to command line only (eg php -f update.php). Useful for busy sites with multiple users.",NULL),
     );
     

trunk/gregarius/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));