]> git.mxchange.org Git - friendica.git/blobdiff - mod/contacts.php
The Diaspora class is now productive
[friendica.git] / mod / contacts.php
index f5289cf03a0253ac721481edd4d321867951727d..4897663a051d92b2c3e208507de588ced76adfdd 100644 (file)
@@ -7,7 +7,6 @@ require_once('include/Scrape.php');
 require_once('mod/proxy.php');
 require_once('include/Photo.php');
 
-if(! function_exists('contacts_init')) {
 function contacts_init(&$a) {
        if(! local_user())
                return;
@@ -39,13 +38,13 @@ function contacts_init(&$a) {
 
                        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
+                       } 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) ? z_root()."/redir/".$a->data['contact']['id'] : $a->data['contact']['url'],
+                               '$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:'),
@@ -89,10 +88,9 @@ function contacts_init(&$a) {
                '$base' => $base
        ));
 
-}
+
 }
 
-if(! function_exists('contacts_batch_actions')) {
 function contacts_batch_actions(&$a){
        $contacts_id = $_POST['contact_batch'];
        if (!is_array($contacts_id)) return;
@@ -131,13 +129,13 @@ function contacts_batch_actions(&$a){
        }
 
        if(x($_SESSION,'return_url'))
-               goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+               goaway('' . $_SESSION['return_url']);
        else
-               goaway($a->get_baseurl(true) . '/contacts');
-}
+               goaway('contacts');
+
 }
 
-if(! function_exists('contacts_post')) {
+
 function contacts_post(&$a) {
 
        if(! local_user())
@@ -159,7 +157,7 @@ function contacts_post(&$a) {
 
        if(! count($orig_record)) {
                notice( t('Could not access contact record.') . EOL);
-               goaway($a->get_baseurl(true) . '/contacts');
+               goaway('contacts');
                return; // NOTREACHED
        }
 
@@ -217,11 +215,10 @@ function contacts_post(&$a) {
                $a->data['contact'] = $r[0];
 
        return;
-}
+
 }
 
 /*contact actions*/
-if(! function_exists('_contact_update')) {
 function _contact_update($contact_id) {
        $r = q("SELECT `uid`, `url`, `network` FROM `contact` WHERE `id` = %d", intval($contact_id));
        if (!$r)
@@ -242,9 +239,7 @@ function _contact_update($contact_id) {
                // pull feed and consume it, which should subscribe to the hub.
                proc_run('php',"include/onepoll.php","$contact_id", "force");
 }
-}
 
-if(! function_exists('_contact_update_profile')) {
 function _contact_update_profile($contact_id) {
        $r = q("SELECT `uid`, `url`, `network` FROM `contact` WHERE `id` = %d", intval($contact_id));
        if (!$r)
@@ -304,9 +299,7 @@ function _contact_update_profile($contact_id) {
        // Update the entry in the gcontact table
        update_gcontact_from_probe($data["url"]);
 }
-}
 
-if(! function_exists('_contact_block')) {
 function _contact_block($contact_id, $orig_record) {
        $blocked = (($orig_record['blocked']) ? 0 : 1);
        $r = q("UPDATE `contact` SET `blocked` = %d WHERE `id` = %d AND `uid` = %d",
@@ -315,10 +308,8 @@ function _contact_block($contact_id, $orig_record) {
                intval(local_user())
        );
        return $r;
-}
-}
 
-if(! function_exists('_contact_ignore')) {
+}
 function _contact_ignore($contact_id, $orig_record) {
        $readonly = (($orig_record['readonly']) ? 0 : 1);
        $r = q("UPDATE `contact` SET `readonly` = %d WHERE `id` = %d AND `uid` = %d",
@@ -328,9 +319,6 @@ function _contact_ignore($contact_id, $orig_record) {
        );
        return $r;
 }
-}
-
-if(! function_exists('_contact_archive')) {
 function _contact_archive($contact_id, $orig_record) {
        $archived = (($orig_record['archive']) ? 0 : 1);
        $r = q("UPDATE `contact` SET `archive` = %d WHERE `id` = %d AND `uid` = %d",
@@ -343,18 +331,14 @@ function _contact_archive($contact_id, $orig_record) {
        }
        return $r;
 }
-}
-
-if(! function_exists('_contact_drop')) {
 function _contact_drop($contact_id, $orig_record) {
        $a = get_app();
 
        terminate_friendship($a->user,$a->contact,$orig_record);
        contact_remove($orig_record['id']);
 }
-}
 
-if(! function_exists('contacts_content')) {
+
 function contacts_content(&$a) {
 
        $sort_type = 0;
@@ -382,19 +366,19 @@ function contacts_content(&$a) {
 
                if(! count($orig_record)) {
                        notice( t('Could not access contact record.') . EOL);
-                       goaway($a->get_baseurl(true) . '/contacts');
+                       goaway('contacts');
                        return; // NOTREACHED
                }
 
                if($cmd === 'update') {
                        _contact_update($contact_id);
-                       goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
+                       goaway('contacts/' . $contact_id);
                        // NOTREACHED
                }
 
                if($cmd === 'updateprofile') {
                        _contact_update_profile($contact_id);
-                       goaway($a->get_baseurl(true) . '/crepair/' . $contact_id);
+                       goaway('crepair/' . $contact_id);
                        // NOTREACHED
                }
 
@@ -405,7 +389,7 @@ function contacts_content(&$a) {
                                info((($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')).EOL);
                        }
 
-                       goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
+                       goaway('contacts/' . $contact_id);
                        return; // NOTREACHED
                }
 
@@ -416,7 +400,7 @@ function contacts_content(&$a) {
                                info((($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')).EOL);
                        }
 
-                       goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
+                       goaway('contacts/' . $contact_id);
                        return; // NOTREACHED
                }
 
@@ -428,7 +412,7 @@ function contacts_content(&$a) {
                                info((($archived) ? t('Contact has been archived') : t('Contact has been unarchived')).EOL);
                        }
 
-                       goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
+                       goaway('contacts/' . $contact_id);
                        return; // NOTREACHED
                }
 
@@ -463,17 +447,17 @@ function contacts_content(&$a) {
                        // Now check how the user responded to the confirmation query
                        if($_REQUEST['canceled']) {
                                if(x($_SESSION,'return_url'))
-                                       goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+                                       goaway('' . $_SESSION['return_url']);
                                else
-                                       goaway($a->get_baseurl(true) . '/contacts');
+                                       goaway('contacts');
                        }
 
                        _contact_drop($contact_id, $orig_record[0]);
                        info( t('Contact has been removed.') . EOL );
                        if(x($_SESSION,'return_url'))
-                               goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+                               goaway('' . $_SESSION['return_url']);
                        else
-                               goaway($a->get_baseurl(true) . '/contacts');
+                               goaway('contacts');
                        return; // NOTREACHED
                }
                if($cmd === 'posts') {
@@ -593,8 +577,8 @@ function contacts_content(&$a) {
                        '$lbl_vis2' => sprintf( t('Please choose the profile you would like to display to %s when viewing your profile securely.'), $contact['name']),
                        '$lbl_info1' => t('Contact Information / Notes'),
                        '$infedit' => t('Edit contact notes'),
-                       //'$common_text' => $common_text,
-                       '$common_link' => $a->get_baseurl(true) . '/common/loc/' . local_user() . '/' . $contact['id'],
+                       '$common_text' => $common_text,
+                       '$common_link' => 'common/loc/' . local_user() . '/' . $contact['id'],
                        '$all_friends' => $all_friends,
                        '$relation_text' => $relation_text,
                        '$visit' => sprintf( t('Visit %s\'s profile [%s]'),$contact['name'],$contact['url']),
@@ -691,7 +675,7 @@ function contacts_content(&$a) {
        $tabs = array(
                array(
                        'label' => t('Suggestions'),
-                       'url'   => $a->get_baseurl(true) . '/suggest',
+                       'url'   => 'suggest',
                        'sel'   => '',
                        'title' => t('Suggest potential friends'),
                        'id'    => 'suggestions-tab',
@@ -699,7 +683,7 @@ function contacts_content(&$a) {
                ),
                array(
                        'label' => t('All Contacts'),
-                       'url'   => $a->get_baseurl(true) . '/contacts/all',
+                       'url'   => 'contacts/all',
                        'sel'   => ($all) ? 'active' : '',
                        'title' => t('Show all contacts'),
                        'id'    => 'showall-tab',
@@ -707,7 +691,7 @@ function contacts_content(&$a) {
                ),
                array(
                        'label' => t('Unblocked'),
-                       'url'   => $a->get_baseurl(true) . '/contacts',
+                       'url'   => 'contacts',
                        'sel'   => ((! $all) && (! $blocked) && (! $hidden) && (! $search) && (! $nets) && (! $ignored) && (! $archived)) ? 'active' : '',
                        'title' => t('Only show unblocked contacts'),
                        'id'    => 'showunblocked-tab',
@@ -716,7 +700,7 @@ function contacts_content(&$a) {
 
                array(
                        'label' => t('Blocked'),
-                       'url'   => $a->get_baseurl(true) . '/contacts/blocked',
+                       'url'   => 'contacts/blocked',
                        'sel'   => ($blocked) ? 'active' : '',
                        'title' => t('Only show blocked contacts'),
                        'id'    => 'showblocked-tab',
@@ -725,7 +709,7 @@ function contacts_content(&$a) {
 
                array(
                        'label' => t('Ignored'),
-                       'url'   => $a->get_baseurl(true) . '/contacts/ignored',
+                       'url'   => 'contacts/ignored',
                        'sel'   => ($ignored) ? 'active' : '',
                        'title' => t('Only show ignored contacts'),
                        'id'    => 'showignored-tab',
@@ -734,7 +718,7 @@ function contacts_content(&$a) {
 
                array(
                        'label' => t('Archived'),
-                       'url'   => $a->get_baseurl(true) . '/contacts/archived',
+                       'url'   => 'contacts/archived',
                        'sel'   => ($archived) ? 'active' : '',
                        'title' => t('Only show archived contacts'),
                        'id'    => 'showarchived-tab',
@@ -743,7 +727,7 @@ function contacts_content(&$a) {
 
                array(
                        'label' => t('Hidden'),
-                       'url'   => $a->get_baseurl(true) . '/contacts/hidden',
+                       'url'   => 'contacts/hidden',
                        'sel'   => ($hidden) ? 'active' : '',
                        'title' => t('Only show hidden contacts'),
                        'id'    => 'showhidden-tab',
@@ -822,7 +806,6 @@ function contacts_content(&$a) {
 
        return $o;
 }
-}
 
 /**
  * @brief List of pages for the Contact TabBar
@@ -876,13 +859,19 @@ function contacts_tab($a, $contact_id, $active_tab) {
                                'id' => 'common-loc-tab',
                                'accesskey' => 'd');
 
+       $tabs[] = array('label' => t('Advanced'),
+                       'url'   => 'crepair/' . $contact_id,
+                       'sel' => (($active_tab == 5)?'active':''),
+                       'title' => t('Advanced Contact Settings'),
+                       'id'    => 'advanced-tab',
+                       'accesskey' => 'r');
+
        $tab_tpl = get_markup_template('common_tabs.tpl');
        $tab_str = replace_macros($tab_tpl, array('$tabs' => $tabs));
 
        return $tab_str;
 }
 
-if(! function_exists('contact_posts')) {
 function contact_posts($a, $contact_id) {
 
        $r = q("SELECT `url` FROM `contact` WHERE `id` = %d", intval($contact_id));
@@ -910,9 +899,7 @@ function contact_posts($a, $contact_id) {
 
        return $o;
 }
-}
 
-if(! function_exists('_contact_detail_for_template')) {
 function _contact_detail_for_template($rr){
 
        $community = '';
@@ -963,7 +950,7 @@ function _contact_detail_for_template($rr){
                'url' => $url,
                'network' => network_to_name($rr['network'], $rr['url']),
        );
-}
+
 }
 
 /**
@@ -983,7 +970,7 @@ function contact_actions($contact) {
        if($contact['network'] === NETWORK_DFRN) {
                $contact_actions['suggest'] = array(
                                                        'label' => t('Suggest friends'),
-                                                       'url'   => app::get_baseurl(true) . '/fsuggest/' . $contact['id'],
+                                                       'url'   => 'fsuggest/' . $contact['id'],
                                                        'title' => '',
                                                        'sel'   => '',
                                                        'id'    =>  'suggest',
@@ -993,24 +980,16 @@ function contact_actions($contact) {
        if($poll_enabled) {
                $contact_actions['update'] = array(
                                                        'label' => t('Update now'),
-                                                       'url'   => app::get_baseurl(true) . '/contacts/' . $contact['id'] . '/update',
+                                                       'url'   => 'contacts/' . $contact['id'] . '/update',
                                                        'title' => '',
                                                        'sel'   => '',
                                                        'id'    => 'update',
                                        );
        }
 
-       $contact_actions['repair'] = array(
-                                               'label' => t('Repair'),
-                                               'url'   => app::get_baseurl(true) . '/crepair/' . $contact['id'],
-                                               'title' => t('Advanced Contact Settings'),
-                                               'sel'   => '',
-                                               'id'    => 'repair',
-                               );
-
        $contact_actions['block'] = array(
                                                'label' => (intval($contact['blocked']) ? t('Unblock') : t('Block') ),
-                                               'url'   => app::get_baseurl(true) . '/contacts/' . $contact['id'] . '/block',
+                                               'url'   => 'contacts/' . $contact['id'] . '/block',
                                                'title' => t('Toggle Blocked status'),
                                                'sel'   => (intval($contact['blocked']) ? 'active' : ''),
                                                'id'    => 'toggle-block',
@@ -1018,7 +997,7 @@ function contact_actions($contact) {
 
        $contact_actions['ignore'] = array(
                                                'label' => (intval($contact['readonly']) ? t('Unignore') : t('Ignore') ),
-                                               'url'   => app::get_baseurl(true) . '/contacts/' . $contact['id'] . '/ignore',
+                                               'url'   => 'contacts/' . $contact['id'] . '/ignore',
                                                'title' => t('Toggle Ignored status'),
                                                'sel'   => (intval($contact['readonly']) ? 'active' : ''),
                                                'id'    => 'toggle-ignore',
@@ -1026,7 +1005,7 @@ function contact_actions($contact) {
 
        $contact_actions['archive'] = array(
                                                'label' => (intval($contact['archive']) ? t('Unarchive') : t('Archive') ),
-                                               'url'   => app::get_baseurl(true) . '/contacts/' . $contact['id'] . '/archive',
+                                               'url'   => 'contacts/' . $contact['id'] . '/archive',
                                                'title' => t('Toggle Archive status'),
                                                'sel'   => (intval($contact['archive']) ? 'active' : ''),
                                                'id'    => 'toggle-archive',
@@ -1034,7 +1013,7 @@ function contact_actions($contact) {
 
        $contact_actions['delete'] = array(
                                                'label' => t('Delete'),
-                                               'url'   => app::get_baseurl(true) . '/contacts/' . $contact['id'] . '/drop', 
+                                               'url'   => 'contacts/' . $contact['id'] . '/drop', 
                                                'title' => t('Delete contact'),
                                                'sel'   => '',
                                                'id'    => 'delete',