Menu
▾
▴
phpbb-checkins — If you subscribed to this list, please update: code.phpbb.com
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(193) |
Nov
(393) |
Dec
(347) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(401) |
Feb
(232) |
Mar
(343) |
Apr
(129) |
May
(129) |
Jun
(116) |
Jul
(189) |
Aug
(129) |
Sep
(68) |
Oct
(172) |
Nov
(298) |
Dec
(148) |
| 2003 |
Jan
(264) |
Feb
(210) |
Mar
(322) |
Apr
(309) |
May
(234) |
Jun
(188) |
Jul
(215) |
Aug
(161) |
Sep
(234) |
Oct
(163) |
Nov
(110) |
Dec
(7) |
| 2004 |
Jan
(95) |
Feb
(107) |
Mar
(55) |
Apr
(3) |
May
(49) |
Jun
(35) |
Jul
(57) |
Aug
(43) |
Sep
(56) |
Oct
(40) |
Nov
(25) |
Dec
(21) |
| 2005 |
Jan
(93) |
Feb
(25) |
Mar
(22) |
Apr
(72) |
May
(45) |
Jun
(24) |
Jul
(29) |
Aug
(20) |
Sep
(50) |
Oct
(93) |
Nov
(69) |
Dec
(183) |
| 2006 |
Jan
(185) |
Feb
(143) |
Mar
(402) |
Apr
(260) |
May
(322) |
Jun
(367) |
Jul
(234) |
Aug
(299) |
Sep
(206) |
Oct
(288) |
Nov
(338) |
Dec
(307) |
| 2007 |
Jan
(296) |
Feb
(250) |
Mar
(261) |
Apr
(434) |
May
(539) |
Jun
(274) |
Jul
(440) |
Aug
(190) |
Sep
(128) |
Oct
(249) |
Nov
(86) |
Dec
(51) |
| 2008 |
Jan
(177) |
Feb
(67) |
Mar
(61) |
Apr
(48) |
May
(56) |
Jun
(97) |
Jul
(60) |
Aug
(64) |
Sep
(151) |
Oct
(79) |
Nov
(109) |
Dec
(123) |
| 2009 |
Jan
(70) |
Feb
(70) |
Mar
(73) |
Apr
(80) |
May
(22) |
Jun
(193) |
Jul
(191) |
Aug
(181) |
Sep
(120) |
Oct
(48) |
Nov
(24) |
Dec
|
|
From: Jonathan H. <the...@us...> - 2001-11-06 16:54:18
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english In directory usw-pr-cvs1:/tmp/cvs-serv26369/language/lang_english Modified Files: lang_main.php Log Message: Update to "merge" upgrade with Install... (Not fully tested since current upgrade not in CVS) Index: lang_main.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -r1.23 -r1.24 *** lang_main.php 2001/11/04 12:55:22 1.23 --- lang_main.php 2001/11/06 16:54:15 1.24 *************** *** 1092,1095 **** --- 1092,1098 ---- $lang['Transfer_config'] = "Start Transfer"; $lang['ftp_info'] = "Enter Your FTP Information"; + $lang['Install'] = "Install"; + $lang['Upgrade'] = "Upgrade"; + $lang['Install_Method'] = 'Choose your installation method'; // |
|
From: Paul S. O. <ps...@us...> - 2001-11-06 09:13:39
|
Update of /cvsroot/phpbb/phpBB In directory usw-pr-cvs1:/tmp/cvs-serv19435 Modified Files: config.php Log Message: 1.4.4 Index: config.php =================================================================== RCS file: /cvsroot/phpbb/phpBB/config.php,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -r1.69 -r1.70 *** config.php 2001/11/05 21:55:21 1.69 --- config.php 2001/11/06 01:55:09 1.70 *************** *** 113,115 **** /* -- Other Settings -- */ ! $phpbbversion = "1.4.3"; --- 113,115 ---- /* -- Other Settings -- */ ! $phpbbversion = "1.4.4"; |
|
From: Paul S. O. <ps...@us...> - 2001-11-06 09:12:46
|
Update of /cvsroot/phpbb/phpBB In directory usw-pr-cvs1:/tmp/cvs-serv17611 Modified Files: fix.php Log Message: Updated fix.php from Ashe Index: fix.php =================================================================== RCS file: /cvsroot/phpbb/phpBB/fix.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** fix.php 2001/08/11 14:17:56 1.1 --- fix.php 2001/11/06 01:47:30 1.2 *************** *** 2,10 **** /***** * ! * fix.php v1.1 ! * 10/09/01 * * ~Ashe * * Go to http://phpbbfix.fr.st to check for newer versions! * --- 2,12 ---- /***** * ! * fix.php v1.38 ! * 05/11/01 * * ~Ashe * + * This file is public domain. + * * Go to http://phpbbfix.fr.st to check for newer versions! * *************** *** 12,21 **** * History: * -------- ! * 1.1 More efficient SQL-check algorithm ! * 1.02 Changed $user_id var-reset to SQL-check because it was messing up with Profile, doh! ! Added SQL-check to $email because of phpBB 1.2.1 ! * 1.01 Fixed a mySQL trick for 1.2.1 (get_userdata). ! * Fixed an eventual trick (any version) with get_userdata_from_id. ! * 1.0 Initial release * *****/ --- 14,36 ---- * History: * -------- ! * 05/11/01 1.38 Mmh... not much... ;) ! * 03/11/01 1.37 SQL-check has been (very) slightly improved. I don't even know if it was a valid way to spoof data on phpBB. ! * 16/10/01 1.36 Bah, let's correct these stupid typos in 1.4.2 :) ! * 29/09/01 1.34 Small modifications to preserve compatibility with older versions of PHP3. ! * 08/09/01 1.32 Doh, now I do remember why I usually prefix reset() with an @ ! * Slightly improved SQL-check (will have less chances to detect a forged query in error) ! * [thanks to Nikki @ phpBB forums for finding this one :) ] ! * 04/09/01 1.3 New SQL-check. It fixes two yet-undiscovered exploits (believe it or not... heh) and ensure maximum security. ! * I dare anyone to defeat it ;) ! * 20/08/01 1.2 Fixed a misfunction with search.php ! * Corrected a bad misfunction of SQL-check on specific configurations. ! * [thanks to mmj for spending time on this and pointing it out] ! * 13/08/01 1.11 Now resets variables instead of setting them to null. ! * 10/08/01 1.1 More efficient SQL-check algorithm ! * 09/08/01 1.02 Changed $user_id var-reset to SQL-check because it was messing up with Profile, doh! ! * Added $email to SQL-check because of phpBB 1.2.1 ! * 09/08/01 1.01 Fixed a mySQL trick for 1.2.1 (get_userdata). ! * Fixed an eventual trick (any version) with get_userdata_from_id. ! * 09/08/01 1.0 Initial release * *****/ *************** *** 24,31 **** * var-reset ***/ ! $fix_vars = array('userdata', 'user_logged_in', 'user_lang', 'logged_in', 'l_statsblock', 'l_pwdmessage', 'l_privnotify'); ! for ($n = 0; $n < sizeof($fix_vars); $n++) { ! $$fix_vars[$n] = ''; } --- 39,49 ---- * var-reset ***/ ! $fix_vars = array('userdata', 'user_logged_in', 'user_lang', 'logged_in', 'l_statsblock', 'l_pwdmessage', 'l_privnotify', 'new_name'); ! for ($n = 0; $n < sizeof($fix_vars); ++$n) { ! unset($GLOBALS[$fix_vars[$n]]); ! unset($HTTP_GET_VARS[$fix_vars[$n]]); ! unset($HTTP_POST_VARS[$fix_vars[$n]]); ! unset($HTTP_COOKIE_VARS[$fix_vars[$n]]); } *************** *** 34,40 **** ***/ $fix_vars = array('submit', 'save'); ! for ($n = 0; $n < sizeof($fix_vars); $n++) { ! $$fix_vars[$n] = (isset($HTTP_POST_VARS[$fix_vars[$n]])) ? 1 : 0; } --- 52,63 ---- ***/ $fix_vars = array('submit', 'save'); ! for ($n = 0; $n < sizeof($fix_vars); ++$n) { ! if (!isset ($HTTP_POST_VARS[$fix_vars[$n]]) && !stristr($REQUEST_URI, "search.$phpEx")) ! { ! unset($GLOBALS[$fix_vars[$n]]); ! unset($HTTP_GET_VARS[$fix_vars[$n]]); ! unset($HTTP_COOKIE_VARS[$fix_vars[$n]]); ! } } *************** *** 42,59 **** * SQL-check ***/ ! $fix_vars = array('user_name', 'email', 'viewemail', 'themes', 'sig', 'smile', 'dishtml', 'disbbcode', 'lang', 'username', 'user_id'); ! for ($n = 0; $n < sizeof($fix_vars); $n++) { ! if (isset($$fix_vars[$n])) { ! while (preg_match("/(.*)\\'(.*)\\,(.*)=/i", $$fix_vars[$n], $matches)) ! { ! $$fix_vars[$n] = $matches[1]; ! } ! while (preg_match("/(.*)\\'(.*)WHERE/i", $$fix_vars[$n], $matches)) { ! $$fix_vars[$n] = $matches[1]; } } } ?> --- 65,96 ---- * SQL-check ***/ ! $fix_vars = array('HTTP_GET_VARS', 'HTTP_POST_VARS', 'HTTP_COOKIE_VARS'); ! for ($n = 0; $n < sizeof($fix_vars); ++$n) { ! if (is_array($GLOBALS[$fix_vars[$n]])) { ! while (list($k, $v) = each($GLOBALS[$fix_vars[$n]])) { ! if (($k != 'message') && ($k != 'subject') && ($k != 'username') && ($k != 'sig')) ! { ! while (preg_match("/(.*)'( *)((NOT)?( *))(((!|<|=|>)+)|IS( *)NOT( *)NULL|IN( *)\(|LIKE|BETWEEN(.*)AND|OR|((\|)+)|,(.*)=)(.*)['|\"]/i", $v, $matches)) ! { ! $v = $matches[1]; ! } ! $GLOBALS[$fix_vars[$n]][$k] = $v; ! $GLOBALS[$k] = $v; ! } } + @reset($GLOBALS[$fix_vars[$n]]); } } + + /*** + * Bah, let's correct these stupid typos :] + ***/ + $fviewemail = $viewemail; + $tsig = $sig; + $user_id = $HTTP_COOKIE_VARS['user_id'] = $HTTP_GET_VARS['user_id'] = $HTTP_POST_VARS['user_id'] = intval($user_id); + $post_id = $HTTP_COOKIE_VARS['post_id'] = $HTTP_GET_VARS['post_id'] = $HTTP_POST_VARS['post_id'] = intval($post_id); + $topic_id = $HTTP_COOKIE_VARS['topic_id'] = $HTTP_GET_VARS['topic_id'] = $HTTP_POST_VARS['topic_id'] = intval($topic_id); ?> |
|
From: Doug K. <dou...@us...> - 2001-11-05 21:55:24
|
Update of /cvsroot/phpbb/phpBB In directory usw-pr-cvs1:/tmp/cvs-serv20936 Modified Files: config.php topicadmin.php Log Message: Index: config.php =================================================================== RCS file: /cvsroot/phpbb/phpBB/config.php,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -r1.68 -r1.69 *** config.php 2001/06/16 06:05:50 1.68 --- config.php 2001/11/05 21:55:21 1.69 *************** *** 1,115 **** ! <?php ! /*************************************************************************** ! config.php - description ! ------------------- ! begin : Sat June 17 2000 ! copyright : (C) 2001 The phpBB Group ! email : su...@ph... ! ! $Id$ ! ! ***************************************************************************/ ! ! /*************************************************************************** ! * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. ! * ! ***************************************************************************/ ! // This is the only setting you should need to change in this file. ! // You should set this to the web path to your phpBB installation. ! // For example, if you have phpBB installed in: ! // http://www.mysite.com/phpBB ! // Leave this setting EXACTLY how it is, you're done. ! // If you have phpBB installed in: ! // http://www.mysite.com/forums ! // Change this to: ! // $url_phpbb = "/forums"; ! // Once this is set you should not need to modify anything else in this file. ! $url_phpbb = "/phpBB"; ! ! // -- Edit the following ONLY if you cannot login and $url_phpbb is set correclty -- ! // You shouldn't have to change any of these 5. ! $url_admin = "$url_phpbb/admin"; ! $url_images = "$url_phpbb/images"; ! $url_smiles = "$url_images/smiles"; ! $url_phpbb_index = $url_phpbb . '/index.' . $phpEx; ! $url_admin_index = $url_admin . '/index.' . $phpEx; ! ! /* -- Cookie settings (lastvisit, userid) -- */ ! // Most likely you can leave this be, however if you have problems ! // logging into the forum set this to your domain name, without ! // the http:// ! // For example, if your forum is at http://www.mysite.com/phpBB then ! // set this value to ! // $cookiedomain = "www.mysite.com"; ! $cookiedomain = ""; ! // It should be safe to leave this alone as well. But if you do change it ! // make sure you don't set it to a variable already in use such as 'forum'. ! $cookiename = "phpBB"; ! // It should be safe to leave these alone as well. ! $cookiepath = $url_phpbb; ! $cookiesecure = false; ! ! /* -- Cookie settings (sessions) -- */ ! // This is the cookie name for the sessions cookie, you shouldn't have to change it ! $sesscookiename = "phpBBsession"; ! // This is the number of seconds that a session lasts for, 3600 == 1 hour. ! // The session will exprire if the user dosan't view a page on the forum within ! // this amount of time. ! $sesscookietime = 3600; ! ! /** ! * This setting is only for people running Microsoft IIS. ! * If you're running IIS and your users cannot login using ! * the "login" link on the main page, but they CAN login ! * through other pages like preferences, then you should ! * change this setting to 1. Otherwise, leave at set ! * to 0, because this is an ugly hack around some IIS junk. ! */ ! // Change to "define('USE_IIS_LOGIN_HACK', 1);" if you need to. ! define('USE_IIS_LOGIN_HACK', 0); ! ! /* Stuff for priv msgs - not in DB yet: */ ! // Allow BBCode in private messages? ! $allow_pmsg_bbcode = 1; ! // Allow HTML in private message? ! $allow_pmsg_html = 0; ! ! /* -- You shouldn't have to change anything after this point */ ! /* -- Cosmetic Settings -- */ ! $FontColor = "#FFFFFF"; ! $textcolorMessage = "#FFFFFF"; // Message Font Text Color ! $FontSizeMessage = "1"; // Message Font Text Size ! $FontFaceMessage = "Arial"; // Message Font Text Face ! ! /* -- Images -- */ ! $reply_wquote_image = "$url_images/quote.gif"; ! ! $folder_image = "$url_images/folder.gif"; ! $hot_folder_image = "$url_images/hot_folder.gif"; ! $newposts_image = "$url_images/red_folder.gif"; ! $hot_newposts_image = "$url_images/hot_red_folder.gif"; ! ! $posticon = "$url_images/posticon.gif"; ! $edit_image = "$url_images/edit.gif"; ! $profile_image = "$url_images/profile.gif"; ! $email_image = "$url_images/email.gif"; ! ! $locked_image = "$url_images/lock.gif"; ! $locktopic_image = "$url_images/lock_topic.gif"; ! $deltopic_image = "$url_images/del_topic.gif"; ! $movetopic_image = "$url_images/move_topic.gif"; ! $unlocktopic_image = "$url_images/unlock_topic.gif"; ! $ip_image = "$url_images/ip_logged.gif"; ! ! $www_image = "$url_images/www_icon.gif"; ! $icq_add_image = "$url_images/icq_add.gif"; ! $images_aim = "$url_images/aim.gif"; ! $images_yim = "$url_images/yim.gif"; ! $images_msnm = "$url_images/msnm.gif"; ! ! /* -- Other Settings -- */ ! $phpbbversion = "1.4.1"; --- 1,115 ---- ! <?php ! /*************************************************************************** ! config.php - description ! ------------------- ! begin : Sat June 17 2000 ! copyright : (C) 2001 The phpBB Group ! email : su...@ph... ! ! $Id$ ! ! ***************************************************************************/ ! ! /*************************************************************************** ! * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. ! * ! ***************************************************************************/ ! // This is the only setting you should need to change in this file. ! // You should set this to the web path to your phpBB installation. ! // For example, if you have phpBB installed in: ! // http://www.mysite.com/phpBB ! // Leave this setting EXACTLY how it is, you're done. ! // If you have phpBB installed in: ! // http://www.mysite.com/forums ! // Change this to: ! // $url_phpbb = "/forums"; ! // Once this is set you should not need to modify anything else in this file. ! $url_phpbb = "/phpBB"; ! ! // -- Edit the following ONLY if you cannot login and $url_phpbb is set correclty -- ! // You shouldn't have to change any of these 5. ! $url_admin = "$url_phpbb/admin"; ! $url_images = "$url_phpbb/images"; ! $url_smiles = "$url_images/smiles"; ! $url_phpbb_index = $url_phpbb . '/index.' . $phpEx; ! $url_admin_index = $url_admin . '/index.' . $phpEx; ! ! /* -- Cookie settings (lastvisit, userid) -- */ ! // Most likely you can leave this be, however if you have problems ! // logging into the forum set this to your domain name, without ! // the http:// ! // For example, if your forum is at http://www.mysite.com/phpBB then ! // set this value to ! // $cookiedomain = "www.mysite.com"; ! $cookiedomain = ""; ! // It should be safe to leave this alone as well. But if you do change it ! // make sure you don't set it to a variable already in use such as 'forum'. ! $cookiename = "phpBB"; ! // It should be safe to leave these alone as well. ! $cookiepath = $url_phpbb; ! $cookiesecure = false; ! ! /* -- Cookie settings (sessions) -- */ ! // This is the cookie name for the sessions cookie, you shouldn't have to change it ! $sesscookiename = "phpBBsession"; ! // This is the number of seconds that a session lasts for, 3600 == 1 hour. ! // The session will exprire if the user dosan't view a page on the forum within ! // this amount of time. ! $sesscookietime = 3600; ! ! /** ! * This setting is only for people running Microsoft IIS. ! * If you're running IIS and your users cannot login using ! * the "login" link on the main page, but they CAN login ! * through other pages like preferences, then you should ! * change this setting to 1. Otherwise, leave at set ! * to 0, because this is an ugly hack around some IIS junk. ! */ ! // Change to "define('USE_IIS_LOGIN_HACK', 1);" if you need to. ! define('USE_IIS_LOGIN_HACK', 0); ! ! /* Stuff for priv msgs - not in DB yet: */ ! // Allow BBCode in private messages? ! $allow_pmsg_bbcode = 1; ! // Allow HTML in private message? ! $allow_pmsg_html = 0; ! ! /* -- You shouldn't have to change anything after this point */ ! /* -- Cosmetic Settings -- */ ! $FontColor = "#FFFFFF"; ! $textcolorMessage = "#FFFFFF"; // Message Font Text Color ! $FontSizeMessage = "1"; // Message Font Text Size ! $FontFaceMessage = "Arial"; // Message Font Text Face ! ! /* -- Images -- */ ! $reply_wquote_image = "$url_images/quote.gif"; ! ! $folder_image = "$url_images/folder.gif"; ! $hot_folder_image = "$url_images/hot_folder.gif"; ! $newposts_image = "$url_images/red_folder.gif"; ! $hot_newposts_image = "$url_images/hot_red_folder.gif"; ! ! $posticon = "$url_images/posticon.gif"; ! $edit_image = "$url_images/edit.gif"; ! $profile_image = "$url_images/profile.gif"; ! $email_image = "$url_images/email.gif"; ! ! $locked_image = "$url_images/lock.gif"; ! $locktopic_image = "$url_images/lock_topic.gif"; ! $deltopic_image = "$url_images/del_topic.gif"; ! $movetopic_image = "$url_images/move_topic.gif"; ! $unlocktopic_image = "$url_images/unlock_topic.gif"; ! $ip_image = "$url_images/ip_logged.gif"; ! ! $www_image = "$url_images/www_icon.gif"; ! $icq_add_image = "$url_images/icq_add.gif"; ! $images_aim = "$url_images/aim.gif"; ! $images_yim = "$url_images/yim.gif"; ! $images_msnm = "$url_images/msnm.gif"; ! ! /* -- Other Settings -- */ ! $phpbbversion = "1.4.3"; Index: topicadmin.php =================================================================== RCS file: /cvsroot/phpbb/phpBB/topicadmin.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -r1.21 -r1.22 *** topicadmin.php 2001/06/16 06:05:50 1.21 --- topicadmin.php 2001/11/05 21:55:21 1.22 *************** *** 1,294 **** ! <?php ! /*************************************************************************** ! topicadmin.php - description ! ------------------- ! begin : Sat June 17 2000 ! copyright : (C) 2001 The phpBB Group ! email : su...@ph... ! ! $Id$ ! ! ***************************************************************************/ ! ! /*************************************************************************** ! * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. ! * ! ***************************************************************************/ ! include('extention.inc'); ! include('functions.'.$phpEx); ! include('config.'.$phpEx); ! require('auth.'.$phpEx); ! $pagetitle = "Topic Administration"; ! $pagetype = "bbcode_ref"; ! include('page_header.'.$phpEx); ! ! if (isset($user)) ! { ! $mod_data = get_userdata($user, $db); ! } else { ! $mod_data = get_userdata($userdata[username], $db); ! } ! ! if(!is_moderator($forum, $mod_data[user_id], $db) && $mod_data[user_level] <= 2) ! error_die("You are not the moderator of this forum therefore you cannot perform this function."); ! ! if($HTTP_POST_VARS['submit'] || ($user_logged_in==1 && $mode=='viewip')) { ! if( $user_logged_in != 1 && ($mod_data[user_password] != md5($passwd)) ) ! error_die("Error - You did not enter the correct password, please go back and try again."); ! ! switch($mode) { ! case 'del': ! // Update the users's post count, this might be slow on big topics but it makes other parts of the ! // forum faster so we win out in the long run. ! $sql = "SELECT poster_id, post_id FROM posts WHERE topic_id = '$topic'"; ! if(!$r = mysql_query($sql, $db)) ! die("Error - Could not query the posts database!"); ! while($row = mysql_fetch_array($r)) { ! if($row[poster_id] != -1) { ! $sql = "UPDATE users SET user_posts = user_posts - 1 WHERE user_id = '$row[poster_id]'"; ! @mysql_query($sql, $db); ! } ! } ! ! // Get the post ID's we have to remove. ! $sql = "SELECT post_id FROM posts WHERE topic_id = '$topic'"; ! if(!$r = mysql_query($sql, $db)) ! die("Error - Could not query the posts database!"); ! while($row = mysql_fetch_array($r)) ! { ! $posts_to_remove[] = $row["post_id"]; ! } ! ! $sql = "DELETE FROM posts WHERE topic_id = '$topic'"; ! if(!$result = mysql_query($sql, $db)) ! die("Error - Could not remove posts from the database!"); ! $sql = "DELETE FROM topics WHERE topic_id = '$topic'"; ! if(!$result = mysql_query($sql, $db)) ! die("Error - Could not remove posts from the database!"); ! $sql = "DELETE FROM posts_text WHERE "; ! for($x = 0; $x < count($posts_to_remove); $x++) ! { ! if($set) ! { ! $sql .= " OR "; ! } ! $sql .= "post_id = ".$posts_to_remove[$x]; ! $set = TRUE; ! } ! ! if(!mysql_query($sql, $db)) ! { ! die("Error - Could not remove post texts!"); ! } ! sync($db, $forum, 'forum'); ! ! echo "The topic has been removed from the database. Click <a href=\"viewforum.$phpEx?forum=$forum\">here</a> to return to the forum, or <a href=\"index.$phpEx\">here</a> to return to the forum index."; ! break; ! case 'move': ! $sql = "UPDATE topics SET forum_id = '$newforum' WHERE topic_id = '$topic'"; ! if(!$r = mysql_query($sql, $db)) ! die("Error - Could not move selected topic to selected forum. Please go back and try again."); ! $sql = "UPDATE posts SET forum_id = '$newforum' WHERE topic_id = '$topic'"; ! if(!$r = mysql_query($sql, $db)) ! die("Error - Could not move selected topic to selected forum. Please go back and try again."); ! sync($db, $newforum, 'forum'); ! sync($db, $forum, 'forum'); ! ! echo "The topic has been moved. Click <a href=\"viewtopic.$phpEx?topic=$topic&forum=$newforum\">here</a> to view the updated topic. Or click <a href=\"index.$phpEx\">here</a> to return to the forum index"; ! break; ! case 'lock': ! $sql = "UPDATE topics SET topic_status = 1 WHERE topic_id = '$topic'"; ! if(!$r = mysql_query($sql, $db)) ! die("Error - Could not lock the selected topic. Please go back and try again."); ! echo "The topic has been locked. Click <a href=\"viewtopic.$phpEx?topic=$topic&forum=$forum\">here</a> to view, or <a href=\"index.$phpEx\">here</a> to return to the forum index."; ! break; ! case 'unlock': ! $sql = "UPDATE topics SET topic_status = '0' WHERE topic_id = '$topic'"; ! if(!$r = mysql_query($sql, $db)) ! die("Error - Could not unlock the selected topic. Please go back and try again."); ! echo "The topic has been unlocked. Click <a href=\"viewtopic.$phpEx?topic=$topic&forum=$forum\">here</a> to view, or <a href=\"index.$phpEx\">here</a> to return to the forum index."; ! break; ! case 'viewip': ! $sql = "SELECT u.username, p.poster_ip FROM users u, posts p WHERE p.post_id = '$post' AND u.user_id = p.poster_id"; ! if(!$r = mysql_query($sql, $db)) ! die("Error - Could not query the database. <BR>Error: mysql_error()"); ! if(!$m = mysql_fetch_array($r)) ! die("Error - No such user or post in the database."); ! $poster_host = gethostbyaddr($m[poster_ip]); ! ?> ! <TABLE BORDER="0" CELLPADDING="1" CELLSPACEING="0" ALIGN="CENTER" VALIGN="TOP" WIDTH="95%"><TR><TD BGCOLOR="<?php echo $table_bgcolor?>"> ! <TABLE BORDER="0" CELLPADDING="1" CELLSPACEING="1" WIDTH="100%"> ! <TR BGCOLOR="<?php echo $color1?>" ALIGN="LEFT"> ! <TD COLSPAN="2" ALIGN="CENTER">Users IP and Account information</TD> ! </TR> ! <TR BGCOLOR="<?php echo $color2?>" ALIGN="LEFT"> ! <TD>User IP:</TD> ! <TD><?php echo $m[poster_ip] . " ( $poster_host )"?></TD> ! </TR> ! <TR BGCOLOR="<?php echo $color1?>" ALIGN="LEFT"> ! <TD COLSPAN="2" ALIGN="CENTER">Usernames of users that posted from this IP + post counts</TD> ! </TR> ! <?php ! $sql = "SELECT user_id, username, count(*) as postcount FROM posts p, users u WHERE poster_ip='".$m[poster_ip]."' && p.poster_id = u.user_id GROUP BY user_id"; ! if(!$r = mysql_query($sql, $db)) ! { ! echo "<TR><TD COLSPAN=\"2\">Error - Could not query the database. <BR>Error: mysql_error()</TD></TR></TABLE>"; ! exit(); ! } ! ! while ($row = mysql_fetch_array($r)){ ! print "<TR BGCOLOR=\"$color2\" ALIGN=\"LEFT\">\n"; ! print " <TD><A HREF=\"bb_profile.php?mode=view&user=".$row[user_id]."\">".$row[username]."</A></TD>\n"; ! print " <TD>".$row[postcount]." posts</TD>\n"; ! print "</TR>\n"; ! } ! ?> ! ! </TABLE></TD></TR></TABLE> ! <?php ! break; ! ! } ! } ! else { // No submit ! ?> ! <FORM ACTION="<?php echo $PHP_SELF?>" METHOD="POST"> ! <TABLE BORDER="0" CELLPADDING="1" CELLSPACING="0" ALIGN="CENTER" VALIGN="TOP" WIDTH="95%"><TR><TD BGCOLOR="<?php echo $table_bgcolor?>"> ! <TABLE BORDER="0" CELLPADDING="1" CELLSPACING="1" WIDTH="100%"> ! <TR BGCOLOR="<?php echo $color1?>" ALIGN="LEFT"> ! <?php ! switch($mode) { ! case 'del': ! ?> ! <TD COLSPAN=2><B>Read This:</b>Once you press the delete button at the bottom of this form the topic you have selected, and all its related posts, will be <b>permanently</b> removed.</TD> ! <?php ! break; ! case 'move': ! ?> ! <TD COLSPAN=2><B>Read This:</b>Once you press the move button at the bottom of this form the topic you have selected, and its related posts, will be moved to the forum you have selected.</TD> ! <?php ! break; ! case 'lock': ! ?> ! <TD COLSPAN=2><B>Read This:</b>Once you press the lock button at the bottom of this form the topic you have selected will be locked. You may unlock it at a later time if you like.</TD> ! <?php ! break; ! case 'unlock': ! ?> ! <TD COLSPAN=2><B>Read This:</b>Once you press the unlock button at the bottom of this form the topic you have selected will be unlocked. You may lock it again at a later time if you like.</TD> ! <?php ! break; ! case 'viewip': ! ?> ! <TD COLSPAN=2><B>Read This:</b>View this users IP address.</TD> ! <?php ! break; ! } ! ?> ! </TR> ! <?php ! if (!$user_logged_in) ! { ! ?> ! <TR> ! <TD BGCOLOR="<?php echo $color1?>">Username:</TD> ! <TD BGCOLOR="<?php echo $color2?>"><INPUT TYPE="TEXT" NAME="user" SIZE="25" MAXLENGTH="40" VALUE="<?php echo $userdata[username]?>"></TD> ! </TR> ! <TR> ! <TD BGCOLOR="<?php echo $color1?>">Password:</TD> ! <TD BGCOLOR="<?php echo $color2?>"><INPUT TYPE="PASSWORD" NAME="passwd" SIZE="25" MAXLENGTH="25"></TD> ! </TR> ! <?php ! } ! if($mode == 'move') { ! ?> ! <TR> ! <TD BGCOLOR="<?php echo $color1?>">Move Topic To:</TD> ! <TD BGCOLOR="<?php echo $color2?>"><SELECT NAME="newforum" SIZE="0"> ! <?php ! $sql = "SELECT forum_id, forum_name FROM forums WHERE forum_id != '$forum' ORDER BY forum_id"; ! if($result = mysql_query($sql, $db)) { ! if($myrow = mysql_fetch_array($result)) { ! do { ! echo "<OPTION VALUE=\"$myrow[forum_id]\">$myrow[forum_name]</OPTION>\n"; ! } while($myrow = mysql_fetch_array($result)); ! } ! else { ! echo "<OPTION VALUE=\"-1\">No Forums in DB</OPTION>\n"; ! } ! } ! else { ! echo "<OPTION VALUE=\"-1\">Database Error</OPTION>\n"; ! } ! ?> ! </SELECT></TD> ! </TR> ! <?php ! } ! ?> ! <TR BGCOLOR="<?php echo $color1?>"> ! <TD COLSPAN="2" ALIGN="CENTER"> ! <?php ! switch($mode) { ! case 'del': ! ?> ! <INPUT TYPE="HIDDEN" NAME="mode" VALUE="del"> ! <INPUT TYPE="HIDDEN" NAME="topic" VALUE="<?php echo $topic?>"> ! <INPUT TYPE="HIDDEN" NAME="forum" VALUE="<?php echo $forum?>"> ! <INPUT TYPE="SUBMIT" NAME="submit" VALUE="Delete Topic"> ! <?php ! break; ! case 'move': ! ?> ! <INPUT TYPE="HIDDEN" NAME="mode" VALUE="move"> ! <INPUT TYPE="HIDDEN" NAME="topic" VALUE="<?php echo $topic?>"> ! <INPUT TYPE="HIDDEN" NAME="forum" VALUE="<?php echo $forum?>"> ! <INPUT TYPE="SUBMIT" NAME="submit" VALUE="Move Topic"> ! <?php ! break; ! case 'lock': ! ?> ! <INPUT TYPE="HIDDEN" NAME="mode" VALUE="lock"> ! <INPUT TYPE="HIDDEN" NAME="topic" VALUE="<?php echo $topic?>"> ! <INPUT TYPE="HIDDEN" NAME="forum" VALUE="<?php echo $forum?>"> ! <INPUT TYPE="SUBMIT" NAME="submit" VALUE="Lock Topic"> ! <?php ! break; ! case 'unlock': ! ?> ! <INPUT TYPE="HIDDEN" NAME="mode" VALUE="unlock"> ! <INPUT TYPE="HIDDEN" NAME="topic" VALUE="<?php echo $topic?>"> ! <INPUT TYPE="HIDDEN" NAME="forum" VALUE="<?php echo $forum?>"> ! <INPUT TYPE="SUBMIT" NAME="submit" VALUE="Unlock Topic"> ! <?php ! break; ! case 'viewip': ! ?> ! <INPUT TYPE="HIDDEN" NAME="mode" VALUE="viewip"> ! <INPUT TYPE="HIDDEN" NAME="post" VALUE="<?php echo $post?>"> ! <INPUT TYPE="HIDDEN" NAME="forum" VALUE="<?php echo $forum?>"> ! <INPUT TYPE="SUBMIT" NAME="submit" VALUE="View IP"> ! <?php ! break; ! } ! ?> ! </TD></TR> ! </FORM> ! </TABLE></TD></TR></TABLE></TD></TR></TABLE> ! <?php ! } ! include('page_tail.'.$phpEx); ! ?> ! ! ! ! ! ! ! ! ! --- 1,300 ---- ! <?php ! /*************************************************************************** ! topicadmin.php - description ! ------------------- ! begin : Sat June 17 2000 ! copyright : (C) 2001 The phpBB Group ! email : su...@ph... ! ! $Id$ ! ! ***************************************************************************/ ! ! /*************************************************************************** ! * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. ! * ! ***************************************************************************/ ! include('extention.inc'); ! include('functions.'.$phpEx); ! include('config.'.$phpEx); ! require('auth.'.$phpEx); ! $pagetitle = "Topic Administration"; ! $pagetype = "bbcode_ref"; ! include('page_header.'.$phpEx); ! ! if (isset($user)) ! { ! error_die("Error - You did not enter the correct password, please go back and try again."); ! } ! else if(isset($userdata[username])) ! { ! $mod_data = get_userdata($userdata[username], $db); ! } ! else ! { ! error_die("Error - You must be signed in to perform this function. Please go back and try again."); ! } ! ! if(!is_moderator($forum, $mod_data[user_id], $db) && $mod_data[user_level] <= 2) ! error_die("You are not the moderator of this forum therefore you cannot perform this function."); ! ! if($HTTP_POST_VARS['submit'] || ($user_logged_in==1 && $mode=='viewip')) { ! if( $user_logged_in != 1 && ($mod_data[user_password] != md5($passwd)) ) ! error_die("Error - You did not enter the correct password, please go back and try again."); ! ! switch($mode) { ! case 'del': ! // Update the users's post count, this might be slow on big topics but it makes other parts of the ! // forum faster so we win out in the long run. ! $sql = "SELECT poster_id, post_id FROM posts WHERE topic_id = '$topic'"; ! if(!$r = mysql_query($sql, $db)) ! die("Error - Could not query the posts database!"); ! while($row = mysql_fetch_array($r)) { ! if($row[poster_id] != -1) { ! $sql = "UPDATE users SET user_posts = user_posts - 1 WHERE user_id = '$row[poster_id]'"; ! @mysql_query($sql, $db); ! } ! } ! ! // Get the post ID's we have to remove. ! $sql = "SELECT post_id FROM posts WHERE topic_id = '$topic'"; ! if(!$r = mysql_query($sql, $db)) ! die("Error - Could not query the posts database!"); ! while($row = mysql_fetch_array($r)) ! { ! $posts_to_remove[] = $row["post_id"]; ! } ! ! $sql = "DELETE FROM posts WHERE topic_id = '$topic'"; ! if(!$result = mysql_query($sql, $db)) ! die("Error - Could not remove posts from the database!"); ! $sql = "DELETE FROM topics WHERE topic_id = '$topic'"; ! if(!$result = mysql_query($sql, $db)) ! die("Error - Could not remove posts from the database!"); ! $sql = "DELETE FROM posts_text WHERE "; ! for($x = 0; $x < count($posts_to_remove); $x++) ! { ! if($set) ! { ! $sql .= " OR "; ! } ! $sql .= "post_id = ".$posts_to_remove[$x]; ! $set = TRUE; ! } ! ! if(!mysql_query($sql, $db)) ! { ! die("Error - Could not remove post texts!"); ! } ! sync($db, $forum, 'forum'); ! ! echo "The topic has been removed from the database. Click <a href=\"viewforum.$phpEx?forum=$forum\">here</a> to return to the forum, or <a href=\"index.$phpEx\">here</a> to return to the forum index."; ! break; ! case 'move': ! $sql = "UPDATE topics SET forum_id = '$newforum' WHERE topic_id = '$topic'"; ! if(!$r = mysql_query($sql, $db)) ! die("Error - Could not move selected topic to selected forum. Please go back and try again."); ! $sql = "UPDATE posts SET forum_id = '$newforum' WHERE topic_id = '$topic'"; ! if(!$r = mysql_query($sql, $db)) ! die("Error - Could not move selected topic to selected forum. Please go back and try again."); ! sync($db, $newforum, 'forum'); ! sync($db, $forum, 'forum'); ! ! echo "The topic has been moved. Click <a href=\"viewtopic.$phpEx?topic=$topic&forum=$newforum\">here</a> to view the updated topic. Or click <a href=\"index.$phpEx\">here</a> to return to the forum index"; ! break; ! case 'lock': ! $sql = "UPDATE topics SET topic_status = 1 WHERE topic_id = '$topic'"; ! if(!$r = mysql_query($sql, $db)) ! die("Error - Could not lock the selected topic. Please go back and try again."); ! echo "The topic has been locked. Click <a href=\"viewtopic.$phpEx?topic=$topic&forum=$forum\">here</a> to view, or <a href=\"index.$phpEx\">here</a> to return to the forum index."; ! break; ! case 'unlock': ! $sql = "UPDATE topics SET topic_status = '0' WHERE topic_id = '$topic'"; ! if(!$r = mysql_query($sql, $db)) ! die("Error - Could not unlock the selected topic. Please go back and try again."); ! echo "The topic has been unlocked. Click <a href=\"viewtopic.$phpEx?topic=$topic&forum=$forum\">here</a> to view, or <a href=\"index.$phpEx\">here</a> to return to the forum index."; ! break; ! case 'viewip': ! $sql = "SELECT u.username, p.poster_ip FROM users u, posts p WHERE p.post_id = '$post' AND u.user_id = p.poster_id"; ! if(!$r = mysql_query($sql, $db)) ! die("Error - Could not query the database. <BR>Error: mysql_error()"); ! if(!$m = mysql_fetch_array($r)) ! die("Error - No such user or post in the database."); ! $poster_host = gethostbyaddr($m[poster_ip]); ! ?> ! <TABLE BORDER="0" CELLPADDING="1" CELLSPACEING="0" ALIGN="CENTER" VALIGN="TOP" WIDTH="95%"><TR><TD BGCOLOR="<?php echo $table_bgcolor?>"> ! <TABLE BORDER="0" CELLPADDING="1" CELLSPACEING="1" WIDTH="100%"> ! <TR BGCOLOR="<?php echo $color1?>" ALIGN="LEFT"> ! <TD COLSPAN="2" ALIGN="CENTER">Users IP and Account information</TD> ! </TR> ! <TR BGCOLOR="<?php echo $color2?>" ALIGN="LEFT"> ! <TD>User IP:</TD> ! <TD><?php echo $m[poster_ip] . " ( $poster_host )"?></TD> ! </TR> ! <TR BGCOLOR="<?php echo $color1?>" ALIGN="LEFT"> ! <TD COLSPAN="2" ALIGN="CENTER">Usernames of users that posted from this IP + post counts</TD> ! </TR> ! <?php ! $sql = "SELECT user_id, username, count(*) as postcount FROM posts p, users u WHERE poster_ip='".$m[poster_ip]."' && p.poster_id = u.user_id GROUP BY user_id"; ! if(!$r = mysql_query($sql, $db)) ! { ! echo "<TR><TD COLSPAN=\"2\">Error - Could not query the database. <BR>Error: mysql_error()</TD></TR></TABLE>"; ! exit(); ! } ! ! while ($row = mysql_fetch_array($r)){ ! print "<TR BGCOLOR=\"$color2\" ALIGN=\"LEFT\">\n"; ! print " <TD><A HREF=\"bb_profile.php?mode=view&user=".$row[user_id]."\">".$row[username]."</A></TD>\n"; ! print " <TD>".$row[postcount]." posts</TD>\n"; ! print "</TR>\n"; ! } ! ?> ! ! </TABLE></TD></TR></TABLE> ! <?php ! break; ! ! } ! } ! else { // No submit ! ?> ! <FORM ACTION="<?php echo $PHP_SELF?>" METHOD="POST"> ! <TABLE BORDER="0" CELLPADDING="1" CELLSPACING="0" ALIGN="CENTER" VALIGN="TOP" WIDTH="95%"><TR><TD BGCOLOR="<?php echo $table_bgcolor?>"> ! <TABLE BORDER="0" CELLPADDING="1" CELLSPACING="1" WIDTH="100%"> ! <TR BGCOLOR="<?php echo $color1?>" ALIGN="LEFT"> ! <?php ! switch($mode) { ! case 'del': ! ?> ! <TD COLSPAN=2><B>Read This:</b>Once you press the delete button at the bottom of this form the topic you have selected, and all its related posts, will be <b>permanently</b> removed.</TD> ! <?php ! break; ! case 'move': ! ?> ! <TD COLSPAN=2><B>Read This:</b>Once you press the move button at the bottom of this form the topic you have selected, and its related posts, will be moved to the forum you have selected.</TD> ! <?php ! break; ! case 'lock': ! ?> ! <TD COLSPAN=2><B>Read This:</b>Once you press the lock button at the bottom of this form the topic you have selected will be locked. You may unlock it at a later time if you like.</TD> ! <?php ! break; ! case 'unlock': ! ?> ! <TD COLSPAN=2><B>Read This:</b>Once you press the unlock button at the bottom of this form the topic you have selected will be unlocked. You may lock it again at a later time if you like.</TD> ! <?php ! break; ! case 'viewip': ! ?> ! <TD COLSPAN=2><B>Read This:</b>View this users IP address.</TD> ! <?php ! break; ! } ! ?> ! </TR> ! <?php ! if (!$user_logged_in) ! { ! ?> ! <TR> ! <TD BGCOLOR="<?php echo $color1?>">Username:</TD> ! <TD BGCOLOR="<?php echo $color2?>"><INPUT TYPE="TEXT" NAME="user" SIZE="25" MAXLENGTH="40" VALUE="<?php echo $userdata[username]?>"></TD> ! </TR> ! <TR> ! <TD BGCOLOR="<?php echo $color1?>">Password:</TD> ! <TD BGCOLOR="<?php echo $color2?>"><INPUT TYPE="PASSWORD" NAME="passwd" SIZE="25" MAXLENGTH="25"></TD> ! </TR> ! <?php ! } ! if($mode == 'move') { ! ?> ! <TR> ! <TD BGCOLOR="<?php echo $color1?>">Move Topic To:</TD> ! <TD BGCOLOR="<?php echo $color2?>"><SELECT NAME="newforum" SIZE="0"> ! <?php ! $sql = "SELECT forum_id, forum_name FROM forums WHERE forum_id != '$forum' ORDER BY forum_id"; ! if($result = mysql_query($sql, $db)) { ! if($myrow = mysql_fetch_array($result)) { ! do { ! echo "<OPTION VALUE=\"$myrow[forum_id]\">$myrow[forum_name]</OPTION>\n"; ! } while($myrow = mysql_fetch_array($result)); ! } ! else { ! echo "<OPTION VALUE=\"-1\">No Forums in DB</OPTION>\n"; ! } ! } ! else { ! echo "<OPTION VALUE=\"-1\">Database Error</OPTION>\n"; ! } ! ?> ! </SELECT></TD> ! </TR> ! <?php ! } ! ?> ! <TR BGCOLOR="<?php echo $color1?>"> ! <TD COLSPAN="2" ALIGN="CENTER"> ! <?php ! switch($mode) { ! case 'del': ! ?> ! <INPUT TYPE="HIDDEN" NAME="mode" VALUE="del"> ! <INPUT TYPE="HIDDEN" NAME="topic" VALUE="<?php echo $topic?>"> ! <INPUT TYPE="HIDDEN" NAME="forum" VALUE="<?php echo $forum?>"> ! <INPUT TYPE="SUBMIT" NAME="submit" VALUE="Delete Topic"> ! <?php ! break; ! case 'move': ! ?> ! <INPUT TYPE="HIDDEN" NAME="mode" VALUE="move"> ! <INPUT TYPE="HIDDEN" NAME="topic" VALUE="<?php echo $topic?>"> ! <INPUT TYPE="HIDDEN" NAME="forum" VALUE="<?php echo $forum?>"> ! <INPUT TYPE="SUBMIT" NAME="submit" VALUE="Move Topic"> ! <?php ! break; ! case 'lock': ! ?> ! <INPUT TYPE="HIDDEN" NAME="mode" VALUE="lock"> ! <INPUT TYPE="HIDDEN" NAME="topic" VALUE="<?php echo $topic?>"> ! <INPUT TYPE="HIDDEN" NAME="forum" VALUE="<?php echo $forum?>"> ! <INPUT TYPE="SUBMIT" NAME="submit" VALUE="Lock Topic"> ! <?php ! break; ! case 'unlock': ! ?> ! <INPUT TYPE="HIDDEN" NAME="mode" VALUE="unlock"> ! <INPUT TYPE="HIDDEN" NAME="topic" VALUE="<?php echo $topic?>"> ! <INPUT TYPE="HIDDEN" NAME="forum" VALUE="<?php echo $forum?>"> ! <INPUT TYPE="SUBMIT" NAME="submit" VALUE="Unlock Topic"> ! <?php ! break; ! case 'viewip': ! ?> ! <INPUT TYPE="HIDDEN" NAME="mode" VALUE="viewip"> ! <INPUT TYPE="HIDDEN" NAME="post" VALUE="<?php echo $post?>"> ! <INPUT TYPE="HIDDEN" NAME="forum" VALUE="<?php echo $forum?>"> ! <INPUT TYPE="SUBMIT" NAME="submit" VALUE="View IP"> ! <?php ! break; ! } ! ?> ! </TD></TR> ! </FORM> ! </TABLE></TD></TR></TABLE></TD></TR></TABLE> ! <?php ! } ! include('page_tail.'.$phpEx); ! ?> ! ! ! ! ! ! ! ! ! |
|
From: James A. <th...@us...> - 2001-11-05 07:15:23
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver/admin
In directory usw-pr-cvs1:/tmp/cvs-serv18206/templates/subSilver/admin
Modified Files:
board_config_body.tpl
Log Message:
Re-added coppa stuff for admin (who removed it??)
Added SMTP username and password settiings
Index: board_config_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/board_config_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** board_config_body.tpl 2001/11/03 18:13:35 1.2
--- board_config_body.tpl 2001/11/05 07:15:05 1.3
***************
*** 133,136 ****
--- 133,148 ----
</tr>
<tr>
+ <th class="thHead" colspan="2">COPPA Settings</th>
+ </tr>
+ <tr>
+ <td class="row1">COPPA Fax Number</td>
+ <td class="row2"><input type="text" size="25" maxlength="100" name="coppa_fax" value="{COPPA_FAX}" /></td>
+ </tr>
+ <tr>
+ <td class="row1">COPPA Mailing Address<br /><span class="gensmall">This is the mailing address where parents will send COPPA registration forms</span></td>
+ <td class="row2"><textarea name="coppa_mail" rows="5" cols="30">{COPPA_MAIL}</textarea></td>
+ </tr>
+
+ <tr>
<th class="thHead" colspan="2">Email Settings</th>
</tr>
***************
*** 151,154 ****
--- 163,175 ----
<td class="row2"><input type="text" name="smtp_host" value="{SMTP_HOST}" size="25" maxlength="50" /></td>
</tr>
+ <tr>
+ <td class="row1">SMTP Username</td>
+ <td class="row2"><input type="text" name="smtp_username" value="{SMTP_USERNAME}" size="25" maxlength="50" /></td>
+ </tr>
+ <tr>
+ <td class="row1">SMTP Password</td>
+ <td class="row2"><input type="text" name="smtp_password" value="{SMTP_PASSWORD}" size="25" maxlength="50" /></td>
+ </tr>
+
<tr>
<td class="catBottom" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="Save Settings" class="mainoption" />
|
|
From: James A. <th...@us...> - 2001-11-05 07:15:23
|
Update of /cvsroot/phpbb/phpBB2/admin In directory usw-pr-cvs1:/tmp/cvs-serv18206/admin Modified Files: admin_board.php Log Message: Re-added coppa stuff for admin (who removed it??) Added SMTP username and password settiings Index: admin_board.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/admin/admin_board.php,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -r1.29 -r1.30 *** admin_board.php 2001/11/03 18:13:35 1.29 --- admin_board.php 2001/11/05 07:15:05 1.30 *************** *** 167,170 **** --- 167,172 ---- "SMTP_NO" => $smtp_no, "SMTP_HOST" => $new['smtp_host'], + "SMTP_USERNAME" => $new['smtp_username'], + "SMTP_PASSWORD" => $new['smtp_password'], "COPPA_MAIL" => $new['coppa_mail'], "COPPA_FAX" => $new['coppa_fax']) |
|
From: Paul S. O. <ps...@us...> - 2001-11-05 02:40:45
|
Update of /cvsroot/phpbb/phpBB2 In directory usw-pr-cvs1:/tmp/cvs-serv29979 Modified Files: posting.php Log Message: Fixed small error in message output upon deletion of msg Index: posting.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/posting.php,v retrieving revision 1.87 retrieving revision 1.88 diff -C2 -r1.87 -r1.88 *** posting.php 2001/11/03 16:14:59 1.87 --- posting.php 2001/11/05 02:40:41 1.88 *************** *** 1377,1381 **** // If we get here the post has been deleted successfully. // ! $msg_die = $lang['Deleted']; if( !$is_first_post_topic && !$is_last_post_topic ) --- 1377,1381 ---- // If we get here the post has been deleted successfully. // ! $message = $lang['Deleted']; if( !$is_first_post_topic && !$is_last_post_topic ) |
|
From: Paul S. O. <ps...@us...> - 2001-11-05 01:24:29
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv11638
Modified Files:
profile.php
Log Message:
Added check for avatar type before attempting deletion
Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.124
retrieving revision 1.125
diff -C2 -r1.124 -r1.125
*** profile.php 2001/11/03 19:33:33 1.124
--- profile.php 2001/11/05 01:24:26 1.125
***************
*** 427,431 ****
if( $mode == "register" && !isset($HTTP_POST_VARS['agreed']) && !isset($HTTP_GET_VARS['agreed']) )
{
! if(!isset($HTTP_POST_VARS['agreed']) && !isset($HTTP_GET_VARS['agreed']))
{
//
--- 427,431 ----
if( $mode == "register" && !isset($HTTP_POST_VARS['agreed']) && !isset($HTTP_GET_VARS['agreed']) )
{
! if( !isset($HTTP_POST_VARS['agreed']) && !isset($HTTP_GET_VARS['agreed']) )
{
//
***************
*** 527,531 ****
if($mode == "editprofile")
{
! if($user_id != $userdata['user_id'])
{
$error = TRUE;
--- 527,531 ----
if($mode == "editprofile")
{
! if( $user_id != $userdata['user_id'] )
{
$error = TRUE;
***************
*** 560,564 ****
FROM " . USERS_TABLE . "
WHERE user_id = $user_id";
! if($result = $db->sql_query($sql))
{
$row = $db->sql_fetchrow($result);
--- 560,564 ----
FROM " . USERS_TABLE . "
WHERE user_id = $user_id";
! if( $result = $db->sql_query($sql) )
{
$row = $db->sql_fetchrow($result);
***************
*** 592,596 ****
// Do a ban check on this email address
//
! if($email != $userdata['user_email'] || $mode == "register")
{
if( !validate_email($email) )
--- 592,596 ----
// Do a ban check on this email address
//
! if( $email != $userdata['user_email'] || $mode == "register" )
{
if( !validate_email($email) )
***************
*** 606,617 ****
$username_sql = "";
! if($board_config['allow_namechange'] || $mode == "register")
{
! if($username != $userdata['username'] || $mode == "register")
{
! if(!validate_username($username))
{
$error = TRUE;
! if(isset($error_msg))
{
$error_msg .= "<br />";
--- 606,617 ----
$username_sql = "";
! if( $board_config['allow_namechange'] || $mode == "register" )
{
! if( $username != $userdata['username'] || $mode == "register" )
{
! if( !validate_username($username) )
{
$error = TRUE;
! if( isset($error_msg) )
{
$error_msg .= "<br />";
***************
*** 631,635 ****
{
$error = TRUE;
! if(isset($error_msg))
{
$error_msg .= "<br />";
--- 631,635 ----
{
$error = TRUE;
! if( isset($error_msg) )
{
$error_msg .= "<br />";
***************
*** 644,648 ****
}
! if($mode == "register")
{
//
--- 644,648 ----
}
! if( $mode == "register" )
{
//
***************
*** 653,657 ****
$sql = "SELECT MAX(user_id) AS total
FROM " . USERS_TABLE;
! if($result = $db->sql_query($sql))
{
$row = $db->sql_fetchrow($result);
--- 653,657 ----
$sql = "SELECT MAX(user_id) AS total
FROM " . USERS_TABLE;
! if( $result = $db->sql_query($sql) )
{
$row = $db->sql_fetchrow($result);
***************
*** 668,672 ****
$sql = "SELECT MAX(group_id) AS total
FROM " . GROUPS_TABLE;
! if($result = $db->sql_query($sql))
{
$row = $db->sql_fetchrow($result);
--- 668,672 ----
$sql = "SELECT MAX(group_id) AS total
FROM " . GROUPS_TABLE;
! if( $result = $db->sql_query($sql) )
{
$row = $db->sql_fetchrow($result);
***************
*** 692,696 ****
{
$error = TRUE;
! if(isset($error_msg))
{
$error_msg .= "<br />";
--- 692,696 ----
{
$error = TRUE;
! if( isset($error_msg) )
{
$error_msg .= "<br />";
***************
*** 701,707 ****
if( isset($HTTP_POST_VARS['avatardel']) && $mode == "editprofile" )
{
! if( @file_exists("./" . $board_config['avatar_path'] . "/" . $userdata['user_avatar']) )
{
! @unlink("./" . $board_config['avatar_path'] . "/" . $userdata['user_avatar']);
}
$avatar_sql = ", user_avatar = '', user_avatar_type = " . USER_AVATAR_NONE;
--- 701,710 ----
if( isset($HTTP_POST_VARS['avatardel']) && $mode == "editprofile" )
{
! if( $userdata['user_avatar_type'] == USER_AVATAR_UPLOAD && $userdata['user_avatar'] != "" )
{
! if( @file_exists("./" . $board_config['avatar_path'] . "/" . $userdata['user_avatar']) )
! {
! @unlink("./" . $board_config['avatar_path'] . "/" . $userdata['user_avatar']);
! }
}
$avatar_sql = ", user_avatar = '', user_avatar_type = " . USER_AVATAR_NONE;
***************
*** 709,715 ****
else if( $user_avatar_loc != "" && $board_config['allow_avatar_upload'] )
{
! if(file_exists($user_avatar_loc) && ereg(".jpg$|.gif$|.png$", $user_avatar_name))
{
! if($user_avatar_size <= $board_config['avatar_filesize'] && $avatar_size > 0)
{
$error_type = false;
--- 712,718 ----
else if( $user_avatar_loc != "" && $board_config['allow_avatar_upload'] )
{
! if( file_exists($user_avatar_loc) && ereg(".jpg$|.gif$|.png$", $user_avatar_name) )
{
! if( $user_avatar_size <= $board_config['avatar_filesize'] && $avatar_size > 0)
{
$error_type = false;
***************
*** 721,725 ****
$user_avatar_filetype = $user_avatar_filetype[1];
! switch($user_avatar_filetype)
{
case "jpeg":
--- 724,728 ----
$user_avatar_filetype = $user_avatar_filetype[1];
! switch( $user_avatar_filetype )
{
case "jpeg":
***************
*** 739,748 ****
}
! if(!$error)
{
list($width, $height) = @getimagesize($user_avatar_loc);
! if( $width <= $board_config['avatar_max_width'] &&
! $height <= $board_config['avatar_max_height'] )
{
$user_id = ($mode == "register") ? $new_user_id : $userdata['user_id'];
--- 742,750 ----
}
! if( !$error )
{
list($width, $height) = @getimagesize($user_avatar_loc);
! if( $width <= $board_config['avatar_max_width'] && $height <= $board_config['avatar_max_height'] )
{
$user_id = ($mode == "register") ? $new_user_id : $userdata['user_id'];
***************
*** 750,754 ****
$avatar_filename = $user_id . $imgtype;
! if($mode == "editprofile")
{
if( @file_exists("./" . $board_config['avatar_path'] . "/" . $userdata['user_avatar']) )
--- 752,756 ----
$avatar_filename = $user_id . $imgtype;
! if( $mode == "editprofile" && $userdata['user_avatar_type'] == USER_AVATAR_UPLOAD && $userdata['user_avatar'] != "" )
{
if( @file_exists("./" . $board_config['avatar_path'] . "/" . $userdata['user_avatar']) )
***************
*** 764,768 ****
{
$error = true;
! $error_msg = (!empty($error_msg)) ? $error_msg . "<br />" . $lang['Avatar_imagesize'] : $lang['Avatar_imagesize'];
}
}
--- 766,770 ----
{
$error = true;
! $error_msg = ( !empty($error_msg) ) ? $error_msg . "<br />" . $lang['Avatar_imagesize'] : $lang['Avatar_imagesize'];
}
}
***************
*** 772,776 ****
$error = true;
$error_filesize = $lang['Avatar_filesize'] . " " . round($board_config['avatar_filesize'] / 1024) . " " . $lang['kB'];
! $error_msg = (!empty($error_msg)) ? $error_msg . "<br />" . $error_filesize : $error_filesize;
}
}
--- 774,778 ----
$error = true;
$error_filesize = $lang['Avatar_filesize'] . " " . round($board_config['avatar_filesize'] / 1024) . " " . $lang['kB'];
! $error_msg = ( !empty($error_msg) ) ? $error_msg . "<br />" . $error_filesize : $error_filesize;
}
}
***************
*** 778,782 ****
{
$error = true;
! $error_msg = (!empty($error_msg)) ? $error_msg . "<br />" . $lang['Avatar_filetype'] : $lang['Avatar_filetype'];
}
}
--- 780,784 ----
{
$error = true;
! $error_msg = ( !empty($error_msg) ) ? $error_msg . "<br />" . $lang['Avatar_filetype'] : $lang['Avatar_filetype'];
}
}
***************
*** 795,799 ****
$fsock = @fsockopen($url_ary[2], $port, $errno, $errstr);
! if($fsock)
{
$base_get = "/" . $url_ary[4];
--- 797,801 ----
$fsock = @fsockopen($url_ary[2], $port, $errno, $errstr);
! if( $fsock )
{
$base_get = "/" . $url_ary[4];
***************
*** 807,811 ****
unset($avatar_data);
! while(!@feof($fsock))
{
$avatar_data .= @fread($fsock, $board_config['avatar_filesize']);
--- 809,813 ----
unset($avatar_data);
! while( !@feof($fsock) )
{
$avatar_data .= @fread($fsock, $board_config['avatar_filesize']);
***************
*** 813,822 ****
@fclose($fsock);
! if(preg_match("/Content-Length\: ([0-9]+)[^\/]+Content-Type\: image\/[x\-]*([a-z]+)[\s]+/i", $avatar_data, $file_data))
{
$file_size = $file_data[1];
$file_type = $file_data[2];
! switch($file_type)
{
case "jpeg":
--- 815,824 ----
@fclose($fsock);
! if( preg_match("/Content-Length\: ([0-9]+)[^\/]+Content-Type\: image\/[x\-]*([a-z]+)[\s]+/i", $avatar_data, $file_data) )
{
$file_size = $file_data[1];
$file_type = $file_data[2];
! switch( $file_type )
{
case "jpeg":
***************
*** 836,840 ****
}
! if(!$error && $file_size > 0 && $file_size < $board_config['avatar_filesize'])
{
$avatar_data = substr($avatar_data, strlen($avatar_data) - $file_size, $file_size);
--- 838,842 ----
}
! if( !$error && $file_size > 0 && $file_size < $board_config['avatar_filesize'] )
{
$avatar_data = substr($avatar_data, strlen($avatar_data) - $file_size, $file_size);
***************
*** 845,849 ****
@fclose($fptr);
! if($bytes_written == $file_size)
{
list($width, $height) = @getimagesize($tmp_filename);
--- 847,851 ----
@fclose($fptr);
! if( $bytes_written == $file_size )
{
list($width, $height) = @getimagesize($tmp_filename);
***************
*** 851,861 ****
if( $width <= $board_config['avatar_max_width'] && $height <= $board_config['avatar_max_height'] )
{
! $user_id = ($mode == "register") ? $new_user_id : $userdata['user_id'];
$avatar_filename = $user_id . $imgtype;
! if($mode == "editprofile")
{
! if(file_exists("./" . $board_config['avatar_path'] . "/" . $userdata['user_avatar']))
{
@unlink("./" . $board_config['avatar_path'] . "/" . $userdata['user_avatar']);
--- 853,863 ----
if( $width <= $board_config['avatar_max_width'] && $height <= $board_config['avatar_max_height'] )
{
! $user_id = ( $mode == "register" ) ? $new_user_id : $userdata['user_id'];
$avatar_filename = $user_id . $imgtype;
! if( $mode == "editprofile" && $userdata['user_avatar_type'] == USER_AVATAR_UPLOAD && $userdata['user_avatar'] != "")
{
! if( file_exists("./" . $board_config['avatar_path'] . "/" . $userdata['user_avatar']) )
{
@unlink("./" . $board_config['avatar_path'] . "/" . $userdata['user_avatar']);
***************
*** 874,878 ****
@unlink($tmp_filename);
$error = true;
! $error_msg = (!empty($error_msg)) ? $error_msg . "<br />" . $lang['Avatar_imagesize'] : $lang['Avatar_imagesize'];
}
}
--- 876,880 ----
@unlink($tmp_filename);
$error = true;
! $error_msg = ( !empty($error_msg) ) ? $error_msg . "<br />" . $lang['Avatar_imagesize'] : $lang['Avatar_imagesize'];
}
}
***************
*** 893,897 ****
//
$error = true;
! $error_msg = (!empty($error_msg)) ? $error_msg . "<br />" . $lang['File_no_data'] : $lang['File_no_data'];
}
}
--- 895,899 ----
//
$error = true;
! $error_msg = ( !empty($error_msg) ) ? $error_msg . "<br />" . $lang['File_no_data'] : $lang['File_no_data'];
}
}
***************
*** 902,906 ****
//
$error = true;
! $error_msg = (!empty($error_msg)) ? $error_msg . "<br />" . $lang['No_connection_URL'] : $lang['No_connection_URL'];
}
}
--- 904,908 ----
//
$error = true;
! $error_msg = ( !empty($error_msg) ) ? $error_msg . "<br />" . $lang['No_connection_URL'] : $lang['No_connection_URL'];
}
}
***************
*** 908,912 ****
{
$error = true;
! $error_msg = (!empty($error_msg)) ? $error_msg . "<br />" . $lang['Incomplete_URL'] : $lang['Incomplete_URL'];
}
}
--- 910,914 ----
{
$error = true;
! $error_msg = ( !empty($error_msg) ) ? $error_msg . "<br />" . $lang['Incomplete_URL'] : $lang['Incomplete_URL'];
}
}
***************
*** 915,919 ****
$error = true;
$error_filesize = $lang['Avatar_filesize'] . " " . round($board_config['avatar_filesize'] / 1024) . " " . $lang['kB'];
! $error_msg = (!empty($error_msg)) ? $error_msg . "<br />" . $error_filesize : $error_filesize;
}
}
--- 917,921 ----
$error = true;
$error_filesize = $lang['Avatar_filesize'] . " " . round($board_config['avatar_filesize'] / 1024) . " " . $lang['kB'];
! $error_msg = ( !empty($error_msg) ) ? $error_msg . "<br />" . $error_filesize : $error_filesize;
}
}
***************
*** 935,939 ****
{
$error = true;
! $error_msg = (!empty($error_msg)) ? $error_msg . "<br />" . $lang['Wrong_remote_avatar_format'] : $lang['Wrong_remote_avatar_format'];
}
}
--- 937,941 ----
{
$error = true;
! $error_msg = ( !empty($error_msg) ) ? $error_msg . "<br />" . $lang['Wrong_remote_avatar_format'] : $lang['Wrong_remote_avatar_format'];
}
}
***************
*** 948,956 ****
}
! if(!$error)
{
! if($mode == "editprofile")
{
! if($email != $current_email && ( $board_config['require_activation'] == USER_ACTIVATION_SELF || $board_config['require_activation'] == USER_ACTIVATION_ADMIN ) && $userdata['user_level'] != ADMIN)
{
$user_active = 0;
--- 950,958 ----
}
! if( !$error )
{
! if( $mode == "editprofile" )
{
! if( $email != $current_email && ( $board_config['require_activation'] == USER_ACTIVATION_SELF || $board_config['require_activation'] == USER_ACTIVATION_ADMIN ) && $userdata['user_level'] != ADMIN )
{
$user_active = 0;
***************
*** 976,980 ****
WHERE user_id = $user_id";
! if($result = $db->sql_query($sql))
{
if( $user_active == 0 )
--- 978,982 ----
WHERE user_id = $user_id";
! if( $result = $db->sql_query($sql) )
{
if( $user_active == 0 )
***************
*** 1058,1062 ****
}
! if($result = $db->sql_query($sql, BEGIN_TRANSACTION))
{
$sql = "INSERT INTO " . GROUPS_TABLE . " (group_id, group_name, group_description, group_single_user, group_moderator)
--- 1060,1064 ----
}
! if( $result = $db->sql_query($sql, BEGIN_TRANSACTION) )
{
$sql = "INSERT INTO " . GROUPS_TABLE . " (group_id, group_name, group_description, group_single_user, group_moderator)
***************
*** 1102,1106 ****
$emailer->extra_headers($email_headers);
! if($coppa)
{
$emailer->assign_vars(array(
--- 1104,1108 ----
$emailer->extra_headers($email_headers);
! if( $coppa )
{
$emailer->assign_vars(array(
|
|
From: Paul S. O. <ps...@us...> - 2001-11-05 00:29:28
|
Update of /cvsroot/phpbb/phpBB2 In directory usw-pr-cvs1:/tmp/cvs-serv28251 Modified Files: viewonline.php Log Message: Mental note, engage brain before typing Index: viewonline.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/viewonline.php,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -r1.36 -r1.37 *** viewonline.php 2001/11/05 00:23:14 1.36 --- viewonline.php 2001/11/05 00:29:25 1.37 *************** *** 82,86 **** WHERE u.user_id <> " . ANONYMOUS . " AND u.user_id = s.session_user_id ! AND s.session_time >= " . ( time() - 1200 ) . " AND s.session_logged_in = " . TRUE . " ORDER BY s.session_time DESC"; --- 82,86 ---- WHERE u.user_id <> " . ANONYMOUS . " AND u.user_id = s.session_user_id ! AND s.session_time >= " . ( time() - 300 ) . " AND s.session_logged_in = " . TRUE . " ORDER BY s.session_time DESC"; *************** *** 94,98 **** FROM " . SESSIONS_TABLE . " WHERE session_logged_in = 0 ! AND session_time >= " . ( time() - 1200 ) . " ORDER BY session_time DESC"; if(!$result = $db->sql_query($sql)) --- 94,98 ---- FROM " . SESSIONS_TABLE . " WHERE session_logged_in = 0 ! AND session_time >= " . ( time() - 300 ) . " ORDER BY session_time DESC"; if(!$result = $db->sql_query($sql)) |
|
From: Paul S. O. <ps...@us...> - 2001-11-05 00:23:17
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv27393
Modified Files:
viewonline.php
Log Message:
Seemed to be a problem creeping back in with duplicated names due to switch in code ... fixed?
Index: viewonline.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewonline.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** viewonline.php 2001/11/03 13:54:03 1.35
--- viewonline.php 2001/11/05 00:23:14 1.36
***************
*** 82,86 ****
WHERE u.user_id <> " . ANONYMOUS . "
AND u.user_id = s.session_user_id
! AND s.session_time >= " . ( time() - 300 ) . "
AND s.session_logged_in = " . TRUE . "
ORDER BY s.session_time DESC";
--- 82,86 ----
WHERE u.user_id <> " . ANONYMOUS . "
AND u.user_id = s.session_user_id
! AND s.session_time >= " . ( time() - 1200 ) . "
AND s.session_logged_in = " . TRUE . "
ORDER BY s.session_time DESC";
***************
*** 94,98 ****
FROM " . SESSIONS_TABLE . "
WHERE session_logged_in = 0
! AND session_time >= " . ( time() - 300 ) . "
ORDER BY session_time DESC";
if(!$result = $db->sql_query($sql))
--- 94,98 ----
FROM " . SESSIONS_TABLE . "
WHERE session_logged_in = 0
! AND session_time >= " . ( time() - 1200 ) . "
ORDER BY session_time DESC";
if(!$result = $db->sql_query($sql))
***************
*** 143,163 ****
$hidden_users = 0;
- $displayed_userid_list = "";
-
for($i = 0; $i < count($onlinerow_reg); $i++)
{
if( !inarray($onlinerow_reg[$i]['user_id'], $reg_userid_ary) )
{
if( $onlinerow_reg[$i]['user_allow_viewonline'] || $userdata['user_level'] == ADMIN )
{
- $username = $onlinerow_reg[$i]['username'];
- $hidden = FALSE;
$registered_users++;
}
else
{
- $username = $onlinerow_reg[$i]['username'];
- $hidden = TRUE;
$hidden_users++;
}
--- 143,163 ----
$hidden_users = 0;
for($i = 0; $i < count($onlinerow_reg); $i++)
{
if( !inarray($onlinerow_reg[$i]['user_id'], $reg_userid_ary) )
{
+ $reg_userid_ary[] = $onlinerow_reg[$i]['user_id'];
+
+ $username = $onlinerow_reg[$i]['username'];
+
if( $onlinerow_reg[$i]['user_allow_viewonline'] || $userdata['user_level'] == ADMIN )
{
$registered_users++;
+ $hidden = FALSE;
}
else
{
$hidden_users++;
+ $hidden = TRUE;
}
***************
*** 248,253 ****
// Guest users
//
- $guest_userip_ary = array();
-
if( count($onlinerow_guest) )
{
--- 248,251 ----
***************
*** 256,327 ****
for($i = 0; $i < count($onlinerow_guest); $i++)
{
! if( !inarray($onlinerow_guest[$i]['session_ip'], $guest_userip_ary) )
! {
! $guest_users++;
! if($onlinerow_guest[$i]['session_page'] < 1 || !$is_auth_ary[$onlinerow_reg[$i]['session_page']]['auth_view'] )
! {
! switch($onlinerow_guest[$i]['session_page'])
! {
! case PAGE_INDEX:
! $location = $lang['Forum_index'];
! $location_url = "index.$phpEx";
! break;
! case PAGE_POSTING:
! $location = $lang['Posting_message'];
! $location_url = "index.$phpEx";
! break;
! case PAGE_LOGIN:
! $location = $lang['Logging_on'];
! $location_url = "index.$phpEx";
! break;
! case PAGE_SEARCH:
! $location = $lang['Searching_forums'];
! $location_url = "search.$phpEx";
! break;
! case PAGE_PROFILE:
! $location = $lang['Viewing_profile'];
! $location_url = "index.$phpEx";
! break;
! case PAGE_VIEWONLINE:
! $location = $lang['Viewing_online'];
! $location_url = "viewonline.$phpEx";
! break;
! case PAGE_VIEWMEMBERS:
! $location = $lang['Viewing_member_list'];
! $location_url = "memberlist.$phpEx";
! break;
! case PAGE_PRIVMSGS:
! $location = $lang['Viewing_priv_msgs'];
! $location_url = "privmsg.$phpEx";
! break;
! case PAGE_FAQ:
! $location = $lang['Viewing_FAQ'];
! $location_url = "faq.$phpEx";
! break;
! default:
! $location = $lang['Forum_index'];
! $location_url = "index.$phpEx";
! }
! }
! else
{
! $location_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=" . $onlinerow_guest[$i]['session_page']);
! $location = $forum_data[$onlinerow_guest[$i]['session_page']];
}
! $row_color = ( $guest_users % 2 ) ? $theme['td_color1'] : $theme['td_color2'];
! $row_class = ( $guest_users % 2 ) ? $theme['td_class1'] : $theme['td_class2'];
! $template->assign_block_vars("guest_user_row", array(
! "ROW_COLOR" => "#" . $row_color,
! "ROW_CLASS" => $row_class,
! "USERNAME" => $lang['Guest'],
! "LASTUPDATE" => create_date($board_config['default_dateformat'], $onlinerow_guest[$i]['session_time'], $board_config['board_timezone']),
! "LOCATION" => $location,
! "U_FORUM_LOCATION" => append_sid($location_url))
! );
! }
}
--- 254,323 ----
for($i = 0; $i < count($onlinerow_guest); $i++)
{
! $guest_userip_ary[] = $onlinerow_guest[$i]['session_ip'];
! $guest_users++;
! if($onlinerow_guest[$i]['session_page'] < 1 || !$is_auth_ary[$onlinerow_reg[$i]['session_page']]['auth_view'] )
! {
! switch($onlinerow_guest[$i]['session_page'])
{
! case PAGE_INDEX:
! $location = $lang['Forum_index'];
! $location_url = "index.$phpEx";
! break;
! case PAGE_POSTING:
! $location = $lang['Posting_message'];
! $location_url = "index.$phpEx";
! break;
! case PAGE_LOGIN:
! $location = $lang['Logging_on'];
! $location_url = "index.$phpEx";
! break;
! case PAGE_SEARCH:
! $location = $lang['Searching_forums'];
! $location_url = "search.$phpEx";
! break;
! case PAGE_PROFILE:
! $location = $lang['Viewing_profile'];
! $location_url = "index.$phpEx";
! break;
! case PAGE_VIEWONLINE:
! $location = $lang['Viewing_online'];
! $location_url = "viewonline.$phpEx";
! break;
! case PAGE_VIEWMEMBERS:
! $location = $lang['Viewing_member_list'];
! $location_url = "memberlist.$phpEx";
! break;
! case PAGE_PRIVMSGS:
! $location = $lang['Viewing_priv_msgs'];
! $location_url = "privmsg.$phpEx";
! break;
! case PAGE_FAQ:
! $location = $lang['Viewing_FAQ'];
! $location_url = "faq.$phpEx";
! break;
! default:
! $location = $lang['Forum_index'];
! $location_url = "index.$phpEx";
}
+ }
+ else
+ {
+ $location_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=" . $onlinerow_guest[$i]['session_page']);
+ $location = $forum_data[$onlinerow_guest[$i]['session_page']];
+ }
! $row_color = ( $guest_users % 2 ) ? $theme['td_color1'] : $theme['td_color2'];
! $row_class = ( $guest_users % 2 ) ? $theme['td_class1'] : $theme['td_class2'];
! $template->assign_block_vars("guest_user_row", array(
! "ROW_COLOR" => "#" . $row_color,
! "ROW_CLASS" => $row_class,
! "USERNAME" => $lang['Guest'],
! "LASTUPDATE" => create_date($board_config['default_dateformat'], $onlinerow_guest[$i]['session_time'], $board_config['board_timezone']),
! "LOCATION" => $location,
! "U_FORUM_LOCATION" => append_sid($location_url))
! );
}
***************
*** 345,347 ****
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
--- 341,343 ----
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! ?>
\ No newline at end of file
|
|
From: Paul S. O. <ps...@us...> - 2001-11-04 15:26:46
|
Update of /cvsroot/phpbb/phpBB2/includes In directory usw-pr-cvs1:/tmp/cvs-serv8562/includes Modified Files: db.php Log Message: MySQL 4.x support, functionaly similar to MySQL bar transaction support Index: db.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/includes/db.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** db.php 2001/08/30 22:20:23 1.6 --- db.php 2001/11/04 15:26:33 1.7 *************** *** 27,30 **** --- 27,34 ---- break; + case 'mysql4': + include($phpbb_root_path . 'db/mysql4.'.$phpEx); + break; + case 'postgres': include($phpbb_root_path . 'db/postgres7.'.$phpEx); |
|
From: Paul S. O. <ps...@us...> - 2001-11-04 15:26:46
|
Update of /cvsroot/phpbb/phpBB2/db
In directory usw-pr-cvs1:/tmp/cvs-serv8562/db
Added Files:
mysql4.php
Log Message:
MySQL 4.x support, functionaly similar to MySQL bar transaction support
--- NEW FILE ---
<?php
/***************************************************************************
* mysql.php
* -------------------
* begin : Saturday, Feb 13, 2001
* copyright : (C) 2001 The phpBB Group
* email : su...@ph...
*
* $Id: mysql4.php,v 1.1 2001/11/04 15:26:33 psotfx Exp $
*
***************************************************************************/
/***************************************************************************
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
***************************************************************************/
if(!defined("SQL_LAYER"))
{
define("SQL_LAYER","mysql4");
class sql_db
{
var $db_connect_id;
var $query_result;
var $row;
var $num_queries = 0;
var $in_transaction = 0;
//
// Constructor
//
function sql_db($sqlserver, $sqluser, $sqlpassword, $database, $persistency = true)
{
$this->persistency = $persistency;
$this->user = $sqluser;
$this->password = $sqlpassword;
$this->server = $sqlserver;
$this->dbname = $database;
if($this->persistency)
{
$this->db_connect_id = @mysql_pconnect($this->server, $this->user, $this->password);
}
else
{
$this->db_connect_id = @mysql_connect($this->server, $this->user, $this->password);
}
if($this->db_connect_id)
{
if($database != "")
{
$this->dbname = $database;
$dbselect = @mysql_select_db($this->dbname);
if(!$dbselect)
{
@mysql_close($this->db_connect_id);
$this->db_connect_id = $dbselect;
}
}
return $this->db_connect_id;
}
else
{
return false;
}
}
//
// Other base methods
//
function sql_close()
{
if($this->db_connect_id)
{
//
// Commit any remaining transactions
//
if( $this->in_transaction )
{
@mysql_query("COMMIT", $this->db_connect_id);
}
$result = @mysql_close($this->db_connect_id);
return $result;
}
else
{
return false;
}
}
//
// Base query method
//
function sql_query($query = "", $transaction = FALSE)
{
//
// Remove any pre-existing queries
//
unset($this->query_result);
if( $query != "" )
{
// $this->num_queries++;
if( $transaction == BEGIN_TRANSACTION )
{
$result = @mysql_query("BEGIN", $this->db_connect_id);
if(!$result)
{
return false;
}
$this->in_transaction = TRUE;
}
$this->query_result = @mysql_query($query, $this->db_connect_id);
}
if( $this->query_result )
{
unset($this->row[$this->query_result]);
unset($this->rowset[$this->query_result]);
if( $transaction == END_TRANSACTION )
{
$result = @mysql_query("COMMIT", $this->db_connect_id);
}
return $this->query_result;
}
else
{
if($this->in_transaction)
{
@mysql_query("ROLLBACK", $this->db_connect_id);
$this->in_transaction = FALSE;
}
return false;
}
}
//
// Other query methods
//
function sql_numrows($query_id = 0)
{
if(!$query_id)
{
$query_id = $this->query_result;
}
if($query_id)
{
$result = @mysql_num_rows($query_id);
return $result;
}
else
{
return false;
}
}
function sql_affectedrows()
{
if($this->db_connect_id)
{
$result = @mysql_affected_rows($this->db_connect_id);
return $result;
}
else
{
return false;
}
}
function sql_numfields($query_id = 0)
{
if(!$query_id)
{
$query_id = $this->query_result;
}
if($query_id)
{
$result = @mysql_num_fields($query_id);
return $result;
}
else
{
return false;
}
}
function sql_fieldname($offset, $query_id = 0)
{
if(!$query_id)
{
$query_id = $this->query_result;
}
if($query_id)
{
$result = @mysql_field_name($query_id, $offset);
return $result;
}
else
{
return false;
}
}
function sql_fieldtype($offset, $query_id = 0)
{
if(!$query_id)
{
$query_id = $this->query_result;
}
if($query_id)
{
$result = @mysql_field_type($query_id, $offset);
return $result;
}
else
{
return false;
}
}
function sql_fetchrow($query_id = 0)
{
if(!$query_id)
{
$query_id = $this->query_result;
}
if($query_id)
{
$this->row[$query_id] = @mysql_fetch_array($query_id, MYSQL_ASSOC);
return $this->row[$query_id];
}
else
{
return false;
}
}
function sql_fetchrowset($query_id = 0)
{
if(!$query_id)
{
$query_id = $this->query_result;
}
if($query_id)
{
unset($this->rowset[$query_id]);
unset($this->row[$query_id]);
while($this->rowset[$query_id] = @mysql_fetch_array($query_id, MYSQL_ASSOC))
{
$result[] = $this->rowset[$query_id];
}
return $result;
}
else
{
return false;
}
}
function sql_fetchfield($field, $rownum = -1, $query_id = 0)
{
if(!$query_id)
{
$query_id = $this->query_result;
}
if($query_id)
{
if($rownum > -1)
{
$result = @mysql_result($query_id, $rownum, $field);
}
else
{
if(empty($this->row[$query_id]) && empty($this->rowset[$query_id]))
{
if($this->sql_fetchrow())
{
$result = $this->row[$query_id][$field];
}
}
else
{
if($this->rowset[$query_id])
{
$result = $this->rowset[$query_id][$field];
}
else if($this->row[$query_id])
{
$result = $this->row[$query_id][$field];
}
}
}
return $result;
}
else
{
return false;
}
}
function sql_rowseek($rownum, $query_id = 0){
if(!$query_id)
{
$query_id = $this->query_result;
}
if($query_id)
{
$result = @mysql_data_seek($query_id, $rownum);
return $result;
}
else
{
return false;
}
}
function sql_nextid(){
if($this->db_connect_id)
{
$result = @mysql_insert_id($this->db_connect_id);
return $result;
}
else
{
return false;
}
}
function sql_freeresult($query_id = 0){
if(!$query_id)
{
$query_id = $this->query_result;
}
if($query_id)
{
$result = @mysql_free_result($query_id);
return $result;
}
else
{
return false;
}
}
function sql_error($query_id = 0)
{
$result["message"] = @mysql_error($this->db_connect_id);
$result["code"] = @mysql_errno($this->db_connect_id);
return $result;
}
} // class sql_db
} // if ... define
?>
|
|
From: Paul S. O. <ps...@us...> - 2001-11-04 14:11:28
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver In directory usw-pr-cvs1:/tmp/cvs-serv22120/templates/subSilver Modified Files: subSilver.cfg Log Message: Support for new locked with new topics icon Index: subSilver.cfg =================================================================== RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/subSilver.cfg,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** subSilver.cfg 2001/10/09 13:37:21 1.3 --- subSilver.cfg 2001/11/04 14:11:25 1.4 *************** *** 9,17 **** // Configuration file for subSilver template // ! // ** Created by subBlue design ** ! // ** www.subBlue.com ** // ! // ** subSilver dev. forum: www.subSky.com/phpBB2/ ** // // // This contains (at present) an array, images which --- 9,19 ---- // Configuration file for subSilver template // ! // $Id$ // ! // ** copyright (C) 2001 The phpBB Group ** ! // ** Created by subBlue design ** ! // ** www.subBlue.com ** // + // ** subSilver dev. forum: www.subSky.com/phpBB2/ ** // // This contains (at present) an array, images which *************** *** 47,52 **** $images['folder_new'] = "templates/subSilver/images/folder_new.gif"; $images['folder_hot'] = "templates/subSilver/images/folder_hot.gif"; ! $images['folder_new_hot'] = "templates/subSilver/images/folder_new_hot.gif"; $images['folder_locked'] = "templates/subSilver/images/folder_lock.gif"; $images['folder_sticky'] = "templates/subSilver/images/folder_sticky.gif"; $images['folder_sticky_new'] = "templates/subSilver/images/folder_sticky_new.gif"; --- 49,55 ---- $images['folder_new'] = "templates/subSilver/images/folder_new.gif"; $images['folder_hot'] = "templates/subSilver/images/folder_hot.gif"; ! $images['folder_hot_new'] = "templates/subSilver/images/folder_new_hot.gif"; $images['folder_locked'] = "templates/subSilver/images/folder_lock.gif"; + $images['folder_locked_new'] = "templates/subSilver/images/folder_lock_new.gif"; $images['folder_sticky'] = "templates/subSilver/images/folder_sticky.gif"; $images['folder_sticky_new'] = "templates/subSilver/images/folder_sticky_new.gif"; *************** *** 54,58 **** $images['folder_announce_new'] = "templates/subSilver/images/folder_announce_new.gif"; - $images['post_new'] = "templates/subSilver/images/post.gif"; $images['post_locked'] = "templates/subSilver/images/reply-locked.gif"; --- 57,60 ---- *************** *** 103,114 **** $board_config['vote_graphic_length'] = 205; $board_config['privmsg_graphic_length'] = 175; - - // - // Default theme to use (can be blank if - // themes aren't supported by this template) - // - $template_default_theme = "subSilver-subSilver"; - - ?> --- 105,108 ---- |
|
From: Paul S. O. <ps...@us...> - 2001-11-04 12:55:26
|
Update of /cvsroot/phpbb/phpBB2/includes In directory usw-pr-cvs1:/tmp/cvs-serv9214/includes Modified Files: page_header.php Log Message: Support for new locked with new topics icon Index: page_header.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -r1.58 -r1.59 *** page_header.php 2001/11/03 21:49:01 1.58 --- page_header.php 2001/11/04 12:55:22 1.59 *************** *** 220,224 **** "L_NO_NEW_POSTS_HOT" => $lang['No_new_posts_hot'], "L_NEW_POSTS_HOT" => $lang['New_posts_hot'], ! "L_TOPIC_IS_LOCKED" => $lang['Topic_is_locked'], "L_ANNOUNCEMENT" => $lang['Post_Announcement'], "L_STICKY" => $lang['Post_Sticky'], --- 220,225 ---- "L_NO_NEW_POSTS_HOT" => $lang['No_new_posts_hot'], "L_NEW_POSTS_HOT" => $lang['New_posts_hot'], ! "L_NO_NEW_POSTS_LOCKED" => $lang['No_new_posts_locked'], ! "L_NEW_POSTS_LOCKED" => $lang['New_posts_locked'], "L_ANNOUNCEMENT" => $lang['Post_Announcement'], "L_STICKY" => $lang['Post_Sticky'], |
|
From: Paul S. O. <ps...@us...> - 2001-11-04 12:55:26
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv9214/templates/subSilver
Modified Files:
viewforum_body.tpl
Log Message:
Support for new locked with new topics icon
Index: viewforum_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/viewforum_body.tpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** viewforum_body.tpl 2001/11/03 15:15:05 1.8
--- viewforum_body.tpl 2001/11/04 12:55:23 1.9
***************
*** 75,78 ****
--- 75,80 ----
<td class="gensmall">{L_NO_NEW_POSTS}</td>
<td> </td>
+ <td width="20" align="center"><img src="templates/subSilver/images/folder_announce.gif" alt="{L_ANNOUNCEMENT}" width="19" height="18" /></td>
+ <td class="gensmall">{L_ANNOUNCEMENT}</td>
</tr>
<tr>
***************
*** 82,95 ****
<td width="20" align="center"><img src="templates/subSilver/images/folder_hot.gif" alt="{L_NO_NEW_POSTS_HOT}" width="19" height="18" /></td>
<td class="gensmall">{L_NO_NEW_POSTS_HOT}</td>
! </tr>
! <tr>
<td width="20" align="center"><img src="templates/subSilver/images/folder_sticky.gif" alt="{L_STICKY}" width="19" height="18" /></td>
<td class="gensmall">{L_STICKY}</td>
! <td> </td>
! <td width="20" align="center"><img src="templates/subSilver/images/folder_announce.gif" alt="{L_ANNOUNCEMENT}" width="19" height="18" /></td>
! <td class="gensmall">{L_ANNOUNCEMENT}</td>
<td> </td>
! <td class="gensmall"><img src="templates/subSilver/images/folder_lock.gif" alt="{L_TOPIC_IS_LOCKED}" width="19" height="18" /></td>
! <td class="gensmall">{L_TOPIC_IS_LOCKED}</td>
</table></td>
<td align="right"><span class="gensmall">{S_AUTH_LIST}</span></td>
--- 84,97 ----
<td width="20" align="center"><img src="templates/subSilver/images/folder_hot.gif" alt="{L_NO_NEW_POSTS_HOT}" width="19" height="18" /></td>
<td class="gensmall">{L_NO_NEW_POSTS_HOT}</td>
! <td> </td>
<td width="20" align="center"><img src="templates/subSilver/images/folder_sticky.gif" alt="{L_STICKY}" width="19" height="18" /></td>
<td class="gensmall">{L_STICKY}</td>
! </tr>
! <tr>
! <td class="gensmall"><img src="templates/subSilver/images/folder_lock_new.gif" alt="{L_NEW_POSTS_TOPIC_LOCKED}" width="19" height="18" /></td>
! <td class="gensmall">{L_NEW_POSTS_LOCKED}</td>
<td> </td>
! <td class="gensmall"><img src="templates/subSilver/images/folder_lock.gif" alt="{L_NO_NEW_POSTS_TOPIC_LOCKED}" width="19" height="18" /></td>
! <td class="gensmall">{L_NO_NEW_POSTS_LOCKED}</td>
</table></td>
<td align="right"><span class="gensmall">{S_AUTH_LIST}</span></td>
|
|
From: Paul S. O. <ps...@us...> - 2001-11-04 12:55:25
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv9214
Modified Files:
viewforum.php
Log Message:
Support for new locked with new topics icon
Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -r1.98 -r1.99
*** viewforum.php 2001/11/03 13:57:29 1.98
--- viewforum.php 2001/11/04 12:55:22 1.99
***************
*** 113,156 ****
if( $mark_read == "topics" )
{
! $sql = "SELECT t.topic_id, p.post_time
! FROM " . TOPICS_TABLE . " t, " . POSTS_TABLE . " p
! WHERE t.forum_id = $forum_id
! AND p.post_id = t.topic_last_post_id
! AND p.post_time > " . $userdata['session_last_visit'] . "
! AND t.topic_moved_id IS NULL";
! if(!$t_result = $db->sql_query($sql))
! {
! message_die(GENERAL_ERROR, "Couldn't obtain topic information", "", __LINE__, __FILE__, $sql);
! }
!
! if( $mark_read_rows = $db->sql_numrows($t_result) )
{
! $mark_read_list = $db->sql_fetchrowset($t_result);
! for($i = 0; $i < $mark_read_rows; $i++ )
{
! $topic_id = $mark_read_list[$i]['topic_id'];
! $post_time = $mark_read_list[$i]['post_time'];
! if( empty($HTTP_COOKIE_VARS['phpbb2_' . $forum_id . '_' . $topic_id]) )
{
! setcookie('phpbb2_' . $forum_id . '_' . $topic_id, time(), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
! }
! else
! {
! if( isset($HTTP_COOKIE_VARS['phpbb2_' . $forum_id . '_' . $topic_id]) )
{
setcookie('phpbb2_' . $forum_id . '_' . $topic_id, time(), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
}
}
}
- }
! $template->assign_vars(array(
! "META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id") . '">')
! );
! $message = $lang['Topics_marked_read'] . "<br /><br />" . sprintf($lang['Click_return_forum'], "<a href=\"" . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id") . "\">", "</a> ");
! message_die(GENERAL_MESSAGE, $message);
}
//
--- 113,159 ----
if( $mark_read == "topics" )
{
! if( $userdata['session_last_visit'] )
{
! $sql = "SELECT t.topic_id, p.post_time
! FROM " . TOPICS_TABLE . " t, " . POSTS_TABLE . " p
! WHERE t.forum_id = $forum_id
! AND p.post_id = t.topic_last_post_id
! AND p.post_time > " . $userdata['session_last_visit'] . "
! AND t.topic_moved_id IS NULL";
! if(!$t_result = $db->sql_query($sql))
! {
! message_die(GENERAL_ERROR, "Couldn't obtain topic information", "", __LINE__, __FILE__, $sql);
! }
! if( $mark_read_rows = $db->sql_numrows($t_result) )
{
! $mark_read_list = $db->sql_fetchrowset($t_result);
! for($i = 0; $i < $mark_read_rows; $i++ )
{
! $topic_id = $mark_read_list[$i]['topic_id'];
! $post_time = $mark_read_list[$i]['post_time'];
!
! if( empty($HTTP_COOKIE_VARS['phpbb2_' . $forum_id . '_' . $topic_id]) )
{
setcookie('phpbb2_' . $forum_id . '_' . $topic_id, time(), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
}
+ else
+ {
+ if( isset($HTTP_COOKIE_VARS['phpbb2_' . $forum_id . '_' . $topic_id]) )
+ {
+ setcookie('phpbb2_' . $forum_id . '_' . $topic_id, time(), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
+ }
+ }
}
}
! $template->assign_vars(array(
! "META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id") . '">')
! );
! $message = $lang['Topics_marked_read'] . "<br /><br />" . sprintf($lang['Click_return_forum'], "<a href=\"" . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id") . "\">", "</a> ");
! message_die(GENERAL_MESSAGE, $message);
! }
}
//
***************
*** 475,485 ****
}
! if( $topic_rowset[$i]['topic_status'] == TOPIC_LOCKED )
{
- $folder_image = "<img src=\"" . $images['folder_locked'] . "\" alt=\"" . $lang['Topic_locked'] . "\" />";
- $newest_post_img = "";
- }
- else if( $topic_rowset[$i]['topic_status'] == TOPIC_MOVED )
- {
$topic_type = $lang['Topic_Moved'] . " ";
$topic_id = $topic_rowset[$i]['topic_moved_id'];
--- 478,483 ----
}
! if( $topic_rowset[$i]['topic_status'] == TOPIC_MOVED )
{
$topic_type = $lang['Topic_Moved'] . " ";
$topic_id = $topic_rowset[$i]['topic_moved_id'];
***************
*** 490,494 ****
else
{
! if( $topic_rowset[$i]['topic_type'] == POST_ANNOUNCE )
{
$folder = $images['folder_announce'];
--- 488,497 ----
else
{
! if( $topic_rowset[$i]['topic_status'] == TOPIC_LOCKED )
! {
! $folder = $images['folder_locked'];
! $folder_new = $images['folder_locked_new'];
! }
! else if( $topic_rowset[$i]['topic_type'] == POST_ANNOUNCE )
{
$folder = $images['folder_announce'];
***************
*** 505,509 ****
{
$folder = $images['folder_hot'];
! $folder_new = $images['folder_new_hot'];
}
else
--- 508,512 ----
{
$folder = $images['folder_hot'];
! $folder_new = $images['folder_hot_new'];
}
else
***************
*** 532,536 ****
else
{
! $folder_image = "<img src=\"$folder\" alt=\"" . $lang['No_new_posts'] . "\" />";
$newest_post_img = "";
}
--- 535,540 ----
else
{
! $folder_alt = ( $topic_rowset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts'];
! $folder_image = "<img src=\"$folder\" alt=\"$folder_alt\" />";
$newest_post_img = "";
}
***************
*** 538,542 ****
else
{
! $folder_image = "<img src=\"$folder\" alt=\"" . $lang['No_new_posts'] . "\" />";
$newest_post_img = "";
}
--- 542,547 ----
else
{
! $folder_alt = ( $topic_rowset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts'];
! $folder_image = "<img src=\"$folder\" alt=\"$folder_alt\" />";
$newest_post_img = "";
}
|
|
From: Paul S. O. <ps...@us...> - 2001-11-04 12:55:25
|
Update of /cvsroot/phpbb/phpBB2/language/lang_english In directory usw-pr-cvs1:/tmp/cvs-serv9214/language/lang_english Modified Files: lang_main.php Log Message: Support for new locked with new topics icon Index: lang_main.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -r1.22 -r1.23 *** lang_main.php 2001/11/03 19:17:06 1.22 --- lang_main.php 2001/11/04 12:55:22 1.23 *************** *** 152,156 **** $lang['No_new_posts_hot'] = "No new posts [ Popular ]"; $lang['New_posts_hot'] = "New posts [ Popular ]"; ! $lang['Topic_is_locked'] = "Topic is locked"; $lang['Forum_is_locked'] = "Forum is locked"; --- 152,157 ---- $lang['No_new_posts_hot'] = "No new posts [ Popular ]"; $lang['New_posts_hot'] = "New posts [ Popular ]"; ! $lang['No_new_posts_locked'] = "No new posts [ Locked ]"; ! $lang['New_posts_locked'] = "New posts [ Locked ]"; $lang['Forum_is_locked'] = "Forum is locked"; |
|
From: Paul S. O. <ps...@us...> - 2001-11-04 12:40:49
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver/images In directory usw-pr-cvs1:/tmp/cvs-serv6526/templates/subSilver/images Added Files: folder_lock_new.gif Log Message: New icon --- NEW FILE --- GIF89a b¹Óß$p9|ÄØãñóô¿ìî隣úüýz ã5·ÌÀÒM£ÁËѼÃÆXÿÿÿ!ù /&CAL§P$à <pÃà ÉWÌnÐÌCC§î ¦zY u ) )3?`z)8 &, ¹ §¨Á³$ 1,&(ÃË´!6?"3Î çç%'B <ÛôÛ#- CF=óîÝ#PbDN.T¨QB Jl¸EË |
|
From: Paul S. O. <ps...@us...> - 2001-11-03 22:39:40
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv31028/admin
Modified Files:
index.php
Log Message:
Hopefully killed bug #472269 dead, a touch of Domestos power
Index: index.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/index.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** index.php 2001/11/03 21:56:17 1.22
--- index.php 2001/11/03 22:39:37 1.23
***************
*** 202,206 ****
{
$row = $db->sql_fetchrow($result);
! echo $version = $row['mysql_version'];
if( preg_match("/^(3\.23|4\.)/", $version) )
--- 202,206 ----
{
$row = $db->sql_fetchrow($result);
! $version = $row['mysql_version'];
if( preg_match("/^(3\.23|4\.)/", $version) )
|
|
From: Paul S. O. <ps...@us...> - 2001-11-03 21:56:20
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv21567/admin
Modified Files:
index.php
Log Message:
Hopefully killed bug #472269 dead, a touch of Domestos power
Index: index.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/index.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** index.php 2001/10/14 15:46:53 1.21
--- index.php 2001/11/03 21:56:17 1.22
***************
*** 196,206 ****
// in phpMyAdmin 2.2.0
//
! if(SQL_LAYER == 'mysql')
{
$sql = "SELECT VERSION() AS mysql_version";
if($result = $db->sql_query($sql))
{
! list($version) = $db->sql_fetchrow($result);
! if( ereg("^3\.23", $version) )
{
$sql = "SHOW TABLE STATUS
--- 196,208 ----
// in phpMyAdmin 2.2.0
//
! if( preg_match("/^mysql/", SQL_LAYER) )
{
$sql = "SELECT VERSION() AS mysql_version";
if($result = $db->sql_query($sql))
{
! $row = $db->sql_fetchrow($result);
! echo $version = $row['mysql_version'];
!
! if( preg_match("/^(3\.23|4\.)/", $version) )
{
$sql = "SHOW TABLE STATUS
***************
*** 215,229 ****
for($i = 0; $i < count($tabledata_ary); $i++)
{
! if($tabledata_ary[$i]['Type'] != "MRG_MyISAM" && strstr($tabledata_ary[$i]['Name'], $table_prefix) )
{
! $dbsize += $tabledata_ary[$i]['Data_length'] + $tabledata_ary[$i]['Index_length'];
}
}
! if($dbsize >= 1048576)
{
$dbsize = sprintf("%.2f MB", ( $dbsize / 1048576 ));
}
! else if($dbsize >= 1024)
{
$dbsize = sprintf("%.2f KB", ( $dbsize / 1024 ));
--- 217,241 ----
for($i = 0; $i < count($tabledata_ary); $i++)
{
! if( $tabledata_ary[$i]['Type'] != "MRG_MyISAM" )
{
! if( $table_prefix != "" )
! {
! if( strstr($tabledata_ary[$i]['Name'], $table_prefix) )
! {
! $dbsize += $tabledata_ary[$i]['Data_length'] + $tabledata_ary[$i]['Index_length'];
! }
! }
! else
! {
! $dbsize += $tabledata_ary[$i]['Data_length'] + $tabledata_ary[$i]['Index_length'];
! }
}
}
! if( $dbsize >= 1048576 )
{
$dbsize = sprintf("%.2f MB", ( $dbsize / 1048576 ));
}
! else if( $dbsize >= 1024 )
{
$dbsize = sprintf("%.2f KB", ( $dbsize / 1024 ));
|
|
From: Paul S. O. <ps...@us...> - 2001-11-03 21:49:04
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv19914/includes
Modified Files:
functions.php page_header.php
Log Message:
Fixed bug #477831 + some minor alterations
Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -r1.78 -r1.79
*** functions.php 2001/10/25 23:21:11 1.78
--- functions.php 2001/11/03 21:49:01 1.79
***************
*** 787,806 ****
"-1" => "(GMT -1:00 hours) Azores, Cape Verde Islands",
"0" => "(GMT) Casablanca, Dublin, Edinburgh, London, Lisbon, Monrovia",
! "+1" => "(GMT +1:00 hours) Berlin, Brussels, Copenhagen, Madrid, Paris, Rome",
! "+2" => "(GMT +2:00 hours) Kaliningrad, South Africa, Warsaw",
! "+3" => "(GMT +3:00 hours) Baghdad, Riyadh, Moscow, Nairobi",
! "+3.5" => "(GMT +3:30 hours) Tehran",
! "+4" => "(GMT +4:00 hours) Abu Dhabi, Baku, Muscat, Tbilisi",
! "+4.5" => "(GMT +4:30 hours) Kabul",
! "+5" => "(GMT +5:00 hours) Ekaterinburg, Islamabad, Karachi, Tashkent",
! "+5.5" => "(GMT +5:30 hours) Bombay, Calcutta, Madras, New Delhi",
! "+6" => "(GMT +6:00 hours) Almaty, Colombo, Dhaka",
! "+7" => "(GMT +7:00 hours) Bangkok, Hanoi, Jakarta",
! "+8" => "(GMT +8:00 hours) Beijing, Hong Kong, Perth, Singapore, Taipei",
! "+9" => "(GMT +9:00 hours) Osaka, Sapporo, Seoul, Tokyo, Yakutsk",
! "+9.5" => "(GMT +9:30 hours) Adelaide, Darwin",
! "+10" => "(GMT +10:00 hours) Melbourne, Papua New Guinea, Sydney, Vladivostok",
! "+11" => "(GMT +11:00 hours) Magadan, New Caledonia, Solomon Islands",
! "+12" => "(GMT +12:00 hours) Auckland, Wellington, Fiji, Marshall Island");
while( list($offset, $zone) = each($tz_array) )
--- 787,806 ----
"-1" => "(GMT -1:00 hours) Azores, Cape Verde Islands",
"0" => "(GMT) Casablanca, Dublin, Edinburgh, London, Lisbon, Monrovia",
! "1" => "(GMT +1:00 hours) Berlin, Brussels, Copenhagen, Madrid, Paris, Rome",
! "2" => "(GMT +2:00 hours) Kaliningrad, South Africa, Warsaw",
! "3" => "(GMT +3:00 hours) Baghdad, Riyadh, Moscow, Nairobi",
! "3.5" => "(GMT +3:30 hours) Tehran",
! "4" => "(GMT +4:00 hours) Abu Dhabi, Baku, Muscat, Tbilisi",
! "4.5" => "(GMT +4:30 hours) Kabul",
! "5" => "(GMT +5:00 hours) Ekaterinburg, Islamabad, Karachi, Tashkent",
! "5.5" => "(GMT +5:30 hours) Bombay, Calcutta, Madras, New Delhi",
! "6" => "(GMT +6:00 hours) Almaty, Colombo, Dhaka",
! "7" => "(GMT +7:00 hours) Bangkok, Hanoi, Jakarta",
! "8" => "(GMT +8:00 hours) Beijing, Hong Kong, Perth, Singapore, Taipei",
! "9" => "(GMT +9:00 hours) Osaka, Sapporo, Seoul, Tokyo, Yakutsk",
! "9.5" => "(GMT +9:30 hours) Adelaide, Darwin",
! "10" => "(GMT +10:00 hours) Melbourne, Papua New Guinea, Sydney, Vladivostok",
! "11" => "(GMT +11:00 hours) Magadan, New Caledonia, Solomon Islands",
! "12" => "(GMT +12:00 hours) Auckland, Wellington, Fiji, Marshall Island");
while( list($offset, $zone) = each($tz_array) )
Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -r1.57 -r1.58
*** page_header.php 2001/11/03 15:15:05 1.57
--- page_header.php 2001/11/03 21:49:01 1.58
***************
*** 76,80 ****
{
$u_login_logout = "login.$phpEx?logout=true";
! $l_login_logout = $lang['Logout'] . " : " . $userdata["username"] . "";
}
else
--- 76,80 ----
{
$u_login_logout = "login.$phpEx?logout=true";
! $l_login_logout = $lang['Logout'] . " [ " . $userdata["username"] . " ]";
}
else
***************
*** 246,249 ****
--- 246,251 ----
"S_CONTENT_DIRECTION" => $lang['DIRECTION'],
"S_CONTENT_ENCODING" => $lang['ENCODING'],
+ "S_CONTENT_DIR_LEFT" => $lang['LEFT'],
+ "S_CONTENT_DIR_RIGHT" => $lang['RIGHT'],
"S_TIMEZONE" => $lang['All_times'] . " " . $lang[$board_config['board_timezone']],
"S_LOGIN_ACTION" => append_sid("login.$phpEx"),
|
|
From: Paul S. O. <ps...@us...> - 2001-11-03 19:33:36
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv27432
Modified Files:
profile.php
Log Message:
Fixed error #475726 + lang updates
Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -r1.123 -r1.124
*** profile.php 2001/10/22 01:11:47 1.123
--- profile.php 2001/11/03 19:33:33 1.124
***************
*** 77,93 ****
if($email_taken['user_email'] != "")
{
! return(0);
}
! return(1);
}
else
{
! return(0);
}
}
else
{
! return(0);
}
}
--- 77,93 ----
if($email_taken['user_email'] != "")
{
! return false;
}
! return true;
}
else
{
! return false;
}
}
else
{
! return false;
}
}
***************
*** 752,758 ****
if($mode == "editprofile")
{
! if(file_exists("./" . $board_config['avatar_path'] . "/" . $user_id))
{
! @unlink("./" . $board_config['avatar_path'] . "/" . $user_id);
}
}
--- 752,758 ----
if($mode == "editprofile")
{
! if( @file_exists("./" . $board_config['avatar_path'] . "/" . $userdata['user_avatar']) )
{
! @unlink("./" . $board_config['avatar_path'] . "/". $userdata['user_avatar']);
}
}
***************
*** 857,863 ****
if($mode == "editprofile")
{
! if(file_exists("./" . $board_config['avatar_path'] . "/" . $user_id))
{
! @unlink("./" . $board_config['avatar_path'] . "/" . $user_id);
}
}
--- 857,863 ----
if($mode == "editprofile")
{
! if(file_exists("./" . $board_config['avatar_path'] . "/" . $userdata['user_avatar']))
{
! @unlink("./" . $board_config['avatar_path'] . "/" . $userdata['user_avatar']);
}
}
***************
*** 1014,1018 ****
$emailer->reset();
! $message = $lang['Profile_updated_inactive'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("index.$phpEx") . "\">" . $lang['Here'] . "</a> " . $lang['to_return_index'];
// Log the user out as their account is no longer active
--- 1014,1018 ----
$emailer->reset();
! $message = $lang['Profile_updated_inactive'] . "<br /><br />" . sprintf($lang['Click_return_index'], "<a href=\"" . append_sid("index.$phpEx") . "\">", "</a>");
// Log the user out as their account is no longer active
***************
*** 1026,1030 ****
else
{
! $message = $lang['Profile_updated'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("index.$phpEx") . "\">" . $lang['Here'] . "</a> " . $lang['to_return_index'];
}
--- 1026,1030 ----
else
{
! $message = $lang['Profile_updated'] . "<br /><br />" . sprintf($lang['Click_return_index'], "<a href=\"" . append_sid("index.$phpEx") . "\">", "</a>");
}
***************
*** 1161,1165 ****
);
! $message = $message . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("index.$phpEx") . "\">" . $lang['Here'] . "</a> " . $lang['to_return_index'];
message_die(GENERAL_MESSAGE, $message);
--- 1161,1165 ----
);
! $message = $message . "<br /><br />" . sprintf($lang['Click_return_index'], "<a href=\"" . append_sid("index.$phpEx") . "\">", "</a>");
message_die(GENERAL_MESSAGE, $message);
***************
*** 1677,1681 ****
);
! $message = $lang['Password_updated'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("index.$phpEx") . "\">" . $lang['Here'] . "</a> " . $lang['to_return_index'];
message_die(GENERAL_MESSAGE, $message);
--- 1677,1681 ----
);
! $message = $lang['Password_updated'] . "<br /><br />" . sprintf($lang['Click_return_index'], "<a href=\"" . append_sid("index.$phpEx") . "\">", "</a>");
message_die(GENERAL_MESSAGE, $message);
|
|
From: Paul S. O. <ps...@us...> - 2001-11-03 19:17:09
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv24237/admin
Modified Files:
admin_groups.php
Log Message:
Group control panel updates and mods + hidden group ability
Index: admin_groups.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_groups.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** admin_groups.php 2001/10/30 23:44:39 1.12
--- admin_groups.php 2001/11/03 19:17:06 1.13
***************
*** 37,41 ****
if( isset($HTTP_POST_VARS[POST_GROUPS_URL]) || isset($HTTP_GET_VARS[POST_GROUPS_URL]) )
{
! $group_id = ( isset($HTTP_POST_VARS[POST_GROUPS_URL]) ) ? $HTTP_POST_VARS[POST_GROUPS_URL] : $HTTP_GET_VARS[POST_GROUPS_URL];
}
else
--- 37,41 ----
if( isset($HTTP_POST_VARS[POST_GROUPS_URL]) || isset($HTTP_GET_VARS[POST_GROUPS_URL]) )
{
! $group_id = ( isset($HTTP_POST_VARS[POST_GROUPS_URL]) ) ? intval($HTTP_POST_VARS[POST_GROUPS_URL]) : intval($HTTP_GET_VARS[POST_GROUPS_URL]);
}
else
***************
*** 44,48 ****
}
-
if( isset($HTTP_POST_VARS['edit']) || isset($HTTP_POST_VARS['new']) )
{
--- 44,47 ----
***************
*** 78,83 ****
"group_description" => "",
"group_moderator" => "",
! "group_type" => "1"
! );
$group_open = "checked=\"checked\"";
--- 77,81 ----
"group_description" => "",
"group_moderator" => "",
! "group_type" => GROUP_OPEN);
$group_open = "checked=\"checked\"";
***************
*** 108,113 ****
$select_list .= "</select>";
! $group_open = ( !empty($group_info['group_type']) ) ? "checked=\"checked\"" : "";
! $group_closed = ( empty($group_info['group_type']) ) ? "checked=\"checked\"" : "";
$template->set_filenames(array(
--- 106,112 ----
$select_list .= "</select>";
! $group_open = ( $group_info['group_type'] == GROUP_OPEN ) ? "checked=\"checked\"" : "";
! $group_closed = ( $group_info['group_type'] == GROUP_CLOSED ) ? "checked=\"checked\"" : "";
! $group_hidden = ( $group_info['group_type'] == GROUP_HIDDEN ) ? "checked=\"checked\"" : "";
$template->set_filenames(array(
***************
*** 129,132 ****
--- 128,132 ----
"L_GROUP_OPEN" => $lang['group_open'],
"L_GROUP_CLOSED" => $lang['group_closed'],
+ "L_GROUP_HIDDEN" => $lang['group_hidden'],
"L_GROUP_DELETE" => $lang['group_delete'],
"L_GROUP_DELETE_CHECK" => $lang['group_delete_check'],
***************
*** 138,143 ****
--- 138,147 ----
"S_SELECT_MODERATORS" => $select_list,
+ "S_GROUP_OPEN_TYPE" => GROUP_OPEN,
+ "S_GROUP_CLOSED_TYPE" => GROUP_CLOSED,
+ "S_GROUP_HIDDEN_TYPE" => GROUP_HIDDEN,
"S_GROUP_OPEN_CHECKED" => $group_open,
"S_GROUP_CLOSED_CHECKED" => $group_closed,
+ "S_GROUP_HIDDEN_CHECKED" => $group_hidden,
"S_GROUP_ACTION" => append_sid("admin_groups.$phpEx"),
"S_HIDDEN_FIELDS" => $s_hidden_fields)
|
|
From: Paul S. O. <ps...@us...> - 2001-11-03 19:17:09
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver/admin
In directory usw-pr-cvs1:/tmp/cvs-serv24237/templates/subSilver/admin
Modified Files:
group_edit_body.tpl
Log Message:
Group control panel updates and mods + hidden group ability
Index: group_edit_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/group_edit_body.tpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** group_edit_body.tpl 2001/10/15 00:38:30 1.5
--- group_edit_body.tpl 2001/11/03 19:17:06 1.6
***************
*** 36,43 ****
<td class="row1" width="38%"><span class="gen">{L_GROUP_STATUS}:</span></td>
<td class="row2" width="62%">
! <input type="radio" name="group_type" value="1" {S_GROUP_OPEN_CHECKED} />
! {L_GROUP_OPEN}
! <input type="radio" name="group_type" value="0" {S_GROUP_CLOSED_CHECKED} />
! {L_GROUP_CLOSED}</td>
</tr>
<tr>
--- 36,40 ----
<td class="row1" width="38%"><span class="gen">{L_GROUP_STATUS}:</span></td>
<td class="row2" width="62%">
! <input type="radio" name="group_type" value="{S_GROUP_OPEN_TYPE}" {S_GROUP_OPEN_CHECKED} /> {L_GROUP_OPEN} <input type="radio" name="group_type" value="{S_GROUP_CLOSED_TYPE}" {S_GROUP_CLOSED_CHECKED} /> {L_GROUP_CLOSED} <input type="radio" name="group_type" value="{S_GROUP_HIDDEN_TYPE}" {S_GROUP_HIDDEN_CHECKED} /> {L_GROUP_HIDDEN}</td>
</tr>
<tr>
|
|
From: Paul S. O. <ps...@us...> - 2001-11-03 19:17:09
|
Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv24237/templates/subSilver
Modified Files:
groupcp_info_body.tpl groupcp_user_body.tpl
Added Files:
groupcp_pending_info.tpl
Log Message:
Group control panel updates and mods + hidden group ability
--- NEW FILE ---
<br clear="all" />
<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
<tr>
<th class="thCornerL" height="25">{L_PM}</th>
<th class="thTop">{L_USERNAME}</th>
<th class="thTop">{L_POSTS}</th>
<th class="thTop">{L_FROM}</th>
<th class="thTop">{L_EMAIL}</th>
<th class="thTop">{L_WEBSITE}</th>
<th class="thCornerR">{L_SELECT}</th>
</tr>
<tr>
<td class="catSides" colspan="8" height="28"><span class="cattitle">{L_PENDING_MEMBERS}</span></td>
</tr>
<!-- BEGIN pending_members_row -->
<tr>
<td class="{pending_members_row.ROW_CLASS}" align="center"> {pending_members_row.PM_IMG}
</td>
<td class="{pending_members_row.ROW_CLASS}" align="center"><span class="gen"><a href="{pending_members_row.U_VIEWPROFILE}" class="gen">{pending_members_row.USERNAME}</a></span></td>
<td class="{pending_members_row.ROW_CLASS}" align="center"><span class="gen">{pending_members_row.POSTS}</span></td>
<td class="{pending_members_row.ROW_CLASS}" align="center"><span class="gen">{pending_members_row.FROM}</span></td>
<td class="{pending_members_row.ROW_CLASS}" align="center"><span class="gen">{pending_members_row.EMAIL_IMG}</span></td>
<td class="{pending_members_row.ROW_CLASS}" align="center"><span class="gen">{pending_members_row.WWW_IMG}</span></td>
<td class="{pending_members_row.ROW_CLASS}" align="center"><span class="gensmall"> <input type="checkbox" name="pending_members[]" value="{pending_members_row.USER_ID}" /></span></td>
</tr>
<!-- END pending_members_row -->
<tr>
<td class="cat" colspan="8" align="right"><span class="cattitle">
<input type="submit" name="approve" value="{L_APPROVE_SELECTED}" class="mainoption" />
<input type="submit" name="deny" value="{L_DENY_SELECTED}" class="liteoption" />
</span></td>
</tr>
</table>
Index: groupcp_info_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/groupcp_info_body.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** groupcp_info_body.tpl 2001/10/06 04:44:47 1.3
--- groupcp_info_body.tpl 2001/11/03 19:17:06 1.4
***************
*** 1,3 ****
--- 1,4 ----
+ <form method="POST" action="{S_GROUP_INFO_ACTION}">
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr>
***************
*** 5,9 ****
</tr>
</table>
! <form method="POST" action="{S_GROUP_INFO_ACTION}">
<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
<tr>
--- 6,10 ----
</tr>
</table>
!
<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
<tr>
***************
*** 20,33 ****
<tr>
<td class="row1" width="20%"><span class="gen">{L_GROUP_MEMBERSHIP}:</span></td>
! <td class="row2"><span class="gen">{GROUP_DETAILS}{S_HIDDEN_FIELDS}</span></td>
</tr>
</table>
</form>
! <form action="{S_PENDING_ACTION}" method="POST" name="post">
! {S_PENDING_HIDDEN_FIELDS}
! <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
<tr>
! <th class="thCornerL" height="25">Private Message</th>
<th class="thTop">{L_USERNAME}</th>
<th class="thTop">{L_POSTS}</th>
--- 21,47 ----
<tr>
<td class="row1" width="20%"><span class="gen">{L_GROUP_MEMBERSHIP}:</span></td>
! <td class="row2"><span class="gen">{GROUP_DETAILS}
! <!-- BEGIN switch_subscribe_group_input -->
! <input class="mainoption" type="submit" name="joingroup" value="{L_JOIN_GROUP}" />
! <!-- END switch_subscribe_group_input -->
! <!-- BEGIN switch_unsubscribe_group_input -->
! <input class="mainoption" type="submit" name="unsub" value="{L_UNSUBSCRIBE_GROUP}" />
! <!-- END switch_unsubscribe_group_input -->
! </span></td>
! </tr>
! <!-- BEGIN switch_mod_option -->
! <tr>
! <td class="row1" width="20%"><span class="gen">{L_GROUP_STATUS}:</span></td>
! <td class="row2"><span class="gen"><span class="gen"><input type="radio" name="group_type" value="{S_GROUP_OPEN_TYPE}" {S_GROUP_OPEN_CHECKED} /> {L_GROUP_OPEN} <input type="radio" name="group_type" value="{S_GROUP_CLOSED_TYPE}" {S_GROUP_CLOSED_CHECKED} /> {L_GROUP_CLOSED} <input type="radio" name="group_type" value="{S_GROUP_HIDDEN_TYPE}" {S_GROUP_HIDDEN_CHECKED} /> {L_GROUP_HIDDEN} <input class="mainoption" type="submit" name="groupstatus" value="{L_UPDATE}" /></span></td>
</tr>
+ <!-- END switch_mod_option -->
</table>
+ {S_HIDDEN_FIELDS}
</form>
! <form action="{S_PENDING_ACTION}" method="post" name="post">
! <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
<tr>
! <th class="thCornerL" height="25">{L_PM}</th>
<th class="thTop">{L_USERNAME}</th>
<th class="thTop">{L_POSTS}</th>
***************
*** 37,43 ****
<th class="thCornerR">{L_SELECT}</th>
</tr>
<tr>
! <td class="catSides" colspan="7" height="28"><span class="cattitle">Group Moderator</span></td>
</tr>
<tr>
<td class="row1" align="center"> {MOD_PM_IMG} </td>
--- 51,59 ----
<th class="thCornerR">{L_SELECT}</th>
</tr>
+
<tr>
! <td class="catSides" colspan="8" height="28"><span class="cattitle">{L_GROUP_MODERATOR}</span></td>
</tr>
+
<tr>
<td class="row1" align="center"> {MOD_PM_IMG} </td>
***************
*** 46,126 ****
<td class="row1" align="center" valign="middle"><span class="gen">{MOD_FROM}</span></td>
<td class="row1" align="center" valign="middle"><span class="gen">{MOD_EMAIL_IMG}</span></td>
! <td class="row1" align="center" colspan="2">{MOD_WWW_IMG}</td>
</tr>
<tr>
! <td class="catSides" colspan="8" height="28"><span class="cattitle">Group Members</span></td>
</tr>
! <!-- BEGIN memberrow -->
<tr>
! <td class="{memberrow.ROW_CLASS}" align="center"> {memberrow.PM_IMG} </td>
! <td class="{memberrow.ROW_CLASS}" align="center"><span class="gen"><a href="{memberrow.U_VIEWPROFILE}" class="gen">{memberrow.USERNAME}</a></span></td>
! <td class="{memberrow.ROW_CLASS}" align="center"><span class="gen">{memberrow.POSTS}</span></td>
! <td class="{memberrow.ROW_CLASS}" align="center"><span class="gen"> {memberrow.FROM}
</span></td>
! <td class="{memberrow.ROW_CLASS}" align="center" valign="middle"><span class="gen">{memberrow.EMAIL_IMG}</span></td>
! <td class="{memberrow.ROW_CLASS}" align="center"> {memberrow.WWW_IMG}</td>
! <td class="{memberrow.ROW_CLASS}" align="center">
! <!-- BEGIN memberselect -->
! <input type="checkbox" name="member[]" value="{memberrow.memberselect.USER_ID}" /> <span class="gen">{L_SELECT}</span>
! <!-- END memberselect -->
</td>
- </tr>
- <!-- END memberrow -->
- <!-- BEGIN modoption -->
- <tr>
- <td class="cat" colspan="8" align="right"><span class="cattitle">
- <input type="submit" name="remove" value="{L_REMOVESELECTED}" class="mainoption" />
- </td>
</tr>
! <!-- END modoption -->
! <!-- BEGIN pendingmembers -->
<tr>
! <td class="catSides" colspan="6" height="28"><span class="cattitle">Pending Members</span></td>
! <td class="catSides" align="center"><span class="gen"><b>Action</b></span></td>
</tr>
! <!-- END pendingmembers -->
! <!-- BEGIN pendingmembersrow -->
<tr>
! <td class="{pendingmembersrow.ROW_CLASS}" align="center"> {pendingmembersrow.PM_IMG}
! </td>
! <td class="{pendingmembersrow.ROW_CLASS}" align="center"><span class="gen"><a href="{pendingmembersrow.U_VIEWPROFILE}" class="gen">{pendingmembersrow.USERNAME}</a></span></td>
! <td class="{pendingmembersrow.ROW_CLASS}" align="center"><span class="gen">{pendingmembersrow.POSTS}</span></td>
! <td class="{pendingmembersrow.ROW_CLASS}" align="center"><span class="gen">{pendingmembersrow.FROM}</span></td>
! <td class="{pendingmembersrow.ROW_CLASS}" align="center"><span class="gen">{pendingmembersrow.EMAIL_IMG}</span></td>
! <td class="{pendingmembersrow.ROW_CLASS}" align="center"><span class="gen">{pendingmembersrow.WWW_IMG}</span></td>
! <td class="{pendingmembersrow.ROW_CLASS}" align="center"><span class="gensmall">{pendingmembersrow.SELECT}
! {L_SELECT}</span></td>
! </tr>
! <!-- END pendingmembersrow -->
! <!-- BEGIN pendingmembers -->
! <tr>
! <td class="cat" colspan="8" align="right"><span class="cattitle">
! <input type="submit" name="approve" value="{L_APPROVESELECTED}" class="mainoption" />
!
! <input type="submit" name="deny" value="{L_DENYSELECTED}" class="liteoption" />
! </span></td>
</tr>
! <!-- END pendingmembers -->
! <!-- BEGIN nomembers -->
! <tr>
! <td class="row1" colspan="7" align="center">{L_NO_MEMBERS}</td>
</tr>
! <!-- END nomembers -->
! </table>
! <table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
<tr>
! <td align="left" valign="top"><span class="genmed">
! <!-- BEGIN addmember -->
! <input type="text" class="post" name="username" maxlength="50" size="20" />
!
! <input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="liteoption" onClick="window.open('privmsg.php?mode=searchuser', '_phpbbsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" />
! <input type="submit" name="add" value="{L_ADDMEMBER}" class="mainoption" />
! </span>
! <!-- END addmember -->
! </td>
! <td align="right" valign="top"><span class="gensmall">{S_TIMEZONE}</span></td>
</tr>
! </table>
! </form>
<table width="100%" cellspacing="2" border="0" align="center">
<tr>
--- 62,126 ----
<td class="row1" align="center" valign="middle"><span class="gen">{MOD_FROM}</span></td>
<td class="row1" align="center" valign="middle"><span class="gen">{MOD_EMAIL_IMG}</span></td>
! <td class="row1" align="center">{MOD_WWW_IMG}</td>
! <td class="row1" align="center"> </td>
</tr>
+
<tr>
! <td class="catSides" colspan="8" height="28"><span class="cattitle">{L_GROUP_MEMBERS}</span></td>
</tr>
!
! <!-- BEGIN member_row -->
<tr>
! <td class="{member_row.ROW_CLASS}" align="center"> {member_row.PM_IMG} </td>
! <td class="{member_row.ROW_CLASS}" align="center"><span class="gen"><a href="{member_row.U_VIEWPROFILE}" class="gen">{member_row.USERNAME}</a></span></td>
! <td class="{member_row.ROW_CLASS}" align="center"><span class="gen">{member_row.POSTS}</span></td>
! <td class="{member_row.ROW_CLASS}" align="center"><span class="gen"> {member_row.FROM}
</span></td>
! <td class="{member_row.ROW_CLASS}" align="center" valign="middle"><span class="gen">{member_row.EMAIL_IMG}</span></td>
! <td class="{member_row.ROW_CLASS}" align="center"> {member_row.WWW_IMG}</td>
! <td class="{member_row.ROW_CLASS}" align="center">
! <!-- BEGIN switch_mod_option -->
! <input type="checkbox" name="members[]" value="{member_row.USER_ID}" />
! <!-- END switch_mod_option -->
</td>
</tr>
! <!-- END member_row -->
!
! <!-- BEGIN switch_no_members -->
<tr>
! <td class="row1" colspan="7" align="center"><span class="gen">{L_NO_MEMBERS}</span></td>
</tr>
! <!-- END switch_no_members -->
!
! <!-- BEGIN switch_hidden_group -->
<tr>
! <td class="row1" colspan="7" align="center"><span class="gen">{L_HIDDEN_MEMBERS}</span></td>
</tr>
! <!-- END switch_hidden_group -->
!
! <!-- BEGIN switch_mod_option -->
! <tr>
! <td class="cat" colspan="8" align="right"><span class="cattitle">
! <input type="submit" name="remove" value="{L_REMOVE_SELECTED}" class="mainoption" />
! </td>
</tr>
! <!-- END switch_mod_option -->
! </table>
!
! <table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
<tr>
! <td align="left" valign="top">
! <!-- BEGIN switch_mod_option -->
! <span class="genmed"><input type="text" class="post" name="username" maxlength="50" size="20" /> <input type="submit" name="add" value="{L_ADD_MEMBER}" class="mainoption" /> <input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="liteoption" onClick="window.open('{U_SEARCH_USER}', '_phpbbsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" /></span>
! <!-- END switch_mod_option -->
! </td>
! <td align="right" valign="top"><span class="gensmall">{S_TIMEZONE}</span></td>
</tr>
! </table>
!
! {PENDING_USER_BOX}
!
! {S_HIDDEN_FIELDS}</form>
!
<table width="100%" cellspacing="2" border="0" align="center">
<tr>
Index: groupcp_user_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/groupcp_user_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** groupcp_user_body.tpl 2001/10/01 23:22:18 1.2
--- groupcp_user_body.tpl 2001/11/03 19:17:06 1.3
***************
*** 5,50 ****
</tr>
</table>
<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
<tr>
<th colspan="2" align="center" class="thHead" height="25">{L_GROUP_MEMBERSHIP_DETAILS}</th>
</tr>
<tr>
<td class="row1"><span class="gen">{L_YOU_BELONG_GROUPS}</span></td>
<td class="row2" align="right">
<table width="90%" cellspacing="0" cellpadding="0" border="0">
! <tr>
! <form method="post" action="{S_USERGROUP_ACTION}">
<td width="40%"><span class="gensmall">{GROUP_MEMBER_SELECT}</span></td>
<td align="center" width="30%">
! <input type="submit" name="viewinfo" value="{L_VIEW_INFORMATION}" class="liteoption" />
</td>
! <td align="center" width="30%">
! <input type="submit" name="unsubjoin" value="{L_UNSUBSCRIBE}" class="liteoption" />
! </td>
! </form>
! </tr>
</table>
</td>
</tr>
<tr>
<td class="row1"><span class="gen">{L_PENDING_GROUPS}</span></td>
<td class="row2" align="right">
<table width="90%" cellspacing="0" cellpadding="0" border="0">
! <tr>
! <form method="post" action="{S_USERGROUP_ACTION}">
<td width="40%"><span class="gensmall">{GROUP_PENDING_SELECT}</span></td>
<td align="center" width="30%">
! <input type="submit" name="viewinfo2" value="{L_VIEW_INFORMATION}" class="liteoption" />
</td>
! <td align="center" width="30%">
! <input type="submit" name="unsubpending" value="{L_UNSUBSCRIBE}" class="liteoption" />
! </td>
! </form>
! </tr>
</table>
</td>
</tr>
<tr>
! <td class="catSides" colspan="2" align="center" height="28"><span class="cattitle"><b>{L_JOIN_A_GROUP}</b></span></td>
</tr>
<tr>
--- 5,48 ----
</tr>
</table>
+
<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
+ <!-- BEGIN groups_joined -->
<tr>
<th colspan="2" align="center" class="thHead" height="25">{L_GROUP_MEMBERSHIP_DETAILS}</th>
</tr>
+ <!-- BEGIN groups_member -->
<tr>
<td class="row1"><span class="gen">{L_YOU_BELONG_GROUPS}</span></td>
<td class="row2" align="right">
<table width="90%" cellspacing="0" cellpadding="0" border="0">
! <tr><form method="get" action="{S_USERGROUP_ACTION}">
<td width="40%"><span class="gensmall">{GROUP_MEMBER_SELECT}</span></td>
<td align="center" width="30%">
! <input type="submit" value="{L_VIEW_INFORMATION}" class="liteoption" />
</td>
! </form></tr>
</table>
</td>
</tr>
+ <!-- END groups_member -->
+ <!-- BEGIN groups_pending -->
<tr>
<td class="row1"><span class="gen">{L_PENDING_GROUPS}</span></td>
<td class="row2" align="right">
<table width="90%" cellspacing="0" cellpadding="0" border="0">
! <tr><form method="get" action="{S_USERGROUP_ACTION}">
<td width="40%"><span class="gensmall">{GROUP_PENDING_SELECT}</span></td>
<td align="center" width="30%">
! <input type="submit" value="{L_VIEW_INFORMATION}" class="liteoption" />
</td>
! </form></tr>
</table>
</td>
</tr>
+ <!-- END groups_pending -->
+ <!-- END groups_joined -->
+ <!-- BEGIN groups_remaining -->
<tr>
! <th colspan="2" align="center" class="thHead" height="25">{L_JOIN_A_GROUP}</th>
</tr>
<tr>
***************
*** 52,68 ****
<td class="row2" align="right">
<table width="90%" cellspacing="0" cellpadding="0" border="0">
! <tr>
! <form method="post" action="{S_USERGROUP_ACTION}">
<td width="40%"><span class="gensmall">{GROUP_LIST_SELECT}</span></td>
- <td align="center" width="30%">
- <input type="submit" name="viewinfo2" value="{L_VIEW_INFORMATION}" class="liteoption" />
- </td>
<td align="center" width="30%">
! <input type="submit" name="subnew" value="{L_SUBSCRIBE}" class="liteoption" />
</td>
! </form>
! </tr>
</table>
</td>
</tr>
</table>
--- 50,76 ----
<td class="row2" align="right">
<table width="90%" cellspacing="0" cellpadding="0" border="0">
! <tr><form method="get" action="{S_USERGROUP_ACTION}">
<td width="40%"><span class="gensmall">{GROUP_LIST_SELECT}</span></td>
<td align="center" width="30%">
! <input type="submit" value="{L_VIEW_INFORMATION}" class="liteoption" />
</td>
! </form></tr>
</table>
</td>
+ </tr>
+ <!-- END groups_remaining -->
+ </table>
+
+ <table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
+ <tr>
+ <td align="right" valign="top"><span class="gensmall">{S_TIMEZONE}</span></td>
+ </tr>
+ </table>
+
+ <br clear="all" />
+
+ <table width="100%" cellspacing="2" border="0" align="center">
+ <tr>
+ <td valign="top" align="right">{JUMPBOX}</td>
</tr>
</table>
|
7 messages has been excluded from this view by a project administrator.
