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

68 Commits

Author SHA1 Message Date
Cesar G
b893dae105 [ticket/11959] Move phpbb_generate_string_list() to functions_content.php.
PHPBB3-11959
2014-03-29 09:32:04 -07:00
Joas Schilling
8a78699f6c Merge remote-tracking branch 'brunoais/ticket/11663' into develop
* brunoais/ticket/11663:
  [ticket/11663] Add the doc block about the parameters.
  [ticket/11663] Add the doc block about the return value.
  [ticket/11663] Make generate_text_for_storage return the errors.
2013-11-02 16:26:29 +01:00
Andreas Fischer
d024ba9b09 [ticket/11901] Pass empty string as relative_url for non-local magic URL.
Only the regular expression for MAGIC_URL_LOCAL has three capturing groups. As
a result $matches[3] is only set in this case. Prior to PHPBB3-11606 an empty
string was passed to make_clickable_callback() as a replacement in case of less
than three capturing groups. This patch reintroduces the empty string.

Regression from 49c12ef4be229bf2223139298766ef441b075fbc.

PHPBB3-11901
2013-10-10 21:01:15 +02:00
Joas Schilling
7525c49d45 [ticket/11852] Split filesystem and path_helper into 2 classes
PHPBB3-11852
2013-09-26 15:34:44 +02:00
Andreas Fischer
41dd9d3b49 Merge remote-tracking branch 'fredsa/ticket/11606' into develop
* fredsa/ticket/11606:
  [ticket/11606] remove preg_replace() /e modifier in make_clickable()
2013-09-23 02:25:13 +02:00
Nathan Guse
f8e665751a [ticket/11832] Fix smiley paths
PHPBB3-11832
2013-09-13 09:56:00 -05:00
brunoais
7a02a8bcf2 [ticket/11663] Add the doc block about the parameters.
PHPBB3-11663
2013-08-17 20:11:26 +01:00
brunoais
53888ec540 [ticket/11663] Add the doc block about the return value.
generate_text_for_storage does not return anything, all returned values are outputted using the parameters so this uses the returned value with the same idea as many C language functions where the returned value is if all went well or not and if it didn't what went wrong.

PHPBB3-11663
2013-08-14 10:44:45 +01:00
brunoais
b6d6938b9f [ticket/11663] Make generate_text_for_storage return the errors.
generate_text_for_storage does not return anything, all returned values are outputted using the parameters so this uses the returned value with the same idea as many C language functions where the returned value is if all went well or not and if it didn't what went wrong.

PHPBB3-11663
2013-08-09 17:01:09 +01:00
Joas Schilling
78623bf2ff Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11762] Added call to test class's parent::setUp().
  [ticket/11762] Fixed test's filename
  [ticket/11762] Use the === operator to distinguish "0" from ""
2013-08-03 15:37:01 +02:00
s9e
8a02db317e [ticket/11762] Use the === operator to distinguish "0" from ""
PHPBB3-11762
2013-08-03 12:20:52 +02:00
Fred Sauer
49c12ef4be [ticket/11606] remove preg_replace() /e modifier in make_clickable()
PHPBB3-11606
2013-06-13 09:54:58 -07:00
Oleg Pudeyev
196ed8ef9f Merge PR #786 branch 'brunoais/ticket/10845' into develop
* brunoais/ticket/10845:
  [ticket/10845] Removed one empty line that wasn't supposed to be there
  [ticket/10845] Two of the three colouns were missing in the DB update file
  [ticket/10845] Remove censor from text
  [ticket/10845] Now it shows the preview post parsed
  [ticket/10845] Changed the report system. Now it saves posts with the bbcode

Conflicts:
	phpBB/includes/functions_content.php
2012-11-06 16:23:33 -05:00
David King
e67b010846 [feature/add_events] Put globals on one line
PHPBB3-9550
2012-08-22 10:41:59 -04:00
David King
575980cba9 [feature/add_events] Remove $allow_bbcode and $allow_smilies
Upon testing it was discovered that these did not work as originally intended.

PHPBB3-9550
2012-08-22 09:37:47 -04:00
David King
46597be1a3 [feature/add_events] Globalize event dispatcher object in some functions
PHPBB3-9550
2012-08-22 08:37:33 -04:00
David King
0358db2184 [feature/add_events] Before and after events for generate_text_for_* functions
PHPBB3-9550
2012-08-21 16:42:30 -04:00
David King
1e29f064e8 [feature/add_events] Added events for modifying generate_text_for_display()
The events allow you to perform extra functions on the text before nad/or
after it has been parsed for BBCode and Smilies.

PHPBB3-9550
2012-08-21 12:55:16 -04:00
David King
05755e1b37 [feature/add_events] Fixed docs, added _profile_cache to event parameters
PHPBB3-9550
2012-08-21 11:31:18 -04:00
David King
c0cd1fcb4f [feature/add_events] Change alter -> modify in event name
PHPBB3-9550
2012-08-21 11:27:28 -04:00
David King
e80e3809b9 [feature/add_events] Add event core.alter_username_string to change username
PHPBB3-9550
2012-08-20 12:21:44 -04:00
Bruno Ais
593ef78859 [ticket/10845] Remove censor from text
In order to remove the censor, I added a new parameter to
generate_text_for_display(), that new parameter is used to tell if the text
should be censored or not. Defaults to true.

PHPBB3-10845
2012-05-02 17:13:39 +01:00
Hari Sankar R
06d26ef46e [ticket/10438] Alligning the Smileys on the same line as the text.
Changed the styling of smilies to appear at the same level as
text, by adding vertical-align: text-bottom css property to all
smilies. Edited functions_content.php to add class="smilies"
to all parsed smilies.

PHPBB3-10438
2012-04-02 00:35:39 +05:30
Callum Macrae
79a987ffcb [ticket/10510] Moved a $user->lang call into the function.
PHPBB3-10510
2012-03-17 18:06:46 +00:00
Callum Macrae
784c9725f3 [ticket/10510] Made a couple improvements to phpbb_add_quickmod_option.
PHPBB3-10510
2012-03-17 18:06:45 +00:00
Callum Macrae
4f59990d90 [ticket/10510] Added phpbb_add_quickmod_option and moved existing to it.
PHPBB3-10510
2012-03-17 18:06:45 +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
Andreas Fischer
0b9fe01cce Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10240] Reverted a commit which added buggy code.
2011-08-21 14:26:37 +02:00
Callum Macrae
4592076366 [ticket/10240] Reverted a commit which added buggy code.
This reverts commit f9dbe33fa7917b6220a85a01ed9f395f3f1bb888.

The code which was added also removed new lines and tabs.

PHPBB3-10240
2011-08-21 13:16:50 +01:00
Oleg Pudeyev
4754e11d67 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10240] Added code to strip control characters from messages.
2011-08-09 21:33:36 -04:00
Oleg Pudeyev
cad3e4cb45 Merge remote-tracking branch 'callumacrae/ticket/10240' into develop-olympus
* callumacrae/ticket/10240:
  [ticket/10240] Added code to strip control characters from messages.
2011-08-09 21:30:37 -04:00
Callum Macrae
f9dbe33fa7 [ticket/10240] Added code to strip control characters from messages.
It is possible to evade the word filter using control characters.

Seeing as control characters have no practical application in a bulletin
board software, it doesn't do any harm to remove them entirely. That is
what this commit does.

PHPBB3-10240
2011-08-08 17:43:28 +01:00
Oleg Pudeyev
22389d4324 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10299] Fix typo in comment about $max_store_length in truncate_string()
2011-08-04 23:11:16 -04:00
Andreas Fischer
08ca84a3e7 [ticket/10299] Fix typo in comment about $max_store_length in truncate_string()
PHPBB3-10299
2011-07-31 15:34:45 +02:00
Josh Woody
4eda4855ef Deprecate $allow_reply parameter to truncate_string() (Bug #56675)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10442 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-25 18:02:37 +00:00
Andreas Fischer
5d2e4e88ab Allow "0" as censor word and replacement.
Only obtain word censor list if text is not empty.

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10039 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-21 09:44:55 +00:00
Meik Sievertsen
f7009291e2 Ability to define constant PHPBB_USE_BOARD_URL_PATH to use board url for images/avatars/ranks/imageset...
This feature does not change anything for those not using the constant and this feature is also quite in-flux. We need to test this with some applications and bridges and there may be other locations able to benefit from it.

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10008 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-17 14:45:14 +00:00
Meik Sievertsen
2958890439 Apply locale-independent basename() to attachment filenames. New function added: utf8_basename(). (Bug #43335 - Patch by ocean=Yohsuke)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9905 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-01 12:28:50 +00:00
Joas Schilling
433f03107d Fix bug #31505 - Do not cut post-message in between HTML-Entities on search.php - Patch by leviatan21
Authorised by: AcydBurn


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9842 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-07-24 08:56:06 +00:00
Andreas Fischer
54ee31972a Fix bug #47775 - Properly convert and show filesize information
Authorised by: naderman

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9748 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-07-11 10:05:20 +00:00
Meik Sievertsen
29cd21102d late fix for #44845 (phpBB debug notice for some search terms)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9515 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-05-13 10:42:44 +00:00
Meik Sievertsen
e2f445ae14 Fix infinite loop in truncate_string (Bug #43475)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9424 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-04-04 11:05:47 +00:00
Meik Sievertsen
66a33c75a5 Fix infinite loop in truncate_string (Bug #43475)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9423 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-04-04 10:55:58 +00:00
Meik Sievertsen
d4ac2d4209 Flash files do not display anymore after update to flash player 10 (Bug #41315)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9384 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-03-17 14:42:13 +00:00
Meik Sievertsen
3b918a234e Fix download count increments for image attachments without corresponding thumbnails. (Bug #42505)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9373 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-03-16 15:59:53 +00:00
Meik Sievertsen
67775c5332 fix tiny typo... the mode is no_profile instead of noprofile.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9247 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-01-03 12:20:05 +00:00
Meik Sievertsen
516734979c change get_username_string() again. This time we do not try to "guess" something. We also do not cache the modes. Instead we try to only run required code and pre-compile the URL and TPL. This should give the optimal performance given the circumstances.
Additionally fix a small bug with profile urls if the RokBridge is used.

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9217 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-24 12:06:14 +00:00
Meik Sievertsen
5a0d7717f6 Fix bug #38655
- Since guest_username is only used for anonymous we revert back to user_id being the cache key and not caching anonymous usernames at all
- the code changes are as minimal as possible

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9184 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-11 14:46:38 +00:00
Meik Sievertsen
10da18e829 fix the no_profile one called after another mode with the same user_id and guest_username
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9160 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-03 11:15:50 +00:00