1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

54 Commits

Author SHA1 Message Date
Joas Schilling
f01e0a2eef [ticket/10073] Deduplicate the if statement
PHPBB3-10073
2014-05-29 02:14:40 +02:00
Joas Schilling
ed8c16bf0d [ticket/10073] Fallback to board_contact when contact page is disabled
PHPBB3-10073
2014-05-29 02:14:39 +02:00
Nils Adermann
389bc0b8dd [ticket/10073] Replace board_contact mail with links to contact page
Error pages still contain the email address.

PHPBB3-10073
2014-05-29 02:14:28 +02:00
Yuriy Rusko
a759704b39 [ticket/12594] Remove @package tags and update file headers
PHPBB3-12594
2014-05-27 20:51:13 +02:00
Unknown
7a04c9048c [ticket/9916] Updating header license and removing Version $Id$
PHPBB3-9916
2011-12-31 13:32:52 +00:00
Igor Wiedler
d766ee3fe6 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10446] Pass $config and $user via parameter to anti_abuse_headers().
  [ticket/10446] Remove leftover $headers parameter from anti_abuse_headers().
  [ticket/10446] RFC2047 encode user/server names in X-AntiAbuse headers.
  [ticket/10446] DRY X-AntiAbuse header addition.

Conflicts:
	phpBB/includes/ucp/ucp_register.php
2011-11-20 18:45:56 +01:00
Andreas Fischer
37c7668193 [ticket/10446] Pass $config and $user via parameter to anti_abuse_headers().
PHPBB3-10446
2011-11-20 16:35:31 +01:00
Oleg Pudeyev
64d62038cd [ticket/10446] DRY X-AntiAbuse header addition.
PHPBB3-10446
2011-11-20 04:15:44 -05:00
Igor Wiedler
72a3bcd048 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9307] Add config variable to installation schema.
  [ticket/9307] Remove hardcoded chunk size of mass emails.

Conflicts:
	phpBB/install/database_update.php
2011-10-29 13:03:04 +02:00
Chris Smith
138d1050fc [ticket/9307] Remove hardcoded chunk size of mass emails.
The new config option is 'email_max_chunk_size' I have not added
an interface option to change this.

PHPBB3-9307
2011-09-24 22:05:40 +01:00
Erik Frèrejean
83ca730544 [ticket/9581] Fix missing index
Add `u.user_lang` to the select statement to prevent "undefined
index" errors.

PHPBB3-9581
2011-03-24 10:44:36 +01:00
Erik Frèrejean
df76799d4b [ticket/9581] Slightly tweaked queries
Changed the queries based upon comments by Oleg and Nick, this
should return the expected result in every case.

PHPBB3-9581
2011-03-04 12:14:00 +01:00
Erik Frèrejean
1dd25ce62d [ticket/9581] Make banlist table select optional
Per Nick, only set the `BANLIST_TABLE` in the select statement
if the `$sql_ban_where` variable is set.

PHPBB3-9581
2011-03-04 11:10:09 +01:00
Erik Frèrejean
1b60613319 [ticket/9581] Mass e-mail to banned users
Implement the suggestion made by Adam in the ticket, this will add
an additional checkbox to the mass e-mail page. By checking this
the mass e-mail shall also be send to banned users. By default
banned users however are excluded from the mass e-mail.

PHPBB3-9581
2011-03-04 11:10:08 +01:00
Meik Sievertsen
1e36ed1f74 Mass Email works again for users with empty jabber address but notification set to 'both'. (Bug #39755)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9389 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-03-17 15:50:19 +00:00
Meik Sievertsen
7de5bb3498 dumdidum... sorry. ;)
git-svn-id: file:///svn/phpbb/trunk@8147 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-10-05 14:36:34 +00:00
Henry Sudhof
4defd8a830 Ok, here comes a big one. Poor updater. Also requires testing.
#i91
#i92
#i93
#i94
#i95
#i96


git-svn-id: file:///svn/phpbb/trunk@8120 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-10-03 15:05:54 +00:00
Meik Sievertsen
e3882844ec #i62 - #i65
gone through every javascript invocation and making sure we adhere to our coding guidelines.


git-svn-id: file:///svn/phpbb/trunk@8099 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-09-22 18:31:50 +00:00
Meik Sievertsen
ec1da5b1fd try to normalize everything...
git-svn-id: file:///svn/phpbb/trunk@7920 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-07-22 20:11:45 +00:00
Meik Sievertsen
5c6653717f fixing some bugs
more mcp links for easier moderating different aspects (all, forum, topic)
i may have introduced new bugs with this commit due to me having fixed some things weeks ago and some code changed in between - please report if you see something not working as expected.


git-svn-id: file:///svn/phpbb/trunk@7007 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-02-18 13:42:08 +00:00
Meik Sievertsen
333b3515ed Some... fixes... laying around here.
git-svn-id: file:///svn/phpbb/trunk@6970 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-02-06 19:09:43 +00:00
Meik Sievertsen
576bb754e9 fixing some bugs, most being submitted grammatical/spelling errors.
git-svn-id: file:///svn/phpbb/trunk@6915 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-01-21 18:33:45 +00:00
Oleg Pudeyev
2d3dcd43c5 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9581] Fix missing index
  [ticket/9581] Slightly tweaked queries
  [ticket/9581] Make banlist table select optional
  [ticket/9581] Mass e-mail to banned users
2011-04-10 14:17:56 -04:00
Igor Wiedler
af5b9a9640 [ticket/9556] Drop php closing tags, add trailing newline
Closing tags converted using Oleg's script.
remove-php-end-tags.py -a .

Trailing newlines added using the following where $ext is file extension.
find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s;

Extensions: php, css, html, js, xml.

PHPBB3-9556
2010-11-11 19:10:55 +01:00
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
68aa6bd29a put acp, mcp and ucp into modules/ directory
git-svn-id: file:///svn/phpbb/trunk@9223 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-24 14:08:15 +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
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
David M
370e189f15 - make viewforum work again
- remove the lower case functions, they were stupid anyway
- added some indexes
- added a group_name_clean column


git-svn-id: file:///svn/phpbb/trunk@8315 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-01-08 06:44:05 +00:00
Meik Sievertsen
46f3bd40a8 - telling the admin for what the board contact and board email addresses are used for and also making sure this explanation is correct ;)
- fixes for bugs #6694, #6664 and #6662


git-svn-id: file:///svn/phpbb/trunk@6826 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-12-31 16:56:15 +00:00
Meik Sievertsen
945afbc5fa Unused Code inside function update_forum_data [Bug #6606]
Copy permissions protection for groups [Bug #6594]
HTML issues in ACP [Bug #6580, #6578]
Always send the correct encoding [related to bug #6576]
Mass email fixes for first loop iteration [Bug #6570]
Extension groups to be allowed in PM's and/or Posts [Bug #6558]
Extension allowance checking clarified (no longer using forum id 0 for private messaging)
Using request_var() array method for some variables [Bug #6556]
Added confirmation for deletion of ranks/smilies/icons/word censores [Bug #6548, #6530, #6512, #6466]
Only show postable forums in dropdown list for moving posts on forum deletion as well as correct re-indexing [Bug #6510, #6476, #6384]
Jabber password being password field in jabber settings screen [Bug #6478]
user activity language variable if viewing not own profile [Bug #6432]
Show moderator group/user-name colour [Bug #6402]
Log rank creation/updating/removing [Bug #6398]
Update check permission changed from a_ to a_board [Bug #6392]


git-svn-id: file:///svn/phpbb/trunk@6816 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-12-27 17:43:55 +00:00
Meik Sievertsen
7ad986c37e - a bunch of fixes
- added todos to the updater to make sure i do not forget. :)


git-svn-id: file:///svn/phpbb/trunk@6698 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-12-02 13:19:40 +00:00
Meik Sievertsen
7ab232a455 ok, i am an idiot...
git-svn-id: file:///svn/phpbb/trunk@6548 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-11-03 21:05:25 +00:00
Meik Sievertsen
1634814e16 - make sure the sql layer for mysql always states mysql4 and get to mysql if using mysql < 4
- assign some default vars to email templates (we always need some basic ones)


git-svn-id: file:///svn/phpbb/trunk@6546 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-11-03 17:50:39 +00:00
Meik Sievertsen
daa3288a36 - implemented the suggested html_entity_decode function made by david
- fixed string length checking by also decoding entities for the sake of checking
- used the new html_entity_decode function


git-svn-id: file:///svn/phpbb/trunk@6545 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-11-03 11:26:14 +00:00
Meik Sievertsen
f4da66a932 - adjust unread query a bit to cope with large topics (thanks bart!)
- fixing some bugs
- more username_clean work


git-svn-id: file:///svn/phpbb/trunk@6513 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-10-20 13:48:44 +00:00
Meik Sievertsen
b76222cb6e - fixed some bugs
- changed attachment handling a bit
- tried to remove target tags out of the code
- do not add session ids to urls for bots as well as not creating a new session on each page view for them

I bet i introduced some bugs too. ;)


git-svn-id: file:///svn/phpbb/trunk@6364 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-09-13 16:08:36 +00:00
Meik Sievertsen
1d37b69ddd - some bugfixes
- using E_USER_WARNING if an error occurred within the ACP (sadly not able to use it as a default for trigger_error - it seems to be hardcoded in PHP)


git-svn-id: file:///svn/phpbb/trunk@6320 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-08-28 15:50:33 +00:00
Meik Sievertsen
8405f0d324 sql_in_set changes
git-svn-id: file:///svn/phpbb/trunk@6271 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-08-12 13:14:39 +00:00
Meik Sievertsen
b4b901b825 - fixed some bugs
- made imageset naming more consistent
- updated every schema to be consistent and also fixed it (every db should install fine now)
-


git-svn-id: file:///svn/phpbb/trunk@6237 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-08-05 15:49:28 +00:00
Meik Sievertsen
52045ff263 some bugfixes
git-svn-id: file:///svn/phpbb/trunk@6104 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-06-19 21:30:32 +00:00
Meik Sievertsen
10846d462a fix bugs #2271 and #2273
git-svn-id: file:///svn/phpbb/trunk@6081 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-06-17 11:28:21 +00:00
Meik Sievertsen
b0c3e39582 - removed db cache (might re-appear, but for now we do not see the need for it)
- all changes to styles/subsilver/template are purely cosmetic (no functional changes)
- cosmetics
- bugfixes
- add index to modules table
- use modules ordering code for forums too


git-svn-id: file:///svn/phpbb/trunk@6073 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-06-16 16:54:51 +00:00
Meik Sievertsen
dd9ad539fd ok, this one is rather large... the most important change:
re-introduce append_sid: old style continues to work, not a performance hog as it was in 2.0.x -> structure is different

apart from this, code cleanage, bug fixing, etc.


git-svn-id: file:///svn/phpbb/trunk@6015 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-06-06 20:53:46 +00:00
Meik Sievertsen
530b7e94c5 - fixing a few smaller bugs/glitches
- init user session in cron.php (else it can produce errors if functions expect the user object being set)
- fix sql escaping for mssql/mssql_odbc


git-svn-id: file:///svn/phpbb/trunk@5957 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-05-21 16:54:19 +00:00
Meik Sievertsen
5029170afb - fixed a few smaller things
git-svn-id: file:///svn/phpbb/trunk@5952 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-05-20 18:39:35 +00:00
Meik Sievertsen
7bc05c5e24 - fixing some bugs, containing fixes for anonymous username displays, eaccelerator issue, permission trace and a few smaller bugs.
git-svn-id: file:///svn/phpbb/trunk@5858 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-04-29 01:18:57 +00:00
Meik Sievertsen
431e494ae4 To all people having their bug status set to fixed: SF pserver CVS access is currently down, therefore the snapshots are still out of date.
- fix a bunch of bugs
- <!-- $Id$ --> is no longer allowed in template (.html) files
- changed layout of private message screens (folders are menu items)
- removed unread mode for private messages
- added new feature to template engine - "jump out of loop" or "loop another loop within my loop" :D (will be documented within the coding guidelines)
- added autologin field to sessions
- check session length checks
- added add_log statement to sessions to track session valid to invalid changes if ip/browser change depending on config settings (only debug)
- added multibyte support for various variables (exception at the moment is usernames which needs some discussion)
- hopefully not broke something. :/


git-svn-id: file:///svn/phpbb/trunk@5765 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-04-06 17:15:45 +00:00
Meik Sievertsen
1a8c91b0d4 ok, thought about this now for too long. I think the best solution circumventing memory consumption and not introducing "hacks" is to seperate module information (and probably more in 3.2 for installation/uninstallation) from the main code.
git-svn-id: file:///svn/phpbb/trunk@5725 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-03-25 19:14:55 +00:00
Meik Sievertsen
5d2bba8e70 #1232
git-svn-id: file:///svn/phpbb/trunk@5719 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-03-25 15:46:20 +00:00