From 880bace3554370167be705378ebf5b320cb78b16 Mon Sep 17 00:00:00 2001 From: rxu Date: Sat, 16 Oct 2010 20:46:38 +0800 Subject: [PATCH 1/5] [ticket/9840] Display view unread posts link for guests. Display view unread posts link for guests if applicable. PHPBB3-9840 --- phpBB/includes/functions.php | 2 +- phpBB/styles/prosilver/template/index_body.html | 2 +- phpBB/styles/subsilver2/template/overall_header.html | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 9aec98dce2..e154aa44b0 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4466,7 +4466,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 'S_ENABLE_FEEDS_TOPICS_ACTIVE' => ($config['feed_topics_active']) ? true : false, 'S_ENABLE_FEEDS_NEWS' => ($s_feed_news) ? true : false, - 'S_LOAD_UNREADS' => ($config['load_unreads_search']) ? true : false, + 'S_LOAD_UNREADS' => ($config['load_unreads_search'] && ($config['load_anon_lastread'] || $user->data['is_registered'])) ? true : false, 'T_THEME_PATH' => "{$web_path}styles/" . $user->theme['theme_path'] . '/theme', 'T_TEMPLATE_PATH' => "{$web_path}styles/" . $user->theme['template_path'] . '/template', diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html index af2077141c..d4d50a11c0 100644 --- a/phpBB/styles/prosilver/template/index_body.html +++ b/phpBB/styles/prosilver/template/index_body.html @@ -6,7 +6,7 @@ diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html index 37691d4f1c..a8a53abd24 100644 --- a/phpBB/styles/subsilver2/template/overall_header.html +++ b/phpBB/styles/subsilver2/template/overall_header.html @@ -201,8 +201,8 @@ function marklist(id, name, state)

{L_SEARCH_UNANSWERED} | {L_SEARCH_ACTIVE_TOPICS} - - {L_SEARCH_UNREAD} | {L_SEARCH_NEW} | {L_SEARCH_SELF} + + {L_SEARCH_UNREAD} | {L_SEARCH_NEW} | {L_SEARCH_SELF}

From b6a60d4d64abc78d5e3e3899e912e31499dc73f9 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Fri, 25 Jun 2010 01:43:58 +0200 Subject: [PATCH 2/5] [ticket/9509] The VCS is now git Partially cherry-picked from 163a0974. PHPBB3-9509 --- phpBB/docs/coding-guidelines.html | 123 ++++-------------------------- 1 file changed, 15 insertions(+), 108 deletions(-) diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html index 1978a0a307..83bd229c8c 100644 --- a/phpBB/docs/coding-guidelines.html +++ b/phpBB/docs/coding-guidelines.html @@ -90,7 +90,7 @@
  • VCS Guidelines
    1. Repository structure
      2. -
    2. Commit messages
      3. +
    3. Commit Messages and Repository Rules
  • Guidelines Changelog
    • @@ -2326,126 +2326,33 @@ if (utf8_case_fold_nfc($string1) == utf8_case_fold_nfc($string2))
    -

    The version control system for phpBB3 is subversion. The repository is available at http://code.phpbb.com/svn/phpbb.

    +

    The version control system for phpBB3 is git. The repository is available at http://github.com/phpbb/phpbb3.

    7.i. Repository Structure

      -
    • trunk
      The latest unstable development version with new features etc. Contains the actual board in /trunk/phpBB
      • -
    • branches
      Development branches of stable phpBB releases. Copied from /trunk at the time of release. +
    • develop
      The latest unstable development version with new features etc.
      • +
    • develop-*
      Development branches of stable phpBB releases. Branched off of develop at the time of feature freeze.
        -
      • phpBB3.0/branches/phpBB-3_0_0/phpBB
        Development branch of the stable 3.0 line. Bug fixes are applied here.
        • -
      • phpBB2/branches/phpBB-2_0_0/phpBB
        Old phpBB2 development branch.
        • +
      • phpBB3.0develop-olympus
        Development branch of the stable 3.0 line. Bug fixes are applied here.
        • +
      • phpBB3.1develop-ascraeus
        Development branch of the stable 3.1 line. Bug fixes are applied here.
      • -
    • tags
      Released versions. Copies of trunk or the respective branch, made at the time of release. +
    • master
      A branch containing all stable phpBB3 release points
      • +
    • tags
      Released versions. Stable ones get merged into the master branch.
        -
      • /tags/release_3_0_BX
        Beta release X of the 3.0 line.
        • -
      • /tags/release_3_0_RCX
        Release candidate X of the 3.0 line.
        • -
      • /tags/release_3_0_X-RCY
        Release candidate Y of the stable 3.0.X release.
        • -
      • /tags/release_3_0_X
        Stable 3.0.X release.
        • -
      • /tags/release_2_0_X
        Old stable 2.0.X release.
        • +
      • release-3.Y-BX
        Beta release X of the 3.Y line.
        • +
      • release-3.Y-RCX
        Release candidate X of the 3.Y line.
        • +
      • release-3.Y.Z-RCX
        Release candidate X of the stable 3.Y.Z release.
        • +
      • release-3.0.X
        Stable 3.0.X release.
        • +
      • release-2.0.X
        Old stable 2.0.X release.
    -

    7.ii. Commit Messages

    - -

    The commit message should contain a brief explanation of all changes made within the commit. Often identical to the changelog entry. A bug ticket can be referenced by specifying the ticket ID with a hash, e.g. #12345. A reference to another revision should simply be prefixed with r, e.g. r12345.

    - -

    Junior Developers need to have their patches approved by a development team member first. The commit message must end in a line with the following format:

    - - 
    -Authorised by: developer1[, developer2[, ...]]
-
    - -
    - -
    Back to Top
    - - - - -
    - -

    8. Guidelines Changelog

    -
    -
    - -
    -

    Revision 10007

    - - - -

    Revision 9817

    - -
      -
    • Added VCS section.
      • -
    - -

    Revision 8732

    - - - -

    Revision 8596+

    - -
      -
    • Removed sql_build_array('MULTI_INSERT'... statements.
      • -
    • Added sql_multi_insert() explanation.
      • -
    - -

    Revision 1.31

    - -
      -
    • Added add_form_key and check_form_key.
      • -
    - -

    Revision 1.24

    - - - -

    Revision 1.16

    - - - -

    Revision 1.11-1.15

    - -
      -
    • Various document formatting, spelling, punctuation, grammar bugs.
      • -
    - -

    Revision 1.9-1.10

    - - - -

    Revision 1.8

    - - - -

    Revision 1.5

    - - +

    7.ii. Commit Messages and Reposiory Rules

    +

    Information on repository rules, such as commit messages can be found at http://wiki.phpbb.com/display/DEV/Git

    .
    From 9950fa34c6b3a0aeac6140e0b8eb671529824ea4 Mon Sep 17 00:00:00 2001 From: Josh Woody Date: Sun, 17 Oct 2010 15:47:41 -0500 Subject: [PATCH 3/5] [ticket/9854] Revise docs/auth_api.html to add more methods Notably, the auth_admin class is still missing documentation. PHPBB3-9854 --- phpBB/docs/auth_api.html | 48 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/phpBB/docs/auth_api.html b/phpBB/docs/auth_api.html index c83aaadc2d..50d73d4485 100644 --- a/phpBB/docs/auth_api.html +++ b/phpBB/docs/auth_api.html @@ -61,6 +61,9 @@
  • acl_getf
  • acl_getf_global
  • acl_cache
    • +
  • acl_clear_prefetch
    • +
  • acl_get_list
    • +
  • Miscellaneous
  • Admin related functions
    • @@ -176,7 +179,7 @@ array(forum_id1 => array(option => integer), This method is used to find out whether a user has a permission in at least one forum or globally. This method is similar to checking whether acl_getf(option, true) returned one or more forums but it's faster. It should be called in the following way:

    -$result = acl_getf_global(option)
+$result = $auth->acl_getf_global(option)

    As with the previous methods option is a string specifying the permission which has to be checked.

    @@ -187,6 +190,49 @@ $result = acl_getf_global(option)

    This should be considered a private method and not be called externally. It handles the generation of the user_permissions data from the basic user and group authorisation data. When necessary this method is called automatically by acl.

    +

    2.vii. acl_clear_prefetch

    + +

    This method clears the user_permissions column in the users table for the given user. If the user ID passed is zero, the permissions cache is cleared for all users. This method should be called whenever permissions are set.

    + + 
    +// clear stored permissions for user 2
+$user_id = 2;
+$auth->acl_clear_prefetch($user_id);
+
    + +

    This method returns void.

    + +

    2.viii. acl_get_list

    + +

    This method returns an an array describing which users have permissions in given fora. The resultant array contains an entry for permission that every user has in every forum when no arguments are passed.

    + + 
    +$user_id = array(2, 53);
+$permissions = array('f_list', 'f_read');
+$forum_id = array(1, 2, 3);
+$result = $auth->acl_get_list($user_id, $permissions, $forum_id);
+
    + +

    The parameters may be of the following legal types:

    +
      +
    • $user_id: false, int, array(int, int, int, ...)
      • +
    • $permissions: false, string, array(string, string, ...)
      • +
    • $forum_id: false, int, array(int, int, int, ...)
      • +
    + +

    2.ix. Miscellaneous

    + +

    There are other methods defined in the auth class which serve mostly as private methods, but are available for use if needed. Each of them is used to pull data directly from the database tables. They are:

    +
      + 
    • function acl_group_raw_data($group_id = false, $opts = false, $forum_id = false)
      • + 
    • function acl_user_raw_data($user_id = false, $opts = false, $forum_id = false)
      • + 
    • function acl_raw_data_single_user($user_id)
      • + 
    • function acl_raw_data($user_id = false, $opts = false, $forum_id = false)
      • + 
    • function acl_role_data($user_type, $role_type, $ug_id = false, $forum_id = false)
      • +
    + +

    Of these, acl_raw_data is the most general, but the others will be faster if you need a smaller amount of data.

    +
    Back to Top
    From 5ad5930c8f664035c92453230489b1dbbc5acbab Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Tue, 19 Oct 2010 13:45:50 +0200 Subject: [PATCH 4/5] [ticket/9509] Close anchor tag in coding guidelines Thanks Andreas. PHPBB3-9509 --- phpBB/docs/coding-guidelines.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html index 83bd229c8c..ae6cbaacbc 100644 --- a/phpBB/docs/coding-guidelines.html +++ b/phpBB/docs/coding-guidelines.html @@ -2352,7 +2352,7 @@ if (utf8_case_fold_nfc($string1) == utf8_case_fold_nfc($string2))

    7.ii. Commit Messages and Reposiory Rules

    -

    Information on repository rules, such as commit messages can be found at http://wiki.phpbb.com/display/DEV/Git

    . +

    Information on repository rules, such as commit messages can be found at http://wiki.phpbb.com/display/DEV/Git

    .
    From c4dfe24feca3c47fab40548554a125ad55da6b70 Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Tue, 19 Oct 2010 13:51:47 +0200 Subject: [PATCH 5/5] [ticket/9509] Remove section 8 from index Thanks Andreas. PHPBB3-9509 --- phpBB/docs/coding-guidelines.html | 1 - 1 file changed, 1 deletion(-) diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html index ae6cbaacbc..e9b222858d 100644 --- a/phpBB/docs/coding-guidelines.html +++ b/phpBB/docs/coding-guidelines.html @@ -93,7 +93,6 @@
  • Commit Messages and Repository Rules
    • -
  • Guidelines Changelog
  • Copyright and disclaimer