]> git.mxchange.org Git - friendica.git/blobdiff - mod/contacts.php
added much more curly braces + space between "if" and brace
[friendica.git] / mod / contacts.php
index 3d8b44b719c2e3ba933898e7afa876b6e05f8c7e..4f634bbc1c45cd46357acbd63d3122a7cd4cb857 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(! count($r)) {
+               if (! dbm::is_result($r)) {
                        $contact_id = 0;
                }
        }
@@ -38,7 +39,7 @@ 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(
@@ -48,7 +49,7 @@ function contacts_init(&$a) {
                                '$addr' => (($a->data['contact']['addr'] != "") ? ($a->data['contact']['addr']) : ""),
                                '$network_name' => $networkname,
                                '$network' => t('Network:'),
-                               'account_type' => (($a->data['contact']['forum'] || $a->data['contact']['prv']) ? t('Forum') : '')
+                               '$account_type' => account_type($a->data['contact'])
                        ));
                        $finpeople_widget = '';
                        $follow_widget = '';
@@ -78,20 +79,20 @@ function contacts_init(&$a) {
        $base = z_root();
        $tpl = get_markup_template("contacts-head.tpl");
        $a->page['htmlhead'] .= replace_macros($tpl,array(
-               '$baseurl' => $a->get_baseurl(true),
+               '$baseurl' => App::get_baseurl(true),
                '$base' => $base
        ));
 
        $tpl = get_markup_template("contacts-end.tpl");
        $a->page['end'] .= replace_macros($tpl,array(
-               '$baseurl' => $a->get_baseurl(true),
+               '$baseurl' => App::get_baseurl(true),
                '$base' => $base
        ));
 
 
 }
 
-function contacts_batch_actions(&$a){
+function contacts_batch_actions(App &$a){
        $contacts_id = $_POST['contact_batch'];
        if (!is_array($contacts_id)) return;
 
@@ -136,10 +137,11 @@ function contacts_batch_actions(&$a){
 }
 
 
-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 +149,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 +167,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(! count($r)) {
+               if (! dbm::is_result($r)) {
                        notice( t('Could not locate selected profile.') . EOL);
                        return;
                }
@@ -211,7 +214,7 @@ function contacts_post(&$a) {
                intval($contact_id),
                intval(local_user())
        );
-       if($r && count($r))
+       if($r && dbm::is_result($r))
                $a->data['contact'] = $r[0];
 
        return;
@@ -237,7 +240,7 @@ function _contact_update($contact_id) {
                                intval($contact_id));
        } else
                // pull feed and consume it, which should subscribe to the hub.
-               proc_run('php',"include/onepoll.php","$contact_id", "force");
+               proc_run(PRIORITY_HIGH, "include/onepoll.php", $contact_id, "force");
 }
 
 function _contact_update_profile($contact_id) {
@@ -339,14 +342,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;
        }
@@ -434,7 +437,8 @@ function contacts_content(&$a) {
                                $a->page['aside'] = '';
 
                                return replace_macros(get_markup_template('contact_drop_confirm.tpl'), array(
-                                       '$contact' =>  _contact_detail_for_template($orig_record[0]),
+                                       '$header' => t('Drop contact'),
+                                       '$contact' => _contact_detail_for_template($orig_record[0]),
                                        '$method' => 'get',
                                        '$message' => t('Do you really want to delete this contact?'),
                                        '$extra_inputs' => $inputs,
@@ -479,11 +483,11 @@ function contacts_content(&$a) {
                        $editselect = 'exact';
 
                $a->page['htmlhead'] .= replace_macros(get_markup_template('contact_head.tpl'), array(
-                       '$baseurl' => $a->get_baseurl(true),
+                       '$baseurl' => App::get_baseurl(true),
                        '$editselect' => $editselect,
                ));
                $a->page['end'] .= replace_macros(get_markup_template('contact_end.tpl'), array(
-                       '$baseurl' => $a->get_baseurl(true),
+                       '$baseurl' => App::get_baseurl(true),
                        '$editselect' => $editselect,
                ));
 
@@ -563,7 +567,7 @@ function contacts_content(&$a) {
 
                if (in_array($contact['network'], array(NETWORK_DIASPORA, NETWORK_OSTATUS)) AND
                        ($contact['rel'] == CONTACT_IS_FOLLOWER))
-                       $follow = $a->get_baseurl(true)."/follow?url=".urlencode($contact["url"]);
+                       $follow = App::get_baseurl(true)."/follow?url=".urlencode($contact["url"]);
 
                // Load contactact related actions like hide, suggest, delete and others
                $contact_actions = contact_actions($contact);
@@ -571,6 +575,7 @@ function contacts_content(&$a) {
 
                $o .= replace_macros($tpl, array(
                        //'$header' => t('Contact Editor'),
+                       '$header' => t("Contact"),
                        '$tab_str' => $tab_str,
                        '$submit' => t('Submit'),
                        '$lbl_vis1' => t('Profile Visibility'),
@@ -604,6 +609,7 @@ function contacts_content(&$a) {
                        '$ignore_text' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ),
                        '$insecure' => (($contact['network'] !== NETWORK_DFRN && $contact['network'] !== NETWORK_MAIL && $contact['network'] !== NETWORK_FACEBOOK && $contact['network'] !== NETWORK_DIASPORA) ? $insecure : ''),
                        '$info' => $contact['info'],
+                       '$cinfo' => array('info', '', $contact['info'], ''),
                        '$blocked' => (($contact['blocked']) ? t('Currently blocked') : ''),
                        '$ignored' => (($contact['readonly']) ? t('Currently ignored') : ''),
                        '$archived' => (($contact['archive']) ? t('Currently archived') : ''),
@@ -620,8 +626,11 @@ function contacts_content(&$a) {
                        '$url' => $url,
                        '$profileurllabel' => t('Profile URL'),
                        '$profileurl' => $contact['url'],
+                       '$account_type' => account_type($contact),
                        '$location' => bbcode($contact["location"]),
                        '$location_label' => t("Location:"),
+                       '$xmpp' => bbcode($contact["xmpp"]),
+                       '$xmpp_label' => t("XMPP:"),
                        '$about' => bbcode($contact["about"], false, false),
                        '$about_label' => t("About:"),
                        '$keywords' => $contact["keywords"],
@@ -630,6 +639,7 @@ function contacts_content(&$a) {
                        '$contact_actions' => $contact_actions,
                        '$contact_status' => t("Status"),
                        '$contact_settings_label' => t('Contact Settings'),
+                       '$contact_profile_label' => t("Profile"),
 
                ));
 
@@ -758,7 +768,7 @@ function contacts_content(&$a) {
        $r = q("SELECT COUNT(*) AS `total` FROM `contact`
                WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 ",
                intval($_SESSION['uid']));
-       if(count($r)) {
+       if (dbm::is_result($r)) {
                $a->set_pager_total($r[0]['total']);
                $total = $r[0]['total'];
        }
@@ -773,8 +783,8 @@ function contacts_content(&$a) {
 
        $contacts = array();
 
-       if(count($r)) {
-               foreach($r as $rr) {
+       if (dbm::is_result($r)) {
+               foreach ($r as $rr) {
                        $contacts[] = _contact_detail_for_template($rr);
                }
        }
@@ -800,6 +810,7 @@ function contacts_content(&$a) {
                        "contacts_batch_archive" => t('Archive')."/".t("Unarchive"),
                        "contacts_batch_drop" => t('Delete'),
                ),
+               '$h_batch_actions' => t('Batch Actions'),
                '$paginate' => paginate($a),
 
        ));
@@ -886,24 +897,13 @@ function contact_posts($a, $contact_id) {
 
        $o .= $tab_str;
 
-       $r = q("SELECT `id` FROM `item` WHERE `contact-id` = %d LIMIT 1", intval($contact_id));
-       if ($r)
-               $o .= posts_from_contact($a, $contact_id);
-       elseif ($contact["url"]) {
-               $r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
-                       dbesc(normalise_link($contact["url"])));
-
-               if ($r[0]["id"] <> 0)
-                       $o .= posts_from_gcontact($a, $r[0]["id"]);
-       }
+       $o .= posts_from_contact_url($a, $contact["url"]);
 
        return $o;
 }
 
 function _contact_detail_for_template($rr){
 
-       $community = '';
-
        switch($rr['rel']) {
                case CONTACT_IS_FRIEND:
                        $dir_icon = 'images/lrarrow.gif';
@@ -929,11 +929,6 @@ function _contact_detail_for_template($rr){
                $sparkle = '';
        }
 
-       //test if contact is a forum page
-       if (isset($rr['forum']) OR isset($rr['prv']))
-                               $community = ($rr['forum'] OR $rr['prv']);
-
-
        return array(
                'img_hover' => sprintf( t('Visit %s\'s profile [%s]'),$rr['name'],$rr['url']),
                'edit_hover' => t('Edit contact'),
@@ -944,7 +939,7 @@ function _contact_detail_for_template($rr){
                'thumb' => proxy_url($rr['thumb'], false, PROXY_SIZE_THUMB),
                'name' => htmlentities($rr['name']),
                'username' => htmlentities($rr['name']),
-               'account_type' => ($community ? t('Forum') : ''),
+               'account_type' => account_type($rr),
                'sparkle' => $sparkle,
                'itemurl' => (($rr['addr'] != "") ? $rr['addr'] : $rr['url']),
                'url' => $url,