Automatically set default account when adding or removing one

diff --git a/init.php b/init.php
index 7fced8e926b1f43394faef56f2b4683642359b15..5b26c226820075474a8fb7d149c537acd6cf3e59 100644 (file)
--- a/init.php
+++ b/init.php
@@ -375,6 +375,7 @@ class Micropub extends Plugin implements IHandler
             'access_token' => $data['access_token'],
             'scope'        => $data['scope'],
         ];
+        $accounts = $this->fixDefaultIdentity($accounts);
         $host->set($this, 'accounts', $accounts);
 
         //all fine now.
@@ -401,9 +402,10 @@ class Micropub extends Plugin implements IHandler
         }
 
         unset($accounts[$me]);
+        $accounts = $this->fixDefaultIdentity($accounts);
         $host->set($this, 'accounts', $accounts);
-        header('Content-type: application/json');
 
+        header('Content-type: application/json');
         echo json_encode(
             [
                 'code'     => '200',
@@ -428,13 +430,12 @@ class Micropub extends Plugin implements IHandler
         if (!isset($accounts[$me])) {
             return $this->errorOut('Unknown identity');
         }
-
         foreach ($accounts as $url => $data) {
             $accounts[$url]['default'] = ($url == $me);
         }
         $host->set($this, 'accounts', $accounts);
-        header('Content-type: application/json');
 
+        header('Content-type: application/json');
         echo json_encode(
             [
                 'code'     => '200',
@@ -444,6 +445,33 @@ class Micropub extends Plugin implements IHandler
         exit();
     }
 
+    /**
+     * Set the default identity if there is none
+     *
+     * @param array $accounts Array of account data arrays
+     *
+     * @return array Array of account data arrays
+     */
+    protected function fixDefaultIdentity($accounts)
+    {
+        if (!count($accounts)) {
+            return $accounts;
+        }
+
+        $hasDefault = false;
+        foreach ($accounts as $account) {
+            if ($account['default']) {
+                $hasDefault = true;
+            }
+        }
+
+        if (!$hasDefault) {
+            reset($accounts);
+            $accounts[key($accounts)]['default'] = true;
+        }
+        return $accounts;
+    }
+
     /**
      * Send an error message.
      * Automatically in the correct format (plain text or json)
@@ -504,9 +532,27 @@ class Micropub extends Plugin implements IHandler
         return $links;
     }
 
+    /**
+     * If a valid CSRF token is necessary or not
+     *
+     * @param string $method Plugin method name (here: "action")
+     *
+     * @return boolean True if an invalid CSRF token shall be ignored
+     */
     function csrf_ignore($method)
     {
-        return true;
+        $mode = null;
+        if (isset($_POST['mode'])) {
+            $mode = $_POST['mode'];
+        } else if (isset($_GET['mode'])) {
+            $mode = $_GET['mode'];
+        }
+
+        if ($mode == 'authreturn') {
+            return true;
+        }
+
+        return false;
     }
 
     /**

diff --git a/settings.phtml b/settings.phtml
index 97e3b8fdf52418df89228ce162aa4513dccf06c6..083f3d7e61a259a1c77ba00ee7b8503069c86312 100644 (file)
--- a/settings.phtml
+++ b/settings.phtml
@@ -40,7 +40,8 @@
    <input type="hidden" name="method" value="action"/>
    <input type="hidden" name="mode"   value="authorize"/>
 
-   <input name="url" type="url" size="40" dojoType="dijit.form.TextBox" required="1"/>
+   <input name="url" type="url" size="40" dojoType="dijit.form.TextBox"
+     required="1" autocomplete="on"/>
    <button type="submit">Authorize</button>
   </form>
  </div>