applied coding convention:

[friendica.git] / mod / contacts.php

diff --git a/mod/contacts.php b/mod/contacts.php
index 26dfe0607837afc4b58f1305b8688e5d3972d11e..a2a77e2a5cddaa725e106e3ca1a86ad8fd77b86b 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -7,7 +7,7 @@ require_once('include/Scrape.php');
 require_once('mod/proxy.php');
 require_once('include/Photo.php');
 
-function contacts_init(App &$a) {
+function contacts_init(App $a) {
        if (! local_user()) {
                return;
        }
@@ -37,34 +37,36 @@ function contacts_init(App &$a) {
        }
 
        if ($contact_id) {
-                       $a->data['contact'] = $r[0];
+               $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 = '';
-                       }
+               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 {
+               /// @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();
        }
@@ -95,7 +97,7 @@ function contacts_init(App &$a) {
 
 }
 
-function contacts_batch_actions(App &$a){
+function contacts_batch_actions(App $a) {
        $contacts_id = $_POST['contact_batch'];
        if (!is_array($contacts_id)) return;
 
@@ -142,7 +144,7 @@ function contacts_batch_actions(App &$a){
 }
 
 
-function contacts_post(App &$a) {
+function contacts_post(App $a) {
 
        if (! local_user()) {
                return;
@@ -189,13 +191,13 @@ function contacts_post(App &$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,
@@ -347,7 +349,7 @@ function _contact_drop($contact_id, $orig_record) {
 }
 
 
-function contacts_content(App &$a) {
+function contacts_content(App $a) {
 
        $sort_type = 0;
        $o = '';
@@ -487,17 +489,11 @@ function contacts_content(App &$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');
@@ -829,13 +825,13 @@ function contacts_content(App &$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) {
@@ -959,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
  */
@@ -1017,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',