@@ -300,7 +301,7 @@
query('SELECT u.id, u.username, u.email, u.title, u.num_posts, u.admin_note, g.g_id, g.g_user_title FROM '.$db->prefix.'users AS u LEFT JOIN '.$db->prefix.'groups AS g ON g.g_id=u.group_id WHERE u.id>1 AND '.implode(' AND ', $conditions).' ORDER BY '.$order_by.' '.$direction) or error('Unable to fetch user info', __FILE__, __LINE__, $db->error());
+ $result = $db->query('SELECT u.id, u.username, u.email, u.title, u.num_posts, u.admin_note, g.g_id, g.g_user_title FROM '.$db->prefix.'users AS u LEFT JOIN '.$db->prefix.'groups AS g ON g.g_id=u.group_id WHERE u.id>1 AND '.implode(' AND ', $conditions).' ORDER BY '.$db->escape($order_by).' '.$db->escape($direction)) or error('Unable to fetch user info', __FILE__, __LINE__, $db->error());
if ($db->num_rows($result))
{
while ($user_data = $db->fetch_assoc($result))
@@ -338,7 +339,7 @@
diff -urN punbb-1.2.2/upload/extern.php punbb-1.2.13/upload/extern.php
--- punbb-1.2.2/upload/extern.php Tue Jan 11 20:41:14 2005
+++ punbb-1.2.13/upload/extern.php Wed Jul 27 23:25:14 2005
@@ -116,8 +116,8 @@
exit('The file \'config.php\' doesn\'t exist or is corrupt. Please run install.php to install PunBB first.');
-// Disable error reporting for uninitialized variables
-error_reporting(E_ALL);
+// Make sure PHP reports all errors except E_NOTICE
+error_reporting(E_ALL ^ E_NOTICE);
// Turn off magic_quotes_runtime
set_magic_quotes_runtime(0);
@@ -129,10 +129,14 @@
// Load DB abstraction layer and try to connect
require PUN_ROOT.'include/dblayer/common_db.php';
-// Get the forum config
-$result = $db->query('SELECT * FROM '.$db->prefix.'config') or error('Unable to fetch forum config', __FILE__, __LINE__, $db->error());
-while ($cur_config_item = $db->fetch_row($result))
- $pun_config[$cur_config_item[0]] = $cur_config_item[1];
+// Load cached config
+@include PUN_ROOT.'cache/cache_config.php';
+if (!defined('PUN_CONFIG_LOADED'))
+{
+ require PUN_ROOT.'include/cache.php';
+ generate_config_cache();
+ require PUN_ROOT.'cache/cache_config.php';
+}
// Make sure we (guests) have permission to read the forums
$result = $db->query('SELECT g_read_board FROM '.$db->prefix.'groups WHERE g_id=3') or error('Unable to fetch group info', __FILE__, __LINE__, $db->error());
diff -urN punbb-1.2.2/upload/footer.php punbb-1.2.13/upload/footer.php
--- punbb-1.2.2/upload/footer.php Tue Feb 22 23:31:02 2005
+++ punbb-1.2.13/upload/footer.php Thu Jul 7 18:44:40 2005
@@ -140,10 +140,13 @@
// START SUBST -
-while (preg_match('//', $tpl_main, $cur_include))
+while (preg_match('##', $tpl_main, $cur_include))
{
+ if (!file_exists(PUN_ROOT.'include/user/'.$cur_include[1]))
+ error('Unable to process user include <pun_include "'.htmlspecialchars($cur_include[1]).'"> from template main.tpl. There is no such file in folder /include/user/');
+
ob_start();
- include PUN_ROOT.$cur_include[1];
+ include PUN_ROOT.'include/user/'.$cur_include[1];
$tpl_temp = ob_get_contents();
$tpl_main = str_replace($cur_include[0], $tpl_temp, $tpl_main);
ob_end_clean();
diff -urN punbb-1.2.2/upload/header.php punbb-1.2.13/upload/header.php
--- punbb-1.2.2/upload/header.php Tue Feb 1 16:16:46 2005
+++ punbb-1.2.13/upload/header.php Tue Feb 28 20:20:26 2006
@@ -15,7 +15,7 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU G>eneral Public License
+ You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston,
MA 02111-1307 USA
@@ -68,10 +68,7 @@
if (defined('PUN_ADMIN_CONSOLE'))
echo ''."\n";
-if (isset($destination_url))
- echo ''."\n";
-
-else if (isset($required_fields))
+if (isset($required_fields))
{
// Output JavaScript to validate form (make sure required fields are filled out)
@@ -134,7 +131,7 @@
// START SUBST -
-$tpl_main = str_replace('', basename($_SERVER['PHP_SELF'], '.php'), $tpl_main);
+$tpl_main = str_replace('', htmlspecialchars(basename($_SERVER['PHP_SELF'], '.php')), $tpl_main);
// END SUBST -
@@ -171,10 +168,8 @@
$tpl_temp .= "\n\t\t\t\t".'
diff -urN punbb-1.2.2/upload/include/cache.php punbb-1.2.13/upload/include/cache.php
--- punbb-1.2.2/upload/include/cache.php Sun Jan 30 18:40:38 2005
+++ punbb-1.2.13/upload/include/cache.php Thu Jul 7 19:00:08 2005
@@ -129,7 +129,7 @@
global $db;
// Get the rank list from the DB
- $result = $db->query('SELECT * FROM '.$db->prefix.'ranks', true) or error('Unable to fetch rank list', __FILE__, __LINE__, $db->error());
+ $result = $db->query('SELECT * FROM '.$db->prefix.'ranks ORDER BY min_posts', true) or error('Unable to fetch rank list', __FILE__, __LINE__, $db->error());
$output = array();
while ($cur_rank = $db->fetch_assoc($result))
@@ -174,7 +174,7 @@
if (!$fh)
error('Unable to write quickjump cache file to cache directory. Please make sure PHP has write access to the directory \'cache\'', __FILE__, __LINE__);
- $output = '';
+ $output = '';
$output .= "\t\t\t\t".'