More info for a proper, fancy-url lighttpd setup

[quix0rs-gnu-social.git] / plugins / OpenID / openidtrust.php

diff --git a/plugins/OpenID/openidtrust.php b/plugins/OpenID/openidtrust.php
index fa7ea36e26c40bc2906aca5ebaa4535e4fde5f7e..d39d8541c6c7b74a07b306a47f8ff28b1d931cfa 100644 (file)
--- a/plugins/OpenID/openidtrust.php
+++ b/plugins/OpenID/openidtrust.php
@@ -17,10 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) {
+    exit(1);
+}
 
 require_once INSTALLDIR.'/plugins/OpenID/openid.php';
-require_once(INSTALLDIR.'/plugins/OpenID/User_openid_trustroot.php');
 
 class OpenidtrustAction extends Action
 {
@@ -34,7 +35,6 @@ class OpenidtrustAction extends Action
      *
      * @return boolean false
      */
-
     function isReadOnly($args)
     {
         return false;
@@ -45,9 +45,9 @@ class OpenidtrustAction extends Action
      *
      * @return string title of the page
      */
-
     function title()
     {
+        // TRANS: Title for identity verification page.
         return _m('OpenID Identity Verification');
     }
 
@@ -66,12 +66,13 @@ class OpenidtrustAction extends Action
         $this->allowUrl = $_SESSION['openid_allow_url'];
         $this->denyUrl = $_SESSION['openid_deny_url'];
         if(empty($this->trust_root) || empty($this->allowUrl) || empty($this->denyUrl)){
+            // TRANS: Client error when visiting page directly.
             $this->clientError(_m('This page should only be reached during OpenID processing, not directly.'));
             return;
         }
         return true;
     }
-    
+
     function handle($args)
     {
         parent::handle($args);
@@ -96,7 +97,6 @@ class OpenidtrustAction extends Action
             $user_openid_trustroot->created = DB_DataObject_Cast::dateTime();
             if (!$user_openid_trustroot->insert()) {
                 $err = PEAR::getStaticProperty('DB_DataObject','lastError');
-                common_debug('DB error ' . $err->code . ': ' . $err->message, __FILE__);
             }
             common_redirect($this->allowUrl, $code=302);
         }else{
@@ -112,10 +112,10 @@ class OpenidtrustAction extends Action
      *
      * @return void
      */
-
     function showPageNotice()
     {
-        $this->element('p',null,sprintf(_m('%s  has asked to verify your identity. Click Continue to verify your identity and login without creating a new password.'),$this->trust_root));
+        // TRANS: Page notice. %s is a trustroot name.
+        $this->element('p',null,sprintf(_m('%s has asked to verify your identity. Click Continue to verify your identity and login without creating a new password.'),$this->trust_root));
     }
 
     /**
@@ -125,7 +125,6 @@ class OpenidtrustAction extends Action
      *
      * @return void
      */
-
     function showContent()
     {
         $this->elementStart('form', array('method' => 'post',
@@ -133,9 +132,11 @@ class OpenidtrustAction extends Action
                                    'class' => 'form_settings',
                                    'action' => common_local_url('openidtrust')));
         $this->elementStart('fieldset');
-        $this->submit('allow', _m('Continue'));
-        $this->submit('deny', _m('Cancel'));
-        
+        // TRANS: Button text to continue OpenID identity verification.
+        $this->submit('allow', _m('BUTTON','Continue'));
+        // TRANS: Button text to cancel OpenID identity verification.
+        $this->submit('deny', _m('BUTTON','Cancel'));
+
         $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }