1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-02 04:24:56 +02:00

654 Commits

Author SHA1 Message Date
Andreas Fischer
2236849511 Merge remote-tracking branch 'nickvergessen/ticket/10457' into develop
* nickvergessen/ticket/10457:
  [ticket/10457] Undefined variable $request, when print-viewing PMs
2011-11-14 19:01:28 +01:00
Andreas Fischer
2761a993ff Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9361] View correct error messages when editing account information
2011-11-14 19:01:15 +01:00
Andreas Fischer
69f943c8d6 Merge remote-tracking branch 'nickvergessen/ticket/9361' into develop-olympus
* nickvergessen/ticket/9361:
  [ticket/9361] View correct error messages when editing account information
2011-11-14 19:01:06 +01:00
Joas Schilling
14af18cb1b [ticket/9361] View correct error messages when editing account information
Currently the "current password" is only checked, when you change something.
This means you get "Your profile has been updated." although you enter a wrong
password. I also added proper error messages, when you leave the confirm fields
empty, and sorted them in the order of the field appearances on the html page.

PHPBB3-9361
2011-11-14 18:54:12 +01:00
Joas Schilling
160e89aa06 [ticket/10457] Undefined variable $request, when print-viewing PMs
PHPBB3-10457
2011-11-14 18:49:07 +01:00
Andreas Fischer
1b003fd244 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8616] Include old U_INBOX var for BC
  [ticket/8616] Rename U_INBOX to U_VIEW_MESSAGE
  [ticket/8616] Direct links in pm notification emails
2011-11-13 20:34:53 +01:00
Andreas Fischer
0a5d2a84d1 Merge remote-tracking branch 'igorw/ticket/8616' into develop-olympus
* igorw/ticket/8616:
  [ticket/8616] Include old U_INBOX var for BC
  [ticket/8616] Rename U_INBOX to U_VIEW_MESSAGE
  [ticket/8616] Direct links in pm notification emails
2011-11-13 20:34:39 +01:00
Igor Wiedler
735e89c91b Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10259] Do not send notifications to user accounts joining free groups.
2011-10-29 11:43:44 +02:00
Andreas Fischer
8f6cfc77d2 [ticket/10259] Do not send notifications to user accounts joining free groups.
It does not make sense to send notifications to users joining a freely open
group. They already know that they were added to the group, because they
triggered the actual join.

PHPBB3-10259
2011-10-17 19:10:41 +02:00
Alan
f7c1341402 [ticket/8616] Direct links in pm notification emails
Import the "Direct links in pm notification emails" modification,
version 1.0.1.

PHPBB3-8616
2011-10-13 19:17:56 +02:00
Andreas Fischer
d5cd49f276 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10304] Fix URL for ICQ while view private messages
2011-10-13 17:07:39 +02:00
Joas Schilling
f94f872624 [ticket/10304] Fix URL for ICQ while view private messages
PHPBB3-10304
2011-10-13 13:59:39 +02: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
Igor Wiedler
ec4962d84e [ticket/9608] Remove blank line
PHPBB3-9608
2011-07-17 09:49:58 +02:00
Igor Wiedler
4bdad7125a [ticket/9608] Remove use of references in captcha and other places
References are not really needed in PHP due to copy-on-write. Since
PHP5, objects are always passed around as identifiers, which means they
are mutable. So it is no longer required to pass these by reference
either.

PHPBB3-9608
2011-07-13 11:32:38 +02:00
Nils Adermann
a30ec6e052 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10158] Remove some code duplication from generating the message.
  [ticket/10195] Return false in session::check_dnsbl() when IPv6 is passed.
  [ticket/10158] Only view "Return to" links if they are useful.
  [ticket/10158] Add return-link to folder, when the user replied from a folder.
  [ticket/10158] Add "Return to Inbox"-link to "PM send"-message.
2011-06-05 01:58:52 +02:00
Nils Adermann
6b6705b852 [ticket/10158] Remove some code duplication from generating the message.
PHPBB3-10158
2011-06-05 01:58:03 +02:00
Joas Schilling
67449f8f1b [ticket/10158] Only view "Return to" links if they are useful.
PHPBB3-10158
2011-05-23 12:03:04 +02:00
Oleg Pudeyev
f9307531a7 Merge remote-tracking branch 'nickvergessen/ticket/8542' into develop
* nickvergessen/ticket/8542:
  [ticket/8542] Display custom profile fields in private messages

Conflicts:
	phpBB/install/database_update.php
2011-05-20 19:50:29 -04:00
Joas Schilling
8fa44cc3b9 [ticket/8542] Display custom profile fields in private messages
Introduce an option to display the cpf in the PM view.

PHPBB3-8542
2011-05-20 16:45:29 +02:00
Joas Schilling
437013194a [ticket/10158] Add return-link to folder, when the user replied from a folder.
PHPBB3-10158
2011-05-09 12:46:34 +02:00
Joas Schilling
65d956bd81 [ticket/10158] Add "Return to Inbox"-link to "PM send"-message.
PHPBB3-10158
2011-05-05 10:49:54 +02:00
Oleg Pudeyev
a4a9e38007 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9961] Create log entries when users are activated.
2011-04-30 20:44:42 -04:00
Erik Frèrejean
1d2201902f [ticket/9961] Create log entries when users are activated.
* Create log entries when a user activates own account without
   also changing their password.

 * Additionally create admin log entries when an administrator activates
   user accounts.

PHPBB3-9961
2011-04-19 13:11:20 +02:00
Andreas Fischer
7074d19c40 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10121] Fix missing urlencode() for ICQ-number in viewtopic.php
  [ticket/10121] Fix ICQ profile link, leading to a dead web-messenger.
2011-04-05 00:31:42 +02:00
Joas Schilling
59d75c1ae6 [ticket/10121] Fix ICQ profile link, leading to a dead web-messenger.
PHPBB3-10121
2011-04-03 22:11:13 +02:00
Oleg Pudeyev
df096b6b52 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9970] Rename validate_language() to validate_language_iso_name().
  [ticket/9970] Do not allow switching to languages not installed on reg. page.
  [ticket/9970] Check whether language pack is installed.
  [ticket/9970] User language input is checked for existance
2011-03-11 21:55:46 -05:00
Andreas Fischer
ac90190682 [ticket/9970] Rename validate_language() to validate_language_iso_name().
PHPBB3-9970
2011-03-07 00:41:24 +01:00
Andreas Fischer
0f16fd3519 [ticket/9970] Do not allow switching to languages not installed on reg. page.
PHPBB3-9970
2011-03-07 00:41:24 +01:00
Josh Woody
f7723b3e95 [ticket/9970] User language input is checked for existance
Users could select a language which did not exist in the database by altering
form fields because there was no back-end verification.

PHPBB3-9970
2011-03-07 00:41:14 +01:00
Igor Wiedler
80a063ac34 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10024] Populate unread information to template for styling issues.
2011-02-28 01:03:55 +01:00
Igor Wiedler
ab3f45c0e9 Merge branch 'ticket/hanakin/10001' into develop
* ticket/hanakin/10001:
  [ticket/10001]  Created the new styles within colours.css to handle the displaying of the forum & topic images
  [ticket/10001]  Created new Template variable to house class names based on $folder_img value, Modified prosilver template files to utilize class for forum & topic images through out template via the newly created Template variable, Created the new styles within colours.css to handle the displaying of the forum & topic images
2011-02-28 00:07:59 +01:00
Philippe Chevrier
ffe691db10 [ticket/10024] Populate unread information to template for styling issues.
PHPBB3-10024
2011-02-28 00:00:56 +01:00
hanakin
abc8384bf2 [ticket/10001] Created new Template variable to house class names based on $folder_img value, Modified prosilver template files to utilize class for forum & topic images through out template via the newly created Template variable, Created the new styles within colours.css to handle the displaying of the forum & topic images
* Created new Template variable to house class names based on $folder_img value in functions_display.php.
* Created new Template variable to house class names based on $folder_img value in mcp_forums.php.
* Created new Template variable to house class names based on $folder_img value in ucp_main.php.
* Created new Template variable to house class names based on $folder_img value in search.php.
* Created new Template variable to house class names based on $folder_img value in ucp_pm_viewfolder.php.
* Created new Template variable to house class names based on $folder_img value in search.php.
* Created new Template variable to house class names based on $folder_img value in viewforum.php.
* Modified forumlist_body.html to utilize class for forum & topic images through out template via the newly created Template variable
* Modified mcp_forum.html to utilize class for forum & topic images through out template via the newly created Template variable
* Modified search_results.html to utilize class for forum & topic images through out template via the newly created Template variable
* Modified ucp_main_bookmarks.html to utilize class for forum & topic images through out template via the newly created Template variable
* Modified ucp_main_subscribed.html to utilize class for forum & topic images through out template via the newly created Template variable
* Modified ucp_main_front.html to utilize class for forum & topic images through out template via the newly created Template variable
* Modified ucp_pm_viewfolder.html to utilize class for forum & topic images through out template via the newly created Template variable
* Modified viewforum_body.html to utilize class for forum & topic images through out template via the newly created Template variable
* Created the new styles within colours.css to handle the displaying of the forum & topic images

- NOTES: This changes are the first step in the revamp of prosilver initiative, this provides the ground work to handle the images via sprites to reduce the amount of HTTP requests by the server

PHPBB3-10001
2011-01-18 22:39:50 -05:00
Igor Wiedler
eda9fbbb63 [ticket/9574] Remove conditional PHP<5.2 code
There is a large amount of conditional code for PHP < 5.2 that can be
removed with phpBB 3.1.

PHPBB3-9574
2010-12-28 22:36:25 +01:00
Andreas Fischer
442fc61be7 Merge branch 'feature/igorw/request-class' into develop
* feature/igorw/request-class:
  [feature/request-class] Convert some remaining cookies
  [feature/request-class] Adjust misleading comment
  [feature/request-class] Remove direct access to _REQUEST in acp_search
  [feature/request-class] Special case of direct access to _REQUEST
2010-12-16 02:22:17 +01:00
Nils Adermann
18f74a7e10 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9851] "Search new posts" should require login.
  [task/phpdoc] Added a phpdoc task to the build process
  [task/phpdoc] Added a configuration file for phpDocumentor.
  [feature/acm-wincache] Adding caching module for WinCache's User Cache.
  [ticket/9939] Fix JavaScript error in admin recaptcha template
  [ticket/9575] Also change 'administrate' to 'administer' in templates
  [ticket/8736] guest can have 255 chars long username
  [ticket/9928] Do not link "login to your board" to the "send statistics" page.
  [ticket/9575] Change 'administrate' to 'administer'
  [ticket/9921] Adding sample configuration file for the lighttpd webserver.
  [ticket/9932] Add the Bing bot when converting
  [ticket/9930] Redirect failes with open_basedir enabled.
  [ticket/9910] Make sure S_BBCODE_ALLOWED exists when viewing PMs
2010-12-13 17:14:36 +01:00
Igor Wiedler
217e77d16b [ticket/9910] Make sure S_BBCODE_ALLOWED exists when viewing PMs
PHPBB3-9910
2010-11-21 23:18:09 +01: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
rxu
67b243cfc5 [ticket/9867] Adjust the implementation of error messages localization.
Use array_map instead of preg_replace.

PHPBB3-9867
2010-10-26 01:38:09 +08:00
Nils Adermann
ecd648c996 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9807] Update existing module permissions in database
  [ticket/9807] Hide avatar tab in UCP when avatars are disabled
2010-10-23 14:10:19 +02:00
Igor Wiedler
b08e0d1772 [feature/request-class] Convert some remaining cookies
Convert some remaining accesses to cookie to use the
request class instead. Thanks to bantu for the note.

PHPBB3-9716
2010-10-17 13:56:16 +02:00
Igor Wiedler
986935c474 [feature/request-class] Adjust some trailing newlines
PHPBB3-9716
2010-09-27 22:50:25 +02:00
Igor Wiedler
fccd7f0ab5 [feature/request-class] Convert any direct access to $_* to use $request
PHPBB3-9716
2010-09-25 20:32:15 +02:00
Igor Wiedler
a27811b1d4 [ticket/9807] Hide avatar tab in UCP when avatars are disabled
PHPBB3-9807
2010-09-07 22:27:41 +02:00
Andreas Fischer
dfd3c4a5df Merge branch 'ticket/nickvergessen/9519' into develop-olympus
* ticket/nickvergessen/9519:
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
2010-08-28 23:25:05 +02:00
Andreas Fischer
3c02a1cff7 Merge branch 'ticket/jellydoughnut/9772' into develop-olympus
* ticket/jellydoughnut/9772:
  [ticket/9772] Unify permissions for sending email when board_email_form is off
2010-08-28 23:24:55 +02:00
Josh Woody
2a59e6d486 [ticket/9772] Unify permissions for sending email when board_email_form is off
Sending email via memberlist.php was limited to users having u_sendemail. When
board_email_form is disabled, no such requirement was enforced.  This is now
changed.

PHPBB3-9772
2010-08-28 15:49:47 -05:00
Josh Woody
25c579c00d Merge branch 'ticket/bantu/9612' into develop-olympus
* ticket/bantu/9612:
  [ticket/9612] Introduce new function gen_rand_string_friendly().
2010-08-19 09:11:36 -05:00
Josh Woody
46d2d97a37 Merge branch 'ticket/bantu/9611' into develop-olympus
* ticket/bantu/9611:
  [ticket/9611] Make length of activation keys variable between 6 and 10.
2010-08-19 09:03:45 -05:00