| [vhffs-dev] [2268] updated tuxfamily phpPgAdmin patch against phpPgAdmin 5.1 |
[ Thread Index |
Date Index
| More vhffs.org/vhffs-dev Archives
]
Revision: 2268
Author: gradator
Date: 2015-02-08 00:26:17 +0100 (Sun, 08 Feb 2015)
Log Message:
-----------
updated tuxfamily phpPgAdmin patch against phpPgAdmin 5.1
Added Paths:
-----------
trunk/vhffs-patches/phppgadmin/phppgadmin_5.1_tuxfamily.patch
Removed Paths:
-------------
trunk/vhffs-patches/phppgadmin/phppgadmin_4.2.3_tuxfamily.patch
trunk/vhffs-patches/phppgadmin/phppgadmin_5.0.2_tuxfamily.patch
Deleted: trunk/vhffs-patches/phppgadmin/phppgadmin_4.2.3_tuxfamily.patch
===================================================================
--- trunk/vhffs-patches/phppgadmin/phppgadmin_4.2.3_tuxfamily.patch 2015-02-07 22:18:16 UTC (rev 2267)
+++ trunk/vhffs-patches/phppgadmin/phppgadmin_4.2.3_tuxfamily.patch 2015-02-07 23:26:17 UTC (rev 2268)
@@ -1,61 +0,0 @@
-diff -Nru release/conf/config.inc.php new/conf/config.inc.php
---- release/conf/config.inc.php 2008-12-18 21:13:34.000000000 +0100
-+++ new/conf/config.inc.php 2009-05-21 00:51:39.000000000 +0200
-@@ -11,11 +11,11 @@
- // indexed from zero upwards.
-
- // Display name for the server on the login screen
-- $conf['servers'][0]['desc'] = 'PostgreSQL';
-+ $conf['servers'][0]['desc'] = 'sql';
-
- // Hostname or IP address for server. Use '' for UNIX domain socket.
- // use 'localhost' for TCP/IP connection on this computer
-- $conf['servers'][0]['host'] = '';
-+ $conf['servers'][0]['host'] = 'sql';
-
- // Database port on server (5432 is the PostgreSQL default)
- $conf['servers'][0]['port'] = 5432;
-@@ -24,11 +24,11 @@
- // Possible options: disable, allow, prefer, require
- // To require SSL on older servers use option: legacy
- // To ignore the SSL mode, use option: unspecified
-- $conf['servers'][0]['sslmode'] = 'allow';
-+ $conf['servers'][0]['sslmode'] = 'disable';
-
- // Change the default database only if you cannot connect to template1.
- // For a PostgreSQL 8.1+ server, you can set this to 'postgres'.
-- $conf['servers'][0]['defaultdb'] = 'template1';
-+ $conf['servers'][0]['defaultdb'] = '';
-
- // Specify the path to the database dump utilities for this server.
- // You can set these to '' if no dumper is available.
-@@ -76,7 +76,7 @@
- // Note: This will simply hide other databases in the list - this does
- // not in any way prevent your users from seeing other database by
- // other means. (e.g. Run 'SELECT * FROM pg_database' in the SQL area.)
-- $conf['owned_only'] = false;
-+ $conf['owned_only'] = true;
-
- // Display comments on objects? Comments are a good way of documenting
- // a database, but they do take up space in the interface.
-@@ -93,7 +93,7 @@
-
- // Display reports feature? For this feature to work, you must
- // install the reports database as explained in the INSTALL file.
-- $conf['show_reports'] = true;
-+ $conf['show_reports'] = false;
-
- // Database and table for reports
- $conf['reports_db'] = 'phppgadmin';
-diff -Nru release/libraries/lib.inc.php new/libraries/lib.inc.php
---- release/libraries/lib.inc.php 2008-12-18 06:28:57.000000000 +0100
-+++ new/libraries/lib.inc.php 2009-05-21 00:48:13.000000000 +0200
-@@ -170,7 +170,7 @@
- if (isset($_REQUEST['database']))
- $_curr_db = $_REQUEST['database'];
- else
-- $_curr_db = $_server_info['defaultdb'];
-+ $_curr_db = $_server_info['username'];
-
- include_once('./classes/database/Connection.php');
-
Deleted: trunk/vhffs-patches/phppgadmin/phppgadmin_5.0.2_tuxfamily.patch
===================================================================
--- trunk/vhffs-patches/phppgadmin/phppgadmin_5.0.2_tuxfamily.patch 2015-02-07 22:18:16 UTC (rev 2267)
+++ trunk/vhffs-patches/phppgadmin/phppgadmin_5.0.2_tuxfamily.patch 2015-02-07 23:26:17 UTC (rev 2268)
@@ -1,61 +0,0 @@
-diff -Nru phpPgAdmin-5.0.2.a/conf/config.inc.php phpPgAdmin-5.0.2.b/conf/config.inc.php
---- phpPgAdmin-5.0.2.a/conf/config.inc.php 2011-01-03 20:23:44.000000000 +0100
-+++ phpPgAdmin-5.0.2.b/conf/config.inc.php 2011-04-17 01:48:27.000000000 +0200
-@@ -11,11 +11,11 @@
- // indexed from zero upwards.
-
- // Display name for the server on the login screen
-- $conf['servers'][0]['desc'] = 'PostgreSQL';
-+ $conf['servers'][0]['desc'] = 'sql';
-
- // Hostname or IP address for server. Use '' for UNIX domain socket.
- // use 'localhost' for TCP/IP connection on this computer
-- $conf['servers'][0]['host'] = '';
-+ $conf['servers'][0]['host'] = 'sql';
-
- // Database port on server (5432 is the PostgreSQL default)
- $conf['servers'][0]['port'] = 5432;
-@@ -24,11 +24,11 @@
- // Possible options: disable, allow, prefer, require
- // To require SSL on older servers use option: legacy
- // To ignore the SSL mode, use option: unspecified
-- $conf['servers'][0]['sslmode'] = 'allow';
-+ $conf['servers'][0]['sslmode'] = 'disable';
-
- // Change the default database only if you cannot connect to template1.
- // For a PostgreSQL 8.1+ server, you can set this to 'postgres'.
-- $conf['servers'][0]['defaultdb'] = 'template1';
-+ $conf['servers'][0]['defaultdb'] = '';
-
- // Specify the path to the database dump utilities for this server.
- // You can set these to '' if no dumper is available.
-@@ -91,7 +91,7 @@
- // Note: This will simply hide other databases in the list - this does
- // not in any way prevent your users from seeing other database by
- // other means. (e.g. Run 'SELECT * FROM pg_database' in the SQL area.)
-- $conf['owned_only'] = false;
-+ $conf['owned_only'] = true;
-
- // Display comments on objects? Comments are a good way of documenting
- // a database, but they do take up space in the interface.
-@@ -108,7 +108,7 @@
-
- // Display reports feature? For this feature to work, you must
- // install the reports database as explained in the INSTALL file.
-- $conf['show_reports'] = true;
-+ $conf['show_reports'] = false;
-
- // Database and table for reports
- $conf['reports_db'] = 'phppgadmin';
-diff -Nru phpPgAdmin-5.0.2.a/libraries/lib.inc.php phpPgAdmin-5.0.2.b/libraries/lib.inc.php
---- phpPgAdmin-5.0.2.a/libraries/lib.inc.php 2011-01-03 20:22:26.000000000 +0100
-+++ phpPgAdmin-5.0.2.b/libraries/lib.inc.php 2011-04-17 01:49:44.000000000 +0200
-@@ -202,7 +202,7 @@
- if (isset($_REQUEST['database']))
- $_curr_db = $_REQUEST['database'];
- else
-- $_curr_db = $_server_info['defaultdb'];
-+ $_curr_db = $_server_info['username'];
-
- include_once('./classes/database/Connection.php');
-
Added: trunk/vhffs-patches/phppgadmin/phppgadmin_5.1_tuxfamily.patch
===================================================================
--- trunk/vhffs-patches/phppgadmin/phppgadmin_5.1_tuxfamily.patch (rev 0)
+++ trunk/vhffs-patches/phppgadmin/phppgadmin_5.1_tuxfamily.patch 2015-02-07 23:26:17 UTC (rev 2268)
@@ -0,0 +1,52 @@
+diff -Nru phpPgAdmin-5.1.a/conf/config.inc.php phpPgAdmin-5.1.b/conf/config.inc.php
+--- phpPgAdmin-5.1.a/conf/config.inc.php 2013-04-15 01:16:09.000000000 +0200
++++ phpPgAdmin-5.1.b/conf/config.inc.php 2015-02-08 00:19:18.764952319 +0100
+@@ -11,11 +11,11 @@
+ // indexed from zero upwards.
+
+ // Display name for the server on the login screen
+- $conf['servers'][0]['desc'] = 'PostgreSQL';
++ $conf['servers'][0]['desc'] = 'sql';
+
+ // Hostname or IP address for server. Use '' for UNIX domain socket.
+ // use 'localhost' for TCP/IP connection on this computer
+- $conf['servers'][0]['host'] = '';
++ $conf['servers'][0]['host'] = 'sql';
+
+ // Database port on server (5432 is the PostgreSQL default)
+ $conf['servers'][0]['port'] = 5432;
+@@ -24,11 +24,11 @@
+ // Possible options: disable, allow, prefer, require
+ // To require SSL on older servers use option: legacy
+ // To ignore the SSL mode, use option: unspecified
+- $conf['servers'][0]['sslmode'] = 'allow';
++ $conf['servers'][0]['sslmode'] = 'disable';
+
+ // Change the default database only if you cannot connect to template1.
+ // For a PostgreSQL 8.1+ server, you can set this to 'postgres'.
+- $conf['servers'][0]['defaultdb'] = 'template1';
++ $conf['servers'][0]['defaultdb'] = '';
+
+ // Specify the path to the database dump utilities for this server.
+ // You can set these to '' if no dumper is available.
+@@ -96,7 +96,7 @@
+ // Note: This will simply hide other databases in the list - this does
+ // not in any way prevent your users from seeing other database by
+ // other means. (e.g. Run 'SELECT * FROM pg_database' in the SQL area.)
+- $conf['owned_only'] = false;
++ $conf['owned_only'] = true;
+
+ // Display comments on objects? Comments are a good way of documenting
+ // a database, but they do take up space in the interface.
+diff -Nru phpPgAdmin-5.1.a/libraries/lib.inc.php phpPgAdmin-5.1.b/libraries/lib.inc.php
+--- phpPgAdmin-5.1.a/libraries/lib.inc.php 2013-04-15 00:59:58.000000000 +0200
++++ phpPgAdmin-5.1.b/libraries/lib.inc.php 2015-02-08 00:22:18.853796058 +0100
+@@ -211,7 +211,7 @@
+ if (isset($_REQUEST['database']))
+ $_curr_db = $_REQUEST['database'];
+ else
+- $_curr_db = $_server_info['defaultdb'];
++ $_curr_db = $_server_info['username'];
+
+ include_once('./classes/database/Connection.php');
+