From c1c3b9f9124b42dd37b5d1da582e23b927cbee44 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Fri, 11 Apr 2008 14:14:23 +0000 Subject: [PATCH] fixing two potential problems - blank style - check for correct role assignment within auth.php (should not happen, but seems like some users are not able to persist from manually messing with the db) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8502 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 26 +++++++++++++++++--------- phpBB/includes/auth.php | 2 +- phpBB/style.php | 7 +------ 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index dd4fd3b90a..7596bb76c7 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -53,6 +53,7 @@
  1. Changelog
      +
    1. Changes since 3.0.1
    2. Changes since 3.0.0
    3. Changes since RC-8
    4. Changes since RC-7
      5. @@ -81,7 +82,14 @@
      -

      1.i. Changes since 3.0.0

      +

      1.i. Changes since 3.0.1

      + +
        +
      • [Fix] Ability to set permissions on non-mysql dbms (Bug #24955)
        • +
      • [Fix] Fixed blank style on setups having no username defined within config.php (Bug #25065)
        • +
      + +

      1.ii. Changes since 3.0.0

      • [Change] Validate birthdays (Bug #15004)
        • @@ -152,7 +160,7 @@
      • [Fix] Find and display colliding usernames correctly when converting from one database to another (Bug #23925)
      -

      1.i. Changes since 3.0.RC8

      +

      1.iii. Changes since 3.0.RC8

      • [Fix] Cleaned usernames contain only single spaces, so "a_name" and "a__name" are treated as the same name (Bug #15634)
        • @@ -161,7 +169,7 @@
      • [Fix] Call garbage_collection() within database updater to correctly close connections (affects Oracle for example)
      -

      1.ii. Changes since 3.0.RC7

      +

      1.iv. Changes since 3.0.RC7

      • [Fix] Fixed MSSQL related bug in the update system
        • @@ -196,7 +204,7 @@
      • [Fix] No duplication of active topics (Bug #15474)
      -

      1.iii. Changes since 3.0.RC6

      +

      1.v. Changes since 3.0.RC6

      • [Fix] Submitting language changes using acp_language (Bug #14736)
        • @@ -206,7 +214,7 @@
      • [Fix] Able to request new password (Bug #14743)
      -

      1.iv. Changes since 3.0.RC5

      +

      1.vi. Changes since 3.0.RC5

      • [Feature] Removing constant PHPBB_EMBEDDED in favor of using an exit_handler(); the constant was meant to achive this more or less.
        • @@ -269,7 +277,7 @@
      • [Sec] New password hashing mechanism for storing passwords (#i42)
      -

      1.v. Changes since 3.0.RC4

      +

      1.vii. Changes since 3.0.RC4

      • [Fix] MySQL, PostgreSQL and SQLite related database fixes (Bug #13862)
        • @@ -320,7 +328,7 @@
      • [Fix] odbc_autocommit causing existing result sets to be dropped (Bug #14182)
      -

      1.vi. Changes since 3.0.RC3

      +

      1.viii. Changes since 3.0.RC3

      • [Fix] Fixing some subsilver2 and prosilver style issues
        • @@ -429,7 +437,7 @@
      -

      1.vii. Changes since 3.0.RC2

      +

      1.ix. Changes since 3.0.RC2

      • [Fix] Re-allow searching within the memberlist
        • @@ -475,7 +483,7 @@
      -

      1.viii. Changes since 3.0.RC1

      +

      1.x. Changes since 3.0.RC1

      • [Fix] (X)HTML issues within the templates (Bug #11255, #11255)
        • diff --git a/phpBB/includes/auth.php b/phpBB/includes/auth.php index 8dd15fea64..d0b38b67a3 100644 --- a/phpBB/includes/auth.php +++ b/phpBB/includes/auth.php @@ -800,7 +800,7 @@ class auth { $this->_set_group_hold_ary($hold_ary[$row['forum_id']], $row['auth_option_id'], $row['auth_setting']); } - else + else if (!empty($this->role_cache[$row['auth_role_id']])) { foreach (unserialize($this->role_cache[$row['auth_role_id']]) as $option_id => $setting) { diff --git a/phpBB/style.php b/phpBB/style.php index 9d38128356..599434d087 100644 --- a/phpBB/style.php +++ b/phpBB/style.php @@ -20,7 +20,7 @@ error_reporting(E_ALL ^ E_NOTICE); require($phpbb_root_path . 'config.' . $phpEx); -if (!defined('PHPBB_INSTALLED') || empty($dbms) || !isset($dbhost) || !isset($dbpasswd) || empty($dbuser)) +if (!defined('PHPBB_INSTALLED') || empty($dbms) || empty($acm_type)) { exit; } @@ -57,11 +57,6 @@ if (strspn($sid, 'abcdefABCDEF0123456789') !== strlen($sid)) // server a little if ($id) { - if (empty($acm_type) || empty($dbms)) - { - die('Hacking attempt'); - } - // Include files require($phpbb_root_path . 'includes/acm/acm_' . $acm_type . '.' . $phpEx); require($phpbb_root_path . 'includes/cache.' . $phpEx);