README.md

@@ -38,13 +38,13 @@ To configure an apache server, add the following rewrite rules:
     <Directory /where/ever/you/put/it>
       RewriteEngine on
       RewriteBase /
-      RewriteRule ^api/federator/(.+)$ federator.php?_call=$1 [L]
-      RewriteRule ^(\.well-known/.*)$ /federator.php?_call=$1 [L,END]
+      RewriteRule ^api/(.+)$ api.php?_call=$1 [L]
+      RewriteRule ^(\.well-known/.*)$ /api.php?_call=$1 [L,END]
     </Directory>
 
 With the dummy plugin and everything installed correctly a
 
-> curl -v http://localhost/api/federator/v1/dummy/moo -H "X-Session: somethingvalid" -H "X-Profile: ihaveone"
+> curl -v http://localhost/api/v1/dummy/moo -H "X-Session: somethingvalid" -H "X-Profile: ihaveone"
 
 should return a piece of ascii art.
 

php/federator/dio/user.php

@@ -32,8 +32,7 @@ class User
         openssl_pkey_export($private_key, $private);
         try {
             $sql = 'insert into users (id, externalid, rsapublic, rsaprivate, validuntil)';
-            $sql .= ' values (?, ?, ?, ?, now() + interval 1 day)';
-            $sql .= ' on duplicate key update validuntil=now() + interval 1 day';
+            $sql .= ' values (?, ?, ?, ?, now() + interval 1 day) on duplicate key update validuntil=now() + interval 1 day';
             $stmt = $dbh->prepare($sql);
             if ($stmt === false) {
                 throw new \Federator\Exceptions\ServerError();
@@ -120,7 +119,8 @@ class User
             }
         }
         if ($cache !== null) {
-            if ($user->id === null && $user->externalid !== null) {
+            print_r($user);
+            if ($user->id === null) {
                 self::addLocalUser($dbh, $user, $_name);
             }
             $cache->saveRemoteUserByName($_name, $user);