Commit Graph

55 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
6870da15ca Fix broken ServerDatabasesControllerTest
Related to a8a5139bd7

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2019-02-07 20:23:38 -02:00
Maurício Meneghini Fauth
a8a5139bd7 Fix PO generation errors
POs were incorrectly generated with 'php-format'

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2019-01-30 16:56:12 -02:00
Maurício Meneghini Fauth
32e83d9097 Refactor ServerDatabasesController
Refactors PhpMyAdmin\Controllers\Server\ServerDatabasesController.

- Renames variables and methods to camelCase format.
- Moves request and response handling back to server_databases.php.
- Groups all HTML into templates/server/databases/index.twig.
- Improves unit tests.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2019-01-26 16:29:33 -02:00
Maurício Meneghini Fauth
ef5d7dd66b Use Bootstrap buttons component
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-21 01:01:12 -02:00
Maurício Meneghini Fauth
9eba565bf4 Remove unnecessary HTML closing tags
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-19 00:12:54 -02:00
beekalam
8b12a68622 ### Description
solves databases in Databases tab are shown with default collation.

Fixes 14705

Before submitting pull request, please review the following checklist:

- [x] Make sure you have read our [CONTRIBUTING.md](https://github.com/phpmyadmin/phpmyadmin/blob/master/CONTRIBUTING.md) document.
- [x] Make sure you are making a pull request against the correct branch. For example, for bug fixes in a released version use the corresponding QA branch and for new features use the _master_ branch. If you have a doubt, you can ask as a comment in the bug report or on the mailing list.
- [x] Every commit has proper `Signed-off-by` line as described in our [DCO](https://github.com/phpmyadmin/phpmyadmin/blob/master/DCO). This ensures that the work you're submitting is your own creation.
- [x] Every commit has a descriptive commit message.
- [x] Every commit is needed on its own, if you have just minor fixes to previous commits, you can squash them.
- [x] Any new functionality is covered by tests.

Signed-off-by: beekalam <beekalam@gmail.com>
2018-11-06 11:13:50 +03:30
Leonardo Strozzi
ad3334ccc3 Refactor Sanitize Twig extensions
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
2018-08-03 17:11:32 -03:00
Leonardo Strozzi
1037b1d626 Refactor Util Twig extensions
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
2018-08-03 17:11:32 -03:00
Leonardo Strozzi
b65ede42ee Refactor Url Twig extensions
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
2018-08-03 17:11:05 -03:00
Leonardo Strozzi
00aea8821a Rename message Twig extensions
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
2018-08-03 17:00:30 -03:00
Leonardo Strozzi
8333a994b7 Rename charsets Twig extensions
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
2018-08-03 17:00:30 -03:00
Leonardo Strozzi
15ae8d7fe5 Refactor server_databases templates
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
2018-06-29 16:36:36 -03:00
Leonardo Strozzi
5d0fd81e67 Remove Twig php function extensions
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
2018-05-29 23:06:31 -03:00
Michal Čihař
bed6fb4ebd Avois passing extension to Util::getImage
We do not use it anyway for quite some time and this way it's less
processing to generate the img tag.

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-11-27 14:24:42 +01:00
Michal Čihař
37abef4715 Use just one error icon
The other really does not fit the theme and there is no reason to have two.

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-11-27 13:33:09 +01:00
Maurício Meneghini Fauth
cc2c4fc36d Replace globals with DI in Charsets class
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-11-09 11:31:42 -02:00
Maurício Meneghini Fauth
2ae2b8b54e Use template for server databases table
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-11-03 11:31:01 -02:00
Maurício Meneghini Fauth
ff38d5c5eb Move sub page header to index template
Move server/sub_page_header template from ServerDatabasesController
to server/databases/index template

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-11-02 22:26:47 -02:00
Maurício Meneghini Fauth
6672d4f2ea Use template for server databases index
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-11-02 22:26:47 -02:00
Maurício Meneghini Fauth
569ee91f2a Merge branch 'master' into templates
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-11-01 12:06:09 -02:00
Michal Čihař
2bb01ef0a7 Share code for row filtering
Make it generic so that it works in most cases and fixes does not have
to be implemented multiple times.

Issue #13517

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-10-30 11:25:51 +01:00
Maurício Meneghini Fauth
d4464f948c Port server/databases/table_row template to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-29 12:18:28 -02:00
Maurício Meneghini Fauth
412020beea Port server/databases/table_header template to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-29 12:18:28 -02:00
Maurício Meneghini Fauth
0e867253dd Port server/databases/table_footer to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-29 12:18:28 -02:00
Michal Čihař
98964e2f59 Remove is_superuser superglobal
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-10-10 12:28:00 +02:00
Maurício Meneghini Fauth
582b1484ac Port server/databases/create template to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-07 21:34:05 -03:00
Manish Bisht
238d0c278b removed inline onclick javascript
Signed-off-by: Manish Bisht <manish.bisht490@gmail.com>
2017-07-23 21:54:02 +05:30
Maurício Meneghini Fauth
ca910e8de8 Move classes to PhpMyAdmin namespace
- Move Table to PhpMyAdmin namespace
- Move Template to PhpMyAdmin namespace
- Move ThemeManager to PhpMyAdmin namespace
- Move Theme to PhpMyAdmin namespace
- Move Tracker to PhpMyAdmin namespace
- Move Transformations to PhpMyAdmin namespace
- Move TypesMySQL to PhpMyAdmin namespace
- Move Types to PhpMyAdmin namespace
- Move Util to PhpMyAdmin namespace
- Move VersionInformation to PhpMyAdmin namespace
- Move Url to PhpMyAdmin namespace

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-07-08 10:54:21 -03:00
Maurício Meneghini Fauth
8f943ae1c0 Move classes to PhpMyAdmin namespace
- Move Sanitize to PhpMyAdmin namespace
- Move SavedSearches to PhpMyAdmin namespace
- Move Scripts to PhpMyAdmin namespace
- Move ServerStatusData to PhpMyAdmin namespace
- Move Sql to PhpMyAdmin namespace
- Move StorageEngine to PhpMyAdmin namespace
- Move SubPartition to PhpMyAdmin namespace
- Move SysInfoLinux to PhpMyAdmin namespace
- Move SysInfoSunOS to PhpMyAdmin namespace
- Move SysInfoWINNT to PhpMyAdmin namespace
- Move SysInfo to PhpMyAdmin namespace
- Move SystemDatabase to PhpMyAdmin namespace

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-07-07 01:46:08 -03:00
Madhura Jayaratne
d781ce309e Fix #13429 "Check privileges" link broken
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2017-07-01 21:20:25 +10:00
Maurício Meneghini Fauth
13c0f7bc3c Move classes to PhpMyAdmin namespace
- Move Advisor to PhpMyAdmin namespace
- Move Bookmark to PhpMyAdmin namespace
- Move Charsets to PhpMyAdmin namespace
- Move Config class to PhpMyAdmin namespace
- Move Console class to PhpMyAdmin namespace
- Move Core to PhpMyAdmin namespace
- Move DatabaseInterface to PhpMyAdmin namespace
- Move DbList to PhpMyAdmin namespace
- Move DbQbe to PhpMyAdmin namespace
- Move DbSearch to PhpMyAdmin namespace
- Move DisplayResults to PhpMyAdmin namespace
- Move Encoding to PhpMyAdmin namespace
- Move Error to PhpMyAdmin namespace
- Move ErrorHandler to PhpMyAdmin namespace
- Move File to PhpMyAdmin namespace
- Move Font to PhpMyAdmin namespace
- Move Footer to PhpMyAdmin namespace
- Move Header to PhpMyAdmin namespace
- Move Index to PhpMyAdmin namespace
- Move IndexColumn to PhpMyAdmin namespace
- Move LanguageManager to PhpMyAdmin namespace
- Move Language to PhpMyAdmin namespace
- Move Linter to PhpMyAdmin namespace
- Move ListAbstract to PhpMyAdmin namespace
- Move ListDatabase to PhpMyAdmin namespace

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-06-28 21:17:18 -03:00
Deven Bansod
059ffe64ed Use better way to form the Database link URLs
Fix #13384

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2017-06-15 12:18:59 +05:30
Maurício Meneghini Fauth
05e39541c7 Remove inline CSS
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-05-22 23:21:03 -03:00
Deven Bansod
827c71f86a Merge branch 'QA_4_7' 2017-03-31 19:50:20 +05:30
Deven Bansod
8486d8afa7 Use correct value as an argument to the Collation Description function
Fix #13135

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2017-03-31 19:46:29 +05:30
F. E Noel Nfebe
77b39264b0 Fix #12984 : Show default collation when creating new DB (#13061)
Added a default value for database collation dropdown

Fix #12984 

Signed-off-by: Fenn-CS <fenn25.fn@gmail.com>
2017-03-12 19:20:28 +05:30
Michal Čihař
c2ca1c8c22 Merge branch 'QA_4_6-security' into master-security 2016-07-12 16:58:46 +02:00
Michal Čihař
bde4ef735b Escape suggested database name
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-12 16:42:50 +02:00
Michal Čihař
791bdafcdd Merge branch 'QA_4_6-security' into master-security 2016-06-17 16:24:39 +02:00
Michal Čihař
8716855b30 Properly escape translated string
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-17 14:45:29 +02:00
Michal Čihař
b311780d76 Separate methods for charset and collation dropdowns
They do not share much code in the end and this way the code is more
readable.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-11 13:04:41 +02:00
Michal Čihař
3e2029e750 Move MySQL charsets handling to the Charsets class
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-11 12:55:42 +02:00
Durgesh
6650f7b07d Refactor text sanitization and javascript escaping, Issue #11989, #11988
Signed-off-by: Durgesh <007durgesh219@gmail.com>
2016-02-22 14:45:19 +05:30
Durgesh
0b64827930 Refactored url parmeters generating, Issue #11990
Signed-off-by: Durgesh <007durgesh219@gmail.com>
2016-02-22 14:36:41 +05:30
Atul Pratap Singh
b6ee54035a Remove newline eof from templates/*
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2016-01-22 23:27:24 +05:30
Atul Pratap Singh
373ebc29bc Replace <?php echo with <?= in 'templates/'
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2016-01-20 19:14:11 +05:30
Marc Delisle
06d22e636e Remove some unnecessary string concatenations
https://github.com/dseguy/clearPHP/blob/master/rules/no-unnecessary-string-concatenation.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-12-07 09:41:46 -05:00
Madhura Jayaratne
0a2b037706 merge db_create.php into ServerDatabasesController
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-11-24 20:41:40 +11:00
Madhura Jayaratne
677ea758ca Template display_create_database.lib.php
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-11-24 20:12:33 +11:00
Madhura Jayaratne
62dac7ff0f Update tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-11-24 08:35:12 +11:00