modified: view/theme/smoothly/style.css

[friendica.git] / mod / profiles.php

diff --git a/mod/profiles.php b/mod/profiles.php
index ca3890eb9466e39aa7be7354e450fd0e38662b76..74844ff42efad0d6fb5965316facf567a5461d7b 100644 (file)
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -48,10 +48,15 @@ function profiles_post(&$a) {
                        
                $name = notags(trim($_POST['name']));
 
+               if(! strlen($name)) {
+                       $name = '[No Name]';
+               }
+
                if($orig[0]['name'] != $name)
                        $namechanged = true;
 
 
+
                $pdesc = notags(trim($_POST['pdesc']));
                $gender = notags(trim($_POST['gender']));
                $address = notags(trim($_POST['address']));
@@ -62,9 +67,15 @@ function profiles_post(&$a) {
                $pub_keywords = notags(trim($_POST['pub_keywords']));
                $prv_keywords = notags(trim($_POST['prv_keywords']));
                $marital = notags(trim($_POST['marital']));
+               $howlong = notags(trim($_POST['howlong']));
 
                $with = ((x($_POST,'with')) ? notags(trim($_POST['with'])) : '');
 
+               if(! strlen($howlong))
+                       $howlong = '0000-00-00 00:00:00';
+               else
+                       $howlong = datetime_convert(date_default_timezone_get(),'UTC',$howlong);
+ 
                // linkify the relationship target if applicable
 
                $withchanged = false;
@@ -120,9 +131,13 @@ function profiles_post(&$a) {
 
                $sexual = notags(trim($_POST['sexual']));
                $homepage = notags(trim($_POST['homepage']));
+               $hometown = notags(trim($_POST['hometown']));
                $politic = notags(trim($_POST['politic']));
                $religion = notags(trim($_POST['religion']));
 
+               $likes = fix_mce_lf(escape_tags(trim($_POST['likes'])));
+               $dislikes = fix_mce_lf(escape_tags(trim($_POST['dislikes'])));
+
                $about = fix_mce_lf(escape_tags(trim($_POST['about'])));
                $interest = fix_mce_lf(escape_tags(trim($_POST['interest'])));
                $contact = fix_mce_lf(escape_tags(trim($_POST['contact'])));
@@ -148,7 +163,15 @@ function profiles_post(&$a) {
                        if($withchanged) {
                                $changes[] = '[color=#ff0000]♥[/color] ' . t('Romantic Partner');
                                $value = strip_tags($with);
-                       }                                                       
+                       }
+                       if($likes != $orig[0]['likes']) {
+                               $changes[] = t('Likes');
+                               $value = $likes;
+                       }
+                       if($dislikes != $orig[0]['dislikes']) {
+                               $changes[] = t('Dislikes');
+                               $value = $dislikes;
+                       }
                        if($work != $orig[0]['work']) {
                                $changes[] = t('Work/Employment');
                        }
@@ -207,12 +230,16 @@ function profiles_post(&$a) {
                        `country-name` = '%s',
                        `marital` = '%s',
                        `with` = '%s',
+                       `howlong` = '%s',
                        `sexual` = '%s',
                        `homepage` = '%s',
+                       `hometown` = '%s',
                        `politic` = '%s',
                        `religion` = '%s',
                        `pub_keywords` = '%s',
                        `prv_keywords` = '%s',
+                       `likes` = '%s',
+                       `dislikes` = '%s',
                        `about` = '%s',
                        `interest` = '%s',
                        `contact` = '%s',
@@ -237,12 +264,16 @@ function profiles_post(&$a) {
                        dbesc($country_name),
                        dbesc($marital),
                        dbesc($with),
+                       dbesc($howlong),
                        dbesc($sexual),
                        dbesc($homepage),
+                       dbesc($hometown),
                        dbesc($politic),
                        dbesc($religion),
                        dbesc($pub_keywords),
                        dbesc($prv_keywords),
+                       dbesc($likes),
+                       dbesc($dislikes),
                        dbesc($about),
                        dbesc($interest),
                        dbesc($contact),
@@ -359,9 +390,17 @@ function profile_activity($changed, $value) {
        $arr['deny_gid']  = $a->user['deny_gid'];
 
        $i = item_store($arr);
-       if($i)
+       if($i) {
+
+               // give it a permanent link
+               q("update item set plink = '%s' where id = %d limit 1",
+                       dbesc($a->get_baseurl() . '/display/' . $a->user['nickname'] . '/' . $i),
+                       intval($i)
+               );
+
                proc_run('php',"include/notifier.php","activity","$i");
 
+       }
 }
 
 
@@ -512,6 +551,10 @@ function profiles_content(&$a) {
                        '$baseurl' => $a->get_baseurl(true),
                        '$editselect' => $editselect,
                ));
+               $a->page['end'] .= replace_macros(get_markup_template('profed_end.tpl'), array(
+                       '$baseurl' => $a->get_baseurl(true),
+                       '$editselect' => $editselect,
+               ));
 
 
                $opt_tpl = get_markup_template("profile-hide-friends.tpl");
@@ -523,9 +566,6 @@ function profiles_content(&$a) {
                        '$no_selected' => (($r[0]['hide-friends'] == 0) ? " checked=\"checked\" " : "")
                ));
 
-               $a->page['htmlhead'] .= "<script type=\"text/javascript\" src=\"js/country.js\" ></script>";
-
-
 
 
 
@@ -558,12 +598,16 @@ function profiles_content(&$a) {
                        '$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_howlong' => t('Since [date]:'),
                        '$lbl_sexual' => t('Sexual Preference:'),
                        '$lbl_homepage' => t('Homepage URL:'),
+                       '$lbl_hometown' => t('Hometown:'),
                        '$lbl_politic' => t('Political Views:'),
                        '$lbl_religion' => t('Religious Views:'),
                        '$lbl_pubkey' => t('Public Keywords:'),
                        '$lbl_prvkey' => t('Private Keywords:'),
+                       '$lbl_likes' => t('Likes:'),
+                       '$lbl_dislikes' => t('Dislikes:'),
                        '$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"),
@@ -595,13 +639,17 @@ function profiles_content(&$a) {
                        '$gender' => gender_selector($r[0]['gender']),
                        '$marital' => marital_selector($r[0]['marital']),
                        '$with' => strip_tags($r[0]['with']),
+                       '$howlong' => ($r[0]['howlong'] === '0000-00-00 00:00:00' ? '' : datetime_convert('UTC',date_default_timezone_get(),$r[0]['howlong'])),
                        '$sexual' => sexpref_selector($r[0]['sexual']),
                        '$about' => $r[0]['about'],
                        '$homepage' => $r[0]['homepage'],
+                       '$hometown' => $r[0]['hometown'],
                        '$politic' => $r[0]['politic'],
                        '$religion' => $r[0]['religion'],
                        '$pub_keywords' => $r[0]['pub_keywords'],
                        '$prv_keywords' => $r[0]['prv_keywords'],
+                       '$likes' => $r[0]['likes'],
+                       '$dislikes' => $r[0]['dislikes'],
                        '$music' => $r[0]['music'],
                        '$book' => $r[0]['book'],
                        '$tv' => $r[0]['tv'],
@@ -637,7 +685,7 @@ function profiles_content(&$a) {
 
                        foreach($r as $rr) {
                                $o .= replace_macros($tpl, array(
-                                       '$photo' => $rr['thumb'],
+                                       '$photo' => $a->get_cached_avatar_image($rr['thumb']),
                                        '$id' => $rr['id'],
                                        '$alt' => t('Profile Image'),
                                        '$profile_name' => $rr['profile-name'],