Merge pull request #1487 from fabrixxm/projects

new api dfrn/remoteauth, allow plugins to use update_structure

diff --git a/include/api.php b/include/api.php
index cf75428a3d12fa7c3d09d93b466534380df85f8f..dd24a92c9b105bf22e2bbc25532fc7f258e24d78 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -102,6 +102,9 @@
                $password = $_SERVER['PHP_AUTH_PW'];
                $encrypted = hash('whirlpool',trim($password));
 
+               // allow "user@server" login (but ignore 'server' part)
+               $at=strstr($user, "@", true);
+               if ( $at ) $user=$at;
 
                /**
                 *  next code from mod/auth.php. needs better solution
@@ -109,7 +112,7 @@
                $record = null;
 
                $addon_auth = array(
-                       'username' => trim($user), 
+                       'username' => trim($user),
                        'password' => trim($password),
                        'authenticated' => 0,
                        'user_record' => null
@@ -2666,6 +2669,70 @@
 
 
 
+       /**
+        * similar as /mod/redir.php
+        * redirect to 'url' after dfrn auth
+        *
+        * why this when there is mod/redir.php already?
+        * This use api_user() and api_login()
+        *
+        * params
+        *              c_url: url of remote contact to auth to
+        *              url: string, url to redirect after auth
+        */
+       function api_friendica_remoteauth(&$a) {
+               $url = ((x($_GET,'url')) ? $_GET['url'] : '');
+               $c_url = ((x($_GET,'c_url')) ? $_GET['c_url'] : '');
+
+               if ($url === '' || $c_url === '')
+                       die((api_error($a, 'json', "Wrong parameters")));
+
+               $c_url = normalise_link($c_url);
+
+               // traditional DFRN
+
+               $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `nurl` = '%s' LIMIT 1",
+                       dbesc($c_url),
+                       intval(api_user())
+               );
+
+               if ((! count($r)) || ($r[0]['network'] !== NETWORK_DFRN))
+                       die((api_error($a, 'json', "Unknown contact")));
+
+               $cid = $r[0]['id'];
+
+               $dfrn_id = $orig_id = (($r[0]['issued-id']) ? $r[0]['issued-id'] : $r[0]['dfrn-id']);
+
+               if($r[0]['duplex'] && $r[0]['issued-id']) {
+                       $orig_id = $r[0]['issued-id'];
+                       $dfrn_id = '1:' . $orig_id;
+               }
+               if($r[0]['duplex'] && $r[0]['dfrn-id']) {
+                       $orig_id = $r[0]['dfrn-id'];
+                       $dfrn_id = '0:' . $orig_id;
+               }
+
+               $sec = random_string();
+
+               q("INSERT INTO `profile_check` ( `uid`, `cid`, `dfrn_id`, `sec`, `expire`)
+                       VALUES( %d, %s, '%s', '%s', %d )",
+                       intval(api_user()),
+                       intval($cid),
+                       dbesc($dfrn_id),
+                       dbesc($sec),
+                       intval(time() + 45)
+               );
+
+               logger($r[0]['name'] . ' ' . $sec, LOGGER_DEBUG);
+               $dest = (($url) ? '&destination_url=' . $url : '');
+               goaway ($r[0]['poll'] . '?dfrn_id=' . $dfrn_id
+                               . '&dfrn_version=' . DFRN_PROTOCOL_VERSION
+                               . '&type=profile&sec=' . $sec . $dest . $quiet );
+       }
+       api_register_func('api/friendica/remoteauth', 'api_friendica_remoteauth', true);
+
+
+
 function api_share_as_retweet(&$item) {
        $body = trim($item["body"]);
 
@@ -2884,6 +2951,7 @@ function api_best_nickname(&$contacts) {
                $contacts = array($contacts[0]);
 }
 
+
 /*
 Not implemented by now:
 statuses/retweets_of_me

diff --git a/include/dbstructure.php b/include/dbstructure.php
index d25834edff801bae2b81a6bf98c7519073cc0084..083255b8ae87ae4baf9ca612ec43c57500006922 100644 (file)
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -120,7 +120,7 @@ function print_structure($database) {
        }
 }
 
-function update_structure($verbose, $action) {
+function update_structure($verbose, $action, $tables=null, $definition=null) {
        global $a, $db;
 
        $errors = false;
@@ -130,7 +130,8 @@ function update_structure($verbose, $action) {
        // Get the current structure
        $database = array();
 
-       $tables = q("show tables");
+       if (is_null($tables))
+               $tables = q("show tables");
 
        foreach ($tables AS $table) {
                $table = current($table);
@@ -139,7 +140,8 @@ function update_structure($verbose, $action) {
        }
 
        // Get the definition
-       $definition = db_definition();
+       if (is_null($definition))
+               $definition = db_definition();
 
        // Compare it
        foreach ($definition AS $name => $structure) {