summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
Diffstat (limited to 'classes')
-rw-r--r--classes/Design.php56
-rw-r--r--classes/File.php54
-rw-r--r--classes/Oauth_application.php17
-rw-r--r--classes/Profile.php1
-rw-r--r--classes/User_group.php57
5 files changed, 142 insertions, 43 deletions
diff --git a/classes/Design.php b/classes/Design.php
index ff44e0109..a8fdb7219 100644
--- a/classes/Design.php
+++ b/classes/Design.php
@@ -139,34 +139,50 @@ class Design extends Memcached_DataObject
static function url($filename)
{
- $path = common_config('background', 'path');
-
- if ($path[strlen($path)-1] != '/') {
- $path .= '/';
- }
+ if (StatusNet::isHTTPS()) {
+
+ $sslserver = common_config('background', 'sslserver');
+
+ if (empty($sslserver)) {
+ // XXX: this assumes that background dir == site dir + /background/
+ // not true if there's another server
+ if (is_string(common_config('site', 'sslserver')) &&
+ mb_strlen(common_config('site', 'sslserver')) > 0) {
+ $server = common_config('site', 'sslserver');
+ } else if (common_config('site', 'server')) {
+ $server = common_config('site', 'server');
+ }
+ $path = common_config('site', 'path') . '/background/';
+ } else {
+ $server = $sslserver;
+ $path = common_config('background', 'sslpath');
+ if (empty($path)) {
+ $path = common_config('background', 'path');
+ }
+ }
- if ($path[0] != '/') {
- $path = '/'.$path;
- }
+ $protocol = 'https';
- $server = common_config('background', 'server');
+ } else {
- if (empty($server)) {
- $server = common_config('site', 'server');
- }
+ $path = common_config('background', 'path');
- $ssl = common_config('background', 'ssl');
+ $server = common_config('background', 'server');
- if (is_null($ssl)) { // null -> guess
- if (common_config('site', 'ssl') == 'always' &&
- !common_config('background', 'server')) {
- $ssl = true;
- } else {
- $ssl = false;
+ if (empty($server)) {
+ $server = common_config('site', 'server');
}
+
+ $protocol = 'http';
}
- $protocol = ($ssl) ? 'https' : 'http';
+ if ($path[strlen($path)-1] != '/') {
+ $path .= '/';
+ }
+
+ if ($path[0] != '/') {
+ $path = '/'.$path;
+ }
return $protocol.'://'.$server.$path.$filename;
}
diff --git a/classes/File.php b/classes/File.php
index d457968b5..da029e39b 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -261,22 +261,41 @@ class File extends Memcached_DataObject
// TRANS: Client exception thrown if a file upload does not have a valid name.
throw new ClientException(_("Invalid filename."));
}
- if(common_config('site','private')) {
+
+ if (common_config('site','private')) {
return common_local_url('getfile',
array('filename' => $filename));
- } else {
- $path = common_config('attachments', 'path');
+ }
- if ($path[strlen($path)-1] != '/') {
- $path .= '/';
- }
+ if (StatusNet::isHTTPS()) {
+
+ $sslserver = common_config('attachments', 'sslserver');
- if ($path[0] != '/') {
- $path = '/'.$path;
+ if (empty($sslserver)) {
+ // XXX: this assumes that background dir == site dir + /file/
+ // not true if there's another server
+ if (is_string(common_config('site', 'sslserver')) &&
+ mb_strlen(common_config('site', 'sslserver')) > 0) {
+ $server = common_config('site', 'sslserver');
+ } else if (common_config('site', 'server')) {
+ $server = common_config('site', 'server');
+ }
+ $path = common_config('site', 'path') . '/file/';
+ } else {
+ $server = $sslserver;
+ $path = common_config('attachments', 'sslpath');
+ if (empty($path)) {
+ $path = common_config('attachments', 'path');
+ }
}
+ $protocol = 'https';
+
+ } else {
+
+ $path = common_config('attachments', 'path');
$server = common_config('attachments', 'server');
if (empty($server)) {
@@ -285,19 +304,18 @@ class File extends Memcached_DataObject
$ssl = common_config('attachments', 'ssl');
- if (is_null($ssl)) { // null -> guess
- if (common_config('site', 'ssl') == 'always' &&
- !common_config('attachments', 'server')) {
- $ssl = true;
- } else {
- $ssl = false;
- }
- }
-
$protocol = ($ssl) ? 'https' : 'http';
+ }
- return $protocol.'://'.$server.$path.$filename;
+ if ($path[strlen($path)-1] != '/') {
+ $path .= '/';
}
+
+ if ($path[0] != '/') {
+ $path = '/'.$path;
+ }
+
+ return $protocol.'://'.$server.$path.$filename;
}
function getEnclosure(){
diff --git a/classes/Oauth_application.php b/classes/Oauth_application.php
index e81706104..f1d4fb7a6 100644
--- a/classes/Oauth_application.php
+++ b/classes/Oauth_application.php
@@ -46,12 +46,19 @@ class Oauth_application extends Memcached_DataObject
static function maxDesc()
{
- $desclimit = common_config('application', 'desclimit');
- // null => use global limit (distinct from 0!)
- if (is_null($desclimit)) {
- $desclimit = common_config('site', 'textlimit');
+ // This used to default to textlimit or allow unlimited descriptions,
+ // but this isn't part of a notice and the field's limited to 255 chars
+ // in the DB, so those seem silly.
+ //
+ // Now just defaulting to 255 max unless a smaller application desclimit
+ // is actually set. Setting to 0 will use the maximum.
+ $max = 255;
+ $desclimit = intval(common_config('application', 'desclimit'));
+ if ($desclimit > 0 && $desclimit < $max) {
+ return $desclimit;
+ } else {
+ return $max;
}
- return $desclimit;
}
static function descriptionTooLong($desc)
diff --git a/classes/Profile.php b/classes/Profile.php
index 3844077e6..12ce5d9b6 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -854,6 +854,7 @@ class Profile extends Memcached_DataObject
case Right::SANDBOXUSER:
case Right::SILENCEUSER:
case Right::DELETEUSER:
+ case Right::DELETEGROUP:
$result = $this->hasRole(Profile_role::MODERATOR);
break;
case Right::CONFIGURESITE:
diff --git a/classes/User_group.php b/classes/User_group.php
index cfdcef290..7d6e21914 100644
--- a/classes/User_group.php
+++ b/classes/User_group.php
@@ -547,4 +547,61 @@ class User_group extends Memcached_DataObject
$group->query('COMMIT');
return $group;
}
+
+ /**
+ * Handle cascading deletion, on the model of notice and profile.
+ *
+ * This should handle freeing up cached entries for the group's
+ * id, nickname, URI, and aliases. There may be other areas that
+ * are not de-cached in the UI, including the sidebar lists on
+ * GroupsAction
+ */
+ function delete()
+ {
+ if ($this->id) {
+
+ // Safe to delete in bulk for now
+
+ $related = array('Group_inbox',
+ 'Group_block',
+ 'Group_member',
+ 'Related_group');
+
+ Event::handle('UserGroupDeleteRelated', array($this, &$related));
+
+ foreach ($related as $cls) {
+
+ $inst = new $cls();
+ $inst->group_id = $this->id;
+
+ if ($inst->find()) {
+ while ($inst->fetch()) {
+ $dup = clone($inst);
+ $dup->delete();
+ }
+ }
+ }
+
+ // And related groups in the other direction...
+ $inst = new Related_group();
+ $inst->related_group_id = $this->id;
+ $inst->delete();
+
+ // Aliases and the local_group entry need to be cleared explicitly
+ // or we'll miss clearing some cache keys; that can make it hard
+ // to create a new group with one of those names or aliases.
+ $this->setAliases(array());
+ $local = Local_group::staticGet('group_id', $this->id);
+ if ($local) {
+ $local->delete();
+ }
+
+ // blow the cached ids
+ self::blow('user_group:notice_ids:%d', $this->id);
+
+ } else {
+ common_log(LOG_WARN, "Ambiguous user_group->delete(); skipping related tables.");
+ }
+ parent::delete();
+ }
}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-09-18 03:25:00 +0000