Permalink
Browse files

Check before commit!

  • Loading branch information...
1 parent f0780e3 commit fb9a3a598ee9b59ace10f5874c62f2cd1c77ccdb @nijel nijel committed Nov 17, 2006
Showing with 12,329 additions and 5,377 deletions.
  1. +126 −0 ChangeLog
  2. +30 −9 Documentation.html
  3. +2 −2 README
  4. +61 −60 config.sample.inc.php
  5. +6 −6 contrib/packaging/Fedora/phpMyAdmin.spec
  6. +0 −279 db_importdocsql.php
  7. +12 −25 db_operations.php
  8. +2 −1 error.php
  9. +9 −14 export.php
  10. +6 −4 import.php
  11. +34 −17 lang/afrikaans-iso-8859-1.inc.php
  12. +34 −17 lang/afrikaans-utf-8.inc.php
  13. +34 −17 lang/albanian-iso-8859-1.inc.php
  14. +34 −17 lang/albanian-utf-8.inc.php
  15. +34 −17 lang/arabic-utf-8.inc.php
  16. +34 −17 lang/arabic-windows-1256.inc.php
  17. +34 −17 lang/azerbaijani-iso-8859-9.inc.php
  18. +34 −17 lang/azerbaijani-utf-8.inc.php
  19. +34 −17 lang/basque-iso-8859-1.inc.php
  20. +34 −17 lang/basque-utf-8.inc.php
  21. +34 −17 lang/belarusian_cyrillic-utf-8.inc.php
  22. +34 −17 lang/belarusian_cyrillic-windows-1251.inc.php
  23. +34 −17 lang/belarusian_latin-utf-8.inc.php
  24. +34 −17 lang/bosnian-utf-8.inc.php
  25. +34 −17 lang/bosnian-windows-1250.inc.php
  26. +34 −17 lang/brazilian_portuguese-iso-8859-1.inc.php
  27. +34 −17 lang/brazilian_portuguese-utf-8.inc.php
  28. +34 −17 lang/bulgarian-koi8-r.inc.php
  29. +34 −17 lang/bulgarian-utf-8.inc.php
  30. +34 −17 lang/bulgarian-windows-1251.inc.php
  31. +34 −17 lang/catalan-iso-8859-1.inc.php
  32. +34 −17 lang/catalan-utf-8.inc.php
  33. +34 −17 lang/chinese_simplified-gb2312.inc.php
  34. +34 −17 lang/chinese_simplified-utf-8.inc.php
  35. +34 −17 lang/chinese_traditional-big5.inc.php
  36. +34 −17 lang/chinese_traditional-utf-8.inc.php
  37. +34 −17 lang/croatian-iso-8859-2.inc.php
  38. +34 −17 lang/croatian-utf-8.inc.php
  39. +34 −17 lang/croatian-windows-1250.inc.php
  40. +35 −18 lang/czech-iso-8859-2.inc.php
  41. +35 −18 lang/czech-utf-8.inc.php
  42. +35 −18 lang/czech-windows-1250.inc.php
  43. +34 −17 lang/danish-iso-8859-1.inc.php
  44. +34 −17 lang/danish-utf-8.inc.php
  45. +35 −18 lang/dutch-iso-8859-1.inc.php
  46. +35 −18 lang/dutch-iso-8859-15.inc.php
  47. +35 −18 lang/dutch-utf-8.inc.php
  48. +34 −17 lang/english-iso-8859-1.inc.php
  49. +34 −17 lang/english-iso-8859-15.inc.php
  50. +34 −17 lang/english-utf-8.inc.php
  51. +34 −17 lang/estonian-iso-8859-1.inc.php
  52. +34 −17 lang/estonian-utf-8.inc.php
  53. +34 −17 lang/finnish-iso-8859-1.inc.php
  54. +34 −17 lang/finnish-iso-8859-15.inc.php
  55. +34 −17 lang/finnish-utf-8.inc.php
  56. +34 −17 lang/french-iso-8859-1.inc.php
  57. +34 −17 lang/french-iso-8859-15.inc.php
  58. +34 −17 lang/french-utf-8.inc.php
  59. +34 −17 lang/galician-iso-8859-1.inc.php
  60. +34 −17 lang/galician-utf-8.inc.php
  61. +34 −17 lang/georgian-utf-8.inc.php
  62. +34 −17 lang/german-iso-8859-1.inc.php
  63. +34 −17 lang/german-iso-8859-15.inc.php
  64. +34 −17 lang/german-utf-8.inc.php
  65. +34 −17 lang/greek-iso-8859-7.inc.php
  66. +34 −17 lang/greek-utf-8.inc.php
  67. +34 −17 lang/hebrew-iso-8859-8-i.inc.php
  68. +34 −17 lang/hebrew-utf-8.inc.php
  69. +34 −17 lang/hindi-utf-8.inc.php
  70. +34 −17 lang/hungarian-iso-8859-2.inc.php
  71. +34 −17 lang/hungarian-utf-8.inc.php
  72. +34 −17 lang/indonesian-iso-8859-1.inc.php
  73. +34 −17 lang/indonesian-utf-8.inc.php
  74. +34 −17 lang/italian-iso-8859-1.inc.php
  75. +34 −17 lang/italian-iso-8859-15.inc.php
  76. +34 −17 lang/italian-utf-8.inc.php
  77. +34 −17 lang/japanese-euc.inc.php
  78. +38 −21 lang/japanese-sjis.inc.php
  79. +34 −17 lang/japanese-utf-8.inc.php
  80. +34 −17 lang/korean-euc-kr.inc.php
  81. +34 −17 lang/korean-utf-8.inc.php
  82. +34 −17 lang/latvian-utf-8.inc.php
  83. +34 −17 lang/latvian-windows-1257.inc.php
  84. +34 −17 lang/lithuanian-utf-8.inc.php
  85. +34 −17 lang/lithuanian-windows-1257.inc.php
  86. +34 −17 lang/malay-iso-8859-1.inc.php
  87. +34 −17 lang/malay-utf-8.inc.php
  88. +34 −17 lang/mongolian-utf-8.inc.php
  89. +34 −17 lang/norwegian-iso-8859-1.inc.php
  90. +34 −17 lang/norwegian-utf-8.inc.php
  91. +34 −17 lang/persian-utf-8.inc.php
  92. +34 −17 lang/persian-windows-1256.inc.php
  93. +34 −17 lang/polish-iso-8859-2.inc.php
  94. +34 −17 lang/polish-utf-8.inc.php
  95. +34 −17 lang/polish-windows-1250.inc.php
  96. +34 −17 lang/portuguese-iso-8859-1.inc.php
  97. +34 −17 lang/portuguese-iso-8859-15.inc.php
  98. +34 −17 lang/portuguese-utf-8.inc.php
  99. +34 −17 lang/romanian-iso-8859-1.inc.php
  100. +34 −17 lang/romanian-utf-8.inc.php
  101. +34 −17 lang/russian-cp-866.inc.php
  102. +34 −17 lang/russian-koi8-r.inc.php
  103. +34 −17 lang/russian-utf-8.inc.php
  104. +34 −17 lang/russian-windows-1251.inc.php
  105. +34 −17 lang/serbian_cyrillic-utf-8.inc.php
  106. +34 −17 lang/serbian_cyrillic-windows-1251.inc.php
  107. +34 −17 lang/serbian_latin-utf-8.inc.php
  108. +34 −17 lang/serbian_latin-windows-1250.inc.php
  109. +34 −17 lang/slovak-iso-8859-2.inc.php
  110. +34 −17 lang/slovak-utf-8.inc.php
  111. +34 −17 lang/slovak-windows-1250.inc.php
  112. +34 −17 lang/slovenian-iso-8859-2.inc.php
  113. +34 −17 lang/slovenian-utf-8.inc.php
  114. +34 −17 lang/slovenian-windows-1250.inc.php
  115. +34 −17 lang/spanish-iso-8859-1.inc.php
  116. +34 −17 lang/spanish-iso-8859-15.inc.php
  117. +34 −17 lang/spanish-utf-8.inc.php
  118. +34 −17 lang/swedish-iso-8859-1.inc.php
  119. +34 −17 lang/swedish-utf-8.inc.php
  120. +34 −17 lang/tatarish-iso-8859-9.inc.php
  121. +34 −17 lang/tatarish-utf-8.inc.php
  122. +34 −17 lang/thai-tis-620.inc.php
  123. +34 −17 lang/thai-utf-8.inc.php
  124. +34 −17 lang/turkish-iso-8859-9.inc.php
  125. +34 −17 lang/turkish-utf-8.inc.php
  126. +34 −17 lang/ukrainian-utf-8.inc.php
  127. +34 −17 lang/ukrainian-windows-1251.inc.php
  128. +41 −1 libraries/PMA_List_Database.class.php
  129. +11 −21 libraries/auth/cookie.auth.lib.php
  130. +38 −15 libraries/common.lib.php
  131. +5 −3 libraries/config.default.php
  132. +0 −1 libraries/database_interface.lib.php
  133. +23 −4 libraries/db_links.inc.php
  134. +6 −0 libraries/db_table_exists.lib.php
  135. +12 −1 libraries/dbi/mysql.dbi.lib.php
  136. +11 −1 libraries/dbi/mysqli.dbi.lib.php
  137. +3 −0 libraries/display_tbl.lib.php
  138. +13 −18 libraries/export/pdf.php
  139. +0 −3 libraries/fpdf/README
  140. BIN libraries/fpdf/font/FreeSans.ctg.z
  141. +0 −150 libraries/fpdf/font/FreeSans.php
  142. BIN libraries/fpdf/font/FreeSans.z
  143. BIN libraries/fpdf/font/FreeSansBold.ctg.z
  144. +0 −79 libraries/fpdf/font/FreeSansBold.php
  145. BIN libraries/fpdf/font/FreeSansBold.z
  146. +0 −8 libraries/fpdf/font/courier.php
  147. +0 −16 libraries/fpdf/font/helvetica.php
  148. +0 −16 libraries/fpdf/font/helveticab.php
  149. +0 −16 libraries/fpdf/font/helveticabi.php
  150. +0 −16 libraries/fpdf/font/helveticai.php
  151. +0 −16 libraries/fpdf/font/symbol.php
  152. +0 −23 libraries/fpdf/font/tahoma.php
  153. +0 −23 libraries/fpdf/font/tahomab.php
  154. +0 −16 libraries/fpdf/font/times.php
  155. +0 −16 libraries/fpdf/font/timesb.php
  156. +0 −16 libraries/fpdf/font/timesbi.php
  157. +0 −16 libraries/fpdf/font/timesi.php
  158. +0 −16 libraries/fpdf/font/zapfdingbats.php
  159. +0 −1,629 libraries/fpdf/fpdf.php
  160. +0 −483 libraries/fpdf/ufpdf.php
  161. +7 −2 libraries/import.lib.php
  162. +3 −3 libraries/import/README
  163. +2 −2 libraries/import/csv.php
  164. +77 −0 libraries/import/docsql.php
  165. +1 −5 libraries/mcrypt.lib.php
  166. +0 −205 libraries/read_dump.lib.php
  167. +20 −4 libraries/relation.lib.php
  168. +2 −3 libraries/session.inc.php
  169. +3 −1 libraries/sqlparser.data.php
  170. +18 −15 libraries/tbl_links.inc.php
  171. +2 −2 libraries/tbl_properties.inc.php
  172. +87 −0 libraries/tcpdf/CHANGELOG
  173. +504 −0 libraries/tcpdf/LICENSE
  174. +61 −0 libraries/tcpdf/README
  175. +98 −0 libraries/tcpdf/font/LICENSE
  176. +4 −0 libraries/tcpdf/font/README
  177. BIN libraries/tcpdf/font/dejavusans-bold.ctg.z
  178. +254 −0 libraries/tcpdf/font/dejavusans-bold.php
  179. BIN libraries/tcpdf/font/dejavusans-bold.z
  180. BIN libraries/tcpdf/font/dejavusans.ctg.z
  181. +254 −0 libraries/tcpdf/font/dejavusans.php
  182. BIN libraries/tcpdf/font/dejavusans.z
  183. BIN libraries/tcpdf/font/dejavuserif-bold.ctg.z
  184. +128 −0 libraries/tcpdf/font/dejavuserif-bold.php
  185. BIN libraries/tcpdf/font/dejavuserif-bold.z
  186. BIN libraries/tcpdf/font/dejavuserif.ctg.z
  187. +128 −0 libraries/tcpdf/font/dejavuserif.php
  188. BIN libraries/tcpdf/font/dejavuserif.z
  189. +309 −0 libraries/tcpdf/html_entity_decode_php4.php
  190. +4,138 −0 libraries/tcpdf/tcpdf.php
  191. +11 −6 libraries/transformations.lib.php
  192. +13 −4 libraries/transformations/application_octetstream__download.inc.php
  193. +18 −14 navigation.php
  194. +13 −30 pdf_schema.php
  195. BIN pmd/images/2leftarrow.png
  196. BIN pmd/images/2leftarrow_m.png
  197. BIN pmd/images/2rightarrow.png
  198. BIN pmd/images/2rightarrow_m.png
  199. BIN pmd/images/bord.png
  200. BIN pmd/images/bottom.png
  201. BIN pmd/images/connect.png
  202. BIN pmd/images/def.png
  203. BIN pmd/images/del_pdd.png
  204. BIN pmd/images/dell.png
  205. BIN pmd/images/downarrow1.png
  206. BIN pmd/images/downarrow2.png
  207. BIN pmd/images/downarrow2_m.png
  208. BIN pmd/images/exec.png
  209. BIN pmd/images/exec_small.png
  210. BIN pmd/images/favicon.ico
  211. BIN pmd/images/gohome.png
  212. BIN pmd/images/help.png
  213. BIN pmd/images/help_relation.png
  214. BIN pmd/images/link.png
  215. BIN pmd/images/link2.png
  216. BIN pmd/images/pdf.png
  217. BIN pmd/images/relation.png
  218. BIN pmd/images/reload.png
  219. BIN pmd/images/resize.png
  220. BIN pmd/images/rightarrow1.png
  221. BIN pmd/images/rightarrow2.png
  222. BIN pmd/images/save.png
  223. BIN pmd/images/table.png
  224. BIN pmd/images/uparrow2_m.png
  225. +117 −0 pmd/scripts/ajax.js
  226. +626 −0 pmd/scripts/move.js
  227. BIN pmd/styles/default/images/1.png
  228. BIN pmd/styles/default/images/2.png
  229. BIN pmd/styles/default/images/3.png
  230. BIN pmd/styles/default/images/4.png
  231. BIN pmd/styles/default/images/5.png
  232. BIN pmd/styles/default/images/6.png
  233. BIN pmd/styles/default/images/7.png
  234. BIN pmd/styles/default/images/8.png
  235. BIN pmd/styles/default/images/FieldKey_small.png
  236. BIN pmd/styles/default/images/Field_small.png
  237. BIN pmd/styles/default/images/Header.png
  238. BIN pmd/styles/default/images/Header_Linked.png
  239. BIN pmd/styles/default/images/left_panel_butt.png
  240. BIN pmd/styles/default/images/left_panel_tab.png
  241. BIN pmd/styles/default/images/small_tab.png
  242. BIN pmd/styles/default/images/top_panel.png
  243. +114 −0 pmd/styles/default/style1.css
  244. +6 −0 pmd_config.php
  245. +271 −0 pmd_general.php
  246. +181 −0 pmd_get_info.php
  247. +22 −0 pmd_help.php
  248. +91 −0 pmd_pdf.php
  249. +84 −0 pmd_relation_new.php
  250. +48 −0 pmd_relation_upd.php
  251. +45 −0 pmd_save_pos.php
  252. +14 −0 pmd_session.php
  253. +1 −1 readme.php
  254. +29 −11 scripts/create_tables_mysql_4_1_2+.sql
  255. +64 −30 scripts/setup.php
  256. +15 −2 server_status.php
  257. +7 −1 sql.php
  258. +2 −2 tbl_change.php
  259. +2 −2 tbl_move_copy.php
  260. +4 −4 tbl_operations.php
  261. +1 −0 themes/darkblue_orange/css/theme_right.css.php
  262. +23 −0 themes/original/css/theme_left.css.php
  263. +1 −0 themes/original/css/theme_right.css.php
  264. +1 −6 user_password.php
View
126 ChangeLog
@@ -5,6 +5,132 @@ phpMyAdmin - ChangeLog
$Id$
$HeadURL$
+2006-11-17 Michal Čihař <michal@cihar.com>
+ * sql.php, libraries/display_tbl.lib.php: Force pos to be integer to avoid
+ XSS.
+
+2006-11-16 Marc Delisle <lem9@users.sourceforge.net>
+ * pmd_pdf.php: export coordinates to PDF page even if the tables
+ were not defined on this PDF page
+
+2006-11-13 Marc Delisle <lem9@users.sourceforge.net>
+ * libraries/relation.lib.php: verify the presence of designer_coords
+
+2006-11-13 Michal Čihař <michal@cihar.com>
+ * server_status.php: Check for divison by zero (bug #1594460).
+ * db_operations.php: Change information about not configured pmadb to
+ notice (bug #1589294).
+ * scripts/setup.php: Configure also designer table.
+
+2006-11-12 Marc Delisle <lem9@users.sourceforge.net>
+ * pmd_get_info.php: avoid error if no index defined for a table
+
+2006-11-11 Michal Čihař <michal@cihar.com>
+ * lang/czech: Update.
+
+2006-11-11 Marc Delisle <lem9@users.sourceforge.net>
+ * pmd_general.php, pmd_get_info.php, pmd/scripts/move.js, lang/*:
+ in InnoDB, it's allowed to create a relation even if it's not on
+ a primary key, so display the InnoDB-related options (ON UPDATE,
+ ON CASCADE)
+
+2006-11-10 Michal Čihař <michal@cihar.com>
+ * lang/czech: Translate designer.
+ * config.sample.inc.php: Comment out pmadb and controluser to avoid
+ confusion when they are not properly created.
+
+2006-11-09 Marc Delisle <lem9@users.sourceforge.net>
+ ### 2.9.1 released from MAINT_2_9_1
+
+2006-11-07 Michal Čihař <michal@cihar.com>
+ * lang/czech: Translate designer.
+
+2006-11-07 Marc Delisle <lem9@users.sourceforge.net>
+ * (many files) new Designer feature, thanks to Ivan A Kirillov
+
+2006-11-03 Michal Čihař <michal@cihar.com>
+ * config.sample.inc.php: Make it use CRLF to make Windows users happy.
+
+2006-11-02 Michal Čihař <michal@cihar.com>
+ * Documentation.html: Mention problems with Hardened-PHP.
+ * user_password.php, tbl_move_copy.php, export.php,
+ libraries/session.inc.php, libraries/mcrypt.lib.php,
+ libraries/auth/cookie.auth.lib.php: Use PMA_{set,remove}Cookie functions
+ instead of PHP ones (no need to define params on all places).
+ * libraries/common.lib.php, libraries/session.inc.php: Make all cookies
+ httponly as default - this protects them from usage in javascript in
+ modern browsers (RFE #1586078).
+ * pdf_schema.php, contrib/packaging/Fedora/phpMyAdmin.spec,
+ libraries/export/pdf.php, libraries/fpdf, libraries/tcpdf: Switch to
+ TCPDF for PDF generating (RFE #1501452).
+ * readme.php, README: Make README utf-8.
+ * Documentation.html, libraries/dbi/mysqli.dbi.lib.php,
+ libraries/dbi/mysql.dbi.lib.php, libraries/config.default.php: Add
+ support for SSL connections (based on patch #1588882).
+ * libraries/sqlparser.data.php: Add support for XML manipulating functions
+ - UpdateXML and ExtractValue (RFE #1532712).
+ * scripts/setup.php: Make end of line in generated file configurable (RFE
+ #1493897).
+ * server_status.php: Calculate key read/write ration (RFE #1466287).
+ * Documentation.html, navigation.php,
+ themes/original/css/theme_left.css.php,
+ libraries/PMA_List_Database.class.php, libraries/config.default.php:
+ Optional display of databases in navigation frame as list instead of
+ dropdown (RFE #1435922).
+ * scripts/setup.php: Configuration for list/drop down choice.
+ * tbl_change.php: Automatically edit text in textarea if it contains new
+ lines (RFE #1224791).
+ * lang/dutch: Fix typo, thanks to Thijs Kinkhorst - kink.
+
+2006-10-27 Marc Delisle <lem9@users.sourceforge.net>
+ * libraries/fpdf/font: replace broken binary files
+
+2006-10-27 Michal Čihař <michal@cihar.com>
+ * export.php: Define $tables on correct place (bug #1585374).
+ * import.php: Do not load header to soon to avoid reading table stats
+ before query gets executed (bug #1441833).
+ * libraries/tbl_links.inc.php, libraries/db_links.inc.php,
+ libraries/common.lib.php, lang/*,
+ themes/darkblue_orange/css/theme_right.css.php,
+ themes/original/css/theme_right.css.php: Do not disable tabs for empty
+ tables/databases, only make them look different (RFE #1584296).
+ * libraries/common.lib.php: Show messages in notice div to make them look
+ better and more visible.
+ * sql.php, lang/*: Better message when showing as PHP code.
+ * libraries/common.lib.php: Add missing quotes.
+ * import.php, libraries/db_common.inc.php: Avoid query execution when
+ showing PHP code (bug #1567314).
+ * sql.php, libraries/common.lib.php, lang/*: Correct behaviour when
+ switching from PHP to SQL display mode (no execution of query).
+
+2006-10-26 Marc Delisle <lem9@users.sourceforge.net>
+ * error.php, libraries/common.lib.php, /database_interface.lib.php,
+ /session.inc.php: force utf-8 charset to avoid XSS with crafted URL
+ and utf-7 in charset; error messages won't display correctly if
+ the chosen lang is not utf-8
+
+2006-10-26 Michal Čihař <michal@cihar.com>
+ * libraries/import/csv.php: Fix wrong import when ;; is at buffer boundary
+ (bug #1584836).
+ * tbl_operations.php: Fix duplicate ID for checkbox (bug #1584770).
+ * libraries/import/README: Fix example import plugin to match current
+ state.
+ * libraries/import.lib.php: Add support for running queries as control
+ user.
+ * db_importdocsql.php, Documentation.html, scripts/setup.php,
+ db_operations.php, libraries/read_dump.lib.php,
+ libraries/import/docsql.php, libraries/config.default.php, lang/*:
+ Convert DocSQL import to import plugin, remove not needed messages and
+ files it used.
+ * lang/*: Remove profiling messages as profiling extension has been
+ dropped some time ago.
+ * libraries/common.lib.php: pma_convcharset never existed :-).
+ * libraries/tbl_properties.inc.php: Check form only when saving table
+ fields (bug #1566222).
+ * libraries/transformations.lib.php: Improve options parser.
+ * libraries/transformations/application_octetstream__download.inc.php:
+ Again accept column name (bug #1562864).
+
2006-10-25 Michal Čihař <michal@cihar.com>
* Documentation.html, libraries/tbl_properties.inc.php,
libraries/config.default.php: Allow to edit small number of fields
View
@@ -598,6 +598,10 @@ <h2 id="config">Configuration</h2>
<tt>mysql</tt> command&#8211;line client, issue the <tt>status</tt> command.
Among the resulting information displayed will be the socket used.</dd>
+ <dt id="cfg_Servers_ssl">$cfg['Servers'][$i]['ssl'] boolean</dt>
+ <dd>Whether to enable SSL for connection to MySQL server.
+ </dd>
+
<dt id="cfg_Servers_connect_type">$cfg['Servers'][$i]['connect_type'] string</dt>
<dd>What type connection to use with the MySQL server. Your options are
<tt>'socket'</tt> and <tt>'tcp'</tt>. It defaults to 'tcp' as that
@@ -947,6 +951,22 @@ <h2 id="config">Configuration</h2>
</ul>
</dd>
+ <dt id="designer_coords">
+ <span id="cfg_Servers_designer_coords">$cfg['Servers'][$i]['designer_coords']</span> string
+ </dt>
+ <dd>Since release 2.10.0 a Designer interface is available; it permits
+ to visually manage the relations.
+ <br /><br />
+
+ To allow the usage of this functionality:
+
+ <ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables
+ infrastructure</li>
+ <li>put the table name in <tt>$cfg['Servers'][$i]['designer_coords']</tt>
+ </li>
+ </ul>
+ </dd>
+
<dt><span id="cfg_Servers_verbose_check">$cfg['Servers'][$i]['verbose_check']</span> boolean
</dt>
<dd>Because release 2.5.0 introduced the new MIME-transformation support, the
@@ -1197,6 +1217,9 @@ <h2 id="config">Configuration</h2>
<dt id="cfg_DisplayServersList">$cfg['DisplayServersList'] boolean</dt>
<dd>Defines whether to display this server choice as links instead of in a drop-down.
Defaults to FALSE (drop-down).</dd>
+ <dt id="cfg_DisplayDatabasesList">$cfg['DisplayDatabasesList'] boolean</dt>
+ <dd>Defines whether to display database choice in light navigation frame as links
+ instead of in a drop-down. Defaults to FALSE (drop-down).</dd>
<dt id="cfg_ShowStats">$cfg['ShowStats'] boolean</dt>
<dd>Defines whether or not to display space usage and statistics about databases
and tables.<br />
@@ -1605,15 +1628,6 @@ <h2 id="config">Configuration</h2>
alternatives.
</dd>
- <dt id="cfg_docSQLDir">$cfg['docSQLDir'] string</dt>
- <dd>
- The name of the directory where docSQL files can be uploaded for
- import into phpMyAdmin.
- <br /><br />
- Please note that if PHP is running in safe mode, this directory must
- be owned by the same user as the owner of the phpMyAdmin scripts.
- </dd>
-
<dt id="cfg_SaveDir">$cfg['SaveDir'] string</dt>
<dd>
The name of the directory where dumps can be saved.<br /><br />
@@ -2855,6 +2869,10 @@ <h4 id="faqmissingparameters">
<li>In the <tt>php.ini</tt> directive <tt>arg_separator.input</tt>, a value
of &quot;;&quot; will cause this error. Replace it with &quot;&amp;;&quot;.
</li>
+ <li>If you are using <a href="http://www.hardened-php.net/">Hardened-PHP</a>,
+ you might want to increase
+ <a href="http://www.hardened-php.net/hphp/troubleshooting.html">request limits</a>.
+ </li>
</ul>
<h3 id="faqlimitations">Known limitations</h3>
@@ -4024,6 +4042,9 @@ <h2 id="credits">Credits</h2>
* interface improvements
* various bugfixes
+- Ivan A Kirillov
+ * new relations Designer
+
And also to the following people who have contributed minor changes,
enhancements, bugfixes or support for a new language since version 2.1.0:
View
4 README
@@ -11,10 +11,10 @@ phpMyAdmin - Readme
Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com>
Copyright (C) 2001-2006 Marc Delisle <DelislMa_at_CollegeSherbrooke.qc.ca>
- Olivier M�ller <om_at_omnis.ch>
+ Olivier Müller <om_at_omnis.ch>
Robin Johnson <robbat2_at_users.sourceforge.net>
Alexander M. Turek <me_at_derrabus.de>
- Michal Cihar <michal_at_cihar.com>
+ Michal Čihař <michal_at_cihar.com>
Garvin Hicking <me_at_supergarv.de>
Michael Keck <mkkeck_at_users.sourceforge.net>
Sebastian Mendel <cybot_tm_at_users.sourceforge.net>
View
@@ -1,60 +1,61 @@
-<?php
-
-/* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
-
-/**
- * phpMyAdmin sample configuration, you can use it as base for
- * manual configuration. For easier setup you can use scripts/setup.php
- *
- * All directives are explained in Documentation.html and on phpMyAdmin
- * wiki <http://wiki.cihar.com>.
- */
-
-/*
- * This is needed for cookie based authentication to encrypt password in
- * cookie
- */
-$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
-
-/*
- * Servers configuration
- */
-$i = 0;
-
-/*
- * First server
- */
-$i++;
-/* Authentication type */
-$cfg['Servers'][$i]['auth_type'] = 'cookie';
-/* Server parameters */
-$cfg['Servers'][$i]['host'] = 'localhost';
-$cfg['Servers'][$i]['connect_type'] = 'tcp';
-$cfg['Servers'][$i]['compress'] = false;
-/* Select mysqli if your server has it */
-$cfg['Servers'][$i]['extension'] = 'mysql';
-/* User for advanced features */
-$cfg['Servers'][$i]['controluser'] = 'pmausr';
-$cfg['Servers'][$i]['controlpass'] = 'pmapass';
-/* Advanced phpMyAdmin features */
-$cfg['Servers'][$i]['pmadb'] = 'phpmyadmin';
-$cfg['Servers'][$i]['bookmarktable'] = 'pma_bookmark';
-$cfg['Servers'][$i]['relation'] = 'pma_relation';
-$cfg['Servers'][$i]['table_info'] = 'pma_table_info';
-$cfg['Servers'][$i]['table_coords'] = 'pma_table_coords';
-$cfg['Servers'][$i]['pdf_pages'] = 'pma_pdf_pages';
-$cfg['Servers'][$i]['column_info'] = 'pma_column_info';
-$cfg['Servers'][$i]['history'] = 'pma_history';
-
-/*
- * End of servers configuration
- */
-
-/*
- * Directories for saving/loading files from server
- */
-$cfg['UploadDir'] = '';
-$cfg['SaveDir'] = '';
-
-?>
+<?php
+
+/* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
+
+/**
+ * phpMyAdmin sample configuration, you can use it as base for
+ * manual configuration. For easier setup you can use scripts/setup.php
+ *
+ * All directives are explained in Documentation.html and on phpMyAdmin
+ * wiki <http://wiki.cihar.com>.
+ */
+
+/*
+ * This is needed for cookie based authentication to encrypt password in
+ * cookie
+ */
+$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
+
+/*
+ * Servers configuration
+ */
+$i = 0;
+
+/*
+ * First server
+ */
+$i++;
+/* Authentication type */
+$cfg['Servers'][$i]['auth_type'] = 'cookie';
+/* Server parameters */
+$cfg['Servers'][$i]['host'] = 'localhost';
+$cfg['Servers'][$i]['connect_type'] = 'tcp';
+$cfg['Servers'][$i]['compress'] = false;
+/* Select mysqli if your server has it */
+$cfg['Servers'][$i]['extension'] = 'mysql';
+/* User for advanced features */
+// $cfg['Servers'][$i]['controluser'] = 'pma';
+// $cfg['Servers'][$i]['controlpass'] = 'pmapass';
+/* Advanced phpMyAdmin features */
+// $cfg['Servers'][$i]['pmadb'] = 'phpmyadmin';
+// $cfg['Servers'][$i]['bookmarktable'] = 'pma_bookmark';
+// $cfg['Servers'][$i]['relation'] = 'pma_relation';
+// $cfg['Servers'][$i]['table_info'] = 'pma_table_info';
+// $cfg['Servers'][$i]['table_coords'] = 'pma_table_coords';
+// $cfg['Servers'][$i]['pdf_pages'] = 'pma_pdf_pages';
+// $cfg['Servers'][$i]['column_info'] = 'pma_column_info';
+// $cfg['Servers'][$i]['history'] = 'pma_history';
+// $cfg['Servers'][$i]['designer_coords'] = 'pma_designer_coords';
+
+/*
+ * End of servers configuration
+ */
+
+/*
+ * Directories for saving/loading files from server
+ */
+$cfg['UploadDir'] = '';
+$cfg['SaveDir'] = '';
+
+?>
@@ -53,9 +53,9 @@ manual. Currently phpMyAdmin can:
install -d "${RPM_BUILD_ROOT}%{_myadminpath}"/{css,js,lang,libraries,themes}
install -d "${RPM_BUILD_ROOT}%{_myadminpath}"/libraries/{auth,dbg,dbi,engines}
-install -d "${RPM_BUILD_ROOT}%{_myadminpath}"/libraries/{export,fpdf,import}
+install -d "${RPM_BUILD_ROOT}%{_myadminpath}"/libraries/{export,tcpdf,import}
install -d "${RPM_BUILD_ROOT}%{_myadminpath}"/libraries/transformations
-install -d "${RPM_BUILD_ROOT}%{_myadminpath}"/libraries/fpdf/font
+install -d "${RPM_BUILD_ROOT}%{_myadminpath}"/libraries/tcpdf/font
install -d "${RPM_BUILD_ROOT}%{_myadminpath}"/themes/{darkblue_orange,original}
install -d "${RPM_BUILD_ROOT}%{_myadminpath}"/themes/darkblue_orange/{css,img}
install -d "${RPM_BUILD_ROOT}%{_myadminpath}"/themes/original/{css,img}
@@ -78,9 +78,9 @@ install libraries/engines/*.php \
"${RPM_BUILD_ROOT}%{_myadminpath}/libraries/engines"/
install libraries/export/*.php \
"${RPM_BUILD_ROOT}%{_myadminpath}/libraries/export"/
-install libraries/fpdf/*.php "${RPM_BUILD_ROOT}%{_myadminpath}/libraries/fpdf"/
-install libraries/fpdf/font/*.{php,z} \
- "${RPM_BUILD_ROOT}%{_myadminpath}/libraries/fpdf/font"/
+install libraries/tcpdf/*.php "${RPM_BUILD_ROOT}%{_myadminpath}/libraries/tcpdf"/
+install libraries/tcpdf/font/*.{php,z} \
+ "${RPM_BUILD_ROOT}%{_myadminpath}/libraries/tcpdf/font"/
install libraries/import/*.php \
"${RPM_BUILD_ROOT}%{_myadminpath}/libraries/import"/
install libraries/transformations/*.php \
@@ -113,7 +113,7 @@ install Documentation.* docs.css "${DOCROOT}"/
install translators.html "${DOCROOT}"/
install lang/*.sh "${DOCROOT}"/lang/
install scripts/* "${DOCROOT}"/scripts/
-install libraries/fpdf/README "${DOCROOT}"/README.fpdf
+install libraries/tcpdf/README "${DOCROOT}"/README.tcpdf
install libraries/import/README "${DOCROOT}"/README.import
install libraries/transformations/README "${DOCROOT}"/transformations/
install libraries/transformations/TEMPLATE* "${DOCROOT}"/transformations/
Oops, something went wrong.

0 comments on commit fb9a3a5

Please sign in to comment.