error viewing logfiles over 2Gb

[friendica.git] / mod / contacts.php

diff --git a/mod/contacts.php b/mod/contacts.php
index 4d9385026cdf6622b92d90fa8c7fa377f3af3dd2..307e9b15bce6899d835bb137605b8569698cf9bc 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -87,25 +87,15 @@ function contacts_post(&$a) {
 
 
        $priority = intval($_POST['poll']);
-       if($priority == (-1))
-               
        if($priority > 5 || $priority < 0)
                $priority = 0;
 
-       $rating = intval($_POST['reputation']);
-       if($rating > 5 || $rating < 0)
-               $rating = 0;
-
-       $reason = notags(trim($_POST['reason']));
-
        $info = escape_tags(trim($_POST['info']));
 
-       $r = q("UPDATE `contact` SET `profile-id` = %d, `priority` = %d , `rating` = %d, `reason` = '%s', `info` = '%s'
+       $r = q("UPDATE `contact` SET `profile-id` = %d, `priority` = %d , `info` = '%s'
                WHERE `id` = %d AND `uid` = %d LIMIT 1",
                intval($profile_id),
                intval($priority),
-               intval($rating),
-               dbesc($reason),
                dbesc($info),
                intval($contact_id),
                intval(local_user())
@@ -277,8 +267,6 @@ function contacts_content(&$a) {
                        $sparkle = '';
                }
 
-               $grps = '';
-
                $insecure = '<div id="profile-edit-insecure"><p><img src="images/unlock_icon.gif" alt="' . t('Privacy Unavailable') . '" />&nbsp;'
                        . t('Private communications are not available for this contact.') . '</p></div>';
 
@@ -292,6 +280,9 @@ function contacts_content(&$a) {
                $lblsuggest = (($r[0]['network'] === NETWORK_DFRN) 
                        ? '<div id="contact-suggest-wrapper"><a href="fsuggest/' . $r[0]['id'] . '" id="contact-suggest">' . t('Suggest friends') . '</a></div>' : '');
 
+               $poll_enabled = (($r[0]['network'] !== NETWORK_DIASPORA) ? true : false);
+
+               $nettype = '<div id="contact-edit-nettype">' . sprintf( t('Network type: %s'),network_to_name($r[0]['network'])) . '</div>';
 
                $o .= replace_macros($tpl,array(
                        '$header' => t('Contact Editor'),
@@ -310,9 +301,10 @@ function contacts_content(&$a) {
                        '$lblcrepair' => t("Repair contact URL settings \x28WARNING: Advanced\x29"),
                        '$lblrecent' => t('View conversations'),
                        '$lblsuggest' => $lblsuggest,
-                       '$grps' => $grps,
                        '$delete' => t('Delete contact'),
-                       '$poll_interval' => contact_poll_interval($r[0]['priority']),
+                       '$nettype' => $nettype,
+                       '$poll_interval' => contact_poll_interval($r[0]['priority'],(! $poll_enabled)),
+                       '$poll_enabled' => $poll_enabled,
                        '$lastupdtext' => t('Last updated: '),
                        '$updpub' => t('Update public posts: '),
                        '$last_update' => $last_update,
@@ -325,9 +317,6 @@ function contacts_content(&$a) {
                        '$info' => $r[0]['info'],
                        '$blocked' => (($r[0]['blocked']) ? '<div id="block-message">' . t('Currently blocked') . '</div>' : ''),
                        '$ignored' => (($r[0]['readonly']) ? '<div id="ignore-message">' . t('Currently ignored') . '</div>' : ''),
-                       '$rating' => contact_reputation($r[0]['rating']),
-                       '$reason' => $r[0]['reason'],
-                       '$groups' => '', // group_selector(),
                        '$photo' => $r[0]['photo'],
                        '$name' => $r[0]['name'],
                        '$dir_icon' => $dir_icon,
@@ -422,11 +411,12 @@ function contacts_content(&$a) {
                        $o .= replace_macros($tpl, array(
                                '$img_hover' => sprintf( t('Visit %s\'s profile [%s]'),$rr['name'],$rr['url']),
                                '$edit_hover' => t('Edit contact'),
+                               '$contact_photo_menu' => contact_photo_menu($rr),
                                '$id' => $rr['id'],
                                '$alt_text' => $alt_text,
                                '$dir_icon' => $dir_icon,
                                '$thumb' => $rr['thumb'], 
-                               '$name' => substr($rr['name'],0,20),
+                               '$name' => $rr['name'],
                                '$username' => $rr['name'],
                                '$sparkle' => $sparkle,
                                '$url' => $url