.

[friendica.git] / mod / profiles.php

diff --git a/mod/profiles.php b/mod/profiles.php
index 61f525e0fa29e8850d292cff625de922dfb09beb..eaa603a282bf537fbdebe9719969199078b98df4 100644 (file)
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -42,16 +42,28 @@ function profiles_post(&$a) {
                $day = intval($_POST['day']);
                        if(($day > $mtab[$month]) || ($day < 0))
                                $day = 0;
+
+               // It's OK to have an empty (0) year, but if you supplied a year you have to have a non-zero month and day
+               if($year && ! $month)
+                       $month = 1;
+               if($year && ! $day)
+                       $day = 1;
+
                $dob = '0000-00-00';
                $dob = sprintf('%04d-%02d-%02d',$year,$month,$day);
 
                        
                $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']));
@@ -96,7 +108,7 @@ function profiles_post(&$a) {
                                }
                                else {
                                        $newname = $lookup;
-                                       if(strstr($lookup,' ')) {
+/*                                     if(strstr($lookup,' ')) {
                                                $r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
                                                        dbesc($newname),
                                                        intval(local_user())
@@ -107,6 +119,17 @@ function profiles_post(&$a) {
                                                        dbesc($lookup),
                                                        intval(local_user())
                                                );
+                                       }*/
+                                       
+                                       $r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
+                                               dbesc($newname),
+                                               intval(local_user())
+                                       );
+                                       if(! $r) {
+                                               $r = q("SELECT * FROM `contact` WHERE `nick` = '%s' AND `uid` = %d LIMIT 1",
+                                                       dbesc($lookup),
+                                                       intval(local_user())
+                                               );
                                        }
                                        if(count($r)) {
                                                $prf = $r[0]['url'];
@@ -538,14 +561,21 @@ function profiles_content(&$a) {
                require_once('include/profile_selectors.php');
 
 
-               $editselect = 'textareas';
-               if(intval(get_pconfig(local_user(),'system','plaintext')))
-                       $editselect = 'none';
+/*             $editselect = 'textareas';
+               if( intval(get_pconfig(local_user(),'system','plaintext')) || !feature_enabled(local_user(),'richtext') )
+                       $editselect = 'none';*/
+               $editselect = 'none';
+               if( feature_enabled(local_user(),'richtext') )
+                       $editselect = 'textareas';
 
                $a->page['htmlhead'] .= replace_macros(get_markup_template('profed_head.tpl'), array(
                        '$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");
@@ -557,9 +587,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>";
-
-
 
 
 
@@ -575,6 +602,7 @@ function profiles_content(&$a) {
                        '$profile_drop_link' => 'profiles/drop/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_drop"),
                        '$banner' => t('Edit Profile Details'),
                        '$submit' => t('Submit'),
+                       '$profpic' => t('Change Profile Photo'),
                        '$viewprof' => t('View this profile'),
                        '$cr_prof' => t('Create a new profile using these settings'),
                        '$cl_prof' => t('Clone this profile'),