bug #85

[friendica.git] / mod / profiles.php

diff --git a/mod/profiles.php b/mod/profiles.php
index 99812ed8806f859382c84d33ddc5f4b10797fb15..9c92d81bad906779f0cc9b198cbc8e77ac2ddcb2 100644 (file)
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -196,7 +196,7 @@ function profiles_post(&$a) {
                );
 
                if($r)
-                       notice( t('Profile updated.') . EOL);
+                       info( t('Profile updated.') . EOL);
 
 
                if($namechanged && $is_default) {
@@ -251,7 +251,7 @@ function profiles_content(&$a) {
                        intval(local_user())
                );
                if($r)
-                       notice( t('Profile deleted.') . EOL);
+                       info( t('Profile deleted.') . EOL);
 
                goaway($a->get_baseurl() . '/profiles');
                return; // NOTREACHED
@@ -286,7 +286,7 @@ function profiles_content(&$a) {
                        dbesc($name)
                );
 
-               notice( t('New profile created.') . EOL);
+               info( t('New profile created.') . EOL);
                if(count($r3) == 1)
                        goaway($a->get_baseurl() . '/profiles/' . $r3[0]['id']);
                goaway($a->get_baseurl() . '/profiles');
@@ -325,7 +325,7 @@ function profiles_content(&$a) {
                        intval(local_user()),
                        dbesc($name)
                );
-               notice( t('New profile created.') . EOL);
+               info( t('New profile created.') . EOL);
                if(count($r3) == 1)
                        goaway($a->get_baseurl() . '/profiles/' . $r3[0]['id']);
        goaway($a->get_baseurl() . '/profiles');
@@ -347,9 +347,9 @@ function profiles_content(&$a) {
 
                require_once('include/profile_selectors.php');
 
-               $tpl = load_view_file('view/profed_head.tpl');
+               $tpl = get_markup_template('profed_head.tpl');
 
-               $opt_tpl = load_view_file("view/profile-hide-friends.tpl");
+               $opt_tpl = get_markup_template("profile-hide-friends.tpl");
                $hide_friends = replace_macros($opt_tpl,array(
                        '$desc' => t('Hide my contact/friend list from viewers of this profile?'),
                        '$yes_str' => t('Yes'),
@@ -364,8 +364,46 @@ function profiles_content(&$a) {
 
 
                $is_default = (($r[0]['is-default']) ? 1 : 0);
-               $tpl = load_view_file("view/profile_edit.tpl");
+               $tpl = get_markup_template("profile_edit.tpl");
                $o .= replace_macros($tpl,array(
+                       '$banner' => t('Edit Profile Details'),
+                       '$submit' => t('Submit'),
+                       '$viewprof' => t('View this profile'),
+                       '$cr_prof' => t('Create a new profile using these settings'),
+                       '$cl_prof' => t('Clone this profile'),
+                       '$del_prof' => t('Delete this profile'),
+                       '$lbl_profname' => t('Profile Name:'),
+                       '$lbl_fullname' => t('Your Full Name:'),
+                       '$lbl_title' => t('Title/Description:'),
+                       '$lbl_gender' => t('Your Gender:'),
+                       '$lbl_bd' => t("Birthday \x28y/m/d\x29:"),
+                       '$lbl_address' => t('Street Address:'),
+                       '$lbl_city' => t('Locality/City:'),
+                       '$lbl_zip' => t('Postal/Zip Code:'),
+                       '$lbl_country' => t('Country:'),
+                       '$lbl_region' => t('Region/State:'),
+                       '$lbl_marital' => t('<span class="heart">&hearts;</span> Marital Status:'),
+                       '$lbl_with' => t("Who: \x28if applicable\x29"),
+                       '$lbl_ex1' => t('Examples: cathy123, Cathy Williams, cathy@example.com'),
+                       '$lbl_sexual' => t('Sexual Preference:'),
+                       '$lbl_homepage' => t('Homepage URL:'),
+                       '$lbl_politic' => t('Political Views:'),
+                       '$lbl_religion' => t('Religious Views:'),
+                       '$lbl_pubkey' => t('Public Keywords:'),
+                       '$lbl_prvkey' => t('Private Keywords:'),
+                       '$lbl_ex2' => t('Example: fishing photography software'),
+                       '$lbl_pubdsc' => t("\x28Used for suggesting potential friends, can be seen by others\x29"),
+                       '$lbl_prvdsc' => t("\x28Used for searching profiles, never shown to others\x29"),
+                       '$lbl_about' => t('Tell us about yourself...'),
+                       '$lbl_hobbies' => t('Hobbies/Interests'),
+                       '$lbl_social' => t('Contact information and Social Networks'),
+                       '$lbl_music' => t('Musical interests'),
+                       '$lbl_book' => t('Books, literature'),
+                       '$lbl_tv' => t('Television'),
+                       '$lbl_film' => t('Film/dance/culture/entertainment'),
+                       '$lbl_love' => t('Love/romance'),
+                       '$lbl_work' => t('Work/employment'),
+                       '$lbl_school' => t('School/education'),
                        '$disabled' => (($is_default) ? 'onclick="return false;" style="color: #BBBBFF;"' : ''),
                        '$baseurl' => $a->get_baseurl(),
                        '$profile_id' => $r[0]['id'],
@@ -413,7 +451,7 @@ function profiles_content(&$a) {
                        local_user());
                if(count($r)) {
 
-                       $tpl_header = load_view_file('view/profile_listing_header.tpl');
+                       $tpl_header = get_markup_template('profile_listing_header.tpl');
                        $o .= replace_macros($tpl_header,array(
                                '$header' => t('Profiles'),
                                '$chg_photo' => t('Change profile photo'),
@@ -421,20 +459,20 @@ function profiles_content(&$a) {
                        ));
 
 
-                       $tpl_default = load_view_file('view/profile_entry_default.tpl');
-                       $tpl = load_view_file('view/profile_entry.tpl');
+                       $tpl = get_markup_template('profile_entry.tpl');
 
                        foreach($r as $rr) {
-                               $template = (($rr['is-default']) ? $tpl_default : $tpl);
-                               $o .= replace_macros($template, array(
+                               $o .= replace_macros($tpl, array(
                                        '$photo' => $rr['thumb'],
                                        '$id' => $rr['id'],
                                        '$alt' => t('Profile Image'),
-                                       '$profile_name' => $rr['profile-name']
+                                       '$profile_name' => $rr['profile-name'],
+                                       '$visible' => (($rr['is-default']) ?  '<strong>' . t('Visible to everybody') . '</strong>' 
+                                               : '<a href="' . $a->get_baseurl() . '/profperm/' . $rr['id'] . '" />' . t('Edit visibility') . '</a>')
                                ));
                        }
                }
                return $o;
        }
 
-}
\ No newline at end of file
+}