Stop being too paranoid about hacking of includes containing only fully inclusive functions

git-svn-id: file:///svn/phpbb/trunk@2328 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/includes/auth.php

@@ -20,11 +20,6 @@
  *
  ***************************************************************************/
 
-if ( !defined('IN_PHPBB') )
-{
-	die("Hacking attempt");
-}
-
 /*
 	$type's accepted (pre-pend with AUTH_):
 	VIEW, READ, POST, REPLY, EDIT, DELETE, STICKY, ANNOUNCE, VOTE, VOTECREATE,

phpBB/includes/emailer.php

@@ -19,11 +19,6 @@
  *
  ***************************************************************************/
 
-if ( !defined('IN_PHPBB') )
-{
-	die("Hacking attempt");
-}
-
 //
 // The emailer class has support for attaching files, that isn't implemented
 // in the 2.0 release but we can probable find some way of using it in a future

phpBB/includes/functions.php

@@ -21,11 +21,6 @@
  *
  ***************************************************************************/
 
-if ( !defined('IN_PHPBB') )
-{
-	die("Hacking attempt");
-}
-
 function get_db_stat($mode)
 {
 	global $db;

phpBB/includes/functions_admin.php

@@ -21,11 +21,6 @@
  *
  ***************************************************************************/
 
-if ( !defined('IN_PHPBB') )
-{
-	die("Hacking attempt");
-}
-
 //
 // Simple version of jumpbox, just lists authed forums
 //

phpBB/includes/functions_search.php

@@ -19,11 +19,6 @@
  *
  ***************************************************************************/
 
-if ( !defined('IN_PHPBB') )
-{
-	die("Hacking attempt");
-}
-
 function clean_words($mode, &$entry, &$stopword_list, &$synonym_list)
 {
 	// Weird, $init_match doesn't work with static when double quotes (") are used...

phpBB/includes/functions_selects.php

@@ -21,11 +21,6 @@
  *
  ***************************************************************************/
 
-if ( !defined('IN_PHPBB') )
-{
-	die("Hacking attempt");
-}
-
 //
 // Pick a language, any language ...
 //

phpBB/includes/functions_validate.php

@@ -21,11 +21,6 @@
  *
  ***************************************************************************/
 
-if ( !defined('IN_PHPBB') )
-{
-	die("Hacking attempt");
-}
-
 //
 // Check to see if the username has been taken, or if it is disallowed.
 // Also checks if it includes the " character, which we don't allow in usernames.

phpBB/includes/prune.php

@@ -20,11 +20,6 @@
  *
  ***************************************************************************/
 
-if ( !defined('IN_PHPBB') )
-{
-	die("Hacking attempt");
-}
-
 require($phpbb_root_path . 'includes/functions_search.'.$phpEx);
 
 function prune($forum_id, $prune_date)

phpBB/includes/sessions.php

@@ -20,11 +20,6 @@
  *
  ***************************************************************************/
 
-if ( !defined('IN_PHPBB') )
-{
-	die("Hacking attempt");
-}
-
 //
 // session_begin()
 //

phpBB/includes/smtp.php

@@ -19,11 +19,6 @@
  *
  ***************************************************************************/
 
-if ( !defined('IN_PHPBB') )
-{
-	die("Hacking attempt");
-}
-
 define('SMTP_INCLUDED', 1);
 //
 // This function has been modified as provided

phpBB/includes/sql_parse.php

@@ -28,11 +28,6 @@
 *
 \***************************************************************************/
 
-if ( !defined('IN_PHPBB') )
-{
-	die("Hacking attempt");
-}
-
 //
 // remove_comments will strip the sql comment lines out of an uploaded sql file
 // specifically for mssql and postgres type files in the install....
@@ -67,6 +62,7 @@ function remove_comments(&$output)
 	unset($lines);
 	return $output;
 }
+
 //
 // remove_remarks will strip the sql comment lines out of an uploaded sql file
 //
@@ -192,4 +188,5 @@ function split_sql_file($sql, $delimiter)
 
 	return $output;
 }
+
 ?>

phpBB/includes/template.php

@@ -20,11 +20,6 @@
  *
  ***************************************************************************/
 
-if ( !defined('IN_PHPBB') )
-{
-	die("Hacking attempt");
-}
-
 /**
  * Template class. By Nathan Codding of the phpBB group.
  * The interface was originally inspired by PHPLib templates,

phpBB/includes/topic_review.php

@@ -21,15 +21,6 @@
  *
  ***************************************************************************/
 
-if ( !defined('IN_PHPBB') )
-{
-	die("Hacking attempt");
-}
-
-// -----------------------
-// Page specific functions
-//
-
 function topic_review($topic_id, $is_inline_review)
 {
 	global $db, $board_config, $template, $lang, $images, $theme, $phpEx, $phpbb_root_path;
@@ -216,8 +207,5 @@ function topic_review($topic_id, $is_inline_review)
 		include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
 	}
 }
-//
-// End page specific functions
-// ---------------------------
 
 ?>

phpBB/includes/usercp_activate.php

@@ -21,7 +21,7 @@
  *
  ***************************************************************************/
 
-if ( !defined('IN_PROFILE') )
+if ( !defined('IN_PHPBB') )
 {
 	die("Hacking attempt");
 	exit;

phpBB/includes/usercp_avatar.php

@@ -21,12 +21,6 @@
  *
  ***************************************************************************/
 
-if ( !defined('IN_PROFILE') )
-{
-	die("Hacking attempt");
-	exit;
-}
-
 function check_image_type(&$type, &$error, &$error_msg)
 {
 	global $lang;

phpBB/includes/usercp_email.php

@@ -21,7 +21,7 @@
  *
  ***************************************************************************/
 
-if ( !defined('IN_PROFILE') )
+if ( !defined('IN_PHPBB') )
 {
 	die("Hacking attempt");
 	exit;

phpBB/includes/usercp_register.php

@@ -21,7 +21,7 @@
  *
  ***************************************************************************/
 
-if ( !defined('IN_PROFILE') )
+if ( !defined('IN_PHPBB') )
 {
 	die("Hacking attempt");
 	exit;
@@ -476,20 +476,26 @@ if ( isset($HTTP_POST_VARS['submit']) )
 				FROM " . USERS_TABLE;
 			if ( !($result = $db->sql_query($sql)) )
 			{
-				message_die(GENERAL_ERROR, 'Could not obtained next user_id information', '', __LINE__, __FILE__, $sql);
+				message_die(GENERAL_ERROR, 'Could not obtain next user_id information', '', __LINE__, __FILE__, $sql);
 			}
 
-			$row = $db->sql_fetchrow($result);
+			if ( !($row = $db->sql_fetchrow($result) )
+			{
+				message_die(GENERAL_ERROR, 'Could not obtain next user_id information', '', __LINE__, __FILE__, $sql);
+			}
 			$user_id = $row['total'] + 1;
 
 			$sql = "SELECT MAX(group_id) AS total
 				FROM " . GROUPS_TABLE;
-			if (!( $result = $db->sql_query($sql)) )
+			if ( !($result = $db->sql_query($sql) ) )
 			{
-				message_die(GENERAL_ERROR, 'Could not obtained next user_id information', '', __LINE__, __FILE__, $sql);
+				message_die(GENERAL_ERROR, 'Could not obtain next user_id information', '', __LINE__, __FILE__, $sql);
 			}
 
-			$row = $db->sql_fetchrow($result);
+			if ( !($row = $db->sql_fetchrow($result) )
+			{
+				message_die(GENERAL_ERROR, 'Could not obtain next user_id information', '', __LINE__, __FILE__, $sql);
+			}
 			$group_id = $row['total'] + 1;
 
 			//

phpBB/includes/usercp_sendpasswd.php

@@ -21,7 +21,7 @@
  *
  ***************************************************************************/
 
-if ( !defined('IN_PROFILE') )
+if ( !defined('IN_PHPBB') )
 {
 	die("Hacking attempt");
 	exit;

phpBB/includes/usercp_viewprofile.php

@@ -21,7 +21,7 @@
  *
  ***************************************************************************/
 
-if ( !defined('IN_PROFILE') )
+if ( !defined('IN_PHPBB') )
 {
 	die("Hacking attempt");
 	exit;