cvs: bugtracker /htdocs .htaccess /htdocs/index index.php /includes template.php user.php /template/generic/report report.php
/template/generic/user convert.php login.php verify.php

bcarlyon Sun Aug 10 21:38:41 2008 UTC Modified files: /bugtracker/htdocs .htaccess /bugtracker/htdocs/index index.php /bugtracker/includes template.php user.php /bugtracker/template/generic/report report.php /bugtracker/template/generic/user convert.php login.php verify.php Log: Pushing a update, mostly general stuff Fixed a small bug

http://cvs.php.net/viewvc.cgi/bugtracker/htdocs/.htaccess?r1=1.4&r2=1.5&diff_format=u Index: bugtracker/htdocs/.htaccess diff -u bugtracker/htdocs/.htaccess:1.4 bugtracker/htdocs/.htaccess:1.5 --- bugtracker/htdocs/.htaccess:1.4 Fri Jul 25 22:00:30 2008 +++ bugtracker/htdocs/.htaccess Sun Aug 10 21:38:40 2008 @@ -15,7 +15,7 @@ RedirectPermanent /source.php http://bugs.php.net/source.php #Other shuntage -RewriteRule ^login/$ /user/login/ [L,PT] +RewriteRule ^login(/)?$ /user/login/ [L,PT] RewriteRule ^user/verify/(.*)/(.*)$ index/index.php?page=user/verify&email=$1&tehkey=$2 [L,PT] #the big rewrite http://cvs.php.net/viewvc.cgi/bugtracker/htdocs/index/index.php?r1=1.17&r2=1.18&diff_format=u Index: bugtracker/htdocs/index/index.php diff -u bugtracker/htdocs/index/index.php:1.17 bugtracker/htdocs/index/index.php:1.18 --- bugtracker/htdocs/index/index.php:1.17 Thu Aug 7 09:25:44 2008 +++ bugtracker/htdocs/index/index.php Sun Aug 10 21:38:41 2008 @@ -48,7 +48,9 @@ //cache! $cache->load_cache(); $template->initialize(); -$template->alert = FALSE; + +//now then is the user logged in? +$user->check_auth(); //this is where we do stuff //its related to the page we are requesting from the server @@ -70,8 +72,3 @@ exit; -//now then is the user logged in? -$user->check_auth(); - -$user_data = array(); - http://cvs.php.net/viewvc.cgi/bugtracker/includes/template.php?r1=1.10&r2=1.11&diff_format=u Index: bugtracker/includes/template.php diff -u bugtracker/includes/template.php:1.10 bugtracker/includes/template.php:1.11 --- bugtracker/includes/template.php:1.10 Thu Aug 7 13:31:55 2008 +++ bugtracker/includes/template.php Sun Aug 10 21:38:41 2008 @@ -317,10 +317,11 @@ } if ($this->template_type == FALSE) { //then its a 404! - $this->h_or_p($base_directory . 'generic/404'); - $this->template_file = $base_directory . 'generic/404.' . $template_type; +// $this->h_or_p($base_directory . 'generic/404'); +// $this->template_file = $base_directory . 'generic/404.' . $this->template_type; header("HTTP/1.0 404 Not Found"); - $this->system_error = 'I am sorry the file (<strong>' . $this->page . '</strong>) you have requested could not be found'; +// $this->system_error = 'I am sorry the file (<strong>' . $this->page . '</strong>) you have requested could not be found'; + trigger_error('I am sorry the file (<strong>' . $this->page . '</strong>) you have requested could not be found',E_USER_ERROR); } else { http://cvs.php.net/viewvc.cgi/bugtracker/includes/user.php?r1=1.7&r2=1.8&diff_format=u Index: bugtracker/includes/user.php diff -u bugtracker/includes/user.php:1.7 bugtracker/includes/user.php:1.8 --- bugtracker/includes/user.php:1.7 Thu Aug 7 13:31:55 2008 +++ bugtracker/includes/user.php Sun Aug 10 21:38:41 2008 @@ -18,13 +18,16 @@ $this->logged_in_temp = TRUE; $this->handle = $data[1]; //no further auth required + trace('cookie: ' . $data[0] . ' -- ' . $data[1]); } } return; } + function check_karma() { } + function temp_account($handle,$email,$password) { global $db,$user_data,$email_data; //first check to see if this temp account exists @@ -185,7 +188,7 @@ return TRUE; } function login($user,$password) { - global $template_data,$db; + global $form_data,$db; //lets authenticate the user $query = 'SELECT * FROM ' . USER_TABLE . ' WHERE handle = \'' . $db->protect_data($user) . '\' AND password = \'' . $password . '\''; $db->get_data($query); @@ -199,26 +202,22 @@ if ($valid) { //so lets make sure we have this right - $user = $db->fetch_row(); - $this->handle = $user['handle']; - if ($this->write_cookie('',$template_data['return'])) + $user_row = $db->fetch_row(); + $this->handle = $user_row['handle']; + if ($this->write_cookie('',$form_data['return'])) { return TRUE; } - $template_data['form_error'] = '<div id="error">The Cookie could not be set</div>'; + $form_data['form_error'] = 'The Cookie could not be set'; } //try temp - $query = 'SELECT * FROM ' . TEMP_USER_TABLE . ' WHERE handle = \'' . $db->protect_data($user) . '\' AND password = \'' . $password . '\''; - $db->get_data($query); - $valid = $db->total_rows; - $query = 'SELECT * FROM ' . TEMP_USER_TABLE . ' WHERE email = \'' . $db->protect_data($user) . '\' AND password = \'' . $password . '\''; + $query = 'SELECT * FROM ' . TEMP_USER_TABLE . ' WHERE (handle = \'' . $db->protect_data($user) . '\' || email = \'' . $db->protect_data($user) . '\') AND password = \'' . $password . '\''; $db->get_data($query); - $valid = ($valid) ? $valid : $db->total_rows; - if ($valid) + if ($db->total_rows) { - $user = $db->fetch_row(); - $this->handle = $user['handle']; + $user_row = $db->fetch_row(); + $this->handle = $user_row['handle']; //temp account login! //set a cookie if ($this->write_cookie(array('handle' => $this->handle),TEMP_ACCOUNT)) @@ -230,16 +229,18 @@ } else { - $template_data['form_error'] = '<div id="error">The Cookie could not be set</div>'; + $form_data['form_error'] = 'The Cookie could not be set'; return FALSE; } } unset($password); //not authed - $template_data['form_error'] = '<div id="error">Your User Credentials could not be Validated</div>'; + $form_data['form_error'] = 'Your User Credentials could not be Validated'; return FALSE; } + + function write_cookie($user_data, $type = 'user', $redirect = FALSE) { global $cookie; http://cvs.php.net/viewvc.cgi/bugtracker/template/generic/report/report.php?r1=1.8&r2=1.9&diff_format=u Index: bugtracker/template/generic/report/report.php diff -u bugtracker/template/generic/report/report.php:1.8 bugtracker/template/generic/report/report.php:1.9 --- bugtracker/template/generic/report/report.php:1.8 Thu Aug 7 09:33:04 2008 +++ bugtracker/template/generic/report/report.php Sun Aug 10 21:38:41 2008 @@ -1,5 +1,6 @@ <?php +$content = ''; $form_data['email'] = loadvar('email'); $form_data['php_version'] = loadvar('php_version'); $form_data['bug_type'] = loadvar('bug_type'); @@ -113,8 +114,6 @@ ); $comment->first_comment($comments); - $template_data['page_title'] .= ': Bug Reported'; - $meta_refresh = array(); $meta_refresh['url'] = '/bug/' . $bug->bug_id; $meta_refresh['time'] = 10; http://cvs.php.net/viewvc.cgi/bugtracker/template/generic/user/convert.php?r1=1.4&r2=1.5&diff_format=u Index: bugtracker/template/generic/user/convert.php diff -u bugtracker/template/generic/user/convert.php:1.4 bugtracker/template/generic/user/convert.php:1.5 --- bugtracker/template/generic/user/convert.php:1.4 Sat Jul 26 02:33:44 2008 +++ bugtracker/template/generic/user/convert.php Sun Aug 10 21:38:41 2008 @@ -104,8 +104,9 @@ //the user has been registered in the main database //what now? //just give out a nice message, email is handle in the register function - $content .= '<h2>Account Status</h2>'; - $content .= '<p>Your account has begun the conversion process.</p>'; + $template->page_title .= 'Account Status'; + $template->content_title = 'Account Status'; + $content = '<p>Your account has begun the conversion process.</p>'; $content .= '<p>An email has been sent to you, in order for you to confirm your address.</p>'; $content .= '<p>In order to continue please visit the link in the email.</p>'; $user->logged_in_temp = FALSE; @@ -128,8 +129,7 @@ } else { - $template_data['form_error'] = 'You have got somewhere you should not have'; - trace('some error'); + trigger_error('You have got somewhere you should not have', E_USER_ERROR); } } @@ -139,9 +139,10 @@ if ($user->logged_in_temp) { - $content .= '<h2>Creating a User</h2>'; + $template->page_title .= 'Creating a User'; + $template->content_title = 'Creating a User'; - $content .= '<p>You have attempted to login as a temporary user, in order to continue your account needs to be upgraded to a full account</p>'; + $content = '<p>You have attempted to login as a temporary user, in order to continue your account needs to be upgraded to a full account</p>'; $temp_handle = $user->handle; @@ -196,11 +197,15 @@ } else { - $content .= '<p>However, you have specified an Invalide Handle</p>'; + $content .= '<p>However, you have specified an Invalid Handle</p>'; } + $template->prehtml = $content; } else if ($redirect_convert) { header('Location: /login/'); } - +else +{ + $template->prehtml = $content; +} http://cvs.php.net/viewvc.cgi/bugtracker/template/generic/user/login.php?r1=1.2&r2=1.3&diff_format=u Index: bugtracker/template/generic/user/login.php diff -u bugtracker/template/generic/user/login.php:1.2 bugtracker/template/generic/user/login.php:1.3 --- bugtracker/template/generic/user/login.php:1.2 Sat Jul 26 02:33:44 2008 +++ bugtracker/template/generic/user/login.php Sun Aug 10 21:38:41 2008 @@ -1,16 +1,26 @@ <?php +if ($user->logged_in_temp) +{ + header("Location: /user/convert/"); +} else if ($user->logged_in) { + trigger_error('You are logged in already', E_USER_ERROR); +} + //login contoller and generator echo '<!--'; $method = loadvar('method'); echo '-->'; -$template_data['form_error'] = ''; -$template_data['username'] = ''; -$template_data['remember'] = ''; -$template_data['return'] = (isset($_SERVER['HTTP_REFERER'])) ? str_replace('http://' . $_SERVER['HTTP_HOST'],'',$_SERVER['HTTP_REFERER']) : '/'; +$form_data['form_error'] = ''; +$form_data['username'] = ''; +$form_data['remember'] = ''; +$form_data['return'] = (isset($_SERVER['HTTP_REFERER'])) ? str_replace('http://' . $_SERVER['HTTP_HOST'],'',$_SERVER['HTTP_REFERER']) : '/'; -$content .= '<h2>Logging In</h2>'; +$template->page_title .= 'Logging In'; +$template->content_title = 'Logging In'; + +$content = ''; switch($method) { @@ -19,41 +29,45 @@ $username = loadvar('username'); $password = md5(loadvar('password')); $remember = loadvar('remember'); - $return = loadvar('return',$template_data['return']); - - $template_data['username'] = $username; - $template_data['remember'] = ($remember) ? ' checked="checked" ' : ''; - $template_data['return'] = $return; + $return = loadvar('return',$form_data['return']); -// $system_data['login_username'] = $username; -// $system_data['login_password'] = $password; + $form_data['username'] = $username; + $form_data['remember'] = ($remember) ? ' checked="checked" ' : ''; + $form_data['return'] = $return; //call login - $user->login($username,$password); + if ($user->login($username,$password)) + { +echo '@ user->login'; +exit; + break; + } - $content .= ''; + $content = ''; } default: { - $content .= ' -{FORM_ERROR} + $content = ' +{FORM_FORM_ERROR} -<form action="/login/" method="post" class="form"> +<form action="/user/login/" method="post" class="form"> <input type="hidden" name="method" value="login" /> <div class="slim"> - <label for="username" >Handle/Email:</label> <input type="text" name="username" id="username" value="{USERNAME}" /> + <label for="username" >Handle/Email:</label> <input type="text" name="username" id="username" value="{FORM_USERNAME}" /> <br /><br /> <label for="password" >Password:</label> <input type="password" name="password" id="password" /> <br /><br /> - <label for="remember" >Remember:</label> <input type="checkbox" name="remember" id="remember" {REMEMBER} /> + <label for="remember" >Remember:</label> <input type="checkbox" name="remember" id="remember" {FORM_REMEMBER} /> <br /><br /> <input type="submit" name="submit" id="submit" value="Submit" /> </div> - <input type="hidden" name="return" value="{RETURN}" /> + <input type="hidden" name="return" value="{FORM_RETURN}" /> </form> '; } } +$content = $template->dontloop(array('form' => $form_data), $content); +$template->prehtml = $content; http://cvs.php.net/viewvc.cgi/bugtracker/template/generic/user/verify.php?r1=1.1&r2=1.2&diff_format=u Index: bugtracker/template/generic/user/verify.php diff -u bugtracker/template/generic/user/verify.php:1.1 bugtracker/template/generic/user/verify.php:1.2 --- bugtracker/template/generic/user/verify.php:1.1 Wed Jul 16 12:13:36 2008 +++ bugtracker/template/generic/user/verify.php Sun Aug 10 21:38:41 2008 @@ -1,5 +1,8 @@ <?php +print 'in veriy'; +exit; + //file to verify a user //this needs to verify to the normal user db in case of a password change between temp user and real user