wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More notice errors and fix and incorrect variable name

Browse Source 
darcs-hash:20080720055558-533db-781488916e178921f1bcd6ea141df10c1a0ace55.gz
This commit is contained in:
Mike Cochrane 2008-07-20 01:55:58 -04:00
parent 4b8ae3e339
commit e4f1d6f504
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/util.php
View File

@ -514,7 +514,7 @@ function common_rememberme($user=NULL) {
function common_remembered_user() { function common_remembered_user() {
$user = NULL; $user = NULL;
# Try to remember # Try to remember
$packed = $_COOKIE[REMEMBERME]; $packed = isset($_COOKIE[REMEMBERME]) ? $_COOKIE[REMEMBERME] : '';
if ($packed) { if ($packed) {
list($id, $code) = explode(':', $packed); list($id, $code) = explode(':', $packed);
if ($id && $code) { if ($id && $code) {
@ -550,7 +550,7 @@ function common_forgetme() {
# who is the current user? # who is the current user?
function common_current_user() { function common_current_user() {
if ($_REQUEST[session_name()] || $_SESSION && $_SESSION['userid']) { if (isset($_REQUEST[session_name()]) || (isset($_SESSION['userid']) && $_SESSION['userid'])) {
common_ensure_session(); common_ensure_session();
$id = $_SESSION['userid']; $id = $_SESSION['userid'];
if ($id) { if ($id) {
@ -561,8 +561,8 @@ function common_current_user() {
} }
# that didn't work; try to remember # that didn't work; try to remember
$user = common_remembered_user(); $user = common_remembered_user();
common_debug("Got User " . $user->nickname);
if ($user) { if ($user) {
common_debug("Got User " . $user->nickname);
common_debug("Faking session on remembered user"); common_debug("Faking session on remembered user");
$_SESSION['userid'] = $user->id; $_SESSION['userid'] = $user->id;
} }
@ -622,7 +622,7 @@ function common_relative_profile($sender, $nickname, $dt=NULL) {
# Try to find profiles this profile is subscribed to that have this nickname # Try to find profiles this profile is subscribed to that have this nickname
$recipient = new Profile(); $recipient = new Profile();
# XXX: use a join instead of a subquery # XXX: use a join instead of a subquery
$recipient->whereAdd('EXISTS (SELECT subscribed from subscription where subscriber = '.$sender_id.' and subscribed = id)', 'AND'); $recipient->whereAdd('EXISTS (SELECT subscribed from subscription where subscriber = '.$sender->id.' and subscribed = id)', 'AND');
$recipient->whereAdd('nickname = "' . trim($nickname) . '"', 'AND'); $recipient->whereAdd('nickname = "' . trim($nickname) . '"', 'AND');
if ($recipient->find(TRUE)) { if ($recipient->find(TRUE)) {
# XXX: should probably differentiate between profiles with # XXX: should probably differentiate between profiles with
@ -632,7 +632,7 @@ function common_relative_profile($sender, $nickname, $dt=NULL) {
# Try to find profiles that listen to this profile and that have this nickname # Try to find profiles that listen to this profile and that have this nickname
$recipient = new Profile(); $recipient = new Profile();
# XXX: use a join instead of a subquery # XXX: use a join instead of a subquery
$recipient->whereAdd('EXISTS (SELECT subscriber from subscription where subscribed = '.$sender_id.' and subscriber = id)', 'AND'); $recipient->whereAdd('EXISTS (SELECT subscriber from subscription where subscribed = '.$sender->id.' and subscriber = id)', 'AND');
$recipient->whereAdd('nickname = "' . trim($nickname) . '"', 'AND'); $recipient->whereAdd('nickname = "' . trim($nickname) . '"', 'AND');
if ($recipient->find(TRUE)) { if ($recipient->find(TRUE)) {
# XXX: should probably differentiate between profiles with # XXX: should probably differentiate between profiles with