if-else instead of ?:

[quix0rs-gnu-social.git] / actions / twitapistatuses.php

diff --git a/actions/twitapistatuses.php b/actions/twitapistatuses.php
index 749f2f0849fb7f8d852bf0d60555524ff682ee65..0c97ada0b115b8327725b864fff495b3a36b8d75 100644 (file)
--- a/actions/twitapistatuses.php
+++ b/actions/twitapistatuses.php
@@ -27,15 +27,29 @@ require_once(INSTALLDIR.'/lib/twitterapi.php');
  */
 class TwitapistatusesAction extends TwitterapiAction {
        
+       function is_readonly() {
+               
+               static $write_methods = array(  'update',
+                                                                               'destroy');
+               
+               $cmdtext = explode('.', $this->arg('method'));          
+               
+               if (in_array($cmdtext[0], $write_methods)) {                    
+                       return false;
+               }
+                               
+               return true;
+       }
+       
        function public_timeline($args, $apidata) {
                parent::handle($args);
-
+               
                $sitename = common_config('site', 'name');
                $siteserver = common_config('site', 'server'); 
                $title = sprintf(_("%s public timeline"), $sitename);
                $id = "tag:$siteserver:Statuses";
                $link = common_root_url();
-               $subtitle = sprintf(_("%s updates from everyone!"), $sitemap);
+               $subtitle = sprintf(_("%s updates from everyone!"), $sitename);
 
                // Number of public statuses to return by default -- Twitter sends 20
                $MAX_PUBSTATUSES = 20;
@@ -223,11 +237,7 @@ class TwitapistatusesAction extends TwitterapiAction {
                $link = common_local_url('all', array('nickname' => $user->nickname));
                $subtitle = sprintf(_("Updates from %s and friends on %s!"), $user->nickname, $sitename);
 
-               $notice->$user->noticesWithFriends();
-               
-               $notice->limit((($page-1)*20), $count);
-
-               $cnt = $notice->find();
+               $notice = $user->noticesWithFriends(($page-1)*20, $count);
                
                switch($apidata['content-type']) {
                 case 'xml': 
@@ -365,6 +375,9 @@ class TwitapistatusesAction extends TwitterapiAction {
                
                $user = $apidata['user'];
                                
+               $this->is_readonly();
+               
+                               
                $notice = DB_DataObject::factory('notice');             
                
                $notice->profile_id = $user->id; # user id *is* profile id
@@ -391,7 +404,8 @@ class TwitapistatusesAction extends TwitterapiAction {
                }
 
                $notice->rendered = common_render_content($notice->content, $notice);
-
+               $notice->is_local = 1;
+               
                $id = $notice->insert();
 
                if (!$id) {