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
master
Commit Graph

454 Commits

Author SHA1 Message Date
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
Michal Čihař
44d59e7636 Various coding style improvements 2012-09-04 15:51:02 +02:00
Chanaka Indrajith
766466135e Implement class behavior of common.lib.php file 2012-06-22 23:38:33 +05:30
Rouslan Placella
1f7daca600 Dropped PMA_includeJS() in favor of the PMA_Scripts class 2012-06-11 14:06:04 +01:00
Rouslan Placella
d9bedbd75e Finished integrating the PMA_Footer class 2012-06-11 14:06:03 +01:00
Rouslan Placella
a054562100 PMA_Footer and PMA_Header no longer need to be singletons 2012-06-11 14:06:03 +01:00
Rouslan Placella
a9e97a9e72 Fixed invalid method invocation 2012-06-11 14:06:03 +01:00
Rouslan Placella
afb5600e7e Dropped header_http.inc.php 2012-06-11 14:06:03 +01:00
Madhura Jayaratne
6f9253b59e Various coding style improvements 2012-06-03 20:40:47 +05:30
Michal Čihař
c3afb50573 Add docs to some files and methods 2012-04-27 13:41:44 +02:00
Willian Gustavo Veiga
bf540384ee Unnecessary "else" statement removed 2012-04-13 22:12:28 -03:00
Marc Delisle
7fb054554c Put back jQuery 1.6.2 due to conflicts with Highcharts 2.1.5 (tried to upgrade Highcharts but faced other problems) 2012-04-10 18:08:58 -04:00
Marc Delisle
1fd405d20e Update to jQuery 1.7.2 2012-04-07 09:29:47 -04:00
Rouslan Placella
e60b73fab9 Fixed broken redirect due to globals removal on expired session 2012-04-04 20:04:58 +01:00
Michal Čihař
22c3b46546 Merge remote-tracking branch 'origin/QA_3_5' 2012-04-04 11:27:34 +02:00
Rouslan Placella
04e64410d7 Fixed bug #3514490 - Multiple Navigation panels bug still present 2012-04-04 02:17:54 +01:00
Jo Michael
b2fd866d87 Leading ./ paths for includes can be omitted, part 2 2012-03-16 23:11:57 +01:00
Jo Michael
3b56f6a53b Leading ./ paths for links and favicons can be omitted, part 1 2012-03-16 23:04:12 +01:00
Jo Michael
e04d8812fb Bug #3498559 Not relying on grab_globals for $_GET[target], use $_REQUEST 2012-03-10 14:21:33 +01:00
Michal Čihař
e56949f160 Use package name PhpMyAdmin 
Needed to match phpdoc rules as package name must begin with upper case.
 2011-10-25 10:13:17 +02:00
Dieter Adriaenssens
a30554b1e4 use require() instead of include() when including file unconditionally 2011-09-06 21:48:05 +02:00
Dieter Adriaenssens
e82d3c7136 require/include are statements not functions; no parentheses are required 2011-08-21 23:36:10 +02:00
Michal Čihař
4afb63d08f Upgrade to jQuery 1.6.2 
This should be compatible with 1.6.1 and my tests show no problems.
 2011-08-05 15:31:38 +02:00
Michal Čihař
e57f27e50b Remove @uses tags from docblocks 2011-06-27 11:20:20 +02:00
Aris Feryanto
7e5fddf4ae Recent table: Add support for browser without javascript 2011-06-20 13:21:07 +07:00
Michal Čihař
bbbf2c49ed Drop $GLOBALS['charset']. 
It was anyway always set to utf-8 so it does not make sense to keep it
as a variable.
 2011-06-03 14:04:29 +02:00
Michal Čihař
e6026f6faf Merge remote-tracking branch 'origin/QA_3_4' 2011-05-23 13:22:11 +02:00
Michal Čihař
eb52f22eb0 bug #3276001 [core] Avoid caching of index.php. 2011-05-23 13:19:43 +02:00
Marc Delisle
5f4a8e6a97 Update to jQuery 1.6.1 2011-05-14 08:26:00 -04:00
Michal Čihař
394c6734d0 Use PMA_includeJS from top level page. 
This prevents loading files twice, each time with different URL.
 2011-02-08 09:27:40 +01:00
Marc Delisle
b923bb3fbb Upgrade to jQuery 1.4.4 2011-01-02 08:00:25 -05:00
Michal Čihař
d17fba309c Fix permissions. 
Most files were made executable somewhere in ninadsp tree, reverting
this.
 2010-08-30 09:53:37 +02:00
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
Michal Čihař
ee767e2d3d No need to explicitely include relation.lib its anyway included in common.inc 2010-07-26 16:17:59 +02:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Michal Čihař
3e57a8eca9 No @uses __('Something'). 2010-07-20 15:06:34 +02:00
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
Michal Čihař
8ceb240551 Drop passing of convcharset. 2010-07-20 11:43:10 +02:00
ninadsp
bed1948d04 testing git setup - no major change made in code yet 
only added a few comments
 2010-05-23 01:22:01 +05:30
Marc Delisle
2182098af6 strings to gettext, second batch 2010-05-04 20:07:19 -04:00
Michal Čihař
71ff89c2fe Include non minified version in Git. 
The JS compression will happen on release.
 2010-04-13 11:52:33 +02:00
Michal Čihař
f9ccd69538 Remove no longer needed language file names. 2010-04-09 13:57:36 +02:00
Marc Delisle
7a23444873 no longer needed 2010-04-01 14:11:55 -04:00
Michal Čihař
5ecbd6941d Better name for javascript file. 2010-04-01 11:24:38 +02:00
Michal Čihař
e20e693316 Update generating of bookmarkable url to jQuery. 2010-03-30 13:45:18 +02:00
Michal Čihař
ecc4913a8c Reenable bookmarking code. 
Just disable it for webkit based browsers, because they do not allow to
update any part of location without reload.

bug#2937481
 2010-01-25 11:50:48 +00:00
Michal Čihař
ddbffcd5bd [interface] It is now possible to bookmark most pages in JS capable browser. 2010-01-22 19:15:47 +00:00
Herman van Rink
b2dfe50969 [core] Fix broken cleanup of $_GET 2009-12-28 15:50:36 +00:00
Michal Čihař
77a11d0283 bug #2355925 [display] properly update tooltips in navigation frame 2008-11-28 14:35:17 +00:00
Michal Čihař
56941e509c Adding @package, second part. 2008-11-24 11:05:40 +00:00
Marc Delisle
62461e5477 port 2.11.7.1 fix 2008-07-15 19:03:11 +00:00
Sebastian Mendel
c44c681d35 prevent search indexes from indexing phpMyAdmin installations 2008-04-02 07:18:20 +00:00
Sebastian Mendel
d138f1f856 cleanup 2007-10-18 09:03:01 +00:00
Sebastian Mendel
e5881ade37 rename JavaScript file according it's use 2007-10-05 07:56:07 +00:00
Marc Delisle
dd0ea69c6d no js between </head> and </html>, thanks to Michael Keck 2007-09-02 19:59:59 +00:00
Sebastian Mendel
d0ac1f2bbb XHTML standard: no language attribute in <script> 2007-04-01 11:13:46 +00:00
Sebastian Mendel
cfeb306526 coding standard: no spaces inside braces 2007-04-01 11:02:46 +00:00
Sebastian Mendel
008734f8b0 do NEVER unset $table or $db; 
no need to test for isset() on $db and $table;
always test with strlen() for valid $table or $db;
 2007-03-30 09:12:05 +00:00
Sebastian Mendel
d0facc3d4f splitted common.lib.php into common.inc.php, core.lib.php and common.lib.php 2007-03-20 14:16:18 +00:00
Sebastian Mendel
374abd5173 fixed/added page level docblock 2007-03-20 10:32:13 +00:00
Sebastian Mendel
817e790762 synced/fixed vim line 2007-03-19 17:55:39 +00:00
Michal Čihař
bcc5684a84 security fixes 2007-01-09 09:50:49 +00:00
Marc Delisle
3c5b5d693a undefined index 2006-11-18 11:49:48 +00:00
Michal Čihař
7e5f61842c Fix path disclossure while passing array as some params. 2006-11-17 09:32:19 +00:00
Michal Čihař
491187ed77 Rename left.php to navigation.php and modify all calls to that. Only config variables are kept as Left*. 2006-10-16 07:43:48 +00:00
Sebastian Mendel
abe4cb310e bug #1477576 with rtl langs, navi links open in wrong frame 2006-07-03 15:29:06 +00:00
Sebastian Mendel
506b3cb938 bug #1477576 with rtl langs, navi links open in wrong frame 2006-07-03 15:01:45 +00:00
Sebastian Mendel
9a4e3a65c2 improved themes 2006-04-27 13:18:42 +00:00
Michal Čihař
890918a20d Check target against goto_whitelist. 2006-04-20 14:16:13 +00:00
Sebastian Mendel
44a0f36096 use PMA_getenv() 2006-04-11 14:33:17 +00:00
Sebastian Mendel
d9c104577b replaced $_ENV with getenv() 2006-03-06 11:45:45 +00:00
Sebastian Mendel
0ae8842353 (not complete) PEAR coding standard 2006-01-17 17:03:02 +00:00
Sebastian Mendel
7358f5a712 allow 0 as name for database, table collumn, alias and index 2006-01-14 23:17:17 +00:00
Michal Čihař
76bbf08a3d Move navigation frame to right for rtl languages. 2005-12-14 15:59:39 +00:00
Michal Čihař
c04775d955 Move navigation frame to right for rtl languages. 2005-12-14 15:35:24 +00:00
Sebastian Mendel
8444d62a58 syncronize id and name attribute for frame tags but keep IE sending querywindow form to the correct window (bug #1374757, #1364470, #1297985) 2005-12-07 22:59:37 +00:00
Sebastian Mendel
a7b7f0bd11 - make use of new PMA_Theme and PMA_Theme_Manager classes 
- remove libraries/select_theme.lib.php
 2005-11-29 12:25:31 +00:00
Sebastian Mendel
74f29a1f0e - moved setting of cookies from index.php into common.lib.php 
- revised the parameter passing code
- make use of new functionality of PMA_generate_common_url()
 2005-11-29 08:46:23 +00:00
Sebastian Mendel
4d21dc6cae wrong check for safari 2005-11-24 17:29:48 +00:00
Sebastian Mendel
81cd3d35dc moved setting of cookies into index.php 2005-11-24 17:23:46 +00:00
Michal Čihař
f370db5942 Add target parameter to index.php to allow direct jump to any script. 2005-11-23 20:30:56 +00:00
Michal Čihař
618f2d7408 Move javascript stuff out of libraries folder. 2005-11-23 19:10:30 +00:00
Michal Čihař
0f8da57b54 Avoid XSS on HTTP_HOST. 2005-11-21 12:46:10 +00:00
Sebastian Mendel
ec0013dbf6 - common.lib.php should REALLY REALLY and ALWAYS be the first include 
- no other calls to grab_gloabls.lib.php
 2005-11-18 13:02:36 +00:00
Sebastian Mendel
fcf387bc70 common.lib.php should REALLY REALLY and ALWAYS be the first include 2005-11-18 12:50:49 +00:00
Sebastian Mendel
28a08f296b fixed/added favicon 2005-11-08 09:45:13 +00:00
Sebastian Mendel
df461e2e65 added favicon.ico 2005-10-28 10:26:09 +00:00
Sebastian Mendel
e58627459a fix problem not remembering selected server 2005-10-19 07:58:50 +00:00
Sebastian Mendel
cf9e4208d1 code cleanup whole querywindow js stuff, moved all in one new js file, now included in index.php, bug #1327055 2005-10-17 16:40:32 +00:00
Sebastian Mendel
3143135a5c XHTML 1.0 trans. compliance and more semantic XHTML output 2005-10-11 11:49:17 +00:00
Michal Čihař
535387e736 Add frame spacing (RFE #1036013). 2004-10-19 17:23:09 +00:00
Garvin Hicking
9392a58483 removed superfluous spaces, introduced more CSS ID attributes 2004-10-08 11:14:08 +00:00
Marc Delisle
5103056f34 bug 1006011, save the chosen connection collation into a cookie 2004-08-26 11:12:17 +00:00
Marc Delisle
57035bec43 names and ids for framesets in the noscript section 2004-08-05 10:39:46 +00:00
Marc Delisle
0fdf872232 given names and ids for framesets 2004-08-03 11:09:35 +00:00
Marc Delisle
261abc7537 fine tuning left panel for IE 2004-07-17 00:57:53 +00:00
Marc Delisle
6f97956b60 bug 989581 and display problems if left panel when switching themes 2004-07-14 13:16:03 +00:00
Marc Delisle
03f052c23a bug 981939 and problem with db dropdown in original theme 2004-07-05 13:18:08 +00:00
Marc Delisle
bb98260cd3 compute queryframe height 2004-06-24 20:31:14 +00:00
Marc Delisle
61170805ec temporary fix for new logo adjustment into frame 2004-06-24 14:57:19 +00:00
Michal Čihař
019ce8747e Use same code for all server selection, possibly display server links also in right frame, show server links in query frame when possible. 2004-06-15 13:05:02 +00:00