Readjusted location and size for logo, form_notice,

[quix0rs-gnu-social.git] / classes / Notice.php

diff --git a/classes/Notice.php b/classes/Notice.php
index 35e03e342d81c6b8c1aae0a948c6a77882f5d3fd..3eb6530669bdc2d56c958930f68cd9bf3ad30446 100644 (file)
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -48,23 +48,27 @@ class Notice extends Memcached_DataObject
     public $source;                             // varchar(32)
 
     /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Notice',$k,$v); }
+    function staticGet($k,$v=null)
+    { return Memcached_DataObject::staticGet('Notice',$k,$v); }
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    function getProfile() {
+    function getProfile()
+    {
         return Profile::staticGet('id', $this->profile_id);
     }
 
-    function delete() {
+    function delete()
+    {
         $this->blowCaches(true);
         $this->blowFavesCache(true);
         $this->blowInboxes();
         return parent::delete();
     }
 
-    function saveTags() {
+    function saveTags()
+    {
         /* extract all #hastags */
         $count = preg_match_all('/(?:^|\s)#([A-Za-z0-9_\-\.]{1,64})/', strtolower($this->content), $match);
         if (!$count) {
@@ -91,7 +95,7 @@ class Notice extends Memcached_DataObject
         return true;
     }
 
-    static function saveNew($profile_id, $content, $source=NULL, $is_local=1, $reply_to=NULL, $uri=NULL) {
+    static function saveNew($profile_id, $content, $source=null, $is_local=1, $reply_to=null, $uri=null) {
 
         $profile = Profile::staticGet($profile_id);
 
@@ -184,7 +188,8 @@ class Notice extends Memcached_DataObject
         return true;
     }
 
-    function blowCaches($blowLast=false) {
+    function blowCaches($blowLast=false)
+    {
         $this->blowSubsCache($blowLast);
         $this->blowNoticeCache($blowLast);
         $this->blowRepliesCache($blowLast);
@@ -192,7 +197,8 @@ class Notice extends Memcached_DataObject
         $this->blowTagCache($blowLast);
     }
 
-    function blowTagCache($blowLast=false) {
+    function blowTagCache($blowLast=false)
+    {
         $cache = common_memcache();
         if ($cache) {
             $tag = new Notice_tag();
@@ -210,7 +216,8 @@ class Notice extends Memcached_DataObject
         }
     }
 
-    function blowSubsCache($blowLast=false) {
+    function blowSubsCache($blowLast=false)
+    {
         $cache = common_memcache();
         if ($cache) {
             $user = new User();
@@ -230,7 +237,8 @@ class Notice extends Memcached_DataObject
         }
     }
 
-    function blowNoticeCache($blowLast=false) {
+    function blowNoticeCache($blowLast=false)
+    {
         if ($this->is_local) {
             $cache = common_memcache();
             if ($cache) {
@@ -242,7 +250,8 @@ class Notice extends Memcached_DataObject
         }
     }
 
-    function blowRepliesCache($blowLast=false) {
+    function blowRepliesCache($blowLast=false)
+    {
         $cache = common_memcache();
         if ($cache) {
             $reply = new Reply();
@@ -260,7 +269,8 @@ class Notice extends Memcached_DataObject
         }
     }
 
-    function blowPublicCache($blowLast=false) {
+    function blowPublicCache($blowLast=false)
+    {
         if ($this->is_local == 1) {
             $cache = common_memcache();
             if ($cache) {
@@ -272,7 +282,8 @@ class Notice extends Memcached_DataObject
         }
     }
 
-    function blowFavesCache($blowLast=false) {
+    function blowFavesCache($blowLast=false)
+    {
         $cache = common_memcache();
         if ($cache) {
             $fave = new Fave();
@@ -293,7 +304,7 @@ class Notice extends Memcached_DataObject
     # XXX: too many args; we need to move to named params or even a separate
     # class for notice streams
 
-    static function getStream($qry, $cachekey, $offset=0, $limit=20, $since_id=0, $before_id=0, $order=NULL, $since=NULL) {
+    static function getStream($qry, $cachekey, $offset=0, $limit=20, $since_id=0, $before_id=0, $order=null, $since=null) {
 
         if (common_config('memcached', 'enabled')) {
 
@@ -310,19 +321,19 @@ class Notice extends Memcached_DataObject
 
     static function getStreamDirect($qry, $offset, $limit, $since_id, $before_id, $order, $since) {
 
-        $needAnd = FALSE;
-        $needWhere = TRUE;
+        $needAnd = false;
+        $needWhere = true;
 
         if (preg_match('/\bWHERE\b/i', $qry)) {
-            $needWhere = FALSE;
-            $needAnd = TRUE;
+            $needWhere = false;
+            $needAnd = true;
         }
 
         if ($since_id > 0) {
 
             if ($needWhere) {
                 $qry .= ' WHERE ';
-                $needWhere = FALSE;
+                $needWhere = false;
             } else {
                 $qry .= ' AND ';
             }
@@ -334,7 +345,7 @@ class Notice extends Memcached_DataObject
 
             if ($needWhere) {
                 $qry .= ' WHERE ';
-                $needWhere = FALSE;
+                $needWhere = false;
             } else {
                 $qry .= ' AND ';
             }
@@ -346,7 +357,7 @@ class Notice extends Memcached_DataObject
 
             if ($needWhere) {
                 $qry .= ' WHERE ';
-                $needWhere = FALSE;
+                $needWhere = false;
             } else {
                 $qry .= ' AND ';
             }
@@ -383,7 +394,7 @@ class Notice extends Memcached_DataObject
         # If outside our cache window, just go to the DB
 
         if ($offset + $limit > NOTICE_CACHE_WINDOW) {
-            return Notice::getStreamDirect($qry, $offset, $limit, NULL, NULL, $order, NULL);
+            return Notice::getStreamDirect($qry, $offset, $limit, null, null, $order, null);
         }
 
         # Get the cache; if we can't, just go to the DB
@@ -391,7 +402,7 @@ class Notice extends Memcached_DataObject
         $cache = common_memcache();
 
         if (!$cache) {
-            return Notice::getStreamDirect($qry, $offset, $limit, NULL, NULL, $order, NULL);
+            return Notice::getStreamDirect($qry, $offset, $limit, null, null, $order, null);
         }
 
         # Get the notices out of the cache
@@ -400,7 +411,7 @@ class Notice extends Memcached_DataObject
 
         # On a cache hit, return a DB-object-like wrapper
 
-        if ($notices !== FALSE) {
+        if ($notices !== false) {
             $wrapper = new NoticeWrapper(array_slice($notices, $offset, $limit));
             return $wrapper;
         }
@@ -423,7 +434,7 @@ class Notice extends Memcached_DataObject
             # bet with our DB.
 
             $new_notice = Notice::getStreamDirect($qry, 0, NOTICE_CACHE_WINDOW,
-                                                  $last_id, NULL, $order, NULL);
+                                                  $last_id, null, $order, null);
 
             if ($new_notice) {
                 $new_notices = array();
@@ -447,7 +458,7 @@ class Notice extends Memcached_DataObject
 
         # Otherwise, get the full cache window out of the DB
 
-        $notice = Notice::getStreamDirect($qry, 0, NOTICE_CACHE_WINDOW, NULL, NULL, $order, NULL);
+        $notice = Notice::getStreamDirect($qry, 0, NOTICE_CACHE_WINDOW, null, null, $order, null);
 
         # If there are no hits, just return the value
 
@@ -477,7 +488,8 @@ class Notice extends Memcached_DataObject
         return $wrapper;
     }
 
-    function publicStream($offset=0, $limit=20, $since_id=0, $before_id=0, $since=NULL) {
+    function publicStream($offset=0, $limit=20, $since_id=0, $before_id=0, $since=null)
+    {
 
         $parts = array();
 
@@ -496,10 +508,11 @@ class Notice extends Memcached_DataObject
 
         return Notice::getStream($qry,
                                  'public',
-                                 $offset, $limit, $since_id, $before_id, NULL, $since);
+                                 $offset, $limit, $since_id, $before_id, null, $since);
     }
 
-    function addToInboxes() {
+    function addToInboxes()
+    {
         $enabled = common_config('inboxes', 'enabled');
 
         if ($enabled === true || $enabled === 'transitional') {
@@ -522,7 +535,8 @@ class Notice extends Memcached_DataObject
 
     # Delete from inboxes if we're deleted.
 
-    function blowInboxes() {
+    function blowInboxes()
+    {
 
         $enabled = common_config('inboxes', 'enabled');