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

10971 Commits

Author SHA1 Message Date
erangamapa
8191755cca [ticket/11145] Wrong error thrown when uploading a bigger image.
When attaching an image to a post with a size larger than maximum defined in
php.ini, 'ATTACHED_IMAGE_NOT_IMAGE' error is thrown. $file->is_image() is
returning false value when image size is too large. Therefore, moved
not image test down after image size test.

PHPBB3-11145
2013-05-25 10:50:43 +05:30
David King
901955e452 [ticket/11551] Fix error in system tab if get_remote_file returns empty string
Currently a debug error is thrown. With this patch, it fails without keeping
the admin from being able to access the rest of the System modules by showing
a nicer error "Failed to obtain latest version information."

PHPBB3-11551
2013-05-20 12:20:55 -04:00
Marc Alexander
cd1da92d85 [ticket/11538] Add optional switch as argument to hex colour validation
The value of $optional will decide whether an empty string will be
treated as incorrect input or if it is allowed. The optional argument
will default to false and therefore treat an empty string as incorrect
unless explicitly told to not do so.

PHPBB3-11538
2013-05-19 17:45:45 +02:00
Andreas Fischer
4fc180ade5 Merge remote-tracking branch 'marc1706/ticket/11537' into develop-olympus
* marc1706/ticket/11537:
  [ticket/11537] Adjust error message on ucp group manage to fit rest of ucp
2013-05-19 15:40:04 +02:00
Marc Alexander
7898dd9459 [ticket/11538] Limit comment in acp_groups to 80 characters per line
PHPBB3-11538
2013-05-19 15:13:37 +02:00
Marc Alexander
373e26ca74 [ticket/11538] Merge calls to validate_data() in acp_groups
PHPBB3-11538
2013-05-19 11:38:11 +02:00
Marc Alexander
b49ce5eb3a [ticket/11538] Rename phpbb_validate_colour to phpbb_validate_hex_colour
PHPBB3-11538
2013-05-19 11:29:11 +02:00
Marc Alexander
30e0b694e6 Merge branch 'develop-olympus' of https://github.com/phpbb/phpbb3 into ticket/11538 2013-05-17 12:22:27 +02:00
Andreas Fischer
be71701af7 Merge remote-tracking branch 'galaxyAbstractor/ticket/11536' into develop-olympus
* galaxyAbstractor/ticket/11536:
  [ticket/11536] Fixed incorrect removal of "install" in script_path
2013-05-16 19:11:55 +02:00
Joas Schilling
38dbfc17a7 [ticket/11545] Remove DIRECTORY_SEPARATOR dependency from is_absolute
The given path is an absolute path in general, just not on our current system.

PHPBB3-11545
2013-05-16 17:30:23 +02:00
Marc Alexander
1715619fda [ticket/11538] Add function phpbb_validate_colour for validating colours
It will be possible to use this function via the validate_data() function
interface that has already been used previously. Thus, this new function
will extend the capabilities of validate_data() to checking hex color
values.

PHPBB3-11538
2013-05-16 13:22:43 +02:00
Vjacheslav Trushkin
1ea1247cd5 [ticket/10772] Remove unnecessary comment
PHPBB3-10772
2013-05-16 09:34:58 +03:00
Victor Nagy
63f11a8024 [ticket/11536] Fixed incorrect removal of "install" in script_path
Earlier the script would incorrectly remove the word "install"
from the script_path when trying to remove the last folder in the
path named "/install". This would lead to issues when the path
you are installing phpBB contained "install". For example
"/install_test/install" would become "/_test".

This change gets the parent folder instead of replacing all
"install". $name contains /install_test/install/index.php
from start and running dirname() gives /install_test/install.
Running dirname once more gives the parent folder of install,
/install_test.

PHPBB3-11536
2013-05-15 14:49:46 +02:00
Joas Schilling
06edf15ac3 [ticket/11546] Fix is_absolute() throws E_NOTICE for empty string
PHPBB3-11546
2013-05-15 14:05:56 +02:00
Marc Alexander
204cdb2164 [ticket/11538] Make sure regex doesn't allow multiple color values
This will now make sure that 'AAFF00' will be matched but strings like
'AAFF00 AABB00' will not.

PHPBB3-11538
2013-05-15 12:30:05 +02:00
Marc Alexander
deefe5c0e4 [ticket/11538] Simplify colour value check and remove support for '#'
The input length for the hex color is now limited to 6 characters and
the support for colors starting with a '#' has been dropped. The allowed
input length of 7 in prosilver seems to have been a relict from old ages
of phpBB3. In order to have proper support for correct checking of the
colour value, the new code was also ported to the ACP groups manage page.
The tests have been modified to reflect the changes to the behavior of
the color check. Tests for the ACP will follow.

PHPBB3-11538
2013-05-14 22:39:33 +02:00
Marc Alexander
1fae7720e4 [ticket/11538] Fix incorrect regex and test for duplicate # in color string
PHPBB3-11538
2013-05-14 21:27:25 +02:00
Marc Alexander
a547ba3f9d [ticket/11538] Use regex for testing color value and improve tests
We are now using a regex with preg_match() in order to properly check
if the entered color value is in hex color format or not. A proper
error message is triggered if an incorrect color value is entered and
the prepended '#' is removed if necessary.

PHPBB3-11538
2013-05-14 19:44:55 +02:00
Marc Alexander
b7b0b0ccc3 [ticket/11538] Make sure group color can't exceed maximum of 6 characters
In order to prevent future issues with this, a basic set of functional
tests for the UCP groups manage page have been added.

PHPBB3-11538
2013-05-14 13:43:53 +02:00
Marc Alexander
84cfacf1f2 [ticket/11537] Adjust error message on ucp group manage to fit rest of ucp
The current look highly differed from the rest of the UCP. Additionally,
this caused the error message to be hardly noticeable at all.

PHPBB3-11537
2013-05-14 12:18:40 +02:00
gamerchan
d680aac7c5 [ticket/11105] Added spaces between ; and "url=" to adhere to w3c conventions.
There was no space between ; and the string "url=". But according to w3c, we
should have atleast one space between them. So, added space characters
accordingly.

PHPBB3-11105
2013-05-12 22:57:40 +02:00
Vjacheslav Trushkin
170333a6fc [ticket/10772] Use forum specific style for trigger_error
PHPBB3-10772
2013-05-11 22:49:42 +03:00
Andreas Fischer
a42514105d [ticket/11513] Update (all) composer dependencies.
PHPBB3-11513
2013-05-09 18:46:29 +02:00
Andreas Fischer
585f0bc827 [ticket/11513] Add PHPUnit 3.7 and DbUnit 1.2 as a composer dev dependency.
PHPBB3-11513
2013-05-09 18:42:35 +02:00
Andreas Fischer
5ea75ddf09 [ticket/11526] Update all dependencies / regenerate composer.lock.
PHPBB3-11526
2013-05-09 02:48:38 +02:00
Andreas Fischer
b3d16f21a8 [ticket/11526] Increase composer minimum stability in olympus to stable.
PHPBB3-11526
2013-05-09 02:48:31 +02:00
Andreas Fischer
841f1e4922 Merge remote-tracking branch 'MGaetan89/ticket/11144' into develop-olympus
* MGaetan89/ticket/11144:
  [ticket/11144] Add missing {FORUM_NAME} variable
  [ticket/11144] Add missing {FORUM_NAME} variable
2013-05-06 21:56:20 +02:00
Gaëtan Muller
eefcdfa54a [ticket/11144] Add missing {FORUM_NAME} variable
Replace spaces with tabs

PHPBB3-11144
2013-05-06 21:50:45 +02:00
Gaëtan Muller
828d3b6b68 [ticket/11144] Add missing {FORUM_NAME} variable
The template variable {FORUM_NAME} was missing from
the login page of a password protected forum

PHPBB3-11144
2013-05-06 21:31:16 +02:00
hjpotter92
6d4a75b3cb [ticket/11517] Fix list numbering
PHPBB3-11517
2013-05-02 06:29:32 +05:30
Gaëtan Muller
802fbbb444 [ticket/9975] Translate missing style error message
The error message about missing style data was not
translated

PHPBB3-9975
2013-04-21 17:38:49 +02:00
Nils Adermann
0ce94fde77 Merge branch 'ticket/11358' into develop-olympus
* ticket/11358:
  [ticket/11358] Removed all trailing white spaces.
  [ticket/11358] Fixed the code according to coding guidlines.
2013-04-12 14:03:24 +02:00
erangamapa
7d8bbcd596 [ticket/11358] Removed all trailing white spaces.
Removed all trailing white spaces with new lines.

PHPBB3-11358
2013-04-12 14:03:06 +02:00
erangamapa
00b45fa4dc [ticket/11358] Fixed the code according to coding guidlines.
Added proper indentation and new line after break in switch
statement.

PHPBB3-11358
2013-04-12 14:02:51 +02:00
Nathaniel Guse
fb371d6bbe Merge remote-tracking branch 'remotes/marc/ticket/6723' into develop-olympus
# By Marc Alexander
# Via Marc Alexander
* remotes/marc/ticket/6723:
  [ticket/6723] Show info that message has been deleted before delivery
2013-03-02 17:48:56 -06:00
Marc Alexander
acabe6f5ca [ticket/6723] Show info that message has been deleted before delivery
If the message has been deleted before the delivery it will still show in
the message history, although with an empty message. This patch will
change that behavior to showing the info that it has been deleted before
it was delivered in red letters. The red letters ensure that users won't
mistake the info for the actual message.

PHPBB3-6723
2013-03-03 00:32:31 +01:00
Andreas Fischer
5b2d272137 [ticket/11368] Fix background color for PM report rows by using accessing var.
PHPBB3-11368
2013-02-26 22:17:24 +01:00
Nils Adermann
4615698807 [ticket/10986] message.id fallback to SERVER_NAME or phpbb.generated
Rather than send invalid message ids with a missing domain part we try
to read one from $_SERVER and otherwise use phpbb.generated

PHPBB3-10986
2013-02-24 19:07:24 +01:00
erangamapa
1b39d6d65e [ticket/11358] Changed the name of post parameter.
Replaced the parameter name 'defaultbylink' to a meaningful name
'set_default_on_all'. Parameter is used for making all users
default for selected group in acp_groups.php.

PHPBB3-11358
2013-02-24 18:12:50 +01:00
erangamapa
c0a39537e3 [ticket/11358] Changed the action parameter value to represent the link.
Changed the action parameter value to recognize whether 'Make default
group for every member' is clicked. If so execute a seperate code block
under switch statement for $action and add all the users as default
for the group.

PHPBB3-11358
2013-02-24 18:12:45 +01:00
erangamapa
538b09ba61 [ticket/11358] Enabled link making all users default for a group.
Detect whether link is clicked or form is posted for making users
default for a group. If form is posted and no users are selected,
validation happens and displays an error message. When the link is
clicked, all the users will be default users for that group.

PHPBB3-11358
2013-02-24 18:12:40 +01:00
erangamapa
880786d686 [ticket/11358] Removed redundant code and referred proper variable.
Error was thrown when no users are selected before executing the code
chunk which manually adds all the user to make the group default.
Removed this code and referred $mark_ary instead of $name_ary which
will not have selected user ids.

PHPBB3-11358
2013-02-24 18:12:35 +01:00
erangamapa
373c9a3f4e [ticket/11358] Success message even without selecting a user.
In group membership management, if you perform the action
'Make group default for member' without selecting any user,
a confirm box will be displayed and will show a success
message after confirming. Added a new condition to fix this
issue in acp_groups.php. It will check weather any users are
selected before performing above action.

PHPBB3-11358
2013-02-24 18:12:28 +01:00
erangamapa
ab530a999e [ticket/11355] Referred proper variable when validating selection.
Earlier PR was referring wrong variable $name_ary. Changed it to
$mark_ary which actually contains selected user ids.

PHPBB3-11355
2013-02-24 18:04:54 +01:00
erangamapa
f8e184c54e [ticket/11355] Wrong error message when no user is selected.
In ACP group membership management, if you select 'remove member
from group' without selecting any users and submit,it will display
a wrong error after confirmbox. Since no users are selected, this
should not go even until confirmbox. Added a new condition to check
weather any users are selected when the action is 'deleteusers'
in acp_groups.php and disply a correct error.

PHPBB3-11355
2013-02-24 18:04:46 +01:00
Nils Adermann
639110766c Merge remote-tracking branch 'github-bantu/ticket/11361' into develop-olympus
* github-bantu/ticket/11361:
  [ticket/11361] Make sure that array passed to strtr() has the proper format.
2013-02-24 17:50:04 +01:00
Nils Adermann
678ec7b545 Merge remote-tracking branch 'github-exreaction/ticket/10896' into develop-olympus
* github-exreaction/ticket/10896:
  [ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace EMAIL_INVALID
  [ticket/10896] Adds email validation to email settings in ACP
2013-02-24 17:39:04 +01:00
Nils Adermann
f29bebc7ce Merge remote-tracking branch 'github-bantu/ticket/11122' into develop-olympus
* github-bantu/ticket/11122:
  [ticket/11122] Move rxu to 'Former Contributors' section.
  [ticket/11122] Add EXreaction to docs/AUTHORS.
2013-02-24 17:37:32 +01:00
Andreas Fischer
6bf64d5620 [ticket/7262] Add note about set_config() not updating is_dynamic.
PHPBB3-7262
2013-02-24 13:39:48 +01:00
Andreas Fischer
a9037a68c1 [ticket/7262] Add $is_dynamic example to set_config() and set_config_count().
The logic is the other way around here in comparison to develop's
phpbb_config_db class, so add examples to make things more clear.

PHPBB3-7262
2013-02-24 13:08:00 +01:00