X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FOpenID%2Fopenidtrust.php;h=89f3150f6358344eda2fb832e2f137d2f8723489;hb=0721d8d3e257709d27994eb4ab4bbe60abc93e2e;hp=29c7bdc23cf8b25118884ea72c87286565de5af0;hpb=5f5413624d166a9b2116d266c7698dd6dcd2d8c4;p=quix0rs-gnu-social.git

diff --git a/plugins/OpenID/openidtrust.php b/plugins/OpenID/openidtrust.php
index 29c7bdc23c..89f3150f63 100644
--- 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
 {
@@ -48,7 +49,7 @@ class OpenidtrustAction extends Action
 
     function title()
     {
-        return _('OpenID Identity Verification');
+        return _m('OpenID Identity Verification');
     }
 
     function prepare($args)
@@ -66,12 +67,12 @@ 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)){
-            $this->clientError(_('This page should only be reached during OpenID processing, not 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{
@@ -115,7 +115,7 @@ class OpenidtrustAction extends Action
 
     function showPageNotice()
     {
-        $this->element('p',null,sprintf(_('%s  has asked to verify your identity. Click Continue to verify your identity and login without creating a new password.'),$this->trust_root));
+        $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));
     }
 
     /**
@@ -133,9 +133,9 @@ class OpenidtrustAction extends Action
                                    'class' => 'form_settings',
                                    'action' => common_local_url('openidtrust')));
         $this->elementStart('fieldset');
-        $this->submit('allow', _('Continue'));
-        $this->submit('deny', _('Cancel'));
-        
+        $this->submit('allow', _m('Continue'));
+        $this->submit('deny', _m('Cancel'));
+
         $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }