gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
99,872 Commits 12 Branches 481 Tags 2.4 GiB
d248f77458
Commit Graph

424 Commits

Author SHA1 Message Date
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
Michal Čihař
e077ad2797 Fix format string 2011-08-31 10:40:45 +02:00
Dieter Adriaenssens
3d1813c66c fix coding style, whitespace cleanup, docblocks 2011-08-25 23:04:03 +02:00
Dieter Adriaenssens
5c751cd1c0 make die() messages translatable, where possible 2011-08-25 22:38:51 +02:00
Dieter Adriaenssens
fd118e02d4 try indentation 2011-08-25 22:03:08 +02:00
Dieter Adriaenssens
a805121a22 fix DocCoding 2011-08-25 22:00:32 +02:00
Dieter Adriaenssens
fb5820487c try indentation 2011-08-25 21:44:04 +02:00
Dieter Adriaenssens
0c6dbb530d coding style 2011-08-21 23:19:30 +02:00
Dieter Adriaenssens
20a6232173 remove unused code 2011-08-21 22:57:23 +02:00
Dieter Adriaenssens
2f1443c637 fix typo 2011-08-21 22:54:38 +02:00
Dieter Adriaenssens
ded7b7065c coding style, wrapping long lines 2011-08-21 22:53:43 +02:00
Piotr Przybylski
df9b8c2729 Fix comments for functions with missing @return tag 2011-08-16 14:31:52 +02:00
Michal Čihař
159205458a Unused variable 2011-08-09 08:32:27 +02:00
Michal Čihař
8f618e6f01 Convert more occurences of inline autosubmit code to external js 2011-08-08 13:29:20 +02:00
Michal Čihař
9405dbb82a Fix spacing after @param 2011-07-22 09:21:55 +02:00
Michal Čihař
5330cabd37 Remove rest of custom color support 
This seems to be stray code for it. Also adjusted documentation to
represent real return value.
 2011-07-21 14:28:22 +02:00
Michal Čihař
a8d8e0c89a Add file description 2011-07-21 14:13:24 +02:00
Michal Čihař
abc7e01cf0 Minor fixes in coding style 2011-07-21 14:12:48 +02:00
Michal Čihař
f48846cbc0 Document why eval is used 2011-07-18 10:18:31 +02:00
Michal Čihař
ba9e74bb85 Function file_get_contents is available since PHP 4.3.0, no need to check for it 2011-07-18 10:17:46 +02:00
Michal Čihař
e57f27e50b Remove @uses tags from docblocks 2011-06-27 11:20:20 +02:00
Marc Delisle
13b31956ae For easier reading, replace "!isset" with "! isset" 2011-05-09 12:49:05 -04:00
Marc Delisle
fd1ac3cdac 3.5.0-dev 2011-05-06 06:13:40 -04:00
Marc Delisle
7af7e26cfb 3.4.0-rc3-dev 2011-04-26 12:25:54 -04:00
Marc Delisle
032b3a193f 3.4.0-rc2 2011-04-26 12:03:49 -04:00
Marc Delisle
5381b2f600 3.4.0-rc2-dev 2011-04-16 13:40:46 -04:00
Marc Delisle
c13f25d491 3.4.0-rc1 2011-04-16 13:10:24 -04:00
Marc Delisle
09605e2d81 3.4.0-rc1-dev 2011-03-12 08:01:26 -05:00
Marc Delisle
65a72fbeec 3.4.0-beta4 2011-03-12 07:22:05 -05:00
Marc Delisle
1e1b92af40 3.4.0-beta4-dev 2011-02-12 13:16:33 -05:00
Marc Delisle
8219dbdf41 3.4.0-beta3 2011-02-12 13:01:58 -05:00
Marc Delisle
44f99c2f47 Working on 3.4.0-beta3 2011-01-07 11:16:29 -05:00
Marc Delisle
c46844e4ae 3.4.0-beta2 2011-01-07 10:41:07 -05:00
Marc Delisle
e66884f576 3.4.0-beta1 2010-12-11 06:33:56 -05:00
Marc Delisle
a93399b8a4 the goal of master is currently to stabilize 3.4.0 2010-12-02 07:37:12 -05:00
Marc Delisle
9c8514fb97 3.5.0-dev 2010-11-22 13:23:08 -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
9c34a0eec9 Merged branch official/master. Resolved merge conflicts introduced due to merging of Piotr and Martynas's branches 2010-08-28 01:53:52 +05:30
Crack
a6b34a5977 fix generation of theme unique value 
refresh session cache for config after save
 2010-08-04 15:27:47 +02:00
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
Crack
5a3ec082d8 fix user preferences in phpmyadmin.css.php 
fix css for LightTabs
fix values in <select> lists
 2010-07-27 23:15:23 +02:00
Crack
7db978de3f Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/config.values.php
 2010-07-26 20:24:57 +02:00
Michal Čihař
639dc7fcf6 Simplify inclusions of vendor_config. 2010-07-26 16:46:37 +02:00
Crack
2d67cb58c4 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/relation.lib.php
 2010-07-24 18:34:52 +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
Crack
c67340d023 save lang and collation_connection to user preferences 2010-07-19 23:57:12 +02:00
Crack
995fcba961 fix theme changing 2010-07-16 11:30:21 +02:00
Crack
57a8d902f4 fix ThemeDefault and fontsize export 2010-07-13 22:17:19 +02:00
Crack
e6b551dc71 bugfixes: allow to work with multiple servers, fix boolean values in select fields 2010-07-10 12:09:34 +02:00
Crack
bcaecbf10a allow user preferences to work without pmadb, but warn users about that 2010-07-09 20:37:04 +02:00
ninadsp
020dac8c89 Merge remote branch 'origin/master' 2010-07-07 18:53:41 +05:30
Crack
a9f39a92e7 saving of theme and font size 2010-07-06 18:20:33 +02:00
Piotr Przybylski
573edc0329 patch #3025161 [core] Prevent sending of unnecessary cookies 2010-07-06 11:43:02 -04:00
Crack
68d9c40113 moved Import by LOAD DATA settings to CSV category 
moved PMA_array_* functions to core.lib.php
moved PMA_read_userprefs_fieldnames() to user_preferences.lib.php
server/database/table filename templates are saved to pmadb when "remember template" is checked
 2010-07-04 21:56:46 +02:00
Crack
e842432c7e User preferences: 
- add icons to category tabs
- user overrides were unavailable in CSS files
- apply saved configuration immediately after save, reload navigation frame if it's affected
- disabled overrides marked in user preferences forms
 2010-06-26 01:04:17 +02:00
Crack
9f44d864b6 user preferences saving and integration 2010-06-20 21:34:13 +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ř
08cda2f076 Merge branch 'QA_3_3' 
Conflicts:
	Documentation.html
	README
	libraries/Config.class.php
	translators.html
 2010-04-07 09:24:12 +02:00
Marc Delisle
210b7631da 3.3.3-dev 2010-04-06 13:00:48 -04:00
Marc Delisle
3f5d1063ff start of 3.3.2-dev 2010-03-10 11:32:55 +00:00
Marc Delisle
856a63e971 bug #2042032 Cannot detect PmaAbsoluteUri correctly on Windows 2010-03-01 18:08:29 +00:00
Marc Delisle
4cfa667b97 bug #2042032 Cannot detect PmaAbsoluteUri correctly on Windows 2010-03-01 18:08:29 +00:00
Herman van Rink
1f5a19b69c bug #2944069 [config] Extraneus dot from dirname() when installed in root, thanks to ayanamist 2010-02-03 15:32:37 +00:00
Herman van Rink
2ee9ff3e20 bug #2944069 [config] Extraneus dot from dirname() when installed in root, thanks to ayanamist 2010-02-03 15:32:37 +00:00
Michal Čihař
608ad9b147 bug #2936482 [core] Fix SSL detection. 2010-01-22 21:52:30 +00:00
Michal Čihař
5a5bbbe055 Make the code for getThemeUniqueValue at least a bit readable. 2010-01-21 13:08:40 +00:00
Michal Čihař
0b15e478d7 PmaAbsoluteUri is now checked at the beginning 
This way we don't have to care in all other places whether it is correct
or not.
 2010-01-21 12:49:49 +00:00
Michal Čihař
6ca77a8b5e Simplify https condition as we already know this. 2010-01-21 12:49:09 +00:00
Michal Čihař
7c4eb67e13 We don't need __wakeup in PMA_Config as it is no longer in session. 2010-01-21 12:35:05 +00:00
Michal Čihař
dd58fce29c Fix more occurences of $_SESSION['PMA_Config']. 2010-01-21 12:33:30 +00:00
Michal Čihař
3235e026a5 rfe #2393597 [core] phpMyAdmin honors https in PmaAbsoluteUri. 
Add function to detect current https state in addition the one which
checks what user has configured. Then we do not rewrite configured URL
if protocol differs, because we hope user has made the right thing.
 2010-01-21 11:21:50 +00:00
Michal Čihař
3c5c7f3630 [core] Cookie path now honors PmaAbsoluteUri. 2010-01-21 11:20:42 +00:00
Michal Čihař
58d9b034f7 Cache results of checkPmaAbsoluteUri. 2010-01-21 11:19:49 +00:00
Michal Čihař
94c2f864ae [core] Remove config data from session as it brings chicken-egg problem. 
Configuration data stores PmaAbsoluteUri, which should be accessible
before initiating session. Otherwise there is no way to make
PmaAbsoluteUri work. PmaAbsoluteUri is needed at least for reverse
proxy setups, for example http webserver running behind https proxy.
 2010-01-21 11:18:18 +00:00
Michal Čihař
f7dda75cd7 Separate ?> to avoid confusing syntax highlighters. 2010-01-21 11:13:04 +00:00
Marc Delisle
91dee4238c revert fix for bug #2931216 2010-01-21 00:36:27 +00:00
Marc Delisle
c343434849 revert fix for bug #2931216 2010-01-21 00:36:27 +00:00
Marc Delisle
eacec1d091 bug #2931216 Relations settings not updated on config change 2010-01-20 18:10:37 +00:00
Marc Delisle
ba66e07181 bug #2931216 Relations settings not updated on config change 2010-01-20 18:10:37 +00:00
Marc Delisle
73275fc4de advance version numbers 2009-12-31 13:27:55 +00:00
Marc Delisle
8ed383bf13 advance version numbers 2009-12-31 13:27:55 +00:00
Marc Delisle
526dce65cb 3.3 2009-12-31 13:11:19 +00:00
Marc Delisle
f3833884e4 3.3 2009-12-31 13:09:18 +00:00
Marc Delisle
38fea0cc9e in SESSION, userconf renamed to tmp_user_values to avoid confusion with the future db-based user preferences 2009-06-20 16:36:58 +00:00
Herman van Rink
5d6af24268 bug #2799009 Login with ipv6 IP address breaks redirect 2009-05-31 12:50:52 +00:00
Marc Delisle
e038883325 3.3.0-dev 2009-05-18 14:28:56 +00:00
Marc Delisle
857eba2705 bug #2729191 [config] CheckConfigurationPermissions = false is worthless 2009-04-12 11:42:14 +00:00
Marc Delisle
398feb40fd patch #2407785 [cleanup] ereg*() deprecated in PHP 5.3 2008-12-14 13:58:06 +00:00
Michal Čihař
7503c9b75d Better support for vendor customisation (based on what Debian needs) 2008-11-30 12:58:55 +00:00
Michal Čihař
ebeb0c319f Adding @package, first part. 2008-11-24 10:32:56 +00:00
Marc Delisle
c39bb3bb3f 3.2.0-dev 2008-11-08 14:18:12 +00:00
Michal Čihař
737b292e0d Indentation. 2008-09-03 13:06:17 +00:00
Marc Delisle
1bd7ec70e2 bug #2046883 [core] Notices about deprecated dl() (so stop using it) 2008-08-16 14:06:27 +00:00
Marc Delisle
91ae7b67bd various code improvements, thanks to Piotr Przybylski 2008-08-16 12:17:52 +00:00
Marc Delisle
cdbc44343c 3.1.0-dev 2008-08-08 10:51:58 +00:00
Marc Delisle
bb2c1fbb8d color picker (work in progress) 2008-07-10 17:53:31 +00:00
Marc Delisle
544831fda7 patch #2007196, Typos in comments, thanks to knittl - knittl 2008-07-01 19:21:28 +00:00
Marc Delisle
1c96d44d34 Font size option problem when no config file 2008-06-28 15:46:54 +00:00
Marc Delisle
4e76dc40a3 improved fix for bug 1996943 2008-06-20 17:53:30 +00:00
Marc Delisle
be10c2988f bug #1996943 [export] Firefox 3 and .sql.gz (corrupted) 2008-06-19 12:29:48 +00:00
Marc Delisle
ba57a90e8b bug #1909711 [security] Sensitive data in session files 2008-03-29 06:06:35 +00:00
Marc Delisle
603e566c0d bug #1864468 [display] Theme does not switch to darkblue_orange 2008-01-05 13:33:05 +00:00
Marc Delisle
c3f7496a7f bug #1817612 [cookies] Wrong cookie path on IIS with PHP-CGI 2007-12-13 18:48:53 +00:00
Marc Delisle
ea594740ca remove debug code 2007-12-10 18:14:16 +00:00
Marc Delisle
ffc9a28eaf bug #1806236 Make the world write check on config.inc.php optional 2007-12-10 18:02:20 +00:00
Marc Delisle
8b67c1819b bug #1817224 [import] Incorrect detection of file_uploads in some cases 2007-11-05 12:24:13 +00:00
Sebastian Mendel
ef7a052074 - fixed XSS in server_status.php, thanks to Omer Singer, The DigiTrust Group 
- fixed some possible XSS with PHP_SELF (PATH_INFO)
- commented out some use of PATH_INFO ... needs further testing
 2007-10-16 07:11:28 +00:00
Marc Delisle
37d2d05399 Font size detection was no longer working 2007-10-10 16:56:22 +00:00
Sebastian Mendel
e51a242ee7 removed MySQL < 5 related comment 2007-10-02 08:58:16 +00:00
Marc Delisle
315764bc85 patch goes to 2.11.1 instead of 2.11.2 2007-09-18 12:10:53 +00:00
Marc Delisle
44e9ee3c35 patch #1787915 Avoid CSS reloading on every click, thanks to Juergen Wind 2007-09-17 16:32:17 +00:00
Sebastian Mendel
d2b9013fad fixed E_STRICT 2007-08-02 11:40:16 +00:00
Marc Delisle
ebc2899198 default font size of 82% 2007-07-23 23:54:41 +00:00
Marc Delisle
ef3f2b5a69 version numbers for QA_2_11 and trunk 2007-07-18 16:13:58 +00:00
Marc Delisle
f73d68265b RFE #1743983: replace $max_characters by a configurable param MaxCharactersInDisplayedSQL 2007-07-01 19:26:41 +00:00
Marc Delisle
9d9cd7221b bug #1727138 HTML not encoded (last part of the fix) 2007-06-27 15:12:40 +00:00
Sebastian Mendel
cfeb306526 coding standard: no spaces inside braces 2007-04-01 11:02:46 +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
Marc Delisle
b800466c91 avoid vim error on loading 2007-03-19 16:55:30 +00:00
Marc Delisle
42ac66ad74 get rid of propicon 2007-02-10 15:58:46 +00:00
Marc Delisle
2597ef1435 bug #1590083, DefaultConnectionCollation ignored in config.inc.php 2006-12-30 14:30:58 +00:00
Marc Delisle
8cda2c9b41 allow caching of phpmyadmin.css.php 2006-12-10 13:30:40 +00:00
Michal Čihař
f0780e3129 Add backward compatibility code to affect above renaming. 2006-10-25 14:16:37 +00:00
Sebastian Mendel
1eadc0a41a use @todo tag for todo items, to show up in generated documentation 2006-09-21 14:28:46 +00:00
Marc Delisle
c78c200692 rename a function borrowed from Moodle to avoid double definition when PMA is called by Moodle 2006-09-15 11:43:05 +00:00
Marc Delisle
3ab9bb963b oops 2.10.0-dev 2006-08-10 11:50:48 +00:00
Marc Delisle
896331a8fd 2.9.10-dev 2006-08-10 11:49:59 +00:00
Sebastian Mendel
8c3acfa642 make font size user configurable - missing documentation 2006-07-31 14:20:00 +00:00
Sebastian Mendel
f45e14f2a3 make font size user configurable - forgot to change locale string 2006-07-31 13:55:13 +00:00
Sebastian Mendel
f106d9552e make font size user configurable 2006-07-31 13:52:52 +00:00
Sebastian Mendel
b6c15a38f0 reload default configuration if config.inc.php is removed 2006-07-04 07:36:09 +00:00
Marc Delisle
02f86bfb95 remove debug code 2006-06-28 11:58:07 +00:00
Michal Čihař
1a45c89702 Recalculate URL only if needed not all times when using https. 2006-06-27 14:12:02 +00:00
Marc Delisle
d4dcc67495 bug #1501027, possible user/password disclosure 2006-06-23 11:14:15 +00:00
Michal Čihař
0728242790 Fix parsing of paths containing : (patch #1461766). 2006-04-11 16:41:18 +00:00
Michal Čihař
b8d269c1c3 no PMA_PMA_ prefix :-) 2006-04-11 14:08:23 +00:00
Sebastian Mendel
f365bb5d04 fixed not initilized variable in getCookiePath(); 
use new PMA_getenv();
 2006-04-11 14:04:19 +00:00
Michal Čihař
c53264cac0 Better check for server system (patch #1462738). 2006-04-10 13:01:05 +00:00
Michal Čihař
fd0bb46fa4 Check also default config mtime (bug #1467620). 2006-04-10 12:54:07 +00:00
Marc Delisle
30afc8d7b0 bug 1445120, cookie login not working on IIS 2006-03-13 23:14:50 +00:00
Marc Delisle
6eba03ecfe bug #1444867, config.inc.php not loading on PHP < 4.3.0 2006-03-07 18:35:50 +00:00
Sebastian Mendel
76f0235061 replaced $_SERVER with getenv() 2006-03-06 10:49:45 +00:00
Marc Delisle
6fe79cc137 bug #1418769 part 1: stat failed for ./config.inc.php (under PHP 4) 2006-02-23 12:45:13 +00:00
Michal Čihař
03ca5b8846 Trim spaces from config file to avoid unwanted outpu (path #1431566, thanks to Piotr_Skowronek - piotr_skowronek). 2006-02-21 17:44:38 +00:00
Marc Delisle
dee8d64c1c bug #1418769 part 2, missing argument for PHP 4 2006-02-08 18:26:33 +00:00
Marc Delisle
5c736824c3 possibility of having a backslash in a non-windows path 2006-02-08 17:58:06 +00:00
Marc Delisle
3809b1e8b8 bug #1409770 auto-detection and dirname on Windows 2006-02-04 15:33:54 +00:00
Marc Delisle
32cca60124 2.9.0-dev 2006-01-29 13:03:26 +00:00
Sebastian Mendel
0ae8842353 (not complete) PEAR coding standard 2006-01-17 17:03:02 +00:00
Marc Delisle
32a39388f1 bug #1398931, incorrect detection of PmaAbsoluteUri in vhost situations 2006-01-07 13:25:07 +00:00
Michal Čihař
b14a75c320 Do not check permissions on Windows, it seems to be broken anyway. 2006-01-02 09:32:29 +00:00
Marc Delisle
6d10f738f9 patch #1392181, typo 2005-12-30 22:43:49 +00:00
Sebastian Mendel
541c4b9111 fixed handling of https and $cfg['ForceSSL'] (bug #1379491) 2005-12-15 09:16:56 +00:00
Sebastian Mendel
6696d07f91 check config file also on wakeup (bug #1376522) 2005-12-14 17:41:50 +00:00
Sebastian Mendel
248d12363d added check is_readable for user config file 2005-12-14 17:12:28 +00:00
Michal Čihař
42268f9575 Refuse to load config file with world writable permissions, refuse to work with existing config dir. 2005-12-08 18:29:41 +00:00
Sebastian Mendel
50c4439d30 clear old config values 2005-12-07 08:32:21 +00:00
Sebastian Mendel
b8619ad1ad correctly reset config variables on changes in config.inc.php 2005-12-05 15:50:25 +00:00
Sebastian Mendel
9fe2097f39 make use of PMA_array_merge_recursive() (forgot to remove debug code) 2005-12-05 13:20:07 +00:00
Sebastian Mendel
389d8f2871 make use of PMA_array_merge_recursive() 2005-12-05 13:09:21 +00:00
Sebastian Mendel
3d5994dd7d session cookie path (bug #1370294) 2005-12-01 10:46:56 +00:00
Sebastian Mendel
f05a0df6f6 no error for missing config file (bug #1370269) 2005-12-01 08:33:12 +00:00
Michal Čihař
f88d908e83 Move config.default.php to librarires (bug #1365759). 2005-11-30 19:01:47 +00:00
Michal Čihař
17a3ebe53a Actually load configuration. 2005-11-30 18:59:48 +00:00
Sebastian Mendel
e16cc93094 allow to load no user config 2005-11-30 15:31:36 +00:00
Sebastian Mendel
9a715f8c96 merged code from common.inc.php and defines.lib.php 2005-11-30 14:00:30 +00:00
Sebastian Mendel
86a4731d48 merged check for collationconnection and output buffering from common.lib.php 2005-11-29 18:28:08 +00:00
Sebastian Mendel
687ea83a62 added checkPmaAbsoluteUri() 2005-11-29 17:41:27 +00:00
Sebastian Mendel
ff6c564b13 new class for handling config 2005-11-29 16:46:46 +00:00