gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
136,415 Commits 12 Branches 481 Tags 2.4 GiB
54b67bdbf1
Commit Graph

454 Commits

Author SHA1 Message Date
Michal Čihař
f9c73c7b10 Remove special casing for font size 
It is now stored in configuration in same way as any other setting.

Issue #13466
Issue #11688

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-28 15:16:01 +01:00
Michal Čihař
3cfe9605d5 Use shared code for checking page validity 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-28 09:41:23 +01: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
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
653f685b9a Merge pull request #13677 from mauriciofauth/functions 
Refactor some function calls to static method calls
 2017-09-13 08:09:14 -03:00
Michal Čihař
f76f469289 Avoid using print as method name 
This seems to confuse some parsers as print is keyword.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-09-13 09:05:10 +02:00
Maurício Meneghini Fauth
99642bf6e2 Refactor select_server functions to static methods 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-09-12 23:12:28 -03:00
Maurício Meneghini Fauth
df6ef79e93 Move PMA_printListItem to PhpMyAdmin\Core class 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-09-12 17:51:58 -03:00
Maurício Meneghini Fauth
a2b08bae7b Refactor check_user_privileges to static methods 
Refactor check_user_privileges.lib.php functions to static methods and move logic to check_user_privileges.inc.php.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-09-11 22:09:05 -03:00
Maurício Meneghini Fauth
81ed2c6c03 Refactor git revision function to static function 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-09-06 22:01:20 -03:00
Maurício Meneghini Fauth
e2c83b954b Refactor relation functions to static methods 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-08-22 20:51:27 -03:00
Michal Čihař
8270a1c1e1 Indicate SSL status on main page 
- indicate status on main page
- indicate possible configuration issues
- show in red if remote connection is not using SSL
- add overview documentation for server SSL setup

Fixes #12354

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-21 15:04:59 +02:00
Michal Čihař
0effb3012c Use new API to report version and comment 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-17 14:55:18 +02:00
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
Maurício Meneghini Fauth
119563b7ea Move classes to PhpMyAdmin namespace 
- Move OpenDocument to PhpMyAdmin namespace
- Move OutputBuffering to PhpMyAdmin namespace
- Move Partition to PhpMyAdmin namespace
- Move Pdf class to PhpMyAdmin namespace
- Move RecentFavoriteTable to PhpMyAdmin namespace
- Move Response to PhpMyAdmin namespace

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-06-30 23:44:10 -03:00
Maurício Meneghini Fauth
54a15dbd9c Move classes to PhpMyAdmin namespace 
- Move Logging to PhpMyAdmin namespace
- Move Menu to PhpMyAdmin namespace
- Move Message to PhpMyAdmin namespace

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-06-30 13:30:04 -03: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
Maurício Meneghini Fauth
e330402b5b Refactor the core functions into static methods 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-06-03 00:52:22 -03:00
Michal Čihař
69da96b3e1 Show warning if twig cache can not be used 
Issue #13225

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-05 11:08:36 +02:00
Michal Čihař
8d6b1dce57 Improved handling of logout with disabled LoginCookieDeleteAll 
- avoid removing session for cookie auth if LoginCookieDeleteAll is
  disabled
- redirect user to other server rather than to login page
- show message about partial logout
- adjust tests
- this is based on #13221

Fixes #12301

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-28 16:02:11 +02:00
Michal Čihař
8cc6de4de3 Remove ServerLibraryDifference_DisableWarning setting 
This is getting more and more problematic these days as most of Linux
distributions ship MariaDB libraries, while many people run MySQL
servers. As MariaDB claims the protocol compatibility should stay, we
should not warn in this case.

Of course there is option to add this exception to the warning (so far
the exception is there only other way - when using MySQL libraries to
connect to MariaDB server), but we would be ignoring most cases already
and I think complete removal is better than adding exceptions.

Overall I don't think this warning is doing any good these days.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-20 09:19:22 +01:00
Michal Čihař
924aabf652 Do not show language selector without choices 
Move the check from template to the code, so that the selection is
completely hidden when there is nothing to select.

Fixes #12988

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 11:22:43 +01:00
Michal Čihař
5c3f74d875 Merge branch 'QA_4_6' 2017-01-17 17:22:53 +01:00
Michal Čihař
93e354c2e3 Revert "Remove option to show phpinfo() ($cfg['ShowPhpInfo'])" 
This reverts commit e67e69229a.
 2017-01-07 14:22:14 +01:00
Michal Čihař
308c9d7951 Simplify Response object handling 
- always use use and short name
- avoid calling getInstance() several times in one script

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-07 18:17:59 +01:00
Michal Čihař
b56f101039 Remove is_ajax_request global 
We already have the same information on Response object, so let's use it
from there.

Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-07 17:54:34 +01:00
Michal Čihař
daae30499f Merge branch 'master' into master-security 2016-11-08 15:59:39 +01:00
Deven Bansod
e2dac31bdb Refactor the language selector display into a template 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-31 09:02:59 +05:30
Michal Čihař
2ed64c3c6a Merge branch 'master' into master-security 2016-10-24 13:55:39 +02:00
Michal Čihař
47078395c2 Merge branch 'QA_4_6' into QA_4_6-security 2016-10-24 13:55:29 +02:00
Michal Čihař
75a5fde46d Use secure.php.net for PHP documentation links 
This avoids unnecessary redirect on the way (I still think this website
setup is weird, but that's all I can do about it).

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 11:13:24 +02:00
Michal Čihař
4311ea09d9 Merge branch 'QA_4_6' 2016-10-17 17:03:12 +02:00
Michal Čihař
4055eb9162 Refuse to work with mbstring.func_overload enabled 
In several places our code assumes that strlen does return length in
bytes and not in chars. This can be different with
mbstring.func_overload and will lead to several hard to debug breakages.
Therefore it's safer to simply deny using phpMyAdmin with this setting.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-04 13:06:01 +02:00
Michal Čihař
5ee95b3615 Merge branch 'QA_4_6-security' into master-security 2016-09-02 15:04:55 +02:00
Michal Čihař
dac36c3cd8 Stricter URL validation 
- do not use empty() as empty('0') is true
- do not lowercase the strings, use them as they are
- lowercase all domains in our codebase
- do not allow to specify port

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-02 15:00:43 +02:00
Michal Čihař
8d46edc4b6 Merge branch 'QA_4_6' 2016-08-24 12:03:37 +02:00
Michal Čihař
6879923acc Do not show warning about short blowfish_secret if none is set 
With empty blowfish_secret user would always get both warnings...

Fixes #12485

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-24 12:03:22 +02:00
Michal Čihař
46b329c32b Merge branch 'QA_4_6' 2016-08-18 17:37:34 +02:00
Michal Čihař
6faa1fe46a Add rel="noopener noreferrer" to all external target="_blank" links 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-18 17:35:20 +02:00
Michal Čihař
52f23338a8 Merge branch 'master-security' 2016-08-17 08:50:51 +02:00
Isaac Bennetch
0f6b76b578 Merge remote-tracking branch 'security/QA_4_6-security' into QA_4_6 2016-08-16 16:34:37 -04:00
Michal Čihař
88b817a042 Merge branch 'QA_4_6' 2016-08-03 10:27:54 +02:00
Michal Čihař
91ff2a97e2 Open demo information in new tab 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-03 10:27:49 +02:00
Michal Čihař
12873604cb Merge branch 'master' into master-security 2016-08-02 09:16:12 +02:00
Michal Čihař
e7d4ef2fbc Merge branch 'QA_4_6' into QA_4_6-security 2016-08-02 09:16:03 +02:00
Michal Čihař
21a9bbea9f Merge branch 'QA_4_6' 2016-08-02 08:57:17 +02:00
Pavel Rochnyack
37c2886845 Improved indents, alignment and rtl in Original theme 
* Fixed list items aligment in rtl view
* Fixed notices icon alignment in rtl and ltr views
* Fixed Footer.php getErrorMessages() to avoid <div id="pma_errors"><div id="pma_errors">....</div></div> nested blocks.
* Removed indentation by &nbsp;

Signed-off-by: Pavel Rochnyack <pavel2000@ngs.ru>
 2016-08-01 03:08:48 +01:00
Michal Čihař
f5015c2ea3 Merge branch 'QA_4_6-security' into master-security 2016-07-26 16:31:21 +02:00
Michal Čihař
e67e69229a Remove option to show phpinfo() ($cfg['ShowPhpInfo']) 
This is really more a PHP debugging feature than anything related to
phpMyAdmin. If user wants to debug, it's as simple a creating file with
one line of php code.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-23 11:31:46 +02:00
Michal Čihař
2adf1ca83e Merge branch 'QA_4_6-security' into master-security 2016-07-22 11:35:14 +02:00
Michal Čihař
f07fd90ee9 Document recommended length of 32 for blowfish_secret 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-22 10:14:02 +02:00
Michal Čihař
9348d0cb16 Separate adding HTML markup to message from others 
We really want this to be explicit for easier review and hiding this in
second parameter of addParam doesn't make it.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 13:41:35 +02:00
Isaac Bennetch
e6db8e18ee Fix some CodeSniffer warnings and errors 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-06-12 23:12:23 -04:00
Michal Čihař
95f2d15b4f Merge branch 'QA_4_6' 2016-05-17 10:12:04 +02:00
Michal Čihař
3771852471 Use https when linking to php.net 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-17 10:10:13 +02:00
Michal Čihař
ca5eb903b0 Make ThemeManager a singleton instead of storing it in the session 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-11 15:34:25 +02:00
Michal Čihař
5231649343 Merge commit 'cda4290749f10ed686bfb466b415e5e3a1c04fea' 2016-05-09 20:09:36 +02:00
Michal Čihař
b2f77691e9 Use https links where applicable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-29 15:41:33 +02:00
Michal Čihař
bdb20d1499 Remove link to wiki 
It's outdated and will be soon completely disabled.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-29 15:37:32 +02:00
Michal Čihař
59e56bd63a Pass link to demo server through url.php 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-29 15:36:54 +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
Michal Čihař
cfc2f1cb05 Move charsets obtaining to the Charsets class 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 10:49:09 +02:00
Michal Čihař
cd4008b3d7 Move MySQL charset maps to separate class 
This allows us to load it only when needed

Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 10:33:40 +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
Michal Čihař
5042b65398 Merge branch 'QA_4_5' into QA_4_6 2016-02-12 10:45:43 +01:00
Michal Čihař
4534a90b80 Silent warnings when checking for file existance 
Another occurences of file_exists which can be limited by open_basedir.

Issue #11940

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 10:38:47 +01:00
Michal Čihař
2a9fb73f92 Remove PmaAbsoluteUri from redirects 
This is no longer needed as per RFC 7231.

Issue #11412

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 14:32:14 +01:00
Michal Čihař
b1ac8170fd Show warning in version check and error reporting are not available 
When curl is missing and allow_url_fopen is disabled, we can not access
remote files.

Fixes #11874

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-22 09:38:18 +01:00
Michal Čihař
28055b83e7 We no longer do cross site javascript request 
Remove condition to disable version check on IE, it no loger makes sense
as we do the check server side.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-22 09:33:10 +01:00
Michal Čihař
47798a60e4 Show more used PHP extensions 
This helps user to see what features are available.

Issue #11874

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-22 09:31:44 +01:00
Michal Čihař
908c44c027 Remove no longer used variables 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-12 14:51:08 +01:00
Michal Čihař
55b317c699 Remove /*overload*/ prefix from mb_* calls 
I believe this was temporary flagging to see which code is migrated and
can be safely removed now.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-04 16:35:28 +01:00
Michal Čihař
98d88ef134 Remove unused pmaString variable 
It was used in past when we didn't rely on mbstring.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-21 11:35:36 +01:00
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
Marc Delisle
357b1b4757 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-04 09:05:42 -05:00
Marc Delisle
9ee3931c09 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-03 10:43:10 -05:00
Michal Čihař
c7c2ff4ab6 issue #11708 Remove no password warning 
The empty password has to be enabled by AllowNoPassword, so user should
know what he is doing. Showing this warning every time doesn't bring any
additional security.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-01 08:51:11 +01:00
Madhura Jayaratne
3839d2502f Link license.php 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-06 15:54:10 +11:00
Hugues Peccatte
ffc4422db7 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-19 20:33:21 +02:00
Hugues Peccatte
37bf6f2093 Update nodes load. 
Fix template call.
Remove useless 'use'.
Fix node load.
Fix merge.
Attempt to fix transformation unit test.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-20 00:21:28 +02:00
Hugues Peccatte
a5d35d41b6 Revert PMA_String rename. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-14 22:39:03 +02:00
Hugues Peccatte
42c0ebac85 Merge branch 'master' into useNamespaces_master 2015-09-09 22:05:00 +02:00
Madhura Jayaratne
93bfdbe371 Remove more references to Drizzle 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 01:06:58 +10:00
Madhura Jayaratne
8dcb93c631 More server level Drizzle functions removed 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 01:02:35 +10:00
Hugues Peccatte
7f8f34e89d Remove classes require_once. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-01 21:30:22 +02:00
Hugues Peccatte
0761fb1801 Rename classes files. 
Rename classes.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-01 21:30:21 +02:00
Hugues Peccatte
f0ba28fc1d Set namespace on Advisor, Config, Console and Util classes. 
Set namespace on DbQbe.
Set namespace to 'DbSearch'.
Split Advisor.class.php file.
Change Advisor namespace.
Rename DbQbe class and file.
Set namespace on DisplayResults.
Set namespace on Error.
Use namespace for ErrorHandler.
Add class autoloader.
Change ErrorHandler filename.
Remove some require.
Update Config namespace path.
Update PMA_Util to PMA\libraries\Util.
Rename Font and File classes files.
Use namespace for Footer.
Set namespace in all libraries classes.
Namespace OutputBuffering.
Export SubPartition.
Rename Partition file.
Namespace PDF.
Namespace RecentFavoriteTable.
Replace PMA_Response by Response and PMA_Message by Message.
Update uses and calls.
Fix unit tests.
Fix SqlParser autoload.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-01 21:22:52 +02:00
Madhura Jayaratne
4c968434e5 Use sentence case for these as well 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-25 21:41:27 +10:00
Hugues Peccatte
6a93a350cc Templating ul tag. 
Templating li tag.
Use li template in getHtmlTab.
Use ul/li templates in libraries/user_preferences.inc.php.
Add/update PHPDoc of templates.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-09 14:24:44 +02:00
Hugues Peccatte
08919d9252 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-25 09:36:48 +02:00
Hugues Peccatte
bf61709259 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-23 14:38:07 +02:00
Michal Čihař
16da18e647 Merge remote-tracking branch 'origin/QA_4_4' 2015-07-08 15:26:06 +02:00
Michal Čihař
66dd924517 Point users directly to translator instructions 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-07-08 15:25:46 +02:00
Michal Čihař
b39cb1cb81 Merge remote-tracking branch 'origin/QA_4_4' 2015-07-02 13:40:23 +02:00
Michal Čihař
a6fd4c2ed4 Cleanup URLs to our website 
- use https everywhere
- follow redirects on renamed pages

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-07-02 13:39:10 +02:00
Deven Bansod
edad7fcb3c Replace script names as config options with plain english words 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-13 04:41:54 +05:30
Marc Delisle
b54a5916c9 Fix loose comparison 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-28 14:05:50 -04:00
Marc Delisle
4eccae5290 Merge pull request #1547 from znck/master 
Remove unneeded closing tags
 2015-03-26 07:56:45 -04:00
Madhura Jayaratne
7305e908fb Merge branch 'QA_4_4' 2015-03-20 11:09:48 +05:30
Madhura Jayaratne
0cb4bffe6f Merge branch 'QA_4_3' into QA_4_4 2015-03-20 10:59:40 +05:30
Madhura Jayaratne
51d3a1fc40 bug #4802 Changelog page is not working 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-20 10:54:16 +05:30
Chirayu Chiripal
72b07cae86 Fix some more coding style 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2015-03-07 20:37:17 +05:30
Rahul Kadyan
4d308ba364 Remove unneeded closing tags 
Closing tags at the end of file are not mandatory. It is often
suggested to omit to closing tags at the end of file to prevent
unwanted effects as PHP will start output buffering if there is
any character after closing tag.

Reference: http://php.net/manual/en/language.basic-syntax.phptags.php

Signed-off-by: Rahul Kadyan <hi@znck.me>
 2015-03-06 23:37:35 +05:30
Marc Delisle
fd366c9166 Clarify message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-06 08:14:00 -05:00
Marc Delisle
c132f6697b Merge branch 'QA_4_3' 2015-02-22 08:34:52 -05:00
Marc Delisle
efbfe9a0b4 bug #4768 MariaDB: version mismatch 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-22 08:33:18 -05:00
RAKESH KUMAR
f4ff38afca Feature Request #1604:Show PHP version 
Signed-off-by: RAKESH KUMAR <rakeshkumar4294@gmail.com>
 2015-02-16 16:07:18 +05:30
Madhura Jayaratne
0ad24870e6 rfe #1260 Setting LoginCookieValidity > session.gc_maxlifetime 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-02 16:13:50 +05:30
Hugues Peccatte
763707a72e Fix typos. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-01-04 15:19:09 +01:00
Madhura Jayaratne
fefb11eb87 bug #4646 Version Check Broken 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-15 15:45:09 +05:30
Marc Delisle
ed6ba4210f Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-22 09:10:08 -05:00
Marc Delisle
9af3635c26 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-22 09:09:18 -05:00
Marc Delisle
02fcb6e746 Add FAQ reference 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-22 09:04:11 -05:00
Madhura Jayaratne
99ef493ebb bug #4057 db/table query string parameters no longer work 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-19 15:48:37 +05:30
Michal Čihař
05f01d9c2a Split HTML markup from translatable string 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-11-04 10:47:50 +01:00
Hugues Peccatte
e17de11c74 Improve multibytes string manipulation performances. 
Review SQL import process.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-30 17:40:09 +01:00
Ann + J.M
b1a7039ae3 Convert PMA_URL_getCommon calls to new style 
Rewritten tests need validation
Signed-Off-By: Ann + J.M. <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-18 19:42:29 +02:00
Hugues Peccatte
70a21ec25c Merge from master. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-08 21:49:37 +02:00
Hugues Peccatte
49ababac08 Replace mb functions by standard string functions. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-04 10:09:06 +02:00
Chanaka Dharmarathna
4e68ada908 Remove dead codes 
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
 2014-10-04 11:40:39 +05:30
Hugues Peccatte
e20510de39 Replace mb functions by standard string functions. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-03 23:08:43 +02:00
Hugues Peccatte
3de88162ff Replace PMA_String uses by mb_* calls. 
Remove part of unused  variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-28 20:53:01 +02:00
Marc Delisle
ea1f826f46 Fix code execution path warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-23 13:51:56 -04:00
Smita Kumari
42223e1bf6 avoid session timeout when user is active FR#1529 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-09-13 03:10:40 +05:30
Hugues Peccatte
9b77d746ab Mass modifications to use PMA_String. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-06 10:44:03 +02:00
Marc Delisle
6cadd6ef31 Improve messages 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-25 08:07:42 -04:00
Ashutosh Dhundhara
7a9569f6b5 RFE#1123: Zeroconf PMA tables support. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-08-11 18:33:59 +05:30
Marc Delisle
8ce1e316a6 Merge branch 'QA_4_2' 2014-06-26 09:58:01 -04:00
Marc Delisle
18e6cfd5c5 mcrypt: remove the requirement (64-bit) and the related warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-26 09:56:24 -04:00
Michal Čihař
51d4d514f9 Adjust tests to new encryption 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 14:43:10 +02:00
Hugues Peccatte
b8ca923968 Fix coding style. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-04-17 12:50:58 +02:00
Marc Delisle
3e3d7db2c0 Merge pull request #1129 from WhaleWatching/navigation 
Improve Navigation
 2014-04-08 10:15:57 -04:00
Marc Delisle
09b54ed19b Put back code lost since 2a8962aa95 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-08 10:03:58 -04:00
Chanaka Indrajith
a559543bfb Fixed method naming convention 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
 2014-04-08 00:36:55 +05:30
Edward Cheng
d74ac17cb4 Improve Navigation 
Signed-off-by: Edward Cheng <c4150221@gmail.com>

Fix bugs.

Signed-off-by: Edward Cheng <c4150221@gmail.com>
 2014-04-07 23:32:39 +08:00
Ashutosh Dhundhara
28b7b9031c Browser local storage support for Favorite tables feature. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fixed sync anchor location.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-04-02 18:20:29 +05:30
Ashutosh Dhundhara
e9d59fd7e0 Implemented Favorite tables feature with Ajax. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Minor fixes in Settings->Features page and Navigation Header class.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fixed translation issues in RecentFavoriteTable class.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fixed error in RecentFavoriteTable class.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Another fix in structure.lib.php.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-03-29 00:06:14 +05:30
Michal Čihař
d559fa6a21 Remove trailing whitespace from the code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-20 09:36:48 +01:00
Marc Delisle
0cc0e0f3a1 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-11 12:57:06 -05:00
Marc Delisle
3fa7915575 Merge commit '52084d8' 2014-02-11 12:53:32 -05:00
Marc Delisle
f7f98bbce9 Merge commit '9d66a52' 2014-02-10 13:10:23 -05:00
Dhananjay Nakrani
52084d839c Fix for Bug#4275 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-02-09 14:06:36 +05:30
Dhananjay Nakrani
9d66a521a1 Contest-5 Bug#4276. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-02-09 13:26:33 +05:30
Madhura Jayaratne
3c9f6a6890 Space around . operator - mroe instances 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-08 18:56:30 +05:30
Madhura Jayaratne
6335b10574 Fix coding style 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-08 14:35:15 +05:30
Hugues Peccatte
8665639bb0 Review of modifications 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-01-05 11:05:32 +01:00
Hugues Peccatte
6b01f835cb Rename too short variables. 
Remove useless initializations.
Rename too long variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-01-04 20:46:18 +01:00
Hugues Peccatte
f7f5b48e40 Fix PHPCS errors. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-20 23:34:51 +01:00
Marc Delisle
99b477ffd4 Fix merge conflicts 2013-10-06 09:40:17 -04:00
Marc Delisle
a498a6c8cb bug #3995 Drizzle server charset notice 2013-10-06 09:32:24 -04:00
Madhura Jayaratne
3b17233f25 Remove HTML, PHP mix 2013-09-24 16:58:51 +05:30
Marc Delisle
668c55a437 Fix merge conflicts 2013-09-24 06:55:16 -04:00
Marc Delisle
256fcb61fe bug #4099 Server/library difference warning: setting is ignored 2013-09-24 06:49:39 -04:00
Marc Delisle
5e70597251 Fix codestyle 2013-09-08 06:51:58 -04:00
Michal Čihař
0a3d1d5be8 Better names for URL generating functions 2013-08-07 10:58:17 +02:00
Michal Čihař
d1bb142e87 Remove unused param from PMA_Util::showMySQLDocu 2013-08-07 08:48:50 +02:00
Michal Čihař
351acd74af Demo server support 
This merges messages used in demo server to allow their translations and
consistent handling like other messages. Messages are enabled by
$cfg['DBG']['demo'].
 2013-07-30 14:09:06 +02:00
Michal Čihař
285a9a0f3f Merge remote-tracking branch 'origin/QA_4_0' 2013-07-30 10:18:05 +02:00
Michal Čihař
4da684e7b6 Fixed escaping in error message asking for translations 2013-07-30 10:17:32 +02:00
Michal Čihař
1346134199 Various coding style improvements 2013-07-10 15:05:05 +02:00
Marc Delisle
b39aeb1f89 Remove author name 2013-06-16 08:10:16 -04:00
Michal Čihař
b6073bf722 Whitespace cleanup 2013-06-11 08:52:51 +02:00
Marc Delisle
4a91c5753c Fix merge conflicts 2013-06-08 13:36:15 -04:00
Marc Delisle
30e0e3648d bug #3921 Call to undefined function PMA_isSuperuser() if default server is not set 2013-06-08 13:27:29 -04:00
Marc Delisle
61b46911f1 Merge branch 'QA_4_0' 2013-06-02 09:21:39 -04:00
Marc Delisle
d2e217160b bug #3961 Avoid Suhosin warning when in simulation mode 2013-06-02 09:21:00 -04:00
Madhura Jayaratne
01cdc5cbf7 Few renamings that got missed 2013-05-24 19:53:52 +05:30
Madhura Jayaratne
650a8cdda3 Convert database interface to a class 2013-05-24 17:30:59 +05:30
Marc Delisle
d44367e4db Fix merge conflicts 2013-05-15 13:07:22 -04:00
J.M
529903e0dd Fix bug #3907 undefined variables, function parameter problems 
Thanks Rasmus Lerdorf for analyzing!
 2013-05-13 11:27:56 +02:00
Michal Čihař
1b9d9dd438 Wrap some too long strings 2013-05-10 09:48:37 +02:00
Kasun Chathuranga
99c5c0ef49 PMA_DBI_get_client_info --> PMA_DBI_getClientInfo 2013-05-04 08:37:58 +05:30
Kasun Chathuranga
b0c52a8729 PMA_DBI_get_proto_info --> PMA_DBI_getProtoInfo 2013-05-04 08:36:58 +05:30
Kasun Chathuranga
5bc8b71eda PMA_DBI_get_host_info --> PMA_DBI_getHostInfo 2013-05-04 08:36:11 +05:30
J.M
0b3b113b39 [interface] Make warning about existing config directory clearer 2013-05-01 21:00:45 +02:00
Kasun Chathuranga
6b1f6ae046 Merge branch 'master' into DBI_naming_cleanUp 
Conflicts:
	libraries/database_interface.lib.php
	libraries/db_table_exists.lib.php
	libraries/relation.lib.php
	libraries/rte/rte_triggers.lib.php
	libraries/schema/Dia_Relation_Schema.class.php
	libraries/schema/Visio_Relation_Schema.class.php
	tbl_addfield.php
 2013-05-01 00:51:15 +05:30
Kasun Chathuranga
bc4bfaa6d5 PMA_DBI_fetch_value --> PMA_DBI_fetchValue 2013-05-01 00:02:00 +05:30
Michal Čihař
2fbb4cee0d Consistently include colon in strings to translate 
In some languages this makes difference in translating, so it's better
to give translators full context.
 2013-04-25 14:22:31 +02:00
Samith Dassanayake
16fcf13983 Fixed coding style 2013-03-08 22:43:17 +05:30
Samith Dassanayake
c88420a247 [Contest1] No hard-coded icons in css 
Modified "list-style-type" to "none" for the list items that has an image as the bullet point and aligned them
 2013-03-02 22:07:48 +05:30
Dieter Adriaenssens
49371bbb85 Better description 2013-02-13 14:38:06 +01:00
Michal Čihař
1e4d8e2996 Merge branch 'master' of git://github.com/DronRathore/phpmyadmin into DronRathore-master 
Conflicts:
	index.php
 2013-01-10 08:46:40 +01:00
Dron Rathore
1176ea8b7c Fixed a Typo. 
Typo.
 2013-01-10 12:56:57 +05:30
Marc Delisle
2723495a4f Removed the AjaxEnable directive 2012-12-21 16:04:57 -05:00
Michal Čihař
a6e5286467 Fix links to FAQ 2012-11-12 14:15:45 +01:00
Michal Čihař
61a601fc73 Implement linking to new documentation 2012-11-12 09:48:05 +01:00
Rouslan Placella
963a196fb1 Renamed PMA_Language_select and dropped use of echo in this function 2012-11-05 20:26:12 +00:00
Rouslan Placella
9fd82511c8 Open phpinfo in a new window 2012-10-30 20:24:00 +00:00
Rouslan Placella
49d2d6f5fb Fixed behavior of NavigationDisplayServers configuration directive 2012-10-30 20:16:57 +00:00
Rouslan Placella
41ddd1cc6a Renamed configuration directive: LeftDisplayServers => NavigationDisplayServers 2012-10-30 20:16:57 +00:00
Rouslan Placella
237e7f11c9 Avoid redirecting to self 2012-10-30 20:10:21 +00:00
Rouslan Placella
4d4c8a9bad Update recent tables through index,php instead of navigation.php 2012-10-30 20:10:20 +00:00
Rouslan Placella
1b69d0bf55 Drop the target attrbute from links and forms 2012-10-30 20:10:20 +00:00
Rouslan Placella
797fbf4a98 Die after redirect 2012-10-30 20:10:20 +00:00
Rouslan Placella
90b7b964a9 Dropped outdated workaround 2012-10-30 20:10:20 +00:00
Rouslan Placella
9e3a9ee52f Dropped main.php 2012-10-30 20:10:20 +00:00
Chanaka Indrajith
6971295e96 Renamed PMA_CommonFunctions::getInstance()-> with PMA_Util:: 2012-09-16 14:41:47 +05:30