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

6380 Commits

Author SHA1 Message Date
Michal Čihař
347fca5b86 Use same order of database and table params as elsewhere 2011-08-25 08:49:31 +02:00
Piotr Przybylski
f678a45cd2 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/database_interface.lib.php
 2011-08-24 21:40:52 +02:00
Piotr Przybylski
e13aab1087 Condition excluding XML output from server export was broken 2011-08-24 21:34:08 +02:00
Piotr Przybylski
6bbf248350 Remove unused variable 2011-08-24 21:26:39 +02:00
Piotr Przybylski
5ab5afd506 Use PMA_Table::isView() instead of PMA_isView() 2011-08-24 21:16:04 +02:00
Piotr Przybylski
c12073871d Remove deprecated method PMA_Table::_isView() 2011-08-24 21:00:41 +02:00
Madhura Jayaratne
84f621b545 Sanitize filenames in a unified manner - more instances 2011-08-24 22:52:28 +05:30
Marc Delisle
4d2521ac91 Merge branch 'QA_3_4' 2011-08-24 12:30:15 -04:00
Marc Delisle
3b75f549f4 Merge branch 'MAINT_3_4_4' into QA_3_4 2011-08-24 12:29:30 -04:00
Piotr Przybylski
3e0af18434 Fix indentation broken by past merges 2011-08-24 13:24:21 +02:00
Piotr Przybylski
df4f5b7c96 Whitespace 2011-08-24 13:13:59 +02:00
Piotr Przybylski
b4f4a209c8 PMA_getServerType() - recognize Percona Server 2011-08-24 12:58:40 +02:00
Piotr Przybylski
710c7e2dd7 Print server_comment after server software version 2011-08-24 12:53:13 +02:00
Piotr Przybylski
f42b1d14dc PMA_DBI_fetch_single_row() shouldn't allow to set the $options argument 2011-08-24 12:12:04 +02:00
Madhura Jayaratne
b768e4de82 Typo 2011-08-24 10:06:23 +05:30
Madhura Jayaratne
136921c9cd Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-08-24 10:01:46 +05:30
Madhura Jayaratne
9b007f9920 Min-max calculation for polygons needs not consider inner rings 2011-08-24 09:40:08 +05:30
Piotr Przybylski
e7994a364e PMA_DBI_fetch_value() doesn't shouldn't allow to set the $options argument 2011-08-23 22:56:35 +02:00
Piotr Przybylski
8cd8760256 Create PMA_is_system_schema() function which checks whether current database server treats it as a system schema 2011-08-23 22:48:14 +02:00
Piotr Przybylski
92be06e6e9 Better comment 2011-08-23 22:25:14 +02:00
Piotr Przybylski
da6c5b7129 Inline PMA_DBI_get_default_engine(), this one-liner is used only once 2011-08-23 22:19:21 +02:00
Piotr Przybylski
57bea0630a Use PMA_DBI_get_table_indexes_sql() only when really needed, in all other cases use PMA_DBI_get_table_indexes() 2011-08-23 22:14:15 +02:00
Piotr Przybylski
a31b30ba57 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-23 21:56:33 +02:00
Madhura Jayaratne
b072a8d47c Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-08-23 19:37:07 +05:30
Madhura Jayaratne
b0465744fb Coding style improvements 2011-08-23 19:20:22 +05:30
Michal Čihař
b99420e2ae Remove some unused variables 2011-08-23 15:02:18 +02:00
Michal Čihař
4b83f0bc0d Clarify 2011-08-23 12:36:36 +02:00
Michal Čihař
1433b4c331 Fixed and simplified type detection on editing 
Fixes bug#3392824 and cleans up the code.
 2011-08-23 11:59:43 +02:00
Michal Čihař
93255067eb Clarify comment for translators, avoid duplicating message context 2011-08-23 10:37:31 +02:00
Aris Feryanto
de3ac00227 Fix printing JS arrays 2011-08-23 08:09:55 +02:00
Michal Čihař
9cda17487c Fix CSS rule 2011-08-22 15:56:01 +02:00
Michal Čihař
19ab72bf85 One place to generate CodeMirror CSS 2011-08-22 15:52:35 +02:00
Michal Čihař
e898b1ec19 Move theme helpers to theme class 2011-08-22 15:42:37 +02:00
Michal Čihař
85e778ffc8 Should not be called anymore 2011-08-22 15:36:54 +02:00
Michal Čihař
a0309eb384 Fix function name 2011-08-22 15:35:46 +02:00
Michal Čihař
d15abfb25b Fold PMA_ieFilter into PMA_css_Gradied 2011-08-22 15:35:32 +02:00
Piotr Przybylski
d2255fb9ae Merge remote-tracking branch 'origin/master' into drizzle 2011-08-22 15:19:50 +02:00
Michal Čihař
ccbefbb5ef Adjust calling convention, do not include # in color 2011-08-22 15:09:21 +02:00
Michal Čihař
5b8bb36168 Add forgotten file 2011-08-22 15:01:54 +02:00
Madhura Jayaratne
cc367fad58 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-08-22 15:01:26 +05:30
Madhura Jayaratne
966716ec68 More coding style improvements 2011-08-22 14:51:56 +05:30
Piotr Przybylski
1c2dbf0cbb Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/advisory_rules.txt
 2011-08-22 11:18:26 +02:00
Michal Čihař
ef1fe35f37 Merge branch 'tyron' 2011-08-22 09:25:02 +02:00
Michal Čihař
f1b4c72e41 Revert "Fix: Monitor broken from a change by michal" 
This reverts commit 6f20ebf5cf.
 2011-08-22 09:24:53 +02:00
Michal Čihař
ef80b78991 Docblocks 2011-08-22 09:10:39 +02:00
Michal Čihař
863d8f2e52 Support for not escaped js code 2011-08-22 09:06:31 +02:00
Madhura Jayaratne
adbdb71e60 Coding style improvements 2011-08-22 07:42:24 +05:30
Madhura Jayaratne
ea30c016c8 Opening braces should be on a new line 2011-08-22 07:30:29 +05:30
Madhura Jayaratne
c726d423fe Fix doc blocks 2011-08-22 07:28:37 +05:30
Madhura Jayaratne
05e78b2778 Proper coding style for multi line if statements 2011-08-22 06:46:39 +05:30
Dieter Adriaenssens
e82d3c7136 require/include are statements not functions; no parentheses are required 2011-08-21 23:36:10 +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
Madhura Jayaratne
4d77e95640 Coding style improvements for Svg_Relation_Schema 2011-08-22 00:44:51 +05:30
Tyron Madlener
6f20ebf5cf Fix: Monitor broken from a change by michal 2011-08-21 17:58:30 +03:00
Marc Delisle
0eb8f28a06 Merge commit '4f4ab7dc6951ad3537c9e3578cf0601effa4c688' 2011-08-21 07:32:39 -04:00
Ammar Yasir
4f4ab7dc69 Fixed: 'Browse foreign values' not working properly 2011-08-21 10:47:20 +05:30
Madhura Jayaratne
c052a0203b More instances of coding style violations in Eps_Relation_Schema 2011-08-21 00:47:29 +05:30
Madhura Jayaratne
efbbc52568 Coding style improvements for Pdf_Relation_Schema 2011-08-21 00:45:47 +05:30
Madhura Jayaratne
d5c3cbf42a Style improvements for Export_Relation_Schema 2011-08-20 23:38:22 +05:30
Tyron Madlener
5b5344dca7 Merge remote-tracking branch 'origin/master' 2011-08-20 20:33:24 +03:00
Piotr Przybylski
b0ed51d8cd Remove todo item 2011-08-20 13:51:06 +02:00
Tyron Madlener
08604d7f08 duplicate rule name 2011-08-20 14:18:53 +03:00
Madhura Jayaratne
249a1d5c8c Coding style improvements to Eps_Relation_Schema 2011-08-20 07:30:11 +05:30
Madhura Jayaratne
c5b108b716 Coding style improvements to Dia_Relation_Schema 2011-08-20 07:29:53 +05:30
Madhura Jayaratne
e3a3e26146 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-08-20 07:22:16 +05:30
Madhura Jayaratne
4db9c176b3 bug #3385954 - unknown table status:Create_time on dispalying view (again) 2011-08-20 07:19:17 +05:30
Piotr Przybylski
e5157838e5 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-20 01:03:11 +02:00
Piotr Przybylski
9b2570b0cf Advisor: mark that 'Rate of reading fixed position' may be wrong, requires further investigation 2011-08-20 00:59:11 +02:00
Piotr Przybylski
9be1bad63c Advisor: link to MySQL 5.5 documentation, it's better and more complete 2011-08-20 00:56:06 +02:00
Piotr Przybylski
dec6f85a06 Advisor: don't run 'MyISAM concurrent inserts' on Drizzle 2011-08-20 00:49:22 +02:00
Piotr Przybylski
41c18f6113 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/Table.class.php
	libraries/Tracker.class.php
 2011-08-20 00:48:40 +02:00
Piotr Przybylski
80daf34494 Advisor: properly handle concurrent_insert on MySQL 5.5.3 2011-08-20 00:43:51 +02:00
Piotr Przybylski
11cd7afc7b Advisor: add exceptions for Drizzle 2011-08-20 00:39:52 +02:00
Piotr Przybylski
5ce1db5f1a Advisor: add Com_* variables in Drizzle 2011-08-20 00:37:35 +02:00
Piotr Przybylski
e9158da818 Add MYSQLI_TYPE_VARCHAR to mysqli dbi (required for Drizzle) 2011-08-20 00:36:41 +02:00
Marc Delisle
7e814a711a Merge branch 'QA_3_4' 2011-08-19 16:17:25 -04:00
Marc Delisle
29b694c225 bug #3392920 [edit] BLOB emptied after editing another column 2011-08-19 16:16:51 -04:00
Madhura Jayaratne
c28c33c471 Coding style improvements 2011-08-19 23:38:42 +05:30
Madhura Jayaratne
855dc6e645 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-08-19 23:30:32 +05:30
Piotr Przybylski
38389841d7 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-19 19:37:34 +02:00
Madhura Jayaratne
6b0fb6c206 Code style improvements 2011-08-19 21:51:32 +05:30
Piotr Przybylski
941c186d27 Advisor: properly detect 64-bit builds of MySQL on Windows 2011-08-19 18:17:56 +02:00
Piotr Przybylski
c1f20fefd4 Make Advisor evaluation code easier to understand 2011-08-19 18:16:14 +02:00
Madhura Jayaratne
d5489c4432 Fix doc blocks and multi line if statements 2011-08-19 21:43:07 +05:30
Madhura Jayaratne
7b054e9b7d Fix doc blocks, multi line if statements, switch-case statements 2011-08-19 20:48:27 +05:30
Madhura Jayaratne
88db32fafd More coding style improvements 2011-08-19 20:31:44 +05:30
Madhura Jayaratne
388dfb0e5d Coding style improvements 2011-08-19 20:29:47 +05:30
Madhura Jayaratne
ca16dfb46f Coding style improvements 2011-08-19 20:05:48 +05:30
Madhura Jayaratne
878e78866c proper indentation for switch-case statements 2011-08-19 19:55:43 +05:30
Madhura Jayaratne
21510a093a Fix some doc blocks 2011-08-19 19:54:25 +05:30
Piotr Przybylski
0ca4a5f02e Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	db_search.php
	libraries/Table.class.php
	libraries/schema/Pdf_Relation_Schema.class.php
	libraries/schema/User_Schema.class.php
	libraries/tbl_select.lib.php
	server_status.php
	tbl_change.php
 2011-08-19 15:56:26 +02:00
Michal Čihař
a1c5e7f67a Move library to libraries 2011-08-19 12:21:55 +02:00
Madhura Jayaratne
1dba9c1836 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/tbl_select.lib.php
 2011-08-19 15:17:32 +05:30
Michal Čihař
cb9f7a2c26 Clarify code 2011-08-19 11:15:31 +02:00
Michal Čihař
a3f14bbd80 Fix indentation 2011-08-19 11:15:24 +02:00
Madhura Jayaratne
a05eb3ebcd Should return results when $propertiesIconic == true 2011-08-19 14:27:25 +05:30
Michal Čihař
381b593e59 Fix typecasting 2011-08-19 10:52:32 +02:00
Michal Čihař
c289045dcd Fix typo 2011-08-19 10:49:58 +02:00
Michal Čihař
fb1c4bd9ee Handle more types in js variable formatting 2011-08-19 10:43:08 +02:00
Michal Čihař
4b5ae952dd Function for setting variable 2011-08-19 10:36:22 +02:00
Michal Čihař
17f4b82821 Factor out code escaping from echo 2011-08-19 10:35:00 +02:00
Michal Čihař
d2df35108e Wrap some long lines 2011-08-19 10:33:13 +02:00
Madhura Jayaratne
c5b393665c More code style corrections 2011-08-19 13:36:28 +05:30
Michal Čihař
c4c445b0e9 Use PMA_DBI_get_columns instead of custom query 2011-08-19 09:20:23 +02:00
Michal Čihař
5209562dd3 Use PMA_DBI_get_columns instead of custom query 2011-08-19 09:18:27 +02:00
Michal Čihař
f66f8b7074 Use PMA_DBI_get_columns instead of custom query 2011-08-19 09:14:54 +02:00
Michal Čihař
f0babc56a3 Fix indentation 2011-08-19 09:11:06 +02:00
Michal Čihař
dd046f10b3 Fix typo 2011-08-19 09:11:01 +02:00
Michal Čihař
88ef580bd5 Use PMA_DBI_get_columns instead of custom query 2011-08-19 09:09:12 +02:00
Michal Čihař
ab166dd849 Remove some unused vars 2011-08-19 09:06:46 +02:00
Michal Čihař
ecb999e010 Remove some unused variables 2011-08-19 09:02:11 +02:00
Madhura Jayaratne
77b2b7627d Adhere to PEAR coding standards 2011-08-19 11:21:21 +05:30
Madhura Jayaratne
4f438c3317 Coding style corrections 2011-08-19 11:07:11 +05:30
Madhura Jayaratne
0741a53401 Remove tab characters 2011-08-19 10:44:33 +05:30
Madhura Jayaratne
2d4a4427ef Fix doc blocks 2011-08-19 10:42:57 +05:30
Madhura Jayaratne
46262835b6 Only non-empty search values should go into where clause 2011-08-19 10:03:35 +05:30
Piotr Przybylski
627e4133c3 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	themes/original/css/theme_right.css.php
 2011-08-17 22:47:20 +02:00
Piotr Przybylski
746f3566bb set_time_limit may fail, make it do so silently 2011-08-17 22:22:39 +02:00
Madhura Jayaratne
683a512c41 Wrap long lines. 2011-08-18 00:04:40 +05:30
Madhura Jayaratne
5f2a52153b Use include_once when included conditionally 2011-08-17 23:54:14 +05:30
Madhura Jayaratne
18f567a3f1 Correcting indentation for switch statements 2011-08-17 23:52:36 +05:30
Madhura Jayaratne
1a1833662f Wrap long lines 2011-08-17 23:48:19 +05:30
Piotr Przybylski
dd8116cc61 Two more fixes for Tracking in Drizzle 2011-08-17 17:01:11 +02:00
Piotr Przybylski
99f52e1edd A few missing fixes for Tracking 2011-08-17 16:50:00 +02:00
Piotr Przybylski
1aa438539a Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/common.lib.php
	libraries/config.default.php
	server_synchronize.php
 2011-08-17 16:39:43 +02:00
Madhura Jayaratne
d501fc1fe6 Merge branch 'OpenGIS' 2011-08-17 18:02:25 +05:30
Marc Delisle
798e9c44bd Merge commit '4ce54e17340d4155fa4613ff3954c91ad76d55e9' 2011-08-17 07:53:07 -04:00
Michal Čihař
82c6f950eb Avoid loading themes from non directories, . and .. 2011-08-17 13:32:49 +02:00
Michal Čihař
4e94e3e35d Remove unused code 2011-08-17 13:26:46 +02:00
Michal Čihař
a1d6104502 Use Theme class for getting file name 2011-08-17 13:25:48 +02:00
Madhura Jayaratne
46722b8035 Merge branch 'master' into OpenGIS 2011-08-17 16:43:18 +05:30
Michal Čihař
576e76d419 Fix indentation 2011-08-17 12:31:33 +02:00
Michal Čihař
08967fec6a Make the string translatable 2011-08-17 12:31:04 +02:00
Michal Čihař
e89da7e7e4 Fix typo 2011-08-17 12:30:15 +02:00
Aris Feryanto
5e60aa8380 Fix merge conflict with origin/master 2011-08-17 13:41:38 +08:00
Aris Feryanto
88f3796f1e Grid edit: add datetimepicker support for date, datetime, and timestamp field 2011-08-17 13:12:31 +08:00
Dieter Adriaenssens
cbca775738 coding style and wrapping long lines 2011-08-17 00:09:17 +02:00
Piotr Przybylski
4073badee2 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-17 00:01:05 +02:00
Dieter Adriaenssens
d6ba069b01 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-08-16 22:40:30 +02:00
Dieter Adriaenssens
35b3595ec0 coding style and wrapping long lines 2011-08-16 22:39:46 +02:00
Piotr Przybylski
8c4530e338 Simplify code 2011-08-16 22:19:41 +02:00
Piotr Przybylski
6694352f0c Only PMA_DBI_fetch_assoc is needed here 2011-08-16 22:18:08 +02:00
Piotr Przybylski
726594645c Optimize tracking query, only the first row is needed 2011-08-16 22:17:23 +02:00
Piotr Przybylski
b7f3d86a41 Make tracking compatible with Drizzle 
Simulate SET type by bit flags
 2011-08-16 22:14:24 +02:00
Piotr Przybylski
701c957f40 Inline three one-line methods 2011-08-16 20:23:15 +02:00
Piotr Przybylski
e72036b4b1 No need to use PMA_DBI_get_table_indexes_sql() here, use PMA_DBI_get_table_indexes() 2011-08-16 20:02:23 +02:00
Piotr Przybylski
f578d0dadc Merge remote-tracking branch 'origin/master' into drizzle 2011-08-16 19:58:16 +02:00
Piotr Przybylski
71184688b5 We need only associative array here 2011-08-16 19:57:23 +02:00
Piotr Przybylski
1146572716 Use PMA_DBI_get_columns in Tracker code 2011-08-16 19:53:11 +02:00
Piotr Przybylski
5cd731b232 Make this usage of $sql_backquotes less cryptic 2011-08-16 19:33:09 +02:00
Piotr Przybylski
a502f95af4 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-16 16:11:43 +02:00
Rouslan Placella
79f746198e Merge remote-tracking branch 'origin/master' 2011-08-16 14:02:40 +01:00
Rouslan Placella
8f1aca4818 MySQL allows a function and a procedure with the same name in the same db. This case was unhandled. 2011-08-16 14:02:16 +01:00
Piotr Przybylski
f2842a22bf Fox comment 2011-08-16 14:35:02 +02:00
Piotr Przybylski
df9b8c2729 Fix comments for functions with missing @return tag 2011-08-16 14:31:52 +02:00
Piotr Przybylski
6dca42107e Fix comments in upload progress libs and add make returns consistent 2011-08-16 14:18:15 +02:00
Piotr Przybylski
493aa3a6f0 A few fixes for comments in Relation_Schema classes (they still require further work) 2011-08-16 14:16:46 +02:00
Rouslan Placella
4e4456e9b8 Fixed wrong permission check for "Drop Routine" action 2011-08-16 12:36:38 +01:00
Rouslan Placella
39b0f4d34b Fixed wrong destination page on "Drop Routine" action 2011-08-16 12:35:43 +01:00
Piotr Przybylski
1ea24eb083 Better variable name 2011-08-16 01:04:51 +02:00
Piotr Przybylski
553f6b2f9a Fix comments 2011-08-16 00:41:57 +02:00
Piotr Przybylski
3782a6c89b Remove JS function: getElement 2011-08-16 00:34:44 +02:00
Piotr Przybylski
824fac0da5 Import missing variable into method's scope 2011-08-16 00:09:04 +02:00
Piotr Przybylski
fd44145183 Add missing PMA_sqlAddSlashes 2011-08-16 00:07:57 +02:00
Piotr Przybylski
73485871c7 PMA_backquote is not needed here 2011-08-16 00:05:51 +02:00
Piotr Przybylski
cc4743d396 'comment' is not a reserved keyword, remove PMA_backquote 2011-08-16 00:05:26 +02:00
Piotr Przybylski
e2eb8a28da PMA_backquote is not needed for string literals 2011-08-16 00:04:44 +02:00
Piotr Przybylski
970262c435 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-15 12:03:04 +02:00
Piotr Przybylski
e19d93a70c Remove unneeded variables from config.default.php 2011-08-15 11:58:54 +02:00
Michal Čihař
b3939c021a Remove not needed global $query_default_option 2011-08-15 11:41:49 +02:00
Michal Čihař
21e2913add Remove not needed param from PMA_REL_create_page 2011-08-15 11:37:23 +02:00
Michal Čihař
b0a108473e Remove not needed param from PMA_REL_create_page 2011-08-15 11:36:13 +02:00
Michal Čihař
bbccd32c81 Improve coding style 2011-08-15 11:33:00 +02:00
Michal Čihař
72f9042b9a Coding style 2011-08-15 10:43:21 +02:00
Michal Čihař
aec113c7b7 Rename file to match standards 2011-08-15 10:36:01 +02:00
Michal Čihař
0407bb70a9 Param was missing 2011-08-15 10:18:22 +02:00
Michal Čihař
ac4b82ea13 Merge remote-tracking branch 'tyron/master' 
Conflicts:
	libraries/advisor.class.php
 2011-08-15 10:16:29 +02:00
Michal Čihař
7327dab936 Include link to docs 2011-08-15 10:01:10 +02:00
Michal Čihař
951df3599f Avoid double escaping 2011-08-15 09:39:34 +02:00
Michal Čihař
95308f4205 Remove forgotten line 2011-08-15 09:35:59 +02:00
Michal Čihař
6d62ee60aa This needs an instance 2011-08-15 09:32:06 +02:00
Michal Čihař
18698ad6ad Fix what I broke for multi param formats 2011-08-15 09:30:53 +02:00
Michal Čihař
ee2578764a Fix typo 2011-08-15 09:27:20 +02:00
Michal Čihař
e7cc67a5f6 Always escape % for gettext 
Otherwise it is treated like format string.
 2011-08-15 09:18:18 +02:00
Michal Čihař
9be2507a58 Factor out percent escaping 2011-08-15 08:56:02 +02:00
Madhura Jayaratne
7d7dd02e8c Merge branch 'master' into OpenGIS 
Conflicts:
	tbl_select.php
 2011-08-13 14:12:46 +05:30
Madhura Jayaratne
d6bf1cd451 Adhere to coding style 2011-08-13 10:02:39 +05:30
Piotr Przybylski
bdefd47ec1 Use PMA_DBI_get_columns_sql (completes latest merge) 2011-08-12 22:05:09 +02:00
Piotr Przybylski
a7c0c55c7f Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	js/server_status.js
	libraries/common.lib.php
	tbl_printview.php
	tbl_select.php
	tbl_structure.php
 2011-08-12 22:02:40 +02:00
Marc Delisle
8f7312956d Merge commit '1b7e2f6c7be6c7a96d780a7e9870d498f84e7339' 2011-08-12 14:40:56 -04:00
Tyron Madlener
08b6d28755 External urls from advisory_rules are redirected to url.php 2011-08-12 16:07:13 +03:00
Marc Delisle
70b664a3bd Merge commit '3a672d43b814dbf63276f4631eb0a4fa83a235c5' 2011-08-12 08:01:31 -04:00
Michal Čihař
2c7cdea64a Improve rules descriptions 
Rule name has first char always capitalised and avoid using things like
% at beginnig.
 2011-08-12 12:31:39 +02:00
Michal Čihař
7741ad7286 Merge remote-tracking branch 'tyron/master' 2011-08-12 12:15:50 +02:00
Madhura Jayaratne
bedd7087f3 Wrap long lines 2011-08-12 14:03:40 +05:30
Madhura Jayaratne
cb0eca28e4 Rename functions to match PEAR coding style 2011-08-12 13:50:28 +05:30
Aris Feryanto
3a672d43b8 Change the default MaxTableUiprefs to 100 2011-08-12 16:11:17 +08:00
Madhura Jayaratne
414ac18e62 Remove redundant parameter 2011-08-12 13:32:43 +05:30
Aris Feryanto
3f10465d71 Fix merge conflict with origin/master 2011-08-12 15:56:26 +08:00
Aris Feryanto
fe7eadab72 Add configuration for maximum tbl_uiprefs records, as suggested by Piotr 2011-08-12 15:49:53 +08:00
Dieter Adriaenssens
45aac8dbf4 coding style 2011-08-11 21:37:36 +02:00
Ammar Yasir
57af6f9502 Merge remote branch 'phpmyadmin/master' 
Conflicts:
	js/tbl_select.js
 2011-08-12 00:10:17 +05:30
Tyron Madlener
278c55eb8b Fix: 2 typos 2011-08-11 19:38:25 +03:00
Madhura Jayaratne
7f94f8ea73 Wrap long lines 2011-08-11 21:21:19 +05:30
Madhura Jayaratne
ca0bf0be27 Fix coding style 2011-08-11 21:20:24 +05:30
Marc Delisle
7ead858d58 More typos 2011-08-11 09:14:01 -04:00
Michal Čihař
1e9568f133 Whitespace cleanup 2011-08-11 15:10:54 +02:00
Michal Čihař
05e3e69e83 Fix more typos 2011-08-11 15:10:29 +02:00
Marc Delisle
227e779d59 Typos 2011-08-11 09:05:51 -04:00
Michal Čihař
448d656010 Rather generate new url params, global does not always exist 2011-08-11 14:33:12 +02:00
Michal Čihař
249e7f99a2 Add default parameter value 2011-08-11 14:31:44 +02:00
Michal Čihař
3a034bd539 Whitespace cleanup 2011-08-11 14:31:35 +02:00
Michal Čihař
341b75a990 Implement translation for advisor rules 2011-08-11 13:57:01 +02:00
Michal Čihař
2b79b9534f Fix format string 2011-08-11 13:55:18 +02:00
Michal Čihař
f53800fb02 Merge remote-tracking branch 'tyron/master' 2011-08-11 13:35:37 +02:00
Michal Čihař
ad488d9d1c Factor out justification splitting 2011-08-11 11:56:55 +02:00
Tyron Madlener
66107c8dff Added a rule and notes about memcached as advised by Sheeri 2011-08-11 12:45:17 +03:00
Michal Čihař
0829162550 Merge remote-tracking branch 'tyron/master' into integration 
Conflicts:
	js/functions.js
 2011-08-11 11:25:18 +02:00
Michal Čihař
b36f2e3ca1 Merge remote-tracking branch 'origin/master' 2011-08-11 09:33:38 +02:00
Michal Čihař
d374feb967 Add context to another potentionally unclear message 2011-08-11 09:32:42 +02:00
Dieter Adriaenssens
e4bb7fdcdd fix description 2011-08-10 21:12:08 +02:00
Dieter Adriaenssens
fd383934af Merge branch 'QA_3_4' 2011-08-10 20:58:45 +02:00
Dieter Adriaenssens
556636457a Remove library PHPExcel, due to license issues 
Remove native Excel exportand import modules (xls and xlsx formats)
 2011-08-10 20:53:51 +02:00
Michal Čihař
fc1f74306a Avoid introducing new string to translate, this fits better 2011-08-10 16:17:18 +02:00
Michal Čihař
1dc8fb51b2 Drop not needed font mappings 2011-08-10 15:48:25 +02:00
Michal Čihař
20560bea49 Remove unused files 2011-08-10 15:43:50 +02:00
Michal Čihař
f71f2ab325 Do not include DejaVuSerif font as we do not use it 2011-08-10 15:43:50 +02:00
Marc Delisle
1c0cf460d1 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-08-10 09:38:50 -04:00
Michal Čihař
6f22b57eb5 Fix off-by-one and invalid page references 2011-08-10 15:38:01 +02:00
Michal Čihař
b2f0db3389 Fix download 2011-08-10 15:37:45 +02:00
Marc Delisle
9d28b4b1b0 Merge commit 'a9cd487f0f48ab9b070823545860f384cfb8a4e0' 2011-08-10 09:37:26 -04:00
Michal Čihař
fb5483e4f2 Do not mess with settings on download 2011-08-10 15:32:39 +02:00
Michal Čihař
b573a0d903 Factor out Download method 2011-08-10 15:31:22 +02:00
Michal Čihař
959abbc89c Sane handling of PDF rendering errors 
Will now display proper error page instead of adding errors to top of
PDF output (if any).
 2011-08-10 15:27:42 +02:00
Aris Feryanto
a9cd487f0f Fix merge conflict with origin/master 2011-08-10 21:27:31 +08:00
Michal Čihař
65faeba99f Avoid blindly uppercasing translated strings 2011-08-10 15:12:54 +02:00
Michal Čihař
febbd219aa Use getPageWidth and getPageHeight instead of won getW and getH 2011-08-10 15:10:43 +02:00
Michal Čihař
247a07fb6d Move alias code to generic PMA_PDF class 2011-08-10 15:09:22 +02:00
Michal Čihař
7667986c3a Make aliases work with current TCPDF which uses UTF16BE internally 2011-08-10 15:08:08 +02:00
Michal Čihař
0350930060 Remove unused getBuffer, also it is available upstream 2011-08-10 14:36:08 +02:00
Michal Čihař
7882f75085 Remove unused method 2011-08-10 14:35:28 +02:00
Michal Čihař
f6f133eb09 Avoid duplicating bookmark code from TCPDF, where it works 2011-08-10 14:33:03 +02:00
Michal Čihař
235e14d41e Indentaion 2011-08-10 14:29:36 +02:00
Michal Čihař
0d7d007995 Unify code for PDF footer 2011-08-10 14:29:22 +02:00
Michal Čihař
17cbe29592 Start base class for all PDF output 2011-08-10 14:24:22 +02:00
Michal Čihař
e9ea3b59a3 Fix typo 2011-08-10 14:12:36 +02:00
Michal Čihař
033a1b629f Remove TCPDF localisation 
We've never used it and we propagate phpMyAdmin's settings there now.
 2011-08-10 14:11:27 +02:00
Michal Čihař
c779d002ef Propagate localisation to TCPDF 2011-08-10 14:11:05 +02:00
Michal Čihař
3f81e8790d Remove useless space from messages 2011-08-10 13:44:39 +02:00
Michal Čihař
d48a7bc668 Another Start/End which might be confusing 2011-08-10 13:16:48 +02:00
Michal Čihař
c23696fbfa Another ocurence of Prev/Next 2011-08-10 13:14:21 +02:00
Michal Čihař
c8c9b7501c Use pgettext for Next/Prev as it is needed for some translations (eg. Chinese) 2011-08-10 13:09:31 +02:00
Michal Čihař
20b688f43f Update TCPDF to 5.9.108, remove not really needed files 2011-08-10 12:07:55 +02:00
Michal Čihař
13a00df54c Remove debugging code 2011-08-10 11:34:36 +02:00
Michal Čihař
79c5b6b0e2 Replace all possibly dangerous chars in filename of downloaded file 2011-08-10 10:57:44 +02:00
Michal Čihař
b36ef2f530 Need require_once because of test case 2011-08-10 10:41:15 +02:00
Tyron Madlener
19469fb44f added system_ memory variable 2011-08-10 11:26:07 +03:00
Michal Čihař
f1e2897da0 Return true on succsess 2011-08-10 10:04:17 +02:00
Rouslan Placella
64ae406cfd Do not fetch views instead of filtering them out, when generating the trigger editor 2011-08-09 22:40:40 +01:00
Rouslan Placella
f6982bae84 Triggers don't work with views 2011-08-09 16:41:28 +01:00
Rouslan Placella
cccc78a98e Unified some localised strings for routines, triggers and events. 2011-08-09 16:32:47 +01:00
Rouslan Placella
46d0ea701f Select current table in editor when adding a trigger 2011-08-09 16:29:05 +01:00
Tyron Madlener
82a1f9c033 addded PMA_AddJSCode() to load js code into the page header 2011-08-09 10:35:53 +03:00
Michal Čihař
db84b20052 Explain reason for escaping # after digging in git history 2011-08-09 08:53:56 +02:00
Michal Čihař
c61f87ae08 Remove unused variables 2011-08-09 08:36:01 +02:00
Michal Čihař
5558e10a3d Remove unused variables 2011-08-09 08:35:00 +02:00
Michal Čihař
159205458a Unused variable 2011-08-09 08:32:27 +02:00
Michal Čihař
3906320844 Unused variable 2011-08-09 07:37:24 +02:00
Michal Čihař
d6a0741cf8 Check for correct variable 2011-08-09 07:37:08 +02:00
Michal Čihař
f08d2ded46 Unused variable 2011-08-09 07:36:11 +02:00
Madhura Jayaratne
fa3e058e25 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-08-09 06:16:12 +05:30
Herman van Rink
c547703b10 Sanitize filenames before using in Content-Disposition header 2011-08-08 20:07:09 +02:00
Marc Delisle
630cdd9915 Missing docblock 2011-08-08 12:31:49 -04:00
Michal Čihař
9204ae8594 Adjust calling indentation 2011-08-08 17:55:20 +02:00
Michal Čihař
71f627307a This really should be private 2011-08-08 17:55:15 +02:00
Michal Čihař
96be56ea40 Adjust switch blocks to PEAR coding standards 2011-08-08 17:41:09 +02:00
Michal Čihař
90e7b75189 Fix indentation 2011-08-08 17:40:00 +02:00
Michal Čihař
9317162dcc Fix indentation 2011-08-08 17:39:19 +02:00
Michal Čihař
f7d85630ed Improve coding style 2011-08-08 17:38:26 +02:00
Michal Čihař
bc17e5eedd Fix indentation 2011-08-08 17:37:49 +02:00
Michal Čihař
617f6f5c24 Adjust switch blocks to PEAR coding standards 2011-08-08 17:36:16 +02:00
Michal Čihař
747ab57391 Adjust switch blocks to PEAR coding standards 2011-08-08 17:35:03 +02:00
Michal Čihař
ed1519ee76 Fix indentation of some code blocks 2011-08-08 17:33:10 +02:00
Michal Čihař
f5cdef3db8 No need to mention requirements 2011-08-08 17:17:34 +02:00
Michal Čihař
aceefcb23e Avoid three calls of same PMA_substr 2011-08-08 17:15:59 +02:00
Michal Čihař
2bfaa716bd Remove global variables 
These are used only once anyway and storing in variables looks like it
is configurable.
 2011-08-08 17:12:21 +02:00
Michal Čihař
3d29edba96 Remove no longer needed globals 2011-08-08 17:11:00 +02:00
Michal Čihař
3228a5b761 Avoid using GLOBALS referenced functions 
This actually makes performance because it needs extra lookup in
globals.
 2011-08-08 17:08:53 +02:00
Michal Čihař
53f9d89fbd Wrap some long lines 2011-08-08 16:59:31 +02:00
Michal Čihař
4a2cedf720 Adjust switch blocks to PEAR coding standards 2011-08-08 16:26:50 +02:00
Michal Čihař
4b61ccb92e Reintroduce trailing \n 2011-08-08 16:23:14 +02:00
Michal Čihař
3803a1cde4 Single call of strtr instead of three str_replace 2011-08-08 16:20:37 +02:00
Michal Čihař
3d621fd3af Simplify replace logic 2011-08-08 16:19:05 +02:00
Michal Čihař
5379b55691 Coding style 2011-08-08 16:17:48 +02:00
Michal Čihař
c722d0d696 Simplify escape functions usint strtr 2011-08-08 16:16:47 +02:00
Michal Čihař
323026c0ea Use strtr instead of str_replace and array_keys/values combo 2011-08-08 16:15:24 +02:00
Michal Čihař
fcf2a7be85 Improve coding style 2011-08-08 16:12:11 +02:00
Michal Čihař
fd5bf0e64e Avoid disambigution with Sun as a star 2011-08-08 15:59:46 +02:00
Tyron Madlener
d257c39339 Merge remote-tracking branch 'origin/master' 2011-08-08 16:58:35 +03:00
Michal Čihař
e35debd7b5 Proper placement of l10n comments 2011-08-08 15:50:43 +02:00
Michal Čihař
3f2ffbe297 Avoid defining link several times 2011-08-08 15:48:23 +02:00
Michal Čihař
1fae25710d Wrap long line 2011-08-08 15:46:37 +02:00
Michal Čihař
b9e17020b8 Whitespace cleanup 2011-08-08 15:46:18 +02:00
Michal Čihař
dae7d3bd4a Improve code readability 2011-08-08 15:46:05 +02:00
Michal Čihař
21afd17860 Wrap long line 2011-08-08 15:45:47 +02:00
Tyron Madlener
8cdfa37d46 Merge remote-tracking branch 'origin/master' 
Conflicts:
	js/functions.js
	js/server_status.js
	js/server_variables.js
	libraries/advisory_rules.txt
	server_status.php
 2011-08-08 16:35:10 +03:00
Michal Čihař
021e811653 Use standard way for passing messages 2011-08-08 15:23:20 +02:00
Michal Čihař
662c96494f Fix and simplify theme selection js 2011-08-08 14:33:58 +02:00
Marc Delisle
1fa702b45c Coding style 2011-08-08 08:27:10 -04:00
Tyron Madlener
bfdf28e24c Workaround too small value of suhosin.get.max_value_length 2011-08-08 08:25:20 -04:00
Michal Čihař
b57e186331 Drop another ocurence of inline js 2011-08-08 13:53:41 +02:00
Michal Čihař
8f618e6f01 Convert more occurences of inline autosubmit code to external js 2011-08-08 13:29:20 +02:00
Tyron Madlener
7e22620ec2 added mysql < 5.5.8 check 2011-08-08 14:13:50 +03:00
Michal Čihař
51b54c954c Replace inline javascript 2011-08-08 12:04:23 +02:00
Aris Feryanto
c13f3fda43 Fix error caused on previous merge conflict 2011-08-08 17:14:59 +08:00
Aris Feryanto
ca0aa169c0 Fix merge conflict with grid branch 2011-08-08 15:48:51 +08:00
Michal Čihař
2f9ca4de99 Merge branch 'edit-view' of git://github.com/csware/phpmyadmin into int 2011-08-08 09:44:19 +02:00
Aris Feryanto
7b3d0f0107 Fix bug - show/hide feature not working correctly (maybe caused by merge error in git) 2011-08-08 14:34:08 +08:00
Aris Feryanto
ba7913a260 Remove inline edit feature 2011-08-08 14:07:59 +08:00
Madhura Jayaratne
0e84927693 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 
Conflicts:
	libraries/common.lib.php
 2011-08-08 07:45:53 +05:30
Madhura Jayaratne
9c316b7b11 Reduce font size. Remove black from the color list 2011-08-08 07:37:21 +05:30
Madhura Jayaratne
acb6656961 Labels for each part in the geometry is not a good idea 2011-08-08 07:37:03 +05:30
Madhura Jayaratne
a1f2d5311a Abstract function definition to the PMA_GIS_Geometry class 2011-08-08 07:36:26 +05:30
Madhura Jayaratne
2f6a53f50d Labels for polygons and multipolygons 2011-08-08 07:36:12 +05:30
Madhura Jayaratne
2b749e30c5 Should verify that the point is not empty first 2011-08-08 07:35:52 +05:30
Madhura Jayaratne
218a2b561c Labels for linestrings and multilinestring exported to PNG and PDF 2011-08-08 07:35:33 +05:30
Madhura Jayaratne
1a16ba7cae Labels for points and multipoint exported to PDF 2011-08-08 07:35:18 +05:30
Madhura Jayaratne
2923f1cdb5 Labels for multipoints exported to PNG 2011-08-08 07:30:41 +05:30
Madhura Jayaratne
981cfeac2e Labels for exporting points as PNG 2011-08-08 07:30:21 +05:30
Madhura Jayaratne
e2d535cc56 Use $cfg['PDFDefaultPageSize'] when exporting to PDF 2011-08-08 07:29:30 +05:30
Sven Strickroth
fcb4986598 there is no create_time-status for views 
Signed-off-by: Sven Strickroth <email@cs-ware.de>
 2011-08-07 18:26:49 +05:30
Sven Strickroth
ed45a8e1f5 use i10n for error message 
Signed-off-by: Sven Strickroth <email@cs-ware.de>
 2011-08-07 18:26:27 +05:30
Ammar Yasir
33ad955596 Merge remote branch 'phpmyadmin/master' 2011-08-07 10:55:41 +05:30
Piotr Przybylski
64926ead73 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-06 13:10:25 +02:00
Piotr Przybylski
db29c02f7a Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/advisory_rules.txt
 2011-08-06 12:54:28 +02:00
Piotr Przybylski
7e749a5f43 Fix broken character 2011-08-06 12:50:20 +02:00
Dieter Adriaenssens
017c1ee960 fix typos 2011-08-06 12:24:17 +02:00
Piotr Przybylski
0219728929 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-05 22:48:03 +02:00
Piotr Przybylski
eb66564960 Fix typo 2011-08-05 22:44:06 +02:00
Piotr Przybylski
36e1af721e Server Synchronize: display semicolon after executed queries 2011-08-05 22:36:12 +02:00
Tyron Madlener
e6e7e893bd Fixed version checks better 2011-08-05 18:44:20 +03:00
Tyron Madlener
81d7a95f74 Fixed db version checks 2011-08-05 18:41:11 +03:00
Tyron Madlener
8906aab33f Advisor: Variable names redirect to the variable on the variables page 2011-08-05 18:18:18 +03:00
Piotr Przybylski
7f1fa1bab0 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	js/server_status.js
	libraries/database_interface.lib.php
	libraries/mysql_charsets.lib.php
 2011-08-05 17:17:47 +02:00
Piotr Przybylski
efa788d00d Synchronize: add missing arguments to a function, document possibly broken function 2011-08-05 17:12:46 +02:00
Piotr Przybylski
7a14dd6ba8 Fix file 2011-08-05 16:50:00 +02:00
Piotr Przybylski
092108bdee Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-08-05 16:47:14 +02:00