Fixes for CVE-2014-4348 and CVE-2014-4349 backported from 4.2.4,
comments ? ok ?
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/phpmyadmin/Makefile,v
retrieving revision 1.98
diff -u -p -u -p -r1.98 Makefile
--- Makefile 14 Feb 2014 10:02:52 -0000 1.98
+++ Makefile 26 Jun 2014 10:03:28 -0000
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.98 2014/02/14 10:02:52 giovanni Exp $
+# $OpenBSD: Makefile,v 1.104 2014/06/13 17:01:36 giovanni Exp $
COMMENT= tool to handle the administration of MySQL over the web
-V= 4.1.6
-REVISION= 0
+V= 4.2.2
PKGNAME= phpMyAdmin-$V
DISTNAME= phpMyAdmin-$V-all-languages
@@ -35,6 +34,7 @@ post-extract:
${WRKSRC}/examples/phpMyAdmin-httpd.conf
do-install:
+ @find ${WRKSRC} -type f -name "*.orig" -exec rm -f {} \;
${INSTALL_DATA_DIR} ${INSTDIR}/
cd ${WRKSRC}; pax -rw ./ ${INSTDIR}/
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/phpmyadmin/distinfo,v
retrieving revision 1.84
diff -u -p -u -p -r1.84 distinfo
--- distinfo 27 Jan 2014 14:20:01 -0000 1.84
+++ distinfo 26 Jun 2014 10:03:28 -0000
@@ -1,2 +1,2 @@
-SHA256 (phpMyAdmin-4.1.6-all-languages.tar.gz) = Iuq39pzeiYcrKZd4w9DygHgTn1VTMXRPVZHY1rOXLlQ=
-SIZE (phpMyAdmin-4.1.6-all-languages.tar.gz) = 8063188
+SHA256 (phpMyAdmin-4.2.2-all-languages.tar.gz) = sn5nEptYo3HLIrCX/aYzT9JaWS0QKfxbPkD92FNaSEU=
+SIZE (phpMyAdmin-4.2.2-all-languages.tar.gz) = 8589833
Index: patches/patch-js_error_report_js
===================================================================
RCS file: patches/patch-js_error_report_js
diff -N patches/patch-js_error_report_js
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-js_error_report_js 26 Jun 2014 10:03:28 -0000
@@ -0,0 +1,15 @@
+$OpenBSD: patch-js_error_report_js,v 1.1 2014/06/13 17:01:36 giovanni Exp $
+Error "token mismatch" when a new user is created on a remote
+database.
+http://sourceforge.net/p/phpmyadmin/bugs/3893/
+
+--- js/error_report.js.orig Fri Jun 13 17:45:51 2014
++++ js/error_report.js Fri Jun 13 17:47:18 2014
+@@ -21,6 +21,7 @@ var ErrorReport = {
+ ErrorReport._last_exception = exception;
+ $.get("error_report.php", {
+ ajax_request: true,
++ server: PMA_commonParams.get('server'),
+ token: PMA_commonParams.get('token'),
+ get_settings: true
+ }, function (data) {
Index: patches/patch-js_server_privileges_js
===================================================================
RCS file: patches/patch-js_server_privileges_js
diff -N patches/patch-js_server_privileges_js
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-js_server_privileges_js 26 Jun 2014 10:03:28 -0000
@@ -0,0 +1,15 @@
+$OpenBSD: patch-js_server_privileges_js,v 1.1 2014/06/13 17:01:36 giovanni Exp $
+Error "token mismatch" when a new user is created on a remote
+database.
+http://sourceforge.net/p/phpmyadmin/bugs/3893/
+
+--- js/server_privileges.js.orig Fri Jun 13 17:45:36 2014
++++ js/server_privileges.js Fri Jun 13 17:46:48 2014
+@@ -192,6 +192,7 @@ AJAX.registerOnload('server_privileges.js', function (
+ var href = $("form[name='usersForm']").attr('action');
+ var params = {
+ 'ajax_request' : true,
++ 'server' : PMA_commonParams.get('server'),
+ 'token' : PMA_commonParams.get('token'),
+ 'validate_username' : true,
+ 'username' : username
Index: patches/patch-libraries_RecentFavoriteTable_class_php
===================================================================
RCS file: patches/patch-libraries_RecentFavoriteTable_class_php
diff -N patches/patch-libraries_RecentFavoriteTable_class_php
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libraries_RecentFavoriteTable_class_php 26 Jun 2014 10:03:28 -0000
@@ -0,0 +1,66 @@
+$OpenBSD$
+--- libraries/RecentFavoriteTable.class.php.orig Thu Jun 26 11:22:05 2014
++++ libraries/RecentFavoriteTable.class.php Thu Jun 26 11:30:44 2014
+@@ -203,36 +203,46 @@ class PMA_RecentFavoriteTable
+ if ($this->_tableType == 'recent') {
+ foreach ($this->_tables as $table) {
+ $html .= '<li class="warp_link">';
+- $html .= '<a href="sql.php?server=' . $GLOBALS['server']
+- . '&db=' . $table['db']
+- . '&table=' . $table['table']
+- . '&token=' . $_SESSION[' PMA_token ']
+- . '">`' . $table['db'] . '`.`' . $table['table'] . '`</a>';
++ $recent_params = array(
++ 'db' => $table['db'],
++ 'table' => $table['table']
++ );
++ $recent_url = 'sql.php'
++ . PMA_URL_getCommon($recent_params);
++ $html .= '<a href="' . $recent_url . '">`
++ . htmlspecialchars($table['db']) . '`.`'
++ . htmlspecialchars($table['table']) . '`</a>';
+ $html .= '</li>';
+ }
+ } else {
+ foreach ($this->_tables as $table) {
+ $html .= '<li class="warp_link">';
+
+- $html .= '<a class="ajax favorite_table_anchor"';
+- $fav_params = array('db' => $table['db'],
+- 'ajax_request' => true,
+- 'favorite_table' => $table['table'],
+- 'remove_favorite' => true);
++ $html .= '<a class="ajax favorite_table_anchor" ';
++ $fav_params = array(
++ 'db' => $table['db'],
++ 'ajax_request' => true,
++ 'favorite_table' => $table['table'],
++ 'remove_favorite' => true
++ );
+ $fav_rm_url = 'db_structure.php'
+ . PMA_URL_getCommon($fav_params);
+ $html .= 'href="' . $fav_rm_url
+ . '" title="' . __("Remove from Favorites")
+- . '" data-favtargetn="' . $table['db'] . "." . $table['table']
++ . '" data-favtargetn="' . md5($table['db'] . "." . $table['table'])
+ . '" >'
+ . PMA_Util::getIcon('b_favorite.png')
+ . '</a>';
+
+- $html .= '<a href="sql.php?server=' . $GLOBALS['server']
+- . '&db=' . $table['db']
+- . '&table=' . $table['table']
+- . '&token=' . $_SESSION[' PMA_token ']
+- . '">`' . $table['db'] . '`.`' . $table['table'] . '`</a>';
++ $fav_params = array(
++ 'db' => $table['db'],
++ 'table' => $table['table']
++ );
++ $table_url = 'sql.php'
++ . PMA_URL_getCommon($fav_params);
++ $html .= '<a href="' . $table_url . '">`'
++ . htmlspecialchars($table['db']) . '`.`'
++ . htmlspecialchars($table['table']) . '`</a>';
+ $html .= '</li>';
+ }
+ }
Index: patches/patch-libraries_navigation_Navigation_class_php
===================================================================
RCS file: patches/patch-libraries_navigation_Navigation_class_php
diff -N patches/patch-libraries_navigation_Navigation_class_php
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libraries_navigation_Navigation_class_php 26 Jun 2014 10:03:28 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+--- libraries/navigation/Navigation.class.php.orig Thu Jun 26 11:08:31 2014
++++ libraries/navigation/Navigation.class.php Thu Jun 26 11:09:23 2014
+@@ -189,9 +189,9 @@ class PMA_Navigation
+ $html .= '<td style="width:80px"><a href="navigation.php?'
+ . PMA_URL_getCommon()
+ . '&unhideNavItem=true'
+- . '&itemType=' . $t
+- . '&itemName=' . urldecode($hiddenItem)
+- . '&dbName=' . urldecode($dbName) . '"'
++ . '&itemType=' . urlencode($t)
++ . '&itemName=' . urlencode($hiddenItem)
++ . '&dbName=' . urlencode($dbName) . '"'
+ . ' class="unhideNavItem ajax">'
+ . PMA_Util::getIcon('lightbulb.png', __('Show'))
+ . '</a></td>';
Index: patches/patch-libraries_navigation_Nodes_Node_DatabaseChild_class_php
===================================================================
RCS file: patches/patch-libraries_navigation_Nodes_Node_DatabaseChild_class_php
diff -N patches/patch-libraries_navigation_Nodes_Node_DatabaseChild_class_php
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libraries_navigation_Nodes_Node_DatabaseChild_class_php 26 Jun 2014 10:03:28 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+--- libraries/navigation/Nodes/Node_DatabaseChild.class.php.orig Thu Jun 26 11:09:49 2014
++++ libraries/navigation/Nodes/Node_DatabaseChild.class.php Thu Jun 26 11:10:18 2014
+@@ -32,9 +32,9 @@ abstract class Node_DatabaseChild extends Node
+ . '<a href="navigation.php?'
+ . PMA_URL_getCommon()
+ . '&hideNavItem=true'
+- . '&itemType=' . urldecode($this->getItemType())
+- . '&itemName=' . urldecode($item)
+- . '&dbName=' . urldecode($db) . '"'
++ . '&itemType=' . urlencode($this->getItemType())
++ . '&itemName=' . urlencode($item)
++ . '&dbName=' . urlencode($db) . '"'
+ . ' class="hideNavItem ajax">'
+ . PMA_Util::getImage('lightbulb_off.png', __('Hide'))
+ . '</a></span>';
Index: patches/patch-libraries_structure_lib_php
===================================================================
RCS file: patches/patch-libraries_structure_lib_php
diff -N patches/patch-libraries_structure_lib_php
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libraries_structure_lib_php 26 Jun 2014 10:03:28 -0000
@@ -0,0 +1,24 @@
+$OpenBSD$
+--- libraries/structure.lib.php.orig Thu Jun 26 11:25:45 2014
++++ libraries/structure.lib.php Thu Jun 26 11:27:54 2014
+@@ -2735,9 +2735,8 @@ function PMA_checkFavoriteTable($db, $current_table)
+ function PMA_getHtmlForFavoriteAnchor($db, $current_table, $titles)
+ {
+ $html_output = '<a ';
+- $html_output .= 'id="' . preg_replace(
+- '/\s+/', '', $current_table['TABLE_NAME']
+- ) . '_favorite_anchor" ';
++ $html_output .= 'id="' . md5($current_table['TABLE_NAME'])
++ . '_favorite_anchor" ';
+ $html_output .= 'class="ajax favorite_table_anchor';
+
+ // Check if current table is already in favorite list.
+@@ -2751,7 +2750,7 @@ function PMA_getHtmlForFavoriteAnchor($db, $current_ta
+ $html_output .= 'href="' . $fav_url
+ . '" title="' . ($already_favorite ? __("Remove from Favorites")
+ : __("Add to Favorites"))
+- . '" data-favtargets="' . $db . "." . $current_table['TABLE_NAME']
++ . '" data-favtargets="' . md5($db . "." . $current_table['TABLE_NAME'])
+ . '" >'
+ . (!$already_favorite ? $titles['NoFavorite']
+ : $titles['Favorite']) . '</a>';
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/phpmyadmin/pkg/PLIST,v
retrieving revision 1.51
diff -u -p -u -p -r1.51 PLIST
--- pkg/PLIST 27 Jan 2014 14:20:01 -0000 1.51
+++ pkg/PLIST 26 Jun 2014 10:03:29 -0000
@@ -1,10 +1,11 @@
-@comment $OpenBSD: PLIST,v 1.51 2014/01/27 14:20:01 giovanni Exp $
+@comment $OpenBSD: PLIST,v 1.53 2014/05/16 15:32:30 giovanni Exp $
@unexec-delete rm -f /var/www/conf/modules/phpmyadmin.conf
@group daemon
phpMyAdmin/
@comment phpMyAdmin/.coveralls.yml
phpMyAdmin/CONTRIBUTING.md
phpMyAdmin/ChangeLog
+phpMyAdmin/DCO
phpMyAdmin/LICENSE
phpMyAdmin/README
phpMyAdmin/RELEASE-DATE-${V}
@@ -150,8 +151,6 @@ phpMyAdmin/js/ajax.js
phpMyAdmin/js/canvg/
phpMyAdmin/js/canvg/MIT-LICENSE.txt
phpMyAdmin/js/canvg/canvg.js
-phpMyAdmin/js/canvg/flashcanvas.js
-phpMyAdmin/js/canvg/flashcanvas.swf
phpMyAdmin/js/chart.js
phpMyAdmin/js/codemirror/
phpMyAdmin/js/codemirror/LICENSE
@@ -163,10 +162,12 @@ phpMyAdmin/js/codemirror/lib/codemirror.
phpMyAdmin/js/codemirror/mode/
phpMyAdmin/js/codemirror/mode/sql/
phpMyAdmin/js/codemirror/mode/sql/sql.js
+phpMyAdmin/js/columndelete.js
phpMyAdmin/js/common.js
phpMyAdmin/js/config.js
phpMyAdmin/js/cross_framing_protection.js
phpMyAdmin/js/db_operations.js
+phpMyAdmin/js/db_qbe.js
phpMyAdmin/js/db_search.js
phpMyAdmin/js/db_structure.js
phpMyAdmin/js/doclinks.js
@@ -202,13 +203,13 @@ phpMyAdmin/js/jquery/jquery.cookie.js
phpMyAdmin/js/jquery/jquery.debounce-1.0.5.js
phpMyAdmin/js/jquery/jquery.event.drag-2.2.js
phpMyAdmin/js/jquery/jquery.fullscreen.js
-phpMyAdmin/js/jquery/jquery.json-2.4.js
phpMyAdmin/js/jquery/jquery.menuResizer-1.0.js
phpMyAdmin/js/jquery/jquery.mousewheel.js
phpMyAdmin/js/jquery/jquery.sortableTable.js
phpMyAdmin/js/jquery/jquery.sprintf.js
phpMyAdmin/js/jquery/jquery.svg.js
phpMyAdmin/js/jquery/jquery.tablesorter.js
+phpMyAdmin/js/jquery/jquery.uitablefilter.js
phpMyAdmin/js/jquery/src/
phpMyAdmin/js/jquery/src/README
phpMyAdmin/js/jquery/src/jquery/
@@ -305,6 +306,346 @@ phpMyAdmin/js/openlayers/img/zoom-minus-
phpMyAdmin/js/openlayers/img/zoom-plus-mini.png
phpMyAdmin/js/openlayers/img/zoom-world-mini.png
phpMyAdmin/js/openlayers/img/zoombar.png
+phpMyAdmin/js/openlayers/src/
+phpMyAdmin/js/openlayers/src/README
+phpMyAdmin/js/openlayers/src/openlayers/
+phpMyAdmin/js/openlayers/src/openlayers/lib/
+phpMyAdmin/js/openlayers/src/openlayers/lib/Firebug/
+phpMyAdmin/js/openlayers/src/openlayers/lib/Firebug/errorIcon.png
+phpMyAdmin/js/openlayers/src/openlayers/lib/Firebug/firebug.css
+phpMyAdmin/js/openlayers/src/openlayers/lib/Firebug/firebug.html
+phpMyAdmin/js/openlayers/src/openlayers/lib/Firebug/firebug.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/Firebug/firebugx.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/Firebug/infoIcon.png
+phpMyAdmin/js/openlayers/src/openlayers/lib/Firebug/license.txt
+phpMyAdmin/js/openlayers/src/openlayers/lib/Firebug/readme.txt
+phpMyAdmin/js/openlayers/src/openlayers/lib/Firebug/warningIcon.png
+phpMyAdmin/js/openlayers/src/openlayers/lib/Gears/
+phpMyAdmin/js/openlayers/src/openlayers/lib/Gears/gears_init.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Ajax.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Bounds.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Class.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Element.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/LonLat.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Pixel.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Size.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Console.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/ArgParser.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/Attribution.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/Button.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/DragFeature.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/DragPan.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/DrawFeature.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/EditingToolbar.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/GetFeature.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/Graticule.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/KeyboardDefaults.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/LayerSwitcher.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/Measure.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/ModifyFeature.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/MouseDefaults.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/MousePosition.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/MouseToolbar.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/NavToolbar.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/Navigation.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/NavigationHistory.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/OverviewMap.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/Pan.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/PanPanel.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/PanZoom.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/PanZoomBar.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/Panel.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/Permalink.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/SLDSelect.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/Scale.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/ScaleLine.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/SelectFeature.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/Snapping.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/Split.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/TransformFeature.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/WMSGetFeatureInfo.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/WMTSGetFeatureInfo.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/ZoomBox.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/ZoomIn.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/ZoomOut.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/ZoomPanel.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Control/ZoomToMaxExtent.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Events.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Feature/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Feature.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Feature/Vector.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Feature/WFS.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Filter/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Filter.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Filter/Comparison.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Filter/FeatureId.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Filter/Logical.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Filter/Spatial.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/ArcXML/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/ArcXML.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/ArcXML/Features.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/Atom.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetDomain/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetDomain.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetDomain/v2_0_2.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetRecords/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetRecords.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetRecords/v2_0_2.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/Context.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/Filter/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/Filter.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/Filter/v1.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/Filter/v1_0_0.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/Filter/v1_1_0.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/GML/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/GML.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/GML/Base.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/GML/v2.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/GML/v3.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/GPX.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/GeoJSON.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/GeoRSS.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/JSON.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/KML.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/OSM.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/OWSCommon/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/OWSCommon/v1.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/OWSCommon/v1_0_0.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/OWSCommon/v1_1_0.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/OWSContext/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/OWSContext.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/OWSContext/v0_3_1.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/SLD/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/SLD.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/SLD/v1.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/SLD/v1_0_0.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/SOSCapabilities/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/SOSCapabilities.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/SOSCapabilities/v1_0_0.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/SOSGetFeatureOfInterest.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/SOSGetObservation.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/Text.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFS.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFSCapabilities/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFSCapabilities.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFSCapabilities/v1.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFSCapabilities/v1_0_0.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFSCapabilities/v1_1_0.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFSDescribeFeatureType.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFST/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFST.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFST/v1.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFST/v1_0_0.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFST/v1_1_0.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WKT.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMC/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMC.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMC/v1.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMC/v1_0_0.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMC/v1_1_0.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_1.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_1_0.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_1_1.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_3.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_3_0.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSDescribeLayer/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSDescribeLayer.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSDescribeLayer/v1_1.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSGetFeatureInfo.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMTSCapabilities/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMTSCapabilities.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMTSCapabilities/v1_0_0.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Format/XML.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Geometry.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/Collection.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/Curve.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/LineString.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/LinearRing.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/MultiLineString.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/MultiPoint.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/MultiPolygon.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/Point.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/Polygon.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/Rectangle.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/Surface.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Handler/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Handler.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Box.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Click.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Drag.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Feature.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Hover.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Keyboard.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Handler/MouseWheel.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Path.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Point.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Polygon.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Handler/RegularPolygon.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Icon.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/ar.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/be-tarask.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/bg.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/br.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/ca.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/cs-CZ.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/da-DK.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/de.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/el.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/en-CA.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/en.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/es.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/fi.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/fr.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/fur.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/gl.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/gsw.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/hr.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/hsb.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/hu.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/ia.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/id.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/io.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/is.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/it.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/ja.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/km.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/ksh.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/nb.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/nds.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/nl.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/nn.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/oc.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/pt-BR.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/pt.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/ru.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/sk.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/sv-SE.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/te.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/vi.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/zh-CN.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Lang/zh-TW.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/ArcGIS93Rest.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/ArcIMS.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Boxes.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/EventPane.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/FixedZoomLevels.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/GML.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/GeoRSS.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Google/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Google.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Google/v3.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Grid.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/HTTPRequest.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Image.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/KaMap.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/KaMapCache.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/MapGuide.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/MapServer/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/MapServer.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/MapServer/Untiled.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Markers.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/MultiMap.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/PointTrack.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/SphericalMercator.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/TMS.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Text.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/TileCache.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Vector/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Vector.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Vector/RootContainer.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/VirtualEarth.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/WFS.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/WMS/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/WMS.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/WMS/Post.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/WMS/Untiled.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/WMTS.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/WorldWind.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/XYZ.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Yahoo.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Zoomify.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Map.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Marker/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Marker.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Marker/Box.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Popup/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Popup.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Popup/Anchored.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Popup/AnchoredBubble.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Popup/Framed.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Popup/FramedCloud.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Projection.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Protocol.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/HTTP.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/SOS/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/SOS.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/SOS/v1_0_0.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/SQL/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/SQL.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/SQL/Gears.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/WFS/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/WFS.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/WFS/v1.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/WFS/v1_0_0.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/WFS/v1_1_0.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Renderer/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Renderer.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Renderer/Canvas.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Renderer/Elements.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Renderer/SVG.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Renderer/VML.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Request/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Request.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Request/XMLHttpRequest.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Rule.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/SingleFile.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Strategy/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Strategy.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Strategy/BBOX.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Strategy/Cluster.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Strategy/Filter.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Strategy/Fixed.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Strategy/Paging.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Strategy/Refresh.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Strategy/Save.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Style.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Style2.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/StyleMap.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Symbolizer/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Symbolizer.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Symbolizer/Line.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Symbolizer/Point.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Symbolizer/Polygon.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Symbolizer/Raster.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Symbolizer/Text.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Tile/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Tile.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Tile/Image/
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Tile/Image.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Tile/Image/IFrame.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Tile/WFS.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Tween.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/OpenLayers/Util.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/Rico/
+phpMyAdmin/js/openlayers/src/openlayers/lib/Rico/Color.js
+phpMyAdmin/js/openlayers/src/openlayers/lib/Rico/Corner.js
phpMyAdmin/js/openlayers/theme/
phpMyAdmin/js/openlayers/theme/default/
phpMyAdmin/js/openlayers/theme/default/framedCloud.css
@@ -386,6 +727,7 @@ phpMyAdmin/libraries/DisplayResults.clas
phpMyAdmin/libraries/Error.class.php
phpMyAdmin/libraries/Error_Handler.class.php
phpMyAdmin/libraries/File.class.php
+phpMyAdmin/libraries/Font.class.php
phpMyAdmin/libraries/Footer.class.php
phpMyAdmin/libraries/Header.class.php
phpMyAdmin/libraries/Index.class.php
@@ -397,8 +739,9 @@ phpMyAdmin/libraries/OutputBuffering.cla
phpMyAdmin/libraries/PDF.class.php
phpMyAdmin/libraries/PMA.php
phpMyAdmin/libraries/Partition.class.php
-phpMyAdmin/libraries/RecentTable.class.php
+phpMyAdmin/libraries/RecentFavoriteTable.class.php
phpMyAdmin/libraries/Response.class.php
+phpMyAdmin/libraries/SavedSearches.class.php
phpMyAdmin/libraries/Scripts.class.php
phpMyAdmin/libraries/ServerStatusData.class.php
phpMyAdmin/libraries/StorageEngine.class.php
@@ -434,6 +777,7 @@ phpMyAdmin/libraries/config/ConfigFile.c
phpMyAdmin/libraries/config/Form.class.php
phpMyAdmin/libraries/config/FormDisplay.class.php
phpMyAdmin/libraries/config/FormDisplay.tpl.php
+phpMyAdmin/libraries/config/ServerConfigChecks.class.php
phpMyAdmin/libraries/config/Validator.class.php
phpMyAdmin/libraries/config/config_functions.lib.php
phpMyAdmin/libraries/config/messages.inc.php
@@ -479,18 +823,19 @@ phpMyAdmin/libraries/engines/pbxt.lib.ph
phpMyAdmin/libraries/engines/performance_schema.lib.php
phpMyAdmin/libraries/error.inc.php
phpMyAdmin/libraries/error_report.lib.php
+phpMyAdmin/libraries/export.lib.php
phpMyAdmin/libraries/file_listing.lib.php
phpMyAdmin/libraries/gis/
-phpMyAdmin/libraries/gis/pma_gis_factory.php
-phpMyAdmin/libraries/gis/pma_gis_geometry.php
-phpMyAdmin/libraries/gis/pma_gis_geometrycollection.php
-phpMyAdmin/libraries/gis/pma_gis_linestring.php
-phpMyAdmin/libraries/gis/pma_gis_multilinestring.php
-phpMyAdmin/libraries/gis/pma_gis_multipoint.php
-phpMyAdmin/libraries/gis/pma_gis_multipolygon.php
-phpMyAdmin/libraries/gis/pma_gis_point.php
-phpMyAdmin/libraries/gis/pma_gis_polygon.php
-phpMyAdmin/libraries/gis/pma_gis_visualization.php
+phpMyAdmin/libraries/gis/GIS_Factory.class.php
+phpMyAdmin/libraries/gis/GIS_Geometry.class.php
+phpMyAdmin/libraries/gis/GIS_Geometrycollection.class.php
+phpMyAdmin/libraries/gis/GIS_Linestring.class.php
+phpMyAdmin/libraries/gis/GIS_Multilinestring.class.php
+phpMyAdmin/libraries/gis/GIS_Multipoint.class.php
+phpMyAdmin/libraries/gis/GIS_Multipolygon.class.php
+phpMyAdmin/libraries/gis/GIS_Point.class.php
+phpMyAdmin/libraries/gis/GIS_Polygon.class.php
+phpMyAdmin/libraries/gis/GIS_Visualization.class.php
phpMyAdmin/libraries/iconv_wrapper.lib.php
phpMyAdmin/libraries/import.lib.php
phpMyAdmin/libraries/index.lib.php
@@ -609,17 +954,18 @@ phpMyAdmin/libraries/plugins/transformat
phpMyAdmin/libraries/plugins/transformations/README
phpMyAdmin/libraries/plugins/transformations/TEMPLATE
phpMyAdmin/libraries/plugins/transformations/TEMPLATE_ABSTRACT
-phpMyAdmin/libraries/plugins/transformations/Text_Plain_Append.class.php
+phpMyAdmin/libraries/plugins/transformations/Text_Plain_Bool2text.class.php
phpMyAdmin/libraries/plugins/transformations/Text_Plain_Dateformat.class.php
phpMyAdmin/libraries/plugins/transformations/Text_Plain_External.class.php
phpMyAdmin/libraries/plugins/transformations/Text_Plain_Formatted.class.php
phpMyAdmin/libraries/plugins/transformations/Text_Plain_Imagelink.class.php
phpMyAdmin/libraries/plugins/transformations/Text_Plain_Link.class.php
phpMyAdmin/libraries/plugins/transformations/Text_Plain_Longtoipv4.class.php
+phpMyAdmin/libraries/plugins/transformations/Text_Plain_Preappend.class.php
phpMyAdmin/libraries/plugins/transformations/Text_Plain_Sql.class.php
phpMyAdmin/libraries/plugins/transformations/Text_Plain_Substring.class.php
phpMyAdmin/libraries/plugins/transformations/abstract/
-phpMyAdmin/libraries/plugins/transformations/abstract/AppendTransformationsPlugin.class.php
+phpMyAdmin/libraries/plugins/transformations/abstract/Bool2TextTransformationsPlugin.class.php
phpMyAdmin/libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php
phpMyAdmin/libraries/plugins/transformations/abstract/DownloadTransformationsPlugin.class.php
phpMyAdmin/libraries/plugins/transformations/abstract/ExternalTransformationsPlugin.class.php
@@ -628,6 +974,7 @@ phpMyAdmin/libraries/plugins/transformat
phpMyAdmin/libraries/plugins/transformations/abstract/ImageLinkTransformationsPlugin.class.php
phpMyAdmin/libraries/plugins/transformations/abstract/InlineTransformationsPlugin.class.php
phpMyAdmin/libraries/plugins/transformations/abstract/LongToIPv4TransformationsPlugin.class.php
+phpMyAdmin/libraries/plugins/transformations/abstract/PreApPendTransformationsPlugin.class.php
phpMyAdmin/libraries/plugins/transformations/abstract/SQLTransformationsPlugin.class.php
phpMyAdmin/libraries/plugins/transformations/abstract/SubstringTransformationsPlugin.class.php
phpMyAdmin/libraries/plugins/transformations/abstract/TextImageLinkTransformationsPlugin.class.php
@@ -678,6 +1025,7 @@ phpMyAdmin/libraries/schema/Eps_Relation
phpMyAdmin/libraries/schema/Export_Relation_Schema.class.php
phpMyAdmin/libraries/schema/Pdf_Relation_Schema.class.php
phpMyAdmin/libraries/schema/Svg_Relation_Schema.class.php
+phpMyAdmin/libraries/schema/TableStats.class.php
phpMyAdmin/libraries/schema/User_Schema.class.php
phpMyAdmin/libraries/select_lang.lib.php
phpMyAdmin/libraries/select_server.lib.php
@@ -703,8 +1051,6 @@ phpMyAdmin/libraries/sql.lib.php
phpMyAdmin/libraries/sql_query_form.lib.php
phpMyAdmin/libraries/sqlparser.data.php
phpMyAdmin/libraries/sqlparser.lib.php
-phpMyAdmin/libraries/sqlvalidator.class.php
-phpMyAdmin/libraries/sqlvalidator.lib.php
phpMyAdmin/libraries/string.inc.php
phpMyAdmin/libraries/structure.lib.php
phpMyAdmin/libraries/sysinfo.lib.php
@@ -799,6 +1145,9 @@ phpMyAdmin/locale/hi/LC_MESSAGES/phpmyad
phpMyAdmin/locale/hu/
phpMyAdmin/locale/hu/LC_MESSAGES/
phpMyAdmin/locale/hu/LC_MESSAGES/phpmyadmin.mo
+phpMyAdmin/locale/ia/
+phpMyAdmin/locale/ia/LC_MESSAGES/
+phpMyAdmin/locale/ia/LC_MESSAGES/phpmyadmin.mo
phpMyAdmin/locale/id/
phpMyAdmin/locale/id/LC_MESSAGES/
phpMyAdmin/locale/id/LC_MESSAGES/phpmyadmin.mo
@@ -850,9 +1199,6 @@ phpMyAdmin/locale/sr@latin/LC_MESSAGES/p
phpMyAdmin/locale/sv/
phpMyAdmin/locale/sv/LC_MESSAGES/
phpMyAdmin/locale/sv/LC_MESSAGES/phpmyadmin.mo
-phpMyAdmin/locale/th/
-phpMyAdmin/locale/th/LC_MESSAGES/
-phpMyAdmin/locale/th/LC_MESSAGES/phpmyadmin.mo
phpMyAdmin/locale/tr/
phpMyAdmin/locale/tr/LC_MESSAGES/
phpMyAdmin/locale/tr/LC_MESSAGES/phpmyadmin.mo
@@ -874,6 +1220,7 @@ phpMyAdmin/locale/zh_TW/LC_MESSAGES/phpm
phpMyAdmin/navigation.php
phpMyAdmin/phpinfo.php
phpMyAdmin/phpmyadmin.css.php
+phpMyAdmin/phpunit.xml.hhvm
phpMyAdmin/phpunit.xml.nocoverage
phpMyAdmin/pmd_display_field.php
phpMyAdmin/pmd_general.php
@@ -975,6 +1322,7 @@ phpMyAdmin/themes/original/img/b_engine.
phpMyAdmin/themes/original/img/b_event_add.png
phpMyAdmin/themes/original/img/b_events.png
phpMyAdmin/themes/original/img/b_export.png
+phpMyAdmin/themes/original/img/b_favorite.png
phpMyAdmin/themes/original/img/b_find_replace.png
phpMyAdmin/themes/original/img/b_ftext.png
phpMyAdmin/themes/original/img/b_globe.gif
@@ -993,6 +1341,7 @@ phpMyAdmin/themes/original/img/b_move.pn
phpMyAdmin/themes/original/img/b_newdb.png
phpMyAdmin/themes/original/img/b_newtbl.png
phpMyAdmin/themes/original/img/b_nextpage.png
+phpMyAdmin/themes/original/img/b_no_favorite.png
phpMyAdmin/themes/original/img/b_plus.png
phpMyAdmin/themes/original/img/b_primary.png
phpMyAdmin/themes/original/img/b_print.png
@@ -1161,6 +1510,7 @@ phpMyAdmin/themes/pmahomme/img/b_engine.
phpMyAdmin/themes/pmahomme/img/b_event_add.png
phpMyAdmin/themes/pmahomme/img/b_events.png
phpMyAdmin/themes/pmahomme/img/b_export.png
+phpMyAdmin/themes/pmahomme/img/b_favorite.png
phpMyAdmin/themes/pmahomme/img/b_find_replace.png
phpMyAdmin/themes/pmahomme/img/b_firstpage.png
phpMyAdmin/themes/pmahomme/img/b_ftext.png
@@ -1181,6 +1531,7 @@ phpMyAdmin/themes/pmahomme/img/b_move.pn
phpMyAdmin/themes/pmahomme/img/b_newdb.png
phpMyAdmin/themes/pmahomme/img/b_newtbl.png
phpMyAdmin/themes/pmahomme/img/b_nextpage.png
+phpMyAdmin/themes/pmahomme/img/b_no_favorite.png
phpMyAdmin/themes/pmahomme/img/b_pdfdoc.png
phpMyAdmin/themes/pmahomme/img/b_plus.png
phpMyAdmin/themes/pmahomme/img/b_prevpage.png
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/phpmyadmin/Makefile,v
retrieving revision 1.104
diff -u -p -u -p -r1.104 Makefile
--- Makefile 13 Jun 2014 17:01:36 -0000 1.104
+++ Makefile 26 Jun 2014 10:02:42 -0000
@@ -3,12 +3,12 @@
COMMENT= tool to handle the administration of MySQL over the web
V= 4.2.2
+REVISION= 1
PKGNAME= phpMyAdmin-$V
DISTNAME= phpMyAdmin-$V-all-languages
CATEGORIES= www
HOMEPAGE= http://www.phpmyadmin.net/
-REVISION= 0
MAINTAINER= Giovanni Bechis <giova...@openbsd.org>
Index: patches/patch-libraries_RecentFavoriteTable_class_php
===================================================================
RCS file: patches/patch-libraries_RecentFavoriteTable_class_php
diff -N patches/patch-libraries_RecentFavoriteTable_class_php
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libraries_RecentFavoriteTable_class_php 26 Jun 2014 10:02:42 -0000
@@ -0,0 +1,66 @@
+$OpenBSD$
+--- libraries/RecentFavoriteTable.class.php.orig Thu Jun 26 11:22:05 2014
++++ libraries/RecentFavoriteTable.class.php Thu Jun 26 11:30:44 2014
+@@ -203,36 +203,46 @@ class PMA_RecentFavoriteTable
+ if ($this->_tableType == 'recent') {
+ foreach ($this->_tables as $table) {
+ $html .= '<li class="warp_link">';
+- $html .= '<a href="sql.php?server=' . $GLOBALS['server']
+- . '&db=' . $table['db']
+- . '&table=' . $table['table']
+- . '&token=' . $_SESSION[' PMA_token ']
+- . '">`' . $table['db'] . '`.`' . $table['table'] . '`</a>';
++ $recent_params = array(
++ 'db' => $table['db'],
++ 'table' => $table['table']
++ );
++ $recent_url = 'sql.php'
++ . PMA_URL_getCommon($recent_params);
++ $html .= '<a href="' . $recent_url . '">`
++ . htmlspecialchars($table['db']) . '`.`'
++ . htmlspecialchars($table['table']) . '`</a>';
+ $html .= '</li>';
+ }
+ } else {
+ foreach ($this->_tables as $table) {
+ $html .= '<li class="warp_link">';
+
+- $html .= '<a class="ajax favorite_table_anchor"';
+- $fav_params = array('db' => $table['db'],
+- 'ajax_request' => true,
+- 'favorite_table' => $table['table'],
+- 'remove_favorite' => true);
++ $html .= '<a class="ajax favorite_table_anchor" ';
++ $fav_params = array(
++ 'db' => $table['db'],
++ 'ajax_request' => true,
++ 'favorite_table' => $table['table'],
++ 'remove_favorite' => true
++ );
+ $fav_rm_url = 'db_structure.php'
+ . PMA_URL_getCommon($fav_params);
+ $html .= 'href="' . $fav_rm_url
+ . '" title="' . __("Remove from Favorites")
+- . '" data-favtargetn="' . $table['db'] . "." . $table['table']
++ . '" data-favtargetn="' . md5($table['db'] . "." . $table['table'])
+ . '" >'
+ . PMA_Util::getIcon('b_favorite.png')
+ . '</a>';
+
+- $html .= '<a href="sql.php?server=' . $GLOBALS['server']
+- . '&db=' . $table['db']
+- . '&table=' . $table['table']
+- . '&token=' . $_SESSION[' PMA_token ']
+- . '">`' . $table['db'] . '`.`' . $table['table'] . '`</a>';
++ $fav_params = array(
++ 'db' => $table['db'],
++ 'table' => $table['table']
++ );
++ $table_url = 'sql.php'
++ . PMA_URL_getCommon($fav_params);
++ $html .= '<a href="' . $table_url . '">`'
++ . htmlspecialchars($table['db']) . '`.`'
++ . htmlspecialchars($table['table']) . '`</a>';
+ $html .= '</li>';
+ }
+ }
Index: patches/patch-libraries_navigation_Navigation_class_php
===================================================================
RCS file: patches/patch-libraries_navigation_Navigation_class_php
diff -N patches/patch-libraries_navigation_Navigation_class_php
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libraries_navigation_Navigation_class_php 26 Jun 2014 10:02:42 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+--- libraries/navigation/Navigation.class.php.orig Thu Jun 26 11:08:31 2014
++++ libraries/navigation/Navigation.class.php Thu Jun 26 11:09:23 2014
+@@ -189,9 +189,9 @@ class PMA_Navigation
+ $html .= '<td style="width:80px"><a href="navigation.php?'
+ . PMA_URL_getCommon()
+ . '&unhideNavItem=true'
+- . '&itemType=' . $t
+- . '&itemName=' . urldecode($hiddenItem)
+- . '&dbName=' . urldecode($dbName) . '"'
++ . '&itemType=' . urlencode($t)
++ . '&itemName=' . urlencode($hiddenItem)
++ . '&dbName=' . urlencode($dbName) . '"'
+ . ' class="unhideNavItem ajax">'
+ . PMA_Util::getIcon('lightbulb.png', __('Show'))
+ . '</a></td>';
Index: patches/patch-libraries_navigation_Nodes_Node_DatabaseChild_class_php
===================================================================
RCS file: patches/patch-libraries_navigation_Nodes_Node_DatabaseChild_class_php
diff -N patches/patch-libraries_navigation_Nodes_Node_DatabaseChild_class_php
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libraries_navigation_Nodes_Node_DatabaseChild_class_php 26 Jun 2014 10:02:42 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+--- libraries/navigation/Nodes/Node_DatabaseChild.class.php.orig Thu Jun 26 11:09:49 2014
++++ libraries/navigation/Nodes/Node_DatabaseChild.class.php Thu Jun 26 11:10:18 2014
+@@ -32,9 +32,9 @@ abstract class Node_DatabaseChild extends Node
+ . '<a href="navigation.php?'
+ . PMA_URL_getCommon()
+ . '&hideNavItem=true'
+- . '&itemType=' . urldecode($this->getItemType())
+- . '&itemName=' . urldecode($item)
+- . '&dbName=' . urldecode($db) . '"'
++ . '&itemType=' . urlencode($this->getItemType())
++ . '&itemName=' . urlencode($item)
++ . '&dbName=' . urlencode($db) . '"'
+ . ' class="hideNavItem ajax">'
+ . PMA_Util::getImage('lightbulb_off.png', __('Hide'))
+ . '</a></span>';
Index: patches/patch-libraries_structure_lib_php
===================================================================
RCS file: patches/patch-libraries_structure_lib_php
diff -N patches/patch-libraries_structure_lib_php
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libraries_structure_lib_php 26 Jun 2014 10:02:42 -0000
@@ -0,0 +1,24 @@
+$OpenBSD$
+--- libraries/structure.lib.php.orig Thu Jun 26 11:25:45 2014
++++ libraries/structure.lib.php Thu Jun 26 11:27:54 2014
+@@ -2735,9 +2735,8 @@ function PMA_checkFavoriteTable($db, $current_table)
+ function PMA_getHtmlForFavoriteAnchor($db, $current_table, $titles)
+ {
+ $html_output = '<a ';
+- $html_output .= 'id="' . preg_replace(
+- '/\s+/', '', $current_table['TABLE_NAME']
+- ) . '_favorite_anchor" ';
++ $html_output .= 'id="' . md5($current_table['TABLE_NAME'])
++ . '_favorite_anchor" ';
+ $html_output .= 'class="ajax favorite_table_anchor';
+
+ // Check if current table is already in favorite list.
+@@ -2751,7 +2750,7 @@ function PMA_getHtmlForFavoriteAnchor($db, $current_ta
+ $html_output .= 'href="' . $fav_url
+ . '" title="' . ($already_favorite ? __("Remove from Favorites")
+ : __("Add to Favorites"))
+- . '" data-favtargets="' . $db . "." . $current_table['TABLE_NAME']
++ . '" data-favtargets="' . md5($db . "." . $current_table['TABLE_NAME'])
+ . '" >'
+ . (!$already_favorite ? $titles['NoFavorite']
+ : $titles['Favorite']) . '</a>';
