1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-23 15:59:49 +02:00

200 Commits

Author SHA1 Message Date
Meik Sievertsen
2e17e448de Copy 3.0.x branch to trunk
git-svn-id: file:///svn/phpbb/trunk@10211 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-04 18:14:59 +00:00
Meik Sievertsen
bf8ac19eaa Move trunk/phpBB to old_trunk/phpBB
git-svn-id: file:///svn/phpbb/trunk@10210 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-04 18:13:59 +00:00
Meik Sievertsen
1042152a55 Merge changes made in revisions #r9405 to #r9467
2009-04-18

git-svn-id: file:///svn/phpbb/trunk@9468 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-04-18 15:09:19 +00:00
Meik Sievertsen
4cbf6bc703 Merge most changes from 3.0.x branch since the 25th december.
(Captcha changes for refreshing captcha image not included)

git-svn-id: file:///svn/phpbb/trunk@9404 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-03-22 16:34:26 +00:00
Meik Sievertsen
d181f0ef36 append_sid wrapper + is_guest
git-svn-id: file:///svn/phpbb/trunk@9338 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-02-22 19:17:10 +00:00
Meik Sievertsen
b27add94f8 $template to phpbb::$template
git-svn-id: file:///svn/phpbb/trunk@9337 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-02-22 18:56:09 +00:00
Meik Sievertsen
84f795e9fb $db-> to phpbb::$db->
git-svn-id: file:///svn/phpbb/trunk@9336 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-02-22 18:06:05 +00:00
Meik Sievertsen
95b69cfa7f $auth-> to phpbb::$acl->
git-svn-id: file:///svn/phpbb/trunk@9335 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-02-22 15:48:29 +00:00
Meik Sievertsen
794c574969 remove global and change $user-> to phpbb::$user->
git-svn-id: file:///svn/phpbb/trunk@9334 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-02-22 15:29:18 +00:00
Meik Sievertsen
57aea7e62f modified some files to get the admin index page working, as well as index page in logged in state and not logged in state
additionally prepare for a working installation

git-svn-id: file:///svn/phpbb/trunk@9272 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-01-16 17:41:04 +00:00
Meik Sievertsen
11e76473aa fix some functions
git-svn-id: file:///svn/phpbb/trunk@9245 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-30 17:20:50 +00:00
Meik Sievertsen
19aed179e5 $config to phpbb::$config
git-svn-id: file:///svn/phpbb/trunk@9242 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-28 23:30:09 +00:00
Meik Sievertsen
889fa87140 implement new phpbb::$acm object, replacing $cache global
git-svn-id: file:///svn/phpbb/trunk@9240 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-28 13:27:58 +00:00
Meik Sievertsen
5b9a3c9a7d add nils' request and super globals class
rename request:: to phpbb_request::

git-svn-id: file:///svn/phpbb/trunk@9230 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-25 14:47:57 +00:00
Meik Sievertsen
3cd007c49d change cache:: to phpbb_cache::
git-svn-id: file:///svn/phpbb/trunk@9226 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-24 14:44:19 +00:00
Nils Adermann
07e9b83a3d - updated all code to use the request class instead of any direct access to
super globals
- disabled super globals in common.php. See commit r9101 for
  more information
- cleaned up/simplified a few lines along the way.

git-svn-id: file:///svn/phpbb/trunk@9102 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-24 00:20:33 +00:00
Meik Sievertsen
04f7c1da69 Only display special ranks to guests; no longer display normal ranks for guests (Bug #36735)
[changed parameters for get_user_rank(), breaks backward compatibility]

git-svn-id: file:///svn/phpbb/trunk@9083 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-22 20:26:47 +00:00
Meik Sievertsen
9c7d8dcd7d - Do not show link to user/group profiles if user has no permission to view the linked page and gets a denied message anyway. (Bug #15088)
- Do not display last post link and sort display options for search engines. (Bug #15088)


git-svn-id: file:///svn/phpbb/trunk@8988 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-09 14:22:07 +00:00
Chris Smith
0a4c62f12e Merge in r8924, r8925, r8926, r8936, r8938
git-svn-id: file:///svn/phpbb/trunk@8939 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-26 09:28:12 +00:00
Henry Sudhof
9f9a89c78e Merging 8927, 8928, 8929, 8930
git-svn-id: file:///svn/phpbb/trunk@8931 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-24 12:29:57 +00:00
Chris Smith
b486710ea1 Merge in r8843, r8908, r8909
git-svn-id: file:///svn/phpbb/trunk@8910 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-23 12:56:34 +00:00
Henry Sudhof
08428f8fa1 merging 8904
git-svn-id: file:///svn/phpbb/trunk@8905 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-22 13:32:28 +00:00
Meik Sievertsen
1651c5df57 Display popular topic based on posts within topic instead of replies within topic. (Bug #16099)
git-svn-id: file:///svn/phpbb/trunk@8861 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-17 14:31:32 +00:00
Meik Sievertsen
17ec98b834 simplify $user->img()
git-svn-id: file:///svn/phpbb/trunk@8859 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-16 15:15:03 +00:00
Meik Sievertsen
c83e6f7e94 cleanage
git-svn-id: file:///svn/phpbb/trunk@8822 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-04 14:10:17 +00:00
Henry Sudhof
323fb23b49 Merge R8790/8791
git-svn-id: file:///svn/phpbb/trunk@8793 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-08-28 13:12:18 +00:00
Henry Sudhof
3a3b9eb8ef merge
git-svn-id: file:///svn/phpbb/trunk@8776 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-08-21 15:50:21 +00:00
Henry Sudhof
ae27aaf1a4 merge
git-svn-id: file:///svn/phpbb/trunk@8750 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-08-13 14:22:27 +00:00
Meik Sievertsen
2f4a618900 ok... i hope i haven't messed too much with the code and everything is still working.
Changes:
- Ascraeus now uses constants for the phpbb root path and the php extension. This ensures more security for external applications and modifications (no more overwriting of root path and extension possible through insecure mods and register globals enabled) as well as no more globalizing needed.
- A second change implemented here is an additional short-hand-notation for append_sid(). It is allowed to omit the root path and extension now (for example calling append_sid('memberlist')) - in this case the root path and extension get added automatically. The hook is called after these are added.

git-svn-id: file:///svn/phpbb/trunk@8572 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-05-29 12:25:56 +00:00
Nils Adermann
3b669aedfd adding a new option to hide the entire list of subforums on listforums
git-svn-id: file:///svn/phpbb/trunk@8373 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-02-03 22:39:38 +00:00
Meik Sievertsen
48ed77f046 Merging revisions #r8352, #r8353, #r8354 and #r8355
git-svn-id: file:///svn/phpbb/trunk@8356 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-01-30 21:48:49 +00:00
Meik Sievertsen
4b5fab372f merge with revision #r8350
git-svn-id: file:///svn/phpbb/trunk@8351 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-01-30 16:14:39 +00:00
Meik Sievertsen
5dddcb42ae - Do not split topic list for topics being promoted to announcements after been moved to another forum (Bug #18635)
- Allow editing usernames within database_update on username cleanup (Bug #18415)
- Fixing wrong sync() calls if moving all posts by a member in ACP (Bug #18385)
- Check entered imagemagick path for trailing slash (Bug #18205)
- Use proper title on index for new/unread posts (Bug #13101) - patch provided by Pyramide
- Allow calls to $user->set_cookie() define no cookie time for setting session cookies (Bug #18025)


git-svn-id: file:///svn/phpbb/trunk@8310 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-01-06 17:00:09 +00:00
David M
85055ac97f oh boy...
- Migrate code base to PHP 5.1+


git-svn-id: file:///svn/phpbb/trunk@8295 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-01-03 17:00:40 +00:00
Meik Sievertsen
f31626cec7 #14850
git-svn-id: file:///svn/phpbb/trunk@8207 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-10-20 10:13:57 +00:00
Meik Sievertsen
e6c79242e6 dumdidum... sorry. ;)
git-svn-id: file:///svn/phpbb/trunk@8146 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-10-05 14:30:11 +00:00
Meik Sievertsen
87e2e62c34 #i8
git-svn-id: file:///svn/phpbb/trunk@8119 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-10-02 18:29:05 +00:00
David M
4c50481379 #14211
- doing is_null on Oracle is not good, we return empty strings instead


git-svn-id: file:///svn/phpbb/trunk@8068 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-08-24 18:00:28 +00:00
Meik Sievertsen
683930ca4a - Handle forum links/redirects within viewforum if no read permission given (to display login box or error message) (Bug #13467)
- Prevent changing postable forum having subforums to link forum without moving subforums out first


git-svn-id: file:///svn/phpbb/trunk@7895 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-07-16 14:02:06 +00:00
David M
d4675c109a That else statement will never come into effect because the ORDER BY makes sure that the parent is dealt with before the children
git-svn-id: file:///svn/phpbb/trunk@7894 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-07-16 01:26:00 +00:00
Meik Sievertsen
f27fa04b8c even more fixes. :o
git-svn-id: file:///svn/phpbb/trunk@7889 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-07-15 13:47:01 +00:00
David M
86de92d8f0 #11931
git-svn-id: file:///svn/phpbb/trunk@7888 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-07-15 12:57:30 +00:00
Meik Sievertsen
bd33acd012 some fixes
git-svn-id: file:///svn/phpbb/trunk@7866 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-07-11 15:03:06 +00:00
Meik Sievertsen
13a02f6cc5 my round of bug fixes
git-svn-id: file:///svn/phpbb/trunk@7749 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-06-11 00:12:42 +00:00
Meik Sievertsen
455536773f ok, mess around with the templates + fixing some bugs + adjusting headers for those files already modified to circumvent conflicts for those having their editor set to remove trailing spaces (not recommended!)
git-svn-id: file:///svn/phpbb/trunk@7736 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-06-09 11:11:20 +00:00
Meik Sievertsen
4de7171836 Ok, try to fix the "re-approval on edit" bugs. Also added make_clickable to log entries as well as logging moderator edits.
git-svn-id: file:///svn/phpbb/trunk@7491 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-06 21:02:23 +00:00
Jonathan Stanley
dd00ce06dd #10523
Just saw this one, whilst thinking about some other stuff... Now possible to select the subforum listing for styling by:

a.subforum { foo: bar; } // both read and unread links

... and either specifically by:

a.subforum.read { foo: bar; } // read links only
a.subforum.unread { foo: bar; } // unread links only


git-svn-id: file:///svn/phpbb/trunk@7480 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-06 00:57:07 +00:00
Henry Sudhof
42251d008c Prepare to be yelled at and brace for the tide of bug reports: I had hoped we would not have to do this, but it seems that we have to.
-Route all avatar downloads through download.php - adrien
-Change the way inline attachments are delivered
-Fixes a few (unreported) bugs, notably avatar upload during group generation
-#10079


git-svn-id: file:///svn/phpbb/trunk@7429 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-04-30 10:46:17 +00:00
Henry Sudhof
9ee570aebd #10191
git-svn-id: file:///svn/phpbb/trunk@7410 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-04-27 14:07:24 +00:00
Meik Sievertsen
550f270a00 #10005, #10003, #10001, #9999, #9945, #9965, #9909, #9906, #9877, #9861, #9831, #9830, #9815, #9665, #9624
prosilver adjustments for important announcements in ucp - #9995
MCP fixes for user notes/warnings - #9981
Preserving imageset values on save/edit
find a member link for Mass PM's - #9925
syndicate window.onload events where necessary - #9878
Duplicate topics in forums with announcements - #9840
Email template for forced re-activation - #9808
Topic pagination adjustment - #9763
Changed compose message layout in UCP - #9706, #9702
Fixed inline attachment font size (hopefully)


git-svn-id: file:///svn/phpbb/trunk@7384 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-04-22 15:27:40 +00:00