]> git.mxchange.org Git - friendica.git/blobdiff - mod/contacts.php
Merge pull request #3307 from rebeka-catalina/space_before_t
[friendica.git] / mod / contacts.php
index 37cc09cab6b968592299a6168475bf689b9f75a2..f2500099c3f44689b37f67b4faf3afb7320ce3dd 100644 (file)
@@ -7,9 +7,10 @@ require_once('include/Scrape.php');
 require_once('mod/proxy.php');
 require_once('include/Photo.php');
 
-function contacts_init(&$a) {
-       if(! local_user())
+function contacts_init(App $a) {
+       if (! local_user()) {
                return;
+       }
 
        $contact_id = 0;
 
@@ -19,7 +20,7 @@ function contacts_init(&$a) {
                        intval(local_user()),
                        intval($contact_id)
                );
-               if(! dbm::is_result($r)) {
+               if (! dbm::is_result($r)) {
                        $contact_id = 0;
                }
        }
@@ -27,40 +28,45 @@ function contacts_init(&$a) {
        require_once('include/group.php');
        require_once('include/contact_widgets.php');
 
-       if ($_GET['nets'] == "all")
-       $_GET['nets'] = "";
+       if ($_GET['nets'] == "all") {
+               $_GET['nets'] = "";
+       }
 
-       if(! x($a->page,'aside'))
+       if (! x($a->page,'aside')) {
                $a->page['aside'] = '';
-
-       if($contact_id) {
-                       $a->data['contact'] = $r[0];
-
-                       if (($a->data['contact']['network'] != "") AND ($a->data['contact']['network'] != NETWORK_DFRN)) {
-                               $networkname = format_network_name($a->data['contact']['network'],$a->data['contact']['url']);
-                       } else
-                               $networkname = '';
-
-                       $vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"),array(
-                               '$name' => htmlentities($a->data['contact']['name']),
-                               '$photo' => $a->data['contact']['photo'],
-                               '$url' => ($a->data['contact']['network'] == NETWORK_DFRN) ? "redir/".$a->data['contact']['id'] : $a->data['contact']['url'],
-                               '$addr' => (($a->data['contact']['addr'] != "") ? ($a->data['contact']['addr']) : ""),
-                               '$network_name' => $networkname,
-                               '$network' => t('Network:'),
-                               '$account_type' => account_type($a->data['contact'])
-                       ));
-                       $finpeople_widget = '';
-                       $follow_widget = '';
-                       $networks_widget = '';
        }
-       else {
+
+       if ($contact_id) {
+               $a->data['contact'] = $r[0];
+
+               if (($a->data['contact']['network'] != "") AND ($a->data['contact']['network'] != NETWORK_DFRN)) {
+                       $networkname = format_network_name($a->data['contact']['network'],$a->data['contact']['url']);
+               } else {
+                       $networkname = '';
+               }
+
+               /// @TODO Add nice spaces
+               $vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"),array(
+                       '$name' => htmlentities($a->data['contact']['name']),
+                       '$photo' => $a->data['contact']['photo'],
+                       '$url' => ($a->data['contact']['network'] == NETWORK_DFRN) ? "redir/".$a->data['contact']['id'] : $a->data['contact']['url'],
+                       '$addr' => (($a->data['contact']['addr'] != "") ? ($a->data['contact']['addr']) : ""),
+                       '$network_name' => $networkname,
+                       '$network' => t('Network:'),
+                       '$account_type' => account_type($a->data['contact'])
+               ));
+
+               $finpeople_widget = '';
+               $follow_widget = '';
+               $networks_widget = '';
+       } else {
                $vcard_widget = '';
                $networks_widget .= networks_widget('contacts',$_GET['nets']);
-               if (isset($_GET['add']))
+               if (isset($_GET['add'])) {
                        $follow_widget = follow_widget($_GET['add']);
-               else
+               } else {
                        $follow_widget = follow_widget();
+               }
 
                $findpeople_widget .= findpeople_widget();
        }
@@ -91,7 +97,7 @@ function contacts_init(&$a) {
 
 }
 
-function contacts_batch_actions(&$a){
+function contacts_batch_actions(App $a) {
        $contacts_id = $_POST['contact_batch'];
        if (!is_array($contacts_id)) return;
 
@@ -128,18 +134,21 @@ function contacts_batch_actions(&$a){
                info ( sprintf( tt("%d contact edited.", "%d contacts edited.", $count_actions), $count_actions) );
        }
 
-       if(x($_SESSION,'return_url'))
+       if (x($_SESSION,'return_url')) {
                goaway('' . $_SESSION['return_url']);
-       else
+       }
+       else {
                goaway('contacts');
+       }
 
 }
 
 
-function contacts_post(&$a) {
+function contacts_post(App $a) {
 
-       if(! local_user())
+       if (! local_user()) {
                return;
+       }
 
        if ($a->argv[1]==="batch") {
                contacts_batch_actions($a);
@@ -147,15 +156,16 @@ function contacts_post(&$a) {
        }
 
        $contact_id = intval($a->argv[1]);
-       if(! $contact_id)
+       if (! $contact_id) {
                return;
+       }
 
        $orig_record = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                intval($contact_id),
                intval(local_user())
        );
 
-       if(! count($orig_record)) {
+       if (! count($orig_record)) {
                notice( t('Could not access contact record.') . EOL);
                goaway('contacts');
                return; // NOTREACHED
@@ -164,12 +174,12 @@ function contacts_post(&$a) {
        call_hooks('contact_edit_post', $_POST);
 
        $profile_id = intval($_POST['profile-assign']);
-       if($profile_id) {
+       if ($profile_id) {
                $r = q("SELECT `id` FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                        intval($profile_id),
                        intval(local_user())
                );
-               if(! dbm::is_result($r)) {
+               if (! dbm::is_result($r)) {
                        notice( t('Could not locate selected profile.') . EOL);
                        return;
                }
@@ -181,13 +191,13 @@ function contacts_post(&$a) {
 
        $fetch_further_information = intval($_POST['fetch_further_information']);
 
-       $ffi_keyword_blacklist = fix_mce_lf(escape_tags(trim($_POST['ffi_keyword_blacklist'])));
+       $ffi_keyword_blacklist = escape_tags(trim($_POST['ffi_keyword_blacklist']));
 
        $priority = intval($_POST['poll']);
        if($priority > 5 || $priority < 0)
                $priority = 0;
 
-       $info = fix_mce_lf(escape_tags(trim($_POST['info'])));
+       $info = escape_tags(trim($_POST['info']));
 
        $r = q("UPDATE `contact` SET `profile-id` = %d, `priority` = %d , `info` = '%s',
                `hidden` = %d, `notify_new_posts` = %d, `fetch_further_information` = %d,
@@ -339,14 +349,14 @@ function _contact_drop($contact_id, $orig_record) {
 }
 
 
-function contacts_content(&$a) {
+function contacts_content(App $a) {
 
        $sort_type = 0;
        $o = '';
        nav_set_selected('contacts');
 
 
-       if(! local_user()) {
+       if (! local_user()) {
                notice( t('Permission denied.') . EOL);
                return;
        }
@@ -384,7 +394,7 @@ function contacts_content(&$a) {
 
                if($cmd === 'block') {
                        $r = _contact_block($contact_id, $orig_record[0]);
-                       if($r) {
+                       if ($r) {
                                $blocked = (($orig_record[0]['blocked']) ? 0 : 1);
                                info((($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')).EOL);
                        }
@@ -395,7 +405,7 @@ function contacts_content(&$a) {
 
                if($cmd === 'ignore') {
                        $r = _contact_ignore($contact_id, $orig_record[0]);
-                       if($r) {
+                       if ($r) {
                                $readonly = (($orig_record[0]['readonly']) ? 0 : 1);
                                info((($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')).EOL);
                        }
@@ -407,7 +417,7 @@ function contacts_content(&$a) {
 
                if($cmd === 'archive') {
                        $r = _contact_archive($contact_id, $orig_record[0]);
-                       if($r) {
+                       if ($r) {
                                $archived = (($orig_record[0]['archive']) ? 0 : 1);
                                info((($archived) ? t('Contact has been archived') : t('Contact has been unarchived')).EOL);
                        }
@@ -446,22 +456,26 @@ function contacts_content(&$a) {
                                ));
                        }
                        // Now check how the user responded to the confirmation query
-                       if($_REQUEST['canceled']) {
-                               if(x($_SESSION,'return_url'))
+                       if ($_REQUEST['canceled']) {
+                               if (x($_SESSION,'return_url')) {
                                        goaway('' . $_SESSION['return_url']);
-                               else
+                               }
+                               else {
                                        goaway('contacts');
+                               }
                        }
 
                        _contact_drop($contact_id, $orig_record[0]);
                        info( t('Contact has been removed.') . EOL );
-                       if(x($_SESSION,'return_url'))
+                       if (x($_SESSION,'return_url')) {
                                goaway('' . $_SESSION['return_url']);
-                       else
+                       }
+                       else {
                                goaway('contacts');
+                       }
                        return; // NOTREACHED
                }
-               if($cmd === 'posts') {
+               if ($cmd === 'posts') {
                        return contact_posts($a, $contact_id);
                }
        }
@@ -475,17 +489,11 @@ function contacts_content(&$a) {
                $contact_id = $a->data['contact']['id'];
                $contact = $a->data['contact'];
 
-               $editselect = 'none';
-               if( feature_enabled(local_user(),'richtext') )
-                       $editselect = 'exact';
-
                $a->page['htmlhead'] .= replace_macros(get_markup_template('contact_head.tpl'), array(
                        '$baseurl' => App::get_baseurl(true),
-                       '$editselect' => $editselect,
                ));
                $a->page['end'] .= replace_macros(get_markup_template('contact_end.tpl'), array(
                        '$baseurl' => App::get_baseurl(true),
-                       '$editselect' => $editselect,
                ));
 
                require_once('include/contact_selectors.php');
@@ -526,13 +534,13 @@ function contacts_content(&$a) {
 
                $insecure = t('Private communications are not available for this contact.');
 
-               $last_update = (($contact['last-update'] == '0000-00-00 00:00:00')
+               $last_update = (($contact['last-update'] <= NULL_DATE)
                                ? t('Never')
                                : datetime_convert('UTC',date_default_timezone_get(),$contact['last-update'],'D, j M Y, g:i A'));
 
-               if($contact['last-update'] !== '0000-00-00 00:00:00')
+               if ($contact['last-update'] > NULL_DATE) {
                        $last_update .= ' ' . (($contact['last-update'] <= $contact['success_update']) ? t("\x28Update was successful\x29") : t("\x28Update was not successful\x29"));
-
+               }
                $lblsuggest = (($contact['network'] === NETWORK_DFRN) ? t('Suggest friends') : '');
 
                $poll_enabled = in_array($contact['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_FEED, NETWORK_MAIL, NETWORK_MAIL2));
@@ -550,12 +558,12 @@ function contacts_content(&$a) {
                // tabs
                $tab_str = contacts_tab($a, $contact_id, 2);
 
-               $lost_contact = (($contact['archive'] && $contact['term-date'] != '0000-00-00 00:00:00' && $contact['term-date'] < datetime_convert('','','now')) ? t('Communications lost with this contact!') : '');
+               $lost_contact = (($contact['archive'] && $contact['term-date'] > NULL_DATE && $contact['term-date'] < datetime_convert('','','now')) ? t('Communications lost with this contact!') : '');
 
-               if ($contact['network'] == NETWORK_FEED)
+               if ($contact['network'] == NETWORK_FEED) {
                        $fetch_further_information = array('fetch_further_information', t('Fetch further information for feeds'), $contact['fetch_further_information'], t('Fetch further information for feeds'),
                                                                        array('0'=>t('Disabled'), '1'=>t('Fetch information'), '2'=>t('Fetch information and keywords')));
-
+               }
                if (in_array($contact['network'], array(NETWORK_FEED, NETWORK_MAIL, NETWORK_MAIL2)))
                        $poll_interval = contact_poll_interval($contact['priority'],(! $poll_enabled));
 
@@ -817,13 +825,13 @@ function contacts_content(&$a) {
 
 /**
  * @brief List of pages for the Contact TabBar
- * 
+ *
  * Available Pages are 'Status', 'Profile', 'Contacts' and 'Common Friends'
- * 
+ *
  * @param app $a
  * @param int $contact_id The ID of the contact
  * @param int $active_tab 1 if tab should be marked as active
- * 
+ *
  * @return array with with contact TabBar data
  */
 function contacts_tab($a, $contact_id, $active_tab) {
@@ -947,9 +955,9 @@ function _contact_detail_for_template($rr){
 
 /**
  * @brief Gives a array with actions which can performed to a given contact
- * 
+ *
  * This includes actions like e.g. 'block', 'hide', 'archive', 'delete' and others
- * 
+ *
  * @param array $contact Data about the Contact
  * @return array with contact related actions
  */
@@ -1005,7 +1013,7 @@ function contact_actions($contact) {
 
        $contact_actions['delete'] = array(
                                                'label' => t('Delete'),
-                                               'url'   => 'contacts/' . $contact['id'] . '/drop', 
+                                               'url'   => 'contacts/' . $contact['id'] . '/drop',
                                                'title' => t('Delete contact'),
                                                'sel'   => '',
                                                'id'    => 'delete',