All actions now use isReadOnly()

diff --git a/actions/api.php b/actions/api.php
index 64971774de38ed658fc8491b276b8abb573b1326..47c1196052e25bd5a3ccf3dfe0a84b1ddcd55765 100644 (file)
--- a/actions/api.php
+++ b/actions/api.php
@@ -174,7 +174,7 @@ class ApiAction extends Action
         }
     }
 
-    function is_readonly()
+    function isReadOnly()
     {
         # NOTE: before handle(), can't use $this->arg
         $apiaction = $_REQUEST['apiaction'];

diff --git a/actions/foaf.php b/actions/foaf.php
index a0f8a1ff39a19428ec93e7dac419a8d0b9a519cf..9fa321d4a95b79d0ee5fdbdb82ecc2ad3683dc4f 100644 (file)
--- a/actions/foaf.php
+++ b/actions/foaf.php
@@ -26,7 +26,7 @@ define('BOTH', 0);
 class FoafAction extends Action
 {
 
-    function is_readonly()
+    function isReadOnly()
     {
         return true;
     }

diff --git a/actions/invite.php b/actions/invite.php
index 879264deb99d7276217e803cac9fcdcf862d3ec1..95d96bcde002305832ee768a8c1b63075fa3223f 100644 (file)
--- a/actions/invite.php
+++ b/actions/invite.php
@@ -22,7 +22,7 @@ if (!defined('LACONICA')) { exit(1); }
 class InviteAction extends Action
 {
 
-    function is_readonly()
+    function isReadOnly()
     {
         return false;
     }

diff --git a/actions/login.php b/actions/login.php
index 060d16ad61df8698b5e8b768b017fe48264450d1..cd337bd3956f38f087fbcf43b3c6bc88a3c20e1e 100644 (file)
--- a/actions/login.php
+++ b/actions/login.php
@@ -22,7 +22,7 @@ if (!defined('LACONICA')) { exit(1); }
 class LoginAction extends Action
 {
 
-    function is_readonly()
+    function isReadOnly()
     {
         return true;
     }
@@ -33,13 +33,13 @@ class LoginAction extends Action
         if (common_is_real_login()) {
             $this->clientError(_('Already logged in.'));
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-            $this->check_login();
+            $this->checkLogin();
         } else {
-            $this->show_form();
+            $this->showForm();
         }
     }
 
-    function check_login()
+    function checkLogin()
     {
         # XXX: login throttle
 
@@ -75,7 +75,7 @@ class LoginAction extends Action
             }
             common_redirect($url);
         } else {
-            $this->show_form(_('Incorrect username or password.'));
+            $this->showForm(_('Incorrect username or password.'));
             return;
         }
 
@@ -104,7 +104,7 @@ class LoginAction extends Action
         common_redirect($url);
     }
 
-    function show_form($error=null)
+    function showForm($error=null)
     {
        $this->error = $error;
        $this->showPage();
@@ -120,7 +120,7 @@ class LoginAction extends Action
         if ($this->error) {
             $this->element('p', 'error', $this->error);
         } else {
-            $instr = $this->get_instructions();
+            $instr = $this->getInstructions();
             $output = common_markup_to_html($instr);
            $this->elementStart('div', 'instructions');
             $this->raw($output);
@@ -145,10 +145,9 @@ class LoginAction extends Action
         $this->element('a', array('href' => common_local_url('recoverpassword')),
                        _('Lost or forgotten password?'));
         $this->elementEnd('p');
-        common_show_footer();
     }
 
-    function get_instructions()
+    function getInstructions()
     {
         if (common_logged_in() &&
             !common_is_real_login() &&
@@ -166,8 +165,4 @@ class LoginAction extends Action
                      'try [OpenID](%%action.openidlogin%%). ');
         }
     }
-
-    function show_top($error=null)
-    {
-    }
 }

diff --git a/actions/logout.php b/actions/logout.php
index 3001f3613edc680579cd5ac8cbb757a045c6af3c..86d6270abe550020f63f741ddceb8adc8e6fc1b2 100644 (file)
--- a/actions/logout.php
+++ b/actions/logout.php
@@ -24,7 +24,7 @@ require_once(INSTALLDIR.'/lib/openid.php');
 class LogoutAction extends Action
 {
     
-    function is_readonly()
+    function isReadOnly()
     {
         return true;
     }

diff --git a/actions/publicxrds.php b/actions/publicxrds.php
index f66e34533afa7fe52d23a6b39d9115a85d95a15b..e765fb1c92426a2db1eb4ce212494d784fabf3eb 100644 (file)
--- a/actions/publicxrds.php
+++ b/actions/publicxrds.php
@@ -26,7 +26,7 @@ require_once(INSTALLDIR.'/lib/openid.php');
 class PublicxrdsAction extends Action
 {
 
-    function is_readonly()
+    function isReadOnly()
     {
         return true;
     }

diff --git a/actions/requesttoken.php b/actions/requesttoken.php
index 378db4403050e6eb3729e4904d1bce24e5fa7ee7..5058deedb5a55b23c2a9ce990a7129bc4704a316 100644 (file)
--- a/actions/requesttoken.php
+++ b/actions/requesttoken.php
@@ -24,7 +24,7 @@ require_once(INSTALLDIR.'/lib/omb.php');
 class RequesttokenAction extends Action
 {
     
-    function is_readonly()
+    function isReadOnly()
     {
         return false;
     }

diff --git a/actions/sup.php b/actions/sup.php
index 6a1897585acd959b968873a36bbc9cf5f35eefb3..38e2e2e59ceb85985e5a61cd4eec79fcdec9826d 100644 (file)
--- a/actions/sup.php
+++ b/actions/sup.php
@@ -79,7 +79,7 @@ class SupAction extends Action
         return $updates;
     }
     
-    function is_readonly()
+    function isReadOnly()
     {
         return true;
     }

diff --git a/actions/userbyid.php b/actions/userbyid.php
index 3ff2c9c410dcf92eb8afa5fd4864936b1c5870b4..4bb896c38e11cd7d67635da6b6e90208cf7feeca 100644 (file)
--- a/actions/userbyid.php
+++ b/actions/userbyid.php
@@ -22,7 +22,7 @@ if (!defined('LACONICA')) { exit(1); }
 class UserbyidAction extends Action
 {
     
-    function is_readonly()
+    function isReadOnly()
     {                
         return true;
     }

diff --git a/actions/xrds.php b/actions/xrds.php
index 7cb2cd210066b222d6c97384f4553c9e2fc391ce..14cb9d503e98a4a2842fa522b41754e6785e63d6 100644 (file)
--- a/actions/xrds.php
+++ b/actions/xrds.php
@@ -24,7 +24,7 @@ require_once(INSTALLDIR.'/lib/omb.php');
 class XrdsAction extends Action
 {
 
-    function is_readonly()
+    function isReadOnly()
     {                
         return true;
     }