diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2011-01-25 10:16:47 +0100 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2011-01-25 10:16:47 +0100 |
| commit | 1f95ba5c344a1b17c735bf2760a169beeff864c2 (patch) | |
| tree | 576774009b9c9a9f8828538865d2ff8d9bbe3596 /mod | |
| parent | f2789132ce13c92166f41992dd8955f667cab440 (diff) | |
| parent | b0ab3e468b5c20cfe369ff282b7906d1690a3510 (diff) | |
| download | volse-hubzilla-1f95ba5c344a1b17c735bf2760a169beeff864c2.tar.gz volse-hubzilla-1f95ba5c344a1b17c735bf2760a169beeff864c2.tar.bz2 volse-hubzilla-1f95ba5c344a1b17c735bf2760a169beeff864c2.zip | |
Merge remote branch 'friendika-master/master'
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/follow.php | 5 | ||||
| -rw-r--r-- | mod/settings.php | 20 |
2 files changed, 18 insertions, 7 deletions
diff --git a/mod/follow.php b/mod/follow.php index e5eb7763b..bad2e74f9 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -74,8 +74,8 @@ function follow_post(&$a) { $ret = scrape_feed($url); - if(count($ret) && $ret['feed_atom']) { - $poll = $ret['feed_atom']; + if(count($ret) && ($ret['feed_atom'] || $ret['feed_rss'])) { + $poll = ((x($ret,'feed_atom')) ? $ret['feed_atom'] : $ret['feed_rss']); $vcard = array(); require_once('simplepie/simplepie.inc'); $feed = new SimplePie(); @@ -115,7 +115,6 @@ function follow_post(&$a) { logger('follow: poll=' . $poll . ' notify=' . $notify . ' profile=' . $profile . ' vcard=' . print_r($vcard,true)); - // do we have enough information? if(! ((x($vcard['fn'])) && ($poll) && ($profile))) { diff --git a/mod/settings.php b/mod/settings.php index 1923c58da..32906d86e 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -87,11 +87,14 @@ function settings_post(&$a) { $err = ''; + $name_change = false; + if($username != $a->user['username']) { - if(strlen($username) > 40) - $err .= t(' Please use a shorter name.'); - if(strlen($username) < 3) - $err .= t(' Name too short.'); + $name_change = true; + if(strlen($username) > 40) + $err .= t(' Please use a shorter name.'); + if(strlen($username) < 3) + $err .= t(' Name too short.'); } if($email != $a->user['email']) { @@ -165,6 +168,15 @@ function settings_post(&$a) { intval(local_user()) ); + + if($name_change) { + q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `uid` = %d AND `self` = 1 LIMIT 1", + dbesc($username), + dbesc(datetime_convert()), + intval(local_user()) + ); + } + if($old_visibility != $net_publish) { // Update global directory in background $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); |