Menu
▾
▴
[osbb-commits Mailing List] osbb SQLChangeLog,1.5,1.6 login.php,1.3,1.4
|
From: Sven <bra...@us...> - 2005-01-09 14:23:10
|
Update of /cvsroot/osbb/osbb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16053 Modified Files: SQLChangeLog login.php Log Message: made the login working again with the new template system Index: login.php =================================================================== RCS file: /cvsroot/osbb/osbb/login.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** login.php 1 Jan 2005 15:53:17 -0000 1.3 --- login.php 9 Jan 2005 14:23:01 -0000 1.4 *************** *** 27,30 **** --- 27,55 ---- if($userid != 0) accessError(); + $js = '<script type="text/javascript" src="js/sha1.js"></script> + <script type="text/javascript"> + <!-- + var salt = \''.sha1($sessions->salt).'\'; + function hash(){ + encrypt = document.osbb_form.encryptlogin.checked; + if(encrypt == true){ + password = hex_sha1(document.osbb_form.password.value); + sha1 = hex_sha1(password+salt); + document.osbb_form.password2.value = sha1; + document.osbb_form.password.value = \'\'; + } + } + //--> + </script>'; + + $ab = array(); + $ab[] = 'a'; + $ab[] = 'b'; + $count = 0; + + $template->assignVar('login','count',$count); + $template->assignVar('login','ab',$ab); + $template->assignVar('login','error',''); + if (isset($_POST['username']) && isset($_POST['password'])){ $username = $_POST['username']; *************** *** 36,41 **** elseif($_POST['encryptlogin'] == 1 && !comepareSHA1Password($res['userpwd'],$_POST['password2'],$sessions->salt2)) $error = $lang->lang['login_error2']; if(!empty($error)){ ! eval("echo output(\"".$template->get('login')."\");"); ! exit; } if (isset($_POST['s'])) $s = myEscape($_POST['s']); --- 61,66 ---- elseif($_POST['encryptlogin'] == 1 && !comepareSHA1Password($res['userpwd'],$_POST['password2'],$sessions->salt2)) $error = $lang->lang['login_error2']; if(!empty($error)){ ! $template->assignVar('login','error',$error); ! output('login',$lang->lang['title_login'],$js); } if (isset($_POST['s'])) $s = myEscape($_POST['s']); *************** *** 53,56 **** Header("Location: index.php?s=".$s); exit; ! }else eval("output(\"".$template->get('login')."\");"); ?> --- 78,81 ---- Header("Location: index.php?s=".$s); exit; ! }else output('login',$lang->lang['title_login'],$js); ?> Index: SQLChangeLog =================================================================== RCS file: /cvsroot/osbb/osbb/SQLChangeLog,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** SQLChangeLog 9 Jan 2005 14:00:15 -0000 1.5 --- SQLChangeLog 9 Jan 2005 14:23:00 -0000 1.6 *************** *** 49,50 **** --- 49,53 ---- DELETE FROM `osbb_templates` WHERE templatename = 'board'; INSERT INTO `osbb_templates` VALUES (6, 0, 'board', '', '<br />\r\n<if condition={checkBoardPermission(\'can_start_threads\',$vars[\'boardid\'],0) && $vars[\'board\'][\'boardtype\'] == BOARD_BOARD}>\r\n<table cellspacing="<{style.tbl_in_cellspacing}>" cellpadding="<{style.table_in_cellpadding}>" style="width: 98%;">\r\n<tr><td>\r\n <div align="right">\r\n <{button_newthread}>\r\n </div>\r\n</td></tr>\r\n</table>\r\n<endif>\r\n\r\n<if condition={$vars[\'subboardcount\'] != 0}>\r\n<table class="table_in" cellspacing="<{style.tbl_in_cellspacing}>" cellpadding="<{style.tbl_in_cellpadding}>">\r\n<tr>\r\n <td class="table_in_cat" width="50"> </td>\r\n <td class="table_in_cat" width="*"><span class="bigtext"><[index_boardname]></span></td>\r\n <td class="table_in_cat" width="50"><span class="bigtext"><[index_threads]></span></td>\r\n <td class="table_in_cat" width="50"><span class="bigtext"><[index_posts]></span></td>\r\n <td class="table_in_cat" width="300"><span class="bigtext"><[index_lastpost]></span></td>\r\n</tr>\r\n<foreach variable="boards" bit="boardbit">\r\n<if condition={$vars[\'boardbit\'][\'depth\'] == 0}>\r\n<if condition={$vars[\'boardbit\'][\'boardtype\'] == BOARD_CAT}>\r\n<tr>\r\n<td class="table_in_cat" colspan="5" style="text-align: left;">\r\n <span class="bigtext">\r\n <a href="board.php?id=<{boardbit.boardid}>&s=<{s}>"><{boardbit.boardname}></a></span>\r\n <if condition={$vars[\'boardbit\'][\'boarddesc\'] != \'\'}>\r\n <span class="normaltext"><{boardbit.boarddesc}></span> \r\n <endif>\r\n</td>\r\n</tr>\r\n<else>\r\n<tr>\r\n<td class="table_in_<exp>getVar($vars[\'count\'],0,$vars[\'ab\'])</exp>" width="*" colspan="2">\r\n <table width="100%" cellspacing="0" cellpadding="1" border="0">\r\n <tr>\r\n <td width=50">\r\n <if condition={!checkPermission(\'can_view_board\',$vars[\'boardbit\'][\'boardid\'],0)}>\r\n <img src="<{style.imagefolder}>/b_closed.png" alt="" />\r\n <elseif condition={$vars[\'boardbit\'][\'old\'] == 1}>\r\n <img src="<{style.imagefolder}>/b_old.png" alt="" />\r\n <else>\r\n <img src="<{style.imagefolder}>/b_new.png" alt="" />\r\n <endif>\r\n </td>\r\n <td width="*" style="text-align: left;">\r\n <span class="bigtext">\r\n <a href="board.php?id=<{boardbit.boardid}>&s=<{s}>"><{boardbit.boardname}></a>\r\n </span>\r\n <if condition={$vars[\'boardbit\'][\'boarddesc\'] != \'\'}>\r\n <span class="normaltext">\r\n <br /><{boardbit.boarddesc}>\r\n <if condition={$vars[\'boardbit\'][\'subboards\'] != \'\'}>\r\n <{boardbit.subboards}>\r\n <endif>\r\n </span>\r\n <endif>\r\n </td></tr></table>\r\n</td>\r\n<td class="table_in_<exp>getVar($vars[\'count\'],0,$vars[\'ab\'])</exp>" width="50">\r\n <span class="normaltext">\r\n <{boardbit.boardthreads}>\r\n </span>\r\n</td>\r\n<td class="table_in_<exp>getVar($vars[\'count\'],0,$vars[\'ab\'])</exp>" width="50">\r\n <span class="normaltext">\r\n <{boardbit.boardposts}>\r\n </span>\r\n</td>\r\n<td class="table_in_<exp>getVar($vars[\'count\'],1,$vars[\'ab\'])</exp>" width="300">\r\n <span class="normaltext">\r\n <if condition={checkPermission(\'can_view_board\',$vars[\'boardbit\'][\'boardid\'],0)}>\r\n <if condition={$vars[\'boardbit\'][\'boardlastpostid\'] == 0}>\r\n <[board_nolastpost]>\r\n <else>\r\n <a href="thread.php?id=<{boardbit.threadid}>&s=<{s}>&lastpost=1#post_<{boardbit.postid}>">\r\n <b><{boardbit.threadtopic}></b>\r\n </a><br />\r\n <exp>formatDate($vars[\'boardbit\'][\'posttime\'])</exp> <[board_thread_from]>\r\n <a href="etc.php?action=userinfo&id=<{boardbit.boardlastposterid}>&s=<{s}>">\r\n <b><{boardbit.boardlastpostername}></b>\r\n </a>\r\n <endif>\r\n <else>\r\n <b><[index_board_lastpost_noaccess]></b> \r\n <endif>\r\n </span>\r\n</td>\r\n</tr>\r\n<endif>\r\n<elseif condition={$vars[\'boardbit\'][\'depth\'] == 1}>\r\n<if condition={$vars[\'boardbit\'][\'boardtype\'] == BOARD_CAT}>\r\n<tr>\r\n<td class="table_in_cat" width="50"> </td>\r\n<td class="table_in_cat" colspan="4" style="text-align: left;">\r\n <span class="bigtext">\r\n <a href="board.php?id=<{boardbit.boardid}>&s=<{s}>"><{boardbit.boardname}></a></span>\r\n <if condition={$vars[\'boardbit\'][\'boarddesc\'] != \'\'}>\r\n <span class="normaltext"><{boardbit.boarddesc}></span> \r\n <endif>\r\n</td>\r\n</tr>\r\n<else>\r\n<tr>\r\n<td class="table_in_<exp>getVar($vars[\'count\'],0,$vars[\'ab\'])</exp>" width="50">\r\n <if condition={!checkPermission(\'can_view_board\',$vars[\'boardbit\'][\'boardid\'],0)}>\r\n <img src="<{style.imagefolder}>/b_closed.png" alt="" />\r\n <elseif condition={$vars[\'boardbit\'][\'old\'] == 1}>\r\n <img src="<{style.imagefolder}>/b_old.png" alt="" />\r\n <else>\r\n <img src="<{style.imagefolder}>/b_new.png" alt="" />\r\n <endif>\r\n</td>\r\n<td class="table_in_<exp>getVar($vars[\'count\'],0,$vars[\'ab\'])</exp>" width="*" style="text-align: left;">\r\n <span class="bigtext">\r\n <a href="board.php?id=<{boardbit.boardid}>&s=<{s}>"><{boardbit.boardname}></a>\r\n </span>\r\n <if condition={$vars[\'boardbit\'][\'boarddesc\'] != \'\'}>\r\n <span class="normaltext">\r\n <br /><{boardbit.boarddesc}>\r\n <if condition={$vars[\'boardbit\'][\'subboards\'] != \'\'}>\r\n <{boardbit.subboards}>\r\n <endif>\r\n </span>\r\n <endif>\r\n</td>\r\n<td class="table_in_<exp>getVar($vars[\'count\'],0,$vars[\'ab\'])</exp>" width="50">\r\n <span class="normaltext">\r\n <{boardbit.boardthreads}>\r\n </span>\r\n</td>\r\n<td class="table_in_<exp>getVar($vars[\'count\'],0,$vars[\'ab\'])</exp>" width="50">\r\n <span class="normaltext">\r\n <{boardbit.boardposts}>\r\n </span>\r\n</td>\r\n<td class="table_in_<exp>getVar($vars[\'count\'],1,$vars[\'ab\'])</exp>" width="300">\r\n <span class="normaltext">\r\n <if condition={checkPermission(\'can_view_board\',$vars[\'boardbit\'][\'boardid\'],0)}>\r\n <if condition={$vars[\'boardbit\'][\'boardlastpostid\'] == 0}>\r\n <[board_nolastpost]>\r\n <else>\r\n <a href="thread.php?id=<{boardbit.threadid}>&s=<{s}>&lastpost=1#post_<{boardbit.postid}>">\r\n <b><{boardbit.threadtopic}></b>\r\n </a><br />\r\n <exp>formatDate($vars[\'boardbit\'][\'posttime\'])</exp> <[board_thread_from]>\r\n <a href="etc.php?action=userinfo&id=<{boardbit.boardlastposterid}>&s=<{s}>">\r\n <b><{boardbit.boardlastpostername}></b>\r\n </a>\r\n <endif>\r\n <else>\r\n <b><[index_board_lastpost_noaccess]></b> \r\n <endif>\r\n </span>\r\n</td>\r\n</tr>\r\n<endif>\r\n<endif>\r\n<endforeach>\r\n</table><br />\r\n<elseif condition={$vars[\'board\'][\'boardtype\'] == BOARD_CAT}>\r\n<table class="table_in" cellspacing="<{style.tbl_in_cellspacing}>" cellpadding="<{style.tbl_in_cellpadding}>">\r\n<tr>\r\n <td class="table_in_a">\r\n <span class="bigtext">\r\n <b><[board_nosubboards]></b>\r\n </span>\r\n </td>\r\n</tr>\r\n</table><br />\r\n<endif>\r\n\r\n<if condition={$vars[\'threadcount\'] != 0}>\r\n<table class="table_in" cellspacing="<{style.tbl_in_cellspacing}>" cellpadding="<{style.tbl_in_cellpadding}>">\r\n<tr>\r\n <td class ="table_in_cat" width="30"> </td>\r\n <td class ="table_in_cat" width="16"> </td>\r\n <td class ="table_in_cat" width="*">\r\n <span class="bigtext">\r\n <[board_threads]>\r\n </span>\r\n </td>\r\n <td class ="table_in_cat" width="150">\r\n <span class="bigtext">\r\n <[thread_author]>\r\n </span>\r\n </td>\r\n <td class ="table_in_cat" width="50">\r\n <span class="bigtext">\r\n <[board_replies]>\r\n </span>\r\n </td>\r\n <td class ="table_in_cat" width="50">\r\n <span class="bigtext">\r\n <[board_hits]>\r\n </span>\r\n </td>\r\n <td class ="table_in_cat" width="250">\r\n <span class="bigtext">\r\n <[board_lastpost]>\r\n </span>\r\n </td>\r\n</tr>\r\n\r\n<foreach variable="threads" bit="threadbit">\r\n<if condition={$vars[\'threadbit\'][\'threaddeleted\'] == 1 && !checkBoardPermission(\'can_view_deleted_threads\',$vars[\'boardid\'],0)}>\r\n<tr>\r\n <td class="table_in_<exp>getVar($vars[\'count\'],1,$vars[\'ab\'])</exp>" colspan="7">\r\n <span class="bigtext">\r\n <{threadbit.threadtopic}>\r\n </span><br />\r\n <span class="normaltext">\r\n <{threadbit.deleted_info}> <{threadbit.threaddeletedreason}>\r\n </span>\r\n </td>\r\n</tr>\r\n<else>\r\n<tr>\r\n <td class ="table_in_<exp>getVar($vars[\'count\'],0,$vars[\'ab\'])</exp>" width="30">\r\n <img src="<{style.imagefolder}>/<exp>makeThreadImage($vars[\'threadbit\'][\'old\'],$vars[\'threadbit\'])</exp>" alt=" " />\r\n </td>\r\n <td class ="table_in_<exp>getVar($vars[\'count\'],0,$vars[\'ab\'])</exp>" width="16">\r\n <exp>makeIcon($vars[\'threadbit\'][\'threadiconid\'],$vars[\'threadbit\'])</exp>\r\n </td>\r\n <td class ="table_in_<exp>getVar($vars[\'count\'],0,$vars[\'ab\'])</exp>" width="*" style="text-align: left;">\r\n <span class="bigtext">\r\n <if condition={$vars[\'threadbit\'][\'threadimportant\'] == THREAD_IMPORTANT}>\r\n <[thread_important]>\r\n <elseif condition={$vars[\'threadbit\'][\'threadimportant\'] == THREAD_ANNOUNCEMENT}>\r\n <[thread_annoucnement]>\r\n <endif>\r\n <a href="thread.php?id=<{threadbit.threadid}>&s=<{s}>"><{threadbit.threadtopic}></a>\r\n </span>\r\n <if condition={$vars[\'threadbit\'][\'threaddesc\'] != \'\'}>\r\n <span class="normaltext"><br />\r\n <exp>killHTML($vars[\'threadbit\'][\'threaddesc\'])</exp>\r\n </span>\r\n <endif>\r\n </td>\r\n <td class ="table_in_<exp>getVar($vars[\'count\'],0,$vars[\'ab\'])</exp>" width="150">\r\n <span class="bigtext">\r\n <a href="etc.php?do=userinfo&id=<{threadbit.threadauthorid}>&s=<{s}>"><{threadbit.threadauthorname}></a>\r\n </span>\r\n </td>\r\n <td class ="table_in_<exp>getVar($vars[\'count\'],0,$vars[\'ab\'])</exp>" width="50">\r\n <span class="bigtext">\r\n <{threadbit.threadreplies}>\r\n </span>\r\n </td>\r\n <td class ="table_in_<exp>getVar($vars[\'count\'],0,$vars[\'ab\'])</exp>" width="50">\r\n <span class="bigtext">\r\n <{threadbit.threadhits}>\r\n </span>\r\n </td>\r\n <td class ="table_in_<exp>getVar($vars[\'count\'],1,$vars[\'ab\'])</exp>" width="250">\r\n <span class="normaltext">\r\n <[board_thread_at]> <b><exp>formatDate($vars[\'threadbit\'][\'posttime\'])</exp></b><br />\r\n <[board_thread_from]> <a href="etc.php?do=userinfo&id=<{threadbit.postauthorid}>&s=<{s}>"><b><{threadbit.postauthorname}></b></a>\r\n </span>\r\n </td>\r\n</tr>\r\n<endif>\r\n<endforeach>\r\n</table><br />\r\n<elseif condition={$vars[\'board\'][\'boardtype\'] == BOARD_BOARD && $vars[\'threadcount\'] == 0}>\r\n<table class="table_in" cellspacing="<{style.tbl_in_cellspacing}>" cellpadding="<{style.tbl_in_cellpadding}>">\r\n<tr>\r\n <td class="table_in_a">\r\n <span class="bigtext">\r\n <b><[board_nothreads]></b>\r\n </span>\r\n </td>\r\n</tr>\r\n</table><br />\r\n<endif>\r\n<table class="table_in" cellspacing="<{style.tbl_in_cellspacing}>" cellpadding="<{style.tbl_in_cellpadding}>">\r\n<tr>\r\n <td class="table_in_a">\r\n <{pagelink}>\r\n </td>\r\n</tr>\r\n</table>', 'board_wrongid,button_addthread,board_nolastpost,index_boardname,index_threads,index_posts,index_lastpost,index_subboards_closed,index_board_lastpost_noaccess,board_nolastpost,board_thread_from,board_nosubboards,board_threads,board_posts,board_threads,board_lastpost,thread_closed_noreason,thread_deleted_info,thread_important,thread_announcement,thread_author,board_hits,board_replies,board_nothreads,board_thread_at,board_thread_from,button_addthread', 0); + + #09/01/2005 (DD/MM/YYYY) - made the login working again with the new template system + INSERT INTO `osbb_templates` VALUES (9, 0, 'login', '', '<form action="login.php" method="POST" name ="osbb_form" onsubmit="return hash();">\r\n<input type="hidden" name="password2" value="" />\r\n<input type="hidden" name="s" value="<{s}>" />\r\n<table class="table_in" cellspacing="<{style.tbl_in_cellspacing}>" cellpadding="<{style.tbl_in_cellpadding}>">\r\n<tr>\r\n <td colspan="2" class="table_in_cat" style="text-align: center;">\r\n <span class="bigtext">\r\n <[title_login]>\r\n </span>\r\n </td>\r\n</tr>\r\n<if condition={$vars[\'error\'] != \'\'}>\r\n<tr>\r\n <td colspan="2" class="table_in_<exp>getVar($vars[\'count\'],1,$vars[\'ab\'])</exp>" style="text-align: center;">\r\n <span class="errortext">\r\n <{error}>\r\n </span>\r\n </td>\r\n</tr>\r\n<endif>\r\n<tr>\r\n <td class="table_in_<exp>getVar($vars[\'count\'],0,$vars[\'ab\'])</exp>" style="text-align: left; width: 50%">\r\n <span class="bigtext">\r\n <[login_user]>\r\n </span>\r\n </td>\r\n <td class="table_in_<exp>getVar($vars[\'count\'],1,$vars[\'ab\'])</exp>" style="text-align: left; width: 50%">\r\n <span class="normaltext">\r\n <input type="text" name="username" />\r\n </span>\r\n </td>\r\n</tr>\r\n<tr>\r\n <td class="table_in_<exp>getVar($vars[\'count\'],0,$vars[\'ab\'])</exp>" style="text-align: left; width: 50%">\r\n <span class="bigtext">\r\n <[login_password]>\r\n </span>\r\n </td>\r\n <td class="table_in_<exp>getVar($vars[\'count\'],1,$vars[\'ab\'])</exp>" style="text-align: left; width: 50%">\r\n <span class="bigtext">\r\n <input type="password" name="password" />\r\n </span>\r\n </td>\r\n</tr>\r\n<tr>\r\n <td class="table_in_<exp>getVar($vars[\'count\'],0,$vars[\'ab\'])</exp>" style="text-align: left; width: 50%">\r\n <span class="bigtext">\r\n <[login_encrypt]>\r\n </span>\r\n </td>\r\n <td class="table_in_<exp>getVar($vars[\'count\'],1,$vars[\'ab\'])</exp>" style="text-align: left; width: 50%">\r\n <span class="bigtext">\r\n <input type="checkbox" name="encryptlogin" value="1" checked="checked" />\r\n </span>\r\n </td>\r\n</tr>\r\n<tr>\r\n <td colspan="2" class="table_in_cat" style="text-align: center;">\r\n <span class="bigtext">\r\n <input type="submit" value="<[title_login]>" />\r\n </span>\r\n </td>\r\n</tr>\r\n</table>\r\n</form>', 'title_login,login_user,login_password,login_encrypt,login_error1,login_error2', 0); |
