forked from GNUsocial/gnu-social
		
	remove some debugging statements from util.php
This commit is contained in:
		@@ -191,7 +191,6 @@ function common_ensure_session()
 | 
				
			|||||||
            }
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    common_debug("Session ID = " . session_id());
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// Three kinds of arguments:
 | 
					// Three kinds of arguments:
 | 
				
			||||||
@@ -258,7 +257,6 @@ function common_rememberme($user=null)
 | 
				
			|||||||
    if (!$user) {
 | 
					    if (!$user) {
 | 
				
			||||||
        $user = common_current_user();
 | 
					        $user = common_current_user();
 | 
				
			||||||
        if (!$user) {
 | 
					        if (!$user) {
 | 
				
			||||||
            common_debug('No current user to remember', __FILE__);
 | 
					 | 
				
			||||||
            return false;
 | 
					            return false;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
@@ -276,14 +274,11 @@ function common_rememberme($user=null)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    if (!$result) {
 | 
					    if (!$result) {
 | 
				
			||||||
        common_log_db_error($rm, 'INSERT', __FILE__);
 | 
					        common_log_db_error($rm, 'INSERT', __FILE__);
 | 
				
			||||||
        common_debug('Error adding rememberme record for ' . $user->nickname, __FILE__);
 | 
					 | 
				
			||||||
        return false;
 | 
					        return false;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    $rm->query('COMMIT');
 | 
					    $rm->query('COMMIT');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    common_debug('Inserted rememberme record (' . $rm->code . ', ' . $rm->user_id . '); result = ' . $result . '.', __FILE__);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    $cookieval = $rm->user_id . ':' . $rm->code;
 | 
					    $cookieval = $rm->user_id . ':' . $rm->code;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    common_log(LOG_INFO, 'adding rememberme cookie "' . $cookieval . '" for ' . $user->nickname);
 | 
					    common_log(LOG_INFO, 'adding rememberme cookie "' . $cookieval . '" for ' . $user->nickname);
 | 
				
			||||||
@@ -391,8 +386,6 @@ function common_current_user()
 | 
				
			|||||||
        $_cur = common_remembered_user();
 | 
					        $_cur = common_remembered_user();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if ($_cur) {
 | 
					        if ($_cur) {
 | 
				
			||||||
            common_debug("Got User " . $_cur->nickname);
 | 
					 | 
				
			||||||
            common_debug("Faking session on remembered user");
 | 
					 | 
				
			||||||
            // XXX: Is this necessary?
 | 
					            // XXX: Is this necessary?
 | 
				
			||||||
            $_SESSION['userid'] = $_cur->id;
 | 
					            $_SESSION['userid'] = $_cur->id;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user