]> git.mxchange.org Git - friendica.git/commitdiff
Merge pull request #1810 from annando/issue-1739
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Wed, 12 Aug 2015 06:17:27 +0000 (08:17 +0200)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Wed, 12 Aug 2015 06:17:27 +0000 (08:17 +0200)
Contact requests now contain more information.

boot.php
include/poller.php
include/uimport.php
mod/_well_known.php
mod/network.php
mod/nodeinfo.php [new file with mode: 0644]
view/theme/vier/style.css

index 2a11501033cbddc7f954697f180aced146b79204..ce02ca8b0dba57d213014cfc344923e3cce4f76d 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -829,7 +829,7 @@ if(! class_exists('App')) {
                                $v = get_class_vars( $class );
                                if(x($v,"name")) $name = $v['name'];
                        }
-                       if ($name===""){
+                       if ($name===""){
                                echo "template engine <tt>$class</tt> cannot be registered without a name.\n";
                                killme();
                        }
@@ -1449,7 +1449,7 @@ if(! function_exists('current_theme')) {
                $a = get_app();
 
                $page_theme = null;
-               
+
                // Find the theme that belongs to the user whose stuff we are looking at
 
                if($a->profile_uid && ($a->profile_uid != local_user())) {
@@ -1488,7 +1488,7 @@ if(! function_exists('current_theme')) {
                                        // user has selected to have the mobile theme be the same as the normal one
                                        $system_theme = $standard_system_theme;
                                        $theme_name = $standard_theme_name;
-                                       
+
                                        if($page_theme)
                                                $theme_name = $page_theme;
                                }
@@ -1533,7 +1533,7 @@ if(! function_exists('current_theme_url')) {
                $opts = (($a->profile_uid) ? '?f=&puid=' . $a->profile_uid : '');
                if (file_exists('view/theme/' . $t . '/style.php'))
                        return($a->get_baseurl() . '/view/theme/' . $t . '/style.pcss' . $opts);
-               
+
                return($a->get_baseurl() . '/view/theme/' . $t . '/style.css');
        }
 }
@@ -1619,9 +1619,9 @@ if(! function_exists('load_contact_links')) {
                                $url = normalise_link($rr['url']);
                                $ret[$url] = $rr;
                        }
-               }
-               else
+               } else
                        $ret['empty'] = true;
+
                $a->contacts = $ret;
                return;
        }
@@ -1634,24 +1634,24 @@ if(! function_exists('load_contact_links')) {
 * @return string
 */
 function build_querystring($params, $name=null) {
-    $ret = "";
-    foreach($params as $key=>$val) {
-        if(is_array($val)) {
-            if($name==null) {
-                $ret .= build_querystring($val, $key);
-            } else {
-                $ret .= build_querystring($val, $name."[$key]");
-            }
-        } else {
-            $val = urlencode($val);
-            if($name!=null) {
-                $ret.=$name."[$key]"."=$val&";
-            } else {
-                $ret.= "$key=$val&";
-            }
-        }
-    }
-    return $ret;
+       $ret = "";
+       foreach($params as $key=>$val) {
+               if(is_array($val)) {
+                       if($name==null) {
+                               $ret .= build_querystring($val, $key);
+                       } else {
+                               $ret .= build_querystring($val, $name."[$key]");
+                       }
+               } else {
+                       $val = urlencode($val);
+                       if($name!=null) {
+                               $ret.=$name."[$key]"."=$val&";
+                       } else {
+                               $ret.= "$key=$val&";
+                       }
+               }
+       }
+       return $ret;
 }
 
 function explode_querystring($query) {
@@ -1659,8 +1659,7 @@ function explode_querystring($query) {
        if($arg_st !== false) {
                $base = substr($query, 0, $arg_st);
                $arg_st += 1;
-       }
-       else {
+       } else {
                $base = '';
                $arg_st = 0;
        }
@@ -1746,16 +1745,16 @@ function clear_cache($basepath = "", $path = "") {
                $cachetime = 86400;
 
        if (is_writable($path)){
-       if ($dh = opendir($path)) {
-               while (($file = readdir($dh)) !== false) {
-                       $fullpath = $path."/".$file;
-                       if ((filetype($fullpath) == "dir") and ($file != ".") and ($file != ".."))
-                               clear_cache($basepath, $fullpath);
-                       if ((filetype($fullpath) == "file") and (filectime($fullpath) < (time() - $cachetime)))
-                               unlink($fullpath);
+               if ($dh = opendir($path)) {
+                       while (($file = readdir($dh)) !== false) {
+                               $fullpath = $path."/".$file;
+                               if ((filetype($fullpath) == "dir") and ($file != ".") and ($file != ".."))
+                                       clear_cache($basepath, $fullpath);
+                               if ((filetype($fullpath) == "file") and (filectime($fullpath) < (time() - $cachetime)))
+                                       unlink($fullpath);
+                       }
+                       closedir($dh);
                }
-               closedir($dh);
-       }
        }
 }
 
@@ -1805,14 +1804,22 @@ function get_lockpath() {
 }
 
 function get_temppath() {
+       $a = get_app();
+
        $temppath = get_config("system","temppath");
        if (($temppath != "") AND is_dir($temppath) AND is_writable($temppath))
                return($temppath);
 
        $temppath = sys_get_temp_dir();
        if (($temppath != "") AND is_dir($temppath) AND is_writable($temppath)) {
-               set_config("system", "temppath", $temppath);
-               return($temppath);
+               $temppath .= "/".$a->get_hostname();
+               if (!is_dir($temppath))
+                       mkdir($temppath);
+
+               if (is_dir($temppath) AND is_writable($temppath)) {
+                       set_config("system", "temppath", $temppath);
+                       return($temppath);
+               }
        }
 
        return("");
index 7cc1a285276222cd1d1e0c06472fef06865cc111..b72a4a823fcfbbba123abded104603dcc10f2fd0 100644 (file)
@@ -36,6 +36,7 @@ function poller_run(&$argv, &$argc){
        require_once('include/email.php');
        require_once('include/socgraph.php');
        require_once('include/pidfile.php');
+       require_once('mod/nodeinfo.php');
 
        load_config('config');
        load_config('system');
@@ -117,6 +118,9 @@ function poller_run(&$argv, &$argc){
        // Check every conversation
        check_conversations(false);
 
+       // update nodeinfo data
+       nodeinfo_cron();
+
        // To-Do: Regenerate usage statistics
        // q("ANALYZE TABLE `item`");
 
index 6808c706fab7240d8c7707bf23bb515615f7f785..b8439ee0944c8192fec2557134db68c234f09bcb 100644 (file)
@@ -156,7 +156,8 @@ function import_account(&$a, $file) {
        $newuid = last_insert_id();\r
        //~ $newuid = 1;\r
 \r
-\r
+       // Generate a new guid for the account. Otherwise there will be problems with diaspora\r
+       q("UPDATE `user` SET `guid` = '%s' WHERE `uid` = %d", generate_user_guid(), $newuid);\r
 \r
        foreach ($account['profile'] as &$profile) {\r
                foreach ($profile as $k => &$v) {\r
index 3d722f72246e764e853ce8a8bb184aaebb7f2067..33070a1ecdf4dc071d65aabd94b67f530be47efe 100644 (file)
@@ -1,5 +1,6 @@
 <?php\r
 require_once("mod/hostxrd.php");\r
+require_once("mod/nodeinfo.php");\r
 \r
 function _well_known_init(&$a){\r
        if ($a->argc > 1) {\r
@@ -10,6 +11,9 @@ function _well_known_init(&$a){
                        case "x-social-relay":\r
                                wk_social_relay($a);\r
                                break;\r
+                       case "nodeinfo":\r
+                               nodeinfo_wellknown($a);\r
+                               break;\r
                }\r
        }\r
        http_status_exit(404);\r
@@ -57,6 +61,6 @@ function wk_social_relay(&$a) {
                        "tags" => $taglist);\r
 \r
        header('Content-type: application/json; charset=utf-8');\r
-       echo json_encode($relay, true);\r
+       echo json_encode($relay, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);\r
        exit;\r
 }\r
index 56c0eeb95376a5ca00b8c70f79fc2fa743512b02..a92e0c691b497ccdef8b88062407ee985c5d9620 100644 (file)
@@ -45,7 +45,7 @@ function network_init(&$a) {
                else if($sel_groups !== false) {
                        $net_baseurl .= '/' . $sel_groups;
                }
-               
+
                if($remember_tab) {
                        // redirect if current selected tab is '/network' and
                        // last selected tab is _not_ '/network?f=&order=comment'.
@@ -91,17 +91,17 @@ function network_init(&$a) {
                else if($sel_nets!==false) {
                        $net_args['nets'] = $sel_nets;
                }
-               
+
                if($remember_tab || $remember_net || $remember_group) {
                        $net_args = array_merge($query_array, $net_args);
                        $net_queries = build_querystring($net_args);
-                       
+
                        $redir_url = ($net_queries ? $net_baseurl."?".$net_queries : $net_baseurl);
-                       
+
                        goaway($a->get_baseurl() . $redir_url);
                }
        }
-       
+
        if(x($_GET['nets']) && $_GET['nets'] === 'all')
                unset($_GET['nets']);
 
@@ -485,8 +485,8 @@ function network_content(&$a, $update = 0) {
                        'allow_location' => $a->user['allow_location'],
                        'default_location' => $a->user['default-location'],
                        'nickname' => $a->user['nickname'],
-                       'lockstate'=> ((($group) || ($cid) || ($nets) || (is_array($a->user) && 
-                                       ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || 
+                       'lockstate'=> ((($group) || ($cid) || ($nets) || (is_array($a->user) &&
+                                       ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) ||
                                        (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
                        'default_perms' => get_acl_permissions($a->user),
                        'acl'   => populate_acl((($group || $cid || $nets) ? $def_acl : $a->user), true),
@@ -552,8 +552,8 @@ function network_content(&$a, $update = 0) {
                //$sql_post_table = " INNER JOIN (SELECT DISTINCT(`parent`) FROM `item` WHERE (`contact-id` IN ($contact_str) OR `allow_gid` like '".protect_sprintf('%<'.intval($group).'>%')."') and deleted = 0 ORDER BY `created` DESC) AS `temp1` ON $sql_table.$sql_parent = `temp1`.`parent` ";
 
                $sql_extra3 .= " AND `contact-id` IN ($contact_str$contact_str_self) ";
-               $sql_extra3 .= " AND EXISTS (SELECT id FROM `item` WHERE (`contact-id` IN ($contact_str) 
-                               OR `allow_gid` like '".protect_sprintf('%<'.intval($group).'>%')."') and deleted = 0 
+               $sql_extra3 .= " AND EXISTS (SELECT id FROM `item` WHERE (`contact-id` IN ($contact_str)
+                               OR `allow_gid` like '".protect_sprintf('%<'.intval($group).'>%')."') and deleted = 0
                                AND parent = $sql_table.$sql_parent) ";
 
                $o = replace_macros(get_markup_template("section_title.tpl"),array(
diff --git a/mod/nodeinfo.php b/mod/nodeinfo.php
new file mode 100644 (file)
index 0000000..d19d0fc
--- /dev/null
@@ -0,0 +1,237 @@
+<?php
+/*
+Documentation: http://nodeinfo.diaspora.software/schema.html
+*/
+
+function nodeinfo_wellknown(&$a) {
+       if (!get_config("system", "nodeinfo")) {
+               http_status_exit(404);
+               killme();
+       }
+       $nodeinfo = array("links" => array("rel" => "http://nodeinfo.diaspora.software/ns/schema/1.0",
+                                       "href" => $a->get_baseurl()."/nodeinfo/1.0"));
+
+       header('Content-type: application/json; charset=utf-8');
+       echo json_encode($nodeinfo, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
+       exit;
+}
+
+function nodeinfo_init(&$a){
+       if (!get_config("system", "nodeinfo")) {
+               http_status_exit(404);
+               killme();
+       }
+
+       if (($a->argc != 2) OR ($a->argv[1] != "1.0")) {
+               http_status_exit(404);
+               killme();
+       }
+
+       $smtp = (function_exists("imap_open") AND !get_config("system","imap_disabled") AND !get_config("system","dfrn_only"));
+
+       $nodeinfo = array();
+       $nodeinfo["version"] = "1.0";
+       $nodeinfo["software"] = array("name" => "friendica", "version" => FRIENDICA_VERSION."-".DB_UPDATE_VERSION);
+
+       $nodeinfo["protocols"] = array();
+       $nodeinfo["protocols"]["inbound"] = array();
+       $nodeinfo["protocols"]["outbound"] = array();
+
+       if (get_config("system","diaspora_enabled")) {
+               $nodeinfo["protocols"]["inbound"][] = "diaspora";
+               $nodeinfo["protocols"]["outbound"][] = "diaspora";
+       }
+
+       $nodeinfo["protocols"]["inbound"][] = "friendica";
+       $nodeinfo["protocols"]["outbound"][] = "friendica";
+
+       if (!get_config("system","ostatus_disabled")) {
+               $nodeinfo["protocols"]["inbound"][] = "gnusocial";
+               $nodeinfo["protocols"]["outbound"][] = "gnusocial";
+       }
+
+       //if ($smtp) {
+       //      $nodeinfo["protocols"]["inbound"][] = "smtp";
+       //      $nodeinfo["protocols"]["outbound"][] = "smtp";
+       //}
+
+
+       $nodeinfo["services"] = array();
+
+       if (nodeinfo_plugin_enabled("appnet") OR nodeinfo_plugin_enabled("buffer"))
+               $nodeinfo["services"][] = "appnet";
+
+       if (nodeinfo_plugin_enabled("blogger"))
+               $nodeinfo["services"][] = "blogger";
+
+       //if (get_config("system","diaspora_enabled"))
+       //      $nodeinfo["services"][] = "diaspora";
+
+       if (nodeinfo_plugin_enabled("dwpost"))
+               $nodeinfo["services"][] = "dreamwidth";
+
+       if (nodeinfo_plugin_enabled("fbpost") OR nodeinfo_plugin_enabled("buffer"))
+               $nodeinfo["services"][] = "facebook";
+
+       //$nodeinfo["services"][] = "friendica";
+
+       //if (nodeinfo_plugin_enabled("statusnet") OR !get_config("system","ostatus_disabled"))
+       if (nodeinfo_plugin_enabled("statusnet"))
+               $nodeinfo["services"][] = "gnusocial";
+
+       if (nodeinfo_plugin_enabled("gpluspost") OR nodeinfo_plugin_enabled("buffer"))
+               $nodeinfo["services"][] = "google";
+
+       if (nodeinfo_plugin_enabled("ijpost"))
+               $nodeinfo["services"][] = "insanejournal";
+
+       if (nodeinfo_plugin_enabled("libertree"))
+               $nodeinfo["services"][] = "libertree";
+
+       if (nodeinfo_plugin_enabled("buffer"))
+               $nodeinfo["services"][] = "linkedin";
+
+       if (nodeinfo_plugin_enabled("ljpost"))
+               $nodeinfo["services"][] = "livejournal";
+
+       if (nodeinfo_plugin_enabled("buffer"))
+               $nodeinfo["services"][] = "pinterest";
+
+       if (nodeinfo_plugin_enabled("posterous"))
+               $nodeinfo["services"][] = "posterous";
+
+       if (nodeinfo_plugin_enabled("pumpio"))
+               $nodeinfo["services"][] = "pumpio";
+
+       // redmatrix
+
+       if ($smtp)
+               $nodeinfo["services"][] = "smtp";
+
+       if (nodeinfo_plugin_enabled("tumblr"))
+               $nodeinfo["services"][] = "tumblr";
+
+       if (nodeinfo_plugin_enabled("twitter"))
+               $nodeinfo["services"][] = "twitter";
+
+       if (nodeinfo_plugin_enabled("wppost"))
+               $nodeinfo["services"][] = "wordpress";
+
+       $nodeinfo["openRegistrations"] = ($a->config['register_policy'] != 0);
+
+       $nodeinfo["usage"] = array();
+       $nodeinfo["usage"]["users"] = array("total" => (int)get_config("nodeinfo","total_users"),
+                               "activeHalfyear" => (int)get_config("nodeinfo","active_users_halfyear"),
+                               "activeMonth" => (int)get_config("nodeinfo","active_users_monthly"));
+       $nodeinfo["usage"]["localPosts"] = (int)get_config("nodeinfo","local_posts");
+       $nodeinfo["usage"]["localComments"] = (int)get_config("nodeinfo","local_comments");
+
+       //$nodeinfo["metadata"] = new stdClass();
+       $nodeinfo["metadata"] = array("nodeName" => $a->config["sitename"]);
+
+       header('Content-type: application/json; charset=utf-8');
+       echo json_encode($nodeinfo, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
+       exit;
+}
+
+function nodeinfo_plugin_enabled($plugin) {
+       $r = q("SELECT * FROM `addon` WHERE `installed` = 1 AND `name` = '%s'", $plugin);
+       return((bool)(count($r) > 0));
+}
+
+function nodeinfo_cron() {
+
+       $a = get_app();
+
+       if (!get_config("system", "nodeinfo"))
+               return;
+
+       $last = get_config('nodeinfo','last_calucation');
+
+       if($last) {
+               // Calculate every 24 hours
+               $next = $last + (24 * 60 * 60);
+               if($next > time()) {
+                       logger("calculation intervall not reached");
+                       return;
+               }
+       }
+        logger("cron_start");
+
+       $users = q("SELECT profile.*, `user`.`login_date`, `lastitem`.`lastitem_date`
+                       FROM (SELECT MAX(`item`.`changed`) as `lastitem_date`, `item`.`uid`
+                               FROM `item`
+                                       WHERE `item`.`type` = 'wall'
+                                               GROUP BY `item`.`uid`) AS `lastitem`
+                                               RIGHT OUTER JOIN `user` ON `user`.`uid` = `lastitem`.`uid`, `contact`, `profile`
+                                WHERE
+                                       `user`.`uid` = `contact`.`uid` AND `profile`.`uid` = `user`.`uid`
+                                       AND `profile`.`is-default` AND (`profile`.`publish` OR `profile`.`net-publish`)
+                                       AND `user`.`verified` AND `contact`.`self`
+                                       AND NOT `user`.`blocked`
+                                       AND NOT `user`.`account_removed`
+                                       AND NOT `user`.`account_expired`");
+
+       if (is_array($users)) {
+                       $total_users = count($users);
+                       $active_users_halfyear = 0;
+                       $active_users_monthly = 0;
+
+                       $halfyear = time() - (180 * 24 * 60 * 60);
+                       $month = time() - (30 * 24 * 60 * 60);
+
+                       foreach ($users AS $user) {
+                               if ((strtotime($user['login_date']) > $halfyear) OR
+                                       (strtotime($user['lastitem_date']) > $halfyear))
+                                       ++$active_users_halfyear;
+
+                               if ((strtotime($user['login_date']) > $month) OR
+                                       (strtotime($user['lastitem_date']) > $month))
+                                       ++$active_users_monthly;
+
+                       }
+                       set_config('nodeinfo','total_users', $total_users);
+                       logger("total_users: ".$total_users, LOGGER_DEBUG);
+
+                       set_config('nodeinfo','active_users_halfyear', $active_users_halfyear);
+                       set_config('nodeinfo','active_users_monthly', $active_users_monthly);
+       }
+
+       //$posts = q("SELECT COUNT(*) AS local_posts FROM `item` WHERE `wall` AND `uid` != 0 AND `id` = `parent` AND left(body, 6) != '[share'");
+       $posts = q("SELECT COUNT(*) AS `local_posts` FROM `item`
+                       INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+                       WHERE `contact`.`self` and `item`.`id` = `item`.`parent` AND left(body, 6) != '[share' AND `item`.`network` IN ('%s', '%s', '%s')",
+                       dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_DFRN));
+
+       if (!is_array($posts))
+               $local_posts = -1;
+       else
+               $local_posts = $posts[0]["local_posts"];
+
+       set_config('nodeinfo','local_posts', $local_posts);
+
+        logger("local_posts: ".$local_posts, LOGGER_DEBUG);
+
+       $posts = q("SELECT COUNT(*) AS `local_comments` FROM `item`
+                       INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+                       WHERE `contact`.`self` and `item`.`id` != `item`.`parent` AND `item`.`network` IN ('%s', '%s', '%s')",
+                       dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_DFRN));
+
+       if (!is_array($posts))
+               $local_comments = -1;
+       else
+               $local_comments = $posts[0]["local_comments"];
+
+       set_config('nodeinfo','local_comments', $local_comments);
+
+       // Now trying to register
+       $url = "http://the-federation.info/register/".$a->get_hostname();
+        logger('registering url: '.$url, LOGGER_DEBUG);
+       $ret = fetch_url($url);
+        logger('registering answer: '.$ret, LOGGER_DEBUG);
+
+        logger("cron_end");
+       set_config('nodeinfo','last_calucation', time());
+}
+
+?>
index 26b0aa3626213828b8c987481b054b8262ba7b62..11bb2944de23e85726dbd6dd5b9d4758f2d6a302 100644 (file)
@@ -927,7 +927,8 @@ aside #profile-extra-links li {
   margin: 0px;
   list-style: none;
 }
-aside #dfrn-request-link {
+aside #dfrn-request-link,
+aside #wallmessage-link {
   display: block;
   -moz-border-radius: 5px 5px 5px 5px;
   -webkit-border-radius: 5px 5px 5px 5px;
@@ -938,7 +939,8 @@ aside #dfrn-request-link {
   text-transform: uppercase;
   padding: 4px 2px 2px 35px;
 }
-aside #dfrn-request-link:hover {
+aside #dfrn-request-link:hover,
+aside #wallmessage-link:hover {
   text-decoration: none;
   background-color: #36c;
   /* background-color: #19aeff; */