harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revised openid patch, added fix for Windows servers, make "is now friends with" commentable, fix settings form hook to be inside form

Browse Source
This commit is contained in:
Friendika
2010-12-23 14:40:32 -08:00
parent 68868fd74b
commit c55cb45855
7 changed files with 27 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/settings.php
+13 -5
View File
@@ -109,12 +109,17 @@ function settings_post(&$a) {
$str_group_deny = perms2str($_POST['group_deny']);
$str_contact_deny = perms2str($_POST['contact_deny']);
$openidserver="";
if ($openid != $a->user['openid'] && isset($a->user['openidserver'])){
$openidserver = ", `openidserver` = ''";
$openidserver = $a->user['openidserver'];
if($openid != $a->user['openid']) {
logger('updating openidserver');
require_once('library/openid.php');
$open_id_obj = new LightOpenID;
$open_id_obj->identity = $openid;
$openidserver = $open_id_obj->discover($open_id_obj->identity);
}
$r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `theme` = '%s', `maxreq` = %d".$openidserver." WHERE `uid` = %d LIMIT 1",
$r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `theme` = '%s', `maxreq` = %d, `openidserver` = '%s' WHERE `uid` = %d LIMIT 1",
dbesc($username),
dbesc($email),
dbesc($openid),
@@ -129,6 +134,7 @@ function settings_post(&$a) {
intval($allow_location),
dbesc($theme),
intval($maxreq),
dbesc($openidserver),
intval(local_user())
);
if($r)
@@ -306,7 +312,9 @@ function settings_content(&$a) {
'$pagetype' => $pagetype
));
call_hooks('settings_page',$o);
call_hooks('settings_form',$o);
$o .= '</form>' . "\r\n";
return $o;