summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--classes/File.php2
-rw-r--r--classes/Notice.php21
-rw-r--r--classes/statusnet.ini1
-rw-r--r--scripts/clearcache.php16
-rwxr-xr-xscripts/setup_status_network.sh6
-rw-r--r--scripts/showcache.php6
6 files changed, 40 insertions, 12 deletions
diff --git a/classes/File.php b/classes/File.php
index 6dd9e0c06..ee418a802 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -181,7 +181,7 @@ class File extends Memcached_DataObject
*/
static function validFilename($filename)
{
- return preg_match('^/[A-Za-z0-9._-]+$/', $filename);
+ return preg_match('/^[A-Za-z0-9._-]+$/', $filename);
}
/**
diff --git a/classes/Notice.php b/classes/Notice.php
index 42878d94f..f9f386357 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1468,4 +1468,25 @@ class Notice extends Memcached_DataObject
$handler->handle($this);
}
}
+
+ function insert()
+ {
+ $result = parent::insert();
+
+ if ($result) {
+ // Profile::hasRepeated() abuses pkeyGet(), so we
+ // have to clear manually
+ if (!empty($this->repeat_of)) {
+ $c = self::memcache();
+ if (!empty($c)) {
+ $ck = self::multicacheKey('Notice',
+ array('profile_id' => $this->profile_id,
+ 'repeat_of' => $this->repeat_of));
+ $c->delete($ck);
+ }
+ }
+ }
+
+ return $result;
+ }
}
diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index 6203650a6..e28424ce2 100644
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -585,6 +585,7 @@ modified = 384
[user_group__keys]
id = N
+nickname = U
[user_openid]
canonical = 130
diff --git a/scripts/clearcache.php b/scripts/clearcache.php
index 702c1e3d6..0fb75daa0 100644
--- a/scripts/clearcache.php
+++ b/scripts/clearcache.php
@@ -20,35 +20,35 @@
define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-$shortoptions = "t:c:v:k:";
+$shortoptions = "t:l:v:k:";
-$helptext = <<<ENDOFHELP
+$helptext = <<<END_OF_CLEARCACHE_HELP
USAGE: clearcache.php <args>
clears the cached object based on the args
-t table Table to look up
- -c column Column to look up, default "id"
+ -l column Column to look up, default "id"
-v value Value to look up
-k key Key to look up; other args are ignored
-ENDOFHELP;
+END_OF_CLEARCACHE_HELP;
require_once INSTALLDIR.'/scripts/commandline.inc';
-$karg = get_option_value('k');
+$karg = get_option_value('k', 'key');
if (!empty($karg)) {
$k = common_cache_key($karg);
} else {
- $table = get_option_value('t');
+ $table = get_option_value('t', 'table');
if (empty($table)) {
die("No table or key specified\n");
}
- $column = get_option_value('c');
+ $column = get_option_value('l', 'column');
if (empty($column)) {
$column = 'id';
}
- $value = get_option_value('v');
+ $value = get_option_value('v', 'value');
$k = Memcached_DataObject::cacheKey($table, $column, $value);
}
diff --git a/scripts/setup_status_network.sh b/scripts/setup_status_network.sh
index 4ad808011..89d15415f 100755
--- a/scripts/setup_status_network.sh
+++ b/scripts/setup_status_network.sh
@@ -13,6 +13,11 @@ export sitename="$2"
export tags="$3"
export email="$4"
export fullname="$5"
+export siteplan="$6"
+
+if [ "$siteplan" == '' ]; then
+ siteplan='single-user'
+fi
# Fixme: if this is changed later we need to update profile URLs
# for the created user.
@@ -71,6 +76,7 @@ then
sed "s/\$nickname/$nickname/" | \
sed "s/\$sitename/$sitename/" | \
sed "s/\$userpass/$userpass/" | \
+ sed "s/\$siteplan/$siteplan/" | \
php $PHPBASE/scripts/sendemail.php \
-s"$server" \
-n"$nickname" \
diff --git a/scripts/showcache.php b/scripts/showcache.php
index f17979572..93b57a484 100644
--- a/scripts/showcache.php
+++ b/scripts/showcache.php
@@ -20,14 +20,14 @@
define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-$shortoptions = "t:c:v:k:";
+$shortoptions = "t:l:v:k:";
$helptext = <<<ENDOFHELP
USAGE: showcache.php <args>
shows the cached object based on the args
-t table Table to look up
- -c column Column to look up, default "id"
+ -l column Column to look up, default "id"
-v value Value to look up
-k key Key to look up; other args are ignored
@@ -44,7 +44,7 @@ if (!empty($karg)) {
if (empty($table)) {
die("No table or key specified\n");
}
- $column = get_option_value('c');
+ $column = get_option_value('l');
if (empty($column)) {
$column = 'id';
}