Check scope, else a privacy leaks happens this way:

[quix0rs-gnu-social.git] / scripts / uncache_users.php

diff --git a/scripts/uncache_users.php b/scripts/uncache_users.php
index 4e49bd790d62b1d20c7861dd8211dc2ca6886cab..6cd2101ad7a4561378cf498456e99f569d3f25f3 100644 (file)
--- a/scripts/uncache_users.php
+++ b/scripts/uncache_users.php
@@ -1,8 +1,8 @@
 #!/usr/bin/env php
 <?php
 /*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Control Yourself, Inc.
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -17,33 +17,28 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
 
-# Abort if called from a web server
-
-if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
-    print "This script must be run from the command line\n";
-    exit();
-}
+$helptext = <<<ENDOFHELP
+uncache_users.php <idfile>
 
-ini_set("max_execution_time", "0");
-ini_set("max_input_time", "0");
-set_time_limit(0);
-mb_internal_encoding('UTF-8');
+Uncache users listed in an ID file, default 'ids.txt'.
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('LACONICA', true);
+ENDOFHELP;
 
-require_once(INSTALLDIR . '/lib/common.php');
+require_once INSTALLDIR.'/scripts/commandline.inc.php';
 
-$id_file = ($argc > 1) ? $argv[1] : 'ids.txt';
+$id_file = (count($args) > 1) ? $args[0] : 'ids.txt';
 
 common_log(LOG_INFO, 'Updating user inboxes.');
 
 $ids = file($id_file);
 
+$memc = Cache::instance();
+
 foreach ($ids as $id) {
-       
-       $user = User::staticGet('id', $id);
+
+       $user = User::getKV('id', $id);
 
        if (!$user) {
                common_log(LOG_WARNING, 'No such user: ' . $id);
@@ -51,9 +46,7 @@ foreach ($ids as $id) {
        }
 
     $user->decache();
-    
-    $memc = common_memcache();
-    
-    $memc->delete(common_cache_key('user:notices_with_friends:'. $user->id));
-    $memc->delete(common_cache_key('user:notices_with_friends:'. $user->id . ';last'));
+
+    $memc->delete(Cache::key('user:notices_with_friends:'. $user->id));
+    $memc->delete(Cache::key('user:notices_with_friends:'. $user->id . ';last'));
 }