Remove/replace killme() with *exit()

[friendica.git] / mod / modexp.php

diff --git a/mod/modexp.php b/mod/modexp.php
index d424b4c39d75f90652fdfb3be4837306ff113066..cae91c46483c9d576cf48a3d3781a17f5c87256a 100644 (file)
--- a/mod/modexp.php
+++ b/mod/modexp.php
@@ -1,21 +1,23 @@
 <?php
 
-include('library/asn1.php');
+use Friendica\App;
+use Friendica\Database\DBA;
 
-function modexp_init(&$a) {
+function modexp_init(App $a) {
 
        if($a->argc != 2)
-               killme();
+               exit();
 
        $nick = $a->argv[1];
-       $r = q("SELECT `pubkey` FROM `user` WHERE `nickname` = '%s' LIMIT 1",
-                       dbesc($nick)
+       $r = q("SELECT `spubkey` FROM `user` WHERE `nickname` = '%s' LIMIT 1",
+                       DBA::escape($nick)
        );
 
-       if(! count($r))
-               killme();
+       if (! DBA::isResult($r)) {
+               exit();
+       }
 
-       $lines = explode("\n",$r[0]['pubkey']);
+       $lines = explode("\n",$r[0]['spubkey']);
        unset($lines[0]);
        unset($lines[count($lines)]);
        $x = base64_decode(implode('',$lines));
@@ -26,8 +28,9 @@ function modexp_init(&$a) {
        $e = $r[0]->asnData[1]->asnData[0]->asnData[1]->asnData;
 
        header("Content-type: application/magic-public-key");
-       echo 'RSA' . '.' . $m . '.' . $e ;
+       echo 'RSA' . '.' . $m . '.' . $e;
 
-       killme();
+       exit();
+
+}
 
-}
\ No newline at end of file