makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-12 06:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
12949 commits 18 branches 192 tags 206 MiB
Commit graph

5502 commits

Author SHA1 Message Date
Andreas Fischer
8a84f42f7d [ticket/10370] Add require_once to whitelisted functions. 
PHPBB3-10370
 2011-09-19 17:37:15 +02:00
Andreas Fischer
7965387201 [ticket/10370] Use single string instead of an array for arguments. 
PHPBB3-10370
 2011-09-19 17:37:15 +02:00
Andreas Fischer
0df7e5eefa [ticket/10370] Ease up code checking for arguments of include etc. 
PHPBB3-10370
 2011-09-19 17:37:10 +02:00
Andreas Fischer
12530a763b [ticket/10370] Use unset() on the first backtrace instead of checking in loop. 
PHPBB3-10370
 2011-09-19 16:58:25 +02:00
Andreas Fischer
9c0f75fd65 [ticket/10370] Use phpbb_filter_root_path() in get_backtrace(). 
PHPBB3-10370
 2011-09-19 16:57:09 +02:00
Nils Adermann
d0f5b527fe Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10245] Use error_collector instead of ob_start() and ob_get_clean().
 2011-09-18 23:25:57 +02:00
Nils Adermann
410028eecf Merge remote-tracking branch 'github-bantu/ticket/10245' into develop-olympus 
* github-bantu/ticket/10245:
  [ticket/10245] Use error_collector instead of ob_start() and ob_get_clean().
 2011-09-18 23:25:04 +02:00
Nils Adermann
2731e5a456 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10369] Replace root path with "[ROOT]" as per IRC.
  [ticket/10369] Add warning about paths outside of phpBB root not being filtered
  [ticket/10369] Rename filter_errfile() to filter_root_path().
  [ticket/10369] DRY code to remove phpbb path from errfile.
  [ticket/10369] Always include errfile and errline in format_errors().
 2011-09-18 23:24:13 +02:00
Andreas Fischer
1b390f0b49 [ticket/10369] Replace root path with "[ROOT]" as per IRC. 
PHPBB3-10369
 2011-09-18 23:03:28 +02:00
Andreas Fischer
c8564e6ce9 [ticket/10369] Add warning about paths outside of phpBB root not being filtered 
PHPBB3-10369
 2011-09-18 22:41:02 +02:00
Andreas Fischer
1ad97424a4 [ticket/10369] Rename filter_errfile() to filter_root_path(). 
PHPBB3-10369
 2011-09-18 22:32:25 +02:00
Andreas Fischer
9006984d5a [ticket/10369] DRY code to remove phpbb path from errfile. 
PHPBB3-10369
 2011-09-18 22:24:14 +02:00
Andreas Fischer
7b3f6cb219 [ticket/10369] Always include errfile and errline in format_errors(). 
We remove the phpBB root path from errfile. This is consistent with how
msg_handler handles E_WARNING messages etc.

PHPBB3-10369
 2011-09-18 22:23:41 +02:00
Andreas Fischer
05515e0510 [ticket/10245] Use error_collector instead of ob_start() and ob_get_clean(). 
PHPBB3-10245
 2011-09-18 22:04:34 +02:00
Patrick Webster
b5a79009ce [ticket/10322] Separate template varref resolution from output generation 
Most template variables can now have their PHP variable name resolved instead
of only compiling directly. This allows for the use of block vars in INCLUDE
statements. This does not work for language variables since they require
multiple checks. Added tests for the new types of allowed INCLUDEs.

PHPBB3-10322
 2011-09-16 01:46:42 -05:00
Patrick Webster
fbec7c9b2b [ticket/10322] Fix dynamic template includes 
Dynamic template includes from variables was not implemented in the new
templating system.

PHPBB3-10322
 2011-09-08 16:51:22 -05:00
Andreas Fischer
b21cee731a Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10352] Add missing break for Oracle's sql_table_drop()
  [ticket/10351] Fix Oracle's sql_column_remove()
  [ticket/10294] Fix sql_affectedrows() in mssqlnative driver.
 2011-09-06 00:44:19 +02:00
Andreas Fischer
92373e6d46 Merge remote-tracking branch 'bantu/ticket/10294' into develop-olympus 
* bantu/ticket/10294:
  [ticket/10294] Fix sql_affectedrows() in mssqlnative driver.
 2011-09-06 00:43:10 +02:00
Andreas Fischer
d28ec48675 Merge remote-tracking branch 'Noxwizard/ticket/10351' into develop-olympus 
* Noxwizard/ticket/10351:
  [ticket/10351] Fix Oracle's sql_column_remove()
 2011-09-06 00:42:48 +02:00
Andreas Fischer
3801101f3b Merge remote-tracking branch 'Noxwizard/ticket/10352' into develop-olympus 
* Noxwizard/ticket/10352:
  [ticket/10352] Add missing break for Oracle's sql_table_drop()
 2011-09-06 00:42:40 +02:00
Oleg Pudeyev
145bc23044 Merge remote-tracking branch 'igorw/ticket/10155' into develop 
* igorw/ticket/10155:
  [ticket/10155] Briefly explain assets in coding-guidelines
  [ticket/10155] Move jQuery inclusion to footer
  [ticket/10155] Update to jQuery 1.6.2
  [ticket/10155] Add jQuery to AUTHORS
  [ticket/10155] Add jQuery, introduce global assets path
 2011-09-05 06:03:19 -04:00
Oleg Pudeyev
367fe0b4cf Merge remote-tracking branch 'cyberalien/ticket/10350' into develop 
* cyberalien/ticket/10350:
  [ticket/10350] Script for testing eval renderer
  [ticket/10350] Fix for class phpbb_template_renderer_eval
 2011-09-05 05:21:19 -04:00
Oleg Pudeyev
dce62b5271 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10321] Add descriptions to the unit tests
  [ticket/10321] Do not append the ? if the param-list is empty anyway.
 2011-09-05 02:48:54 -04:00
Oleg Pudeyev
cf5f0cce83 Merge remote-tracking branch 'nickvergessen/ticket/10321' into develop-olympus 
* nickvergessen/ticket/10321:
  [ticket/10321] Add descriptions to the unit tests
  [ticket/10321] Do not append the ? if the param-list is empty anyway.
 2011-09-05 02:42:41 -04:00
Patrick Webster
5c7f5f0516 [ticket/10352] Add missing break for Oracle's sql_table_drop() 
PHPBB3-10352
 2011-09-04 20:31:34 -05:00
Patrick Webster
d938d5d399 [ticket/10351] Fix Oracle's sql_column_remove() 
The correct syntax is DROP COLUMN.

PHPBB3-10351
 2011-09-04 20:22:36 -05:00
Vjacheslav Trushkin
0cb539ed72 [ticket/10350] Fix for class phpbb_template_renderer_eval 
Fixing bug in class phpbb_template_renderer_eval

PHPBB3-10350
 2011-09-04 23:25:54 +03: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
Vjacheslav Trushkin
98590201d8 [feature/remove-imagesets] Changing admin control panel styles module 
Removing imagesets. Changing admin control panel styles module

PHPBB3-10336
 2011-09-03 18:57:16 +03:00
Joas Schilling
ee2c8702ea Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10346] Add drop_tables to perform_schema_changes and add tests
 2011-08-29 21:00:13 +02:00
Nils Adermann
0f2e45800e [ticket/10346] Add drop_tables to perform_schema_changes and add tests 
PHPBB3-10346
 2011-08-29 14:24:50 -04:00
Joas Schilling
6a2b13632d [ticket/10344] Add attachment icons to list of reported and queued posts/topics 
PHPBB3-10344
 2011-08-27 00:25:38 +02:00
Nils Adermann
2219193096 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10335] Add X-PHPBB-IS-BOT header so reverse proxies know about bots.
 2011-08-26 05:59:34 -04:00
Nils Adermann
dc9a771473 Merge remote-tracking branch 'github-bantu/ticket/10335' into develop-olympus 
* github-bantu/ticket/10335:
  [ticket/10335] Add X-PHPBB-IS-BOT header so reverse proxies know about bots.
 2011-08-26 05:59:13 -04:00
Nils Adermann
73aca1a6fb Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10320] Exclude passworded forums when determining "Most active topic".
  [ticket/10320] Move phpbb_feed_base::get_passworded_forums() to user class.
 2011-08-25 23:21:09 -04:00
Nils Adermann
0d4089da7f Merge remote-tracking branch 'github-bantu/ticket/10320' into develop-olympus 
* github-bantu/ticket/10320:
  [ticket/10320] Exclude passworded forums when determining "Most active topic".
  [ticket/10320] Move phpbb_feed_base::get_passworded_forums() to user class.
 2011-08-25 23:20:55 -04:00
Nils Adermann
459570bcca Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9995] Do not run forum SQL query when marking the whole board read.
  [ticket/9995] Always continue when harvesting $forum_ids for markread().
  [ticket/9995] Remove useless statement from display_forums()

Conflicts:
	phpBB/includes/functions_display.php
 2011-08-25 23:16:31 -04:00
Andreas Fischer
7ae871dfae [ticket/9995] Do not run forum SQL query when marking the whole board read. 
PHPBB3-9995
 2011-08-26 03:59:39 +02:00
Andreas Fischer
afc35f610d [ticket/9995] Always continue when harvesting $forum_ids for markread(). 
PHPBB3-9995
 2011-08-26 03:32:36 +02:00
Andreas Fischer
e4e854863f [ticket/9995] Remove useless statement from display_forums() 
The $forum_ids array is only used if $mark_read == 'forums'.

When $mark_read == 'forums', we either continue when
$auth->acl_get('f_list', $forum_id) is false or true.

So this statement is never useful.

PHPBB3-9995
 2011-08-26 03:29:05 +02:00
Andreas Fischer
c0507c6a9e [ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds. 
PHPBB3-10278
 2011-08-25 20:39:35 +02:00
Andreas Fischer
29a23ae217 [ticket/10278] Return with a timeout error when fread() or fgets() time out. 
PHPBB3-10278
 2011-08-25 20:34:01 +02:00
Andreas Fischer
2ffdf56bfe [ticket/10278] Also set timeout on stream in get_remote_file(). 
From the PHP manual for fsockopen():
If you need to set a timeout for reading/writing data over the socket, use
stream_set_timeout(), as the timeout parameter to fsockopen() only applies
while connecting the socket.
http://www.php.net/manual/en/function.fsockopen.php

PHPBB3-10278
 2011-08-25 20:14:49 +02:00
Andreas Fischer
4f8bb02a57 [ticket/10320] Exclude passworded forums when determining "Most active topic". 
PHPBB3-10320
 2011-08-25 17:33:39 +02:00
Andreas Fischer
4491746c73 [ticket/10320] Move phpbb_feed_base::get_passworded_forums() to user class. 
PHPBB3-10320
 2011-08-25 17:12:42 +02:00
Andreas Fischer
7a36c3b34b [ticket/10335] Add X-PHPBB-IS-BOT header so reverse proxies know about bots. 
PHPBB3-10335
 2011-08-24 14:51:37 +02:00
Andreas Fischer
ac11806bf4 [ticket/10329] Add phpbb_ prefix to new pcre_utf8_support() function. 
Introduced by 6b4d0a2542.

PHPBB3-10329
 2011-08-21 14:34:34 +02: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 f9dbe33fa7.

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

PHPBB3-10240
 2011-08-21 13:16:50 +01:00
Joas Schilling
dc149a43e4 [ticket/10321] Do not append the ? if the param-list is empty anyway. 
PHPBB3-10321
 2011-08-21 13:16:05 +02:00