phpbbreloaded-checkins Mailing List for phpBB Reloaded (Page 2)
Status: Planning
Brought to you by:
tehphpmaster
Menu
▾
▴
phpbbreloaded-checkins — phpBB Reloaded CVS Checkins
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(49) |
Jul
|
Aug
(1) |
Sep
(1) |
Oct
(16) |
Nov
|
Dec
(8) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
(4) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <kla...@us...> - 2006-10-22 05:33:34
|
Revision: 254
http://svn.sourceforge.net/phpbbreloaded/?rev=254&view=rev
Author: klarinetking
Date: 2006-10-21 22:33:29 -0700 (Sat, 21 Oct 2006)
Log Message:
-----------
Style Fix
#4 (Thanks Noxwizard)
Modified Paths:
--------------
phpBB Reloaded Styles/subBlack/index_body.tpl
Modified: phpBB Reloaded Styles/subBlack/index_body.tpl
===================================================================
--- phpBB Reloaded Styles/subBlack/index_body.tpl 2006-10-22 05:09:18 UTC (rev 253)
+++ phpBB Reloaded Styles/subBlack/index_body.tpl 2006-10-22 05:33:29 UTC (rev 254)
@@ -214,39 +214,34 @@
<br class="nav" />
<table width="100%" cellspacing="0" border="0" align="center" cellpadding="0">
<tr>
- <td align="left" valign="top"><table cellspacing="3" cellpadding="0" border="0">
- <tr>
- <td width="20" align="left"><img src="{FOLDER_NEW_IMG}" alt="{L_NEW_POSTS}" width="19" height="18" /></td>
- <td class="gensmall">{L_NEW_POSTS}</td>
- <td> </td>
- <td width="20" align="center"><img src="{FOLDER_IMG}" alt="{L_NO_NEW_POSTS}" width="19" height="18" /></td>
- <td class="gensmall">{L_NO_NEW_POSTS}</td>
- <td> </td>
- <td width="20" align="center"><img src="{FOLDER_ANNOUNCE_IMG}" alt="{L_ANNOUNCEMENT}" width="19" height="18" /></td>
- <td class="gensmall">{L_ANNOUNCEMENT}</td>
- </tr>
- <tr>
- <td width="20" align="center"><img src="{FOLDER_HOT_NEW_IMG}" alt="{L_NEW_POSTS_HOT}" width="19" height="18" /></td>
- <td class="gensmall">{L_NEW_POSTS_HOT}</td>
- <td> </td>
- <td width="20" align="center"><img src="{FOLDER_HOT_IMG}" 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="{FOLDER_STICKY_IMG}" alt="{L_STICKY}" width="19" height="18" /></td>
- <td class="gensmall">{L_STICKY}</td>
- </tr>
- <tr>
- <td class="gensmall"><img src="{FOLDER_LOCKED_NEW_IMG}" alt="{L_NEW_POSTS_LOCKED}" width="19" height="18" /></td>
- <td class="gensmall">{L_NEW_POSTS_LOCKED}</td>
- <td> </td>
- <td class="gensmall"><img src="{FOLDER_LOCKED_IMG}" alt="{L_NO_NEW_POSTS_LOCKED}" width="19" height="18" /></td>
- <td class="gensmall">{L_NO_NEW_POSTS_LOCKED}</td>
- <td> </td>
- <td width="20" align="center"><img src="{FOLDER_OWN_IMG}" alt="{L_TOPIC_OWN}" width="19" height="18" /></td>
- <td class="gensmall" colspan="4">{L_TOPIC_OWN}</td>
- </tr>
- </table></td>
- <td align="right"><span class="gensmall">{S_AUTH_LIST}</span></td>
+ <td align="left" valign="top"><table cellspacing="3" cellpadding="0" border="0">
+ <tr>
+ <td width="20" align="left"><img src="{FOLDER_NEW_IMG}" alt="{L_NEW_POSTS}" width="19" height="18" /></td>
+ <td class="gensmall">{L_NEW_POSTS}</td>
+ <td> </td>
+ <td width="20" align="center"><img src="{FOLDER_ANNOUNCE_IMG}" alt="{L_ANNOUNCEMENT}" width="19" height="18" /></td>
+ <td class="gensmall">{L_ANNOUNCEMENT}</td>
+ </tr>
+ <tr>
+ <td width="20" align="center"><img src="{FOLDER_IMG}" alt="{L_NO_NEW_POSTS}" width="19" height="18" /></td>
+ <td class="gensmall">{L_NO_NEW_POSTS}</td>
+ <td> </td>
+ <td width="20" align="center"><img src="{FOLDER_STICKY_IMG}" alt="{L_STICKY}" width="19" height="18" /></td>
+ <td class="gensmall">{L_STICKY}</td>
+ </tr>
+ <tr>
+ <td width="20" align="center"><img src="{FOLDER_HOT_IMG}" alt="{L_TOPIC_HOT}" width="19" height="18" /></td>
+ <td class="gensmall">{L_TOPIC_HOT}</td>
+ <td> </td>
+ <td width="20" align="center"><img src="{FOLDER_LOCKED_IMG}" alt="{L_TOPIC_LOCKED}" width="19" height="18" /></td>
+ <td class="gensmall">{L_TOPIC_LOCKED}</td>
+ </tr>
+ <tr>
+ <td width="20" align="center"><img src="{FOLDER_OWN_IMG}" alt="{L_TOPIC_OWN}" width="19" height="18" /></td>
+ <td class="gensmall" colspan="4">{L_TOPIC_OWN}</td>
+ </tr>
+ </table></td>
+ <td align="right"><span class="gensmall">{S_AUTH_LIST}</span></td>
</tr>
</table>
<!-- END forum_legend_ELSE -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kla...@us...> - 2006-10-22 05:09:27
|
Revision: 253
http://svn.sourceforge.net/phpbbreloaded/?rev=253&view=rev
Author: klarinetking
Date: 2006-10-21 22:09:18 -0700 (Sat, 21 Oct 2006)
Log Message:
-----------
Fixing a few schema mistakes. (TO MODDERS: Be careful when applying changes.)
Modified Paths:
--------------
phpBB Reloaded 2/install/cookie.php
phpBB Reloaded 2/install/schemas/mysql_basic.sql
phpBB Reloaded 2/install/schemas/mysql_schema.sql
Modified: phpBB Reloaded 2/install/cookie.php
===================================================================
--- phpBB Reloaded 2/install/cookie.php 2006-09-29 03:18:48 UTC (rev 252)
+++ phpBB Reloaded 2/install/cookie.php 2006-10-22 05:09:18 UTC (rev 253)
@@ -67,67 +67,67 @@
// this is a security precaution to prevent someone
// trying to break out of a SQL statement.
//
-if( !get_magic_quotes_gpc() )
+if (!get_magic_quotes_gpc())
{
- if( is_array($HTTP_GET_VARS) )
- {
- while( list($k, $v) = each($HTTP_GET_VARS) )
- {
- if( is_array($HTTP_GET_VARS[$k]) )
- {
- while( list($k2, $v2) = each($HTTP_GET_VARS[$k]) )
- {
- $HTTP_GET_VARS[$k][$k2] = addslashes($v2);
- }
- @reset($HTTP_GET_VARS[$k]);
- }
- else
- {
- $HTTP_GET_VARS[$k] = addslashes($v);
- }
- }
- @reset($HTTP_GET_VARS);
- }
+ if (@is_array($HTTP_GET_VARS))
+ {
+ while (list($k, $v) = each($HTTP_GET_VARS))
+ {
+ if (is_array($HTTP_GET_VARS[$k]))
+ {
+ while (list($k2, $v2) = each($HTTP_GET_VARS[$k]))
+ {
+ $HTTP_GET_VARS[$k][$k2] = addslashes($v2);
+ }
+ @reset($HTTP_GET_VARS[$k]);
+ }
+ else
+ {
+ $HTTP_GET_VARS[$k] = addslashes($v);
+ }
+ }
+ @reset($HTTP_GET_VARS);
+ }
- if( is_array($HTTP_POST_VARS) )
- {
- while( list($k, $v) = each($HTTP_POST_VARS) )
- {
- if( is_array($HTTP_POST_VARS[$k]) )
- {
- while( list($k2, $v2) = each($HTTP_POST_VARS[$k]) )
- {
- $HTTP_POST_VARS[$k][$k2] = addslashes($v2);
- }
- @reset($HTTP_POST_VARS[$k]);
- }
- else
- {
- $HTTP_POST_VARS[$k] = addslashes($v);
- }
- }
- @reset($HTTP_POST_VARS);
- }
+ if (@is_array($HTTP_POST_VARS))
+ {
+ while (list($k, $v) = each($HTTP_POST_VARS))
+ {
+ if (is_array($HTTP_POST_VARS[$k]))
+ {
+ while (list($k2, $v2) = each($HTTP_POST_VARS[$k]))
+ {
+ $HTTP_POST_VARS[$k][$k2] = addslashes($v2);
+ }
+ @reset($HTTP_POST_VARS[$k]);
+ }
+ else
+ {
+ $HTTP_POST_VARS[$k] = addslashes($v);
+ }
+ }
+ @reset($HTTP_POST_VARS);
+ }
- if( is_array($HTTP_COOKIE_VARS) )
- {
- while( list($k, $v) = each($HTTP_COOKIE_VARS) )
- {
- if( is_array($HTTP_COOKIE_VARS[$k]) )
- {
- while( list($k2, $v2) = each($HTTP_COOKIE_VARS[$k]) )
- {
- $HTTP_COOKIE_VARS[$k][$k2] = addslashes($v2);
- }
- @reset($HTTP_COOKIE_VARS[$k]);
- }
- else
- {
- $HTTP_COOKIE_VARS[$k] = addslashes($v);
- }
- }
- @reset($HTTP_COOKIE_VARS);
- }
+ if (@is_array($HTTP_COOKIE_VARS))
+ {
+ while (list($k, $v) = each($HTTP_COOKIE_VARS))
+ {
+ if (is_array($HTTP_COOKIE_VARS[$k]))
+ {
+ while (list($k2, $v2) = each($HTTP_COOKIE_VARS[$k]))
+ {
+ $HTTP_COOKIE_VARS[$k][$k2] = addslashes($v2);
+ }
+ @reset($HTTP_COOKIE_VARS[$k]);
+ }
+ else
+ {
+ $HTTP_COOKIE_VARS[$k] = addslashes($v);
+ }
+ }
+ @reset($HTTP_COOKIE_VARS);
+ }
}
Modified: phpBB Reloaded 2/install/schemas/mysql_basic.sql
===================================================================
--- phpBB Reloaded 2/install/schemas/mysql_basic.sql 2006-09-29 03:18:48 UTC (rev 252)
+++ phpBB Reloaded 2/install/schemas/mysql_basic.sql 2006-10-22 05:09:18 UTC (rev 253)
@@ -7,8 +7,8 @@
-- Dumping data for table phpbb_agreement
--
-INSERT INTO phpbb_agreement (id,agreement_text) VALUES
-('1','While the administrators and moderators of this forum will attempt to remove or edit any generally objectionable material as quickly as possible, it is impossible to review every message. Therefore you acknowledge that all posts made to these forums express the views and opinions of the author and not the administrators, moderators or webmaster (except for posts by these people) and hence will not be held liable.<br /><br />You agree not to post any abusive, obscene, vulgar, slanderous, hateful, threatening, sexually-oriented or any other material that may violate any applicable laws. Doing so may lead to you being immediately and permanently banned (and your service provider being informed). The IP address of all posts is recorded to aid in enforcing these conditions. You agree that the webmaster, administrator and moderators of this forum have the right to remove, edit, move or close any topic at any time should they see fit. As a user you agree to any information you have entered above being stored in a database. While this information will not be disclosed to any third party without your consent the webmaster, administrator and moderators cannot be held responsible for any hacking attempt that may lead to the data being compromised.<br /><br />This forum system uses cookies to store information on your local computer. These cookies do not contain any of the information you have entered above; they serve only to improve your viewing pleasure. The e-mail address is used only for confirming your registration details and password (and for sending new passwords should you forget your current one).<br /><br />By clicking Register below you agree to be bound by these conditions.');
+INSERT INTO phpbb_agreement VALUES
+('1', 'While the administrators and moderators of this forum will attempt to remove or edit any generally objectionable material as quickly as possible, it is impossible to review every message. Therefore you acknowledge that all posts made to these forums express the views and opinions of the author and not the administrators, moderators or webmaster (except for posts by these people) and hence will not be held liable.<br /><br />You agree not to post any abusive, obscene, vulgar, slanderous, hateful, threatening, sexually-oriented or any other material that may violate any applicable laws. Doing so may lead to you being immediately and permanently banned (and your service provider being informed). The IP address of all posts is recorded to aid in enforcing these conditions. You agree that the webmaster, administrator and moderators of this forum have the right to remove, edit, move or close any topic at any time should they see fit. As a user you agree to any information you have entered above being stored in a database. While this information will not be disclosed to any third party without your consent the webmaster, administrator and moderators cannot be held responsible for any hacking attempt that may lead to the data being compromised.<br /><br />This forum system uses cookies to store information on your local computer. These cookies do not contain any of the information you have entered above; they serve only to improve your viewing pleasure. The e-mail address is used only for confirming your registration details and password (and for sending new passwords should you forget your current one).<br /><br />By clicking Register below you agree to be bound by these conditions.');
--
-- Dumping data for table phpbb_attachments_config
@@ -778,7 +778,7 @@
-- Dumping data for table phpbb_search_results
--
-INSERT INTO phpbb_search_results VALUES (1387010399, '92eda8dfcd3f66441e726a531ec8fa55', 'a:8:{s:14:"search_results";s:13:"2, 3, 4, 5, 6";s:17:"total_match_count";i:5;s:12:"split_search";N;s:7:"sort_by";i:0;s:8:"sort_dir";s:4:"DESC";s:12:"show_results";s:5:"posts";s:12:"return_chars";i:200;s:7:"no_subs";b:0;}');
+INSERT INTO phpbb_search_results VALUES (1387010399, '92eda8dfcd3f66441e726a531ec8fa55', 'a:8:{s:14:"search_results";s:13:"2, 3, 4, 5, 6";s:17:"total_match_count";i:5;s:12:"split_search";N;s:7:"sort_by";i:0;s:8:"sort_dir";s:4:"DESC";s:12:"show_results";s:5:"posts";s:12:"return_chars";i:200;s:7:"no_subs";b:0;}', '0');
--
-- Dumping data for table phpbb_search_wordlist
Modified: phpBB Reloaded 2/install/schemas/mysql_schema.sql
===================================================================
--- phpBB Reloaded 2/install/schemas/mysql_schema.sql 2006-09-29 03:18:48 UTC (rev 252)
+++ phpBB Reloaded 2/install/schemas/mysql_schema.sql 2006-10-22 05:09:18 UTC (rev 253)
@@ -8,8 +8,9 @@
--
CREATE TABLE phpbb_agreement (
-id int(8) not null,
-agreement_text text);
+ id int(8) NOT NULL default '',
+ agreement_text text
+) TYPE=MyISAM;
--
-- Table structure for table `phpbb_attach_quota`
@@ -575,7 +576,7 @@
search_id int(11) unsigned NOT NULL default '0',
session_id varchar(32) NOT NULL default '',
search_array text NOT NULL,
- search_time int(11) DEFAULT '0' NOT NULL;
+ search_time int(11) DEFAULT '0' NOT NULL,
PRIMARY KEY (search_id),
KEY session_id (session_id)
) TYPE=MyISAM;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kla...@us...> - 2006-09-18 03:02:11
|
Revision: 251
http://svn.sourceforge.net/phpbbreloaded/?rev=251&view=rev
Author: klarinetking
Date: 2006-09-17 20:02:08 -0700 (Sun, 17 Sep 2006)
Log Message:
-----------
Should prevent FireFox (and others) from adding the wrong username to the form automatically.
Modified Paths:
--------------
phpBB Reloaded 2/templates/subC1/admin/user_select_body.tpl
Modified: phpBB Reloaded 2/templates/subC1/admin/user_select_body.tpl
===================================================================
--- phpBB Reloaded 2/templates/subC1/admin/user_select_body.tpl 2006-08-12 15:10:37 UTC (rev 250)
+++ phpBB Reloaded 2/templates/subC1/admin/user_select_body.tpl 2006-09-18 03:02:08 UTC (rev 251)
@@ -3,7 +3,7 @@
<p>{L_USER_EXPLAIN}</p>
-<form method="post" name="post" action="{S_USER_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
+<form method="post" name="post" action="{S_USER_ACTION}" autocomplete="off"><table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
<tr>
<th class="thHead" align="center">{L_USER_SELECT}</th>
</tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kla...@us...> - 2006-08-12 15:11:00
|
Revision: 250 Author: klarinetking Date: 2006-08-12 08:10:37 -0700 (Sat, 12 Aug 2006) ViewCVS: http://svn.sourceforge.net/phpbbreloaded/?rev=250&view=rev Log Message: ----------- Big commit today! Mostly removing useless code, updating to internal (not yet published) coding standards. More files to come. Modified Paths: -------------- phpBB Reloaded 2/attach_rules.php phpBB Reloaded 2/calendar.php phpBB Reloaded 2/calendar_scheduler.php phpBB Reloaded 2/common.php phpBB Reloaded 2/download.php phpBB Reloaded 2/extension.inc phpBB Reloaded 2/faq.php phpBB Reloaded 2/groupcp.php phpBB Reloaded 2/index.php phpBB Reloaded 2/login.php phpBB Reloaded 2/memberlist.php phpBB Reloaded 2/modcp.php phpBB Reloaded 2/posting.php phpBB Reloaded 2/privmsg.php phpBB Reloaded 2/profile.php phpBB Reloaded 2/qpes.php phpBB Reloaded 2/ranks.php phpBB Reloaded 2/search.php phpBB Reloaded 2/shoutbox.php phpBB Reloaded 2/shoutbox_max.php phpBB Reloaded 2/shoutbox_view.php phpBB Reloaded 2/uacp.php phpBB Reloaded 2/viewonline.php phpBB Reloaded 2/viewtopic.php Modified: phpBB Reloaded 2/attach_rules.php =================================================================== --- phpBB Reloaded 2/attach_rules.php 2006-06-20 23:05:11 UTC (rev 249) +++ phpBB Reloaded 2/attach_rules.php 2006-08-12 15:10:37 UTC (rev 250) @@ -1,16 +1,16 @@ <?php -/** -* -* @package attachment_mod -* @version $Id: attach_rules.php,v 1.1.1.1 2006/02/24 02:28:06 markthedaemon Exp $ -* @copyright (c) 2002 Meik Sievertsen -* @license http://opensource.org/licenses/gpl-license.php GNU Public License -* -*/ +/** + * @package core + * @version $ID: Exp$ + * @copyright phpBB Reloaded 2006 + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + */ /** -*/ -if (defined('IN_PHPBB')) + * phpBB originally created by phpBB http://www.phpbb.com + */ + +if ( defined('IN_PHPBB') ) { die('Hacking attempt'); exit; @@ -18,21 +18,23 @@ define('IN_PHPBB', TRUE); $phpbb_root_path = './'; -include($phpbb_root_path . 'extension.inc'); -include($phpbb_root_path . 'common.'.$phpEx); +include ($phpbb_root_path . 'extension.inc'); +include ($phpbb_root_path . 'common.' . $phpEx); $forum_id = get_var('f', 0); $privmsg = (!$forum_id) ? true : false; // Start Session Management + $userdata = session_pagestart($user_ip, PAGE_INDEX); init_userprefs($userdata); // Display the allowed Extension Groups and Upload Size -if ($privmsg) + +if ( $privmsg ) { - $auth['auth_attachments'] = ($userdata['user_level'] != ADMIN) ? intval($attach_config['allow_pm_attach']) : true; - $auth['auth_view'] = true; + $auth['auth_attachments'] = ($userdata['user_level'] != ADMIN) ? intval($attach_config['allow_pm_attach']) : TRUE; + $auth['auth_view'] = TRUE; $_max_filesize = $attach_config['max_filesize_pm']; } else @@ -41,7 +43,7 @@ $_max_filesize = $attach_config['max_filesize']; } -if (!($auth['auth_attachments'] && $auth['auth_view'])) +if ( !($auth['auth_attachments'] && $auth['auth_view']) ) { message_die(GENERAL_ERROR, 'You are not allowed to call this file (ID:2)'); } @@ -52,10 +54,10 @@ $sql = 'SELECT group_id, group_name, max_filesize, forum_permissions FROM ' . EXTENSION_GROUPS_TABLE . ' - WHERE allow_group = 1 + WHERE allow_group = 1 ORDER BY group_name ASC'; -if (!($result = $db->sql_query($sql))) +if ( !($result = $db->sql_query($sql)) ) { message_die(GENERAL_ERROR, 'Could not query Extension Groups.', '', __LINE__, __FILE__, $sql); } @@ -66,16 +68,18 @@ $db->sql_freeresult($result); // Ok, only process those Groups allowed within this forum -$nothing = true; + +$nothing = TRUE; + for ($i = 0; $i < $num_rows; $i++) { $auth_cache = trim($rows[$i]['forum_permissions']); - $permit = ($privmsg) ? true : ((is_forum_authed($auth_cache, $forum_id)) || trim($rows[$i]['forum_permissions']) == ''); + $permit = ($privmsg) ? TRUE : ((is_forum_authed($auth_cache, $forum_id)) || trim($rows[$i]['forum_permissions']) == ''); - if ($permit) + if ( $permit ) { - $nothing = false; + $nothing = FALSE; $group_name = $rows[$i]['group_name']; $f_size = intval(trim($rows[$i]['max_filesize'])); $det_filesize = (!$f_size) ? $_max_filesize : $f_size; @@ -98,10 +102,10 @@ $sql = 'SELECT extension FROM ' . EXTENSIONS_TABLE . " - WHERE group_id = " . (int) $rows[$i]['group_id'] . " + WHERE group_id = " . (int) $rows[$i]['group_id'] . " ORDER BY extension ASC"; - if (!($result = $db->sql_query($sql))) + if ( !($result = $db->sql_query($sql)) ) { message_die(GENERAL_ERROR, 'Could not query Extensions.', '', __LINE__, __FILE__, $sql); } @@ -121,7 +125,7 @@ $gen_simple_header = TRUE; $page_title = $lang['Attach_rules_title']; -include($phpbb_root_path . 'includes/page_header.' . $phpEx); +include ($phpbb_root_path . 'includes/page_header.' . $phpEx); $template->assign_vars(array( 'L_RULES_TITLE' => $lang['Attach_rules_title'], @@ -129,7 +133,7 @@ 'L_EMPTY_GROUP_PERMS' => $lang['Note_user_empty_group_permissions']) ); -if ($nothing) +if ( $nothing ) { $template->assign_block_vars('switch_nothing', array()); } Modified: phpBB Reloaded 2/calendar.php =================================================================== --- phpBB Reloaded 2/calendar.php 2006-06-20 23:05:11 UTC (rev 249) +++ phpBB Reloaded 2/calendar.php 2006-08-12 15:10:37 UTC (rev 250) @@ -1,46 +1,41 @@ <?php -/*************************************************************************** - * calendar.php - CH edition - * ------------ - * begin : 06/12/2004 - * copyright : Ptirhiik - * email : pti...@cl... - * - * Version : 0.0.2 - 15/05/2005 - * - ***************************************************************************/ +/** + * @package core + * @version $ID: Exp$ + * @copyright phpBB Reloaded 2006 + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + */ -/*************************************************************************** - * - * 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. - * - ***************************************************************************/ +/** + * phpBB originally created by phpBB http://www.phpbb.com + */ -define('IN_PHPBB', true); -define('IN_CALENDAR', true); +define('IN_PHPBB', TRUE); +define('IN_CALENDAR', TRUE); $phpbb_root_path = './'; -include($phpbb_root_path . 'extension.inc'); -include($phpbb_root_path . 'common.' . $phpEx); +include ($phpbb_root_path . 'extension.inc'); +include ($phpbb_root_path . 'common.' . $phpEx); -include($config->url('includes/class_forums')); -include($config->url('includes/class_calendar')); +include ($config->url('includes/class_forums')); +include ($config->url('includes/class_calendar')); // date is in user format + $date = sprintf('%08d', _read('date', TYPE_INT)); $date = (intval($date) < 19700102) || (intval($date) >= 20700101) ? 0 : mktime( 0, 0, 0, intval(substr($date, 4, 2)), intval(substr($date, 6, 2)), intval(substr($date, 0, 4))); // from pull down lists + $month = _read('month', TYPE_INT); $year = _read('year', TYPE_INT); + if ( ($month > 0) && ($month <= 12) && ($year >= 1970) && ($year < 2070) ) { $date = mktime( 0, 0, 0, $month, 01, $year); } // next/previous from input buttons + if ( intval($date) ) { $aamm = date('Ym', $date); @@ -48,6 +43,7 @@ { $date = mktime( 0, 0, 0, date('m', $date) + 1, 01, $year); } + if ( _button('prev') && ($aamm > 197001) && ($aamm <= 206912) ) { $date = mktime( 0, 0, 0, date('m', $date), 00, $year); @@ -55,6 +51,7 @@ } // read forums + $forums = new forums(); $forums->read(); $forum_id = _read(POST_FORUM_URL, TYPE_INT); @@ -62,13 +59,16 @@ // // Start session management // + $userdata = session_pagestart($user_ip, PAGE_INDEX); init_userprefs($userdata); + // // End session management // // check auths + $user->get_cache(POST_FORUM_URL); if ( !$user->auth(POST_FORUM_URL, 'auth_read', $forum_id) ) { @@ -76,27 +76,31 @@ } // navigation + $navigation = new navigation(); $navigation->add('Calendar', '', 'calendar', array(POST_FORUM_URL => $forum_id, 'date' => empty($date) ? 0 : date('Ymd', $date)), ''); $navigation->display(); // send the calendar box + $calendar = new calendar(); $calendar->display('CALENDAR_MONTH', $date, $forum_id, true); // send board header + $page_title = $user->lang('Calendar'); include($config->url('includes/page_header')); // system + $template->assign_vars(array( - 'S_ACTION' => $config->url('calendar', '', true), + 'S_ACTION' => $config->url('calendar', '', TRUE), )); _hide_set(); // send to browser + $template->set_filenames(array('body' => 'calendar_body.tpl')); $template->pparse('body'); -include($config->url('includes/page_tail')); - +include ($config->url('includes/page_tail')); ?> \ No newline at end of file Modified: phpBB Reloaded 2/calendar_scheduler.php =================================================================== --- phpBB Reloaded 2/calendar_scheduler.php 2006-06-20 23:05:11 UTC (rev 249) +++ phpBB Reloaded 2/calendar_scheduler.php 2006-08-12 15:10:37 UTC (rev 250) @@ -1,41 +1,35 @@ <?php -/*************************************************************************** - * calendar_scheduler.php - CH edition - * ---------------------- - * begin : 06/12/2004 - * copyright : Ptirhiik - * email : pti...@cl... - * - * Version : 0.0.2 - 15/05/2005 - * - ***************************************************************************/ +/** + * @package core + * @version $ID: Exp$ + * @copyright phpBB Reloaded 2006 + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + */ -/*************************************************************************** - * - * 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. - * - ***************************************************************************/ +/** + * phpBB originally created by phpBB http://www.phpbb.com + */ -define('IN_PHPBB', true); -define('IN_CALENDAR', true); +define('IN_PHPBB', TRUE); +define('IN_CALENDAR', TRUE); $phpbb_root_path = './'; -include($phpbb_root_path . 'extension.inc'); -include($phpbb_root_path . 'common.' . $phpEx); +include ($phpbb_root_path . 'extension.inc'); +include ($phpbb_root_path . 'common.' . $phpEx); -include($config->url('includes/class_forums')); -include($config->url('includes/class_calendar')); +include ($config->url('includes/class_forums')); +include ($config->url('includes/class_calendar')); // date is in user format + $date = sprintf('%08d', _read('date', TYPE_INT)); $date = (intval($date) < 19700102) || (intval($date) >= 20700101) ? 0 : mktime( 0, 0, 0, intval(substr($date, 4, 2)), intval(substr($date, 6, 2)), intval(substr($date, 0, 4))); // from pull down lists + $year = _read('year', TYPE_INT); $month = _read('month', TYPE_INT); $day = _read('day', TYPE_INT); + if ( ($month > 0) && ($month <= 12) && ($year >= 1970) && ($year < 2070) ) { $date = mktime( 0, 0, 0, $month, $day, $year); @@ -46,13 +40,16 @@ } // next/previous from input buttons + if ( intval($date) ) { $aamm = date('Ym', $date); + if ( _button('next') && ($aamm >= 197001) && ($aamm < 206912) ) { $date = mktime( 0, 0, 0, date('m', $date) + 1, 01, $year); } + if ( _button('prev') && ($aamm > 197001) && ($aamm <= 206912) ) { $date = mktime( 0, 0, 0, date('m', $date), 00, $year); @@ -60,6 +57,7 @@ } // hour + $hour = _read('hour', TYPE_INT); if ( ($hour < 0) || ($hour > 24) ) { @@ -67,6 +65,7 @@ } // read forums + $forums = new forums(); $forums->read(); $forum_id = _read(POST_FORUM_URL, TYPE_INT); @@ -74,43 +73,52 @@ // // Start session management // + $userdata = session_pagestart($user_ip, PAGE_INDEX); init_userprefs($userdata); + // // End session management // // check auths + $user->get_cache(POST_FORUM_URL); + if ( !$user->auth(POST_FORUM_URL, 'auth_read', $forum_id) ) { $forum_id = 0; } // navigation + $navigation = new navigation(); $navigation->add('Calendar', '', 'calendar', array(POST_FORUM_URL => $forum_id, 'date' => empty($date) ? 0 : date('Ymd', $date)), ''); $navigation->add('Calendar_scheduler', '', 'calendar_scheduler', array(POST_FORUM_URL => $forum_id, 'date' => date('Ymd', $date), 'hour' => $hour), ''); $navigation->display(); // send the calendar box + $calendar_scheduler = new calendar_scheduler(); $calendar_scheduler->display($date, $hour, $forum_id); // send board header + $page_title = $user->lang('Calendar_scheduler'); -include($config->url('includes/page_header')); +include ($config->url('includes/page_header')); // system + $template->assign_vars(array( - 'S_ACTION' => $config->url('calendar_scheduler', '', true), -)); + 'S_ACTION' => $config->url('calendar_scheduler', '', true)) +); + _hide('date', $date); _hide_set(); // send to browser + $template->set_filenames(array('body' => 'calendar_scheduler_body.tpl')); $template->pparse('body'); -include($config->url('includes/page_tail')); - +include ($config->url('includes/page_tail')); ?> \ No newline at end of file Modified: phpBB Reloaded 2/common.php =================================================================== --- phpBB Reloaded 2/common.php 2006-06-20 23:05:11 UTC (rev 249) +++ phpBB Reloaded 2/common.php 2006-08-12 15:10:37 UTC (rev 250) @@ -1,13 +1,15 @@ <?php /** -* -* @package: reloaded -* @version: $Id: common.php,v 1.1.1.1 2006/02/24 02:28:06 markthedaemon Exp $ -* @copyright: (c) 2005, 2006 phpBB Reloaded & 2002, 2006 phpBB Group -* @license: http://opensource.org/licenses/gpl-license.php GNU Public License -* -*/ + * @package core + * @version $ID: Exp$ + * @copyright phpBB Reloaded 2006 + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + */ +/** + * phpBB originally created by phpBB http://www.phpbb.com + */ + if ( !defined('IN_PHPBB') ) { die("Hacking attempt"); @@ -16,8 +18,6 @@ $starttime = microtime(); $trc_loc_start = $trc_loc_end = 0; - -// error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables set_magic_quotes_runtime(0); // Disable magic_quotes_runtime @@ -25,6 +25,7 @@ // Thanks to Matt Kavanagh and Stefan Esser for providing feedback as well as patch files // PHP5 with register_long_arrays off? + if (@phpversion() >= '5.0.0' && (!@ini_get('register_long_arrays') || @ini_get('register_long_arrays') == '0' || strtolower(@ini_get('register_long_arrays')) == 'off')) { $HTTP_POST_VARS = $_POST; @@ -35,55 +36,62 @@ $HTTP_POST_FILES = $_FILES; // _SESSION is the only superglobal which is conditionally set - if (isset($_SESSION)) + + if ( isset($_SESSION) ) { $HTTP_SESSION_VARS = $_SESSION; } } // Protect against GLOBALS tricks -if (isset($HTTP_POST_VARS['GLOBALS']) || isset($HTTP_POST_FILES['GLOBALS']) || isset($HTTP_GET_VARS['GLOBALS']) || isset($HTTP_COOKIE_VARS['GLOBALS'])) + +if ( isset($HTTP_POST_VARS['GLOBALS']) || isset($HTTP_POST_FILES['GLOBALS']) || isset($HTTP_GET_VARS['GLOBALS']) || isset($HTTP_COOKIE_VARS['GLOBALS']) ) { die("Hacking attempt"); } // Protect against HTTP_SESSION_VARS tricks -if (isset($HTTP_SESSION_VARS) && !is_array($HTTP_SESSION_VARS)) + +if ( isset($HTTP_SESSION_VARS) && !is_array($HTTP_SESSION_VARS) ) { die("Hacking attempt"); } -if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on') +if ( @ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on' ) { // PHP4+ path + $not_unset = array('HTTP_GET_VARS', 'HTTP_POST_VARS', 'HTTP_COOKIE_VARS', 'HTTP_SERVER_VARS', 'HTTP_SESSION_VARS', 'HTTP_ENV_VARS', 'HTTP_POST_FILES', 'phpEx', 'phpbb_root_path'); // Not only will array_merge give a warning if a parameter // is not an array, it will actually fail. So we check if // HTTP_SESSION_VARS has been initialised. - if (!isset($HTTP_SESSION_VARS) || !is_array($HTTP_SESSION_VARS)) + + if ( !isset($HTTP_SESSION_VARS) || !is_array($HTTP_SESSION_VARS) ) { $HTTP_SESSION_VARS = array(); } // Merge all into one extremely huge array; unset // this later + $input = array_merge($HTTP_GET_VARS, $HTTP_POST_VARS, $HTTP_COOKIE_VARS, $HTTP_SERVER_VARS, $HTTP_SESSION_VARS, $HTTP_ENV_VARS, $HTTP_POST_FILES); - unset($input['input']); - unset($input['not_unset']); + unset ($input['input']); + unset ($input['not_unset']); - while (list($var,) = @each($input)) + while ( list($var,) = @each($input) ) { - if (in_array($var, $not_unset)) + if ( in_array($var, $not_unset) ) { die('Hacking attempt!'); } - unset($$var); + + unset ($$var); } - unset($input); + unset ($input); } // @@ -93,16 +101,17 @@ // if( !get_magic_quotes_gpc() ) { - if( is_array($HTTP_GET_VARS) ) + if ( is_array($HTTP_GET_VARS) ) { - while( list($k, $v) = each($HTTP_GET_VARS) ) + while ( list($k, $v) = each($HTTP_GET_VARS) ) { - if( is_array($HTTP_GET_VARS[$k]) ) + if ( is_array($HTTP_GET_VARS[$k]) ) { - while( list($k2, $v2) = each($HTTP_GET_VARS[$k]) ) + while ( list($k2, $v2) = each($HTTP_GET_VARS[$k]) ) { $HTTP_GET_VARS[$k][$k2] = addslashes($v2); } + @reset($HTTP_GET_VARS[$k]); } else @@ -110,19 +119,21 @@ $HTTP_GET_VARS[$k] = addslashes($v); } } + @reset($HTTP_GET_VARS); } - if( is_array($HTTP_POST_VARS) ) + if ( is_array($HTTP_POST_VARS) ) { - while( list($k, $v) = each($HTTP_POST_VARS) ) + while ( list($k, $v) = each($HTTP_POST_VARS) ) { - if( is_array($HTTP_POST_VARS[$k]) ) + if ( is_array($HTTP_POST_VARS[$k]) ) { - while( list($k2, $v2) = each($HTTP_POST_VARS[$k]) ) + while ( list($k2, $v2) = each($HTTP_POST_VARS[$k]) ) { $HTTP_POST_VARS[$k][$k2] = addslashes($v2); } + @reset($HTTP_POST_VARS[$k]); } else @@ -130,19 +141,21 @@ $HTTP_POST_VARS[$k] = addslashes($v); } } + @reset($HTTP_POST_VARS); } - if( is_array($HTTP_COOKIE_VARS) ) + if ( is_array($HTTP_COOKIE_VARS) ) { - while( list($k, $v) = each($HTTP_COOKIE_VARS) ) + while ( list($k, $v) = each($HTTP_COOKIE_VARS) ) { - if( is_array($HTTP_COOKIE_VARS[$k]) ) + if ( is_array($HTTP_COOKIE_VARS[$k]) ) { - while( list($k2, $v2) = each($HTTP_COOKIE_VARS[$k]) ) + while ( list($k2, $v2) = each($HTTP_COOKIE_VARS[$k]) ) { $HTTP_COOKIE_VARS[$k][$k2] = addslashes($v2); } + @reset($HTTP_COOKIE_VARS[$k]); } else @@ -150,6 +163,7 @@ $HTTP_COOKIE_VARS[$k] = addslashes($v); } } + @reset($HTTP_COOKIE_VARS); } } @@ -159,6 +173,7 @@ // malicious rewriting of language and otherarray values via // URI params // + $board_config = array(); $userdata = array(); $theme = array(); @@ -168,31 +183,25 @@ $gen_simple_header = FALSE; $dss_seeded = false; -include($phpbb_root_path . 'config.'.$phpEx); +include ($phpbb_root_path . 'config.' . $phpEx); -if( !defined("PHPBB_INSTALLED") ) +if ( !defined("PHPBB_INSTALLED") ) { header('Location: ' . $phpbb_root_path . 'install/install.' . $phpEx); exit; } -include($phpbb_root_path . 'includes/constants.'.$phpEx); -//-- mod : categories hierarchy ------------------------------------------------ -//-- delete -/* -include($phpbb_root_path . 'includes/template.'.$phpEx); -*/ -//-- add -include($phpbb_root_path . 'includes/class_template.'.$phpEx); -//-- fin mod : categories hierarchy -------------------------------------------- -include($phpbb_root_path . 'includes/sessions.'.$phpEx); -include($phpbb_root_path . 'includes/auth.'.$phpEx); -include($phpbb_root_path . 'includes/functions.'.$phpEx); -include($phpbb_root_path . 'includes/db.'.$phpEx); +include ($phpbb_root_path . 'includes/constants.' . $phpEx); +include ($phpbb_root_path . 'includes/class_template.' . $phpEx); +include ($phpbb_root_path . 'includes/sessions.' . $phpEx); +include ($phpbb_root_path . 'includes/auth.' . $phpEx); +include ($phpbb_root_path . 'includes/functions.' . $phpEx); +include ($phpbb_root_path . 'includes/db.' . $phpEx); // We do not need this any longer, unset for safety purposes -unset($dbpasswd); +unset ($dbpasswd); + // // Obtain and encode users IP // @@ -201,6 +210,7 @@ // even bother complaining ... go scream and shout at the idiots out there who feel // "clever" is doing harm rather than good ... karma is a great thing ... :) // + $client_ip = ( !empty($HTTP_SERVER_VARS['REMOTE_ADDR']) ) ? $HTTP_SERVER_VARS['REMOTE_ADDR'] : ( ( !empty($HTTP_ENV_VARS['REMOTE_ADDR']) ) ? $HTTP_ENV_VARS['REMOTE_ADDR'] : getenv('REMOTE_ADDR') ); $user_ip = encode_ip($client_ip); @@ -209,40 +219,27 @@ // then we output a CRITICAL_ERROR since // basic forum information is not available // -//-- mod : categories hierarchy ------------------------------------------------ -//-- delete -/* -$sql = "SELECT * - FROM " . CONFIG_TABLE; -if( !($result = $db->sql_query($sql)) ) -{ - message_die(CRITICAL_ERROR, "Could not query config information", "", __LINE__, __FILE__, $sql); -} -while ( $row = $db->sql_fetchrow($result) ) -{ - $board_config[$row['config_name']] = $row['config_value']; -} -*/ -//-- add // include basic classes def include($phpbb_root_path . 'includes/class_config.' . $phpEx); // get config + $config = new config_class(); + if ( !$config->read() ) { define('RUN_CH_INSTALL', true); } + $board_config = &$config->data; - - // user objects -include($config->url('includes/class_groups')); -include($config->url('includes/class_user')); -include($config->url('includes/class_auth')); +include ($config->url('includes/class_groups')); +include ($config->url('includes/class_user')); +include ($config->url('includes/class_auth')); + // instantiate some objects $user = new user(); $censored_words = new words(); @@ -253,34 +250,30 @@ $topics_attr = new topics_attr(); // People never read achievement messages after after having seen "Succesfull !", tss tss :) + if ( !defined('IN_LOGIN') && !defined('IN_INSTALL') && file_exists('install_cat') ) { message_die(GENERAL_MESSAGE, 'Please ensure the install_cat/ directory is deleted'); } // messages queue -@include($config->url('includes/class_message')); + +@include ($config->url('includes/class_message')); $message_queue = defined('CH_message_queue') ? new message_queue() : ''; -//-- mod : attachmod ----------------------------------------------------------- -//-- add -// attachmod -@include($config->url('attach_mod/attachment_mod')); -//-- fin mod : attachmod ------------------------------------------------------- -//-- fin mod : categories hierarchy ------------------------------------------- +@include ($config->url('attach_mod/attachment_mod')); -//-- mod : Advanced Group Color Management ------------------------------------- -//-- add define('IN_CH', TRUE); -include($config->url('includes/class_color')); +include ($config->url('includes/class_color')); // // prepare colors class -// +/ $colors = new colors(); // // People never read achievement messages after after having seen "Succesfull !", tss tss :) // + if ( !defined('IN_INSTALL') && file_exists('install_color') ) { message_die(GENERAL_MESSAGE, 'Please ensure the install_color/ directory is deleted'); @@ -290,32 +283,20 @@ // // read colors // + if ( !defined('IN_INSTALL') ) { $colors->read(); } -//-- fin mod : Advanced Group Color Management --------------------------------- -if (file_exists('install') || file_exists('contrib')) +if ( file_exists('install') || file_exists('contrib') ) { message_die(GENERAL_MESSAGE, 'Please_remove_install_contrib'); } -// -// Show 'Board is disabled' message if needed. -// -//-- mod : categories hierarchy ------------------------------------------------ -//-- delete -/* -if( $board_config['board_disable'] && !defined("IN_ADMIN") && !defined("IN_LOGIN") ) -*/ -//-- add -/* -if( $config->data['board_disable'] && !defined('IN_ADMIN') && !defined('IN_LOGIN') && !defined('IN_INSTALL') ) -//-- fin mod : categories hierarchy --------------------------------------------- + +if ( $config->data['board_disable'] && !defined('IN_ADMIN') && !defined('IN_LOGIN') && !defined('IN_INSTALL') ) { message_die(GENERAL_MESSAGE, 'Board_disable', 'Information'); } -*/ - ?> \ No newline at end of file Modified: phpBB Reloaded 2/download.php =================================================================== --- phpBB Reloaded 2/download.php 2006-06-20 23:05:11 UTC (rev 249) +++ phpBB Reloaded 2/download.php 2006-08-12 15:10:37 UTC (rev 250) @@ -1,32 +1,25 @@ <?php -/** -* -* @package attachment_mod -* @version $Id: download.php,v 1.1.1.1 2006/02/24 02:28:09 markthedaemon Exp $ -* @copyright (c) 2002 Meik Sievertsen -* @license http://opensource.org/licenses/gpl-license.php GNU Public License -* -*/ -/*************************************************************************** - * - * This file has been modified by phpBB Reloaded - (C) 2006 phpBB Reloaded Group - * Support questions placed here: http://www.phpbbreloaded.com - * - * DO NOT EDIT THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING - * - ***************************************************************************/ /** -*/ -if (defined('IN_PHPBB')) + * @package core + * @version $ID: Exp$ + * @copyright phpBB Reloaded 2006 + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + */ + +/** + * phpBB originally created by phpBB http://www.phpbb.com + */ + +if ( defined('IN_PHPBB')) { - die('Hacking attempt'); + die ('Hacking attempt'); exit; } -define('IN_PHPBB', true); +define ('IN_PHPBB', TRUE); $phpbb_root_path = './'; -include($phpbb_root_path . 'extension.inc'); -include($phpbb_root_path . 'common.' . $phpEx); +include ($phpbb_root_path . 'extension.inc'); +include ($phpbb_root_path . 'common.' . $phpEx); // // Delete the / * to uncomment the block, and edit the values (read the comments) to @@ -101,6 +94,7 @@ $thumbnail = get_var('thumb', 0); // Send file to browser + function send_file_to_browser($attachment, $upload_dir) { global $_SERVER, $HTTP_USER_AGENT, $HTTP_SERVER_VARS, $lang, $db, $attach_config; @@ -109,9 +103,9 @@ $gotit = false; - if (!intval($attach_config['allow_ftp_upload'])) + if ( !intval($attach_config['allow_ftp_upload']) ) { - if (@!file_exists(@amod_realpath($filename))) + if ( @!file_exists(@amod_realpath($filename)) ) { message_die(GENERAL_ERROR, $lang['Error_no_attachment'] . "<br /><br /><b>404 File Not Found:</b> The File <i>" . $filename . "</i> does not exist."); } @@ -125,45 +119,46 @@ // Determine the Browser the User is using, because of some nasty incompatibilities. // Most of the methods used in this function are from phpMyAdmin. :) // - if (!empty($_SERVER['HTTP_USER_AGENT'])) + + if ( !empty($_SERVER['HTTP_USER_AGENT']) ) { $HTTP_USER_AGENT = $_SERVER['HTTP_USER_AGENT']; } - else if (!empty($HTTP_SERVER_VARS['HTTP_USER_AGENT'])) + elseif ( !empty($HTTP_SERVER_VARS['HTTP_USER_AGENT']) ) { $HTTP_USER_AGENT = $HTTP_SERVER_VARS['HTTP_USER_AGENT']; } - else if (!isset($HTTP_USER_AGENT)) + elseif ( !isset($HTTP_USER_AGENT) ) { $HTTP_USER_AGENT = ''; } - if (ereg('Opera(/| )([0-9].[0-9]{1,2})', $HTTP_USER_AGENT, $log_version)) + if ( ereg('Opera(/| )([0-9].[0-9]{1,2})', $HTTP_USER_AGENT, $log_version) ) { $browser_version = $log_version[2]; $browser_agent = 'opera'; } - else if (ereg('MSIE ([0-9].[0-9]{1,2})', $HTTP_USER_AGENT, $log_version)) + elseif ( ereg('MSIE ([0-9].[0-9]{1,2})', $HTTP_USER_AGENT, $log_version) ) { $browser_version = $log_version[1]; $browser_agent = 'ie'; } - else if (ereg('OmniWeb/([0-9].[0-9]{1,2})', $HTTP_USER_AGENT, $log_version)) + elseif ( ereg('OmniWeb/([0-9].[0-9]{1,2})', $HTTP_USER_AGENT, $log_version) ) { $browser_version = $log_version[1]; $browser_agent = 'omniweb'; } - else if (ereg('Netscape([0-9]{1})', $HTTP_USER_AGENT, $log_version)) + elseif ( ereg('Netscape([0-9]{1})', $HTTP_USER_AGENT, $log_version) ) { $browser_version = $log_version[1]; $browser_agent = 'netscape'; } - else if (ereg('Mozilla/([0-9].[0-9]{1,2})', $HTTP_USER_AGENT, $log_version)) + elseif ( ereg('Mozilla/([0-9].[0-9]{1,2})', $HTTP_USER_AGENT, $log_version) ) { $browser_version = $log_version[1]; $browser_agent = 'mozilla'; } - else if (ereg('Konqueror/([0-9].[0-9]{1,2})', $HTTP_USER_AGENT, $log_version)) + elseif ( ereg('Konqueror/([0-9].[0-9]{1,2})', $HTTP_USER_AGENT, $log_version) ) { $browser_version = $log_version[1]; $browser_agent = 'konqueror'; @@ -176,38 +171,39 @@ // Correct the mime type - we force application/octetstream for all files, except images // Please do not change this, it is a security precaution + if (!strstr($attachment['mimetype'], 'image')) { $attachment['mimetype'] = ($browser_agent == 'ie' || $browser_agent == 'opera') ? 'application/octetstream' : 'application/octet-stream'; } - // Now the tricky part... let's dance -// @ob_end_clean(); -// @ini_set('zlib.output_compression', 'Off'); header('Pragma: public'); -// header('Content-Transfer-Encoding: none'); $real_filename = html_entity_decode(basename($attachment['real_filename'])); // Send out the Headers + header('Content-Type: ' . $attachment['mimetype'] . '; name="' . $real_filename . '"'); header('Content-Disposition: inline; filename="' . $real_filename . '"'); - unset($real_filename); + unset ($real_filename); // // Now send the File Contents to the Browser // - if ($gotit) + + if ( $gotit ) { $size = @filesize($filename); - if ($size) + + if ( $size ) { header("Content-length: $size"); } + readfile($filename); } - else if (!$gotit && intval($attach_config['allow_ftp_upload'])) + elseif ( !$gotit && intval($attach_config['allow_ftp_upload']) ) { $conn_id = attach_init_ftp(); @@ -219,6 +215,7 @@ @unlink($tmp_filename); $mode = FTP_BINARY; + if ( (preg_match("/text/i", $attachment['mimetype'])) || (preg_match("/html/i", $attachment['mimetype'])) ) { $mode = FTP_ASCII; @@ -226,7 +223,7 @@ $result = @ftp_get($conn_id, $tmp_filename, $filename, $mode); - if (!$result) + if ( !$result ) { message_die(GENERAL_ERROR, $lang['Error_no_attachment'] . "<br /><br /><b>404 File Not Found:</b> The File <i>" . $filename . "</i> does not exist."); } @@ -234,10 +231,12 @@ @ftp_quit($conn_id); $size = @filesize($tmp_filename); - if ($size) + + if ( $size ) { header("Content-length: $size"); } + readfile($tmp_filename); @unlink($tmp_filename); } @@ -258,26 +257,26 @@ $userdata = session_pagestart($user_ip, PAGE_INDEX); init_userprefs($userdata); -if (!$download_id) +if ( !$download_id ) { message_die(GENERAL_ERROR, $lang['No_attachment_selected']); } -if ($attach_config['disable_mod'] && $userdata['user_level'] != ADMIN) +if ( $attach_config['disable_mod'] && $userdata['user_level'] != ADMIN ) { message_die(GENERAL_MESSAGE, $lang['Attachment_feature_disabled']); } $sql = 'SELECT * FROM ' . ATTACHMENTS_DESC_TABLE . ' - WHERE attach_id = ' . (int) $download_id; + WHERE attach_id = ' . (int) $download_id; -if (!($result = $db->sql_query($sql))) +if ( !($result = $db->sql_query($sql)) ) { message_die(GENERAL_ERROR, 'Could not query attachment informations', '', __LINE__, __FILE__, $sql); } -if (!($attachment = $db->sql_fetchrow($result))) +if ( !($attachment = $db->sql_fetchrow($result)) ) { message_die(GENERAL_MESSAGE, $lang['Error_no_attachment']); } @@ -287,13 +286,14 @@ $db->sql_freeresult($result); // get forum_id for attachment authorization or private message authorization -$authorised = false; +$authorised = FALSE; + $sql = 'SELECT * FROM ' . ATTACHMENTS_TABLE . ' - WHERE attach_id = ' . (int) $attachment['attach_id']; + WHERE attach_id = ' . (int) $attachment['attach_id']; -if (!($result = $db->sql_query($sql))) +if ( !($result = $db->sql_query($sql)) ) { message_die(GENERAL_ERROR, 'Could not query attachment informations', '', __LINE__, __FILE__, $sql); } @@ -301,11 +301,11 @@ $auth_pages = $db->sql_fetchrowset($result); $num_auth_pages = $db->sql_numrows($result); -for ($i = 0; $i < $num_auth_pages && $authorised == false; $i++) +for ( $i = 0; $i < $num_auth_pages && $authorised == FALSE; $i++ ) { $auth_pages[$i]['post_id'] = intval($auth_pages[$i]['post_id']); - if ($auth_pages[$i]['post_id'] != 0) + if ( $auth_pages[$i]['post_id'] != 0 ) { $sql = 'SELECT forum_id FROM ' . POSTS_TABLE . ' @@ -323,7 +323,7 @@ $is_auth = array(); $is_auth = auth(AUTH_ALL, $forum_id, $userdata); - if ($is_auth['auth_download']) + if ( $is_auth['auth_download'] ) { $authorised = TRUE; } @@ -338,7 +338,7 @@ } -if (!$authorised) +if ( !$authorised ) { message_die(GENERAL_MESSAGE, $lang['Sorry_auth_view_attach']); } @@ -346,9 +346,10 @@ // // Get Information on currently allowed Extensions // + $sql = "SELECT e.extension, g.download_mode FROM " . EXTENSION_GROUPS_TABLE . " g, " . EXTENSIONS_TABLE . " e - WHERE (g.allow_group = 1) AND (g.group_id = e.group_id)"; + WHERE (g.allow_group = 1) AND (g.group_id = e.group_id)"; if ( !($result = $db->sql_query($sql)) ) { @@ -358,7 +359,7 @@ $rows = $db->sql_fetchrowset($result); $num_rows = $db->sql_numrows($result); -for ($i = 0; $i < $num_rows; $i++) +for ( $i = 0; $i < $num_rows; $i++ ) { $extension = strtolower(trim($rows[$i]['extension'])); $allowed_extensions[] = $extension; @@ -366,47 +367,50 @@ } // disallowed ? -if (!in_array($attachment['extension'], $allowed_extensions) && $userdata['user_level'] != ADMIN) + +if ( !in_array($attachment['extension'], $allowed_extensions) && $userdata['user_level'] != ADMIN ) { message_die(GENERAL_MESSAGE, sprintf($lang['Extension_disabled_after_posting'], $attachment['extension'])); } $download_mode = intval($download_mode[$attachment['extension']]); -if ($thumbnail) +if ( $thumbnail ) { $attachment['physical_filename'] = THUMB_DIR . '/t_' . $attachment['physical_filename']; } // Update download count -if (!$thumbnail) + +if ( !$thumbnail ) { $sql = 'UPDATE ' . ATTACHMENTS_DESC_TABLE . ' - SET download_count = download_count + 1 - WHERE attach_id = ' . (int) $attachment['attach_id']; + SET download_count = download_count + 1 + WHERE attach_id = ' . (int) $attachment['attach_id']; - if (!$db->sql_query($sql)) + if ( !$db->sql_query($sql) ) { message_die(GENERAL_ERROR, 'Couldn\'t update attachment download count', '', __LINE__, __FILE__, $sql); } } // Determine the 'presenting'-method -if ($download_mode == PHYSICAL_LINK) + +if ( $download_mode == PHYSICAL_LINK ) { $server_protocol = ($board_config['cookie_secure']) ? 'https://' : 'http://'; $server_name = preg_replace('/^\/?(.*?)\/?$/', '\1', trim($board_config['server_name'])); $server_port = ($board_config['server_port'] <> 80) ? ':' . trim($board_config['server_port']) : ''; $script_name = preg_replace('/^\/?(.*?)\/?$/', '/\1', trim($board_config['script_path'])); - if ($script_name[strlen($script_name)] != '/') + if ( $script_name[strlen($script_name)] != '/' ) { $script_name .= '/'; } - if (intval($attach_config['allow_ftp_upload'])) + if ( intval($attach_config['allow_ftp_upload']) ) { - if (trim($attach_config['download_path']) == '') + if ( trim($attach_config['download_path']) == '' ) { message_die(GENERAL_ERROR, 'Physical Download not possible with the current Attachment Setting'); } @@ -422,22 +426,26 @@ } // Redirect via an HTML form for PITA webservers - if (@preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE'))) + + if ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) { header('Refresh: 0; URL=' . $redirect_path); + echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta http-equiv="refresh" content="0; url=' . $redirect_path . '"><title>Redirect</title></head><body><div align="center">If your browser does not support meta redirection please click <a href="' . $redirect_path . '">HERE</a> to be redirected</div></body></html>'; exit; } // Behave as per HTTP/1.1 spec for others + header('Location: ' . $redirect_path); exit; } else { - if (intval($attach_config['allow_ftp_upload'])) + if ( intval($attach_config['allow_ftp_upload']) ) { // We do not need a download path, we are not downloading physically + send_file_to_browser($attachment, ''); exit; } Modified: phpBB Reloaded 2/extension.inc =================================================================== --- phpBB Reloaded 2/extension.inc 2006-06-20 23:05:11 UTC (rev 249) +++ phpBB Reloaded 2/extension.inc 2006-08-12 15:10:37 UTC (rev 250) @@ -1,16 +1,15 @@ <?php -/*************************************************************************** - * extension.inc - * ------------------- - * begin : Saturday, Feb 13, 2001 - * copyright : (C) 2001 The phpBB Group - * email : su...@ph... - * - * $Id: extension.inc,v 1.1.1.1 2006/02/24 02:28:09 markthedaemon Exp $ - * - * - ***************************************************************************/ +/** + * @package core + * @version $ID: Exp$ + * @copyright phpBB Reloaded 2006 + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + */ +/** + * phpBB originally created by phpBB http://www.phpbb.com + */ + if ( !defined('IN_PHPBB') ) { die("Hacking attempt"); Modified: phpBB Reloaded 2/faq.php =================================================================== --- phpBB Reloaded 2/faq.php 2006-06-20 23:05:11 UTC (rev 249) +++ phpBB Reloaded 2/faq.php 2006-08-12 15:10:37 UTC (rev 250) @@ -1,43 +1,27 @@ <?php -/*************************************************************************** - * faq.php - * ------------------- - * begin : Sunday, Jul 8, 2001 - * copyright : (C) 2001 The phpBB Group - * email : su...@ph... - * - * $Id: faq.php,v 1.1.1.1 2006/02/24 02:28:09 markthedaemon Exp $ - * - * - ***************************************************************************/ +/** + * @package core + * @version $ID: Exp$ + * @copyright phpBB Reloaded 2006 + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + */ -/*************************************************************************** - * - * 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 file has been modified by phpBB Reloaded - (C) 2006 phpBB Reloaded Group - * Support questions placed here: http://www.phpbbreloaded.com - * - * DO NOT EDIT THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING - * - ***************************************************************************/ +/** + * phpBB originally created by phpBB http://www.phpbb.com + */ define('IN_PHPBB', true); $phpbb_root_path = './'; -include($phpbb_root_path . 'extension.inc'); -include($phpbb_root_path . 'common.'.$phpEx); +include ($phpbb_root_path . 'extension.inc'); +include ($phpbb_root_path . 'common.'.$phpEx); // // Start session management // + $userdata = session_pagestart($user_ip, PAGE_FAQ); init_userprefs($userdata); + // // End session management // @@ -46,22 +30,22 @@ $navigation->add('FAQ', '', 'faq', '', ''); $navigation->display(); - // Set vars to prevent naughtiness + $faq = array(); // // Load the appropriate faq file // -if( isset($HTTP_GET_VARS['mode']) ) +if ( isset($HTTP_GET_VARS['mode']) ) { - switch( $HTTP_GET_VARS['mode'] ) + switch ( $HTTP_GET_VARS['mode'] ) { - case 'bbcode': + case 'bbcode' : $lang_file = 'lang_bbcode'; $l_title = $lang['BBCode_guide']; break; - default: + default : $lang_file = 'lang_faq'; $l_title = $lang['FAQ']; break; @@ -72,27 +56,28 @@ $lang_file = 'lang_faq'; $l_title = $lang['FAQ']; } -include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/' . $lang_file . '.' . $phpEx); +include ($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/' . $lang_file . '.' . $phpEx); + //attachment stuff! if ( defined('CH_mod_attachmod') ) { attach_faq_include($lang_file); } - // // Pull the array data from the lang pack // + $j = 0; $counter = 0; $counter_2 = 0; $faq_block = array(); $faq_block_titles = array(); -for($i = 0; $i < count($faq); $i++) +for ( $i = 0; $i < count($faq); $i++ ) { - if( $faq[$i][0] != '--' ) + if ( $faq[$i][0] != '--' ) { $faq_block[$j][$counter]['id'] = $counter_2; $faq_block[$j][$counter]['question'] = $faq[$i][0]; @@ -114,12 +99,14 @@ // // Lets build a page ... // + $page_title = $l_title; -include($phpbb_root_path . 'includes/page_header.'.$phpEx); +include ($phpbb_root_path . 'includes/page_header.'.$phpEx ); $template->set_filenames(array( 'body' => 'faq_body.tpl') ); + make_jumpbox('viewforum.'.$phpEx); $template->assign_vars(array( @@ -127,18 +114,19 @@ 'L_BACK_TO_TOP' => $lang['Back_to_top']) ); -for($i = 0; $i < count($faq_block); $i++) +for ( $i = 0; $i < count($faq_block); $i++ ) { - if( count($faq_block[$i]) ) + if ( count($faq_block[$i]) ) { $template->assign_block_vars('faq_block', array( 'BLOCK_TITLE' => $faq_block_titles[$i]) ); + $template->assign_block_vars('faq_block_link', array( 'BLOCK_TITLE' => $faq_block_titles[$i]) ); - for($j = 0; $j < count($faq_block[$i]); $j++) + for ( $j = 0; $j < count($faq_block[$i]); $j++ ) { $row_color = ( !($j % 2) ) ? $theme['td_color1'] : $theme['td_color2']; $row_class = ( !($j % 2) ) ? $theme['td_class1'] : $theme['td_class2']; @@ -163,13 +151,11 @@ )); $template->set_switch('faq_block.faq_row.light', !($j % 2)); $template->set_switch('faq_block_link.faq_row_link.light', !($j % 2)); -//-- fin mod : categories hierarchy -------------------------------------------- } } } $template->pparse('body'); -include($phpbb_root_path . 'includes/page_tail.'.$phpEx); - +include ($phpbb_root_path . 'includes/page_tail.'.$phpEx); ?> \ No newline at end of file Modified: phpBB Reloaded 2/groupcp.php =================================================================== --- phpBB Reloaded 2/groupcp.php 2006-06-20 23:05:11 UTC (rev 249) +++ phpBB Reloaded 2/groupcp.php 2006-08-12 15:10:37 UTC (rev 250) @@ -1,34 +1,21 @@ <?php -//-- mod : group moderatorZ ------------------------------------------------------------------------ -//-- mod : categories hierarchy ------------------------------------------------ -/*************************************************************************** - * groupcp.php - * ------------------- - * begin : Saturday, Feb 13, 2001 - * copyright : (C) 2001 The phpBB Group - * email : su...@ph... - * - * $Id: groupcp.php,v 1.2 2006/02/27 03:45:02 scioncrow Exp $ - * - * - ***************************************************************************/ +/** + * @package core + * @version $ID: Exp$ + * @copyright phpBB Reloaded 2006 + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + */ -/*************************************************************************** - * - * 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. - * - ***************************************************************************/ +/** + * phpBB originally created by phpBB http://www.phpbb.com + */ -define('IN_PHPBB', true); +define('IN_PHPBB', TRUE); $phpbb_root_path = './'; -include($phpbb_root_path . 'extension.inc'); -include($phpbb_root_path . 'common.'.$phpEx); +include ($phpbb_root_path . 'extension.inc'); +include ($phpbb_root_path . 'common.'.$phpEx); -// ------------------------- -// + function generate_user_info(&$row, $date_format, $group_mod, &$from, &$posts, &$joined, &$poster_avatar, &$profile_img, &$profile, &$search_img, &$search, &$pm_img, &$pm, &$email_img, &$email, &$www_img, &$www, &$icq_status_img, &$icq_img, &$icq, &$aim_img, &$aim, &$msn_img, &$msn, &$yim_img, &$yim) { global $lang, $images, $board_config, $phpEx; @@ -38,9 +25,10 @@ $posts = ( $row['user_posts'] ) ? $row['user_posts'] : 0; $poster_avatar = ''; + if ( $row['user_avatar_type'] && $row['user_id'] != ANONYMOUS && $row['user_allowavatar'] ) { - switch( $row['user_avatar_type'] ) + switch ( $row['user_avatar_type'] ) { case USER_AVATAR_UPLOAD: $poster_avatar = ( $board_config['allow_avatar_upload'] ) ? '<img src="' . $board_config['avatar_path'] . '/' . $row['user_avatar'] . '" alt="" border="0" />' : ''; @@ -107,55 +95,61 @@ return; } -// -// -------------------------- // // Start session management // + $userdata = session_pagestart($user_ip, PAGE_GROUPCP); init_userprefs($userdata); + // // End session management // -//-- mod : categories hierarchy ------------------------------------------------ -//-- add $navigation = new navigation(); $navigation->add('Usergroups', '', 'groupcp', '', ''); $navigation->display(); // read forums and auths for the jumpbox -include($config->url('includes/class_forums')); + +include ($config->url('includes/class_forums')); $forums = new forums(); $forums->read(); $user->get_cache(array(POST_GROUPS_URL, POST_FORUM_URL, POST_FORUM_URL . 'jbox')); $user_groups_list = $user->get_groups_list(); // auth -$auth_manage = false; -$auth_membership = false; +$auth_manage = FALSE; +$auth_membership = FALSE; + // level + $is_founder = $user->data['session_logged_in'] && in_array(GROUP_FOUNDER, $user_groups_list); $is_admin = $user->data['session_logged_in'] && in_array(GROUP_ADMIN, $user_groups_list); -$is_owner = false; +$is_owner = FALSE; // read group + $group_id = _read(POST_GROUPS_URL, TYPE_INT); + if ( $group_id == GROUP_REGISTERED ) { message_return('Not_Authorised'); } + $group_status = GROUP_STANDARD; $group_row = array(); + if ( !empty($group_id) ) { $sql = 'SELECT * FROM ' . GROUPS_TABLE . ' WHERE group_id = ' . intval($group_id) . ' - AND group_single_user <> ' . true; + AND group_single_user <> ' . TRUE; $result = $db->sql_query($sql, false, __LINE__, __FILE__); + if ( $group_row = $db->sql_fetchrow($result) ) { $group_status = intval($group_row['group_status']); @@ -163,68 +157,40 @@ $group_row['group_description'] = ($group_status >= GROUP_SYSTEM) ? $user->lang($group_row['group_description']) : $group_row['group_description']; $is_owner = $user->data['session_logged_in'] && (intval($group_row['group_moderator']) == $user->data['user_id']); -//-- mod : group moderatorZ ------------------------------------------------------------------------ $sql = "SELECT * FROM " . USER_GROUP_TABLE . " WHERE group_moderator = 1 AND group_id = $group_id"; - $result = $db->sql_query($sql, false, __LINE__, __FILE__); + $result = $db->sql_query($sql, FALSE, __LINE__, __FILE__); $modZ_row = array(); $is_modZ = FALSE; - while ( ( $modZ_row = $db->sql_fetchrow($result) ) AND ( $is_modZ == FALSE ) ) + + while ( ($modZ_row = $db->sql_fetchrow($result) ) && ($is_modZ == FALSE) ) { $is_modZ = $user->data['session_logged_in'] && (intval($modZ_row['user_id']) == $user->data['user_id']); } -//-- mod : group moderatorZ - dynamic adaptation --------------------------------------------------- + // check auths + $is_auth_owner = $user->auth(POST_GROUPS_URL, 'ucp_auth_owner', $group_id); $is_auth_mod = $user->auth(POST_GROUPS_URL, 'ucp_auth_mod', $group_id); -//-- fin mod : group moderatorZ - dynamic adaptation ----------------------------------------------- -//-- fin mod : group moderatorZ -------------------------------------------------------------------- } } + switch ( $group_id ) { -//-- mod : group moderatorZ ------------------------------------------------------------------------ -// here we added -// || $is_modZ 3 times. -// ( " || $is_auth_owner" and " || $is_auth_mod" for dynamic adaptation) -// -// *** Modding Help -// * Grouplevel -// GROUP_FOUNDER = This apply's to the usergroup that acts as founder -// GROUP_ADMIN = This apply's to the usergroup that acts as admin -// default = This is any outher group. -// * Authority -// $auth_manage = who an act as owner in groups (he has to be in $auth_mebership as well) -// $auth_membership = who can act as moderator in groups -// * Userlevel -// $is_owner = user that is owner oft that group -// $is_founder = user that has founder status -// $is_admin = user that has admin status -// $is_modZ = user that is appointed moderator of that particular group -// $is_auth_owner = user that is given owner acces in the ACP -// $is_auth_mod = user that is given moderator acces in the ACP -// *** End Help -// -// ***Advice: Remove " || $is_admin" from the default if you want that admins can not manage all default groups -// and only can manage those groups set by the founder in the ACP -// -//--modify - case GROUP_FOUNDER: + case GROUP_FOUNDER : $auth_manage = $is_owner; $auth_membership = $is_owner || $is_modZ; break; - case GROUP_ADMIN: + case GROUP_ADMIN : $auth_manage = $is_founder; $auth_membership = $is_owner || $is_founder || $is_modZ; break; - default: + default : $auth_manage = $is_owner || $is_founder || $is_admin; $auth_membership = $is_owner || $is_founder || $is_admin || $is_modZ; break; -//-- fin mod : group moderatorZ -------------------------------------------------------------------- } -//-- fin mod : categories hierarchy -------------------------------------------- $script_name = preg_replace('/^\/?(.*?)\/?$/', "\\1", trim($board_config['script_path'])); $script_name = ( $script_name != '' ) ? $script_name . '/groupcp.'.$phpEx : 'groupcp.'.$phpEx; @@ -261,63 +227,43 @@ // // Default var values // + $is_moderator = FALSE; -//-- mod : Advanced Group Color Management ------------------------------------- -//-- add $colors->read_group_users($group_id); -//-- fin mod : Advanced Group Color Management --------------------------------- - if ( isset($HTTP_POST_VARS['groupstatus']) && $group_id ) { if ( !$userdata['session_logged_in'] ) { - redirect(append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true)); + redirect(append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", TRUE)); } -//-- mod : categories hierarchy ------------------------------------------------ -//-- delete -/* - $sql = "SELECT group_moderator - FROM " . GROUPS_TABLE . " - WHERE group_id = $group_id"; - if ( !($result = $db->sql_query($sql)) ) - { - message_die(GENERAL_ERROR, 'Could not obtain user and group information', '', __LINE__, __FILE__, $sql); - } - - $row = $db->sql_fetchrow($result); -*/ -//-- add // get the group + $row = $group_row; $group_type = _read('group_type', TYPE_INT); + if ( !$auth_membership ) { _error('Not_group_moderator'); } - else if ( ($group_status >= GROUP_SYSTEM) && ($group_type < GROUP_CLOSED) ) + elseif ( ($group_status >= GROUP_SYSTEM) && ($group_type < GROUP_CLOSED) ) { _error('Change_sysgroup_type_denied'); } - else if ( ($group_type != $row['group_type']) && !$auth_manage ) + elseif ( ($group_type != $row['group_type']) && !$auth_manage ) { _error('Manage_group_denied'); } + if ( $error ) { $l_link = 'Click_return_group'; - $u_link = $config->url('groupcp', array(POST_GROUPS_URL => intval($group_id)), true); + $u_link = $config->url('groupcp', array(POST_GROUPS_URL => intval($group_id)), TRUE); message_return($error_msg, $l_link, $u_link); } -//-- fin mod : categories hierarchy -------------------------------------------- -//-- mod : group moderatorZ ------------------------------------------------------------------------ -//-- delete -// if ( $row['group_moderator'] != $userdata['user_id'] && $userdata['user_level'] != ADMIN ) -//-- add - if ( !$auth_manage ) -//-- fin mod : group moderatorZ -------------------------------------------------------------------- + if ( !$auth_manage ) { $template->assign_vars(array( 'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid("index.$phpEx") . '">') @@ -331,6 +277,7 @@ $sql = "UPDATE " . GROUPS_TABLE . " SET group_type = " . intval($HTTP_POST_VARS['group_type']) . " WHERE group_id = $group_id"; + if ( !($result = $db->sql_query($sql)) ) { message_die(GENERAL_ERROR, 'Could not obtain user and group information', '', __LINE__, __FILE__, $sql); @@ -345,12 +292,13 @@ message_die(GENERAL_MESSAGE, $message); } -else if ( isset($HTTP_POST_VARS['joingroup']) && $group_id ) +elseif ( isset($HTTP_POST_VARS['joingroup']) && $group_id ) { // // First, joining a group // If the user isn't logged in redirect them to login // + if ( !$userdata['session_logged_in'] ) { redirect(append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true)); @@ -358,15 +306,16 @@ $sql = "SELECT ug.user_id, g.group_type FROM " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g - WHERE g.group_id = $group_id - AND g.group_type <> " . GROUP_HIDDEN . " - AND ug.group_id = g.group_id"; + WHERE g.group_id = $group_id + AND g.group_type <> " . GROUP_HIDDEN . " + AND ug.group_id = g.group_id"; + if ( !($result = $db->sql_query($sql)) ) { message_die(GENERAL_ERROR, 'Could not obtain user and group information', '', __LINE__, __FILE__, $sql); } - if ( $row = $db->sql_fetchrow($result) ) + if ( $row = $db->sql_fetchrow($result) ) { if ( $row['group_type'] == GROUP_OPEN ) { @@ -382,7 +331,8 @@ message_die(GENERAL_MESSAGE, $message); } - } while ( $row = $db->sql_fetchrow($result) ); + } + while ( $row = $db->sql_fetchrow($result) ); } else { @@ -402,64 +352,45 @@ $sql = "INSERT INTO " . USER_GROUP_TABLE . " (group_id, user_id, user_pending) VALUES ($group_id, " . $userdata['user_id'] . ", 1)"; + if ( !($result = $db->sql_query($sql)) ) { message_die(GENERAL_ERROR, "Error inserting user group subscription", "", __LINE__, __FILE__, $sql); } -//-- mod : group moderatorZ ------------------------------------------------------------------------ -// here we added -// include($phpbb_root_path . 'includes/emailer.'.$phpEx); -// and -// , " . USER_GROUP_TABLE . " ug -// and -// , ( [../..] OR ug.group_moderator = 1 ) -// and -// AND u.user_id = ug.user_id AND ug.group_id = g.group_id -//-- modify - include($phpbb_root_path . 'includes/emailer.'.$phpEx); + include ($phpbb_root_path . 'includes/emailer.'.$phpEx); + $sql = "SELECT u.user_email, u.username, u.user_lang, g.group_name FROM ".USERS_TABLE . " u, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g WHERE ( u.user_id = g.group_moderator OR ug.group_moderator = 1 ) AND g.group_id = $group_id AND u.user_id = ug.user_id AND ug.group_id = g.group_id"; -//-- fin mod : group moderatorZ -------------------------------------------------------------------- + if ( !($result = $db->sql_query($sql)) ) { message_die(GENERAL_ERROR, "Error getting group moderator data", "", __LINE__, __FILE__, $sql); } -//-- mod : group moderatorZ ------------------------------------------------------------------------ -//-- delete -// $moderator = $db->sql_fetchrow($result); -// -// include($phpbb_root_path . 'includes/emailer.'.$phpEx); -//-- add - while ($moderator = $db->sql_fetchrow($result)) + while ( $moderator = $db->sql_fetchrow($result) ) { -//-- fin mod : group moderatorZ -------------------------------------------------------------------- - $emailer = new emailer($board_config['smtp_delivery']); + $emailer = new emailer($board_config['smtp_delivery']); - $emailer->from($board_config['board_email']); - $emailer->replyto($board_config['board_email']); + $emailer->from($board_config['board_email']); + $emailer->replyto($board_config['board_email']); - $emailer->use_template('group_request', $moderator['user_lang']); - $emailer->email_address($moderator['user_email']); - $emailer->set_subject($lang['Group_request']); + $emailer->use_template('group_request', $moderator['user_lang']); + $emailer->email_address($moderator['user_email']); + $emailer->set_subject($lang['Group_request']); - $emailer->assign_vars(array( - 'SITENAME' => $board_config['sitename'], - 'GROUP_MODERATOR' => $moderator['username'], - 'EMAIL_SIG' => (!empty($board_config['board_email_sig'])) ? str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']) : '', + $emailer->assign_vars(array( + 'SITENAME' => $board_config['sitename'], + 'GROUP_MODERATOR' => $moderator['username'], + 'EMAIL_SIG' => (!empty($board_config['board_email_sig'])) ? str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']) : '', - 'U_GROUPCP' => $server_url . '?' . POST_GROUPS_URL . "=$group_id&validate=true") - ); - $emailer->send(); - $emailer->reset(); - -//-- mod : group moderatorZ ------------------------------------------------------------------------ -//-- add + 'U_GROUPCP' => $server_url . '?' . POST_GROUPS_URL . "=$group_id&validate=true") + ); + $emailer->send(); + $emailer->reset(); } -//-- fin mod : group moderatorZ -------------------------------------------------------------------- $template->assign_vars(array( 'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid("index.$phpEx") . '">') @@ -469,19 +400,20 @@ message_die(GENERAL_MESSAGE, $message); } -else if ( isset($HTTP_POST_VARS['unsub']) || isset($HTTP_POST_VARS['unsubpending']) && $group_id ) +elseif ( isset($HTTP_POST_VARS['unsub']) || isset($HTTP_POST_VARS['unsubpending']) && $group_id ) { // // Second, unsubscribing from a group // Check for confirmation of unsub. // + if ( $cancel ) { - redirect(append_sid("groupcp.$phpEx", true)); + redirect(append_sid("groupcp.$phpEx", TRUE)); } elseif ( !$userdata['session_logged_in'] ) { - redirect(append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true)); + redirect(append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", TRUE)); } if ( $confirm ) @@ -494,63 +426,27 @@ message_die(GENERAL_ERROR, 'Could not delete group memebership data', '', __LINE__, __FILE__, $sql); } -//-- mod : categories hierarchy ------------------------------------------------ -//-- delete -/* - if ( $userdata['user_level'] != ADMIN && $userdata['user_level'] == MOD ) - { - $sql = "SELECT COUNT(auth_mod) AS is_auth_mod - FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug - WHERE ug.user_id = " . $userdata['user_id'] . " - AND aa.group_id = ug.group_id - AND aa.auth_mod = 1"; - if ( !($result = $db->sql_query($sql)) ) - { - message_die(GENERAL_ERROR, 'Could not obtain moderator status', '', __LINE__, __FILE__, $sql); - } - - ... [truncated message content] |
|
From: <mar...@us...> - 2006-06-20 23:05:17
|
Revision: 249 Author: markthedaemon Date: 2006-06-20 16:05:11 -0700 (Tue, 20 Jun 2006) ViewCVS: http://svn.sourceforge.net/phpbbreloaded/?rev=249&view=rev Log Message: ----------- Modified Paths: -------------- phpBB Reloaded 2/templates/subC1/index_body.tpl Modified: phpBB Reloaded 2/templates/subC1/index_body.tpl =================================================================== --- phpBB Reloaded 2/templates/subC1/index_body.tpl 2006-06-20 23:02:12 UTC (rev 248) +++ phpBB Reloaded 2/templates/subC1/index_body.tpl 2006-06-20 23:05:11 UTC (rev 249) @@ -177,19 +177,7 @@ </tr> </table></form> <!-- END switch_user_logged_out --> -<!-- Start add - Fully integrated shoutbox MOD --> -<table width="100%" cellspacing="0" border="0" align="center" cellpadding="2" class="forumline"> - <tr> - <td align="center" nowrap="nowrap" class="catHead"><span class="cattitle"><a href="{U_SHOUTBOX_MAX}">{L_SHOUTBOX}</a></span></td> - </tr> - <tr> - <td> - <iframe src="{U_SHOUTBOX}" scrolling="NO" width="100%" height="180" frameborder="0" marginheight="0" marginwidth="0" allowtransparency="true"></iframe> - </td> - </tr> -</table> -<br/> -<!-- End add - Fully integrated shoutbox MOD --> + <!-- BEGIN forum_legend --> <br class="nav" /> <!-- Start add - Fully integrated shoutbox MOD --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mar...@us...> - 2006-06-20 23:02:17
|
Revision: 248 Author: markthedaemon Date: 2006-06-20 16:02:12 -0700 (Tue, 20 Jun 2006) ViewCVS: http://svn.sourceforge.net/phpbbreloaded/?rev=248&view=rev Log Message: ----------- Modified Paths: -------------- phpBB Reloaded 2/templates/subC1/index_body.tpl Modified: phpBB Reloaded 2/templates/subC1/index_body.tpl =================================================================== --- phpBB Reloaded 2/templates/subC1/index_body.tpl 2006-06-20 22:57:36 UTC (rev 247) +++ phpBB Reloaded 2/templates/subC1/index_body.tpl 2006-06-20 23:02:12 UTC (rev 248) @@ -192,6 +192,20 @@ <!-- End add - Fully integrated shoutbox MOD --> <!-- BEGIN forum_legend --> <br class="nav" /> +<!-- Start add - Fully integrated shoutbox MOD --> +<table width="100%" cellspacing="0" border="0" align="center" cellpadding="2" class="forumline"> + <tr> + <td align="center" nowrap="nowrap" class="catHead"><span class="cattitle"><a href="{U_SHOUTBOX_MAX}">{L_SHOUTBOX}</a></span></td> + </tr> + <tr> + <td> + <iframe src="{U_SHOUTBOX}" scrolling="NO" width="100%" height="180" frameborder="0" marginheight="0" marginwidth="0" allowtransparency="true"></iframe> + </td> + </tr> +</table> +<br/> +<!-- End add - Fully integrated shoutbox MOD --> +<br class="nav" /> <table cellspacing="3" border="0" align="center" cellpadding="0"> <tr> <td width="20" align="center"><img src="{FORUM_NEW_IMG}" alt="{L_NEW_POSTS}" /></td> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mar...@us...> - 2006-06-20 22:57:45
|
Revision: 247 Author: markthedaemon Date: 2006-06-20 15:57:36 -0700 (Tue, 20 Jun 2006) ViewCVS: http://svn.sourceforge.net/phpbbreloaded/?rev=247&view=rev Log Message: ----------- Added Paths: ----------- phpBB Reloaded 2/includes/class_calendar.php phpBB Reloaded 2/includes/class_calendar_topics.php Added: phpBB Reloaded 2/includes/class_calendar.php =================================================================== --- phpBB Reloaded 2/includes/class_calendar.php (rev 0) +++ phpBB Reloaded 2/includes/class_calendar.php 2006-06-20 22:57:36 UTC (rev 247) @@ -0,0 +1,914 @@ +<?php + +/*************************************************************************** + * class_calendar.php + * ------------------ + * begin : 01/12/2004 + * copyright : Ptirhiik + * email : pti...@cl... + * + * Version : 0.0.6 - 03/10/2005 + * + ***************************************************************************/ + +/*************************************************************************** + * + * 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('IN_PHPBB') ) +{ + die('Hacking attempt'); +} + +//------------------------------- +// registration of event type : +// class => file +//------------------------------- +$calendar_event_types = array( + 'calendar_event_topics' => 'class_calendar_topics', + 'calendar_event_birthday' => 'class_calendar_birthday', + 'calendar_event_hollyday' => 'class_calendar_hollyday', +); + +// read valid modules +$calendar_modules = array(); +foreach ( $calendar_event_types as $module_class => $module_file ) +{ + if ( !empty($module_file) ) + { + @include_once($config->url('includes/' . $module_file)); + } + if ( class_exists($module_class) ) + { + $calendar_modules[] = $module_class; + } +} +//------------------------------- +// output a user date +function format_user_date($time, $fmt) +{ + global $lang; + return strtr(date($fmt, $time), $lang['datetime']); +} + +// get user date day +function day_user_date($time, $inc=0) +{ + return mktime(0, 0, 0, date('m', $time), date('d', $time) + $inc, date('Y', $time)); +} +//------------------------------- + +class calendar_event_queue +{ + var $queue; + var $map; + + function calendar_event_queue() + { + $this->queue = array(); + $this->map = array(); + } + + // + // map events per day + // + function map($start_date, $end_date) + { + global $config, $user; + + // init + $this->map = array(); + if ( empty($this->queue) ) + { + return false; + } + + // fill the map with the date + $cur = day_user_date($start_date); + while ( $cur < $end_date ) + { + $this->map[$cur] = array(); + $cur = day_user_date($cur, +1); + } + if ( empty($this->map) ) + { + return false; + } + $count_map = count($this->map); + $map_keys = array_keys($this->map); + $rev_map_keys = array_flip($map_keys); + + // build a list per date + $event_classes = array_keys($this->queue); + $count_event_classes = count($event_classes); + for ( $i = 0; $i < $count_event_classes; $i++ ) + { + $event_class = $event_classes[$i]; + if ( !empty($this->queue[$event_class]) ) + { + $count_events = count($this->queue[$event_class]->data); + for ( $j = 0; $j < $count_events; $j++ ) + { + $row = &$this->queue[$event_class]->data[$j]; + $event_start = max($user->cvt_sys_to_user_date($row['event_start']), $start_date); + $event_end = min($user->cvt_sys_to_user_date($row['event_end']), $end_date); + + $offset_date = $event_start == $start_date ? $event_start : day_user_date($event_start); + + // find the first available spot in the mapped day + $count_map_offset_date = count($this->map[$offset_date]); + $map_offset = $count_map_offset_date; + $found = false; + if ( $count_map_offset_date ) + { + for ( $k = 0; ($k < $count_map_offset_date) && !$found; $k++) + { + if ( $this->map[$offset_date][$k] == -1 ) + { + $found = true; + $map_offset = $k; + } + } + } + + // mark the offset as used for the whole event period + $idx_offset = isset($rev_map_keys[$offset_date]) ? $rev_map_keys[$offset_date] : -1; + while ( ($idx_offset >= 0) && ($offset_date <= $event_end) ) + { + for ( $k = count($this->map[$offset_date]); $k <= $map_offset; $k++ ) + { + $this->map[$offset_date][$k] = -1; + } + $this->map[$offset_date][$map_offset] = array('event_class' => $event_class, 'event_idx' => $j); + $idx_offset++; + if ( $idx_offset >= $count_map ) + { + $idx_offset = -1; + } + $offset_date = $map_keys[$idx_offset]; + } + } + } + } + } + + // + // display a week row for the index, or the full month view page + // + function display($start_date, $selected_date, $nb_rows, $nb_cells, $full_month, $start_inc, $with_text, $with_bbcode) + { + global $template, $config, $user; + + // get the number of lines per cell + $nb_lines_per_cell = intval($config->data['calendar_nb_row']); + + // get the mapped dates + $map_dates = array_keys($this->map); + $count_map_dates = count($map_dates); + $offset_map_date = 0 - $start_inc; + + // get today offset for the user + $selected_date = day_user_date($selected_date); + + // display + for ( $i = 0; $i < $nb_rows; $i++ ) + { + $row_sent = false; + for ( $j = 0; $j < $nb_cells; $j++ ) + { + // date out of range + $blank_start = $offset_map_date < 0; + $blank_end = $offset_map_date >= $count_map_dates; + + // empty cells + if ( $blank_start || $blank_end ) + { + if ( $blank_start ) + { + // compute the cell to span + $span = $start_inc; + $j = $start_inc; + $offset_map_date = 0; + } + + // date greater than end + if ( $blank_end ) + { + // compute the cell to span + $span = $nb_cells-$j; + $j = $nb_cells; + } + + // send empty cells + if ( $blank_start || (($span > 0) && ($span < $nb_cells)) ) + { + if ( !$row_sent ) + { + $template->set_switch('cal_row'); + $row_sent = true; + } + $template->assign_block_vars('cal_row.cal_cell', array( + 'WIDTH' => floor(100 / $nb_cells) * $span, + 'SPAN' => $span, + )); + $template->set_switch('cal_row.cal_cell.empty'); + } + } + + // filled cells + if ( !$blank_end ) + { + if ( !$row_sent ) + { + $template->set_switch('cal_row'); + $row_sent = true; + } + $offset_date = $map_dates[$offset_map_date]; + $template->assign_block_vars('cal_row.cal_cell', array( + 'WIDTH' => floor(100 / $nb_cells), + 'DATE' => format_user_date($offset_date, $full_month ? $user->data['user_dateformat_short'] : $user->data['user_dateformat_medium'], false), + 'U_DATE' => $config->url('calendar_scheduler', array('date' => date('Ymd', $offset_date), POST_FORUM_URL => $forum_id), true), + + 'EVENT_DATE' => $offset_date, + 'TOGGLE_STATUS' => 'none', + 'TOGGLE_ICON' => $user->img('down_arrow'), + )); + $template->set_switch('cal_row.cal_cell.filled'); + + $template->set_switch('cal_row.cal_cell.active', $selected_date == $offset_date); + $template->set_switch('cal_row.cal_cell.filled.active', $selected_date == $offset_date); + + // send events + $count_map = count($this->map[$offset_date]); + for ( $k = 0; $k < $count_map; $k++ ) + { + $content = isset($this->map[$offset_date][$k]) && is_array($this->map[$offset_date][$k]); + if ( $content ) + { + $event_class = $this->map[$offset_date][$k]['event_class']; + $event_idx = $this->map[$offset_date][$k]['event_idx']; + $this->queue[$event_class]->display_one_item($event_idx, 'cal_row.cal_cell.filled._event', $with_text, $with_bbcode, false, false, false); + } + else + { + $template->set_switch('cal_row.cal_cell.filled._event'); + $template->set_switch('cal_row.cal_cell.filled._event._content', false); + } + + // we gonna have an overflow + if ( $count_map > $nb_lines_per_cell ) + { + // we are on the last line displayed + $template->set_switch('cal_row.cal_cell.filled._event._more', $k == ($nb_lines_per_cell - 1)); + if ( $k == ($nb_lines_per_cell - 1) ) + { + $template->set_switch('cal_row.cal_cell.filled._event._more.java', $with_bbcode); + } + + // we are on the first line hidden + $template->set_switch('cal_row.cal_cell.filled._event._more_header', $k == $nb_lines_per_cell); + + // we are on the last line hidden + $template->set_switch('cal_row.cal_cell.filled._event._more_footer', $k == ($count_map-1)); + } + } + } + + // next map cell + $offset_map_date++; + } + } + } +} + +class calendar_month_event_queue extends calendar_event_queue +{ + function display($start_date, $selected_date, $nb_rows, $nb_cells, $full_month, $start_inc, $with_text=true, $with_bbcode=true) + { + global $template, $config, $user; + + // get the mapped dates + $map_dates = array_keys($this->map); + $count_map_dates = count($map_dates); + $offset_map_date = 0 - $start_inc; + + // get today offset for the user + $selected_date = day_user_date($selected_date); + + // send java + $template->set_switch('java', $with_bbcode); + + // display + $color = false; + for ( $i = 0; $i < $nb_rows; $i++ ) + { + $color = !$color; + $row_sent = false; + for ( $j = 0; $j < $nb_cells; $j++ ) + { + // date out of range + $blank_start = $offset_map_date < 0; + $blank_end = $offset_map_date >= $count_map_dates; + + // empty cells + if ( $blank_start || $blank_end ) + { + if ( $blank_start ) + { + // compute the cell to span + $span = $start_inc; + $j = $start_inc; + $offset_map_date = 0; + } + + // date greater than end + if ( $blank_end ) + { + // compute the cell to span + $span = $nb_cells-$j; + $j = $nb_cells; + } + + // send empty cells + if ( $blank_start || (($span > 0) && ($span < $nb_cells)) ) + { + if ( !$row_sent ) + { + $template->set_switch('cal_row'); + $row_sent = true; + } + $template->assign_block_vars('cal_row.cal_cell', array( + 'WIDTH' => floor(100 / $nb_cells) * $span, + 'SPAN' => $span, + )); + $template->set_switch('cal_row.cal_cell.empty'); + } + } + + // filled cells + if ( !$blank_end ) + { + if ( !$row_sent ) + { + $template->set_switch('cal_row'); + $row_sent = true; + } + $offset_date = $map_dates[$offset_map_date]; + $template->assign_block_vars('cal_row.cal_cell', array( + 'WIDTH' => floor(100 / $nb_cells), + 'DAY' => format_user_date($offset_date, 'd'), + 'L_DATE' => format_user_date($offset_date, $user->data['user_dateformat_medium']), + 'U_DATE' => $config->url('calendar_scheduler', array('date' => date('Ymd', $offset_date), POST_FORUM_URL => _read(POST_FORUM_URL, TYPE_INT)), true), + )); + if ( $selected_date == $offset_date ) + { + $template->set_switch('cal_row.cal_cell.active'); + } + else + { + $template->set_switch('cal_row.cal_cell.light', $color); + } + + // send events + $count_map = count($this->map[$offset_date]); + $content = false; + for ( $k = 0; $k < $count_map; $k++ ) + { + if ( isset($this->map[$offset_date][$k]) && is_array($this->map[$offset_date][$k]) ) + { + $first = false; + if ( !$content ) + { + $content = true; + $first = true; + $template->set_switch('cal_row.cal_cell.filled'); + if ( $with_bbcode ) + { + $day_id = date('Ymd', $offset_date); + $tpl_var = array( + 'DAY_ID' => $day_id, + 'L_DATE' => format_user_date($offset_date, $user->data['user_dateformat_medium']), + 'U_DATE' => $config->url('calendar_scheduler', array('date' => date('Ymd', $offset_date), POST_FORUM_URL => _read(POST_FORUM_URL, TYPE_INT)), true), + ); + $template->assign_block_vars('java.day', $tpl_var); + $template->assign_block_vars('cal_row.cal_cell.filled.java', $tpl_var); + } + else + { + $template->set_switch('cal_row.cal_cell.filled.java', false); + } + } + $event_class = $this->map[$offset_date][$k]['event_class']; + $event_idx = $this->map[$offset_date][$k]['event_idx']; + $this->queue[$event_class]->display_one_item($event_idx, $with_bbcode ? 'cal_row.cal_cell.filled.java._event' : 'cal_row.cal_cell.filled.java_ELSE._event', $with_text, $with_bbcode, true, $day_id); + } + } + if ( !$content ) + { + $template->set_switch('cal_row.cal_cell.filled', false); + } + } + + // next map cell + $offset_map_date++; + } + } + + + // template + $template->set_filenames(array('_calendar_month_box' => 'calendar_month_box.tpl')); + $template->assign_block_vars('left_side', array( + 'BOX' => $template->get_pparse('_calendar_month_box'), + )); + $template->set_switch('left_side.first'); + } + + function display_list($start_time, $end_time) + { + global $user; + + // prepare the list + $event_classes = array_keys($this->queue); + $count_event_classes = count($event_classes); + $list = array(); + for ( $i = 0; $i < $count_event_classes; $i++ ) + { + $list[ $event_classes[$i] ] = array(); + } + + // get the day starting time + $offset_date = day_user_date($start_time); + $count_map = count($this->map[$offset_date]); + for ( $i = 0; $i < $count_map; $i++ ) + { + if ( isset($this->map[$offset_date][$i]) && is_array($this->map[$offset_date][$i]) ) + { + $event_class = $this->map[$offset_date][$i]['event_class']; + $event_idx = $this->map[$offset_date][$i]['event_idx']; + $event_start = $user->cvt_sys_to_user_date($this->queue[$event_class]->data[$event_idx]['event_start']); + $event_end = $user->cvt_sys_to_user_date($this->queue[$event_class]->data[$event_idx]['event_end']); + if ( ($event_start < $end_time) && ($event_end >= $start_time) ) + { + $list[$event_class][] = $event_idx; + } + } + } + for ( $i = 0; $i < $count_event_classes; $i++ ) + { + $this->queue[ $event_classes[$i] ]->display_list($start_time, $end_time, $list[ $event_classes[$i] ], $i == 0); + } + } +} + +class calendar_event +{ + var $data; + var $total; + var $tpl_loaded; + var $calendar_event_queue; + + function calendar_event(&$calendar_event_queue) + { + $this->data = array(); + $this->total = array(); + $this->tpl_loaded = false; + $this->calendar_event_queue = &$calendar_event_queue; + } +} + +class calendar +{ + var $start_date; + var $end_date; + var $with_text; + var $with_bbcode; + var $forum_id; + + var $full_month; + var $nb_cells; + var $nb_rows; + var $start_inc; + + function calendar() + { + global $config, $template, $user; + + // settings + $settings = array( + 'calendar_header_cells' => 7, + 'calendar_display_open' => false, + 'calendar_overview' => false, + 'calendar_use_java' => true, + 'calendar_title_length' => 30, + 'calendar_text_length' => 200, + 'calendar_week_start' => 1, + 'calendar_nb_row' => 5, + ); + + // create config values + if ( empty($config->data['calendar_title_length']) || empty($config->data['calendar_nb_row']) ) + { + $config->begin_transaction(); + foreach ( $settings as $key => $value ) + { + $config->set($key, $value, true); + } + $config->end_transaction(); + } + + // get user prefs + foreach ( $settings as $key => $value ) + { + if ( !empty($user->data['user_' . $key]) ) + { + $config->data[$key] = $user->data['user_' . $key]; + } + } + + // set the user date short format + $this->set_user_date_format(); + + // header + $template->assign_vars(array( + 'U_CALENDAR' => $config->url('calendar', '', true), + 'L_CALENDAR' => $user->lang('Calendar'), + 'I_CALENDAR' => $user->img('menu_calendar'), + 'L_CALENDAR_ALT' => $user->lang('Calendar_event'), + )); + $template->set_switch('topic_calendar'); + } + + // date is a user format date + function display($tpl_var, $date=0, $forum_id=0, $full_month=false) + { + global $config, $user, $template; + global $calendar_modules; + + $this->forum_id = intval($forum_id); + $this->full_month = $full_month; + $this->nb_cells = $this->full_month ? 7 : intval($config->data['calendar_header_cells']); + $this->with_text = $config->data['calendar_overview'] || $this->full_month; + $this->with_bbcode = $config->data['calendar_use_java']; + + // halt here if single row, no java and header closed + if ( (!$this->with_bbcode && !$config->data['calendar_display_open'] && !$this->full_month) || empty($this->nb_cells) ) + { + return ''; + } + + // the date entered is a user date : pull it to the begining of the day for the user + if ( empty($date) || (date('Ymd', $date) < 19700102) ) + { + $date = $user->cvt_sys_to_user_date(time()); + } + $date = day_user_date($date); + + // the full month is displayed + if ( $this->full_month ) + { + // pull the dates to the first of the month & next month + $this->start_date = mktime(0, 0, 0, date('m', $date), 01, date('Y', $date)); + $this->end_date = mktime(0, 0, 0, date('m', $this->start_date) + 1, 01, date('Y', $this->start_date)); + + // get the number of cells per line, the offset of the first day, and the number of rows (a day can have 23 to 25 hours : DST, so use round()) + $offset = isset($config->data['calendar_week_start']) ? intval($config->data['calendar_week_start']) : 1; + $this->start_inc = date('w', $this->start_date) - $offset; + if ( $this->start_inc < 0 ) + { + $this->start_inc = $this->nb_cells + $this->start_inc; + } + $this->nb_rows = intval(($this->start_inc + round(($this->end_date - $this->start_date) / 86400)) / $this->nb_cells) + 1; + } + + // only a row is displayed + else + { + // set the start date to the day before the date selected + $this->start_date = day_user_date($date, - 1); + $this->end_date = day_user_date($this->start_date, $this->nb_cells); + + // get the number of cells & rows per line, and the offset of the first day + $this->start_inc = 0; + $this->nb_rows = 1; + } + + // init event queue + $calendar_event_queue = new calendar_event_queue(); + + // browse calendar event types + $count_calendar_modules = count($calendar_modules); + for ( $i = 0; $i < $count_calendar_modules; $i++ ) + { + $event_type = $calendar_modules[$i]; + $$event_type = new $event_type($calendar_event_queue); + $$event_type->read($this->start_date, $this->end_date, $this->with_text, $this->forum_id); + } + + // map the events + $calendar_event_queue->map($this->start_date, $this->end_date); + + // display + $this->display_legend(); + $calendar_event_queue->display($this->start_date, $user->cvt_sys_to_user_date(time()), $this->nb_rows, $this->nb_cells, $this->full_month, $this->start_inc, $this->with_text, $this->with_bbcode); + + // template + $template->set_filenames(array('_calendar_body' => 'calendar_box.tpl')); + $template->assign_var_from_handle($tpl_var, '_calendar_body'); + } + + // $date is a user format date + function display_legend() + { + global $config, $template, $user, $forums; + + // set the full month & overview switch + $template->set_switch('full_month', $this->full_month); + $template->set_switch('java', $this->with_bbcode); + + // full month header + if ( $this->full_month ) + { + // day name header + $set_of_days = array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'); + $offset = intval($config->data['calendar_week_start']); + for ( $i = 0; $i < $this->nb_cells; $i++ ) + { + if ( $offset >= $this->nb_cells ) + { + $offset = 0; + } + $template->assign_block_vars('full_month.cal_cell', array( + 'WIDTH' => floor(100 / $this->nb_cells), + 'L_DAY' => $user->lang($set_of_days[$offset]), + )); + $offset++; + if ( $i == 0 ) + { + $template->set_switch('full_month.cal_cell.left'); + } + else if ( $i == ($this->nb_cells - 1) ) + { + $template->set_switch('full_month.cal_cell.right'); + } + else + { + $template->set_switch('full_month.cal_cell.regular'); + } + } + + // next/previous month + $prev = date('Ym', $this->start_date) > 197101 ? date('Ymd', mktime(0, 0, 0, date('m', $this->start_date), 00, date('Y', $this->start_date))) : date('Ymd', $this->start_date); + $next = date('Ym', $this->start_date) < 206912 ? date('Ymd', mktime(0, 0, 0, date('m', $this->start_date) + 1, 01, date('Y', $this->start_date))) : date('Ymd', $this->start_date); + + // header fields + $template->assign_vars(array( + 'S_MONTH' => $this->get_select_monthes($this->start_date), + 'S_YEAR' => $this->get_select_years($this->start_date), + 'S_FORUM_LIST' => $forums->get_jumpbox(true, $this->forum_id), + 'POST_FORUM_URL' => POST_FORUM_URL, + 'L_GO' => $user->lang('Go'), + 'I_GO' => $user->img('cmd_mini_submit'), + + 'U_PREC' => $config->url('calendar', array('date' => $prev, POST_FORUM_URL => $this->forum_id), true), + 'L_PREC' => $user->lang('Previous'), + 'I_PREC' => $user->img('cmd_previous'), + 'U_NEXT' => $config->url('calendar', array('date' => $next, POST_FORUM_URL => $this->forum_id), true), + 'L_NEXT' => $user->lang('Next'), + 'I_NEXT' => $user->img('cmd_next'), + )); + } + // single row header + else + { + $template->assign_vars(array( + 'I_CALENDAR_LRG' => $user->img('icon_calendar'), + )); + if ( $this->with_bbcode ) + { + $template->assign_vars(array( + 'TOGGLE_ICON' => $config->data['calendar_display_open'] ? $user->img('up_arrow') : $user->img('down_arrow'), + 'TOGGLE_STATUS' => $config->data['calendar_display_open'] ? '' : 'none', + )); + } + $template->set_switch('full_month_ELSE.java', $this->with_bbcode); + } + + // header + $template->assign_vars(array( + 'UP_ARROW' => $user->img('up_arrow'), + 'DOWN_ARROW' => $user->img('down_arrow'), + + 'ACTION' => $config->url('calendar', '', true), + 'SPAN_ALL' => $this->nb_cells, + 'WIDTH' => floor(100 / $this->nb_cells), + )); + } + + function get_select_monthes($date) + { + global $user; + + // build select list for month + $month = intval(date('m', $date)); + $options = ''; + $monthes = array('January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'); + for ( $i = 0; $i < 12; $i++ ) + { + $selected = ($month == ($i + 1)) ? ' selected="selected"' : ''; + $options .= '<option value="' . ($i + 1) . '"' . $selected . '>' . $user->lang($monthes[$i]) . '</option>'; + } + return $options; + } + + function get_select_years($date) + { + // buid select list for year + $year = intval(date('Y', $date)); + $options = ''; + for ( $i = 1971; $i < 2070; $i++ ) + { + $selected = ($year == $i) ? ' selected="selected"' : ''; + $options .= '<option value="' . $i . '"' . $selected . '>' . $i . '</option>'; + } + return $options; + } + + function set_user_date_format() + { + global $user; + + $user->data['user_date_order'] = array( + 'y' => strpos(' ' . strtolower($user->data['user_dateformat']), 'y')-1, + 'm' => (strpos(' ' . strtolower($user->data['user_dateformat']), 'm')-1 >= 0) ? strpos(' ' . strtolower($user->data['user_dateformat']), 'm')-1 : strpos(' ' . $user->data['user_dateformat'], 'n')-1, + 'd' => (strpos(' ' . $user->data['user_dateformat'], 'd')-1 >= 0) ? strpos(' ' . $user->data['user_dateformat'], 'd')-1 : strpos(' ' . $user->data['user_dateformat'], 'j')-1, + 'D' => strpos(' ' . $user->data['user_dateformat'], 'D')-1, + ); + asort($user->data['user_date_order']); + $user->data['user_date_order'] = array_flip(array_keys($user->data['user_date_order'])); + $pres = array('y' => 'Y', 'm' => 'M', 'd' => 'd', 'D' => 'D'); + $user->data['user_dateformat_short'] = ''; + $user->data['user_dateformat_medium'] = ''; + foreach ( $user->data['user_date_order'] as $key => $dummy ) + { + if ( $key != 'D' ) + { + $user->data['user_dateformat_short'] .= (empty($user->data['user_dateformat_short']) ? '' : ' ') . $pres[$key]; + } + $user->data['user_dateformat_medium'] .= (empty($user->data['user_dateformat_short']) ? '' : ' ') . $pres[$key]; + } + } +} + +class calendar_scheduler extends calendar +{ + var $start_time; + var $end_time; + + function calendar_scheduler() + { + parent::calendar(); + $this->with_text = false; + } + + // date is a user format date + function display($date=0, $hour=0, $forum_id=0) + { + global $config, $user; + global $calendar_modules; + + $this->forum_id = intval($forum_id); + $this->full_month = true; + $this->nb_cells = 7; + $this->with_text = false; + $this->with_bbcode = $config->data['calendar_use_java']; + + // the date entered is a user date : pull it to the begining of the day for the user + if ( empty($date) || (date('Ymd', $date) < 19700102) ) + { + $date = $user->cvt_sys_to_user_date(time()); + } + $date = day_user_date($date); + + // pull the dates to the first of the month & next month + $this->start_date = mktime(0, 0, 0, date('m', $date), 01, date('Y', $date)); + $this->end_date = mktime(0, 0, 0, date('m', $this->start_date) + 1, 01, date('Y', $this->start_date)); + + // whole day + if ( ($hour < 1) || ($hour > 24) ) + { + $this->start_time = day_user_date($date); + $this->end_time = day_user_date($date, +1); + } + // one hour in the day + else + { + $this->start_time = mktime($hour - 1, 0, 0, date('m', $date), date('d', $date), date('Y', $date)); + $this->end_time = $this->start_time + 3600; + } + + // + // display the month box + // + + // get the number of cells per line, the offset of the first day, and the number of rows (a day can have 23 to 25 hours : DST, so use round()) + $offset = isset($config->data['calendar_week_start']) ? intval($config->data['calendar_week_start']) : 1; + $this->start_inc = date('w', $this->start_date) - $offset; + if ( $this->start_inc < 0 ) + { + $this->start_inc = $this->nb_cells + $this->start_inc; + } + $this->nb_rows = intval(($this->start_inc + round(($this->end_date - $this->start_date) / 86400)) / $this->nb_cells) + 1; + + // init event queue + $calendar_event_queue = new calendar_month_event_queue(); + + // browse calendar event types + $count_calendar_modules = count($calendar_modules); + for ( $i = 0; $i < $count_calendar_modules; $i++ ) + { + $event_type = $calendar_modules[$i]; + $$event_type = new $event_type($calendar_event_queue); + $$event_type->read($this->start_date, $this->end_date, $this->with_text, $this->forum_id); + } + + // map the events + $calendar_event_queue->map($this->start_date, $this->end_date); + + // display + $this->display_legend($calendar_event_queue); + $calendar_event_queue->display($this->start_date, $this->start_time, $this->nb_rows, $this->nb_cells, $this->full_month, $this->start_inc, $this->with_text, $this->with_bbcode); + + // + // display the events lists + // + $calendar_event_queue->display_list($this->start_time, $this->end_time); + } + + // $date is a user format date + function display_legend(&$calendar_event_queue, $single=true) + { + global $config, $template, $user, $forums; + + // day name header + $set_of_months = array('January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'); + $set_of_days = array('Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'); + $offset = intval($config->data['calendar_week_start']); + for ( $i = 0; $i < $this->nb_cells; $i++ ) + { + if ( $offset >= $this->nb_cells ) + { + $offset = 0; + } + $template->assign_block_vars('cal_cell', array( + 'WIDTH' => floor(100 / $this->nb_cells), + 'L_DAY' => $user->lang($set_of_days[$offset]), + )); + $offset++; + if ( $i == 0 ) + { + $template->set_switch('cal_cell.left'); + } + else if ( $i == ($this->nb_cells - 1) ) + { + $template->set_switch('cal_cell.right'); + } + else + { + $template->set_switch('cal_cell.regular'); + } + } + + // next/previous month + $prev = date('Ym', $this->start_date) > 197101 ? date('Ymd', mktime(0, 0, 0, date('m', $this->start_date), 00, date('Y', $this->start_date))) : date('Ymd', $this->start_date); + $next = date('Ym', $this->start_date) < 206912 ? date('Ymd', mktime(0, 0, 0, date('m', $this->start_date) + 1, 01, date('Y', $this->start_date))) : date('Ymd', $this->start_date); + + // header fields + $template->assign_vars(array( + 'L_MONTH' => $user->lang($set_of_months[ (date('m', $this->start_date) - 1) ]), + 'YEAR' => date('Y', $this->start_date), + )); + $template->assign_vars(array( + 'S_MONTH' => $this->get_select_monthes($this->start_date), + 'S_YEAR' => $this->get_select_years($this->start_date), + 'S_FORUM_LIST' => $forums->get_jumpbox(true, $this->forum_id), + 'POST_FORUM_URL' => POST_FORUM_URL, + 'L_GO' => $user->lang('Go'), + 'I_GO' => $user->img('cmd_mini_submit'), + + 'U_PREC' => $config->url('calendar_scheduler', array('date' => $prev, POST_FORUM_URL => $this->forum_id), true), + 'L_PREC' => $user->lang('Previous'), + 'I_PREC' => $user->img('cmd_previous'), + 'U_NEXT' => $config->url('calendar_scheduler', array('date' => $next, POST_FORUM_URL => $this->forum_id), true), + 'L_NEXT' => $user->lang('Next'), + 'I_NEXT' => $user->img('cmd_next'), + )); + $template->set_switch('selector', $single); + } +} + +?> \ No newline at end of file Added: phpBB Reloaded 2/includes/class_calendar_topics.php =================================================================== --- phpBB Reloaded 2/includes/class_calendar_topics.php (rev 0) +++ phpBB Reloaded 2/includes/class_calendar_topics.php 2006-06-20 22:57:36 UTC (rev 247) @@ -0,0 +1,515 @@ +<?php + +/*************************************************************************** + * class_calendar_topics.php + * ------------------------- + * begin : 12/02/2005 + * copyright : Ptirhiik + * email : pti...@cl... + * + * Version : 0.0.7 - 19/10/2005 + * + ***************************************************************************/ + +/*************************************************************************** + * + * 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('IN_PHPBB') ) +{ + die('Hacking attempt'); +} + +include_once($config->url('includes/functions_post')); +include_once($config->url('includes/bbcode')); +include_once($config->url('includes/class_topics')); + +class calendar_event_topics extends calendar_event +{ + var $topic_title_length; + var $topic_text_length; + var $front_title; + var $forum_id; + + var $calendar_event_queue; + + function calendar_event_topics(&$calendar_event_queue) + { + global $config; + + parent::calendar_event($calendar_event_queue); + + $this->topic_title_length = empty($config->data['calendar_title_length']) ? 30 : intval($config->data['calendar_title_length']); + $this->topic_text_length = empty($config->data['calendar_text_length']) ? 200 : intval($config->data['calendar_text_length']); + $this->front_title = new front_title(); + $this->user_data = array(); + } + + function read($start_date, $end_date, $with_text=true, $forum_id=0) + { + global $db, $config, $user, $forums; + + $this->calendar_event_queue->queue[POST_TOPIC_URL] = &$this; + $this->forum_id = intval($forum_id); + + // read forums and auths relative to + if ( empty($forums) ) + { + include_once($config->url('includes/class_forums')); + $forums = new forums(); + $forums->read(); + } + if ( !isset($user->cache[POST_FORUM_URL]) ) + { + $user->get_cache(POST_FORUM_URL); + } + + // get the list of authorized forums + $auth_sql = ''; + + // check forum id + if ( !isset($forums->data[$forum_id]) || !$user->auth(POST_FORUM_URL, 'auth_read', $forum_id) ) + { + return; + } + + // get min and max forum ids for the branch asked + $min_id = intval($forum_id); + $max_id = $forums->data[$forum_id]['last_child_id']; + + // get excluded forums + $tkeys = array_flip($forums->keys); + $min_idx = $tkeys[$min_id]; + $max_idx = $tkeys[$max_id]; + unset($tkeys); + $exclude_forums = array(); + $something = false; + for ( $i = $min_idx; $i <= $max_idx; $i++ ) + { + if ( !$user->auth(POST_FORUM_URL, 'auth_read', $forums->keys[$i]) ) + { + $exclude_forums[] = $forums->keys[$i]; + } + else + { + $something = true; + } + } + + // halt on no forum authed + if ( !$something ) + { + return; + } + + // set branch range + $auth_sql = empty($forum_id) ? '' : sprintf(' AND (f.forum_order BETWEEN %d AND %d)', intval($forums->data[$min_id]['forum_order']), intval($forums->data[$max_id]['forum_order'])); + + // exclude unreadable forums + if ( !empty($exclude_forums) ) + { + $auth_sql .= count($exclude_forums) > 1 ? ' AND t.forum_id NOT IN(' . implode(', ', $exclude_forums) . ')' : ' AND t.forum_id <> ' . $exclude_forums[0]; + unset($exclude_forums); + } + + // add the forums table if required + $fields = array( + 't.*', + ); + $sql_tables = empty($forum_id) ? '' : ', ' . FORUMS_TABLE . ' f'; + $sql_where = empty($forum_id) ? $auth_sql : ' AND f.forum_id = t.forum_id' . $auth_sql; + if ( $with_text ) + { + $fields = array_merge($fields, array( + 'p.enable_bbcode', + 'p.enable_html', + 'p.enable_smilies', + 'pt.post_text', + 'pt.bbcode_uid', + )); + $sql_tables .= ', ' . POSTS_TABLE . ' p, ' . POSTS_TEXT_TABLE . ' pt'; + $sql_where .= ' AND p.post_id = t.topic_first_post_id AND pt.post_id = t.topic_first_post_id'; + } + $sql = 'SELECT ' . implode(', ', $fields) . ' + FROM ' . TOPICS_TABLE . ' t' . $sql_tables . ' + WHERE t.topic_calendar_time <> 0 + AND t.topic_status <> ' . TOPIC_MOVED . ' + AND t.topic_calendar_time < ' . $user->cvt_user_to_sys_date(intval($end_date)) . ' + AND (t.topic_calendar_time + t.topic_calendar_duration) >= ' . $user->cvt_user_to_sys_date(intval($start_date)) . $sql_where . ' + ORDER BY t.topic_calendar_time, t.topic_calendar_duration DESC, t.topic_type DESC, t.topic_last_post_id DESC'; + $result = $db->sql_query($sql, false, __LINE__, __FILE__); + + // read data + $user_ids = array(); + while ( $row = $db->sql_fetchrow($result) ) + { + // if required, prepare the overview window + if ( $with_text && !empty($row['post_text']) && !empty($this->topic_text_length) ) + { + $message = $row['post_text']; + + // remove html escape + $message = unprepare_message($message); + $message = str_replace('<br />', "\n", $message); + + // remove bbcode uid + if ( !empty($row['bbcode_uid']) ) + { + $message = preg_replace('/\:(([a-z0-9]:)?)' . $row['bbcode_uid'] . '/s', '', $message); + + // replace img with url + $message = str_replace(array('[img]', '[/img]'), array('[url]', '[/url]'), $message); + } + + // short the message + $message = substr($message, 0, $this->topic_text_length); + + // re-add bbCode + $row['post_text'] = prepare_message($message, $row['enable_html'], $row['enable_bbcode'], $row['enable_smilies'], $row['bbcode_uid']); + } + + // do some standardization + $row['post_icon'] = $row['topic_icon']; + $row['event_start'] = $row['topic_calendar_time']; + $row['event_end'] = $row['topic_calendar_time'] + (empty($row['topic_calendar_duration']) ? 86399 : $row['topic_calendar_duration']); + + // get users + $row['topic_poster'] = intval($row['topic_poster']); + $row['topic_last_poster'] = intval($row['topic_last_poster']); + if ( !in_array($row['topic_poster'], array(0, ANONYMOUS)) && !isset($this->user_data[ $row['topic_poster'] ]) ) + { + $user_ids[ $row['topic_poster'] ] = true; + } + if ( !in_array($row['topic_last_poster'], array(0, ANONYMOUS)) && !isset($this->user_data[ $row['topic_last_poster'] ]) ) + { + $user_ids[ $row['topic_last_poster'] ] = true; + } + + // add this row + $this->data[] = $row; + $count++; + } + $db->sql_freeresult($result); + + // read users + $user->read_pool($user_ids); + } + + function display_one_item($idx, $tpl_level, $with_text, $with_bbcode, $title_only, $day_id) + { + global $config, $user, $template; + + if ( !isset($this->data[$idx]) ) + { + return false; + } + $title = _un_htmlspecialchars(_censor($this->data[$idx]['topic_title'])); + $short_title = (strlen($title) > $this->topic_title_length + 3) ? substr($title, 0, $this->topic_title_length) . '...' : $title; + $title = htmlspecialchars($title); + $short_title = htmlspecialchars($short_title); + + // basic values + $tpl_values = array( + 'U_EVENT' => $config->url('viewtopic', array(POST_TOPIC_URL => $this->data[$idx]['topic_id']), true), + 'I_EVENT' => $user->img('icon_tiny_topic'), + 'L_EVENT' => $user->lang('Topic'), + 'TITLE' => $short_title, + 'FULL_TITLE' => $title, + ); + + // overview + if ( $title_only ) + { + if ( $with_bbcode && $first ) + { + $template->assign_block_vars('java.day', array('DAY_ID' => $day_id)); + $template->assign_block_vars($tpl_level, array('DAY_ID' => $day_id)); + } + $template->assign_block_vars($with_bbcode ? 'java.day._event' : $tpl_level, $tpl_values); + } + else + { + $message = $this->get_message($idx, $with_text, $with_bbcode); + if ( $with_bbcode ) + { + $event_id = POST_TOPIC_URL . '_' . $idx; + $template->assign_block_vars($tpl_level, $tpl_values + array( + 'EVENT_ID' => $event_id, + )); + if ( !isset($this->data[$idx]['event_sent']) || !$this->data[$idx]['event_sent'] ) + { + $template->assign_block_vars('java.cal_event', array( + 'EVENT_ID' => $event_id, + 'MESSAGE' => $message, + )); + $this->data[$idx]['event_sent'] = true; + } + } + else + { + $template->assign_block_vars($tpl_level, $tpl_values + array( + 'MESSAGE' => $message, + )); + } + $template->set_switch($tpl_level . '._content'); + $template->set_switch($tpl_level . '._content.java', $with_bbcode); + } + } + + function get_message($idx, $with_text, $with_bbcode) + { + global $config, $template, $user, $forums, $icons, $topics_attr; + + // message parsing + $text = ''; + if ( $with_text && !empty($this->data[$idx]['post_text']) ) + { + if ( $with_bbcode ) + { + // parse the message + $text = $this->data[$idx]['post_text']; + if ( !$config->data['allow_html'] && $this->data[$idx]['enable_html'] ) + { + $text = preg_replace('#(<)([\/]?.*?)(>)#is', "<\\2>", $text); + } + if ( !empty($this->data[$idx]['bbcode_uid']) ) + { + $text = $config->data['allow_bbcode'] ? bbencode_second_pass($text, $this->data[$idx]['bbcode_uid']) : preg_replace('/\:[0-9a-z\:]+\]/si', ']', $text); + } + if ( $config->data['allow_smilies'] ) + { + $text = smilies_pass($text); + } + $text = _censor(preg_replace("/[\n\r]{1,2}/", '<br />', $text)); + } + else + { + $text = _clean_bbcode(_clean_html($this->data[$idx]['post_text'])); + $text = str_replace('"', '"', _censor(preg_replace("/[\n\r]{1,2}/", '<br />', $text))); + } + } + + // process the template + $sav_tpl = array(); + $template->save($sav_tpl); + $template->destroy(); + $template->assign_vars(array( + 'L_SUBJECT' => $user->lang('Subject'), + 'TOPIC_TITLE' => _censor($this->data[$idx]['topic_title']), + 'U_TOPIC' => $config->url('viewtopic', array(POST_TOPIC_URL => $this->data[$idx]['topic_id']), true), + 'L_AUTHOR' => $user->lang('Author'), + 'AUTHOR' => !empty($this->data[$idx]['topic_first_username']) ? $this->data[$idx]['topic_first_username'] : (($this->data[$idx]['topic_poster'] == ANONYMOUS) || !isset($user->pool[ $this->data[$idx]['topic_poster'] ]) ? $user->lang('Guest') : $user->pool[ $this->data[$idx]['topic_poster'] ]['username']), + 'L_TOPIC_DATE' => $user->lang('Date'), + 'TOPIC_DATE' => $user->date($this->data[$idx]['topic_time']), + 'L_FORUM' => $user->lang('Forum'), + 'MESSAGE' => $text, + 'L_VIEWS' => $user->lang('Views'), + 'VIEWS' => $this->data[$idx]['topic_views'], + 'L_REPLIES' => $user->lang('Replies'), + 'REPLIES' => $this->data[$idx]['topic_replies'], + )); + $template->set_switch('text', $with_text && !empty($text)); + + // enhance topic title + $this->front_title->set('', $this->data[$idx]); + $forums->display_nav($this->data[$idx]['forum_id'], 'nav', true); + + $no_debug = $template->no_debug; + $template->no_debug = true; + if ( !$this->tpl_loaded ) + { + $template->set_filenames(array('_cal_overview_topic' => $with_bbcode ? 'calendar_overview_topic.tpl' : 'calendar_overview_topic_txt.tpl')); + } + $message = $template->get_pparse('_cal_overview_topic'); + $template->no_debug = $no_debug; + if ( !$with_bbcode ) + { + // do some cleaning for the text-mode overview + $message = str_replace(array('<br />', ' ', '<', '>', '"'), array("\n", ' ', '<', '>', '"'), preg_replace("/[\n\r]{1,2}/", '', $message)); + } + $template->restore($sav_tpl); + + return $message; + } + + function display_list($start_date, $end_date, $event_idxs, $first) + { + global $template, $config, $user; + + $all_events = ($end_date - $start_date > 3600); + $topics = new calendar_topics_list('calendar_scheduler', $start_date, $all_events); + $topics->read($this->data, $event_idxs, $this->forum_id); + $upper_box = true; + $display_empty = true; + $forced_title = format_user_date($start_date, _read('hour', TYPE_INT) <= 0 ? $user->data['user_dateformat_medium'] : $user->data['user_dateformat']); + $template->assign_block_vars('right_side', array( + 'BOX' => $topics->get_display($upper_box, $display_empty, $forced_title), + )); + $template->set_switch('right_side.first', $first); + _hide('day', date('d', $start_date)); + } +} + +class calendar_topics_list extends topics +{ + var $date; + var $all_events; + var $forum_id; + + function calendar_topics_list($requester, $start_date, $all_events) + { + parent::topics($requester); + + $this->date = $start_date; + $this->all_events = $all_events; + } + + function read(&$data, $idxs, $forum_id=0) + { + global $db, $user; + + $this->forum_id = intval($forum_id); + + if ( empty($idxs) ) + { + return; + } + + // get the topics data + $this->data_ext = array(); + $count_idxs = count($idxs); + $user_ids = array(); + $chk_topics_own = array(); + for ( $i = 0; $i < $count_idxs; $i++ ) + { + $topic_id = $data[ $idxs[$i] ]['topic_id']; + $this->data_ext[$topic_id] = &$data[ $idxs[$i] ]; + + if ( !empty($this->data_ext[$topic_id]['topic_poster']) && ($this->data_ext[$topic_id]['topic_poster'] != ANONYMOUS) ) + { + $user_ids[ $this->data_ext[$topic_id]['topic_poster'] ][] = $topic_id; + } + if ( !empty($this->data_ext[$topic_id]['topic_last_poster']) && ($this->data_ext[$topic_id]['topic_last_poster'] != ANONYMOUS) ) + { + $user_ids[ $this->data_ext[$topic_id]['topic_last_poster'] ][] = $topic_id; + } + + // get the topics to check for "you have posted in this topic" + if ( $user->data['session_logged_in'] ) + { + $this->data_ext[$topic_id]['topic_own'] = ($this->data_ext[$topic_id]['topic_poster'] == $user->data['user_id']) || ($this->data_ext[$topic_id]['topic_last_poster'] == $user->data['user_id']); + if ( !$this->data_ext[$topic_id]['topic_own'] ) + { + $chk_topics_own[] = $topic_id; + } + } + } + + // read the pertinent users + $user->read_pool($user_ids); + + // search topics the viewer has posted in + if ( !empty($chk_topics_own) ) + { + $sql = 'SELECT DISTINCT topic_id + FROM ' . POSTS_TABLE . ' + WHERE poster_id = ' . intval($user->data['user_id']) . ' + AND topic_id IN(' . implode(', ', $chk_topics_own) . ')'; + $result = $db->sql_query($sql, false, __LINE__, __FILE__); + while ( $row = $db->sql_fetchrow($result) ) + { + $this->data_ext[ $row['topic_id'] ]['topic_own'] = true; + } + $db->sql_freeresult($result); + } + + // parms for pagination + $this->total_topics = count($this->data_ext); + $this->parms['ppage'] = $this->total_topics; + } + + function get_display($upper_box=false, $display_empty=false, $forced_title='') + { + global $template, $forums, $user; + + // prepare result + $res = ''; + + // check if we display something + if ( $display_empty || ($upper_box && !empty($this->data_ext)) || (!$upper_box && !empty($this->data)) ) + { + // save and reset template + $save_tpl = array(); + $template->save($save_tpl); + + // choose tpl + $template->set_filenames(array('topics_box' => 'topics_row_box.tpl')); + + // send display + $this->display($upper_box, $display_empty, $forced_title); + $template->assign_vars(array( + 'L_NO_TOPICS' => $user->lang('No_search_match'), + )); + + // get result + $res = $template->get_pparse('topics_box'); + + // restore template + $template->restore($save_tpl); + } + return $res; + } + + function bottom_line($empty=false) + { + global $template, $user, $forums; + + $template->set_switch('topicrow'); + $template->set_switch('topicrow.bottom'); + $template->set_switch('topicrow.bottom.no_topics', $empty); + $template->assign_vars(array( + 'L_SELECT_FORM' => $user->lang('Select'), + 'S_FORUM_LIST' => $forums->get_jumpbox(true, $this->forum_id), + 'POST_FORUM_URL' => POST_FORUM_URL, + 'L_GO' => $user->lang('Go'), + 'I_GO' => $user->img('cmd_mini_submit'), + 'S_HOURS' => $this->get_hours(), + )); + $template->set_filenames(array('bottom_row' => 'calendar_topics_bottom_sched.tpl')); + $template->assign_var_from_handle('BOTTOM_ROW', 'bottom_row'); + } + + function get_hours() + { + global $user; + + $fmt = 'H:00'; + if ( strpos(' ' . $user->data['user_dateformat'], 'a') ) + { + $fmt = 'h a'; + } + else if ( strpos(' ' . $user->data['user_dateformat'], 'A') ) + { + $fmt = 'h A'; + } + // let's set an arbitrary date + $date = mktime(0, 0, 0, 01, 01, 2005); + + $select = $this->all_events ? 0 : date('H', $this->date) + 1; + $options = '<option value="0"' . ( empty($select) ? ' selected="selected"' : '') . '>' . $user->lang('Calendar_all_events') . '</option>'; + for ( $i = 1; $i <= 24; $i++ ) + { + $selected = ($select == $i) ? ' selected="selected"' : ''; + $options .= '<option value="' . $i . '"' . $selected . '>' . format_user_date($date, $fmt) . '</option>'; + $date += 3600; + } + return $options; + } +} + +?> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mar...@us...> - 2006-06-20 22:55:37
|
Revision: 246 Author: markthedaemon Date: 2006-06-20 15:55:32 -0700 (Tue, 20 Jun 2006) ViewCVS: http://svn.sourceforge.net/phpbbreloaded/?rev=246&view=rev Log Message: ----------- w00t Modified Paths: -------------- phpBB Reloaded 2/templates/subC1/index_body.tpl Modified: phpBB Reloaded 2/templates/subC1/index_body.tpl =================================================================== --- phpBB Reloaded 2/templates/subC1/index_body.tpl 2006-06-20 22:50:51 UTC (rev 245) +++ phpBB Reloaded 2/templates/subC1/index_body.tpl 2006-06-20 22:55:32 UTC (rev 246) @@ -156,19 +156,6 @@ </table> <br /> -<!-- Start add - Fully integrated shoutbox MOD --> -<table width="100%" cellspacing="0" border="0" align="center" cellpadding="2" class="forumline"> - <tr> - <td align="center" nowrap="nowrap" class="catHead"><span class="cattitle"><a href="{U_SHOUTBOX_MAX}">{L_SHOUTBOX}</a></span></td> - </tr> - <tr> - <td> - <iframe src="{U_SHOUTBOX}" scrolling="NO" width="100%" height="180" frameborder="0" marginheight="0" marginwidth="0" allowtransparency="true"></iframe> - </td> - </tr> -</table> -<br/> -<!-- End add - Fully integrated shoutbox MOD --> {STATS_BOX} @@ -190,7 +177,19 @@ </tr> </table></form> <!-- END switch_user_logged_out --> - +<!-- Start add - Fully integrated shoutbox MOD --> +<table width="100%" cellspacing="0" border="0" align="center" cellpadding="2" class="forumline"> + <tr> + <td align="center" nowrap="nowrap" class="catHead"><span class="cattitle"><a href="{U_SHOUTBOX_MAX}">{L_SHOUTBOX}</a></span></td> + </tr> + <tr> + <td> + <iframe src="{U_SHOUTBOX}" scrolling="NO" width="100%" height="180" frameborder="0" marginheight="0" marginwidth="0" allowtransparency="true"></iframe> + </td> + </tr> +</table> +<br/> +<!-- End add - Fully integrated shoutbox MOD --> <!-- BEGIN forum_legend --> <br class="nav" /> <table cellspacing="3" border="0" align="center" cellpadding="0"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mar...@us...> - 2006-06-20 22:51:00
|
Revision: 245 Author: markthedaemon Date: 2006-06-20 15:50:51 -0700 (Tue, 20 Jun 2006) ViewCVS: http://svn.sourceforge.net/phpbbreloaded/?rev=245&view=rev Log Message: ----------- Modified Paths: -------------- phpBB Reloaded 2/install/schemas/mysql_basic.sql phpBB Reloaded 2/install/update_to_latest.php Modified: phpBB Reloaded 2/install/schemas/mysql_basic.sql =================================================================== --- phpBB Reloaded 2/install/schemas/mysql_basic.sql 2006-06-20 22:35:48 UTC (rev 244) +++ phpBB Reloaded 2/install/schemas/mysql_basic.sql 2006-06-20 22:50:51 UTC (rev 245) @@ -275,7 +275,7 @@ INSERT INTO phpbb_config VALUES ('server_name', 'localhost', 1); INSERT INTO phpbb_config VALUES ('server_port', '80', 1); INSERT INTO phpbb_config VALUES ('script_path', '/', 1); -INSERT INTO phpbb_config VALUES ('version', '.2.0', 0); +INSERT INTO phpbb_config VALUES ('version', '.2.1', 0); INSERT INTO phpbb_config VALUES ('stat_total_posts', '7', 0); INSERT INTO phpbb_config VALUES ('stat_total_topics', '5', 0); INSERT INTO phpbb_config VALUES ('stat_total_users', '1', 0); Modified: phpBB Reloaded 2/install/update_to_latest.php =================================================================== --- phpBB Reloaded 2/install/update_to_latest.php 2006-06-20 22:35:48 UTC (rev 244) +++ phpBB Reloaded 2/install/update_to_latest.php 2006-06-20 22:50:51 UTC (rev 245) @@ -59,7 +59,7 @@ // // // -$updates_to_version = '.2.0'; +$updates_to_version = '.2.1'; // // // This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mar...@us...> - 2006-06-20 22:35:57
|
Revision: 244 Author: markthedaemon Date: 2006-06-20 15:35:48 -0700 (Tue, 20 Jun 2006) ViewCVS: http://svn.sourceforge.net/phpbbreloaded/?rev=244&view=rev Log Message: ----------- Modified Paths: -------------- phpBB Reloaded 2/admin/admin_user_ban.php phpBB Reloaded 2/admin/admin_users.php phpBB Reloaded 2/language/lang_english/lang_main.php Modified: phpBB Reloaded 2/admin/admin_user_ban.php =================================================================== --- phpBB Reloaded 2/admin/admin_user_ban.php 2006-06-20 22:30:24 UTC (rev 243) +++ phpBB Reloaded 2/admin/admin_user_ban.php 2006-06-20 22:35:48 UTC (rev 244) @@ -57,7 +57,18 @@ $user_list[] = $this_userdata['user_id']; } - +if ($userdata['user_id'] == $this_userdata['user_id'] ) + { + message_die(GENERAL_MESSAGE, $lang['No_ban_self'] ); + } + + if ( $userdata['user_id'] != 2 ) + { + if( $this_userdata['user_id'] == 2 ) + { + message_die(GENERAL_MESSAGE, $lang['No_ban_main_admin'] ); + } + } $ip_list = array(); if ( isset($HTTP_POST_VARS['ban_ip']) ) { @@ -142,7 +153,28 @@ } } } +$user_id1 = 2; +$array1 = get_userdata($user_id1); +$main_admin_email = $array1['user_email']; + if ( $userdata['user_id'] == 2 && $HTTP_POST_VARS['ban_email'] == $main_admin_email ) + { + message_die(GENERAL_MESSAGE, $lang['No_ban_own_email'] ); + } + + elseif ( $HTTP_POST_VARS['ban_email'] == $main_admin_email ) + { + message_die(GENERAL_MESSAGE, $lang['No_ban_main_admin_email'] ); + } + +$user_id2 = $userdata['user_id']; +$array2 = get_userdata($user_id2); +$current_user_email = $array2['user_email']; + + if ( $HTTP_POST_VARS['ban_email'] == $current_user_email ) + { + message_die(GENERAL_MESSAGE, $lang['No_ban_own_email'] ); + } $email_list = array(); if ( isset($HTTP_POST_VARS['ban_email']) ) { Modified: phpBB Reloaded 2/admin/admin_users.php =================================================================== --- phpBB Reloaded 2/admin/admin_users.php 2006-06-20 22:30:24 UTC (rev 243) +++ phpBB Reloaded 2/admin/admin_users.php 2006-06-20 22:35:48 UTC (rev 244) @@ -83,7 +83,18 @@ { message_die(GENERAL_MESSAGE, $lang['No_user_id_specified'] ); } - + if( ($userdata['user_id']==2) ) + { + message_die(GENERAL_MESSAGE, $lang['Main_admin_no_delete_self'] ); + } + elseif( ($HTTP_POST_VARS['username']==2) ) + { + message_die(GENERAL_MESSAGE, $lang['No_delete_main_admin'] ); + } + elseif( ($userdata['user_id'] == $this_userdata['user_id']) ) + { + message_die(GENERAL_MESSAGE, $lang['No_delete_self'] ); + } if( $HTTP_POST_VARS['deleteuser'] && ( $userdata['user_id'] != $user_id ) ) { //-- mod : categories hierarchy ------------------------------------------------ Modified: phpBB Reloaded 2/language/lang_english/lang_main.php =================================================================== --- phpBB Reloaded 2/language/lang_english/lang_main.php 2006-06-20 22:30:24 UTC (rev 243) +++ phpBB Reloaded 2/language/lang_english/lang_main.php 2006-06-20 22:35:48 UTC (rev 244) @@ -1068,5 +1068,12 @@ $lang['Special_ranks'] = 'Special ranks'; $lang['Rank_minimum'] = 'Minimum Posts'; $lang['Total_users'] = 'Total of users'; +$lang['No_ban_main_admin'] = 'You do not have the authority to ban the main administrator.'; +$lang['No_ban_self'] = 'You cannot ban yourself.'; +$lang['No_ban_main_admin_email'] = 'You do not have the authority to ban the email of the main administrator.'; +$lang['No_ban_own_email'] = 'You can not ban your own email.'; +$lang['No_delete_main_admin'] = 'You are not authorized to delete the Main Admin.'; +$lang['Main_admin_no_delete_self'] = 'You can not delete yourself.'; +$lang['No_delete_self'] = 'You can not delete yourself.'; ?> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mar...@us...> - 2006-06-20 22:30:31
|
Revision: 243 Author: markthedaemon Date: 2006-06-20 15:30:24 -0700 (Tue, 20 Jun 2006) ViewCVS: http://svn.sourceforge.net/phpbbreloaded/?rev=243&view=rev Log Message: ----------- why the hell do we have a whole file for 3 lang entries? anyway, we dont anymore ;-) Modified Paths: -------------- phpBB Reloaded 2/language/lang_english/lang_main.php Removed Paths: ------------- phpBB Reloaded 2/language/lang_english/lang_extend_ranks.php Deleted: phpBB Reloaded 2/language/lang_english/lang_extend_ranks.php =================================================================== --- phpBB Reloaded 2/language/lang_english/lang_extend_ranks.php 2006-06-20 22:20:27 UTC (rev 242) +++ phpBB Reloaded 2/language/lang_english/lang_extend_ranks.php 2006-06-20 22:30:24 UTC (rev 243) @@ -1,39 +0,0 @@ -<?php -/*************************************************************************** - * lang_extend_ranks.php [English] - * --------------------- - * begin : 28/09/2003 - * copyright : Ptirhiik - * email : pti...@cl... - * - * version : 1.0.4 - 28/10/2003 - * - * - ***************************************************************************/ - -/*************************************************************************** - * - * 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('IN_PHPBB') ) -{ - die("Hacking attempt"); -} - -// admin part -if ( $lang_extend_admin ) -{ - $lang['Lang_extend_ranks'] = 'Ranks'; -} - -$lang['Ranks'] = 'Ranks'; -$lang['Special_ranks'] = 'Special ranks'; -$lang['Rank_minimum'] = 'Minimum Posts'; -$lang['Total_users'] = 'Total of users'; - -?> \ No newline at end of file Modified: phpBB Reloaded 2/language/lang_english/lang_main.php =================================================================== --- phpBB Reloaded 2/language/lang_english/lang_main.php 2006-06-20 22:20:27 UTC (rev 242) +++ phpBB Reloaded 2/language/lang_english/lang_main.php 2006-06-20 22:30:24 UTC (rev 243) @@ -1064,4 +1064,9 @@ $lang['Censor'] = 'Censor'; //-- fin mod : fully integrated shoutbox --------------------------------------- +$lang['Ranks'] = 'Ranks'; +$lang['Special_ranks'] = 'Special ranks'; +$lang['Rank_minimum'] = 'Minimum Posts'; +$lang['Total_users'] = 'Total of users'; + ?> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mar...@us...> - 2006-06-20 22:20:37
|
Revision: 242 Author: markthedaemon Date: 2006-06-20 15:20:27 -0700 (Tue, 20 Jun 2006) ViewCVS: http://svn.sourceforge.net/phpbbreloaded/?rev=242&view=rev Log Message: ----------- massive cleanup/changing/making things work Modified Paths: -------------- phpBB Reloaded 2/templates/subC1/overall_header.tpl Removed Paths: ------------- phpBB Reloaded 2/includes/class_install.php phpBB Reloaded 2/usercp.php Deleted: phpBB Reloaded 2/includes/class_install.php =================================================================== --- phpBB Reloaded 2/includes/class_install.php 2006-06-20 22:15:10 UTC (rev 241) +++ phpBB Reloaded 2/includes/class_install.php 2006-06-20 22:20:27 UTC (rev 242) @@ -1,882 +0,0 @@ -<?php -/*************************************************************************** - * class_install.php - * ----------------- - * begin : 06/08/2005 - * copyright : Ptirhiik - * email : pti...@cl... - * - * Version : 0.0.2 - 31/10/2005 - * - ***************************************************************************/ - -/*************************************************************************** - * - * 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. - * - ***************************************************************************/ - -// lang keys used in this class -$sys_lang = array( - 'SQL_error' => '<b><u>SQL request not achieved:</u></b><ul><li><b>reason:</b> %s<li><b>file:</b> %s, <b>line:</b> %s<li><b>request:</b><hr /> %s<hr /></ul>', - 'Login_required' => 'You must log in', - 'Login_title' => 'Login', - 'Login_failed' => 'Login failed. Check the username and the password you\'ve typed in, then retry.', - 'Login_username' => 'Username', - 'Login_password' => 'Password', - 'Login_submit' => 'Log me in', - 'Login_admin' => 'You must be an administrator to go further.', - 'Login_mod' => 'You must be an administrator or a moderator to go further.', - 'Error_resume_explain' => 'These are warnings only : press "Resume" to continue :', - 'Error_resume' => 'Resume', -); - -// install the new db class -$original_db = $db; -$db = new light_db(); - -// page management -class page -{ - var $requester; - var $parms; - var $messages; - var $error_msg; - var $title; - var $sub_title; - - var $root; - var $ext; - var $header_sent; - - function page($requester, $title='', $lang_file='') - { - global $phpbb_root_path, $phpEx; - - $this->requester = $requester; - $this->parms = array(); - $this->root = $phpbb_root_path; - $this->ext = $phpEx; - $this->messages = array(); - $this->error_msg = array(); - $this->header_sent = false; - $this->guess_lang($lang_file); - $this->title = empty($title) ? 'Script_title' : $title; - $this->sub_title = ''; - } - - function set_parms($parms) - { - $this->parms = empty($this->parms) ? $parms : array_merge($this->parms, $parms); - } - - function unset_parms($parms) - { - if ( empty($parms) ) - { - return; - } - if ( !is_array($parms) ) - { - $parms = array($parms); - } - if ( empty($this->parms) ) - { - return; - } - $count_parms = count($parms); - for ( $i = 0; $i < $count_parms; $i++ ) - { - if ( isset($this->parms[ $parms[$i] ]) ) - { - unset($this->parms[ $parms[$i] ]); - } - } - } - - // this one comes from phpBB install.php - function guess_lang($lang_file) - { - global $HTTP_SERVER_VARS, $lang; - - // The order here _is_ important, at least for major_minor - // matches. Don't go moving these around without checking with - // me first - psoTFX - $match_lang = array( - 'arabic' => 'ar([_-][a-z]+)?', - 'bulgarian' => 'bg', - 'catalan' => 'ca', - 'czech' => 'cs', - 'danish' => 'da', - 'german' => 'de([_-][a-z]+)?', - 'english' => 'en([_-][a-z]+)?', - 'estonian' => 'et', - 'finnish' => 'fi', - 'french' => 'fr([_-][a-z]+)?', - 'greek' => 'el', - 'spanish_argentina' => 'es[_-]ar', - 'spanish' => 'es([_-][a-z]+)?', - 'gaelic' => 'gd', - 'galego' => 'gl', - 'gujarati' => 'gu', - 'hebrew' => 'he', - 'hindi' => 'hi', - 'croatian' => 'hr', - 'hungarian' => 'hu', - 'icelandic' => 'is', - 'indonesian' => 'id([_-][a-z]+)?', - 'italian' => 'it([_-][a-z]+)?', - 'japanese' => 'ja([_-][a-z]+)?', - 'korean' => 'ko([_-][a-z]+)?', - 'latvian' => 'lv', - 'lithuanian' => 'lt', - 'macedonian' => 'mk', - 'dutch' => 'nl([_-][a-z]+)?', - 'norwegian' => 'no', - 'punjabi' => 'pa', - 'polish' => 'pl', - 'portuguese_brazil' => 'pt[_-]br', - 'portuguese' => 'pt([_-][a-z]+)?', - 'romanian' => 'ro([_-][a-z]+)?', - 'russian' => 'ru([_-][a-z]+)?', - 'slovenian' => 'sl([_-][a-z]+)?', - 'albanian' => 'sq', - 'serbian' => 'sr([_-][a-z]+)?', - 'slovak' => 'sv([_-][a-z]+)?', - 'swedish' => 'sv([_-][a-z]+)?', - 'thai' => 'th([_-][a-z]+)?', - 'turkish' => 'tr([_-][a-z]+)?', - 'ukranian' => 'uk([_-][a-z]+)?', - 'urdu' => 'ur', - 'viatnamese' => 'vi', - 'chinese_traditional_taiwan'=> 'zh[_-]tw', - 'chinese_simplified' => 'zh', - ); - if ( empty($lang_file) ) - { - $lang_file = 'lang_CH_install'; - } - $lang_file = $this->root . 'language/lang_%s/' . $lang_file . '.' . $this->ext; - - @include(sprintf($lang_file, 'english')); - if ( isset($HTTP_SERVER_VARS['HTTP_ACCEPT_LANGUAGE']) ) - { - $accepted_langs = explode(',', $HTTP_SERVER_VARS['HTTP_ACCEPT_LANGUAGE']); - $count_accepted_langs = count($accepted_langs); - for ( $i = 0; $i < $count_accepted_langs; $i++ ) - { - foreach ( $match_lang as $lang_available => $match ) - { - if ( ($lang_available != 'english') && preg_match('#' . $match . '#i', trim($accepted_langs[$i])) ) - { - $file = sprintf($lang_file, trim($lang_available)); - if ( @file_exists($file) ) - { - @include($file); - return; - } - } - } - } - } - - return; - } - - function lang($key) - { - global $lang, $sys_lang; - return empty($key) ? '' : (isset($lang[$key]) ? $lang[$key] : (isset($sys_lang[$key]) ? $sys_lang[$key] : $key)); - } - - function url($parms='', $script='') - { - if ( empty($script) ) - { - $script = $this->requester; - } - $url_parms = ''; - if ( !empty($parms) ) - { - foreach ( $parms as $parm => $value ) - { - if ( !empty($value) ) - { - $url_parms .= (empty($url_parms) ? '?' : '&') . $parm . '=' . $value; - } - } - } - return $this->root . $script . '.' . $this->ext . $url_parms; - } - - function error($msg='') - { - if ( empty($msg) ) - { - return !empty($this->error_msg); - } - $this->error_msg[] = $this->lang($msg); - return true; - } - - function critical_error($msg='') - { - $this->error_msg[] = $this->lang($msg); - $this->header(); - $this->footer(); - } - - function output($msg='') - { - if ( empty($msg) ) - { - return !empty($this->messages); - } - $this->messages[] = $this->lang($msg); - return true; - } - - function header($meta='') - { - if ( $this->header_sent ) - { - return; - } - $this->header_sent = true; -?> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> -<meta http-equiv="Content-Style-Type" content="text/css"><?php echo $meta; ?> -<title><?php echo $this->lang($this->title); ?></title> -<style type="text/css"> -<!-- -font,th,td,p {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px;} -th {font-size: 11px; font-weight : bold; color: #FFA34F; background-color: #0000A0;} -hr {height: 0px; border: solid #D1D7DC 0px; border-top-width: 1px;} -.gen {font-size: 12px} -.gensmall {font-size: 11px} -.background {background-color: #FFFFFF; border: 1px #98AAB1 solid;} -.row1 {background-color: #F0F0FE;} -.row2 {background-color: #E0E0F0;} -//--> -</style> -</head> -<body bgcolor="#E5E5E5" text="#000000" link="#006699" vlink="#5584AA"> -<table cellpadding="10" cellspacing="1" border="0" class="background" width="100%" style="height: 100%"><tr><td valign="top"> -<div align="center" class="background"><br /><br /><h1><u><b><?php echo $this->lang($this->title); ?></b></u></h1><?php if ( !empty($this->sub_title) ) {echo $this->lang($this->sub_title);} ?><br /><br /></div> -<div align="justify" class="gen"><br /><br /> -<?php - } - - function send_messages() - { - // send error messages if any - if ( $count_error_msg = count($this->error_msg) ) - { -?><div class="background" style="width: 100%;"><div class="row1" align="center"><br /><br /> -<?php - for ( $i = 0; $i < $count_error_msg; $i++ ) - { - echo $this->error_msg[$i] . '<br />'; - } -?><br /><br /></div></div><br /><br /> -<?php - $this->error_msg = array(); - } - - // send other messages if any - if ( $count_messages = count($this->messages) ) - { -?><div class="background" style="width: 100%;"><br /><?php - for ( $i = 0; $i < $count_messages; $i++ ) - { - echo $this->messages[$i] . '<br />'; - } -?><br /></div><?php - $this->messages = array(); - } - } - - function hide() - { - if ( !empty($this->parms) ) - { - foreach ( $this->parms as $parm => $value ) - { - if ( !empty($value) ) - { -?><input type="hidden" name="<?php echo $parm; ?>" value="<?php echo str_replace('"', '"', $value); ?>" /><?php - } - } - } - } - - function footer() - { - // send header if not done - if ( !$this->header_sent ) - { - $this->header(); - } - - // send messages if any - $this->send_messages(); - - // close db - if ( !empty($db) && is_object($db) ) - { - $db->sql_close(); - } - - // send footer -?> -</div><br /><hr /> -<div align="center" class="gensmall"><a href="http://www.phpbb.com/" target="phpbb" class="gensmall">phpBB</a> © 2001,2002 phpBB Group</div> -</td></tr></table> -</body> -</html> -<?php - // stop - exit; - } - - function loop($parms='', $no_wait=true) - { - $parms = empty($parms) ? $this->parms : array_merge($this->parms, $parms); - if ( $this->error() ) - { - $this->set_parms($parms); - $this->resume_form(); - } - $meta = '<meta http-equiv="refresh" content="' . ($no_wait ? 0 : 3) . ';url=' . $this->url($parms) . '">'; - $this->header($meta); - $this->footer(); - } - - function _button($var) - { - global $HTTP_POST_VARS, $HTTP_GET_VARS; - return (isset($HTTP_POST_VARS[$var]) && !empty($HTTP_POST_VARS[$var])) || (isset($HTTP_GETT_VARS[$var]) && intval($HTTP_GET_VARS[$var])); - } - - function resume_form() - { - if ( ($count_error_msg = count($this->error_msg)) && !$this->_button('resume') ) - { - $this->header(); -?><form name="post" method="post" action="<?php echo $this->url(); ?>"><div class="background" style="width: 100%;"><div class="row1" align="center"><br /><br /> -<?php - for ( $i = 0; $i < $count_error_msg; $i++ ) - { - echo $this->error_msg[$i] . '<br />'; - } -?><br /><hr /><?php echo $this->lang('Error_resume_explain') ?> <input type="submit" name="resume" value="<?php echo $this->lang('Error_resume') ?>" /><?php $this->hide() ?><br /><br /></div></div><br /><br /></form> -<?php - $this->error_msg = array(); - - // other mesages - $this->send_messages(); - $this->footer(); - } - } -} - -// sample from class_db -class light_db -{ - var $sql_fields; - var $sql_values; - var $sql_update; - var $sql_stack_fields; - var $sql_stack_values; - - function sql_close() - { - global $original_db; - return $original_db->sql_close($id); - } - function sql_query($query='', $transaction=false, $line='', $file='', $break_on_error=true) - { - global $original_db; - - $query_res = $original_db->sql_query($query, $transaction); - if ( !$query_res && $break_on_error ) - { - if ( empty($file) && function_exists('debug_backtrace') ) - { - $dbg = debug_backtrace(); - $file = $dbg[0]['file']; - $line = $dbg[0]['line']; - unset($dbg); - } - else - { - $file = basename(__FILE__); - } - $this->error($line, $file, $query); - } - return $query_res; - } - function sql_numrows($id=0) - { - global $original_db; - return $original_db->sql_numrows($id); - } - function sql_affectedrows() - { - global $original_db; - return $original_db->sql_affectedrows(); - } - function sql_numfields($id=0) - { - global $original_db; - return $original_db->sql_numfields($id); - } - function sql_fieldname($offset, $id=0) - { - global $original_db; - return $original_db->sql_fieldname($offset, $id); - } - function sql_fieldtype($offset, $id=0) - { - global $original_db; - return $original_db->sql_fieldtype($offset, $id); - } - function sql_fetchrow($id=0) - { - global $original_db; - return $original_db->sql_fetchrow($id); - } - function sql_fetchrowset($id=0) - { - global $original_db; - return $original_db->sql_fetchrowset($id); - } - function sql_fetchfield($field, $rownum=-1, $id=0) - { - global $original_db; - return $original_db->sql_fetchfield($field, $rownum, $id); - } - function sql_rowseek($rownum, $id=0) - { - global $original_db; - return $original_db->sql_rowseek($rownum, $id); - } - function sql_nextid() - { - global $original_db; - return $original_db->sql_nextid(); - } - function sql_freeresult($id=0) - { - global $original_db; - return $original_db->sql_freeresult($id); - } - function sql_error($id=0) - { - global $original_db; - return $original_db->sql_error($id); - } - - // additional - function error($line, $file, $query) - { - global $page, $lang; - - $sql_error = $this->sql_error(); - $page->critical_error(sprintf($lang['SQL_error'], empty($sql_error['message']) ? '' : $sql_error['code'] . ' - ' . $sql_error['message'], $file, $line, htmlspecialchars(preg_replace('/[\n\r\s\t]+/', ' ', $query)))); - } - - function sql_escape_string($str) - { - return str_replace('\\\'', '\'\'', addslashes(preg_replace('/[\n\r]+/', '<br />', $str))); - } - - function sql_type_cast(&$value) - { - if ( is_float($value) ) - { - return doubleval($value); - } - if ( is_integer($value) || is_bool($value) ) - { - return intval($value); - } - if ( is_string($value) || empty($value) ) - { - return '\'' . $this->sql_escape_string($value) . '\''; - } - // uncastable var : let's do a basic protection on it to prevent sql injection attempt - return '\'' . $this->sql_escape_string(htmlspecialchars($value)) . '\''; - } - - function sql_statement(&$fields) - { - global $original_db; - - // init result - $this->sql_fields = $this->sql_values = $this->sql_update = ''; - if ( empty($fields) ) - { - return; - } - - // process - $first = true; - foreach ( $fields as $field => $value ) - { - // field must contain a field name - if ( !empty($field) && is_string($field) ) - { - $value = $this->sql_type_cast($value); - $this->sql_fields .= ( $first ? '' : ', ' ) . $field; - $this->sql_values .= ( $first ? '' : ', ' ) . $value; - $this->sql_update .= ( $first ? '' : ', ' ) . $field . ' = ' . $value; - $first = false; - } - } - } - - function sql_stack_reset($id='') - { - if ( empty($id) ) - { - $this->sql_stack_fields = array(); - $this->sql_stack_values = array(); - } - else - { - $this->sql_stack_fields[$id] = array(); - $this->sql_stack_values[$id] = array(); - } - } - - function sql_stack_statement(&$fields, $id='') - { - $this->sql_statement($fields); - if ( empty($id) ) - { - $this->sql_stack_fields = $this->sql_fields; - $this->sql_stack_values[] = '(' . $this->sql_values . ')'; - } - else - { - $this->sql_stack_fields[$id] = $this->sql_fields; - $this->sql_stack_values[$id][] = '(' . $this->sql_values . ')'; - } - } - - function sql_stack_insert($table, $transaction=false, $line='', $file='', $break_on_error=true, $id='') - { - if ( (empty($id) && empty($this->sql_stack_values)) || (!empty($id) && empty($this->sql_stack_values[$id])) ) - { - return false; - } - switch( SQL_LAYER ) - { - case 'mysql': - case 'mysql4': - if ( empty($id) ) - { - $sql = 'INSERT INTO ' . $table . ' - (' . $this->sql_stack_fields . ') VALUES ' . implode(",\n", $this->sql_stack_values); - } - else - { - $sql = 'INSERT INTO ' . $table . ' - (' . $this->sql_stack_fields[$id] . ') VALUES ' . implode(",\n", $this->sql_stack_values[$id]); - } - $this->sql_stack_reset($id); - return $this->sql_query($sql, $transaction, $line, $file, $break_on_error); - break; - default: - $count_sql_stack_values = empty($id) ? count($this->sql_stack_values) : count($this->sql_stack_values[$id]); - $result = !empty($count_sql_stack_values); - for ( $i = 0; $i < $count_sql_stack_values; $i++ ) - { - if ( empty($id) ) - { - $sql = 'INSERT INTO ' . $table . ' - (' . $this->sql_stack_fields . ') VALUES ' . $this->sql_stack_values[$i]; - } - else - { - $sql = 'INSERT INTO ' . $table . ' - (' . $this->sql_stack_fields[$id] . ') VALUES ' . $this->sql_stack_values[$id][$i]; - } - $result &= $this->sql_query($sql, $transaction, $line, $file, $break_on_error); - } - $this->sql_stack_reset($id); - return $result; - break; - } - } - - function get_layer() - { - // Define schemes info - $available_dbms = array( - 'mysql'=> array( - 'LABEL' => 'MySQL 3.x', - 'SCHEMA' => 'mysql', - 'DELIM' => ';', - 'DELIM_BASIC' => ';', - 'COMMENTS' => 'remove_remarks' - ), - 'mysql4' => array( - 'LABEL' => 'MySQL 4.x', - 'SCHEMA' => 'mysql', - 'DELIM' => ';', - 'DELIM_BASIC' => ';', - 'COMMENTS' => 'remove_remarks' - ), - 'postgres' => array( - 'LABEL' => 'PostgreSQL 7.x', - 'SCHEMA' => 'postgres', - 'DELIM' => ';', - 'DELIM_BASIC' => ';', - 'COMMENTS' => 'remove_comments' - ), - 'mssql' => array( - 'LABEL' => 'MS SQL Server 7/2000', - 'SCHEMA' => 'mssql', - 'DELIM' => 'GO', - 'DELIM_BASIC' => ';', - 'COMMENTS' => 'remove_comments' - ), - 'mssql-odbc' => array( - 'LABEL' => 'MS SQL Server [ ODBC ]', - 'SCHEMA' => 'mssql', - 'DELIM' => 'GO', - 'DELIM_BASIC' => ';', - 'COMMENTS' => 'remove_comments' - ), - ); - return isset($available_dbms[SQL_LAYER]) ? $available_dbms[SQL_LAYER] : false; - } -} - -class light_session -{ - var $session_max_length; - var $session_id; - var $session_ip; - var $session_logged_in; - var $user_id; - var $user_level; - - function light_session() - { - $this->session_id = $this->get_id(); - $this->session_ip = $this->get_ip(); - $this->session_logged_in = false; - $this->user_id = ANONYMOUS; - $this->user_level = USER; - } - - function get_id() - { - global $HTTP_POST_VARS, $HTTP_GET_VARS; - - $session_id = ''; - if ( isset($HTTP_POST_VARS['sid']) || isset($HTTP_GET_VARS['sid']) ) - { - $session_id = htmlspecialchars(trim(isset($HTTP_POST_VARS['sid']) ? $HTTP_POST_VARS['sid'] : $HTTP_GET_VARS['sid'])); - } - if ( empty($session_id) || !preg_match('/^[A-Za-z0-9]*$/', $session_id) ) - { - list($sec, $usec) = explode(' ', microtime()); - mt_srand((float) $sec + ((float) $usec * 100000)); - $session_id = md5(uniqid(mt_rand(), true)); - } - return $session_id; - } - - function get_ip() - { - global $HTTP_SERVER_VARS, $HTTP_ENV_VARS; - $ip = explode('.', !empty($HTTP_SERVER_VARS['REMOTE_ADDR']) ? $HTTP_SERVER_VARS['REMOTE_ADDR'] : ( !empty($HTTP_ENV_VARS['REMOTE_ADDR']) ? $HTTP_ENV_VARS['REMOTE_ADDR'] : getenv('REMOTE_ADDR'))); - return sprintf('%02x%02x%02x%02x', intval($ip[0]), intval($ip[1]), intval($ip[2]), intval($ip[3])); - } - - function log_out() - { - global $page, $db; - if ( empty($this->session_id) ) - { - return; - } - $sql = 'DELETE FROM ' . SESSIONS_TABLE . ' - WHERE session_id = \'' . $this->session_id . '\''; - $db->sql_query($sql, false, __LINE__, __FILE__); - $this->session_id = ''; - $this->session_logged_in = false; - $this->user_id = ANONYMOUS; - $this->user_level = USER; - $page->unset_parms('sid'); - } - - function log_in($level=USER) - { - $this->init(); - $this->check($level); - $this->validate(); - $this->display(); - } - - function init() - { - global $db, $page; - - $this->session_logged_in = false; - $session_max_length = 600; // 10 minutes - - // do not use a previous session while validating a login - if ( $page->_button('logme') ) - { - return $this->session_logged_in; - } - - // read session from table - $sql = 'SELECT s.session_id, s.session_ip, s.session_time, u.user_id, u.user_level - FROM ' . SESSIONS_TABLE . ' s - LEFT JOIN ' . USERS_TABLE . ' u - ON u.user_id = s.session_user_id - WHERE session_id = \'' . $this->session_id . '\''; - $result = $db->sql_query($sql, false, __LINE__, __FILE__); - if ( $row = $db->sql_fetchrow($result) ) - { - // check session ip with current ip - $ip_stored = substr($row['session_ip'], 0, 6); - $ip_current = substr($this->session_ip, 0, 6); - if ( $ip_stored == $ip_current ) - { - // the ips match : does the session lenght ok ? - if ( (time() - intval($row['session_time'])) < $session_max_length ) - { - // does the user exists - if ( !empty($row['user_id']) ) - { - $this->user_id = intval($row['user_id']); - $this->user_level = intval($row['user_level']); - - // this session is ok : update the session table - $fields = array( - 'session_ip' => $this->session_ip, - 'session_time' => time(), - ); - $db->sql_statement($fields); - $sql = 'UPDATE ' . SESSIONS_TABLE . ' - SET ' . $db->sql_update . ' - WHERE session_id = \'' . $this->session_id . '\''; - $db->sql_query($sql, false, __LINE__, __FILE__); - $this->session_logged_in = true; - } - } - } - } - return $this->session_logged_in; - } - - function check($level=USER) - { - global $page, $db; - global $HTTP_POST_VARS; - - if ( $this->session_logged_in || !$page->_button('submit') ) - { - return; - } - $username = isset($HTTP_POST_VARS['username']) ? trim(stripslashes(phpbb_clean_username($HTTP_POST_VARS['username']))) : ''; - $password = isset($HTTP_POST_VARS['password']) ? md5($HTTP_POST_VARS['password']) : ''; - if ( empty($username) || empty($password) ) - { - $page->error('Login_required'); - } - else - { - // search the user - $sql = 'SELECT user_id, user_password, user_level, user_active - FROM ' . USERS_TABLE . ' - WHERE LOWER(username) = \'' . $db->sql_escape_string(strtolower($username)) . '\''; - $result = $db->sql_query($sql, false, __LINE__, __FILE__); - if ( (!$row = $db->sql_fetchrow($result)) || !$row['user_active'] || ($row['user_id'] == ANONYMOUS) || ($password != $row['user_password']) ) - { - $page->error('Login_failed'); - } - else if ( (($level == ADMIN) && (intval($row['user_level']) != ADMIN)) || (($level == MOD) && !in_array(intval($row['user_level']), array(MOD, ADMIN))) ) - { - $page->error($level == ADMIN ? 'Login_admin' : 'Login_mod'); - } - else - { - $this->user_id = intval($row['user_id']); - $this->user_level = intval($row['user_level']); - } - } - } - - function validate() - { - global $page, $db; - - if ( $this->session_logged_in ) - { - $page->set_parms(array('sid' => $this->session_id)); - return $this->session_logged_in; - } - else if ( !$page->_button('submit') || $page->error() ) - { - return $this->session_logged_in; - } - - // delete outdated session - $sql = 'DELETE FROM ' . SESSIONS_TABLE . ' - WHERE session_user_id = ' . $this->user_id; - $db->sql_query($sql, false, __LINE__, __FILE__); - - // create the session row - $fields = array( - 'session_id' => $this->session_id, - 'session_ip' => $this->session_ip, - 'session_user_id' => $this->user_id, - 'session_start' => time(), - 'session_time' => time(), - ); - $db->sql_statement($fields); - $sql = 'INSERT INTO ' . SESSIONS_TABLE . ' - (' . $db->sql_fields . ') VALUES(' . $db->sql_values . ')'; - $db->sql_query($sql, false, __LINE__, __FILE__); - $this->session_logged_in = true; - $page->set_parms(array('sid' => $this->session_id)); - return $this->session_logged_in; - } - - function display() - { - global $page; - - if ( $this->session_logged_in ) - { - return; - } - - $page->header(); - $page->send_messages(); -?><form name="post" method="post" action="<?php echo str_replace('"', '"', $page->url($parms)); ?>"><div align="center"><div class="background" style="width: 50%;"><table cellpadding="4" cellspacing="1" border="0" width="100%"> -<tr><th colspan="2"><?php echo $page->lang('Login_title'); ?></th></tr> -<tr><td width="40%" class="row1"><b><?php echo $page->lang('Login_username'); ?>:</b></td><td class="row2"><input type="text" name="username" value="" size="25" /></td></tr> -<tr><td class="row1"><b><?php echo $page->lang('Login_password'); ?>:</b></td><td class="row2"><input type="password" name="password" value="" size="40" /></td></tr> -<tr><td class="row2" colspan="2" align="center"><input type="submit" name="submit" value="<?php echo str_replace('"', '"', $page->lang('Login_submit')); ?>" /><input type="hidden" name="logme" value="1" /><?php $page->hide(); ?></td></tr> -</table></div></div></form> -<?php - $page->footer(); - } -} - -?> \ No newline at end of file Modified: phpBB Reloaded 2/templates/subC1/overall_header.tpl =================================================================== --- phpBB Reloaded 2/templates/subC1/overall_header.tpl 2006-06-20 22:15:10 UTC (rev 241) +++ phpBB Reloaded 2/templates/subC1/overall_header.tpl 2006-06-20 22:20:27 UTC (rev 242) @@ -89,7 +89,6 @@ <a href="{U_MEMBERLIST}">{L_MEMBERLIST}</a> <a href="{U_GROUP_CP}">{L_USERGROUPS}</a> <a href="{U_PROFILE}">{L_PROFILE}</a> -<a href="{U_PREFERENCES}">{L_PREFERENCES}</a> <a href="{U_RANKS}">{L_RANKS}</a> </div></td></tr> </table> Deleted: phpBB Reloaded 2/usercp.php =================================================================== --- phpBB Reloaded 2/usercp.php 2006-06-20 22:15:10 UTC (rev 241) +++ phpBB Reloaded 2/usercp.php 2006-06-20 22:20:27 UTC (rev 242) @@ -1,342 +0,0 @@ -<?php -/*************************************************************************** - * usercp.php - * ---------- - * begin : 26/08/2004 - * copyright : Ptirhiik - * email : pti...@cl... - * - * Version : 0.0.7 - 21/08/2005 - * - ***************************************************************************/ - -/*************************************************************************** - * - * 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. - * - ***************************************************************************/ - -define('IN_PHPBB', 1); -$phpbb_root_path = './'; -include($phpbb_root_path . 'extension.inc'); -include($phpbb_root_path . 'common.'.$phpEx); - -// classes -include($config->url('includes/class_form')); -include($config->url('includes/class_cp')); - -// define the control panel -$cp_name = 'ucp'; - -// return messages & other urls settings -$cp_requester = 'usercp'; -$cp_parms = array(); - -// layout switches -$cp_no_navigation = false; -$cp_no_menus = false; - -// right side title -$cp_panel_name = ''; - -// -// Start session management -// -$userdata = session_pagestart($user_ip, empty($forum_id) ? PAGE_PROFILE : $forum_id); -init_userprefs($userdata); -// -// End session management -// - -// read panels and apply patches if available -$cp_panels = new cp_panels(); -$cp_panels->read(); -$cp_panels->patch(); - -// no panels : end there -if ( empty($cp_panels->keys) ) -{ - message_return('No_options'); -} - -// get viewed user -$view_user_id = _read(POST_USERS_URL, TYPE_INT, $user->data['user_id']); -if ( empty($view_user_id) || ($view_user_id == $user->data['user_id']) ) -{ - $view_user = &$user; -} -else -{ - $view_user = new user(); - $view_user->read($view_user_id); -} - -// retrieve auths -$user->get_cache(array(POST_GROUPS_URL, POST_PANELS_URL)); - -// prepare links -$cp_parms = ($view_user->data['user_id'] == $user->data['user_id']) ? array() : array(POST_USERS_URL => $view_user->data['user_id']); - -// search for the $cp_name panel_id -$cp_panel_id = $cp_panels->search(0, $cp_name); -if ( !$cp_panels->auth($cp_panel_id, $view_user) ) -{ - if ( !$user->data['session_logged_in'] ) - { - redirect($config->url('login', array('redirect' => $config->url($cp_requester, $cp_parms)), true)); - exit; - } - message_return('Not_Authorised'); -} - -// get the first level menus -$panels = $cp_panels->get_menu($cp_panel_id); -$menus = array(); -if ( !empty($panels) ) -{ - foreach ( $panels as $shortcut => $panel_id ) - { - if ( $cp_panels->auth($panel_id, $view_user) ) - { - $menus[$shortcut] = $panel_id; - } - } -} -if ( empty($menus) ) -{ - if ( !$user->data['session_logged_in'] ) - { - redirect($config->url('login', array('redirect' => $config->url($cp_requester, $cp_parms)), true)); - exit; - } - message_return('Not_Authorised'); -} - -// get the menus parm -$menu_id = _read('mode', TYPE_NO_HTML); -if ( empty($menu_id) || !isset($menus[$menu_id]) ) -{ - $found = false; - foreach ( $menus as $shortcut => $id ) - { - $found = !empty($menu_id) || !$cp_panels->data[$id]['panel_hidden']; - if ( $found ) - { - $menu_id = $shortcut; - break; - } - } - if ( !$found ) - { - $menu_id = ''; - } -} -if ( empty($menu_id) ) -{ - if ( !$user->data['session_logged_in'] ) - { - redirect($config->url('login', array('redirect' => $config->url($cp_requester, $cp_parms)), true)); - exit; - } - message_return('Not_Authorised'); -} - -// get the second level menus -$panels = $cp_panels->get_menu($menus[$menu_id]); -$sub_menus = array(); -if ( !empty($panels) ) -{ - foreach ( $panels as $shortcut => $panel_id ) - { - if ( $cp_panels->auth($panel_id, $view_user) ) - { - $sub_menus[$shortcut] = $panel_id; - } - } -} -$dft_sub = ''; -if ( empty($sub_menus) ) -{ - $sub_menus[$menu_id] = $menus[$menu_id]; - $dft_sub = $menu_id; -} - -// get sub-menu parm -$subm_id = _read('sub', TYPE_NO_HTML, $dft_sub); -if ( empty($subm_id) || !isset($sub_menus[$subm_id]) ) -{ - $found = false; - foreach ( $sub_menus as $shortcut => $id ) - { - $found = !empty($subm_id) || !$cp_panels->data[$id]['panel_hidden']; - if ( $found ) - { - $subm_id = $shortcut; - break; - } - } - if ( !$found ) - { - $subm_id = ''; - } -} -if ( empty($subm_id) ) -{ - if ( !$user->data['session_logged_in'] ) - { - redirect($config->url('login', array('redirect' => $config->url($cp_requester, $cp_parms)), true)); - exit; - } - message_return('Not_Authorised'); -} - -// prepare navigation -$navigation->add($view_user->data['username'], '', $cp_requester, $cp_parms); -$navigation->add( $cp_panels->data[ $menus[$menu_id] ]['panel_name'], '', $cp_requester, $cp_parms + array('mode' => $menu_id)); -if ( $menu_id != $subm_id ) -{ - $navigation->add( $cp_panels->data[ $sub_menus[$subm_id] ]['panel_name'], '', $cp_requester, $cp_parms + array('mode' => $menu_id, 'sub' => $subm_id)); -} - -// init fields -$fields = array(); - -// include the specified files -$file = $config->url((empty($cp_panels->data[ $sub_menus[$subm_id] ]['panel_file']) ? 'includes/' . $cp_name . '/' . $cp_name . '_generic' : $cp_panels->data[ $sub_menus[$subm_id] ]['panel_file'])); -if ( !file_exists($file) ) -{ - // send "no options" - $cp_panels->display_empty(); -} -else -{ - // get the fields - $sql = 'SELECT * - FROM ' . CP_FIELDS_TABLE . ' - WHERE panel_id = ' . intval($sub_menus[$subm_id]) . ' - ORDER BY field_order'; - $result = $db->sql_query($sql, false, __LINE__, __FILE__); - $fields = array(); - while ( $row = $db->sql_fetchrow($result) ) - { - // do some tweaking regarding dynamical data - if ( !empty($row['field_name']) ) - { - // unpack data - $field = unserialize(stripslashes($row['field_attr'])); - - // check auths - $authed = true; - if ( !empty($field['field_auth']) ) - { - $auth_type = POST_GROUPS_URL; - $auth_name = $field['field_auth']; - if ( $view_user->data['user_id'] == ANONYMOUS ) - { - $group_user_list = array(GROUP_ANONYMOUS); - } - else if ( $view_user->data['user_id'] == $user->data['user_id'] ) - { - $group_user_list = array(GROUP_OWN); - } - else - { - $group_user_list = $view_user->get_groups_list(); - } - $authed = $user->auth($auth_type, $auth_name, $group_user_list); - } - - if ( $authed) - { - $fields[ $row['field_name'] ] = $field; - if ( !empty($fields[ $row['field_name'] ]['class_file']) ) - { - @include_once($config->url($fields[ $row['field_name'] ]['class_file'])); - } - foreach ( $fields[ $row['field_name'] ] as $key => $val ) - { - if ( !empty($val) && is_string($val) && preg_match('/^\[/', $val) ) - { - $var_check = explode(', ', preg_replace('/^\[([^\]]*)\](.*)/i', '\1, \2', $val)); - if ( !empty($var_check[1]) && preg_match('/^\[/', $var_check[1]) ) - { - $file_check = explode(', ', preg_replace('/^\[([^\]]*)\](.*)/i', '\1, \2', $var_check[1])); - if ( !empty($file_check[1]) ) - { - $var_check[1] = $file_check[1]; - $var_check[2] = $file_check[0]; - } - } - if ( (count($var_check) > 1) && !empty($var_check[0]) && !empty($var_check[1]) ) - { - if ( !empty($var_check[2]) ) - { - @include_once($config->url($var_check[2])); - } - $entity_name = $var_check[1]; - switch ( $var_check[0] ) - { - case 'var': - $res = ''; - if ( isset($$entity_name) ) - { - $res = $$entity_name; - } - $fields[ $row['field_name'] ][$key] = $res; - break; - case 'func': - $res = ''; - if ( function_exists($entity_name) ) - { - $res = $entity_name(); - } - $fields[ $row['field_name'] ][$key] = $res; - break; - } - } - } - } - } - } - } - - // include the file - include($file); -} - -// display constants -$template->assign_vars(array( - 'L_MENU' => $user->lang('Profile'), - 'L_FORM' => empty($cp_panel_name) ? $user->lang($cp_panels->data[ $sub_menus[$subm_id] ]['panel_name']) : $user->lang($cp_panel_name), - 'S_ACTION' => $config->url($cp_requester, '', true), -)); - -// display nav -if ( !$cp_no_navigation ) -{ - $navigation->display('nav'); -} - -// display menu -if ( !$cp_no_menus ) -{ - $cp_panels->display_menus($menus, $sub_menus, $menu_id, $subm_id, $cp_requester, $cp_parms, 'CP_MENUS_BOX'); -} - -// hide some values on form -_hide($cp_parms + array('mode' => $menu_id)); -if ( $subm_id != $menu_id ) -{ - _hide('sub', $subm_id); -} -_hide_set(); - -// send all to browser -include($config->url('includes/page_header')); -$template->pparse('body'); -include($config->url('includes/page_tail')); - -?> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mar...@us...> - 2006-06-20 22:15:18
|
Revision: 241 Author: markthedaemon Date: 2006-06-20 15:15:10 -0700 (Tue, 20 Jun 2006) ViewCVS: http://svn.sourceforge.net/phpbbreloaded/?rev=241&view=rev Log Message: ----------- Added Paths: ----------- phpBB Reloaded 2/templates/subC1/ranks_body.tpl Added: phpBB Reloaded 2/templates/subC1/ranks_body.tpl =================================================================== --- phpBB Reloaded 2/templates/subC1/ranks_body.tpl (rev 0) +++ phpBB Reloaded 2/templates/subC1/ranks_body.tpl 2006-06-20 22:15:10 UTC (rev 241) @@ -0,0 +1,90 @@ + +<table width="100%" cellspacing="2" cellpadding="2" border="0"> + <tr> + <td align="left" valign="middle" width="100%"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a> + -> {L_RANKS}</span></td> + </tr> +</table> + +<table width="100%" border="0" cellpadding="0" cellspacing="5"> +<tr> + + <td valign="top" width="50%"> + <table border="0" cellpadding="4" cellspacing="1" class="forumline" width="100%"> + <tr> + <th class="thHead" height="25" valign="middle" colspan="3">{L_RANKS}</th> + </tr> + <tr> + <td class="catLeft" nowrap="nowrap" align="center"><span class="cattitle"> {L_RANKS} </span></td> + <td class="cat" nowrap="nowrap" align="center"><span class="cattitle"> {L_MINI} </span></td> + <!-- BEGIN no_std_userlist --> + <td class="cat" nowrap="nowrap" align="center"><span class="cattitle"> {L_TOTAL_USERS} </span></td> + <!-- END no_std_userlist --> + </tr> + <!-- BEGIN ranks --> + <tr> + <!-- BEGIN userlist --> + <td class="row1" align="center" rowspan="2" nowrap="nowrap"> + <!-- END userlist --> + <!-- BEGIN no_userlist --> + <td class="row1" align="center" nowrap="nowrap"> + <!-- END no_userlist --> + <span class="gen">{ranks.RANK_TITLE}<br />{ranks.RANK_IMAGE}</span> + </td> + <td class="row2" align="center" valign="top"> + <span class="gensmall">{ranks.RANK_MINI}</span> + </td> + <!-- BEGIN no_userlist --> + <td class="row2" align="center" valign="top"> + <span class="gensmall">{ranks.RANK_TOTAL}</span> + </td> + <!-- END no_userlist --> + </tr> + <!-- BEGIN userlist --> + <tr> + <td class="row1" colspan="2" valign="top"> + <span class="gensmall"> {ranks.userlist.USERS_LIST}</span> + </td> + </tr> + <!-- END userlist --> + <!-- END ranks --> + </table> + </td> + + <td valign="top" width="50%"> + <table border="0" cellpadding="4" cellspacing="1" class="forumline" width="100%"> + <tr> + <th class="thHead" height="25" valign="middle" colspan="2">{L_SPECIAL_RANKS}</th> + </tr> + <tr> + <td class="catLeft" nowrap="nowrap" align="center"><span class="cattitle"> {L_SPECIAL_RANKS} </span></td> + <td class="cat" nowrap="nowrap" valign="top" align="center"> + <!-- BEGIN no_spe_userlist --> + <span class="cattitle"> {L_TOTAL_USERS} </span> + <!-- END no_spe_userlist --> + <!-- BEGIN spe_userlist --> + <span class="cattitle"> {L_USERS_LIST} </span> + <!-- END spe_userlist --> + </td> + </tr> + <!-- BEGIN spe_ranks --> + <tr> + <td class="row1" align="center" nowrap="nowrap"> + <span class="gen">{spe_ranks.RANK_TITLE}<br />{spe_ranks.RANK_IMAGE}</span> + </td> + <!-- BEGIN userlist --> + <td class="row2" valign="top"> + <span class="gensmall">{spe_ranks.userlist.USERS_LIST}</span> + </td> + <!-- END userlist --> + <!-- BEGIN no_userlist --> + <td class="row2" align="center" valign="top"> + <span class="gensmall">{spe_ranks.no_userlist.RANK_TOTAL}</span> + </td> + <!-- END no_userlist --> + </tr> + <!-- END spe_ranks --> + </table> + </td> +</tr> +</table> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mar...@us...> - 2006-06-20 22:12:53
|
Revision: 240 Author: markthedaemon Date: 2006-06-20 15:12:48 -0700 (Tue, 20 Jun 2006) ViewCVS: http://svn.sourceforge.net/phpbbreloaded/?rev=240&view=rev Log Message: ----------- Modified Paths: -------------- phpBB Reloaded 2/install/schemas/mysql_basic.sql Modified: phpBB Reloaded 2/install/schemas/mysql_basic.sql =================================================================== --- phpBB Reloaded 2/install/schemas/mysql_basic.sql 2006-06-20 22:11:01 UTC (rev 239) +++ phpBB Reloaded 2/install/schemas/mysql_basic.sql 2006-06-20 22:12:48 UTC (rev 240) @@ -275,7 +275,7 @@ INSERT INTO phpbb_config VALUES ('server_name', 'localhost', 1); INSERT INTO phpbb_config VALUES ('server_port', '80', 1); INSERT INTO phpbb_config VALUES ('script_path', '/', 1); -INSERT INTO phpbb_config VALUES ('version', '.1.0', 0); +INSERT INTO phpbb_config VALUES ('version', '.2.0', 0); INSERT INTO phpbb_config VALUES ('stat_total_posts', '7', 0); INSERT INTO phpbb_config VALUES ('stat_total_topics', '5', 0); INSERT INTO phpbb_config VALUES ('stat_total_users', '1', 0); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mar...@us...> - 2006-06-20 22:11:11
|
Revision: 239 Author: markthedaemon Date: 2006-06-20 15:11:01 -0700 (Tue, 20 Jun 2006) ViewCVS: http://svn.sourceforge.net/phpbbreloaded/?rev=239&view=rev Log Message: ----------- Modified Paths: -------------- phpBB Reloaded 2/install/cookie.php phpBB Reloaded 2/install/schemas/mysql_schema.sql phpBB Reloaded 2/install/update_to_latest.php Modified: phpBB Reloaded 2/install/cookie.php =================================================================== --- phpBB Reloaded 2/install/cookie.php 2006-06-20 22:10:05 UTC (rev 238) +++ phpBB Reloaded 2/install/cookie.php 2006-06-20 22:11:01 UTC (rev 239) @@ -533,16 +533,16 @@ <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $lang['ENCODING']; ?>"> <meta http-equiv="Content-Style-Type" content="text/css"> <title><?php echo $cookie_lang['Welcome_cookie'];?></title> -<link rel="stylesheet" href="../templates/subSilver/subSilver.css" type="text/css"> +<link rel="stylesheet" href="../templates/subC1/subC1.css" type="text/css"> <style type="text/css"> <!-- -th { background-image: url('../templates/subSilver/images/cellpic3.gif') } -td.cat { background-image: url('../templates/subSilver/images/cellpic1.gif') } -td.rowpic { background-image: url('../templates/subSilver/images/cellpic2.jpg'); background-repeat: repeat-y } -td.catHead,td.catSides,td.catLeft,td.catRight,td.catBottom { background-image: url('../templates/subSilver/images/cellpic1.gif') } +th { background-image: url('../templates/subC1/images/cellpic3.gif') } +td.cat { background-image: url('../templates/subC1/images/cellpic1.gif') } +td.rowpic { background-image: url('../templates/subC1/images/cellpic2.jpg'); background-repeat: repeat-y } +td.catHead,td.catSides,td.catLeft,td.catRight,td.catBottom { background-image: url('../templates/subC1/images/cellpic1.gif') } /* Import the fancy styles for IE only (NS4.x doesn't use the @import function) */ -@import url("../templates/subSilver/formIE.css"); +@import url("../templates/subC1/formIE.css"); //--> </style> </head> @@ -554,7 +554,7 @@ <tr> <td><table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> - <td><img src="../templates/subSilver/images/logo_phpBB.gif" border="0" alt="Forum Home" vspace="1" /></td> + <td><img src="../templates/subC1/images/logo_phpBB.gif" border="0" alt="Forum Home" vspace="1" /></td> <td align="center" width="100%" valign="middle"><span class="maintitle"><?php echo $cookie_lang['Welcome_cookie'];?></span></td> </tr> </table></td> Modified: phpBB Reloaded 2/install/schemas/mysql_schema.sql =================================================================== --- phpBB Reloaded 2/install/schemas/mysql_schema.sql 2006-06-20 22:10:05 UTC (rev 238) +++ phpBB Reloaded 2/install/schemas/mysql_schema.sql 2006-06-20 22:11:01 UTC (rev 239) @@ -575,6 +575,7 @@ search_id int(11) unsigned NOT NULL default '0', session_id varchar(32) NOT NULL default '', search_array text NOT NULL, + search_time int(11) DEFAULT '0' NOT NULL; PRIMARY KEY (search_id), KEY session_id (session_id) ) TYPE=MyISAM; Modified: phpBB Reloaded 2/install/update_to_latest.php =================================================================== --- phpBB Reloaded 2/install/update_to_latest.php 2006-06-20 22:10:05 UTC (rev 238) +++ phpBB Reloaded 2/install/update_to_latest.php 2006-06-20 22:11:01 UTC (rev 239) @@ -207,7 +207,17 @@ VALUES ('search_min_chars', '3')"; break; } + case '.2.1': + switch (SQL_LAYER) + { + case 'mysql': + case 'mysql4': + $sql[] = "ALTER TABLE " . SEARCH_TABLE . " + ADD COLUMN search_time int(11) DEFAULT '0' NOT NULL"; + break; } + + } echo "<h2>Updating database schema</h2>\n"; echo "<p>Progress :: <b>"; flush(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mar...@us...> - 2006-06-20 22:10:10
|
Revision: 238 Author: markthedaemon Date: 2006-06-20 15:10:05 -0700 (Tue, 20 Jun 2006) ViewCVS: http://svn.sourceforge.net/phpbbreloaded/?rev=238&view=rev Log Message: ----------- nooooooooooooooooooooooooo wasnt me lol Modified Paths: -------------- phpBB Reloaded 2/config.php Modified: phpBB Reloaded 2/config.php =================================================================== --- phpBB Reloaded 2/config.php 2006-06-20 22:09:27 UTC (rev 237) +++ phpBB Reloaded 2/config.php 2006-06-20 22:10:05 UTC (rev 238) @@ -1,18 +0,0 @@ -<?php - - -// phpBB 2.x auto-generated config file -// Do not change anything in this file! - -$dbms = 'mysql'; - -$dbhost = 'localhost'; -$dbname = 'phpbbreloaded'; -$dbuser = 'root'; -$dbpasswd = ''; - -$table_prefix = 'reloaded_'; - -define('PHPBB_INSTALLED', true); - -?> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mar...@us...> - 2006-06-20 22:09:33
|
Revision: 237 Author: markthedaemon Date: 2006-06-20 15:09:27 -0700 (Tue, 20 Jun 2006) ViewCVS: http://svn.sourceforge.net/phpbbreloaded/?rev=237&view=rev Log Message: ----------- Modified Paths: -------------- phpBB Reloaded 2/config.php phpBB Reloaded 2/includes/page_header.php Modified: phpBB Reloaded 2/config.php =================================================================== --- phpBB Reloaded 2/config.php 2006-06-20 22:07:00 UTC (rev 236) +++ phpBB Reloaded 2/config.php 2006-06-20 22:09:27 UTC (rev 237) @@ -0,0 +1,18 @@ +<?php + + +// phpBB 2.x auto-generated config file +// Do not change anything in this file! + +$dbms = 'mysql'; + +$dbhost = 'localhost'; +$dbname = 'phpbbreloaded'; +$dbuser = 'root'; +$dbpasswd = ''; + +$table_prefix = 'reloaded_'; + +define('PHPBB_INSTALLED', true); + +?> \ No newline at end of file Modified: phpBB Reloaded 2/includes/page_header.php =================================================================== --- phpBB Reloaded 2/includes/page_header.php 2006-06-20 22:07:00 UTC (rev 236) +++ phpBB Reloaded 2/includes/page_header.php 2006-06-20 22:09:27 UTC (rev 237) @@ -639,7 +639,7 @@ { $template->assign_vars(array( 'I_RANKS' => '<img src="' . $images['Ranks'] . '" width="12" height="13" border="0" alt="' . $lang['Ranks'] . '" hspace="3" />', - 'U_RANKS' => append_sid("ranks.$phpEx"), + 'U_RANKS' => append_sid('ranks.'.$phpEx), 'L_RANKS' => $lang['Ranks'], ) ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mar...@us...> - 2006-06-20 22:07:07
|
Revision: 236 Author: markthedaemon Date: 2006-06-20 15:07:00 -0700 (Tue, 20 Jun 2006) ViewCVS: http://svn.sourceforge.net/phpbbreloaded/?rev=236&view=rev Log Message: ----------- Added Paths: ----------- phpBB Reloaded 2/templates/subC1/admin/admin_agreement.tpl Added: phpBB Reloaded 2/templates/subC1/admin/admin_agreement.tpl =================================================================== --- phpBB Reloaded 2/templates/subC1/admin/admin_agreement.tpl (rev 0) +++ phpBB Reloaded 2/templates/subC1/admin/admin_agreement.tpl 2006-06-20 22:07:00 UTC (rev 236) @@ -0,0 +1,18 @@ +<h1>{L_TITLE_AGREEMENT_TEXT}</h1> + +<p>{L_AGREEMENT_TEXT}</p> + +<form action="{S_AGREEMENT_ACTION}" method="post"> +<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" height="306"> + <tr> + <th class="thHead">{L_TITLE_AGREEMENT_TEXT}</th> + </tr> + <tr> + <td class="row2" align="center"><textarea name="agreement_form" rows="25" cols="120">{AGREEMENT_TEXT}</textarea></td> + </tr> + <tr> + <td class="catBottom" align="center"><input type="submit" name="post" value="{L_SAVE_AGREEMENT_TEXT}" class="mainoption" /> <input type="reset" name="reset" value="{L_RESET_AGREEMENT_TEXT}" class="liteoption" /> + </td> + </tr> +</table> +</form> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mar...@us...> - 2006-06-20 21:54:33
|
Revision: 235 Author: markthedaemon Date: 2006-06-20 14:54:23 -0700 (Tue, 20 Jun 2006) ViewCVS: http://svn.sourceforge.net/phpbbreloaded/?rev=235&view=rev Log Message: ----------- Added Paths: ----------- phpBB Reloaded 2/templates/subC1/shoutbox_max_body.tpl phpBB Reloaded 2/templates/subC1/shoutbox_max_guest_body.tpl phpBB Reloaded 2/templates/subC1/shoutbox_view_body.tpl Added: phpBB Reloaded 2/templates/subC1/shoutbox_max_body.tpl =================================================================== --- phpBB Reloaded 2/templates/subC1/shoutbox_max_body.tpl (rev 0) +++ phpBB Reloaded 2/templates/subC1/shoutbox_max_body.tpl 2006-06-20 21:54:23 UTC (rev 235) @@ -0,0 +1,233 @@ +<script language="JavaScript" src="{T_URL}/bbcode.js" type="text/javascript" ></script> +<script language="JavaScript" type="text/javascript" > +// Helpline messages +b_help = "{L_BBCODE_B_HELP}"; +i_help = "{L_BBCODE_I_HELP}"; +u_help = "{L_BBCODE_U_HELP}"; +q_help = "{L_BBCODE_Q_HELP}"; +c_help = "{L_BBCODE_C_HELP}"; +l_help = "{L_BBCODE_L_HELP}"; +o_help = "{L_BBCODE_O_HELP}"; +p_help = "{L_BBCODE_P_HELP}"; +w_help = "{L_BBCODE_W_HELP}"; +a_help = "{L_BBCODE_A_HELP}"; +s_help = "{L_BBCODE_S_HELP}"; +f_help = "{L_BBCODE_F_HELP}"; +</script> + +<table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"><tr> +<td align="left" valign="bottom"><span class="gensmall"> +<!-- BEGIN switch_user_logged_in --> +{LAST_VISIT_DATE}<br /> +<!-- END switch_user_logged_in --> +{CURRENT_TIME}<br /> +</span><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td> +</tr> + +</table> + +{POST_PREVIEW_BOX} +{ERROR_BOX} +<table width="100%" height="100%" cellpadding="0" cellspacing="0" border="0" class="forumline"> +<form action="{U_SHOUTBOX}" method="post" name="post" onsubmit="return checkForm(this)"> + <tr> + <th class="thHead" colspan="2" height="25"><b>{L_SHOUT_TEXT}</b></th> + </tr> + <!-- BEGIN switch_username_select --> + <tr> + <td class="row1"><span class="gen"><b>{L_USERNAME}</b></span></td> + <td class="row2"><span class="genmed"><input type="text" class="post" tabindex="1" name="username" size="25" maxlength="25" value="{USERNAME}" /></span></td> + </tr> + <!-- END switch_username_select --> + + <tr> + <td class="row1" valign="top"> + <table width="100%" border="0" cellspacing="0" cellpadding="1"> + <tr> + <td valign="middle" align="center"> <br /> + <table width="100" border="0" cellspacing="0" cellpadding="5"> + <tr align="center"> + <td colspan="{S_SMILIES_COLSPAN}" class="gensmall"><b>{L_EMOTICONS}</b></td> + </tr> + <!-- BEGIN smilies_row --> + <tr align="center" valign="middle"> + <!-- BEGIN smilies_col --> + <td><a href="javascript:emoticon('{smilies_row.smilies_col.SMILEY_CODE}')"><img src="{smilies_row.smilies_col.SMILEY_IMG}" border="0" alt="{smilies_row.smilies_col.SMILEY_DESC}" title="{smilies_row.smilies_col.SMILEY_DESC}" /></a></td> + <!-- END smilies_col --> + </tr> + <!-- END smilies_row --> + <!-- BEGIN switch_smilies_extra --> + <tr align="center"> + <td colspan="{S_SMILIES_COLSPAN}"><span class="nav"><a href="{U_MORE_SMILIES}" onclick="window.open('{U_MORE_SMILIES}', '_phpbbsmilies', 'HEIGHT=300,resizable=yes,scrollbars=yes,WIDTH=250');return false;" target="_phpbbsmilies" class="nav">{L_MORE_SMILIES}</a></span></td> + </tr> + <!-- END switch_smilies_extra --> + </table> + </td> + </tr> + </table> + </td> + + <td class="row2" valign="top"><span class="gen"> <span class="genmed"> </span> + <table width="450" border="0" cellspacing="0" cellpadding="2"> + <tr align="center" valign="middle"> + <td><span class="genmed"> + <input type="button" class="button" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onClick="bbstyle(0)" onMouseOver="helpline('b')" /> + </span></td> + <td><span class="genmed"> + <input type="button" class="button" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onClick="bbstyle(2)" onMouseOver="helpline('i')" /> + </span></td> + <td><span class="genmed"> + <input type="button" class="button" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onClick="bbstyle(4)" onMouseOver="helpline('u')" /> + </span></td> + <td><span class="genmed"> + <input type="button" class="button" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onClick="bbstyle(6)" onMouseOver="helpline('q')" /> + </span></td> + <td><span class="genmed"> + <input type="button" class="button" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onClick="bbstyle(8)" onMouseOver="helpline('c')" /> + </span></td> + <td><span class="genmed"> + <input type="button" class="button" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onClick="bbstyle(10)" onMouseOver="helpline('l')" /> + </span></td> + <td><span class="genmed"> + <input type="button" class="button" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onClick="bbstyle(12)" onMouseOver="helpline('o')" /> + </span></td> + <td><span class="genmed"> + <input type="button" class="button" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onClick="bbstyle(14)" onMouseOver="helpline('p')" /> + </span></td> + <td><span class="genmed"> + <input type="button" class="button" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onClick="bbstyle(16)" onMouseOver="helpline('w')" /> + </span></td> + </tr> + <tr> + <td colspan="9"> + <table width="100%" border="0" cellspacing="0" cellpadding="0"> + <tr> + <td><span class="genmed"> {L_FONT_COLOR}: + <select name="addbbcode18" onChange="bbfontstyle('[color=' + this.form.addbbcode18.options[this.form.addbbcode18.selectedIndex].value + ']', '[/color]')" onMouseOver="helpline('s')"> + <option style="color:black; background-color: {T_TD_COLOR1}" value="{T_FONTCOLOR1}" class="genmed">{L_COLOR_DEFAULT}</option> + <option style="color:darkred; background-color: {T_TD_COLOR1}" value="darkred" class="genmed">{L_COLOR_DARK_RED}</option> + <option style="color:red; background-color: {T_TD_COLOR1}" value="red" class="genmed">{L_COLOR_RED}</option> + <option style="color:orange; background-color: {T_TD_COLOR1}" value="orange" class="genmed">{L_COLOR_ORANGE}</option> + <option style="color:brown; background-color: {T_TD_COLOR1}" value="brown" class="genmed">{L_COLOR_BROWN}</option> + <option style="color:yellow; background-color: {T_TD_COLOR1}" value="yellow" class="genmed">{L_COLOR_YELLOW}</option> + <option style="color:green; background-color: {T_TD_COLOR1}" value="green" class="genmed">{L_COLOR_GREEN}</option> + <option style="color:olive; background-color: {T_TD_COLOR1}" value="olive" class="genmed">{L_COLOR_OLIVE}</option> + <option style="color:cyan; background-color: {T_TD_COLOR1}" value="cyan" class="genmed">{L_COLOR_CYAN}</option> + <option style="color:blue; background-color: {T_TD_COLOR1}" value="blue" class="genmed">{L_COLOR_BLUE}</option> + <option style="color:darkblue; background-color: {T_TD_COLOR1}" value="darkblue" class="genmed">{L_COLOR_DARK_BLUE}</option> + <option style="color:indigo; background-color: {T_TD_COLOR1}" value="indigo" class="genmed">{L_COLOR_INDIGO}</option> + <option style="color:violet; background-color: {T_TD_COLOR1}" value="violet" class="genmed">{L_COLOR_VIOLET}</option> + <option style="color:white; background-color: {T_TD_COLOR1}" value="white" class="genmed">{L_COLOR_WHITE}</option> + <option style="color:black; background-color: {T_TD_COLOR1}" value="black" class="genmed">{L_COLOR_BLACK}</option> + </select> {L_FONT_SIZE}:<select name="addbbcode20" onChange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]')" onMouseOver="helpline('f')"> + <option value="7" class="genmed">{L_FONT_TINY}</option> + <option value="9" class="genmed">{L_FONT_SMALL}</option> + <option value="12" selected class="genmed">{L_FONT_NORMAL}</option> + <option value="18" class="genmed">{L_FONT_LARGE}</option> + <option value="24" class="genmed">{L_FONT_HUGE}</option> + </select> + + </span></td> + <td nowrap="nowrap" align="right"><span class="gensmall"><a href="javascript:bbstyle(-1)" class="genmed" onMouseOver="helpline('a')">{L_BBCODE_CLOSE_TAGS}</a></span></td> + </tr> + </table> + </td> + </tr> + <tr> + <td colspan="9"> <span class="gensmall"> + <input type="text" name="helpbox" size="45" maxlength="100" style="width:450px; font-size:10px" class="helpline" value="{L_STYLES_TIP}" /> + </span></td> + </tr> + <tr> + <td colspan="9"><span class="gen"> + <textarea name="message" rows="8" cols="35" wrap="virtual" style="width:450px" tabindex="3" class="post" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);">{MESSAGE}</textarea> + </span></td> + </tr> + </table> + </span></td> + </tr> + <tr> + <td class="row1" valign="top"><span class="gen"><b>{L_OPTIONS}</b></span><br /><span class="gensmall">{HTML_STATUS}<br />{BBCODE_STATUS}<br />{SMILIES_STATUS}</span></td> + <td class="row2"><span class="gen"> </span> + <table cellspacing="0" cellpadding="1" border="0"> + <!-- BEGIN switch_html_checkbox --> + <tr> + <td> + <input type="checkbox" name="disable_html" {S_HTML_CHECKED} /> + </td> + <td><span class="gen">{L_DISABLE_HTML}</span></td> + </tr> + <!-- END switch_html_checkbox --> + <!-- BEGIN switch_bbcode_checkbox --> + <tr> + <td> + <input type="checkbox" name="disable_bbcode" {S_BBCODE_CHECKED} /> + </td> + <td><span class="gen">{L_DISABLE_BBCODE}</span></td> + </tr> + <!-- END switch_bbcode_checkbox --> + </table> + </td> + </tr> + <tr> + <td class="catBottom" colspan="2" align="center" height="28"> {S_HIDDEN_FORM_FIELDS} +<input type="submit" tabindex="5" name="refresh" class="mainoption" value="{L_SHOUT_REFRESH}" /> +<input type="submit" tabindex="5" name="preview" class="mainoption" value="{L_SHOUT_PREVIEW}" /> +<input type="submit" accesskey="s" tabindex="6" name="shout" class="mainoption" value="{L_SHOUT_SUBMIT}" /></td> + </tr> + </table> +</form> + <table width="100%" cellspacing="2" border="0" align="center" cellpadding="2"> + <tr> + <td align="right" valign="bottom" class="gensmall"> +<span class="nav"> + {PAGINATION}</span> +</td> + </tr> +</table> +<table border="0" cellpadding="4" cellspacing="1" width="100%" class="forumline"> + <tr align="right"> + <td class="catHead" colspan="2" height="28" align="center"><b> {L_SHOUTBOX} <b/></td> + </tr> + <tr> + <th class="thLeft" width="160" height="26" nowrap="nowrap">{L_AUTHOR}</th> + <th class="thRight" nowrap="nowrap">{L_MESSAGE}</th> + </tr> + + <!-- BEGIN shoutrow --> + <tr> + <td width="160" align="left" valign="top" class="{shoutrow.ROW_CLASS}"> + <span class="name"><b>{shoutrow.SHOUT_USERNAME}</b></span><br /> + <span class="postdetails">{shoutrow.USER_RANK}<br /> + {shoutrow.RANK_IMAGE}<br/> + {shoutrow.USER_AVATAR}<br /><br/>{shoutrow.USER_JOINED}</span></td> + <td class="{shoutrow.ROW_CLASS}" width="100%" height="28" valign="top"> + <table width="100%" border="0" cellspacing="0" cellpadding="0"> + <tr> + <td width="100%"><a href="{shoutrow.U_MINI_POST}"><img src="{shoutrow.MINI_POST_IMG}" width="12" height="9" alt="{shoutrow.L_MINI_POST_ALT}" title="{shoutrow.L_MINI_POST_ALT}" border="0" /></a><span class="postdetails">{L_POSTED}: {shoutrow.TIME}</span></td> + <td valign="top" align="right" nowrap="nowrap">{shoutrow.QUOTE_IMG}{shoutrow.EDIT_IMG}{shoutrow.CENSOR_IMG}{shoutrow.DELETE_IMG}{shoutrow.IP_IMG}</td></form> + </tr> + <tr> + <td colspan="2"><hr/></td> + </tr> + <tr> + <td colspan="2"><span class="postbody">{shoutrow.SHOUT}{shoutrow.SIGNATURE}</span></td> + </tr> + </table> + </td> + </tr> + <tr> + <td class="spaceRow" colspan="2" height="1"><img src="templates/subSilver/images/spacer.gif" alt="" width="1" height="1" /></td> + </tr> + <!-- END shoutrow --> + +</table> + <table width="100%" cellspacing="2" border="0" align="center" cellpadding="2"> + <tr> + <td align="left" valign="top"><span class="gensmall">{S_TIMEZONE}</span></td> + <td align="right" valign="bottom" class="gensmall"> +<span class="nav"> + {PAGINATION}</span> +</td> + </tr> +</table> \ No newline at end of file Added: phpBB Reloaded 2/templates/subC1/shoutbox_max_guest_body.tpl =================================================================== --- phpBB Reloaded 2/templates/subC1/shoutbox_max_guest_body.tpl (rev 0) +++ phpBB Reloaded 2/templates/subC1/shoutbox_max_guest_body.tpl 2006-06-20 21:54:23 UTC (rev 235) @@ -0,0 +1,76 @@ +<table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"><tr> +<td align="left" valign="bottom"><span class="gensmall"> +<!-- BEGIN switch_user_logged_in --> +{LAST_VISIT_DATE}<br /> +<!-- END switch_user_logged_in --> +{CURRENT_TIME}<br /> +</span><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td> +</tr> + +</table> + +<table width="100%" height="100%" cellpadding="0" cellspacing="0" border="0" class="forumline"> +<form action="{U_SHOUTBOX}" method="post" name="post" onsubmit="return checkForm(this)"> + <tr> + <td class="catBottom" colspan="2" align="center" height="28"> {S_HIDDEN_FORM_FIELDS} +<input type="submit" tabindex="1" name="refresh" class="mainoption" value="{L_SHOUT_REFRESH}" /> +</td> + </tr> + +</table> +</form> + + <table width="100%" cellspacing="2" border="0" align="center" cellpadding="2"> + <tr> + <td align="right" valign="bottom" class="gensmall"> +<span class="nav"> + {PAGINATION}</span> +</td> + </tr> +</table> +<table border="0" cellpadding="4" cellspacing="1" width="100%" class="forumline"> + <tr align="right"> + <td class="catHead" colspan="2" height="28" align="center"><b> {L_SHOUTBOX} <b/></td> + </tr> + <tr> + <th class="thLeft" width="160" height="26" nowrap="nowrap">{L_AUTHOR}</th> + <th class="thRight" nowrap="nowrap">{L_MESSAGE}</th> + </tr> + + <!-- BEGIN shoutrow --> + <tr> + <td width="160" align="left" valign="top" class="{shoutrow.ROW_CLASS}"> + <span class="name"><b>{shoutrow.SHOUT_USERNAME}</b></span><br /> + <span class="postdetails">{shoutrow.USER_RANK}<br /> + {shoutrow.RANK_IMAGE}<br/> + {shoutrow.USER_AVATAR}<br /><br/>{shoutrow.USER_JOINED}</span></td> + <td class="{shoutrow.ROW_CLASS}" width="100%" height="28" valign="top"> + <table width="100%" border="0" cellspacing="0" cellpadding="0"> + <tr> + <td width="100%"><a href="{shoutrow.U_MINI_POST}"><img src="{shoutrow.MINI_POST_IMG}" width="12" height="9" alt="{shoutrow.L_MINI_POST_ALT}" title="{shoutrow.L_MINI_POST_ALT}" border="0" /></a><span class="postdetails">{L_POSTED}: {shoutrow.TIME}</span></td> + <td valign="top" align="right" nowrap="nowrap">{shoutrow.QUOTE_IMG}{shoutrow.EDIT_IMG}{shoutrow.DELETE_IMG}{shoutrow.IP_IMG}</td></form> + </tr> + <tr> + <td colspan="2"><hr/></td> + </tr> + <tr> + <td colspan="2"><span class="postbody">{shoutrow.SHOUT}{shoutrow.SIGNATURE}</span></td> + </tr> + </table> + </td> + </tr> + <tr> + <td class="spaceRow" colspan="2" height="1"><img src="templates/subSilver/images/spacer.gif" alt="" width="1" height="1" /></td> + </tr> + <!-- END shoutrow --> + +</table> + <table width="100%" cellspacing="2" border="0" align="center" cellpadding="2"> + <tr> + <td align="left" valign="top"><span class="gensmall">{S_TIMEZONE}</span></td> + <td align="right" valign="bottom" class="gensmall"> +<span class="nav"> + {PAGINATION}</span> +</td> + </tr> +</table> \ No newline at end of file Added: phpBB Reloaded 2/templates/subC1/shoutbox_view_body.tpl =================================================================== --- phpBB Reloaded 2/templates/subC1/shoutbox_view_body.tpl (rev 0) +++ phpBB Reloaded 2/templates/subC1/shoutbox_view_body.tpl 2006-06-20 21:54:23 UTC (rev 235) @@ -0,0 +1,18 @@ +<HEAD><META http-equiv="refresh" content="120;url={U_SHOUTBOX_VIEW}?auto_refresh=1"> +<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" /> +<link rel="stylesheet" href="{T_URL}/{T_HEAD_STYLESHEET}" type="text/css"> +</HEAD> +<body bgcolor="{T_BODY_BGCOLOR}" text="{T_BODY_TEXT}" link="{T_BODY_LINK}" vlink="{T_BODY_VLINK}"> +<table width="100%" height="100%" cellpadding="0" cellspacing="1" border="0" class="forumline"> +<!-- BEGIN shoutrow --> +<tr> + <td class="{shoutrow.ROW_CLASS}" width="100%" higth="100%"> +<span class="gensmall"> + {shoutrow.TIME}<br /> + <b>{shoutrow.USERNAME}:</b><br /> + {shoutrow.SHOUT}<br/></span> + </td> +</tr> +<!-- END shoutrow --> +</table> +</body> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mar...@us...> - 2006-06-20 21:53:43
|
Revision: 234 Author: markthedaemon Date: 2006-06-20 14:53:35 -0700 (Tue, 20 Jun 2006) ViewCVS: http://svn.sourceforge.net/phpbbreloaded/?rev=234&view=rev Log Message: ----------- Added Paths: ----------- phpBB Reloaded 2/templates/subC1/shoutbox_body.tpl Added: phpBB Reloaded 2/templates/subC1/shoutbox_body.tpl =================================================================== --- phpBB Reloaded 2/templates/subC1/shoutbox_body.tpl (rev 0) +++ phpBB Reloaded 2/templates/subC1/shoutbox_body.tpl 2006-06-20 21:53:35 UTC (rev 234) @@ -0,0 +1,44 @@ +<HEAD> +<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" /> +<link rel="stylesheet" href="{T_URL}/{T_HEAD_STYLESHEET}" type="text/css"> +</HEAD> + +<body bgcolor="{T_TR_COLOR3}" text="{T_BODY_TEXT}" link="{T_BODY_LINK}" vlink="{T_BODY_VLINK}"> +<script language="JavaScript" src="{T_URL}/bbcode.js" type="text/javascript" ></script> +<form method="post" name="post" action="{U_SHOUTBOX}" onsubmit="return checkForm(this)"> +{ERROR_BOX} +<table width="100%" height="26" cellpadding="0" cellspacing="0" border="0" class="row1"> +<tr> + <td class="row1" align="center" valign="middle" width="100%"> + <center><span class="gensmall"> + <!-- BEGIN switch_auth_post --> + <!-- BEGIN switch_bbcode --> + <input type="button" class="button" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onClick="bbstyle(0)" /> + <input type="button" class="button" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onClick="bbstyle(2)" /> + <input type="button" class="button" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onClick="bbstyle(4)" /> + <input type="button" class="button" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onClick="bbstyle(6)" /> + <span class="nav"><a href="{U_MORE_SMILIES}" onclick="window.open('{U_MORE_SMILIES}', '_phpbbsmilies', 'HEIGHT=300,resizable=yes,scrollbars=yes,WIDTH=250');return false;" target="_phpbbsmilies" class="nav">{L_SMILIES}</a></span> + <!-- END switch_bbcode --> + +{L_SHOUT_TEXT}: +<input type="text" class="liteoption" name="message" value="{MESSAGE}" size="60%" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);"/> + + <input type="submit" class="mainoption" value="{L_SHOUT_SUBMIT}" name="shout" /> + + <!-- END switch_auth_post --> + <!-- BEGIN switch_auth_no_post --> + {L_SHOUTBOX_LOGIN} + <!-- END switch_auth_no_post --> + <input type="submit" class="liteoption" value="{L_SHOUT_REFRESH}" name="refresh" /></center><br/> + </span> + <center> + </td> + +</tr> +</table> + <iframe src="{U_SHOUTBOX_VIEW}" align="left" width="100%" height="145" frameborder="0" marginheight="0" marginwidth="0" allowtransparency="true"> + </iframe> + + +</form> +</body> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mar...@us...> - 2006-06-20 21:52:34
|
Revision: 233 Author: markthedaemon Date: 2006-06-20 14:52:29 -0700 (Tue, 20 Jun 2006) ViewCVS: http://svn.sourceforge.net/phpbbreloaded/?rev=233&view=rev Log Message: ----------- oops Modified Paths: -------------- phpBB Reloaded 2/install/schemas/mysql_basic.sql Modified: phpBB Reloaded 2/install/schemas/mysql_basic.sql =================================================================== --- phpBB Reloaded 2/install/schemas/mysql_basic.sql 2006-06-20 21:42:08 UTC (rev 232) +++ phpBB Reloaded 2/install/schemas/mysql_basic.sql 2006-06-20 21:52:29 UTC (rev 233) @@ -873,8 +873,7 @@ -- Dumping data for table phpbb_themes -- -INSERT INTO phpbb_themes VALUES (2, 'ptifo', 'ptifo', '', '', 'ptifo.css', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 0, 0, 0, '444444', '006600', 'FFA34F', '', '', '', 0, 0, '', '', 'FF0000', '00FF00', '0000FF', '006600', 'CC0000'); -INSERT INTO phpbb_themes VALUES (1, 'subSilver', 'subSilver', '', '', 'subSilver.css', '', 'E5E5E5', '000000', '006699', '5493B4', '', 'DD6900', 'EFEFEF', 'DEE3E7', 'D1D7DC', '', '', '', '98AAB1', '006699', 'FFFFFF', 'cellpic1.gif', 'cellpic3.gif', 'cellpic2.jpg', 'FAFAFA', 'FFFFFF', '', 'row1', 'row2', '', 'Verdana, Arial, Helvetica, sans-serif', 'Trebuchet MS', 'Courier, ''Courier New'', sans-serif', 10, 11, 12, '444444', '006600', 'FFA34F', '', '', '', 0, 0, '', '', 'FF0000', '00FF00', '0000FF', '006600', 'CC0000'); +INSERT INTO `phpbb_themes` VALUES (1, 'subC1', 'subC1', '', '', 'subC1.css', '/back.gif', 'E5E5E5', '000000', '535352', '9B0F0D', '', 'C71411', 'D7D7D6', 'C1C1BF', 'B6B5B2', '', '', '', 'C71411', 'C71411', 'FFFFFF', 'cellpic1.gif', 'cellpic3.gif', 'cellpic2.jpg', 'FAFAFA', 'FFFFFF', '', 'row1', 'row2', '', 'Verdana, Arial, Helvetica, sans-serif', 'Trebuchet MS', 'Courier, ''Courier New'', sans-serif', 10, 11, 12, '444444', '006600', 'FFFFFF', '', '', '', 0, 0, '', '', '', '', '', '', ''); -- -- Dumping data for table phpbb_themes_name This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mar...@us...> - 2006-06-20 21:42:16
|
Revision: 232 Author: markthedaemon Date: 2006-06-20 14:42:08 -0700 (Tue, 20 Jun 2006) ViewCVS: http://svn.sourceforge.net/phpbbreloaded/?rev=232&view=rev Log Message: ----------- seeing the new installer thats currently in development won't be around for quite a while i've decided to improve the current one :D Modified Paths: -------------- phpBB Reloaded 2/install/cookie.php phpBB Reloaded 2/install/install.php Removed Paths: ------------- phpBB Reloaded 2/install/upgrade.php phpBB Reloaded 2/toolkit.php Modified: phpBB Reloaded 2/install/cookie.php =================================================================== --- phpBB Reloaded 2/install/cookie.php 2006-06-20 16:31:38 UTC (rev 231) +++ phpBB Reloaded 2/install/cookie.php 2006-06-20 21:42:08 UTC (rev 232) @@ -362,12 +362,12 @@ <tr><td colspan=2> <table width="99%" cellpadding="4" cellspacing="1" border="0" align="center" class="forumline"> <tr> - <th class="thHead">Step 2 Complete</th> + <th class="thHead">Installation Complete!</th> </tr> <tr> <td class="row1"> <span class="gen"></span><br /> - <span class="gen"><strong><font color="red"><a href="./../toolkit.php">Proceed to next (and final) part of installation!</a></font></strong></span><br /> + <span class="gen"><strong><font color="red"><a href="./../login.php">Delete the whole /install directory. When you have done this login!</a></font></strong></span><br /> </td> </tr> </td></tr> Modified: phpBB Reloaded 2/install/install.php =================================================================== --- phpBB Reloaded 2/install/install.php 2006-06-20 16:31:38 UTC (rev 231) +++ phpBB Reloaded 2/install/install.php 2006-06-20 21:42:08 UTC (rev 232) @@ -40,16 +40,16 @@ <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $lang['ENCODING']; ?>"> <meta http-equiv="Content-Style-Type" content="text/css"> <title><?php echo $lang['Welcome_install'];?></title> -<link rel="stylesheet" href="../templates/subSilver/subSilver.css" type="text/css"> +<link rel="stylesheet" href="../templates/subC1/subC1.css" type="text/css"> <style type="text/css"> <!-- -th { background-image: url('../templates/subSilver/images/cellpic3.gif') } -td.cat { background-image: url('../templates/subSilver/images/cellpic1.gif') } -td.rowpic { background-image: url('../templates/subSilver/images/cellpic2.jpg'); background-repeat: repeat-y } -td.catHead,td.catSides,td.catLeft,td.catRight,td.catBottom { background-image: url('../templates/subSilver/images/cellpic1.gif') } +th { background-image: url('../templates/subC1/images/cellpic3.gif') } +td.cat { background-image: url('../templates/subC1/images/cellpic1.gif') } +td.rowpic { background-image: url('../templates/subC1/images/cellpic2.jpg'); background-repeat: repeat-y } +td.catHead,td.catSides,td.catLeft,td.catRight,td.catBottom { background-image: url('../templates/subC1/images/cellpic1.gif') } /* Import the fancy styles for IE only (NS4.x doesn't use the @import function) */ -@import url("../templates/subSilver/formIE.css"); +@import url("../templates/subC1/formIE.css"); //--> </style> </head> @@ -61,8 +61,7 @@ <tr> <td><table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> - <td><img src="../templates/subSilver/images/logo_phpBB.gif" border="0" alt="Forum Home" vspace="1" /></td> - <td align="center" width="100%" valign="middle"><span class="maintitle"><?php echo $lang['Welcome_install'];?></span></td> + <td align="center"><img src="../templates/subC1/images/logo_phpBB.gif" border="0" alt="Forum Home" vspace="1" /></td> </tr> </table></td> </tr> Deleted: phpBB Reloaded 2/install/upgrade.php =================================================================== --- phpBB Reloaded 2/install/upgrade.php 2006-06-20 16:31:38 UTC (rev 231) +++ phpBB Reloaded 2/install/upgrade.php 2006-06-20 21:42:08 UTC (rev 232) @@ -1,281 +0,0 @@ -CREATE TABLE phpbb_attach_quota ( - user_id mediumint(8) unsigned NOT NULL default '0', - group_id mediumint(8) unsigned NOT NULL default '0', - quota_type smallint(2) NOT NULL default '0', - quota_limit_id mediumint(8) unsigned NOT NULL default '0', - KEY quota_type (quota_type) -) TYPE=MyISAM - -CREATE TABLE phpbb_attachments ( - attach_id mediumint(8) unsigned NOT NULL default '0', - post_id mediumint(8) unsigned NOT NULL default '0', - privmsgs_id mediumint(8) unsigned NOT NULL default '0', - user_id_1 mediumint(8) NOT NULL default '0', - user_id_2 mediumint(8) NOT NULL default '0', - KEY attach_id_post_id (attach_id,post_id), - KEY attach_id_privmsgs_id (attach_id,privmsgs_id), - KEY post_id (post_id), - KEY privmsgs_id (privmsgs_id) -) TYPE=MyISAM - -CREATE TABLE phpbb_attachments_config ( - config_name varchar(255) NOT NULL default '', - config_value varchar(255) NOT NULL default '', - PRIMARY KEY (config_name) -) TYPE=MyISAM - -CREATE TABLE phpbb_attachments_desc ( - attach_id mediumint(8) unsigned NOT NULL auto_increment, - physical_filename varchar(255) NOT NULL default '', - real_filename varchar(255) NOT NULL default '', - download_count mediumint(8) unsigned NOT NULL default '0', - comment varchar(255) default NULL, - extension varchar(100) default NULL, - mimetype varchar(100) default NULL, - filesize int(20) NOT NULL default '0', - filetime int(11) NOT NULL default '0', - thumbnail tinyint(1) NOT NULL default '0', - PRIMARY KEY (attach_id), - KEY filetime (filetime), - KEY physical_filename (physical_filename(10)), - KEY filesize (filesize) -) TYPE=MyISAM -CREATE TABLE phpbb_auths_def ( - auth_id smallint(5) unsigned NOT NULL auto_increment, - auth_type char(1) binary NOT NULL default '', - auth_name varchar(50) NOT NULL default '', - auth_desc varchar(255) NOT NULL default '', - auth_title tinyint(1) NOT NULL default '0', - auth_order mediumint(8) unsigned NOT NULL default '0', - PRIMARY KEY (auth_id) -) TYPE=MyISAM - -CREATE TABLE phpbb_banlist ( - ban_id mediumint(8) UNSIGNED NOT NULL auto_increment, - ban_userid mediumint(8) NOT NULL, - ban_ip char(8) NOT NULL, - ban_email varchar(255), - PRIMARY KEY (ban_id), - KEY ban_ip_user_id (ban_ip, ban_userid) -) - -CREATE TABLE phpbb_cp_fields ( - field_id mediumint(8) unsigned NOT NULL auto_increment, - field_name varchar(50) NOT NULL default '', - panel_id mediumint(8) unsigned NOT NULL default '0', - field_order mediumint(8) unsigned NOT NULL default '0', - field_attr text NOT NULL, - PRIMARY KEY (field_id), - KEY panel_id (panel_id,field_name) -) TYPE=MyISAM - -CREATE TABLE phpbb_cp_patches ( - patch_id mediumint(8) unsigned NOT NULL auto_increment, - patch_file varchar(255) NOT NULL default '', - patch_time int(11) NOT NULL default '0', - patch_version varchar(25) NOT NULL default '', - patch_date varchar(8) NOT NULL default '', - patch_ref varchar(255) NOT NULL default '', - patch_author varchar(255) NOT NULL default '', - PRIMARY KEY (patch_id) -) TYPE=MyISAM - -CREATE TABLE phpbb_draft_prune ( - prune_id tinyint(1) unsigned NOT NULL default '1', - prune_days smallint(5) unsigned NOT NULL default '0', - prune_freq smallint(5) unsigned NOT NULL default '0', - prune_next int(11) unsigned NOT NULL default '0', - prune_enable tinyint(1) unsigned NOT NULL default '0' -) TYPE=MyISAM - -CREATE TABLE phpbb_extension_groups ( - group_id mediumint(8) NOT NULL auto_increment, - group_name varchar(20) NOT NULL default '', - cat_id tinyint(2) NOT NULL default '0', - allow_group tinyint(1) NOT NULL default '0', - download_mode tinyint(1) unsigned NOT NULL default '1', - upload_icon varchar(100) default '', - max_filesize int(20) NOT NULL default '0', - forum_permissions varchar(255) NOT NULL default '', - PRIMARY KEY (group_id) -) TYPE=MyISAM - -CREATE TABLE phpbb_extensions ( - ext_id mediumint(8) unsigned NOT NULL auto_increment, - group_id mediumint(8) unsigned NOT NULL default '0', - extension varchar(100) NOT NULL default '', - comment varchar(100) default NULL, - PRIMARY KEY (ext_id) -) TYPE=MyISAM - -CREATE TABLE phpbb_forbidden_extensions ( - ext_id mediumint(8) unsigned NOT NULL auto_increment, - extension varchar(100) NOT NULL default '', - PRIMARY KEY (ext_id) -) TYPE=MyISAM - -ALTER TABLE phpbb_forums ADD( -auth_global_announce tinyint(2) NOT NULL default '0', - forum_last_title varchar(255) default NULL, - forum_last_poster mediumint(8) NOT NULL default '0', - forum_last_username varchar(25) default NULL, - forum_last_time int(11) NOT NULL default '0', - forum_link varchar(255) default NULL, - forum_link_hit_count tinyint(1) NOT NULL default '0', - forum_link_hit bigint(20) unsigned NOT NULL default '0', - forum_link_start int(11) NOT NULL default '0', - forum_style tinyint(4) NOT NULL default '0', - forum_nav_icon varchar(255) default NULL, - forum_icon varchar(255) default NULL, - forum_topics_ppage tinyint(2) NOT NULL default '0', - forum_topics_sort varchar(25) default NULL, - forum_topics_order varchar(4) default NULL, - forum_index_pack tinyint(1) NOT NULL default '0', - forum_index_split tinyint(1) NOT NULL default '0', - forum_board_box tinyint(1) NOT NULL default '0', - forum_subs_hidden tinyint(1) NOT NULL default '0', - auth_download tinyint(2) NOT NULL default '0', - forum_qpes tinyint(1) NOT NULL default '1', -) - -CREATE TABLE phpbb_groups ( - group_id mediumint(8) NOT NULL auto_increment, - group_type tinyint(4) NOT NULL default '1', - group_name varchar(40) NOT NULL default '', - group_description varchar(255) NOT NULL default '', - group_moderator mediumint(8) NOT NULL default '0', - group_single_user tinyint(1) NOT NULL default '1', - group_status tinyint(2) NOT NULL default '0', - group_user_id mediumint(8) NOT NULL default '0', - group_user_list text NOT NULL, - group_weight mediumint(3) NOT NULL default '0', - group_legend smallint(1) NOT NULL default '0', - group_color smallint(1) NOT NULL default '0', - group_dl_auto_traffic bigint(20) NOT NULL default '0', - PRIMARY KEY (group_id), - KEY group_single_user (group_single_user), - KEY group_user_id (group_user_id) -) TYPE=MyISAM - -CREATE TABLE phpbb_icons ( - icon_id mediumint(3) NOT NULL auto_increment, - icon_name varchar(50) NOT NULL default '', - icon_url varchar(255) NOT NULL default '', - icon_auth varchar(50) NOT NULL default '', - icon_types varchar(255) default NULL, - icon_order mediumint(8) unsigned NOT NULL default '0', - PRIMARY KEY (icon_id) -) TYPE=MyISAM - - -ALTER TABLE phpbb_posts ADD( - post_icon smallint(3) unsigned NOT NULL default '0', - post_attachment tinyint(1) NOT NULL default '0', - post_draft smallint(1) unsigned NOT NULL default '0', - KEY post_icon (post_icon) -) - -ALTER TABLE phpbb_posts_text ADD( - post_sub_title varchar(255) default NULL, -) - -CREATE TABLE phpbb_presets ( - preset_id mediumint(5) unsigned NOT NULL auto_increment, - preset_type varchar(5) NOT NULL default '', - preset_name varchar(50) NOT NULL default '', - PRIMARY KEY (preset_id) -) TYPE=MyISAM - -CREATE TABLE phpbb_presets_data ( - preset_id mediumint(5) unsigned NOT NULL default '0', - preset_auth varchar(50) NOT NULL default '', - preset_value tinyint(1) default NULL, - PRIMARY KEY (preset_id,preset_auth) -) TYPE=MyISAM - - -ALTER TABLE phpbb_privmsgs ADD( - privmsgs_attachment tinyint(1) NOT NULL default '0', -) - -CREATE TABLE phpbb_quota_limits ( - quota_limit_id mediumint(8) unsigned NOT NULL auto_increment, - quota_desc varchar(20) NOT NULL default '', - quota_limit bigint(20) unsigned NOT NULL default '0', - PRIMARY KEY (quota_limit_id) -) TYPE=MyISAM - -ALTER TABLE phpbb_themes ADD( - session_time varchar(6) NOT NULL default '', - g0 varchar(6) NOT NULL default '', - g3 varchar(6) NOT NULL default '', - g4 varchar(6) NOT NULL default '', - g5 varchar(6) NOT NULL default '', - g7 varchar(6) NOT NULL default '', - g8 varchar(6) NOT NULL default '', -) - -ALTER TABLE phpbb_topics ADD( - topic_sub_type mediumint(5) NOT NULL default '0', - topic_sub_title varchar(255) default NULL, - topic_first_username varchar(25) default NULL, - topic_last_poster mediumint(8) NOT NULL default '0', - topic_last_username varchar(25) default NULL, - topic_last_time int(11) NOT NULL default '0', - topic_icon smallint(3) unsigned NOT NULL default '0', - topic_duration int(11) NOT NULL default '0', - topic_calendar_time int(11) default NULL, - topic_calendar_duration int(11) default NULL, - topic_attachment tinyint(1) NOT NULL default '0', - KEY topic_last_time (topic_last_time), - KEY topic_calendar_time (topic_calendar_time) -) - -CREATE TABLE phpbb_topics_attr ( - attr_id mediumint(5) unsigned NOT NULL auto_increment, - attr_name varchar(50) NOT NULL default '', - attr_fname varchar(50) default NULL, - attr_fimg varchar(50) default NULL, - attr_tname varchar(50) default NULL, - attr_timg varchar(50) default NULL, - attr_order mediumint(8) NOT NULL default '0', - attr_field varchar(50) default NULL, - attr_cond char(2) default NULL, - attr_value smallint(3) NOT NULL default '0', - attr_auth varchar(50) default NULL, - PRIMARY KEY (attr_id) -) - - -CREATE TABLE phpbb_users ( - user_unread_date int(11) NOT NULL default '0', - user_unread_topics text, - user_keep_unreads tinyint(1) NOT NULL default '0', - user_topics_sort varchar(25) NOT NULL default '', - user_topics_order varchar(4) NOT NULL default '', - user_smart_date tinyint(1) NOT NULL default '0', - user_dst tinyint(1) NOT NULL default '0', - user_board_box tinyint(1) NOT NULL default '0', - user_index_pack tinyint(1) NOT NULL default '0', - user_index_split tinyint(1) NOT NULL default '0', - user_session_logged tinyint(1) NOT NULL default '0', - user_group_id mediumint(8) NOT NULL default '5', - user_qp_settings varchar(25) NOT NULL default '0', -) - - -CREATE TABLE phpbb_users_cache ( - user_id mediumint(8) NOT NULL default '0', - cache_id varchar(5) NOT NULL default '', - cache_data longtext, - cache_time int(11) default '0', - PRIMARY KEY (user_id,cache_id) -) TYPE=MyISAM - -ALTER TABLE phpbb_vote_desc ADD( - vote_option_id tinyint(4) unsigned NOT NULL default '0', - vote_option_text varchar(255) NOT NULL default '', - vote_result int(11) NOT NULL default '0', - KEY vote_option_id (vote_option_id), - KEY vote_id (vote_id) -) \ No newline at end of file Deleted: phpBB Reloaded 2/toolkit.php =================================================================== --- phpBB Reloaded 2/toolkit.php 2006-06-20 16:31:38 UTC (rev 231) +++ phpBB Reloaded 2/toolkit.php 2006-06-20 21:42:08 UTC (rev 232) @@ -1,9413 +0,0 @@ -<?php - -// PHPBB Admin ToolKit, v2.1 - Starfoxtj (sta...@ya...) -// Copyright 2005 - Starfoxtj -// This script is NOT released under the GPL: - - - -/***************************************************************************************************** - - -By using this script you agree to the following: - - -1. You may modify any portion of this script for personal/business use. This includes changing the - look, style, messages, functions, behavior etc. Note that any modifications outside of the standard - configuration options may negatively affect the security of this script if the modification is not - written properly and securely. - Note: If the script has been modified, I ask that you at least retain the toolkit name, and - my name (Starfoxtj), as a link to: http://starfoxtj.no-ip.com/phpbb/uploadtoolkit on the header - or footer of every page. You are not required to list this information, but by removing it you may - be forfeiting your support for this product. (Similar to the phpbb copyright agreement) -2. Ownership of this script remains with Starfoxtj regardless of how this script was acquired. -3. You may NOT sell any portion of this script, even if it is contained within another package - without prior consent from Starfoxtj. -4. You may NOT hold Starfoxtj liable for any direct or indirect consequences of using this script. - Many hours have been spent ensuring that this script is as secure as possible. However nothing - can be 100% guaranteed. - If a security hole has been found, please contact me immediately at: sta...@ya... - - -5. You MAY distribute this script stand alone, or with another package without any prior permission - at no charge. You may NOT however, distribute this script if any modifications have been made - without the consent of Starfoxtj. Meaning, only the unmodified original may be freely distributed - (at no charge). - - I personally recommended you only download this script from: - http://starfoxtj.no-ip.com/phpbb/toolkit - - If the script was downloaded form another location, it IS possible that it may have been altered. - - -******************************************************************************************************/ - - -// You may set a password here if you would rather not use the toolkit_config.php - -$use_toolkit_config_file = 'yes'; // Change this to 'No' to set the password in the toolkit.php itself like in previous releases -$use_hashed_in_file_passwords = 'no'; // Change this if you want to use hashed admin/mod passwords specified in the toolkit (the toolkit_config.php file will use hashed passwords regardless) -$adminpassword = 'ENTER_ADMIN_PASSWORD_HERE'; // Note: I HIGHLY recommend using a password at least 16 characters long! -$modpassword = 'ENTER_MOD_PASSWORD_HERE'; // Leave blank to disable mod login - - -// Option 1: Allow Mods to Ban/UnBan Users? -$modban = 'yes'; // 'yes' : 'no' - - -// Option 2: Allow Mods to Change User Post Count? -$modpost = 'no'; // 'yes' : 'no' - - -// Option 3: Allow Mods to Change User Ranks? -$modrank = 'yes'; // 'yes' : 'no' - - -// Option 4: Allow Mods to Delete Users? -$moddelete = 'no'; // 'yes' : 'no' - - -// Option 5: Update check URLs -// Note: To disable checking for updates for phpbb, set the phpbb URL to 'none' -// Note: To disable checking for updates for this toolkit, set the toolkit URL to 'none' -// The default phpbb url is: http://www.phpbb.com/updatecheck/20x.txt -// The default toolkit url is: http://starfoxtj.no-ip.com/phpBB/toolkit/updatecheck/2.x.txt -$update_url['phpbb'] = 'http://www.phpbbreloaded.com/versionchecker/20x.txt'; -$update_url['toolkit'] = 'http://starfoxtj.no-ip.com/phpBB/toolkit/updatecheck/2.x.txt'; - - - - - -// Lets begin the coding! -// -// (CHANGE INFORMATION AFTER THIS LINE WITH CAUTION!) -// -// -// - - - - -session_start(); - -$_SESSION['toolkitversion'] = '2.1'; -$_SESSION['toolkit_title'] = '<b><a href="index.php"><font size="5" color="#000000">PHPBB Admin ToolKit '.$_SESSION['toolkitversion'].'</b></font></a><font size="5"> - <a href="http://starfoxtj.no-ip.com/phpbb/toolkit" target="_blank">Starfoxtj</a></font>'; -$_SESSION['toolkit_title_nversion'] = '<b><a href="index.php"><font size="5" color="#000000">PHPBB Admin ToolKit</b></font></a><font size="5"> - <a href="http://starfoxtj.no-ip.com/phpbb/toolkit" target="_blank">Starfoxtj</a></font>'; -$_SESSION['copyrightfooter'] = '<br /><center><hr width="90%"><font size="2">PHPBB Admin ToolKit '.$_SESSION['toolkitversion'].' \xA9 2006 - <a href="mailto:sta...@ya...">Starfoxtj</a></font></center>'; - - - -// Set global information and start db access - -if( file_exists( 'config.php' ) ) - - { - - include( 'config.php' ); - - if( $dbms == 'mysql' || $dbms == 'mysql4' ) - - { - - $db = @mysql_connect("$dbhost", "$dbuser", "$dbpasswd") - or die( 'Could not connect to database: '.mysql_error() ); - - @mysql_select_db($dbname) - or die( 'Could not select database: '.mysql_error() ); - - } - - else - - { - - die( 'This toolkit is only compatible with MySQL databases.' ); - - } - } - - -// Define Some Variables - -$index = $_SERVER['PHP_SELF']; -$domain = $_SERVER['SERVER_NAME']; -$full_domain = 'http://'.$domain; - -if( file_exists( 'config.php' ) ) - - { - - $phpbb_auth_access = $table_prefix."auth_access"; - $phpbb_config = $table_prefix."config"; - $phpbb_banlist = $table_prefix."banlist"; - $phpbb_users = $table_prefix."users"; - $phpbb_ranks = $table_prefix."ranks"; - $phpbb_vote_voters = $table_prefix."vote_voters"; - $phpbb_user_group = $table_prefix."user_group"; - $phpbb_groups = $table_prefix."groups"; - $phpbb_posts = $table_prefix."posts"; - $phpbb_posts_text = $table_prefix."posts_text"; - $phpbb_topics = $table_prefix."topics"; - $phpbb_forums = $table_prefix."forums"; - $phpbb_themes = $table_prefix."themes"; - $phpbb_themes_name = $table_prefix."themes_name"; - $phpbb_sessions = $table_prefix."sessions"; - $phpbb_sessions_keys = $table_prefix."sessions_keys"; - $phpbb_topics_watch = $table_prefix."topics_watch"; - $phpbb_privmsgs = $table_prefix."privmsgs"; - $phpbb_privmsgs_text = $table_prefix."privmsgs_text"; - - $phpbb_version_result = mysql_query("SELECT * FROM $phpbb_config WHERE config_name='version'") - or die( 'MySQL Error: '.mysql_error() ); - $myrow_phpbb_version = mysql_fetch_array($phpbb_version_result); - $phpbb_version = $myrow_phpbb_version['config_value']; - - } - -$script_folder = substr( $index, 1, -(strlen( end( explode( '/', $index ) ) ) + 1 ) ); - - -// Set the errors to only display one of each error - -if( isset( $_SESSION['errors']['index'] ) ) - - { - - $_SESSION['errors']['index'] = array_unique( $_SESSION['errors']['index'] ); - - } - -if( isset( $_SESSION['errors']['edituser'] ) ) - - { - - $_SESSION['errors']['edituser'] = array_unique( $_SESSION['errors']['edituser'] ); - - } - -if( isset( $_SESSION['errors']['config'] ) ) - - { - - $_SESSION['errors']['config'] = array_unique( $_SESSION['errors']['config'] ); - - } - - - -///////////////////////////////////////// -// -// Check and Create config.php -// - -if( !file_exists( 'config.php' ) ) - - { //-.2-a - - - if( isset( $_POST['configphp_setup'] ) ) - - { //-.1-a.1 - - - if( $_POST['dbhost'] == '' || - $_POST['dbuser'] == '' || - $_POST['dbpasswd'] == '' || - $_POST['dbname'] == '' ) - - { - - $_SESSION['configphp_error'] = '<b>Error:</b> All fields must be filled in.'; - header( "Location: $index" ); - die(); - - } - - @chmod( "../$script_folder", 0777 ) - or die( "Could not CHMOD $script_folder folder to create config.php!<br /> - You can either change the CHMOD settings manually to 777, or create the config.php file by copying the following information - into notepad and specifying the database settings. Then save it as \"config.php\" and upload it to your $script_folder folder.<br /><br /> - Note: This assumes you are using MySQL4, if you are using MySQL3, replace \"mysql4\" with \"mysql\".<br /><br /> - - <table border=\"0\" width=\"400\" cellpadding=\"5\"; style=\"border-top: black 1px solid; border-right: black 1px solid; border-left: black 1px solid; border-bottom: black 1px solid\" bgcolor=\"#f5f5f5\"> - <tr> - - <td> - <b><?php<br /><br /> - - // phpBB 2.x auto-generated config file<br /> - // Do not change anything in this file!<br /><br /> - - \$dbms = 'mysql4';<br /><br /> - - \$dbhost = '<font color=\"#ff0000\">Your Host</font>';<br /> - \$dbname = '<font color=\"#ff0000\">Your Database Name</font>';<br /> - \$dbuser = '<font color=\"#ff0000\">Your Username</font>';<br /> - \$dbpasswd = '<font color=\"#ff0000\">Your Password</font>';<br /><br /> - - \$table_prefix = 'phpbb_';<br /><br /> - - define('PHPBB_INSTALLED', true);<br /><br /> - - ?></b> - - </td> - - </tr> - </table>" ); - - - @touch( 'config.php' ) - or die( "Could not create config.php!<br /> - You can either change the CHMOD settings manually to 777, or create the config.php file by copying the following information - into notepad and specifying the database settings. Then save it as \"config.php\" and upload it to your $script_folder folder.<br /><br /> - Note: This assumes you are using MySQL4, if you are using MySQL3, replace \"mysql4\" with \"mysql\".<br /><br /> - - <table border=\"0\" width=\"400\" cellpadding=\"5\"; style=\"border-top: black 1px solid; border-right: black 1px solid; border-left: black 1px solid; border-bottom: black 1px solid\" bgcolor=\"#f5f5f5\"> - <tr> - - <td> - <b><?php<br /><br /> - - // phpBB 2.x auto-generated config file<br /> - // Do not change anything in this file!<br /><br /> - - \$dbms = 'mysql4';<br /><br /> - - \$dbhost = '<font color=\"#ff0000\">Your Host</font>';<br /> - \$dbname = '<font color=\"#ff0000\">Your Database Name</font>';<br /> - \$dbuser = '<font color=\"#ff0000\">Your Username</font>';<br /> - \$dbpasswd = '<font color=\"#ff0000\">Your Password</font>';<br /><br /> - - \$table_prefix = 'phpbb_';<br /><br /> - - define('PHPBB_INSTALLED', true);<br /><br /> - - ?></b> - - </td> - - </tr> - </table>" ); - - - - - - $fp = fopen( 'config.php', "w" ) - or die ("The file config.php exists but could not be opened. Check the file permissions." ); - - $dbms = $_POST['dbms']; - $dbhost = $_POST['dbhost']; - $dbuser = $_POST['dbuser']; - $dbpasswd = $_POST['dbpasswd']; - $dbname = $_POST['dbname']; - $table_prefix = $_POST['table_prefix']; - - fwrite( $fp, "<?php - - -// phpBB 2.x auto-generated config file -// Do not change anything in this file! - -\$dbms = '$dbms'; - -\$dbhost = '$dbhost'; -\$dbname = '$dbname'; -\$dbuser = '$dbuser'; -\$dbpasswd = '$dbpasswd'; - -\$table_prefix = '$table_prefix'; - -define('PHPBB_INSTALLED', true); - -?>" ); - - fclose( $fp ); - - chmod( "../$script_folder", 0755 ); - - header( "Location: $index" ); - die(); - - - - } //-.1-a.1 - - else - - { //-.1-a.2 - - - session_destroy(); - - ?> - - <html> - <head> - <title>PHPBB Admin ToolKit v<?php echo $_SESSION['toolkitversion']; ?></title> - - <SCRIPT LANGUAGE="JavaScript"> - function placeFocus() { - if (document.forms.length > 0) { - var field = document.forms[0]; - for (i = 1; i < field.length; i++) { - if ((field.elements[i].name == "dbhost") || (field.elements[i].type == "textarea") || (field.elements[i].type.toString().charAt(0) == "s")) { - document.forms[0].elements[i].focus(); - break; - } - } - } - } - </script> - - </head> - - <body link="#0000ff" vlink="#0000ff" alink="#0000ff" OnLoad="placeFocus()"> - - <center> - <table border="0" bgcolor="#ffffff" cellspacing="1" cellpadding="3"> - <tr><td><div align="center"><?php echo $_SESSION['toolkit_title']; ?></div></td></tr> - </table><br /> - </center> - - <center> - - <font size="4">PHPBB Admin ToolKit: Create Config.php file</font> - <br /><br /> - - Config.php file not found! You may create a new one by entering in the information below:<br /><br /> - - <table border="0" bgcolor="#ffffff" cellspacing="1" cellpadding="3"> - <tr> - - <td> - - <form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="POST"> - - <table border="0" cellpadding="5" cellspacing="0"> - - <tr> - - <td> - - Database Type: - - </td> - - <td> - - <select name="dbms"> - <option value="mysql">MySQL 3.x</option> - <option value="mysql4" selected>MySQL 4.x</option> - <option value="postgres">PostgreSQL 7.x</option> - <option value="mssql">MS SQL Server 7/2000</option> - <option value="msaccess">MS Access [ ODBC ]</option> - <option value="mssql-odbc">MS SQL Server [ ODBC ]</option></select> - </td> - - </tr> - - <tr> - - <td> - - Host: - - </td> - - <td> - - <input type="text" name="dbhost" lengh="20" size="20" maxlengh="255"> - - </td> - - </tr> - - <tr> - - <td> - - Username: - - </td> - - <td> - - <input type="text" name="dbuser" lengh="20" size="20" maxlengh="255"> - - </td> - - </tr> - - <tr> - - <td> - - Password: - - </td> - - <td> - - <input type="password" name="dbpasswd" lengh="20" size="20" maxlengh="255"> - - </td> - - </tr> - - <tr> - - <td> - - Database: - - </td> - - <td> - - <input type="text" name="dbname" lengh="20" size="20" maxlengh="255"> - - </td> - - </tr> - - <tr> - - <td> - - Table Prefix: - - </td> - - <td> - - <input type="text" name="table_prefix" value="phpbb_" lengh="20" size="20" maxlengh="255"> - - </td> - - </tr> - - <tr> - - <td colspan="2" align="center"> - - <input type="hidden" name="configphp_setup" value="1" /> - - <br /><input TYPE="submit" VALUE="Create Config.php"> - - </td> - - </tr> - - </table> - - </form> - - </td> - - </tr> - </table> - </center> - - - <?php - - if( isset( $_SESSION['configphp_error'] ) ) - - { - - ?> - - <center> - <table border="0" bgcolor="#ffffff" cellspacing="1" cellpadding="3"> - <tr> - - <td> - - <br /><br /><?php echo $_SESSION['configphp_error']; ?> - - </td> - - </tr> - - </table> - - - <?php - - } - - ?> - - </body> - </html> - - - - <?php - - - } //-.1-a.2 - - die(); - - - } //-.2-a - - - -///////////////////////////////////////// -// -// Check and set fist time password -// - -if( !file_exists( 'toolkit_config.php' ) && $use_toolkit_config_file == 'yes' ) - - { //-.1-a - - - if( isset( $_POST['toolkitconfig_setup'] ) ) - - { //-.1-a.1 - - - if( !isset( $_POST['admin_password'] ) || !isset( $_POST['admin_password_confirm'] ) ) - - { - - $_SESSION['toolkitconfig_error'] = '<b>Error:</b> Either the admin password was not specified, or the passwords did not match.'; - header( "Location: $index" ); - die(); - - } - - elseif( $_POST['admin_password'] == '' || $_POST['admin_password_confirm'] == '' ) - - { - - $_SESSION['toolkitconfig_error'] = '<b>Error:</b> Either the admin password was not specified, or the passwords did not match.'; - header( "Location: $index" ); - die(); - - } - - elseif( $_POST['admin_password'] != $_POST['admin_password_confirm'] ) - - { - - $_SESSION['toolkitconfig_error'] = '<b>Error:</b> The admin passwords do not match.'; - header( "Location: $index" ); - die(); - - } - - - if( $_POST['mod_password'] != $_POST['mod_password_confirm'] ) - - { - - $_SESSION['toolkitconfig_error'] = '<b>Error:</b> The mod passwords do not match.'; - header( "Location: $index" ); - die(); - - } - - @chmod( "../$script_folder", 0777 ) - or die( "Could not CHMOD $script_folder to 777 to create toolkit_config.php!<br /> - 1: Extract the toolkit.php file and open it with notepad.<br /> - 2: Find \"\$use_toolkit_config_file\" on line 40.<br /> - 3: Change the 'yes' to 'no'.<br /> - 4: Replace both the admin and mod passwords on lines 41 and 42<br /> - 5: Upload toolkit.php to your $script_folder folder." ); - - - @touch( 'toolkit_config.php' ) - or die( "Could not create toolkit_config.php, access denied!<br /> - Please install this script using method 2:<br /><br /> - 1: Extract the toolkit.php file and open it with notepad.<br /> - 2: Find \"\$use_toolkit_config_file\" on line 40.<br /> - 3: Change the 'yes' to 'no'.<br /> - 4: Replace both the admin and mod passwords on lines 41 and 42<br /> - 5: Upload toolkit.php to your $script_folder folder." ); - - - - - $fp = fopen( 'toolkit_config.php', "w" ) - or die ("The file toolkit_config.php exists but could not be opened. Check the file permissions." ); - - $version = $_SESSION['toolkitversion']; - $adminpassword = md5( md5( $_POST['admin_password'] ) ); - $modpassword = md5( md5( $_POST['mod_password'] ) ); - - fwrite( $fp, "<?php - -//////////////////////////////////////////////////////////// -// -// PHPBB Admin ToolKit v$version auto-generated config file. -// -// You may change the passwords in this file. - -// Note: The passwords in this file are hashed for security. -// If you need to change your passwords, you can either use the MD5 Generator included -// near the bottom of the toolkit index. -// Or you can simply delete this toolkit_config.php file and run toolkit.php -// to recreate this file with the new passwords. -// -// NOTE: For security, the passwords for this toolkit have been DOUBLE hashed! -// Meaning, the password was hashed once using the md5() function, then the hash -// was hashed again using the md5() function. The code equivalent is: \$pass = md5( md5( 'password' ) ); -// Because the password is double hashed, it should be almost completely uncrackable as -// a brute force/dictionary attack would have to first crack a 32 character password, THEN -// crack the result yielding the original password. -// This way, even if someone got your toolkit.config.php file it would in theory -// take the most powerful home computer over 10 years to break. -// - - - -\$adminpassword = '$adminpassword'; -\$modpassword = '$modpassword'; - -?>" ); - - fclose( $fp ); - - chmod( "../$script_folder", 0755 ); - - header( "Location: $index" ); - die(); - - - - } //-.1-a.1 - - else - - { //-.1-a.2 - - - session_destroy(); - - ?> - - <html> - <head> - <title>PHPBB Admin ToolKit v<?php echo $_SESSION['toolkitversion']; ?></title> - - <SCRIPT LANGUAGE="JavaScript"> - function placeFocus() { - if (document.forms.length > 0) { - var field = document.forms[0]; - for (i = 0; i < field.length; i++) { - if ((field.elements[i].name == "admin_password") || (field.elements[i].type == "textarea") || (field.elements[i].type.toString().charAt(0) == "s")) { - document.forms[0].elements[i].focus(); - break; - } - } - } - } - </script> - - </head> - - <body link="#0000ff" vlink="#0000ff" alink="#0000ff" OnLoad="placeFocus()"> - - <center> - <table border="0" bgcolor="#ffffff" cellspacing="1" cellpadding="3"> - <tr><td><div align="center"><?php echo $_SESSION['toolkit_title']; ?></div></td></tr> - </table><br /> - </center> - - <center> - - <font size="4">PHPBB Admin ToolKit: First Time Setup</font><br /> - - <table border="0" bgcolor="#ffffff" cellspacing="1" cellpadding="3"> - <tr> - - <td> - - <form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="POST"> - - <table border="0" cellpadding="5" cellspacing="0"> - - <tr> - - <td> - - Specify Admin Password: - - </td> - - <td> - - <input type="password" name="admin_password" lengh="20" size="20" maxlengh="255"> - - </td> - - </tr> - - <tr> - - <td> - - Confirm Admin Password: - - </td> - - <td> - - <input type="password" name="admin_password_confirm" lengh="20" size="20" maxlengh="255"> - - </td> - - </tr> - - <tr> - - <td> - - <br />Specify ModPassword: - - </td> - - <td> - - <br /><input type="password" name="mod_password" lengh="20" size="20" maxlengh="255"> (Optional) - - </td> - - </tr> - - <tr> - - <td> - - Confirm Mod Password: - - </td> - - <td> - - <input type="password" name="mod_password_confirm" lengh="20" size="20" maxlengh="255"> (Optional) - - </td> - - </tr> - - <tr> - - <td colspan="2" align="center"> - - <input type="hidden" name="toolkitconfig_setup" value=1 /> - - <br /><input TYPE="submit" VALUE=" Enter "> - - </td> - - </tr> - - </table> - - </form> - - </td> - - </tr> - </table> - </center> - - - <?php - - if( isset( $_SESSION['toolkitconfig_error'] ) ) - - { - - ?> - - <center> - <table border="0" bgcolor="#ffffff" cellspacing="1" cellpadding="3"> - <tr> - - <td> - - <br /><br /><?php echo $_SESSION['toolkitconfig_error']; ?> - - </td> - - </tr> - - </table> - - - <?php - - } - - ?> - - </body> - </html> - - - - <?php - - - } //-.1-a.2 - - die(); - - - } //-.1-a - -elseif( file_exists( 'toolkit_config.php' ) && $use_toolkit_config_file == 'yes' ) - - { - - include( 'toolkit_config.php' ); - - - } - - - -if( !isset( $_SESSION['user_level'] ) ) - - { //-.1 - - $_SESSION['user_level'] = "null"; - - } //-.1 - - -if( !isset( $_SESSION['AUTH'] ) ) - - { - - $_SESSION['AUTH'] = array(); - - } - - -// Safe SQL data function - -function safe_sql( $data ) - - { - - if ( get_magic_quotes_gpc() ) - - { - - $data = stripslashes( $data ); - - } - - - if( phpversion() >= 4.3 ) - - { - - $data = mysql_real_escape_string( $data ); - - } - - else - - { - - $data = mysql_escape_string( $data ); - - } - - - $data = str_replace( '&', '&', $data ); - $data = str_replace( '<', '<', $data ); - $data = str_replace( '>', '>', $data ); - - return $data; - - } - -function safe_html( $data ) - - { - - $data = trim( $data ); - - $data = str_replace( '&', '&', $data ); - $data = str_replace( '<', '<', $data ); - $data = str_replace( '>', '>', $data ); - - return $data; - - } - -// Safe descriptions data function - -function safe_desc( $data ) - - { - - $data = str_replace( '&', '&', $data ); - $data = str_replace( '<', '<', $data ); - $data = str_replace( '>', '>', $data ); - - return $data; - - } - -// make_time function - -function make_time( $time ) - - { - - // Set error value to false as no errors are generated yet - - $error = false; - - // Set vals to proper "type" (int) - - $mm = intval( $time['mm'] ); - $dd = intval( $time['dd'] ); - $yy = intval( $time['yy'] ); - - $time_hh = intval( $time['time_hh'] ); - $time_mm = intval( $time['time_mm'] ); - $time_ss = intval( $time['time_ss'] ); - - - // Pad vals with leading zeros if single digets - - $mm = sprintf( "%02d", $mm ); - $dd = sprintf( "%02d", $dd ); - $yy = sprintf( "%02d", $yy ); - - $time_hh = sprintf( "%02d", $time_hh ); - $time_mm = sprintf( "%02d", $time_mm ); - $time_ss = sprintf( "%02d", $time_ss ); - - $time_ap = $time['time_ap']; - - - - // First check if specified date is a correct one - - if( !checkdate( $mm, $dd, $yy ) ) - - { - - $_SESSION['errors']['make_time'][] = 'You have entered an invalid date combination.'; - $error = true; - return false; - - } - - - - // Check if year is after 1970 (because thats when the timestamp starts) - - if( $yy < 1970 ) - - { - - $_SESSION['errors']['make_time'][] = 'Due to the Unix timestamp restriction, the year must not be before 1970.'; - $error = true; - return false; - - } - - - - // Now perform various checks on the time info - - if( - - ( - $time_hh > 12 || - $time_hh < 1 || - $time_mm > 60 || - $time_ss < 0 || - $time_ss > 60 || - $time_mm < 0 - ) - - || - - ( - - $time_ap != 'pm' && - $time_ap != 'am' - - ) ) - - { - - $_SESSION['errors']['make_time'][] = 'You have entered an invalid time.'; - $error = true; - return false; - - } - - - // Generate timestamp - - if( $time_ap == 'pm' ) - - { - - $time_hh += 12; - - } - - if( $error == false ) - - { - $time = mktime( $time_hh, $time_mm, $time_ss, $mm, $dd, $yy ); - return $time; - - } - -} - - -// Delete user core function -// Only the actual sql queries are here, the checks and options are in the delete_user() function - -function delete_user_core( $user_id, $clear_posts = false, $retain_pms = false ) - - { - - // Set global variables - - global $index; - global $phpbb_version; - - global $phpbb_banlist; - global $phpbb_user_group; - global $phpbb_users; - global $phpbb_groups; - global $phpbb_posts; - global $phpbb_posts_text; - global $phpbb_topics; - global $phpbb_vote_voters; - global $phpbb_auth_access; - global $phpbb_sessions; - global $phpbb_sessions_keys; - global $phpbb_privmsgs; - global $phpbb_privmsgs_text; - global $phpbb_topics_watch; - - - - // First things first, sanitize the $user_id - - $user_id = safe_sql( $user_id); - - - // - // Obtain username and level based on user_id - // - - $sql = "SELECT * FROM $phpbb_users WHERE user_id=$user_id LIMIT 1"; - - $result = mysql_query($sql); - $myrow = mysql_fetch_array($result); - - $username = safe_sql( $myrow['username'] ); - $user_level = safe_sql( $myrow['user_level'] ); - - - // Obtain first admin account to set as group mod if deleted user is a group mod (step 5) - - $sql = "SELECT * FROM $phpbb_users WHERE user_level=1 ORDER BY user_id ASC LIMIT 1"; - - $result = mysql_query($sql); - $myrow = mysql_fetch_array($result); - - $admin_id= safe_sql( $myrow['user_id'] ); - - // Debug info: - // echo '<pre>'; - // echo gettype( $myrow ); - // die( $admin_id ); - - - - // This actually starts the delete process - - // ************************************************************** - // - // First sql query is to collect group information about the user - // - // ************************************************************** - - $sql = "SELECT g.group_id FROM $phpbb_user_group ug, $phpbb_groups g WHERE ug.user_id = $user_id AND g.group_id = ug.group_id AND g.group_single_user = 1"; - - $result = mysql_query($sql); - $row = mysql_fetch_array($result); - unset( $row[0] ); // Read note directly below about this line: - - - // PHPBB's $row = $db->sql_fetchrow($result); line returns an array containg the user id: - // Array - // ( - // [group_id] => 123 - // ) - - // The mqsql fetch array used in this scrip: $myrow = mysql_fetch_array($result); - // Returns the following: - // Array - // ( - // [0] => 123 - // [group_id] => 123 - // ) - - // Therefore I unset the $row[0] element - - - // Debugging info: - // echo '<pre>'; - // print_r( $row ); - // echo"\n\n$username"; - // die(); - - - // *************************************************************************** - // - // Second sql query sets the poster id to the anonymous account for all posts - // First query in this section is for the $clear_posts variable - // - // *************************************************************************** - - - // If clear posts is set to true, replace all posts made by user to "DELETED" - - if( $clear_posts == true ) - - { - - $sql = "SELECT `post_id` FROM `$phpbb_posts` WHERE `poster_id`=$user_id"; - - if( !$result = mysql_query( $sql ) ) - - { - - die( '<font size="4"><b>Error selecting selecting posts to clear:</b></font><br /><b>Line:</b> '.__LINE__.'<br /><b>File:</b> '.$_SERVER['PHP_SELF']."<br /><b>Query:</b> $sql<br /><b>MySQL Error:</b> ".mysql_error() ); - - } - - - // Assings the results of the above query into an array - - while($myrow = mysql_fetch_array($result)) - - { - - $marked_posts[] = $myrow['post_id']; - - } - - - // Makes mark an empty array if the user has no PMs - - if( !isset( $marked_posts ) ) - - { - - $marked_posts = array(); - - } - - - // First check to see if user has any posts, if not skip replacing the posts - - if( isset( $marked_posts ) && count( $marked_posts ) ) - - { - - $marked_posts = implode( ',', $marked_posts ); - - $sql = "UPDATE `$phpbb_posts_text` SET `post_text`='DELETED' WHERE `post_id` IN ( $marked_posts )"; - - // echo '<pre>'; - // echo $sql; - // echo '<br />'; - // print_r( $marked_posts ); - // die(); - - if( !$result = mysql_query( $sql ) ) - - { - - die( '<font size="4"><b>Error setting posts to DELETED:</b></font><br /><b>Line:</b> '.__LINE__.'<br /><b>File:</b> '.$_SERVER['PHP_SELF']."<br /><b>Query:</b> $sql<br /><b>MySQL Error:</b> ".mysql_error() ); - - } - - } - - - - // Sets the poster id to the anonymous account for all posts and replaces the username with DELETED - - $sql = "UPDATE `$phpbb_posts` SET `poster_id`=-1, `post_username`='DELETED' WHERE `poster_id`=$user_id"; - - if( !$result = mysql_query( $sql ) ) - - { - - die( '<font size="4"><b>Error setting poster id to anonymous for deleted user:</b></font><br /><b>Line:</b> '.__LINE__.'<br /><b>File:</b> '.$_SERVER['PHP_SELF']."<br /><b>Query:</b> $sql<br /><b>MySQL Error:</b> ".mysql_error() ); - - } - } - - else - - { - - - // Sets the poster id to the anonymous account for all posts, but retains the original username - - $sql = "UPDATE `$phpbb_posts` SET `poster_id`=-1, `post_username`='".str_replace( "\\'", "''", addslashes( $username ) )."' WHERE `poster_id`=$user_id"; - - if( !$result = mysql_query( $sql ) ) - - { - - die( '<font size="4"><b>Error setting poster id to anonymous for deleted user:</b></font><br /><b>Line:</b> '.__LINE__.'<br /><b>File:</b> '.$_SERVER['PHP_SELF']."<br /><b>Query:</b> $sql<br /><b>MySQL Error:</b> ".mysql_error() ); - - } - - } - - - // *************************************************************************** - // - // Third sql query sets the topic id to the anonymous account for all topics - // - // *************************************************************************** - - // If clear posts is set to true, replace all topics made by user to "DELETED" - - if( $clear_posts == true ) - - { - - $sql = "UPDATE `$phpbb_topics` SET `topic_title`='DELETED' WHERE `topic_poster`=$user_id"; - - - if( !$result = mysql_query( $sql ) ) - - { - - die( '<font size="4"><b>Error setting topics to DELETED:</b></font><br /><b>Line:</b> '.__LINE__.'<br /><b>File:</b> '.$_SERVER['PHP_SELF']."<br /><b>Query:</b> $sql<br /><b>MySQL Error:</b> ".mysql_error() ); - - } - - - // Sets the topic id to the anonymous account for all topics and replaces the username with DELETED - - $sql = "UPDATE `$phpbb_topics` SET `topic_poster`=-1 WHERE `topic_poster`=$user_id"; - - if( !$result = mysql_query( $sql ) ) - - { - - die( '<font size="4"><b>Error setting topic id poster to anonymous for deleted user:</b></font><br /><b>Line:</b> '.__LINE__.'<br /><b>File:</b> '.$_SERVER['PHP_SELF']."<br /><b>Query:</b> $sql<br /><b>MySQL Error:</b> ".mysql_error() ); - - } - } - - else - - { - - - // Sets the poster id to the anonymous account for all posts, but retains the original username - - $sql = "UPDATE `$phpbb_topics` SET `topic_poster`=-1 WHERE `topic_poster`=$user_id"; - - if( !$result = mysql_query( $sql ) ) - - { - - die( '<font size="4"><b>Error setting topic id poster to anonymous for deleted user:</b></font><br /><b>Line:</b> '.__LINE__.'<br /><b>File:</b> '.$_SERVER['PHP_SELF']."<br /><b>Query:</b> $sql<br /><b>MySQL Error:</b> ".mysql_error() ); - - } - - } - - - // *************************************************************************** - // - // Fourth sql query sets the voter id to anonymous - // - // *************************************************************************** - - $sql = "UPDATE `$phpbb_vote_voters` SET `vote_user_id`=-1 WHERE `vote_user_id`=$user_id"; - - if( !$result = mysql_query( $sql ) ) - - { - - die( '<font size="4"><b>Error setting voter ID to anonymous:</b></font><br /><b>Line:</b> '.__LINE__.'<br /><b>File:</b> '.$_SERVER['PHP_SELF']."<br /><b>Query:</b> $sql<br /><b>MySQL Error:</b> ".mysql_error() ); - - } - - - // *************************************************************************** - // - // Fifth sql query collects the phpbb_groups info and assigns it to the - // $group_mods array where the user is a moderator - // - // *************************************************************************** - - $sql = "SELECT `group_id` FROM `$phpbb_groups` WHERE `group_moderator`=$user_id"; - - if( !$result = mysql_query( $sql ) ) - - { - - die( '<font size="4"><b>Error selecting groups where user is a moderator:</b></font><br /><b>Line:</b> '.__LINE__.'<br /><b>File:</b> '.$_SERVER['PHP_SELF']."<br /><b>Query:</b> $sql<br /><b>MySQL Error:</b> ".mysql_error() ); - - } - - - // Assings the results of the above query into an array - - while($myrow = mysql_fetch_array($result)) - - { - - $group_mod[] = $myrow['group_id']; - - } - - // Debugging info: - // echo '<pre>'; - // print_r( $group_mod ); - // die(); - - - // If the user is a moderator for any groups, this query assigns the - // new mod status to the oldest admin account - - if( isset( $group_mod ) && count( $group_mod ) ) - - { - - // - // Make SURE to insert a query here to check for the first admin account to associate as the new group moderator - // after the deleted user is deleted! - // Done - - // $admin_id = 3; //This is a temp static admin id that will be dymamic in the final release - - $update_mod_id = implode( ',', $group_mod ); - $sql = "UPDATE `$phpbb_groups` SET `group_moderator`=$admin_id WHERE `group_moderator` IN ( $update_mod_id )"; - - // Debugging info: - // echo '<pre>'; - // echo $sql; - // die(); - - if( !$result = mysql_query( $sql ) ) - - { - - die( '<font size="4"><b>Error setting new group moderator to oldest admin:</b></font><br /><b>Line:</b> '.__LINE__.'<br /><b>File:</b> '.$_SERVER['PHP_SELF']."<br /><b>Query:</b> $sql<br /><b>MySQL Error:</b> ".mysql_error() ); - - } - - } - - - // *************************************************************************** - // - // Sixth sql query deletes the user from the phpbb_users table - // - // *************************************************************************** - - $sql = "DELETE FROM `$phpbb_users` WHERE `user_id`=$user_id"; - - if( !$result = mysql_query( $sql ) ) - - { - - die( '<font size="4"><b>Error deleting user from users table:</b></font><br /><b>Line:</b> '.__LINE__.'<br /><b>File:</b> '.$_SERVER['PHP_SELF']."<br /><b>Query:</b> $sql<br /><b>MySQL Error:</b> ".mysql_error() ); - - } - - - // *************************************************************************** - // - // Seventh sql query deletes the user from the phpbb_user_group table - // - // *************************************************************************** - - $sql = "DELETE FROM `$phpbb_user_group` WHERE `user_id`=$user_id"; - - if( !$result = mysql_query( $sql ) ) - - { - - die( '<font size="4"><b>Error deleting user from user_group table:</b></font><br /><b>Line:</b> '.__LINE__.'<br /><b>File:</b> '.$_SERVER['PHP_SELF']."<br /><b>Query:</b> $sql<br /><b>MySQL Error:</b> ".mysql_error() ); - - } - - - // *************************************************************************** - // - // Eighth sql query deletes the user from the phpbb_groups table - // - // *************************************************************************** - - $sql = "DELETE FROM `$phpbb_groups` WHERE `group_id`=".$row['group_id']; - - if( !$result = mysql_query( $sql ) ) - - { - - die( '<font size="4"><b>Error deleting user\'s group from groups table:</b></font><br /><b>Line:</b> '.__LINE__.'<br /><b>File:</b> '.$_SERVER['PHP_SELF']."<br /><b>Query:</b> $sql<br /><b>MySQL Error:</b> ".mysql_error() ); - - } - - - // *************************************************************************** - // - // Ninth sql query deletes the user from the phpbb_auth_access table - // - // *************************************************************************** - - $sql = "DELETE FROM `$phpbb_auth_access` WHERE `group_id`=".$row['group_id']; - - if( !$result = mysql_query( $sql ) ) - - { - - die( '<font size="4"><b>Error deleting user from auth_access table:</b></font><br /><b>Line:</b> '.__LINE__.'<br /><b>File:</b> '.$_SERVER['PHP_SELF']."<br /><b>Query:</b> $sql<br /><b>MySQL Error:</b> ".mysql_error() ); - - } - - - // *************************************************************************** - // - // Tenth sql query deletes the user from the phpbb topics watch table - // - // *************************************************************************** - - $sql = "DELETE FROM `$phpbb_topics_watch` WHERE `user_id`=$user_id"; - - if( !$result = mysql_query( $sql ) ) - - { - - die( '<font size="4"><b>Error deleting user from topics_watch table:</b></font><br /><b>Line:</b> '.__LINE__.'<br /><b>File:</b> '.$_SERVER['PHP_SELF']."<br /><b>Query:</b> $sql<br /><b>MySQL Error:</b> ".mysql_error() ); - - } - - - // *************************************************************************** - // - // Eleventh sql query deletes the user from the banlist table - // - // *************************************************************************** - - $sql = "DELETE FROM `$phpbb_banlist` WHERE `ban_userid`=$user_id"; - - if( !$result = mysql_query( $sql ) ) - - { - - die( '<font size="4"><b>Error deleting user from the banlist table:</b></font><br /><b>Line:</b> '.__LINE__.'<br /><b>File:</b> '.$_SERVER['PHP_SELF']."<br /><b>Query:</b> $sql<br /><b>MySQL Error:</b> ".mysql_error() ); - - } - - - // *************************************************************************** - // - // Twelfth sql query deletes the user from the sessions table - // - // *************************************************************************** - - // This delete section was added in .19, so a check is done before using it incase - // the admin is running an older version of phpbb - - if( $phpbb_version >= 0.19 ) - - { - - $sql = "DELETE FROM `$phpbb_sessions` WHERE `session_user_id`=$user_id"; - - if( !$result = mysql_query( $sql ) ) - - { - - die( '<font size="4"><b>Error deleting user from the sessions table:</b></font><br /><b>Line:</b> '.__LINE__.'<br /><b>File:</b> '.$_SERVER['PHP_SELF']."<br /><b>Query:</b> $sql<br /><b>MySQL Error:</b> ".mysql_error() ); - - } - - } - - - // *************************************************************************** - // - // Twelfth sql query deletes the user from the sessions_keys table - // - // *************************************************************************** - - // This delete section was added in .19, so a check is done before using it incase - // the admin is running an older version of phpbb - - if( $phpbb_version >= '.0.19' ) - - { - - // First check if the sesssions keys table exists - // (Since alot of .19 boards dont have it due to incomplete updates - - $sql_key_check ="SHOW TABLES LIKE '$phpbb_sessions_keys'"; - - if( !$result_key_check = mysql_query( $sql_key_check ) ) - - { - - die( '<font size="4"><b>Error selecting session keys table:</b></font><br /><b>Line:</b> '.__LINE__.'<br /><b>File:</b> '.$_SERVER['PHP_SELF']."<br /><b>Query:</b> $sql<br /><b>MySQL Error:</b> ".mysql_error() ); - - } - - - // This section actually checks if the table exists, if not it skips - // deleting the user from this table - - if( mysql_fetch_array($result_key_check) ) - - { - - - $sql = "DELETE FROM `$phpbb_sessions_keys` WHERE `user_id`=$user_id"; - - if( !$result = mysql_query( $sql ) ) - - { - - die( '<font size="4"><b>Error deleting user from the sessions_keys table:</b></font><br /><b>Line:</b> '.__LINE__.'<br /><b>File:</b> '.$_SERVER['PHP_SELF']."<br /><b>Query:</b> $sql<br /><b>MySQL Error:</b> ".mysql_error() ); - - } - - } - - } - - - // *************************************************************************** - // - // The final sql query collets the to/from PMs with the user's id & deletes them - // - // *************************************************************************** - - // If retain_pms is set to true, change PM author to anonymous instead of deleting them - - if( $retain_pms == true ) - - { - - // This query sets the from_user_id to the anonymous account so the PMs dont have to be deleted - - $sql = "UPDATE `$phpbb_privmsgs` SET `privmsgs_from_userid`=-1 WHERE `privmsgs_from_userid`=$user_id"; - - if( !$result = mysql_query( $sql ) ) - - { - - die( '<font size="4"><b>Error setting from PM from_user_id to anonymous:</b></font><br /><b>Line:</b> '.__LINE__.'<br /><b>File:</b> '.$_SERVER['PHP_SELF']."<br /><b>Query:</b> $sql<br /><b>MySQL Error:</b> ".mysql_error() ); - - } - - - // This query sets the to_user_id to the anonymous account so the PMs dont have to be deleted - - $sql = "UPDATE `$phpbb_privmsgs` SET `privmsgs_to_userid`=-1 WHERE `privmsgs_to_userid`=$user_id"; - - - if( !$result = mysql_query( $sql ) ) - - { - - die( '<font size="4"><b>Error setting from PM to_user_id to anonymous:</b></font><br /><b>Line:</b> '.__LINE__.'<br /><b>File:</b> '.$_SERVER['PHP_SELF']."<br /><b>Query:</b> $sql<br /><b>MySQL Error:</b> ".mysql_error() ); - - } - - } - - else - - { - - $sql = "SELECT `privmsgs_id` FROM `$phpbb_privmsgs` WHERE `privmsgs_from_userid`=$user_id OR `privmsgs_to_userid`=$user_id"; - - if( !$result = mysql_query( $sql ) ) - - { - - die( '<font size="4"><b>Error selecting PMs for the user:</b></font><br /><b>Line:</b> '.__LINE__.'<br /><b>File:</b> '.$_SERVER['PHP_SELF']."<br /><b>Query:</b> $sql<br /><b>MySQL Error:</b> ".mysql_error() ); - - } - - - // Debugging info: - // echo "<br />$sql<br />"; - - - // This section marks and assigns the resulting PMs into the $marked array - - while($myrow = mysql_fetch_array($result)) - - { - - $marked[] = $myrow['privmsgs_id']; - - } - - - // Makes mark an empty array if the user has no PMs - - if( !isset( $marked ) ) - - { - - $marked = array(); - - } - - // This section actually goes through the list and deletes the PMs - - - // Debugging info: - // echo '<pre>'; - // print_r( $marked ); - - if( count( $marked ) ) - - { - - $delete_id = implode( ',', $marked ); - - // Debugging info: - // echo "<br />$delete_id"; - - $sql = "DELETE FROM `$phpbb_privmsgs_text` WHERE `privmsgs_text_id` IN ( $delete_id )"; - - // Debugging info: - // echo "<br />$sql"; - - if( !$result = mysql_query( $sql ) ) - - { - - die( 'Error deleting user PMs:<br />Line: '.__LINE__.'<br />File: '.$_SERVER['PHP_SELF']."<br />Query: $sql<br />MySQL Error: ".msql_error() ); - - } - - - $sql = "DELETE FROM `$phpbb_privmsgs` WHERE `privmsgs_id` IN ( $delete_id )"; - - // Debugging info: - // echo "<br />$sql"; - - if( !$result = mysql_query( $sql ) ) - - { - - die( 'Error deleting user Pms:<br />Line: '.__LINE__.'<br />File: '.$_SERVER['PHP_SELF']."<br />Query: $sql" ); - - } - - } - - } - - // And thats it! The user should now be fully and properly deleted! - - } - - -// Delete User function - -function delete_user( $user_id, $clear_posts = false, $retain_pms = false, $from = 'index' ) - - { - - // Debugging info: - // var_dump( $user_id ); - // var_dump( $clear_posts ); - // var_dump( $retain_pms ); - // var_dump( $from ); - - - // Set global variables - - global $index; - global $phpbb_version; - - global $phpbb_banlist; - global $phpbb_user_group; - global $phpbb_users; - global $phpbb_groups; - global $phpbb_posts; - global $phpbb_posts_text; - global $phpbb_topics; - global $phpbb_vote_voters; - global $phpbb_auth_access; - global $phpbb_sessions; - global $phpbb_sessions_keys; - global $phpbb_privmsgs; - global $phpbb_privmsgs_text; - global $phpbb_topics_watch; - - - // Set redirect URL - - if( $from == 'edit' ) - - { - - $from ="$index?user_id=$user_id"; - - } - - else - - { - - $from = $index; - - } - - - // First, check if we are dealing with a single user, or an array of users - - if( is_array( $user_id ) ) - - { - - // Create user counter variable - - $user_counter = 0; - - - // Loop through the array and perform security checks - // on each element before actually deleting anything - - foreach( $user_id as $id ) - - { //user_id foreach - - // First things first, sanitize the $user_id - - $user_id = safe_sql( $id ); - - - // - // Obtain username and level based on user_id - // - - $sql = "SELECT * FROM $phpbb_users WHERE user_id=$id LIMIT 1"; - - $result = mysql_query($sql); - $myrow = mysql_fetch_array($result); - - $username = safe_sql( $myrow['username'] ); - $user_level = safe_sql( $myrow['user_level'] ); - - - // Obtain first admin account to set as group mod if deleted user is a group mod (step 5) - - $sql = "SELECT * FROM $phpbb_users WHERE user_level=1 ORDER BY user_id ASC LIMIT 1"; - - $result = mysql_query($sql); - $myrow = mysql_fetch_array($result); - - $admin_id= safe_sql( $myrow['user_id'] ); - - // Debug info: - // echo '<pre>'; - // echo gettype( $myrow ); - // die( $admin_id ); - - - // Check if admin account exists before deleting, if not return with error - - if( !is_array( $myrow ) ) - - { - - $_SESSION['errors']['edituser'][] = 'Due to the phpbb table requirements, at least one admin must exist in the database before a user can be deleted.<br />Either promote a current user to an admin, or register a new one g... [truncated message content] |
|
From: <mar...@us...> - 2006-06-20 16:31:45
|
Revision: 231 Author: markthedaemon Date: 2006-06-20 09:31:38 -0700 (Tue, 20 Jun 2006) ViewCVS: http://svn.sourceforge.net/phpbbreloaded/?rev=231&view=rev Log Message: ----------- made teh CAPTCHA work again :D Modified Paths: -------------- phpBB Reloaded 2/includes/usercp_confirm.php phpBB Reloaded 2/includes/usercp_register.php Modified: phpBB Reloaded 2/includes/usercp_confirm.php =================================================================== --- phpBB Reloaded 2/includes/usercp_confirm.php 2006-06-19 23:27:34 UTC (rev 230) +++ phpBB Reloaded 2/includes/usercp_confirm.php 2006-06-20 16:31:38 UTC (rev 231) @@ -66,89 +66,98 @@ exit; } -// We can we will generate a single filtered png -// Thanks to DavidMJ for emulating zlib within the code :) -$_png = define_filtered_pngs(); +// If we can we will generate a single filtered png else we will have to simply +// output six seperate original pngs ... first way is preferable! +if (@extension_loaded('gd') || @extension_loaded('gd2')) +{ + require($root_path . "includes/functions_freecap.$phpEx"); -$total_width = 320; -$total_height = 50; -$img_height = 40; -$img_width = 0; -$l = 0; + // output final image :-) + sendImage($im); + // (sendImage also destroys all used images) +} +elseif (@extension_loaded('zlib')) +{ + $_png = define_filtered_pngs(); -list($usec, $sec) = explode(' ', microtime()); -mt_srand($sec * $usec); + $total_width = 320; + $total_height = 50; + $img_height = 40; + $img_width = 0; + $l = 0; -$char_widths = array(); -for ($i = 0; $i < strlen($code); $i++) -{ - $char = $code{$i}; + list($usec, $sec) = explode(' ', microtime()); + mt_srand($sec * $usec); - $width = mt_rand(0, 4); - $char_widths[] = $width; - $img_width += $_png[$char]['width'] - $width; -} + $char_widths = array(); + for ($i = 0; $i < strlen($code); $i++) + { + $char = $code{$i}; -$offset_x = mt_rand(0, $total_width - $img_width); -$offset_y = mt_rand(0, $total_height - $img_height); + $width = mt_rand(0, 4); + $char_widths[] = $width; + $img_width += $_png[$char]['width'] - $width; + } -$image = ''; -$hold_chars = array(); -for ($i = 0; $i < $total_height; $i++) -{ - $image .= chr(0); + $offset_x = mt_rand(0, $total_width - $img_width); + $offset_y = mt_rand(0, $total_height - $img_height); - if ($i > $offset_y && $i < $offset_y + $img_height) + $image = ''; + $hold_chars = array(); + for ($i = 0; $i < $total_height; $i++) { - $j = 0; + $image .= chr(0); - for ($k = 0; $k < $offset_x; $k++) + if ($i > $offset_y && $i < $offset_y + $img_height) { - $image .= chr(mt_rand(140, 255)); - } + $j = 0; - for ($k = 0; $k < strlen($code); $k++) - { - $char = $code{$k}; + for ($k = 0; $k < $offset_x; $k++) + { + $image .= chr(mt_rand(140, 255)); + } - if (empty($hold_chars[$char])) + for ($k = 0; $k < strlen($code); $k++) { - $hold_chars[$char] = explode("\n", chunk_split(base64_decode($_png[$char]['data']), $_png[$char]['width'] + 1, "\n")); + $char = $code{$k}; + + if (empty($hold_chars[$char])) + { + $hold_chars[$char] = explode("\n", chunk_split(base64_decode($_png[$char]['data']), $_png[$char]['width'] + 1, "\n")); + } + $image .= randomise(substr($hold_chars[$char][$l], 1), $char_widths[$j]); + $j++; } - $image .= randomise(substr($hold_chars[$char][$l], 1), $char_widths[$j]); - $j++; - } - for ($k = $offset_x + $img_width; $k < $total_width; $k++) + for ($k = $offset_x + $img_width; $k < $total_width; $k++) + { + $image .= chr(mt_rand(140, 255)); + } + + $l++; + } + else { - $image .= chr(mt_rand(140, 255)); + for ($k = 0; $k < $total_width; $k++) + { + $image .= chr(mt_rand(140, 255)); + } } - $l++; } - else - { - for ($k = 0; $k < $total_width; $k++) - { - $image .= chr(mt_rand(140, 255)); - } - } + unset($hold); -} -unset($hold); + $image = create_png(gzcompress($image), $total_width, $total_height); -$image = create_png($image, $total_width, $total_height); + // Output image + header('Content-Type: image/png'); + header('Cache-control: no-cache, no-store'); + echo $image; -// Output image -header('Content-Type: image/png'); -header('Cache-control: no-cache, no-store'); -echo $image; + unset($image); + unset($_png); + exit; -unset($image); -unset($_png); -exit; - - } else { @@ -212,7 +221,7 @@ // http://www.libpng.org/pub/png/spec/PNG-Contents.html we use // png because it's a fully recognised open standard and supported // by practically all modern browsers and OSs -function create_png($raw_image, $width, $height) +function create_png($gzimage, $width, $height) { // SIG $image = pack('C8', 137, 80, 78, 71, 13, 10, 26, 10); @@ -221,53 +230,8 @@ $raw .= pack('C4', $height >> 24, $height >> 16, $height >> 8, $height); $raw .= pack('C5', 8, 0, 0, 0, 0); $image .= png_chunk(13, 'IHDR', $raw); - if (@extension_loaded('zlib')) - { - $raw_image = gzcompress($raw_image); - $length = strlen($raw_image); - } - else - { - // The total length of this image, uncompressed, is just a calculation of pixels - $length = ($width + 1) * $height; - - // Adler-32 hash generation - // Optimized Adler-32 loop ported from the GNU Classpath project - $temp_length = $length; - $s1 = 1; - $s2 = $index = 0; - - while ($temp_length > 0) - { - // We can defer the modulo operation: - // s1 maximally grows from 65521 to 65521 + 255 * 3800 - // s2 maximally grows by 3800 * median(s1) = 2090079800 < 2^31 - $substract_value = ($temp_length < 3800) ? $temp_length : 3800; - $temp_length -= $substract_value; - - while (--$substract_value >= 0) - { - $s1 += ord($raw_image[$index]); - $s2 += $s1; - - $index++; - } - - $s1 %= 65521; - $s2 %= 65521; - } - $adler_hash = pack('N', ($s2 << 16) | $s1); - - // This is the same thing as gzcompress($raw_image, 0) but does not need zlib - $raw_image = pack('C3v2', 0x78, 0x01, 0x01, $length, ~$length) . $raw_image . $adler_hash; - - // The Zlib header + Adler hash make us add on 11 - $length += 11; - } - // IDAT - $image .= png_chunk($length, 'IDAT', $raw_image); - + $image .= png_chunk(strlen($gzimage), 'IDAT', $gzimage); // IEND $image .= png_chunk(0, 'IEND', ''); Modified: phpBB Reloaded 2/includes/usercp_register.php =================================================================== --- phpBB Reloaded 2/includes/usercp_register.php 2006-06-19 23:27:34 UTC (rev 230) +++ phpBB Reloaded 2/includes/usercp_register.php 2006-06-20 16:31:38 UTC (rev 231) @@ -319,13 +319,9 @@ if ($row = $db->sql_fetchrow($result)) { -// ---[ mod : FreeCap Visual Confirmation ]---------------------------------------- -// here we replace -// if ($row['code'] != $confirm_code) -//with - if (@extension_loaded('gd') || @extension_loaded('gd2')) +if (@extension_loaded('gd') || @extension_loaded('gd2')) { - $logic = 'return strtolower($row[\'code\'])) != strtolower($confirm_code);'; + $logic = 'return strtolower($row[\'code\']) != strtolower($confirm_code);'; } else { @@ -333,7 +329,7 @@ } if (eval($logic)) -// ---[ fin mod ]---------------------------------------- + { $error = TRUE; $error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Confirm_code_wrong']; @@ -1157,7 +1153,8 @@ */ //-- add // fix a typo - $code = strtoupper(str_replace('0', 'o', substr($code, 2, 6))); + $code = strtoupper(str_replace('0', 'o', substr($code, 6))); + //-- fin mod : categories hierarchy -------------------------------------------- $code = strtolower(preg_replace('#(\d)#e', 'chr($1 + 96)', $code)); @@ -1172,12 +1169,10 @@ unset($code); -// ---[ mod : FreeCap Visual Confirmation ]---------------------------------------- -// here we replace -// $confirm_image = (@extension_loaded('zlib')) ? '<img src="' . append_sid("profile.$phpEx?mode=confirm&id=$confirm_id") . '" alt="" title="" />' : '<img src="' . append_sid("profile.$phpEx?mode=confirm&id=$confirm_id&c=1") . '" alt="" title="" /><img src="' . append_sid("profile.$phpEx?mode=confirm&id=$confirm_id&c=2") . '" alt="" title="" /><img src="' . append_sid("profile.$phpEx?mode=confirm&id=$confirm_id&c=3") . '" alt="" title="" /><img src="' . append_sid("profile.$phpEx?mode=confirm&id=$confirm_id&c=4") . '" alt="" title="" /><img src="' . append_sid("profile.$phpEx?mode=confirm&id=$confirm_id&c=5") . '" alt="" title="" /><img src="' . append_sid("profile.$phpEx?mode=confirm&id=$confirm_id&c=6") . '" alt="" title="" />'; -// with - $confirm_image = (@extension_loaded('gd') || @extension_loaded('gd2')) ? "<img src=\"" . append_sid("profile.$phpEx?mode=confirm&id=$confirm_id") . '" alt="" title="" />' : ((@extension_loaded('zlib')) ? '<img src="' . append_sid("profile.$phpEx?mode=confirm&id=$confirm_id") . '" alt="" title="" />' : '<img src="' . append_sid("profile.$phpEx?mode=confirm&id=$confirm_id&c=1") . '" alt="" title="" /><img src="' . append_sid("profile.$phpEx?mode=confirm&id=$confirm_id&c=2") . '" alt="" title="" /><img src="' . append_sid("profile.$phpEx?mode=confirm&id=$confirm_id&c=3") . '" alt="" title="" /><img src="' . append_sid("profile.$phpEx?mode=confirm&id=$confirm_id&c=4") . '" alt="" title="" /><img src="' . append_sid("profile.$phpEx?mode=confirm&id=$confirm_id&c=5") . '" alt="" title="" /><img src="' . append_sid("profile.$phpEx?mode=confirm&id=$confirm_id&c=6") . '" alt="" title="" />'); -// ---[ fin mod ]---------------------------------------- +$confirm_image = (@extension_loaded('zlib')) ? '<img src="' . append_sid("profile.$phpEx?mode=confirm&id=$confirm_id") . '" alt="" title="" />' : '<img src="' . append_sid("profile.$phpEx?mode=confirm&id=$confirm_id&c=1") . '" alt="" title="" /><img src="' . append_sid("profile.$phpEx?mode=confirm&id=$confirm_id&c=2") . '" alt="" title="" /><img src="' . append_sid("profile.$phpEx?mode=confirm&id=$confirm_id&c=3") . '" alt="" title="" /><img src="' . append_sid("profile.$phpEx?mode=confirm&id=$confirm_id&c=4") . '" alt="" title="" /><img src="' . append_sid("profile.$phpEx?mode=confirm&id=$confirm_id&c=5") . '" alt="" title="" /><img src="' . append_sid("profile.$phpEx?mode=confirm&id=$confirm_id&c=6") . '" alt="" title="" />'; + + + // ---[ fin mod ]---------------------------------------- $s_hidden_fields .= '<input type="hidden" name="confirm_id" value="' . $confirm_id . '" />'; $template->assign_block_vars('switch_confirm', array()); @@ -1354,8 +1349,9 @@ } } } -} + } + $template->pparse('body'); include($phpbb_root_path . 'includes/page_tail.'.$phpEx); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mar...@us...> - 2006-06-19 23:27:42
|
Revision: 230 Author: markthedaemon Date: 2006-06-19 16:27:34 -0700 (Mon, 19 Jun 2006) ViewCVS: http://svn.sourceforge.net/phpbbreloaded/?rev=230&view=rev Log Message: ----------- w00t Modified Paths: -------------- phpBB Reloaded 2/common.php Modified: phpBB Reloaded 2/common.php =================================================================== --- phpBB Reloaded 2/common.php 2006-06-17 21:53:17 UTC (rev 229) +++ phpBB Reloaded 2/common.php 2006-06-19 23:27:34 UTC (rev 230) @@ -1,32 +1,13 @@ <?php -/*************************************************************************** - * common.php - * ------------------- - * begin : Saturday, Feb 23, 2001 - * copyright : (C) 2001 The phpBB Group - * email : su...@ph... - * - * $Id: common.php,v 1.74.2.23 2006/02/26 17:34:50 grahamje Exp $ - * - ***************************************************************************/ +/** +* +* @package: reloaded +* @version: $Id: common.php,v 1.1.1.1 2006/02/24 02:28:06 markthedaemon Exp $ +* @copyright: (c) 2005, 2006 phpBB Reloaded & 2002, 2006 phpBB Group +* @license: http://opensource.org/licenses/gpl-license.php GNU Public License +* +*/ -/*************************************************************************** - * - * 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 file has been modified by phpBB Reloaded - (C) 2006 phpBB Reloaded Group - * Support questions placed here: http://www.phpbbreloaded.com - * - * DO NOT EDIT THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING - * - ***************************************************************************/ - if ( !defined('IN_PHPBB') ) { die("Hacking attempt"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mar...@us...> - 2006-06-17 22:02:07
|
Revision: 229 Author: markthedaemon Date: 2006-06-17 14:53:17 -0700 (Sat, 17 Jun 2006) ViewCVS: http://svn.sourceforge.net/phpbbreloaded/?rev=229&view=rev Log Message: ----------- its sexy, its shiny, we love it, its phpBB3 BETA1 :D Added Paths: ----------- phpBB Reloaded Olympus/adm/ phpBB Reloaded Olympus/adm/images/ phpBB Reloaded Olympus/adm/images/arrow_down.gif phpBB Reloaded Olympus/adm/images/bg_hash1.gif phpBB Reloaded Olympus/adm/images/bg_hash2.gif phpBB Reloaded Olympus/adm/images/bg_hash3.gif phpBB Reloaded Olympus/adm/images/bg_hash4.gif phpBB Reloaded Olympus/adm/images/bg_header.gif phpBB Reloaded Olympus/adm/images/bg_tabs1.gif phpBB Reloaded Olympus/adm/images/bg_tabs2.gif phpBB Reloaded Olympus/adm/images/cellpic3.gif phpBB Reloaded Olympus/adm/images/gradient2b.gif phpBB Reloaded Olympus/adm/images/icon_delete.gif phpBB Reloaded Olympus/adm/images/icon_down.gif phpBB Reloaded Olympus/adm/images/icon_edit.gif phpBB Reloaded Olympus/adm/images/icon_folder.gif phpBB Reloaded Olympus/adm/images/icon_folder_link.gif phpBB Reloaded Olympus/adm/images/icon_folder_link_small.gif phpBB Reloaded Olympus/adm/images/icon_folder_lock.gif phpBB Reloaded Olympus/adm/images/icon_folder_lock_small.gif phpBB Reloaded Olympus/adm/images/icon_folder_small.gif phpBB Reloaded Olympus/adm/images/icon_folder_sub_small.gif phpBB Reloaded Olympus/adm/images/icon_subfolder.gif phpBB Reloaded Olympus/adm/images/icon_sync.gif phpBB Reloaded Olympus/adm/images/icon_trace.gif phpBB Reloaded Olympus/adm/images/icon_up.gif phpBB Reloaded Olympus/adm/images/no_avatar.gif phpBB Reloaded Olympus/adm/images/no_image.png phpBB Reloaded Olympus/adm/images/phpbb_logo.gif phpBB Reloaded Olympus/adm/images/progress_bar.gif phpBB Reloaded Olympus/adm/images/spacer.gif phpBB Reloaded Olympus/adm/index.php phpBB Reloaded Olympus/adm/style/ phpBB Reloaded Olympus/adm/style/acp_attachments.html phpBB Reloaded Olympus/adm/style/acp_ban.html phpBB Reloaded Olympus/adm/style/acp_bbcodes.html phpBB Reloaded Olympus/adm/style/acp_board.html phpBB Reloaded Olympus/adm/style/acp_bots.html phpBB Reloaded Olympus/adm/style/acp_database.html phpBB Reloaded Olympus/adm/style/acp_disallow.html phpBB Reloaded Olympus/adm/style/acp_email.html phpBB Reloaded Olympus/adm/style/acp_forums.html phpBB Reloaded Olympus/adm/style/acp_groups.html phpBB Reloaded Olympus/adm/style/acp_icons.html phpBB Reloaded Olympus/adm/style/acp_jabber.html phpBB Reloaded Olympus/adm/style/acp_language.html phpBB Reloaded Olympus/adm/style/acp_logs.html phpBB Reloaded Olympus/adm/style/acp_main.html phpBB Reloaded Olympus/adm/style/acp_modules.html phpBB Reloaded Olympus/adm/style/acp_permission_roles.html phpBB Reloaded Olympus/adm/style/acp_permissions.html phpBB Reloaded Olympus/adm/style/acp_php_info.html phpBB Reloaded Olympus/adm/style/acp_profile.html phpBB Reloaded Olympus/adm/style/acp_prune_forums.html phpBB Reloaded Olympus/adm/style/acp_prune_users.html phpBB Reloaded Olympus/adm/style/acp_ranks.html phpBB Reloaded Olympus/adm/style/acp_reasons.html phpBB Reloaded Olympus/adm/style/acp_search.html phpBB Reloaded Olympus/adm/style/acp_styles.html phpBB Reloaded Olympus/adm/style/acp_users.html phpBB Reloaded Olympus/adm/style/acp_words.html phpBB Reloaded Olympus/adm/style/admin.css phpBB Reloaded Olympus/adm/style/colour_swatch.html phpBB Reloaded Olympus/adm/style/confirm_body.html phpBB Reloaded Olympus/adm/style/custom_profile_fields.html phpBB Reloaded Olympus/adm/style/editor.js phpBB Reloaded Olympus/adm/style/install_convert.html phpBB Reloaded Olympus/adm/style/install_error.html phpBB Reloaded Olympus/adm/style/install_footer.html phpBB Reloaded Olympus/adm/style/install_header.html phpBB Reloaded Olympus/adm/style/install_install.html phpBB Reloaded Olympus/adm/style/install_main.html phpBB Reloaded Olympus/adm/style/message_body.html phpBB Reloaded Olympus/adm/style/overall_footer.html phpBB Reloaded Olympus/adm/style/overall_header.html phpBB Reloaded Olympus/adm/style/permission_mask.html phpBB Reloaded Olympus/adm/style/permission_roles_mask.html phpBB Reloaded Olympus/adm/style/permission_trace.html phpBB Reloaded Olympus/adm/style/search_index_progress_bar.html phpBB Reloaded Olympus/adm/style/simple_body.html phpBB Reloaded Olympus/adm/style/simple_footer.html phpBB Reloaded Olympus/adm/style/simple_header.html phpBB Reloaded Olympus/adm/style/tooltip.js phpBB Reloaded Olympus/adm/style/viewsource.html phpBB Reloaded Olympus/adm/swatch.php phpBB Reloaded Olympus/cache/ phpBB Reloaded Olympus/cache/.htaccess phpBB Reloaded Olympus/common.php phpBB Reloaded Olympus/config.php phpBB Reloaded Olympus/cron.php phpBB Reloaded Olympus/docs/ phpBB Reloaded Olympus/docs/AUTHORS phpBB Reloaded Olympus/docs/COPYING phpBB Reloaded Olympus/docs/auth_api.html phpBB Reloaded Olympus/docs/coding-guidelines.html phpBB Reloaded Olympus/docs/header_bg.jpg phpBB Reloaded Olympus/docs/header_left.jpg phpBB Reloaded Olympus/download.php phpBB Reloaded Olympus/faq.php phpBB Reloaded Olympus/files/ phpBB Reloaded Olympus/files/.htaccess phpBB Reloaded Olympus/images/ phpBB Reloaded Olympus/images/avatars/ phpBB Reloaded Olympus/images/avatars/gallery/ phpBB Reloaded Olympus/images/avatars/gallery/index.htm phpBB Reloaded Olympus/images/avatars/index.htm phpBB Reloaded Olympus/images/avatars/upload/ phpBB Reloaded Olympus/images/avatars/upload/index.htm phpBB Reloaded Olympus/images/icons/ phpBB Reloaded Olympus/images/icons/index.htm phpBB Reloaded Olympus/images/icons/misc/ phpBB Reloaded Olympus/images/icons/misc/arrow_bold_rgt.gif phpBB Reloaded Olympus/images/icons/misc/asterix.gif phpBB Reloaded Olympus/images/icons/misc/index.htm phpBB Reloaded Olympus/images/icons/misc/musical.gif phpBB Reloaded Olympus/images/icons/misc/square.gif phpBB Reloaded Olympus/images/icons/smile/ phpBB Reloaded Olympus/images/icons/smile/alien_grn.gif phpBB Reloaded Olympus/images/icons/smile/exclaim.gif phpBB Reloaded Olympus/images/icons/smile/idea.gif phpBB Reloaded Olympus/images/icons/smile/index.htm phpBB Reloaded Olympus/images/icons/smile/mr_green.gif phpBB Reloaded Olympus/images/icons/smile/question.gif phpBB Reloaded Olympus/images/icons/smile/redface_anim.gif phpBB Reloaded Olympus/images/index.htm phpBB Reloaded Olympus/images/ranks/ phpBB Reloaded Olympus/images/ranks/index.htm phpBB Reloaded Olympus/images/smilies/ phpBB Reloaded Olympus/images/smilies/icon_arrow.gif phpBB Reloaded Olympus/images/smilies/icon_biggrin.gif phpBB Reloaded Olympus/images/smilies/icon_confused.gif phpBB Reloaded Olympus/images/smilies/icon_cool.gif phpBB Reloaded Olympus/images/smilies/icon_cry.gif phpBB Reloaded Olympus/images/smilies/icon_eek.gif phpBB Reloaded Olympus/images/smilies/icon_evil.gif phpBB Reloaded Olympus/images/smilies/icon_exclaim.gif phpBB Reloaded Olympus/images/smilies/icon_frown.gif phpBB Reloaded Olympus/images/smilies/icon_idea.gif phpBB Reloaded Olympus/images/smilies/icon_lol.gif phpBB Reloaded Olympus/images/smilies/icon_mad.gif phpBB Reloaded Olympus/images/smilies/icon_mrgreen.gif phpBB Reloaded Olympus/images/smilies/icon_neutral.gif phpBB Reloaded Olympus/images/smilies/icon_question.gif phpBB Reloaded Olympus/images/smilies/icon_razz.gif phpBB Reloaded Olympus/images/smilies/icon_redface.gif phpBB Reloaded Olympus/images/smilies/icon_rolleyes.gif phpBB Reloaded Olympus/images/smilies/icon_sad.gif phpBB Reloaded Olympus/images/smilies/icon_smile.gif phpBB Reloaded Olympus/images/smilies/icon_surprised.gif phpBB Reloaded Olympus/images/smilies/icon_twisted.gif phpBB Reloaded Olympus/images/smilies/icon_wink.gif phpBB Reloaded Olympus/images/spacer.gif phpBB Reloaded Olympus/images/upload_icons/ phpBB Reloaded Olympus/images/upload_icons/avi.gif phpBB Reloaded Olympus/images/upload_icons/bmp.gif phpBB Reloaded Olympus/images/upload_icons/doc.gif phpBB Reloaded Olympus/images/upload_icons/exe.gif phpBB Reloaded Olympus/images/upload_icons/flash.gif phpBB Reloaded Olympus/images/upload_icons/gif.gif phpBB Reloaded Olympus/images/upload_icons/html.gif phpBB Reloaded Olympus/images/upload_icons/jpg.gif phpBB Reloaded Olympus/images/upload_icons/mid.gif phpBB Reloaded Olympus/images/upload_icons/mov.gif phpBB Reloaded Olympus/images/upload_icons/mp3.gif phpBB Reloaded Olympus/images/upload_icons/mpg.gif phpBB Reloaded Olympus/images/upload_icons/netscape.gif phpBB Reloaded Olympus/images/upload_icons/pdf.gif phpBB Reloaded Olympus/images/upload_icons/ppt.gif phpBB Reloaded Olympus/images/upload_icons/rar.gif phpBB Reloaded Olympus/images/upload_icons/txt.gif phpBB Reloaded Olympus/images/upload_icons/wav.gif phpBB Reloaded Olympus/images/upload_icons/xls.gif phpBB Reloaded Olympus/images/upload_icons/zip.gif phpBB Reloaded Olympus/includes/ phpBB Reloaded Olympus/includes/acm/ phpBB Reloaded Olympus/includes/acm/acm_file.php phpBB Reloaded Olympus/includes/acp/ phpBB Reloaded Olympus/includes/acp/acp_attachments.php phpBB Reloaded Olympus/includes/acp/acp_ban.php phpBB Reloaded Olympus/includes/acp/acp_bbcodes.php phpBB Reloaded Olympus/includes/acp/acp_board.php phpBB Reloaded Olympus/includes/acp/acp_bots.php phpBB Reloaded Olympus/includes/acp/acp_database.php phpBB Reloaded Olympus/includes/acp/acp_disallow.php phpBB Reloaded Olympus/includes/acp/acp_email.php phpBB Reloaded Olympus/includes/acp/acp_forums.php phpBB Reloaded Olympus/includes/acp/acp_groups.php phpBB Reloaded Olympus/includes/acp/acp_icons.php phpBB Reloaded Olympus/includes/acp/acp_jabber.php phpBB Reloaded Olympus/includes/acp/acp_language.php phpBB Reloaded Olympus/includes/acp/acp_logs.php phpBB Reloaded Olympus/includes/acp/acp_main.php phpBB Reloaded Olympus/includes/acp/acp_modules.php phpBB Reloaded Olympus/includes/acp/acp_permission_roles.php phpBB Reloaded Olympus/includes/acp/acp_permissions.php phpBB Reloaded Olympus/includes/acp/acp_php_info.php phpBB Reloaded Olympus/includes/acp/acp_profile.php phpBB Reloaded Olympus/includes/acp/acp_prune.php phpBB Reloaded Olympus/includes/acp/acp_ranks.php phpBB Reloaded Olympus/includes/acp/acp_reasons.php phpBB Reloaded Olympus/includes/acp/acp_search.php phpBB Reloaded Olympus/includes/acp/acp_styles.php phpBB Reloaded Olympus/includes/acp/acp_users.php phpBB Reloaded Olympus/includes/acp/acp_words.php phpBB Reloaded Olympus/includes/acp/auth.php phpBB Reloaded Olympus/includes/acp/info/ phpBB Reloaded Olympus/includes/acp/info/acp_attachments.php phpBB Reloaded Olympus/includes/acp/info/acp_ban.php phpBB Reloaded Olympus/includes/acp/info/acp_bbcodes.php phpBB Reloaded Olympus/includes/acp/info/acp_board.php phpBB Reloaded Olympus/includes/acp/info/acp_bots.php phpBB Reloaded Olympus/includes/acp/info/acp_database.php phpBB Reloaded Olympus/includes/acp/info/acp_disallow.php phpBB Reloaded Olympus/includes/acp/info/acp_email.php phpBB Reloaded Olympus/includes/acp/info/acp_forums.php phpBB Reloaded Olympus/includes/acp/info/acp_groups.php phpBB Reloaded Olympus/includes/acp/info/acp_icons.php phpBB Reloaded Olympus/includes/acp/info/acp_jabber.php phpBB Reloaded Olympus/includes/acp/info/acp_language.php phpBB Reloaded Olympus/includes/acp/info/acp_logs.php phpBB Reloaded Olympus/includes/acp/info/acp_main.php phpBB Reloaded Olympus/includes/acp/info/acp_modules.php phpBB Reloaded Olympus/includes/acp/info/acp_permission_roles.php phpBB Reloaded Olympus/includes/acp/info/acp_permissions.php phpBB Reloaded Olympus/includes/acp/info/acp_php_info.php phpBB Reloaded Olympus/includes/acp/info/acp_profile.php phpBB Reloaded Olympus/includes/acp/info/acp_prune.php phpBB Reloaded Olympus/includes/acp/info/acp_ranks.php phpBB Reloaded Olympus/includes/acp/info/acp_reasons.php phpBB Reloaded Olympus/includes/acp/info/acp_search.php phpBB Reloaded Olympus/includes/acp/info/acp_styles.php phpBB Reloaded Olympus/includes/acp/info/acp_users.php phpBB Reloaded Olympus/includes/acp/info/acp_words.php phpBB Reloaded Olympus/includes/auth/ phpBB Reloaded Olympus/includes/auth/auth_apache.php phpBB Reloaded Olympus/includes/auth/auth_db.php phpBB Reloaded Olympus/includes/auth/auth_ldap.php phpBB Reloaded Olympus/includes/auth/index.htm phpBB Reloaded Olympus/includes/auth.php phpBB Reloaded Olympus/includes/bbcode.php phpBB Reloaded Olympus/includes/cache.php phpBB Reloaded Olympus/includes/captcha/ phpBB Reloaded Olympus/includes/captcha/captcha_gd.php phpBB Reloaded Olympus/includes/captcha/captcha_non_gd.php phpBB Reloaded Olympus/includes/captcha/fonts/ phpBB Reloaded Olympus/includes/captcha/fonts/dustismo_bold.ttf phpBB Reloaded Olympus/includes/captcha/fonts/genr102.ttf phpBB Reloaded Olympus/includes/captcha/fonts/mgopencosmeticabold.ttf phpBB Reloaded Olympus/includes/captcha/fonts/rubbfont.ttf phpBB Reloaded Olympus/includes/constants.php phpBB Reloaded Olympus/includes/db/ phpBB Reloaded Olympus/includes/db/dbal.php phpBB Reloaded Olympus/includes/db/firebird.php phpBB Reloaded Olympus/includes/db/index.htm phpBB Reloaded Olympus/includes/db/mssql.php phpBB Reloaded Olympus/includes/db/mssql_odbc.php phpBB Reloaded Olympus/includes/db/mysql.php phpBB Reloaded Olympus/includes/db/mysql4.php phpBB Reloaded Olympus/includes/db/mysqli.php phpBB Reloaded Olympus/includes/db/oracle.php phpBB Reloaded Olympus/includes/db/postgres.php phpBB Reloaded Olympus/includes/db/sqlite.php phpBB Reloaded Olympus/includes/functions.php phpBB Reloaded Olympus/includes/functions_admin.php phpBB Reloaded Olympus/includes/functions_compress.php phpBB Reloaded Olympus/includes/functions_display.php phpBB Reloaded Olympus/includes/functions_jabber.php phpBB Reloaded Olympus/includes/functions_messenger.php phpBB Reloaded Olympus/includes/functions_module.php phpBB Reloaded Olympus/includes/functions_posting.php phpBB Reloaded Olympus/includes/functions_privmsgs.php phpBB Reloaded Olympus/includes/functions_profile_fields.php phpBB Reloaded Olympus/includes/functions_template.php phpBB Reloaded Olympus/includes/functions_transfer.php phpBB Reloaded Olympus/includes/functions_upload.php phpBB Reloaded Olympus/includes/functions_user.php phpBB Reloaded Olympus/includes/index.htm phpBB Reloaded Olympus/includes/mcp/ phpBB Reloaded Olympus/includes/mcp/info/ phpBB Reloaded Olympus/includes/mcp/info/mcp_ban.php phpBB Reloaded Olympus/includes/mcp/info/mcp_logs.php phpBB Reloaded Olympus/includes/mcp/info/mcp_main.php phpBB Reloaded Olympus/includes/mcp/info/mcp_notes.php phpBB Reloaded Olympus/includes/mcp/info/mcp_queue.php phpBB Reloaded Olympus/includes/mcp/info/mcp_reports.php phpBB Reloaded Olympus/includes/mcp/info/mcp_warn.php phpBB Reloaded Olympus/includes/mcp/mcp_ban.php phpBB Reloaded Olympus/includes/mcp/mcp_forum.php phpBB Reloaded Olympus/includes/mcp/mcp_front.php phpBB Reloaded Olympus/includes/mcp/mcp_logs.php phpBB Reloaded Olympus/includes/mcp/mcp_main.php phpBB Reloaded Olympus/includes/mcp/mcp_notes.php phpBB Reloaded Olympus/includes/mcp/mcp_post.php phpBB Reloaded Olympus/includes/mcp/mcp_queue.php phpBB Reloaded Olympus/includes/mcp/mcp_reports.php phpBB Reloaded Olympus/includes/mcp/mcp_topic.php phpBB Reloaded Olympus/includes/mcp/mcp_warn.php phpBB Reloaded Olympus/includes/message_parser.php phpBB Reloaded Olympus/includes/search/ phpBB Reloaded Olympus/includes/search/fulltext_mysql.php phpBB Reloaded Olympus/includes/search/fulltext_native.php phpBB Reloaded Olympus/includes/search/index.htm phpBB Reloaded Olympus/includes/search/search.php phpBB Reloaded Olympus/includes/session.php phpBB Reloaded Olympus/includes/template.php phpBB Reloaded Olympus/includes/ucp/ phpBB Reloaded Olympus/includes/ucp/info/ phpBB Reloaded Olympus/includes/ucp/info/ucp_attachments.php phpBB Reloaded Olympus/includes/ucp/info/ucp_groups.php phpBB Reloaded Olympus/includes/ucp/info/ucp_main.php phpBB Reloaded Olympus/includes/ucp/info/ucp_pm.php phpBB Reloaded Olympus/includes/ucp/info/ucp_prefs.php phpBB Reloaded Olympus/includes/ucp/info/ucp_profile.php phpBB Reloaded Olympus/includes/ucp/info/ucp_zebra.php phpBB Reloaded Olympus/includes/ucp/ucp_activate.php phpBB Reloaded Olympus/includes/ucp/ucp_attachments.php phpBB Reloaded Olympus/includes/ucp/ucp_confirm.php phpBB Reloaded Olympus/includes/ucp/ucp_groups.php phpBB Reloaded Olympus/includes/ucp/ucp_main.php phpBB Reloaded Olympus/includes/ucp/ucp_pm.php phpBB Reloaded Olympus/includes/ucp/ucp_pm_compose.php phpBB Reloaded Olympus/includes/ucp/ucp_pm_options.php phpBB Reloaded Olympus/includes/ucp/ucp_pm_viewfolder.php phpBB Reloaded Olympus/includes/ucp/ucp_pm_viewmessage.php phpBB Reloaded Olympus/includes/ucp/ucp_prefs.php phpBB Reloaded Olympus/includes/ucp/ucp_profile.php phpBB Reloaded Olympus/includes/ucp/ucp_register.php phpBB Reloaded Olympus/includes/ucp/ucp_remind.php phpBB Reloaded Olympus/includes/ucp/ucp_resend.php phpBB Reloaded Olympus/includes/ucp/ucp_zebra.php phpBB Reloaded Olympus/index.php phpBB Reloaded Olympus/install/ phpBB Reloaded Olympus/install/index.php phpBB Reloaded Olympus/install/install_install.php phpBB Reloaded Olympus/install/install_main.php phpBB Reloaded Olympus/install/phpinfo.php phpBB Reloaded Olympus/install/schemas/ phpBB Reloaded Olympus/install/schemas/firebird_schema.sql phpBB Reloaded Olympus/install/schemas/index.htm phpBB Reloaded Olympus/install/schemas/mssql_schema.sql phpBB Reloaded Olympus/install/schemas/mysql_schema.sql phpBB Reloaded Olympus/install/schemas/oracle_schema.sql phpBB Reloaded Olympus/install/schemas/postgres_schema.sql phpBB Reloaded Olympus/install/schemas/schema_data.sql phpBB Reloaded Olympus/install/schemas/sqlite_schema.sql phpBB Reloaded Olympus/language/ phpBB Reloaded Olympus/language/en/ phpBB Reloaded Olympus/language/en/acp/ phpBB Reloaded Olympus/language/en/acp/attachments.php phpBB Reloaded Olympus/language/en/acp/ban.php phpBB Reloaded Olympus/language/en/acp/board.php phpBB Reloaded Olympus/language/en/acp/bots.php phpBB Reloaded Olympus/language/en/acp/common.php phpBB Reloaded Olympus/language/en/acp/database.php phpBB Reloaded Olympus/language/en/acp/email.php phpBB Reloaded Olympus/language/en/acp/forums.php phpBB Reloaded Olympus/language/en/acp/groups.php phpBB Reloaded Olympus/language/en/acp/language.php phpBB Reloaded Olympus/language/en/acp/modules.php phpBB Reloaded Olympus/language/en/acp/permissions.php phpBB Reloaded Olympus/language/en/acp/permissions_phpbb.php phpBB Reloaded Olympus/language/en/acp/posting.php phpBB Reloaded Olympus/language/en/acp/profile.php phpBB Reloaded Olympus/language/en/acp/prune.php phpBB Reloaded Olympus/language/en/acp/search.php phpBB Reloaded Olympus/language/en/acp/styles.php phpBB Reloaded Olympus/language/en/acp/users.php phpBB Reloaded Olympus/language/en/common.php phpBB Reloaded Olympus/language/en/email/ phpBB Reloaded Olympus/language/en/email/admin_activate.txt phpBB Reloaded Olympus/language/en/email/admin_send_email.txt phpBB Reloaded Olympus/language/en/email/admin_welcome_activated.txt phpBB Reloaded Olympus/language/en/email/admin_welcome_inactive.txt phpBB Reloaded Olympus/language/en/email/coppa_resend_inactive.txt phpBB Reloaded Olympus/language/en/email/coppa_welcome_inactive.txt phpBB Reloaded Olympus/language/en/email/email_notify.txt phpBB Reloaded Olympus/language/en/email/forum_notify.txt phpBB Reloaded Olympus/language/en/email/group_added.txt phpBB Reloaded Olympus/language/en/email/group_approved.txt phpBB Reloaded Olympus/language/en/email/group_request.txt phpBB Reloaded Olympus/language/en/email/index.htm phpBB Reloaded Olympus/language/en/email/installed.txt phpBB Reloaded Olympus/language/en/email/newtopic_notify.txt phpBB Reloaded Olympus/language/en/email/post_approved.txt phpBB Reloaded Olympus/language/en/email/post_disapproved.txt phpBB Reloaded Olympus/language/en/email/privmsg_notify.txt phpBB Reloaded Olympus/language/en/email/profile_send_email.txt phpBB Reloaded Olympus/language/en/email/profile_send_im.txt phpBB Reloaded Olympus/language/en/email/report_closed.txt phpBB Reloaded Olympus/language/en/email/report_deleted.txt phpBB Reloaded Olympus/language/en/email/topic_approved.txt phpBB Reloaded Olympus/language/en/email/topic_disapproved.txt phpBB Reloaded Olympus/language/en/email/topic_notify.txt phpBB Reloaded Olympus/language/en/email/user_activate.txt phpBB Reloaded Olympus/language/en/email/user_activate_inactive.txt phpBB Reloaded Olympus/language/en/email/user_activate_passwd.txt phpBB Reloaded Olympus/language/en/email/user_remind_inactive.txt phpBB Reloaded Olympus/language/en/email/user_resend_inactive.txt phpBB Reloaded Olympus/language/en/email/user_welcome.txt phpBB Reloaded Olympus/language/en/email/user_welcome_inactive.txt phpBB Reloaded Olympus/language/en/groups.php phpBB Reloaded Olympus/language/en/help_bbcode.php phpBB Reloaded Olympus/language/en/help_faq.php phpBB Reloaded Olympus/language/en/index.htm phpBB Reloaded Olympus/language/en/install.php phpBB Reloaded Olympus/language/en/iso.txt phpBB Reloaded Olympus/language/en/mcp.php phpBB Reloaded Olympus/language/en/memberlist.php phpBB Reloaded Olympus/language/en/posting.php phpBB Reloaded Olympus/language/en/search.php phpBB Reloaded Olympus/language/en/search_ignore_words.php phpBB Reloaded Olympus/language/en/search_synonyms.php phpBB Reloaded Olympus/language/en/ucp.php phpBB Reloaded Olympus/language/en/viewforum.php phpBB Reloaded Olympus/language/en/viewtopic.php phpBB Reloaded Olympus/language/index.htm phpBB Reloaded Olympus/mcp.php phpBB Reloaded Olympus/memberlist.php phpBB Reloaded Olympus/posting.php phpBB Reloaded Olympus/report.php phpBB Reloaded Olympus/search.php phpBB Reloaded Olympus/store/ phpBB Reloaded Olympus/store/.htaccess phpBB Reloaded Olympus/style.php phpBB Reloaded Olympus/styles/ phpBB Reloaded Olympus/styles/subSilver/ phpBB Reloaded Olympus/styles/subSilver/imageset/ phpBB Reloaded Olympus/styles/subSilver/imageset/en/ phpBB Reloaded Olympus/styles/subSilver/imageset/en/btn_aim.gif phpBB Reloaded Olympus/styles/subSilver/imageset/en/btn_approve.gif phpBB Reloaded Olympus/styles/subSilver/imageset/en/btn_delete.gif phpBB Reloaded Olympus/styles/subSilver/imageset/en/btn_edit.gif phpBB Reloaded Olympus/styles/subSilver/imageset/en/btn_email.gif phpBB Reloaded Olympus/styles/subSilver/imageset/en/btn_icq.gif phpBB Reloaded Olympus/styles/subSilver/imageset/en/btn_info.gif phpBB Reloaded Olympus/styles/subSilver/imageset/en/btn_jabber.gif phpBB Reloaded Olympus/styles/subSilver/imageset/en/btn_locked.gif phpBB Reloaded Olympus/styles/subSilver/imageset/en/btn_msnm.gif phpBB Reloaded Olympus/styles/subSilver/imageset/en/btn_offline.gif phpBB Reloaded Olympus/styles/subSilver/imageset/en/btn_online.gif phpBB Reloaded Olympus/styles/subSilver/imageset/en/btn_pm.gif phpBB Reloaded Olympus/styles/subSilver/imageset/en/btn_post.gif phpBB Reloaded Olympus/styles/subSilver/imageset/en/btn_post_pm.gif phpBB Reloaded Olympus/styles/subSilver/imageset/en/btn_profile.gif phpBB Reloaded Olympus/styles/subSilver/imageset/en/btn_quote.gif phpBB Reloaded Olympus/styles/subSilver/imageset/en/btn_reply.gif phpBB Reloaded Olympus/styles/subSilver/imageset/en/btn_reply_pm.gif phpBB Reloaded Olympus/styles/subSilver/imageset/en/btn_report.gif phpBB Reloaded Olympus/styles/subSilver/imageset/en/btn_search.gif phpBB Reloaded Olympus/styles/subSilver/imageset/en/btn_www.gif phpBB Reloaded Olympus/styles/subSilver/imageset/en/btn_yim.gif phpBB Reloaded Olympus/styles/subSilver/imageset/folder.gif phpBB Reloaded Olympus/styles/subSilver/imageset/folder_announce.gif phpBB Reloaded Olympus/styles/subSilver/imageset/folder_announce_new.gif phpBB Reloaded Olympus/styles/subSilver/imageset/folder_announce_new_posted.gif phpBB Reloaded Olympus/styles/subSilver/imageset/folder_announce_posted.gif phpBB Reloaded Olympus/styles/subSilver/imageset/folder_big.gif phpBB Reloaded Olympus/styles/subSilver/imageset/folder_hot.gif phpBB Reloaded Olympus/styles/subSilver/imageset/folder_hot_posted.gif phpBB Reloaded Olympus/styles/subSilver/imageset/folder_link_big.gif phpBB Reloaded Olympus/styles/subSilver/imageset/folder_lock.gif phpBB Reloaded Olympus/styles/subSilver/imageset/folder_lock_new.gif phpBB Reloaded Olympus/styles/subSilver/imageset/folder_lock_new_posted.gif phpBB Reloaded Olympus/styles/subSilver/imageset/folder_lock_posted.gif phpBB Reloaded Olympus/styles/subSilver/imageset/folder_locked_big.gif phpBB Reloaded Olympus/styles/subSilver/imageset/folder_moved.gif phpBB Reloaded Olympus/styles/subSilver/imageset/folder_new.gif phpBB Reloaded Olympus/styles/subSilver/imageset/folder_new_big.gif phpBB Reloaded Olympus/styles/subSilver/imageset/folder_new_hot.gif phpBB Reloaded Olympus/styles/subSilver/imageset/folder_new_hot_posted.gif phpBB Reloaded Olympus/styles/subSilver/imageset/folder_new_posted.gif phpBB Reloaded Olympus/styles/subSilver/imageset/folder_posted.gif phpBB Reloaded Olympus/styles/subSilver/imageset/folder_sticky.gif phpBB Reloaded Olympus/styles/subSilver/imageset/folder_sticky_new.gif phpBB Reloaded Olympus/styles/subSilver/imageset/folder_sticky_new_posted.gif phpBB Reloaded Olympus/styles/subSilver/imageset/folder_sticky_posted.gif phpBB Reloaded Olympus/styles/subSilver/imageset/icon_attach.gif phpBB Reloaded Olympus/styles/subSilver/imageset/icon_latest_reply.gif phpBB Reloaded Olympus/styles/subSilver/imageset/icon_minipost.gif phpBB Reloaded Olympus/styles/subSilver/imageset/icon_minipost_new.gif phpBB Reloaded Olympus/styles/subSilver/imageset/icon_newest_reply.gif phpBB Reloaded Olympus/styles/subSilver/imageset/icon_reported.gif phpBB Reloaded Olympus/styles/subSilver/imageset/icon_unapproved.gif phpBB Reloaded Olympus/styles/subSilver/imageset/imageset.cfg phpBB Reloaded Olympus/styles/subSilver/imageset/progress_bar.gif phpBB Reloaded Olympus/styles/subSilver/imageset/sitelogo.gif phpBB Reloaded Olympus/styles/subSilver/imageset/subfolder_big.gif phpBB Reloaded Olympus/styles/subSilver/imageset/subfolder_new_big.gif phpBB Reloaded Olympus/styles/subSilver/imageset/vote_lcap.gif phpBB Reloaded Olympus/styles/subSilver/imageset/vote_rcap.gif phpBB Reloaded Olympus/styles/subSilver/imageset/voting_bar.gif phpBB Reloaded Olympus/styles/subSilver/style.cfg phpBB Reloaded Olympus/styles/subSilver/template/ phpBB Reloaded Olympus/styles/subSilver/template/attachment.html phpBB Reloaded Olympus/styles/subSilver/template/bbcode.html phpBB Reloaded Olympus/styles/subSilver/template/confirm_body.html phpBB Reloaded Olympus/styles/subSilver/template/custom_profile_fields.html phpBB Reloaded Olympus/styles/subSilver/template/editor.js phpBB Reloaded Olympus/styles/subSilver/template/faq_body.html phpBB Reloaded Olympus/styles/subSilver/template/index.htm phpBB Reloaded Olympus/styles/subSilver/template/index_body.html phpBB Reloaded Olympus/styles/subSilver/template/jumpbox.html phpBB Reloaded Olympus/styles/subSilver/template/login_body.html phpBB Reloaded Olympus/styles/subSilver/template/login_forum.html phpBB Reloaded Olympus/styles/subSilver/template/mcp_approve.html phpBB Reloaded Olympus/styles/subSilver/template/mcp_ban.html phpBB Reloaded Olympus/styles/subSilver/template/mcp_footer.html phpBB Reloaded Olympus/styles/subSilver/template/mcp_forum.html phpBB Reloaded Olympus/styles/subSilver/template/mcp_front.html phpBB Reloaded Olympus/styles/subSilver/template/mcp_header.html phpBB Reloaded Olympus/styles/subSilver/template/mcp_jumpbox.html phpBB Reloaded Olympus/styles/subSilver/template/mcp_logs.html phpBB Reloaded Olympus/styles/subSilver/template/mcp_message.html phpBB Reloaded Olympus/styles/subSilver/template/mcp_move.html phpBB Reloaded Olympus/styles/subSilver/template/mcp_notes_front.html phpBB Reloaded Olympus/styles/subSilver/template/mcp_notes_user.html phpBB Reloaded Olympus/styles/subSilver/template/mcp_post.html phpBB Reloaded Olympus/styles/subSilver/template/mcp_queue.html phpBB Reloaded Olympus/styles/subSilver/template/mcp_reports.html phpBB Reloaded Olympus/styles/subSilver/template/mcp_topic.html phpBB Reloaded Olympus/styles/subSilver/template/mcp_viewlogs.html phpBB Reloaded Olympus/styles/subSilver/template/mcp_warn_front.html phpBB Reloaded Olympus/styles/subSilver/template/mcp_warn_list.html phpBB Reloaded Olympus/styles/subSilver/template/mcp_warn_post.html phpBB Reloaded Olympus/styles/subSilver/template/mcp_warn_user.html phpBB Reloaded Olympus/styles/subSilver/template/mcp_whois.html phpBB Reloaded Olympus/styles/subSilver/template/memberlist_body.html phpBB Reloaded Olympus/styles/subSilver/template/memberlist_email.html phpBB Reloaded Olympus/styles/subSilver/template/memberlist_group.html phpBB Reloaded Olympus/styles/subSilver/template/memberlist_im.html phpBB Reloaded Olympus/styles/subSilver/template/memberlist_leaders.html phpBB Reloaded Olympus/styles/subSilver/template/memberlist_search.html phpBB Reloaded Olympus/styles/subSilver/template/memberlist_view.html phpBB Reloaded Olympus/styles/subSilver/template/message_body.html phpBB Reloaded Olympus/styles/subSilver/template/overall_footer.html phpBB Reloaded Olympus/styles/subSilver/template/overall_header.html phpBB Reloaded Olympus/styles/subSilver/template/posting_attach_body.html phpBB Reloaded Olympus/styles/subSilver/template/posting_body.html phpBB Reloaded Olympus/styles/subSilver/template/posting_poll_body.html phpBB Reloaded Olympus/styles/subSilver/template/posting_preview.html phpBB Reloaded Olympus/styles/subSilver/template/posting_progress_bar.html phpBB Reloaded Olympus/styles/subSilver/template/posting_review.html phpBB Reloaded Olympus/styles/subSilver/template/posting_smilies.html phpBB Reloaded Olympus/styles/subSilver/template/posting_topic_review.html phpBB Reloaded Olympus/styles/subSilver/template/report_body.html phpBB Reloaded Olympus/styles/subSilver/template/search_body.html phpBB Reloaded Olympus/styles/subSilver/template/search_results.html phpBB Reloaded Olympus/styles/subSilver/template/searchbox.html phpBB Reloaded Olympus/styles/subSilver/template/simple_footer.html phpBB Reloaded Olympus/styles/subSilver/template/simple_header.html phpBB Reloaded Olympus/styles/subSilver/template/template.cfg phpBB Reloaded Olympus/styles/subSilver/template/ucp_agreement.html phpBB Reloaded Olympus/styles/subSilver/template/ucp_attachments.html phpBB Reloaded Olympus/styles/subSilver/template/ucp_footer.html phpBB Reloaded Olympus/styles/subSilver/template/ucp_groups_manage.html phpBB Reloaded Olympus/styles/subSilver/template/ucp_groups_membership.html phpBB Reloaded Olympus/styles/subSilver/template/ucp_header.html phpBB Reloaded Olympus/styles/subSilver/template/ucp_main_bookmarks.html phpBB Reloaded Olympus/styles/subSilver/template/ucp_main_drafts.html phpBB Reloaded Olympus/styles/subSilver/template/ucp_main_front.html phpBB Reloaded Olympus/styles/subSilver/template/ucp_main_subscribed.html phpBB Reloaded Olympus/styles/subSilver/template/ucp_pm_history.html phpBB Reloaded Olympus/styles/subSilver/template/ucp_pm_message_footer.html phpBB Reloaded Olympus/styles/subSilver/template/ucp_pm_message_header.html phpBB Reloaded Olympus/styles/subSilver/template/ucp_pm_options.html phpBB Reloaded Olympus/styles/subSilver/template/ucp_pm_popup.html phpBB Reloaded Olympus/styles/subSilver/template/ucp_pm_viewfolder.html phpBB Reloaded Olympus/styles/subSilver/template/ucp_pm_viewmessage.html phpBB Reloaded Olympus/styles/subSilver/template/ucp_pm_viewmessage_print.html phpBB Reloaded Olympus/styles/subSilver/template/ucp_prefs_personal.html phpBB Reloaded Olympus/styles/subSilver/template/ucp_prefs_post.html phpBB Reloaded Olympus/styles/subSilver/template/ucp_prefs_view.html phpBB Reloaded Olympus/styles/subSilver/template/ucp_profile_avatar.html phpBB Reloaded Olympus/styles/subSilver/template/ucp_profile_profile_info.html phpBB Reloaded Olympus/styles/subSilver/template/ucp_profile_reg_details.html phpBB Reloaded Olympus/styles/subSilver/template/ucp_profile_signature.html phpBB Reloaded Olympus/styles/subSilver/template/ucp_register.html phpBB Reloaded Olympus/styles/subSilver/template/ucp_remind.html phpBB Reloaded Olympus/styles/subSilver/template/ucp_resend.html phpBB Reloaded Olympus/styles/subSilver/template/ucp_zebra_foes.html phpBB Reloaded Olympus/styles/subSilver/template/ucp_zebra_friends.html phpBB Reloaded Olympus/styles/subSilver/template/viewforum_body.html phpBB Reloaded Olympus/styles/subSilver/template/viewforum_subforum.html phpBB Reloaded Olympus/styles/subSilver/template/viewonline_body.html phpBB Reloaded Olympus/styles/subSilver/template/viewonline_whois.html phpBB Reloaded Olympus/styles/subSilver/template/viewtopic_body.html phpBB Reloaded Olympus/styles/subSilver/template/viewtopic_print.html phpBB Reloaded Olympus/styles/subSilver/theme/ phpBB Reloaded Olympus/styles/subSilver/theme/images/ phpBB Reloaded Olympus/styles/subSilver/theme/images/background.gif phpBB Reloaded Olympus/styles/subSilver/theme/images/cellpic.gif phpBB Reloaded Olympus/styles/subSilver/theme/images/cellpic1.gif phpBB Reloaded Olympus/styles/subSilver/theme/images/cellpic2.jpg phpBB Reloaded Olympus/styles/subSilver/theme/images/cellpic3.gif phpBB Reloaded Olympus/styles/subSilver/theme/images/created_by.jpg phpBB Reloaded Olympus/styles/subSilver/theme/images/icon_mini_faq.gif phpBB Reloaded Olympus/styles/subSilver/theme/images/icon_mini_groups.gif phpBB Reloaded Olympus/styles/subSilver/theme/images/icon_mini_login.gif phpBB Reloaded Olympus/styles/subSilver/theme/images/icon_mini_members.gif phpBB Reloaded Olympus/styles/subSilver/theme/images/icon_mini_message.gif phpBB Reloaded Olympus/styles/subSilver/theme/images/icon_mini_profile.gif phpBB Reloaded Olympus/styles/subSilver/theme/images/icon_mini_register.gif phpBB Reloaded Olympus/styles/subSilver/theme/images/icon_mini_search.gif phpBB Reloaded Olympus/styles/subSilver/theme/images/index.htm phpBB Reloaded Olympus/styles/subSilver/theme/images/no_avatar.gif phpBB Reloaded Olympus/styles/subSilver/theme/images/spacer.gif phpBB Reloaded Olympus/styles/subSilver/theme/images/whosonline.gif phpBB Reloaded Olympus/styles/subSilver/theme/stylesheet.css phpBB Reloaded Olympus/styles/subSilver/theme/theme.cfg phpBB Reloaded Olympus/ucp.php phpBB Reloaded Olympus/viewforum.php phpBB Reloaded Olympus/viewonline.php phpBB Reloaded Olympus/viewtopic.php Added: phpBB Reloaded Olympus/adm/images/arrow_down.gif =================================================================== (Binary files differ) Property changes on: phpBB Reloaded Olympus/adm/images/arrow_down.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: phpBB Reloaded Olympus/adm/images/bg_hash1.gif =================================================================== (Binary files differ) Property changes on: phpBB Reloaded Olympus/adm/images/bg_hash1.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: phpBB Reloaded Olympus/adm/images/bg_hash2.gif =================================================================== (Binary files differ) Property changes on: phpBB Reloaded Olympus/adm/images/bg_hash2.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: phpBB Reloaded Olympus/adm/images/bg_hash3.gif =================================================================== (Binary files differ) Property changes on: phpBB Reloaded Olympus/adm/images/bg_hash3.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: phpBB Reloaded Olympus/adm/images/bg_hash4.gif =================================================================== (Binary files differ) Property changes on: phpBB Reloaded Olympus/adm/images/bg_hash4.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: phpBB Reloaded Olympus/adm/images/bg_header.gif =================================================================== (Binary files differ) Property changes on: phpBB Reloaded Olympus/adm/images/bg_header.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: phpBB Reloaded Olympus/adm/images/bg_tabs1.gif =================================================================== (Binary files differ) Property changes on: phpBB Reloaded Olympus/adm/images/bg_tabs1.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: phpBB Reloaded Olympus/adm/images/bg_tabs2.gif =================================================================== (Binary files differ) Property changes on: phpBB Reloaded Olympus/adm/images/bg_tabs2.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: phpBB Reloaded Olympus/adm/images/cellpic3.gif =================================================================== (Binary files differ) Property changes on: phpBB Reloaded Olympus/adm/images/cellpic3.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: phpBB Reloaded Olympus/adm/images/gradient2b.gif =================================================================== (Binary files differ) Property changes on: phpBB Reloaded Olympus/adm/images/gradient2b.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: phpBB Reloaded Olympus/adm/images/icon_delete.gif =================================================================== (Binary files differ) Property changes on: phpBB Reloaded Olympus/adm/images/icon_delete.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: phpBB Reloaded Olympus/adm/images/icon_down.gif =================================================================== (Binary files differ) Property changes on: phpBB Reloaded Olympus/adm/images/icon_down.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: phpBB Reloaded Olympus/adm/images/icon_edit.gif =================================================================== (Binary files differ) Property changes on: phpBB Reloaded Olympus/adm/images/icon_edit.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: phpBB Reloaded Olympus/adm/images/icon_folder.gif =================================================================== (Binary files differ) Property changes on: phpBB Reloaded Olympus/adm/images/icon_folder.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: phpBB Reloaded Olympus/adm/images/icon_folder_link.gif =================================================================== (Binary files differ) Property changes on: phpBB Reloaded Olympus/adm/images/icon_folder_link.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: phpBB Reloaded Olympus/adm/images/icon_folder_link_small.gif =================================================================== (Binary files differ) Property changes on: phpBB Reloaded Olympus/adm/images/icon_folder_link_small.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: phpBB Reloaded Olympus/adm/images/icon_folder_lock.gif =================================================================== (Binary files differ) Property changes on: phpBB Reloaded Olympus/adm/images/icon_folder_lock.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: phpBB Reloaded Olympus/adm/images/icon_folder_lock_small.gif =================================================================== (Binary files differ) Property changes on: phpBB Reloaded Olympus/adm/images/icon_folder_lock_small.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: phpBB Reloaded Olympus/adm/images/icon_folder_small.gif =================================================================== (Binary files differ) Property changes on: phpBB Reloaded Olympus/adm/images/icon_folder_small.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: phpBB Reloaded Olympus/adm/images/icon_folder_sub_small.gif =================================================================== (Binary files differ) Property changes on: phpBB Reloaded Olympus/adm/images/icon_folder_sub_small.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: phpBB Reloaded Olympus/adm/images/icon_subfolder.gif =================================================================== (Binary files differ) Property changes on: phpBB Reloaded Olympus/adm/images/icon_subfolder.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: phpBB Reloaded Olympus/adm/images/icon_sync.gif =================================================================== (Binary files differ) Property changes on: phpBB Reloaded Olympus/adm/images/icon_sync.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: phpBB Reloaded Olympus/adm/images/icon_trace.gif =================================================================== (Binary files differ) Property changes on: phpBB Reloaded Olympus/adm/images/icon_trace.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: phpBB Reloaded Olympus/adm/images/icon_up.gif =================================================================== (Binary files differ) Property changes on: phpBB Reloaded Olympus/adm/images/icon_up.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: phpBB Reloaded Olympus/adm/images/no_avatar.gif =================================================================== (Binary files differ) Property changes on: phpBB Reloaded Olympus/adm/images/no_avatar.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: phpBB Reloaded Olympus/adm/images/no_image.png =================================================================== (Binary files differ) Property changes on: phpBB Reloaded Olympus/adm/images/no_image.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: phpBB Reloaded Olympus/adm/images/phpbb_logo.gif =================================================================== (Binary files differ) Property changes on: phpBB Reloaded Olympus/adm/images/phpbb_logo.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: phpBB Reloaded Olympus/adm/images/progress_bar.gif =================================================================== (Binary files differ) Property changes on: phpBB Reloaded Olympus/adm/images/progress_bar.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: phpBB Reloaded Olympus/adm/images/spacer.gif =================================================================== (Binary files differ) Property changes on: phpBB Reloaded Olympus/adm/images/spacer.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: phpBB Reloaded Olympus/adm/index.php =================================================================== --- phpBB Reloaded Olympus/adm/index.php (rev 0) +++ phpBB Reloaded Olympus/adm/index.php 2006-06-17 21:53:17 UTC (rev 229) @@ -0,0 +1,380 @@ +<?php +/** +* +* @package acp +* @version $Id: index.php,v 1.45 2006/06/16 16:54:36 acydburn Exp $ +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* +*/ + +/** +*/ +define('IN_PHPBB', 1); +define('NEED_SID', true); + +// Include files +$phpbb_root_path = './../'; +$phpEx = substr(strrchr(__FILE__, '.'), 1); +require($phpbb_root_path . 'common.' . $phpEx); +require($phpbb_root_path . 'includes/functions_admin.' . $phpEx); +require($phpbb_root_path . 'includes/functions_module.' . $phpEx); + +// Start session management +$user->session_begin(); +$auth->acl($user->data); +$user->setup('acp/common'); +// End session management + +// Did user forget to login? Give 'em a chance to here ... +if ($user->data['user_id'] == ANONYMOUS) +{ + login_box('', $user->lang['LOGIN_ADMIN'], $user->lang['LOGIN_ADMIN_SUCCESS'], true); +} + +// Have they authenticated (again) as an admin for this session? +if (!isset($user->data['session_admin']) || !$user->data['session_admin']) +{ + login_box('', $user->lang['LOGIN_ADMIN_CONFIRM'], $user->lang['LOGIN_ADMIN_SUCCESS'], true, false); +} + +// Is user any type of admin? No, then stop here, each script needs to +// check specific permissions but this is a catchall +if (!$auth->acl_get('a_')) +{ + trigger_error($user->lang['NO_ADMIN']); +} + +// We define the admin variables now, because the user is now able to use the admin related features... +define('IN_ADMIN', true); +$phpbb_admin_path = './'; + +// Some oft used variables +$safe_mode = (@ini_get('safe_mode') || @strtolower(ini_get('safe_mode')) == 'on') ? true : false; +$file_uploads = (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on') ? true : false; +$module_id = request_var('i', ''); +$mode = request_var('mode', ''); + +// Set custom template for admin area +$template->set_custom_template($phpbb_admin_path . 'style', 'admin'); +$template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style'); + +// the acp template is never stored in the database +$user->theme['template_storedb'] = false; + +// Force pagination seperation for admin style +$user->theme['pagination_sep'] = ''; + +// Instantiate new module +$module = new p_master(); + +// Instantiate module system and generate list of available modules +$module->list_modules('acp'); + +// Select the active module +$module->set_active($module_id, $mode); + +// Assign data to the template engine for the list of modules +// We do this before loading the active module for correct menu display in trigger_error +$module->assign_tpl_vars(append_sid("{$phpbb_admin_path}index.$phpEx")); + +// Load and execute the relevant module +$module->load_active(); + +// Generate the page +adm_page_header($module->get_page_title()); + +$template->set_filenames(array( + 'body' => $module->get_tpl_name()) +); + +adm_page_footer(); + +/** +* Header for acp pages +*/ +function adm_page_header($page_title) +{ + global $config, $db, $user, $template; + global $phpbb_root_path, $phpbb_admin_path, $phpEx, $SID, $_SID; + + if (defined('HEADER_INC')) + { + return; + } + + define('HEADER_INC', true); + + // gzip_compression + if ($config['gzip_compress']) + { + if (@extension_loaded('zlib') && !headers_sent()) + { + ob_start('ob_gzhandler'); + } + } + + $template->assign_vars(array( + 'PAGE_TITLE' => $page_title, + 'USERNAME' => $user->data['username'], + + 'SID' => $SID, + '_SID' => $_SID, + 'SESSION_ID' => $user->session_id, + 'ROOT_PATH' => $phpbb_admin_path, + + 'U_LOGOUT' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=logout'), + 'U_ADM_INDEX' => append_sid("{$phpbb_admin_path}index.$phpEx"), + 'U_INDEX' => append_sid("{$phpbb_root_path}index.$phpEx"), + + 'T_IMAGES_PATH' => "{$phpbb_root_path}images/", + 'T_SMILIES_PATH' => "{$phpbb_root_path}{$config['smilies_path']}/", + 'T_AVATAR_PATH' => "{$phpbb_root_path}{$config['avatar_path']}/", + 'T_AVATAR_GALLERY_PATH' => "{$phpbb_root_path}{$config['avatar_gallery_path']}/", + 'T_ICONS_PATH' => "{$phpbb_root_path}{$config['icons_path']}/", + 'T_RANKS_PATH' => "{$phpbb_root_path}{$config['ranks_path']}/", + 'T_UPLOAD_PATH' => "{$phpbb_root_path}{$config['upload_path']}/", + + 'ICON_MOVE_UP' => '<img src="' . $phpbb_admin_path . 'images/icon_up.gif" alt="' . $user->lang['MOVE_UP'] . '" title="' . $user->lang['MOVE_UP'] . '" />', + 'ICON_MOVE_DOWN' => '<img src="' . $phpbb_admin_path . 'images/icon_down.gif" alt="' . $user->lang['MOVE_DOWN'] . '" title="' . $user->lang['MOVE_DOWN'] . '" />', + 'ICON_EDIT' => '<img src="' . $phpbb_admin_path . 'images/icon_edit.gif" alt="' . $user->lang['EDIT'] . '" title="' . $user->lang['EDIT'] . '" />', + 'ICON_DELETE' => '<img src="' . $phpbb_admin_path . 'images/icon_delete.gif" alt="' . $user->lang['DELETE'] . '" title="' . $user->lang['DELETE'] . '" />', + 'ICON_SYNC' => '<img src="' . $phpbb_admin_path . 'images/icon_sync.gif" alt="' . $user->lang['RESYNC'] . '" title="' . $user->lang['RESYNC'] . '" />', + + 'S_CONTENT_DIRECTION' => $user->lang['DIRECTION'], + 'S_CONTENT_ENCODING' => $user->lang['ENCODING'], + 'S_CONTENT_DIR_LEFT' => $user->lang['LEFT'], + 'S_CONTENT_DIR_RIGHT' => $user->lang['RIGHT']) + ); + + if (!empty($config['send_encoding'])) + { + header('Content-type: text/html; charset: ' . $user->lang['ENCODING']); + } + header('Cache-Control: private, no-cache="set-cookie", pre-check=0, post-check=0'); + header('Expires: 0'); + header('Pragma: no-cache'); + + return; +} + +/** +* Page footer for acp pages +*/ +function adm_page_footer($copyright_html = true) +{ + global $db, $config, $template, $user, $auth, $cache; + global $starttime, $phpbb_root_path, $phpbb_admin_path, $phpEx; + + // Output page creation time + if (defined('DEBUG')) + { + $mtime = explode(' ', microtime()); + $totaltime = $mtime[0] + $mtime[1] - $starttime; + + if (!empty($_REQUEST['explain']) && $auth->acl_get('a_') && defined('DEBUG_EXTRA') && method_exists($db, 'sql_report')) + { + $db->sql_report('display'); + } + + $debug_output = sprintf('Time : %.3fs | ' . $db->sql_num_queries() . ' Queries | GZIP : ' . (($config['gzip_compress']) ? 'On' : 'Off') . (($user->load) ? ' | Load : ' . $user->load : ''), $totaltime); + + if ($auth->acl_get('a_') && defined('DEBUG_EXTRA')) + { + if (function_exists('memory_get_usage')) + { + if ($memory_usage = memory_get_usage()) + { + global $base_memory_usage; + $memory_usage -= $base_memory_usage; + $memory_usage = ($memory_usage >= 1048576) ? round((round($memory_usage / 1048576 * 100) / 100), 2) . ' ' . $user->lang['MB'] : (($memory_usage >= 1024) ? round((round($memory_usage / 1024 * 100) / 100), 2) . ' ' . $user->lang['KB'] : $memory_usage . ' ' . $user->lang['BYTES']); + + $debug_output .= ' | Memory Usage: ' . $memory_usage; + } + } + + $debug_output .= ' | <a href="' . build_url() . '&explain=1">Explain</a>'; + } + } + + $template->assign_vars(array( + 'DEBUG_OUTPUT' => (defined('DEBUG')) ? $debug_output : '', + 'S_COPYRIGHT_HTML' => $copyright_html, + 'VERSION' => $config['version']) + ); + + $template->display('body'); + + // Unload cache, must be done before the DB connection if closed + if (!empty($cache)) + { + $cache->unload(); + } + + // Close our DB connection. + $db->sql_close(); + + exit; +} + +/** +* Generate back link for acp pages +*/ +function adm_back_link($u_action) +{ + global $user; + return '<br /><br /><a href="' . $u_action . '">« ' . $user->lang['BACK_TO_PREV'] . '</a>'; +} + +/** +* Build select field options in acp pages +*/ +function build_select($option_ary, $option_default = false) +{ + global $user; + + $html = ''; + foreach ($option_ary as $value => $title) + { + $selected = ($option_default !== false && $value == $option_default) ? ' selected="selected"' : ''; + $html .= '<option value="' . $value . '"' . $selected . '>' . $user->lang[$title] . '</option>'; + } + + return $html; +} + +/** +* Build radio fields in acp pages +*/ +function h_radio($name, &$input_ary, $input_default = false, $id = false, $key = false) +{ + global $user; + + $html = ''; + $id_assigned = false; + foreach ($input_ary as $value => $title) + { + $selected = ($input_default !== false && $value == $input_default) ? ' checked="checked"' : ''; + $html .= ($html) ? ' ' : ''; + $html .= '<input type="radio" name="' . $name . '"' . (($id && !$id_assigned) ? ' id="' . $id . '"' : '') . ' value="' . $value . '"' . $selected . (($key) ? ' accesskey="' . $key . '"' : '') . ' class="radio" /> ' . $user->lang[$title]; + $id_assigned = true; + } + + return $html; +} + +/** +* Build configuration template for acp configuration pages +*/ +function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars) +{ + global $user, $module; + + $tpl = ''; + $name = 'config[' . $config_key . ']'; + + switch ($tpl_type[0]) + { + case 'text': + case 'password': + $size = (int) $tpl_type[1]; + $maxlength = (int) $tpl_type[2]; + + $tpl = '<input id="' . $key . '" type="' . $tpl_type[0] . '"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="' . $name . '" value="' . $new[$config_key] . '" />'; + break; + + case 'dimension': + $size = (int) $tpl_type[1]; + $maxlength = (int) $tpl_type[2]; + + $tpl = '<input id="' . $key . '" type="text"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="config[' . $config_key . '_height]" value="' . $new[$config_key . '_height'] . '" /> x <input type="text"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="config[' . $config_key . '_width]" value="' . $new[$config_key . '_width'] . '" />'; + break; + + case 'textarea': + $rows = (int) $tpl_type[1]; + $cols = (int) $tpl_type[2]; + + $tpl = '<textarea id="' . $key . '" name="' . $name . '" rows="' . $rows . '" cols="' . $cols . '">' . $new[$config_key] . '</textarea>'; + break; + + case 'radio': + $key_yes = ($new[$config_key]) ? ' checked="checked"' : ''; + $key_no = (!$new[$config_key]) ? ' checked="checked"' : ''; + + $tpl_type_cond = explode('_', $tpl_type[1]); + $type_no = ($tpl_type_cond[0] == 'disabled' || $tpl_type_cond[0] == 'enabled') ? false : true; + + $tpl_no = '<input type="radio" name="' . $name . '" value="0"' . $key_no . ' class="radio" /> ' . (($type_no) ? $user->lang['NO'] : $user->lang['DISABLED']); + $tpl_yes = '<input type="radio" id="' . $key . '" name="' . $name . '" value="1"' . $key_yes . ' class="radio" /> ' . (($type_no) ? $user->lang['YES'] : $user->lang['ENABLED']); + + $tpl = ($tpl_type_cond[0] == 'yes' || $tpl_type_cond[0] == 'enabled') ? $tpl_yes . ' ' . $tpl_no : $tpl_no . ' ' . $tpl_yes; + break; + + case 'select': + case 'custom': + + $return = ''; + + if (isset($vars['method'])) + { + $call = array($module->module, $vars['method']); + } + else if (isset($vars['function'])) + { + $call = $vars['function']; + } + else + { + break; + } + + if (isset($vars['params'])) + { + $args = array(); + foreach ($vars['params'] as $value) + { + switch ($value) + { + case '{CONFIG_VALUE}': + $value = $new[$config_key]; + break; + + case '{KEY}': + $value = $key; + break; + } + + $args[] = $value; + } + } + else + { + $args = array($new[$config_key], $key); + } + + $return = call_user_func_array($call, $args); + + if ($tpl_type[0] == 'select') + { + $tpl = '<select id="' . $key . '" name="' . $name . '">' . $return . '</select>'; + } + else + { + $tpl = $return; + } + + break; + + default: + break; + } + + if (isset($vars['append'])) + { + $tpl .= $vars['append']; + } + + return $tpl; +} + +?> \ No newline at end of file Added: phpBB Reloaded Olympus/adm/style/acp_attachments.html =================================================================== --- phpBB Reloaded Olympus/adm/style/acp_attachments.html (rev 0) +++ phpBB Reloaded Olympus/adm/style/acp_attachments.html 2006-06-17 21:53:17 UTC (rev 229) @@ -0,0 +1,355 @@ +<!-- INCLUDE overall_header.html --> + +<a name="maincontent"></a> + +<h1>{L_TITLE}</h1> + +<p>{L_TITLE_EXPLAIN}</p> + +<!-- IF S_WARNING --> + <div class="errorbox"> + <h3>{L_WARNING}</h3> + <p>{WARNING_MSG}</p> + </div> +<!-- ENDIF --> + +<!-- IF S_NOTIFY --> + <div class="successbox"> + <h3>{L_NOTIFY}</h3> + <p>{NOTIFY_MSG}</p> + </div> +<!-- ENDIF --> + +<!-- IF S_UPLOADING_FILES --> + <h2>{L_UPLOADING_FILES}</h2> + + <!-- BEGIN upload --> + :: {upload.FILE_INFO}<br /> + <!-- IF upload.S_DENIED --><span class="error">{upload.DENIED}</span><!-- ELSEIF upload.ERROR_MSG --><span class="error">{upload.ERROR_MSG}</span><!-- ELSE --><span class="success">{L_SUCCESSFULLY_UPLOADED}</span><!-- ENDIF --> + <br /><br /> + <!-- END upload --> + +<!-- ENDIF --> + +<!-- IF S_ATTACHMENT_SETTINGS --> + + <!-- IF not S_THUMBNAIL_SUPPORT --> + <div class="errorbox"> + <p>{L_NO_THUMBNAIL_SUPPORT}</p> + </div> + <!-- ENDIF --> + + <form id="attachsettings" method="post" action="{U_ACTION}"> + <!-- BEGIN options --> + <!-- IF options.S_LEGEND --> + <!-- IF not options.S_FIRST_ROW --> + </fieldset> + <!-- ENDIF --> + <fieldset> + <legend>{options.LEGEND}</legend> + <!-- ELSE --> + + <dl> + <dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt> + <dd>{options.CONTENT}</dd> + </dl> + + <!-- ENDIF --> + <!-- END options --> + </fieldset> + + <fieldset class="submit-buttons"> + <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}... [truncated message content] |
1 message has been excluded from this view by a project administrator.
