Remove more redundant $formats

diff --git a/actions/apigroupismember.php b/actions/apigroupismember.php
index 02079b6ffefa578c81acf20d67def1ea706c7e88..359b7ca4fab52e05061fa70f89c45440db05e008 100644 (file)
--- a/actions/apigroupismember.php
+++ b/actions/apigroupismember.php
@@ -45,7 +45,6 @@ require_once INSTALLDIR . '/lib/apibareauth.php';
 
 class ApiGroupIsMemberAction extends ApiBareAuthAction
 {
-    var $format  = null;
     var $user    = null;
     var $group   = null;
 
@@ -64,7 +63,6 @@ class ApiGroupIsMemberAction extends ApiBareAuthAction
 
         $this->user   = $this->getTargetUser(null);
         $this->group  = $this->getTargetGroup(null);
-        $this->format = $this->arg('format');
 
         return true;
     }

diff --git a/actions/apigroupjoin.php b/actions/apigroupjoin.php
index 7ab1b7272319d3f9f51d0207ca2ed373588770d5..e51842bcb661d1381f28288becf947c84718d30e 100644 (file)
--- a/actions/apigroupjoin.php
+++ b/actions/apigroupjoin.php
@@ -45,7 +45,6 @@ require_once INSTALLDIR . '/lib/apiauth.php';
 
 class ApiGroupJoinAction extends ApiAuthAction
 {
-    var $format  = null;
     var $user    = null;
     var $group   = null;
 
@@ -65,8 +64,6 @@ class ApiGroupJoinAction extends ApiAuthAction
         $this->user  = $this->auth_user;
         $this->group = $this->getTargetGroup($this->arg('id'));
 
-        $this->format = $this->arg('format');
-
         return true;
     }
 

diff --git a/actions/apigroupleave.php b/actions/apigroupleave.php
index 86b56f5af069251ac4015fd422562004902ae53c..332bd7b7b2ef981100b6e41fa4828bdedd155498 100644 (file)
--- a/actions/apigroupleave.php
+++ b/actions/apigroupleave.php
@@ -45,7 +45,6 @@ require_once INSTALLDIR . '/lib/apiauth.php';
 
 class ApiGroupLeaveAction extends ApiAuthAction
 {
-    var $format  = null;
     var $user    = null;
     var $group   = null;
 
@@ -65,8 +64,6 @@ class ApiGroupLeaveAction extends ApiAuthAction
         $this->user  = $this->auth_user;
         $this->group = $this->getTargetGroup($this->arg('id'));
 
-        $this->format = $this->arg('format');
-
         return true;
     }
 

diff --git a/actions/apigrouplist.php b/actions/apigrouplist.php
index 69c347de121f66f6179000df948a1da6fe1fc6b2..00ceeed760b12ac63f19e3855082bfa9dbdf7f84 100644 (file)
--- a/actions/apigrouplist.php
+++ b/actions/apigrouplist.php
@@ -45,7 +45,6 @@ require_once INSTALLDIR . '/lib/apibareauth.php';
 
 class ApiGroupListAction extends ApiBareAuthAction
 {
-    var $format   = null;
     var $user     = null;
     var $page     = null;
     var $count    = null;
@@ -74,7 +73,6 @@ class ApiGroupListAction extends ApiBareAuthAction
         $this->since    = $this->arg('since');
         
         $this->user   = $this->getTargetUser($id);
-        $this->format = $this->arg('format');
         $this->groups = $this->getGroups();
 
         return true;

diff --git a/actions/apigrouplistall.php b/actions/apigrouplistall.php
index 80dcad9dcdbc28cb417c1f2b1023d3f80aa5d1c4..a0f04ed760f3d38e12e1cf65dcb9c0d9834cbba1 100644 (file)
--- a/actions/apigrouplistall.php
+++ b/actions/apigrouplistall.php
@@ -45,7 +45,6 @@ require_once INSTALLDIR . '/lib/api.php';
 
 class ApiGroupListAllAction extends TwitterApiAction
 {
-    var $format   = null;
     var $page     = null;
     var $count    = null;
     var $max_id   = null;
@@ -73,7 +72,6 @@ class ApiGroupListAllAction extends TwitterApiAction
         $this->since    = $this->arg('since');
 
         $this->user   = $this->getTargetUser($id);
-        $this->format = $this->arg('format');
         $this->groups = $this->getGroups();
 
         return true;

diff --git a/actions/apigroupmembership.php b/actions/apigroupmembership.php
index 872ee45eee1d15a8dda131f11b78ab0ff7bcae0d..da510ff26b71c1fa681275b9e61c1510e8d89ae5 100644 (file)
--- a/actions/apigroupmembership.php
+++ b/actions/apigroupmembership.php
@@ -45,7 +45,6 @@ require_once INSTALLDIR . '/lib/api.php';
 
 class ApiGroupMembershipAction extends TwitterApiAction
 {
-    var $format   = null;
     var $page     = null;
     var $count    = null;
     var $max_id   = null;
@@ -73,7 +72,6 @@ class ApiGroupMembershipAction extends TwitterApiAction
         $this->since_id = (int)$this->arg('since_id', 0);
         $this->since    = $this->arg('since');
 
-        $this->format = $this->arg('format');
         $this->group  = $this->getTargetGroup($this->arg('id'));
 
         $this->profiles = $this->getProfiles();

diff --git a/actions/apistatusesdestroy.php b/actions/apistatusesdestroy.php
index 16a7cc376e2018c46caf777903a4f7e1af0650fc..7680f96dcf356c54602456d531911b3f06ecd345 100644 (file)
--- a/actions/apistatusesdestroy.php
+++ b/actions/apistatusesdestroy.php
@@ -48,7 +48,6 @@ class ApiStatusesDestroyAction extends ApiAuthAction
 
     var $user                  = null;
     var $status                = null;
-    var $format                = null;
 
     /**
      * Take arguments for running
@@ -70,7 +69,6 @@ class ApiStatusesDestroyAction extends ApiAuthAction
             $this->notice_id = (int)$this->arg('id');
         }
 
-        $this->format = $this->arg('format');
         $this->notice = Notice::staticGet((int)$this->notice_id);
 
         return true;

diff --git a/actions/apistatusesshow.php b/actions/apistatusesshow.php
index 9e28fe2ab683b6ca6ea03ae1da4a61730d854d2a..0096cfe6b9dc0a54f8c1f6a245a788938ba6331d 100644 (file)
--- a/actions/apistatusesshow.php
+++ b/actions/apistatusesshow.php
@@ -48,7 +48,6 @@ class ApiStatusesShowAction extends ApiAction
 
     var $notice_id = null;
     var $notice    = null;
-    var $format    = null;
 
     /**
      * Take arguments for running
@@ -74,7 +73,6 @@ class ApiStatusesShowAction extends ApiAction
             $this->notice_id = (int)$this->arg('id');
         }
 
-        $this->format = $this->arg('format');
         $this->notice = Notice::staticGet((int)$this->notice_id);
 
         return true;

diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php
index ab33d8a3e93bc2e7d73cad44e3ad263c9fc3cabd..7d6a574ef0bdcc712c80fe70840cb0b5761156e7 100644 (file)
--- a/actions/apistatusesupdate.php
+++ b/actions/apistatusesupdate.php
@@ -50,7 +50,6 @@ class ApiStatusesUpdateAction extends ApiAuthAction
     var $source                = null;
     var $status                = null;
     var $in_reply_to_status_id = null;
-    var $format                = null;
 
     static $reserved_sources = array('web', 'omb', 'mail', 'xmpp', 'api');
 
@@ -92,8 +91,6 @@ class ApiStatusesUpdateAction extends ApiAuthAction
             $this->source = 'api';
         }
 
-        $this->format = $this->arg('format');
-
         $this->in_reply_to_status_id
             = intval($this->trimmed('in_reply_to_status_id'));
 

diff --git a/actions/apisubscriptions.php b/actions/apisubscriptions.php
index bdaa0ea39a8942bff8c12c7a773a12ec2ab46fed..9dbddbd9bdf3df6691be74da8f148269089652b7 100644 (file)
--- a/actions/apisubscriptions.php
+++ b/actions/apisubscriptions.php
@@ -52,7 +52,6 @@ class ApiSubscriptionsAction extends ApiBareAuthAction
     var $count    = null;
     var $user     = null;
     var $profiles = null;
-    var $format   = null;
     var $tag      = null;
     var $lite     = null;
     var $ids_only = null;
@@ -72,7 +71,6 @@ class ApiSubscriptionsAction extends ApiBareAuthAction
 
         $this->page     = (int)$this->arg('page', 1);
         $this->tag      = $this->arg('tag');
-        $this->format   = $this->arg('format');
 
         // Note: Twitter no longer supports 'lite'
         $this->lite     = $this->arg('lite');

diff --git a/actions/apitimelinefavorites.php b/actions/apitimelinefavorites.php
index 35a996c9cb3f7373b4a2836db8f1e8ddca2d94a1..231f2ae49c92bce08756b67a834e4f328bef91d0 100644 (file)
--- a/actions/apitimelinefavorites.php
+++ b/actions/apitimelinefavorites.php
@@ -49,7 +49,6 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction
 
     var $user     = null;
     var $notices  = null;
-    var $format   = null;
     var $page     = null;
     var $count    = null;
     var $max_id   = null;
@@ -74,7 +73,6 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction
         $this->max_id   = (int)$this->arg('max_id', 0);
         $this->since_id = (int)$this->arg('since_id', 0);
         $this->since    = $this->arg('since');
-        $this->format   = $this->arg('format');
 
         $this->user = $this->getTargetUser($this->arg('id'));
 

diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php
index 92a885293662ff1b2f382f85d3d5489d2934df52..02e352569565164172908ffe5914c55d8d0347fc 100644 (file)
--- a/actions/apitimelinefriends.php
+++ b/actions/apitimelinefriends.php
@@ -53,7 +53,6 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
     var $max_id   = null;
     var $since_id = null;
     var $since    = null;
-    var $format   = null;
 
     /**
      * Take arguments for running
@@ -73,7 +72,6 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
         $this->max_id   = (int)$this->arg('max_id', 0);
         $this->since_id = (int)$this->arg('since_id', 0);
         $this->since    = $this->arg('since');
-        $this->format   = $this->arg('format');
 
         $this->user = $this->getTargetUser($this->arg('id'));
 

diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php
index 9d6ac6ad1894e48ddd2e8a4c650dd931c3ee575c..abe7f0c5d84b5e0b1f0350a3596128e04bcdc7c3 100644 (file)
--- a/actions/apitimelinegroup.php
+++ b/actions/apitimelinegroup.php
@@ -70,7 +70,6 @@ class ApiTimelineGroupAction extends ApiAction
 
         $this->group = $this->getTargetGroup($this->arg('id'));
 
-        $this->format  = $this->arg('format');
         $this->notices = $this->getNotices();
 
         return true;

diff --git a/actions/apitimelinementions.php b/actions/apitimelinementions.php
index ecead98ccee8e35c2fe6f352783a8ac78ad80f4a..7549b4722de13d95b6e26ff557fc0c6d014c9d0b 100644 (file)
--- a/actions/apitimelinementions.php
+++ b/actions/apitimelinementions.php
@@ -71,7 +71,7 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
         $this->user = $this->getTargetUser($this->arg('id'));
 
         if (empty($this->user)) {
-            $this->clientError(_('No such user!'), 404, $this->arg('format'));
+            $this->clientError(_('No such user!'), 404, $this->format);
             return;
         }
 
@@ -122,7 +122,7 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
             $sitename, $this->user->nickname, $profile->getBestName()
         );
 
-        switch($this->arg('format')) {
+        switch($this->format) {
         case 'xml':
             $this->show_xml_timeline($this->notices);
             break;

diff --git a/actions/apitimelinepublic.php b/actions/apitimelinepublic.php
index 2638dd29261ff3c53b1d67ff8418c40d1438317b..a635ddc91e3abc96e565166f4727ea4c2151bd3f 100644 (file)
--- a/actions/apitimelinepublic.php
+++ b/actions/apitimelinepublic.php
@@ -103,7 +103,7 @@ class ApiTimelinePublicAction extends ApiAction
         $link       = common_root_url();
         $subtitle   = sprintf(_("%s updates from everyone!"), $sitename);
 
-        switch($this->arg('format')) {
+        switch($this->format) {
         case 'xml':
             $this->show_xml_timeline($this->notices);
             break;

diff --git a/actions/apitimelinetag.php b/actions/apitimelinetag.php
index 0efe8d2449c6c729127da01c60ef1cd6330cc197..8211b01226b04ded65d63028077769710d83eea9 100644 (file)
--- a/actions/apitimelinetag.php
+++ b/actions/apitimelinetag.php
@@ -64,7 +64,6 @@ class ApiTimelineTagAction extends ApiAction
         $this->page     = (int)$this->arg('page', 1);
         $this->count    = (int)$this->arg('count', 20);
         $this->tag      = $this->arg('tag');
-        $this->format   = $this->arg('format');
 
         $this->notices = $this->getNotices();
 

diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php
index d50648d7c9098125b179b0aecf29a383e0172455..81e23116b73ba145d79afc8be2f8b404fda325e3 100644 (file)
--- a/actions/apitimelineuser.php
+++ b/actions/apitimelineuser.php
@@ -73,7 +73,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction
         $this->user = $this->getTargetUser($this->arg('id'));
 
         if (empty($this->user)) {
-            $this->clientError(_('No such user!'), 404, $this->arg('format'));
+            $this->clientError(_('No such user!'), 404, $this->format);
             return;
         }
 
@@ -127,7 +127,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction
         $suplink = common_local_url('sup', null, null, $this->user->id);
         header('X-SUP-ID: ' . $suplink);
 
-        switch($this->arg('format')) {
+        switch($this->format) {
         case 'xml':
             $this->show_xml_timeline($this->notices);
             break;

diff --git a/lib/apiauth.php b/lib/apiauth.php
index 9fc0e57124e15c858cec6553b8c7260c0401945d..25bbae24e53dfaf2c75e1eacdc37113792e6f17f 100644 (file)
--- a/lib/apiauth.php
+++ b/lib/apiauth.php
@@ -172,7 +172,7 @@ class ApiAuthAction extends ApiAction
         header('HTTP/1.1 401 Unauthorized');
         $msg = 'Could not authenticate you.';
 
-        if ($this->arg('format') == 'xml') {
+        if ($this->format == 'xml') {
             header('Content-Type: application/xml; charset=utf-8');
             $this->startXML();
             $this->elementStart('hash');
@@ -180,7 +180,7 @@ class ApiAuthAction extends ApiAction
             $this->element('request', null, $_SERVER['REQUEST_URI']);
             $this->elementEnd('hash');
             $this->endXML();
-        } elseif ($this->arg('format') == 'json') {
+        } elseif ($this->format == 'json') {
             header('Content-Type: application/json; charset=utf-8');
             $error_array = array('error' => $msg,
                                  'request' => $_SERVER['REQUEST_URI']);