1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00

350 Commits

Author SHA1 Message Date
Igor Wiedler
24daef1aaf Merge branch 'develop' into feature/avatars
* develop: (335 commits)
  [ticket/10575] Adding public visibility to the methods.
  [ticket/10575] Fixing non-static access to static functions get_instance
  [ticket/10547] User is not logged in as admin after installation
  [ticket/10650] Revert merge of 'rahulr92/ticket/10650' into develop
  [ticket/10650] Added checking for empty subjects
  [ticket/10650] Corrected intendation
  [ticket/10650]Added permission checking and utf8 functions
  [ticket/10650] Cropped subject and inserted newline
  [ticket/10650] Corrected space before true
  [ticket/10650] Changed language files and forumlist
  [ticket/10650] Added static sql files
  [ticket/10650] Displaying last topic on forum list
  [ticket/10760] Fix numbering in php fun facts.
  [ticket/10760] Value must be quoted as it might be two words.
  [ticket/10760] PHP is great. This commit is the proof.
  [ticket/10760] Catch both versions of parse error output in php.
  [ticket/10607] Added 'Powered by' translation string.
  [ticket/10760] Account for display_errors=stderr in pre-commit hook.
  [ticket/10760] Quote PHP_BIN when using it.
  [ticket/10760] Use echo -e only if echo understands -e.
  ...
2012-04-07 18:27:30 +02:00
Oleg Pudeyev
98964a913c [ticket/10650] Revert merge of 'rahulr92/ticket/10650' into develop
The pull request (#654) was merged a little too quickly.

In particular, display_last_subject per-forum option needs consensus.

This reverts commit b1fb34a4d7e446768b9f66ba6dd359173cd2a5fb, reversing
changes made to 7d6b289671c51694f17dd5f9849abf2534b55e59.

PHPBB3-10650
2012-04-04 19:23:05 -04:00
Rahul R
3e9711d6a4 [ticket/10650] Added checking for empty subjects
Now empty subjects will not be displayed in a
new line on the forum list.

PHPBB3-10650
2012-04-05 02:06:04 +05:30
Rahul R
7bb9e30199 [ticket/10650] Corrected intendation
Corrected the intendation of if condition.

PHPBB3-10650
2012-04-05 01:19:46 +05:30
Rahul R
08bee4c522 [ticket/10650]Added permission checking and utf8 functions
Passworded forums and ones in which user doesn't have
read access will be excluded. Also uft8 based string functions and
html encode/decode functions have been used to sanitise subject.

PHPBB3-10650
2012-04-05 00:46:23 +05:30
Rahul R
663b5f6542 [ticket/10650] Cropped subject and inserted newline
The subject being displayed in the forum list have been
shortened to 30 characters. Also it is now being shown
in a separate line.

PHPBB3-10650
2012-04-05 00:46:14 +05:30
Rahul
f32547c215 [ticket/10650] Displaying last topic on forum list
The most recent topic title of the forum can now
be displayed on the board index. An option is provided
in the ACP under the 'General Forum Setting' which
allows the admin to enable or disable this feature.

PHPBB3-10650
2012-04-05 00:45:26 +05:30
Igor Wiedler
41d8a777dc [feature/ajax] Add entirely unrelated but nice newlines
PHPBB3-10270
2012-03-31 02:10:18 +02:00
Cullen Walsh
a06380c69a [feature/avatars] Make avatars generic
Adding a cleaning function for data coming from the users/groups
tables so drivers only deal with clean data (ideally). Refactored
get_user_avatar() and get_group_avatar() to use an underlying
get_avatar() function.

PHPBB3-10018
2012-03-18 22:21:36 +00:00
Cullen Walsh
f102d9a631 [feature/avatars] Various cosmetic changes
Various small changes based on feedback from nn-
* Renaming $php_ext to $phpEx
* Fixing copyright years
* Explain $ignore_config
* Explain Regex
* Copypasta package error
* rename get_singleton

PHPBB3-10018
2012-03-18 22:19:17 +00:00
Cullen Walsh
1bd3d40121 [feature/avatars] Refactor avatars to use manager
Manager now stores singletons of each driver to speed loading.

PHPBB3-10018
2012-03-18 22:19:16 +00:00
Cullen Walsh
4c699e0d0a [feature/avatars] Modularized Avatars
A modularized avatar system that easily allows plugins to be created
for various avatar services, such as Gravatar.

This inital commit includes module support and is backwards
compatible with 3.0 avatars, but does notcontain ACP or UCP modules
for manipulating new avatars.

PHPBB3-10018
2012-03-18 22:19:16 +00:00
Unknown
7a04c9048c [ticket/9916] Updating header license and removing Version $Id$
PHPBB3-9916
2011-12-31 13:32:52 +00:00
Joas Schilling
88ae40a4b1 [ticket/10345] Make use of the plural function in some basic places
PHPBB3-10345
2011-11-25 15:10:44 -05:00
Joas Schilling
4c77903129 [ticket/10484] Use variables for sql_build_query() calls
It's easier for mods/extensions to extend the arrays.

PHPBB3-10484
2011-11-21 16:22:07 +01:00
Andreas Fischer
019e43bc2d Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10237] Display login-box for guests, when (un)subscribing

Conflicts:
	phpBB/includes/functions_display.php
2011-11-11 22:17:12 +01:00
Andreas Fischer
f3c9133a6c Merge remote-tracking branch 'nickvergessen/ticket/10237' into develop-olympus
* nickvergessen/ticket/10237:
  [ticket/10237] Display login-box for guests, when (un)subscribing
2011-11-11 22:07:11 +01:00
Joas Schilling
1a19388aa3 [ticket/10237] Display login-box for guests, when (un)subscribing
Also initialise $is_watching for PHP Notice: Undefined variable is_watching

PHPBB3-10237
2011-11-06 23:51:29 +01:00
Andreas Fischer
d4cc53dfef Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9036] Add template variable 'S_AUTH_READ' to forumlist
2011-11-01 20:08:44 +01:00
Andreas Fischer
0b1199f7b2 Merge remote-tracking branch 'nickvergessen/ticket/9036' into develop-olympus
* nickvergessen/ticket/9036:
  [ticket/9036] Add template variable 'S_AUTH_READ' to forumlist
2011-11-01 20:08:17 +01:00
Joas Schilling
da8cac280c [ticket/9036] Add template variable 'S_AUTH_READ' to forumlist
PHPBB3-9036
2011-10-29 16:26:17 +02:00
Joas Schilling
367bc23009 Merge branch 'develop-olympus' into develop
Conflicts:
	phpBB/includes/functions.php
2011-10-13 14:46:16 +02:00
Vjacheslav Trushkin
b38fbc6d25 [ticket/10397] Pagination inconsistency fix
Fixing topic_generate_pagination()

PHPBB3-10397
2011-10-04 12:24:42 +03:00
Vjacheslav Trushkin
830c3f4047 [feature/remove-imagesets] Adjustments to php files
Removing imagesets. Adjustments to php files

PHPBB3-10336
2011-09-04 01:08:00 +03:00
Nils Adermann
73aca1a6fb Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10320] Exclude passworded forums when determining "Most active topic".
  [ticket/10320] Move phpbb_feed_base::get_passworded_forums() to user class.
2011-08-25 23:21:09 -04:00
Nils Adermann
0d4089da7f Merge remote-tracking branch 'github-bantu/ticket/10320' into develop-olympus
* github-bantu/ticket/10320:
  [ticket/10320] Exclude passworded forums when determining "Most active topic".
  [ticket/10320] Move phpbb_feed_base::get_passworded_forums() to user class.
2011-08-25 23:20:55 -04:00
Nils Adermann
459570bcca Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9995] Do not run forum SQL query when marking the whole board read.
  [ticket/9995] Always continue when harvesting $forum_ids for markread().
  [ticket/9995] Remove useless statement from display_forums()

Conflicts:
	phpBB/includes/functions_display.php
2011-08-25 23:16:31 -04:00
Andreas Fischer
7ae871dfae [ticket/9995] Do not run forum SQL query when marking the whole board read.
PHPBB3-9995
2011-08-26 03:59:39 +02:00
Andreas Fischer
afc35f610d [ticket/9995] Always continue when harvesting $forum_ids for markread().
PHPBB3-9995
2011-08-26 03:32:36 +02:00
Andreas Fischer
e4e854863f [ticket/9995] Remove useless statement from display_forums()
The $forum_ids array is only used if $mark_read == 'forums'.

When $mark_read == 'forums', we either continue when
$auth->acl_get('f_list', $forum_id) is false or true.

So this statement is never useful.

PHPBB3-9995
2011-08-26 03:29:05 +02:00
Andreas Fischer
4f8bb02a57 [ticket/10320] Exclude passworded forums when determining "Most active topic".
PHPBB3-10320
2011-08-25 17:33:39 +02:00
Nils Adermann
19925ad059 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10237] Also display login-box on subscribing
  [ticket/10237] Handle watching and unwatching the same way.
  [ticket/10237] Use confirm-box to handle unwatching a forum/topic actions

Conflicts:
	phpBB/includes/functions_display.php
2011-07-16 21:57:16 -04:00
Joas Schilling
d60ffdd55c [ticket/10237] Also display login-box on subscribing
PHPBB3-10237
2011-07-11 19:31:11 +02:00
Joas Schilling
773561f862 [ticket/10237] Handle watching and unwatching the same way.
Also add some information to the confirm-box (forum_name / topic title)

PHPBB3-10237
2011-07-11 19:24:40 +02:00
Joas Schilling
b2a65ac76d [ticket/10237] Use confirm-box to handle unwatching a forum/topic actions
PHPBB3-10237
2011-07-07 12:40:35 +02:00
Oleg Pudeyev
7cbbb301e1 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9999] SEARCH_USER_POSTS is also used on viewtopic. Move to common.
  [ticket/9999] Remove broken and unused L_FORUM_FOLDER_ALT variable.
2011-05-09 22:28:35 -04:00
Andreas Fischer
4038091382 [ticket/9999] Remove broken and unused L_FORUM_FOLDER_ALT variable.
L_FORUM_FOLDER_ALT was supposed to be a language variable but the language
variable is never looked up but directly passed as L_FORUM_FOLDER_ALT instead.

Also, the expected functionality is correctly implemented by
FORUM_FOLDER_IMG_ALT.

PHPBB3-9999
2011-05-09 23:11:56 +02:00
Igor Wiedler
cdbb609c20 [ticket/9937] Make sure feed icon only shows for FORUM_POST
This is cleaner, since feed.php only supports FORUM_POST.

PHPBB3-9937
2010-12-21 22:44:10 +01:00
RMcGirr83
3f27cb2ea7 [ticket/9937] The feed icon displays on External links...which we don't want
PHPBB3-9937
2010-12-21 20:44:20 +01:00
Joas Schilling
954b3c3484 [ticket/7720] Fix alternative image-description for unread posts.
Changed the wrong word "new" to "unread" as that is, what we show with the
red-icons, not whether the post is new or not. Language variables were
kept for backwards compatibility.

PHPBB3-7720
2010-07-14 20:55:07 +02:00
Andreas Fischer
6b1f7a2d9d Merge branch 'ticket/bantu/9112' into develop-olympus
* ticket/bantu/9112:
  [ticket/9112] Make sure current user can see most active forum/topic.
2010-06-20 22:45:16 +02:00
Andreas Fischer
e66c089626 [ticket/9112] Make sure current user can see most active forum/topic.
PHPBB3-9112
2010-06-15 20:20:02 +02:00
Mark
cc8d22bed6 [feature/notify_status] Define'd constants for notify_status
define'd constants NOTIFY_YES, NOTIFY_NO to replace magic numbers in
forums_watch table and topics_watch table

PHPBB3-9179
2010-05-16 19:50:35 +02:00
Chris Smith
492063cec6 [bug/59465] Remove start=0 from topic pagination links.
Patch once again by nn-.
2010-03-18 20:28:59 +00:00
Andreas Fischer
0f5856ce5b No longer include subforums in forum feed.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10405 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-12 21:15:32 +00:00
Ruslan Uzdenov
3d3e673396 Fix Bug #53285 introduced in r10018 - Mark the first visible forum on index as unread if there's any unread global announcement
Authorised by: Bantu

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10243 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-28 16:49:23 +00:00
Meik Sievertsen
5537393f76 Further adjust unread tracking query, should work now for user last mark times less than forum/topic mark times.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10121 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-08 10:36:22 +00:00
Andreas Fischer
d85493ab16 Rename get_unread_topics_list() to get_unread_topics().
Cleanup: Remove some stuff we no longer need.
Related to report #46765

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10120 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-08 08:53:01 +00:00
Andreas Fischer
a3c00e88d9 Use comparison instead of arithmetic.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10040 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-21 10:46:58 +00:00
Meik Sievertsen
38fcaaf1d2 instead of only enabling forum feeds in viewforum we set it on every location where forums are shown
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10029 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-20 12:19:48 +00:00