Merge remote branch 'upstream/master'

[friendica.git] / include / contact_widgets.php

diff --git a/include/contact_widgets.php b/include/contact_widgets.php
old mode 100755 (executable)
new mode 100644 (file)
index 135a9e4..96b02f2
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -12,6 +12,7 @@ function follow_widget() {
 }
 
 function findpeople_widget() {
+       require_once('include/Contact.php');
 
        $a = get_app();
 
@@ -32,6 +33,7 @@ function findpeople_widget() {
                '$findthem' => t('Find'),
                '$suggest' => t('Friend Suggestions'),
                '$similar' => t('Similar Interests'),
+               '$random' => t('Random Profile'),
                '$inv' => t('Invite Friends')
        ));
 
@@ -46,7 +48,7 @@ function networks_widget($baseurl,$selected = '') {
                return '';
 
        
-       $r = q("select distinct(network) from contact where uid = %d",
+       $r = q("select distinct(network) from contact where uid = %d and self = 0",
                intval(local_user())
        );
 
@@ -87,13 +89,41 @@ function fileas_widget($baseurl,$selected = '') {
     $cnt = preg_match_all('/\[(.*?)\]/',$saved,$matches,PREG_SET_ORDER);
     if($cnt) {
                foreach($matches as $mtch) {
-                       $unescaped = file_tag_decode($mtch[1]);
+                       $unescaped = xmlify(file_tag_decode($mtch[1]));
                        $terms[] = array('name' => $unescaped,'selected' => (($selected == $unescaped) ? 'selected' : ''));
                }
        }
 
        return replace_macros(get_markup_template('fileas_widget.tpl'),array(
-               '$title' => t('File Selections'),
+               '$title' => t('Saved Folders'),
+               '$desc' => '',
+               '$sel_all' => (($selected == '') ? 'selected' : ''),
+               '$all' => t('Everything'),
+               '$terms' => $terms,
+               '$base' => $baseurl,
+
+       ));
+}
+
+function categories_widget($baseurl,$selected = '') {
+       $a = get_app();
+
+       $saved = get_pconfig($a->profile['profile_uid'],'system','filetags');
+       if(! strlen($saved))
+               return;
+
+       $matches = false;
+       $terms = array();
+        $cnt = preg_match_all('/<(.*?)>/',$saved,$matches,PREG_SET_ORDER);
+        if($cnt) {
+                foreach($matches as $mtch) {
+                       $unescaped = xmlify(file_tag_decode($mtch[1]));
+                       $terms[] = array('name' => $unescaped,'selected' => (($selected == $unescaped) ? 'selected' : ''));
+               }
+       }
+
+       return replace_macros(get_markup_template('categories_widget.tpl'),array(
+               '$title' => t('Categories'),
                '$desc' => '',
                '$sel_all' => (($selected == '') ? 'selected' : ''),
                '$all' => t('Everything'),