aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'Fyorl/feature/attach-dl' into developAndreas Fischer2012-08-261-0/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fyorl/feature/attach-dl: (75 commits) [feature/attach-dl] Removed the use of some abbreviations [feature/attach-dl] Changed $files_added checks [feature/attach-dl] Renamed $post_id to $post_msg_id [feature/attach-dl] Fixed a comment [feature/attach-dl] Optimised an sql query [feature/attach-dl] Fixed the logic in an sql statement [feature/attch-dl] $forum_id cast to int [feature/attach-dl] Fixed $file_added to $files_added [feature/attach-dl] Moved definition of $archive_name [feature/attach-dl] Swapped the order of an if statement [feature/attach-dl] Cast variables to int [feature/attach-dl] Added $archive_path [feature/attach-dl] Used COMMA_SEPARATOR instead of actual comma [feature/attach-dl] Renamed $count to $files_added [feature/attach-dl] Removed sprintf() use [feature/attach-dl] Removed need for array_keys() [feature/attach-dl] Added multiple attachment downloads to PMs [feature/attach-dl] Removed reliance on current($row) [feature/attach-dl] Renamed to phpbb_download_handle_forum_auth [feature/attach-dl] Moved PM authentication handling into own function ...
| * [feature/attach-dl] Renamed $post_id to $post_msg_idFyorl2012-08-171-1/+1
| | | | | | | | PHPBB3-11042
| * [feature/attach-dl] Added multiple attachment downloads to PMsFyorl2012-08-141-0/+7
| | | | | | | | PHPBB3-11042
* | Merge remote-tracking branch 'nickvergessen/feature/php-events-4' into developDavid King2012-08-202-5/+50
|\ \
| * | [feature/php-events] Fix naming and doc of core.ucp_add_zebraJoas Schilling2012-08-041-1/+11
| | | | | | | | | | | | PHPBB3-9550
| * | [feature/php-events] Fix naming and doc of core.ucp_remove_zebraJoas Schilling2012-08-041-3/+13
| | | | | | | | | | | | PHPBB3-9550
| * | [feature/php-events] Fix naming and doc of core.ucp_pm_view_messsageJoas Schilling2012-08-041-4/+20
| | | | | | | | | | | | PHPBB3-9550
| * | [feature/events] Removing the third trigger_event parameterMichael Cullum2012-08-012-3/+3
| | | | | | | | | | | | PHPBB3-9550
| * | [feature/events] Change to use the new method of adding eventsMichael Cullum2012-08-012-9/+3
| | | | | | | | | | | | PHPBB3-9550
| * | [feature/events] Adding ledge ucp_zebra_addJoas Schilling2012-08-011-0/+5
| | | | | | | | | | | | | | | | | | Used by phpBB Gallery PHPBB3-9550
| * | [feature/events] Adding ledge ucp_zebra_removeJoas Schilling2012-08-011-1/+6
| | | | | | | | | | | | | | | | | | Used by phpBB Gallery PHPBB3-9550
| * | [feature/events] Adding ledge ucp_pm_viewmesssageJoas Schilling2012-08-011-1/+6
| | | | | | | | | | | | | | | | | | Used by phpBB Gallery PHPBB3-9550
* | | [ticket/10885] Fix UCP Main Error if no forums existNathan Guse2012-08-061-9/+8
| |/ |/| | | | | | | | | | | This error is caused by an empty set passed to sql_in_set if the user cannot read any forums PHPBB3-10885
* | [ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriateNathan2012-07-223-7/+8
|/ | | | PHPBB3-10990
* Merge pull request #843 from nickvergessen/feature/new-tz-handlingNils Adermann2012-07-192-14/+16
|\ | | | | Feature/new tz handling
| * [feature/new-tz-handling] Don't use global user but make it a parameterJoas Schilling2012-07-192-2/+2
| | | | | | | | PHPBB3-9558
| * Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ↵Joas Schilling2012-07-183-2/+70
| |\ | | | | | | | | | feature/new-tz-handling
| * | [feature/new-tz-handling] Properly name new timezone selection functionJoas Schilling2012-07-172-6/+6
| | | | | | | | | | | | | | | | | | Marked the old one as deprecated and made it using the new function. PHPBB3-9558
| * | [feature/new-tz-handling] Fix Timezone selection on registration pageJoas Schilling2012-06-181-1/+3
| | | | | | | | | | | | PHPBB3-9558
| * | [feature/new-tz-handling] Introduce 2 step timezone selection using javascriptJoas Schilling2012-06-181-1/+3
| | | | | | | | | | | | PHPBB3-9558
| * | [feature/new-tz-handling] Remove appearances of board_dst and user_dstJoas Schilling2012-06-181-3/+0
| | | | | | | | | | | | PHPBB3-9558
| * | [feature/new-tz-handling] Replace gmmktime() and mktime() with phpbb_datetimeJoas Schilling2012-06-181-3/+4
| | | | | | | | | | | | PHPBB3-9558
| * | [feature/new-tz-handling] Fix timezone selection on registration pageJoas Schilling2012-06-181-5/+5
| | | | | | | | | | | | PHPBB3-9558
| * | [feature/new-tz-handling] Fix selecting and validating of timezone in UCPJoas Schilling2012-06-181-2/+2
| | | | | | | | | | | | PHPBB3-9558
* | | [feature/pagination-as-list] New parameter for name of start varDrae2012-07-184-5/+5
| | | | | | | | | | | | | | | | | | | | | Add a new parameter to hold the name of the start variable. This fulfills ticket PHPBB3-8535. PHPBB3-10968
* | | [feature/pagination-as-list] Updates for nils commentsDrae2012-07-184-9/+9
| | | | | | | | | | | | | | | | | | | | | Re-remove deprecated functions, change on_page to phpbb_on_page, add null returns, remove globals and pass as params. PHPBB3-10968
* | | [feature/pagination-as-list] Rename and deprecate functionsDrae2012-07-184-5/+5
| | | | | | | | | | | | | | | | | | | | | Returned and marked deprecated topic_generate_pagination. Rename new function in line with coding guidelines. PHPBB3-10968
* | | [feature/pagination-as-list] Various fixes and improvementsDrae2012-07-184-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extracted common template code for prosilver as per subsilver2. Various other fixups and oversight corrections, changed name of the "new" template function and re-introduced existing version. Altered on_page to compensate for removal of some templating vars from pagination routine. PHPBB3-10968
* | | [ticket/10968] Render pagination within the templateDrae2012-07-184-5/+10
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | Since phpBB 2 pagination has been rendered mostly within the source. This limits just what designers can do with pagination. The current form is also questionable in terms of "best practice". The aim is to move rendering completely to the template via the use of a block element. Enabling S_ template vars also allows for control over specific aspects of the pagination output such as next, previous, active and ellipsis. Related to this - merging the capabilities of the topic_generate_pagination with generate_pagination removes an element of duplication. PHPBB3-10968
* | Merge branch 'develop-olympus' into developAndreas Fischer2012-06-211-2/+15
|\ \ | | | | | | | | | | | | * develop-olympus: [ticket/10935] Limit number of PM rules per user to 5000
| * | [ticket/10935] Limit number of PM rules per user to 5000Joas Schilling2012-06-201-2/+15
| | | | | | | | | | | | PHPBB3-10935
* | | [feature/delete-auto-logins] improved styling and fixes languageDhruv Goel2012-05-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Table ahs been styled. Date is now formatted properly instead of the unix timestamp being displayed earlier. fixes small mistake in language entry PHPBB3-9647
* | | [feature/delete-auto-logins] using loop for errorsDhruv Goel2012-05-171-1/+1
| | | | | | | | | | | | | | | | | | | | | instead of hardcoding html code into ERROR variable, we use errors array and use loop in template file. PHPBB3-9647
* | | [feature/delete-auto-logins] checks form keyDhruv Goel2012-05-171-8/+21
| | | | | | | | | | | | | | | | | | The form key is checked after submission if not correct error is returned. PHPBB3-9647
* | | [feature/delete-auto-logins] Fixes language entries and redirection.Dhruv Goel2012-05-171-1/+2
| | | | | | | | | | | | | | | | | | The user is redirected after deleting auto login session keys. PHPBB3-9647
* | | [feature/delete-auto-logins] User can view/delete auto logins.Dhruv Goel2012-05-172-0/+41
| |/ |/| | | | | | | | | | | User has an extra option in UCP->Profile to view the auto logins and clear them. PHPBB3-9647
* | Merge branch 'develop-olympus' into developAndreas Fischer2012-04-081-1/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10561] Removed extra tabs, changes made to $db->sql_query() [ticket/10561] Changed $temp_style_id to $style_id [ticket/10561] Added function desc for phpbb_style_is_active() [ticket/10561] Casted $config['default_style'] to int [ticket/10561] Reverted to phpbb_style_is_active() [ticket/10561] Added to database_update:database_update_info() [ticket/10561] Added section in database_update.php [ticket/10561] Moved and renamed the funtion validate_style(). [ticket/10561] Fixed syntax error and renamed return variables. [ticket/10561] Changes made to $db->sql_fetchrow(). [ticket/10561] Changes made to function phpbb_style_is_active(). [ticket/10561] All users can choose deactivated styles (fixed). Conflicts: phpBB/install/database_update.php
| * [ticket/10561] Casted $config['default_style'] to intHari Sankar R2012-04-091-1/+1
| | | | | | | | PHPBB3-10561
| * [ticket/10561] Reverted to phpbb_style_is_active()Hari Sankar R2012-04-071-2/+2
| | | | | | | | | | | | Changes made to function name, reverted to old. PHPBB3-10561
| * [ticket/10561] Moved and renamed the funtion validate_style().Hari Sankar R2012-04-051-2/+8
| | | | | | | | | | | | Fixed minor changes as suggested by @bantu. PHPBB3-10561
| * [ticket/10561] Changes made to function phpbb_style_is_active().Hari Sankar R2012-04-031-1/+1
| | | | | | | | | | | | | | Fixed return type, documented function and, removed style_id from fetch. PHPBB3-10561
| * [ticket/10561] All users can choose deactivated styles (fixed).Hari Sankar R2012-04-031-1/+2
| | | | | | | | | | | | | | | | A form exploit enabled the users to select a deactivated style. Fixed with extra check on submit, with a new function styles_verify to check if the selected style is activated or not. PHPBB3-10561
* | [feature/class-prefix] Rename auth => phpbb_authIgor Wiedler2012-03-311-1/+1
| | | | | | | | PHPBB3-10609
* | [ticket/10328] Renamed the JSON class, also now using autoloading.Callum Macrae2012-03-311-6/+18
| | | | | | | | | | | | | | It is no longer static, and uses autoloading. It has also been renamed from JSON to phpbb_json_response. PHPBB3-10328
* | [ticket/10272] Zebra operations using AJAX are now less hacky.Callum Macrae2012-03-311-0/+4
| | | | | | | | | | | | | | Before, they were splitting stuff by the <br />, and now JSON::add() is being used. PHPBB3-10272
* | Merge remote-tracking branch 'imkingdavid/ticket/10535' into developOleg Pudeyev2012-02-032-16/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * imkingdavid/ticket/10535: [ticket/10535] Delete no longer needed email confirm language entries. [ticket/10535] Delete email confirm from installer [ticket/10535] Removed email confirm field from acp_users module [ticket/10535] Forgot a subsilver2 change. *doh* [ticket/10535] Removed email confirm from UCP, removed unused language entries [ticket/10535] Remove email confirm check on registration form
| * | [ticket/10535] Removed email confirm from UCP, removed unused language entriesDavid King2011-12-151-7/+0
| | | | | | | | | | | | PHPBB3-10535
| * | [ticket/10535] Remove email confirm check on registration formDavid King2011-12-151-9/+0
| | | | | | | | | | | | PHPBB3-10535
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-01-231-18/+2
|\ \ \ | | |/ | |/| | | | | | | * develop-olympus: [ticket/10580] Remove checking of server timezone and DST when registering
| * | [ticket/10580] Remove checking of server timezone and DST when registeringRichard Foote2012-01-211-18/+2
| | | | | | | | | | | | | | | | | | | | | | | | Remove checking of server timezone and DST. It causes a problem by selecting the wrong timezone when registering when the board_timezone is 1 hour less than the server timezone. PHPBB3-10580