Merge pull request #1320 from tobiasd/20150127adminpanel

add links to the plugin config pages for active plugins

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 0a9b2c90aeeb6ab522d8fc5ba6db32b78ca39eb9..668544b0bcf8df71afd51cc7628a466078157e4c 100644 (file)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -2,13 +2,14 @@
 
 require_once("include/contact_selectors.php");
 require_once("include/features.php");
+require_once("mod/proxy.php");
 
 /**
- * 
+ *
  */
 
 /**
- * @package acl_selectors 
+ * @package acl_selectors
  */
 function group_select($selname,$selclass,$preselected = false,$size = 4) {
 
@@ -35,11 +36,12 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) {
                                $selected = " selected=\"selected\" ";
                        else
                                $selected = '';
+
                        $trimmed = mb_substr($rr['name'],0,12);
 
                        $o .= "<option value=\"{$rr['id']}\" $selected title=\"{$rr['name']}\" >$trimmed</option>\r\n";
                }
-       
+
        }
        $o .= "</select>\r\n";
 
@@ -89,13 +91,13 @@ function contact_selector($selname, $selclass, $preselected = false, $options) {
                                                $networks = array('dfrn','mail','dspr');
                                        else
                                                $networks = array('dfrn','face','mail','dspr','stat');
-                                       break;                                  
+                                       break;
                                default:
                                        break;
                        }
                }
        }
-               
+
        $x = array('options' => $options, 'size' => $size, 'single' => $single, 'mutual' => $mutual, 'exclude' => $exclude, 'networks' => $networks);
 
        call_hooks('contact_select_options', $x);
@@ -117,15 +119,15 @@ function contact_selector($selname, $selclass, $preselected = false, $options) {
                $str_nets = implode(',',$x['networks']);
                $sql_extra .= " AND `network` IN ( $str_nets ) ";
        }
-       
+
        $tabindex = (x($options, 'tabindex') ? "tabindex=\"" . $options["tabindex"] . "\"" : "");
 
        if($x['single'])
                $o .= "<select name=\"$selname\" id=\"$selclass\" class=\"$selclass\" size=\"" . $x['size'] . "\" $tabindex >\r\n";
-       else 
+       else
                $o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"" . $x['size'] . "$\" $tabindex >\r\n";
 
-       $r = q("SELECT `id`, `name`, `url`, `network` FROM `contact` 
+       $r = q("SELECT `id`, `name`, `url`, `network` FROM `contact`
                WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 AND `notify` != ''
                $sql_extra
                ORDER BY `name` ASC ",
@@ -150,7 +152,7 @@ function contact_selector($selname, $selclass, $preselected = false, $options) {
 
                        $o .= "<option value=\"{$rr['id']}\" $selected title=\"{$rr['name']}|{$rr['url']}\" >$trimmed</option>\r\n";
                }
-       
+
        }
 
        $o .= "</select>\r\n";
@@ -164,6 +166,8 @@ function contact_selector($selname, $selclass, $preselected = false, $options) {
 
 function contact_select($selname, $selclass, $preselected = false, $size = 4, $privmail = false, $celeb = false, $privatenet = false, $tabindex = null) {
 
+       require_once("include/bbcode.php");
+
        $a = get_app();
 
        $o = '';
@@ -180,7 +184,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
        if($privmail) {
                $sql_extra .= " AND `network` IN ( 'dfrn', 'dspr' ) ";
        }
-       elseif($privatenet) {   
+       elseif($privatenet) {
                $sql_extra .= " AND `network` IN ( 'dfrn', 'mail', 'face', 'dspr' ) ";
        }
 
@@ -188,10 +192,10 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 
        if($privmail)
                $o .= "<select name=\"$selname\" id=\"$selclass\" class=\"$selclass\" size=\"$size\" $tabindex >\r\n";
-       else 
+       else
                $o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"$size\" $tabindex >\r\n";
 
-       $r = q("SELECT `id`, `name`, `url`, `network` FROM `contact` 
+       $r = q("SELECT `id`, `name`, `url`, `network` FROM `contact`
                WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 AND `notify` != ''
                $sql_extra
                ORDER BY `name` ASC ",
@@ -212,11 +216,14 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
                        else
                                $selected = '';
 
-                       $trimmed = mb_substr($rr['name'],0,20);
+                       if($privmail)
+                               $trimmed = GetProfileUsername($rr['url'], $rr['name'], false);
+                       else
+                               $trimmed = mb_substr($rr['name'],0,20);
 
                        $o .= "<option value=\"{$rr['id']}\" $selected title=\"{$rr['name']}|{$rr['url']}\" >$trimmed</option>\r\n";
                }
-       
+
        }
 
        $o .= "</select>\r\n";
@@ -239,7 +246,7 @@ function prune_deadguys($arr) {
        $r = q("select id from contact where id in ( " . $str . ") and blocked = 0 and pending = 0 and archive = 0 ");
        if($r) {
                $ret = array();
-               foreach($r as $rr) 
+               foreach($r as $rr)
                        $ret[] = intval($rr['id']);
                return $ret;
        }
@@ -251,7 +258,7 @@ function get_acl_permissions($user = null) {
        $allow_cid = $allow_gid = $deny_cid = $deny_gid = false;
 
        if(is_array($user)) {
-               $allow_cid = ((strlen($user['allow_cid'])) 
+               $allow_cid = ((strlen($user['allow_cid']))
                        ? explode('><', $user['allow_cid']) : array() );
                $allow_gid = ((strlen($user['allow_gid']))
                        ? explode('><', $user['allow_gid']) : array() );
@@ -411,21 +418,21 @@ function acl_lookup(&$a, $out_type = 'json') {
        }
 
        if ($type=='' || $type=='c'){
-               $r = q("SELECT COUNT(*) AS c FROM `contact` 
-                               WHERE `uid` = %d AND `self` = 0 
+               $r = q("SELECT COUNT(*) AS c FROM `contact`
+                               WHERE `uid` = %d AND `self` = 0
                                AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0
                                AND `notify` != '' $sql_extra2" ,
                        intval(local_user())
                );
                $contact_count = (int)$r[0]['c'];
-       } 
+       }
        elseif ($type == 'm') {
 
                // autocomplete for Private Messages
 
-               $r = q("SELECT COUNT(*) AS c FROM `contact` 
-                               WHERE `uid` = %d AND `self` = 0 
-                               AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 
+               $r = q("SELECT COUNT(*) AS c FROM `contact`
+                               WHERE `uid` = %d AND `self` = 0
+                               AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0
                                AND `network` IN ('%s','%s','%s') $sql_extra2" ,
                        intval(local_user()),
                        dbesc(NETWORK_DFRN),
@@ -439,8 +446,8 @@ function acl_lookup(&$a, $out_type = 'json') {
 
                // autocomplete for Contacts
 
-               $r = q("SELECT COUNT(*) AS c FROM `contact` 
-                               WHERE `uid` = %d AND `self` = 0 
+               $r = q("SELECT COUNT(*) AS c FROM `contact`
+                               WHERE `uid` = %d AND `self` = 0
                                AND `pending` = 0 $sql_extra2" ,
                        intval(local_user())
                );
@@ -449,22 +456,22 @@ function acl_lookup(&$a, $out_type = 'json') {
        } else {
                $contact_count = 0;
        }
-       
-       
+
+
        $tot = $group_count+$contact_count;
-       
+
        $groups = array();
        $contacts = array();
-       
+
        if ($type=='' || $type=='g'){
-               
+
                $r = q("SELECT `group`.`id`, `group`.`name`, GROUP_CONCAT(DISTINCT `group_member`.`contact-id` SEPARATOR ',') as uids
-                               FROM `group`,`group_member` 
-                               WHERE `group`.`deleted` = 0 AND `group`.`uid` = %d 
+                               FROM `group`,`group_member`
+                               WHERE `group`.`deleted` = 0 AND `group`.`uid` = %d
                                        AND `group_member`.`gid`=`group`.`id`
                                        $sql_extra
                                GROUP BY `group`.`id`
-                               ORDER BY `group`.`name` 
+                               ORDER BY `group`.`name`
                                LIMIT %d,%d",
                        intval(local_user()),
                        intval($start),
@@ -472,7 +479,7 @@ function acl_lookup(&$a, $out_type = 'json') {
                );
 
                foreach($r as $g){
-//             logger('acl: group: ' . $g['name'] . ' members: ' . $g['uids']);                
+//             logger('acl: group: ' . $g['name'] . ' members: ' . $g['uids']);
                        $groups[] = array(
                                "type"  => "g",
                                "photo" => "images/twopeople.png",
@@ -484,10 +491,10 @@ function acl_lookup(&$a, $out_type = 'json') {
                        );
                }
        }
-       
+
        if ($type=='' || $type=='c'){
-       
-               $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, forum FROM `contact` 
+
+               $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, forum FROM `contact`
                        WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 AND `notify` != ''
                        $sql_extra2
                        ORDER BY `name` ASC ",
@@ -495,7 +502,7 @@ function acl_lookup(&$a, $out_type = 'json') {
                );
        }
        elseif($type == 'm') {
-               $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag` FROM `contact` 
+               $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag` FROM `contact`
                        WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0
                        AND `network` IN ('%s','%s','%s')
                        $sql_extra2
@@ -507,7 +514,7 @@ function acl_lookup(&$a, $out_type = 'json') {
                );
        }
        elseif($type == 'a') {
-               $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag` FROM `contact` 
+               $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag` FROM `contact`
                        WHERE `uid` = %d AND `pending` = 0
                        $sql_extra2
                        ORDER BY `name` ASC ",
@@ -527,7 +534,7 @@ function acl_lookup(&$a, $out_type = 'json') {
                $x['data'] = array();
                if(count($r)) {
                        foreach($r as $g) {
-                               $x['photos'][] = $g['micro'];
+                               $x['photos'][] = proxy_url($g['micro']);
                                $x['links'][] = $g['url'];
                                $x['suggestions'][] = $g['name'];
                                $x['data'][] = intval($g['id']);
@@ -541,7 +548,7 @@ function acl_lookup(&$a, $out_type = 'json') {
                foreach($r as $g){
                        $contacts[] = array(
                                "type"  => "c",
-                               "photo" => $g['micro'],
+                               "photo" => proxy_url($g['micro']),
                                "name"  => $g['name'],
                                "id"    => intval($g['id']),
                                "network" => $g['network'],
@@ -549,28 +556,28 @@ function acl_lookup(&$a, $out_type = 'json') {
                                "nick" => ($g['attag']) ? $g['attag'] : $g['nick'],
                                "forum" => $g['forum']
                        );
-               }                       
+               }
        }
-               
+
        $items = array_merge($groups, $contacts);
 
        if ($conv_id) {
-               /* if $conv_id is set, get unknow contacts in thread */ 
+               /* if $conv_id is set, get unknow contacts in thread */
                /* but first get know contacts url to filter them out */
                function _contact_link($i){ return dbesc($i['link']); }
                $known_contacts = array_map(_contact_link, $contacts);
                $unknow_contacts=array();
-               $r = q("select 
+               $r = q("select
                                        `author-avatar`,`author-name`,`author-link`
                                from item where parent=%d
                                and (
                                        `author-name` LIKE '%%%s%%' OR
                                        `author-link` LIKE '%%%s%%'
-                               ) and 
+                               ) and
                                `author-link` NOT IN ('%s')
                                GROUP BY `author-link`
                                ORDER BY `author-name` ASC
-                               ", 
+                               ",
                                intval($conv_id),
                                dbesc($search),
                                dbesc($search),
@@ -586,7 +593,7 @@ function acl_lookup(&$a, $out_type = 'json') {
                                // /nickname
                                $unknow_contacts[] = array(
                                        "type"  => "c",
-                                       "photo" => $row['author-avatar'],
+                                       "photo" => proxy_url($row['author-avatar']),
                                        "name"  => $row['author-name'],
                                        "id"    => '',
                                        "network" => "unknown",
@@ -611,14 +618,14 @@ function acl_lookup(&$a, $out_type = 'json') {
                );
                return $o;
        }
-       
+
        $o = array(
                'tot'   => $tot,
                'start' => $start,
                'count' => $count,
                'items' => $items,
        );
-       
+
        echo json_encode($o);
 
        killme();

diff --git a/include/api.php b/include/api.php
index 7cff2af5f3cf1efcbcf24fdc2cc85d95fc275ec3..2d3c31af0c3f7a32209d702d2d8dd315d619541e 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -1643,7 +1643,8 @@
 
 
                $user_info = api_get_user($a);
-               $ret = api_format_items($item,$user_info)[0];
+               $rets = api_format_items($item,$user_info);
+               $ret = $rets[0];
 
                $data = array('$status' => $ret);
                switch($type){

diff --git a/include/bbcode.php b/include/bbcode.php
index 639d90cf4b7ee6bf5ecb9325b9bfe00894c6b3fc..c2ebf35e6308b7464359a8af2b3efe36d13628f7 100644 (file)
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -619,6 +619,17 @@ function GetProfileUsername($profile, $username, $compact = false, $getnetwork =
                        return($username." (".$diaspora.")");
        }
 
+       $red = preg_replace("=https?://(.*)/channel/(.*)=ism", "$2@$1", $profile);
+       if ($red != $profile) {
+               if ($getnetwork)
+                       // red is identified as Diaspora - friendica can't connect directly to it
+                       return(NETWORK_DIASPORA);
+               elseif ($compact)
+                       return($red);
+               else
+                       return($username." (".$red.")");
+       }
+
        $StatusnetHost = preg_replace("=https?://(.*)/user/(.*)=ism", "$1", $profile);
        if ($StatusnetHost != $profile) {
                $StatusnetUser = preg_replace("=https?://(.*)/user/(.*)=ism", "$2", $profile);

diff --git a/mod/message.php b/mod/message.php
index 0a54f9428d1c60fd224eda6925ab5c73e3e4d484..178d99bba5fb0383d7958bf712f95283152a2fc6 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -139,7 +139,7 @@ function item_redir_and_replace_images($body, $images, $cid) {
 
        for($i = 0; $i < count($images); $i++) {
                $search = '/\[url\=(.*?)\]\[!#saved_image' . $i . '#!\]\[\/url\]' . '/is';
-               $replace = '[url=' . z_path() . '/redir/' . $cid 
+               $replace = '[url=' . z_path() . '/redir/' . $cid
                           . '?f=1&url=' . '$1' . '][!#saved_image' . $i . '#!][/url]' ;
 
                $img_end = strpos($origbody, '[!#saved_image' . $i . '#!][/url]') + strlen('[!#saved_image' . $i . '#!][/url]');
@@ -256,17 +256,17 @@ function message_content(&$a) {
 
                                if($r)
                                        info( t('Conversation removed.') . EOL );
-                       } 
+                       }
                        //goaway($a->get_baseurl(true) . '/message' );
                        goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
-               }       
-       
+               }
+
        }
 
        if(($a->argc > 1) && ($a->argv[1] === 'new')) {
-               
+
                $o .= $header;
-               
+
 /*             $plaintext = false;
                if(intval(get_pconfig(local_user(),'system','plaintext')))
                        $plaintext = true;*/
@@ -282,7 +282,7 @@ function message_content(&$a) {
                        '$nickname' => $a->user['nickname'],
                        '$linkurl' => t('Please enter a link URL:')
                ));
-       
+
                $tpl = get_markup_template('msg-end.tpl');
                $a->page['end'] .= replace_macros($tpl, array(
                        '$baseurl' => $a->get_baseurl(true),
@@ -290,9 +290,9 @@ function message_content(&$a) {
                        '$nickname' => $a->user['nickname'],
                        '$linkurl' => t('Please enter a link URL:')
                ));
-       
+
                $preselect = (isset($a->argv[2])?array($a->argv[2]):false);
-                       
+
 
                $prename = $preurl = $preid = '';
 
@@ -306,19 +306,19 @@ function message_content(&$a) {
                                $preurl = $r[0]['url'];
                                $preid = $r[0]['id'];
                        }
-               }        
+               }
 
                $prefill = (($preselect) ? $prename  : '');
 
                // the ugly select box
-               
+
                $select = contact_select('messageto','message-to-select', $preselect, 4, true, false, false, 10);
 
                $tpl = get_markup_template('prv_message.tpl');
                $o .= replace_macros($tpl,array(
                        '$header' => t('Send Private Message'),
                        '$to' => t('To:'),
-                       '$showinputs' => 'true', 
+                       '$showinputs' => 'true',
                        '$prefill' => $prefill,
                        '$autocomp' => $autocomp,
                        '$preid' => $preid,
@@ -347,8 +347,8 @@ function message_content(&$a) {
 
                $o .= $header;
 
-               
-               $r = q("SELECT count(*) AS `total` FROM `mail` 
+
+               $r = q("SELECT count(*) AS `total` FROM `mail`
                        WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `created` DESC",
                        intval(local_user()),
                        dbesc($myprofile)
@@ -356,10 +356,10 @@ function message_content(&$a) {
                if(count($r))
                        $a->set_pager_total($r[0]['total']);
 
-               $r = q("SELECT max(`mail`.`created`) AS `mailcreated`, min(`mail`.`seen`) AS `mailseen`, 
+               $r = q("SELECT max(`mail`.`created`) AS `mailcreated`, min(`mail`.`seen`) AS `mailseen`,
                        `mail`.* , `contact`.`name`, `contact`.`url`, `contact`.`thumb` , `contact`.`network`,
                        count( * ) as count
-                       FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id` 
+                       FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id`
                        WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `mailcreated` DESC  LIMIT %d , %d ",
                        intval(local_user()),
                        //
@@ -394,7 +394,7 @@ function message_content(&$a) {
                                $body_e = $rr['body'];
                                $to_name_e = $rr['name'];
                        }
-                       
+
                        $o .= replace_macros($tpl, array(
                                '$id' => $rr['id'],
                                '$from_name' => $partecipants,
@@ -411,7 +411,7 @@ function message_content(&$a) {
                                '$count' => sprintf( tt('%d message', '%d messages', $rr['count']), $rr['count']),
                        ));
                }
-               $o .= paginate($a);     
+               $o .= paginate($a);
                return $o;
        }
 
@@ -423,13 +423,13 @@ function message_content(&$a) {
                if( local_user() && feature_enabled(local_user(),'richtext') )
                        $plaintext = false;
 
-               $r = q("SELECT `mail`.*, `contact`.`name`, `contact`.`url`, `contact`.`thumb` 
-                       FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id` 
+               $r = q("SELECT `mail`.*, `contact`.`name`, `contact`.`url`, `contact`.`thumb`
+                       FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id`
                        WHERE `mail`.`uid` = %d AND `mail`.`id` = %d LIMIT 1",
                        intval(local_user()),
                        intval($a->argv[1])
                );
-               if(count($r)) { 
+               if(count($r)) {
                        $contact_id = $r[0]['contact-id'];
                        $convid = $r[0]['convid'];
 
@@ -438,10 +438,10 @@ function message_content(&$a) {
                                $sql_extra = sprintf(" and ( `mail`.`parent-uri` = '%s' OR `mail`.`convid` = '%d' ) ",
                                        dbesc($r[0]['parent-uri']),
                                        intval($convid)
-                               );  
+                               );
 
-                       $messages = q("SELECT `mail`.*, `contact`.`name`, `contact`.`url`, `contact`.`thumb` 
-                               FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id` 
+                       $messages = q("SELECT `mail`.*, `contact`.`name`, `contact`.`url`, `contact`.`thumb`
+                               FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id`
                                WHERE `mail`.`uid` = %d $sql_extra ORDER BY `mail`.`created` ASC",
                                intval(local_user())
                        );
@@ -522,7 +522,7 @@ function message_content(&$a) {
                                'date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'],'D, d M Y - g:i A'),
                                 'ago' => relative_date($message['created']),
                        );
-                               
+
                        $seen = $message['seen'];
                }
 
@@ -545,9 +545,9 @@ function message_content(&$a) {
                        '$thread_seen' => $seen,
                        '$delete' =>  t('Delete conversation'),
                        '$canreply' => (($unknown) ? false : '1'),
-                       '$unknown_text' => t("No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."),                        
+                       '$unknown_text' => t("No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."),
                        '$mails' => $mails,
-                       
+
                        // reply
                        '$header' => t('Send Reply'),
                        '$to' => t('To:'),

diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index a3cc593d36fbcc7e053382c09e1b9fc4462826ef..31f2a9fe49d4496ab15de3472525719c0dd9a685 100644 (file)
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -2243,6 +2243,10 @@ blockquote {
 #prof-separator { display: none;}
 */
 
+#message-to-select {
+  height: 150px;
+}
+
 #prvmail-upload {
   margin-left: 10px;
 }