phppgadmin-cvs Mailing List for phpPgAdmin (Page 172)

Brought to you by: ioguix, xzilla

phppgadmin-cvs — CVS Commits

You can subscribe to this list here.

2002	Jan	Feb	Mar	Apr (29)	May (39)	Jun (14)	Jul (46)	Aug (26)	Sep (73)	Oct (34)	Nov (28)	Dec (93)
2003	Jan (171)	Feb (58)	Mar (149)	Apr (160)	May (230)	Jun (49)	Jul (46)	Aug (123)	Sep (120)	Oct (91)	Nov (66)	Dec (82)
2004	Jan (40)	Feb (72)	Mar (36)	Apr (31)	May (141)	Jun (86)	Jul (136)	Aug (58)	Sep (41)	Oct (9)	Nov (55)	Dec (24)
2005	Jan (29)	Feb (74)	Mar (112)	Apr (45)	May (49)	Jun (95)	Jul (48)	Aug (57)	Sep (21)	Oct (52)	Nov (73)	Dec (40)
2006	Jan (16)	Feb	Mar (4)	Apr (9)	May (18)	Jun (43)	Jul (5)	Aug (30)	Sep (13)	Oct (8)	Nov (13)	Dec (28)
2007	Jan (65)	Feb (10)	Mar (29)	Apr (96)	May (41)	Jun (26)	Jul (49)	Aug (7)	Sep (61)	Oct (45)	Nov (40)	Dec (66)
2008	Jan (24)	Feb (33)	Mar (12)	Apr (8)	May	Jun (3)	Jul (13)	Aug (10)	Sep (3)	Oct (10)	Nov (7)	Dec (15)
2009	Jan (1)	Feb (7)	Mar (10)	Apr (6)	May (2)	Jun (4)	Jul (8)	Aug (1)	Sep (4)	Oct (12)	Nov (3)	Dec
2010	Jan (5)	Feb (1)	Mar (12)	Apr (7)	May (11)	Jun (6)	Jul (8)	Aug (9)	Sep (31)	Oct (5)	Nov (21)	Dec (13)
2011	Jan (7)	Feb (3)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2012	Jan	Feb	Mar	Apr	May (2)	Jun (1)	Jul	Aug	Sep (1)	Oct	Nov (3)	Dec
2013	Jan	Feb	Mar (7)	Apr (12)	May (11)	Jun	Jul	Aug	Sep	Oct	Nov (10)	Dec (1)
2014	Jan (1)	Feb	Mar (5)	Apr (1)	May	Jun	Jul (1)	Aug	Sep (1)	Oct	Nov	Dec
2015	Jan (5)	Feb (10)	Mar (4)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2016	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (3)	Sep	Oct	Nov	Dec
2018	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (5)	Nov (18)	Dec
2019	Jan	Feb	Mar	Apr	May	Jun (1)	Jul (10)	Aug	Sep (8)	Oct (8)	Nov	Dec (7)
2020	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (12)	Nov (5)	Dec (1)
2021	Jan	Feb (1)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2023	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (1)

Flat | Threaded

<< < 1 .. 170 171 172 173 174 175 > >> (Page 172 of 175)

[ppa-cvs] CVS: www-site/pages main.php,1.3,1.4

From: Dan W. <kil...@us...> - 2002-07-09 21:03:27

Update of /cvsroot/phppgadmin/www-site/pages
In directory usw-pr-cvs1:/tmp/cvs-serv21497

Modified Files:
	main.php 
Log Message:
Commented out link to demo site... won't be up for a while

Index: main.php
===================================================================
RCS file: /cvsroot/phppgadmin/www-site/pages/main.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** main.php	2 May 2002 20:12:41 -0000	1.3
--- main.php	9 Jul 2002 21:03:24 -0000	1.4
***************
*** 26,33 ****
  							<li>administer postgres users and groups</li>
  						</ul>
! 						<span class="text-normal">
  							View the demo at <a href="http://pgdemo.acucore.com">http://pgdemo.acucore.com</a>
  							<br />
! 						</span>
  						<br />
  						<span class="text-normal">
--- 26,33 ----
  							<li>administer postgres users and groups</li>
  						</ul>
! 						<!--span class="text-normal">
  							View the demo at <a href="http://pgdemo.acucore.com">http://pgdemo.acucore.com</a>
  							<br />
! 						</span-->
  						<br />
  						<span class="text-normal">

[ppa-cvs] CVS: www-site/pages about.php,1.1.1.1,1.2 about_tech.php,1.1.1.1,1.2 contact.php,1.2,1.3 docs.php,1.1.1.1,1.2 download.php,1.2,1.3 download_dev.php,1.1.1.1,1.2 thanks.php,1.1.1.1,1.2

From: Dan W. <kil...@us...> - 2002-07-09 21:01:12

Update of /cvsroot/phppgadmin/www-site/pages
In directory usw-pr-cvs1:/tmp/cvs-serv20888

Modified Files:
	about.php about_tech.php contact.php docs.php download.php 
	download_dev.php thanks.php 
Log Message:
Removed latest development link to missing file and changed docs message

Index: about.php
===================================================================
RCS file: /cvsroot/phppgadmin/www-site/pages/about.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** about.php	27 Nov 2001 16:23:55 -0000	1.1.1.1
--- about.php	9 Jul 2002 21:01:09 -0000	1.2
***************
*** 20,26 ****
  							http://www.sourceforge.net/projects/phppgadmin
  						</a>
! 						<br />
! 						<a href="http://phppgadmin.sourceforge.net/phpPgAdmin2_3-dev.tar.gz">
! 							Latest development code
! 						</a>
! 						</p>
\ No newline at end of file
--- 20,22 ----
  							http://www.sourceforge.net/projects/phppgadmin
  						</a>
! 						</p>

Index: about_tech.php
===================================================================
RCS file: /cvsroot/phppgadmin/www-site/pages/about_tech.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** about_tech.php	27 Nov 2001 16:23:55 -0000	1.1.1.1
--- about_tech.php	9 Jul 2002 21:01:09 -0000	1.2
***************
*** 18,24 ****
  							http://www.sourceforge.net/projects/phppgadmin
  						</a>
! 						<br />
! 						<a href="http://phppgadmin.sourceforge.net/phpPgAdmin2_3-dev.tar.gz">
! 							Latest development code
! 						</a>
! 						</p>
\ No newline at end of file
--- 18,20 ----
  							http://www.sourceforge.net/projects/phppgadmin
  						</a>
! 						</p>

Index: contact.php
===================================================================
RCS file: /cvsroot/phppgadmin/www-site/pages/contact.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** contact.php	19 Dec 2001 19:46:21 -0000	1.2
--- contact.php	9 Jul 2002 21:01:10 -0000	1.3
***************
*** 56,62 ****
  								http://www.sourceforge.net/projects/phppgadmin
  							</a>
- 							<br />
- 							<a href="http://phppgadmin.sourceforge.net/phpPgAdmin2_3-dev.tar.gz">
- 								Latest development code
- 							</a>
  						</span>										
--- 56,58 ----

Index: docs.php
===================================================================
RCS file: /cvsroot/phppgadmin/www-site/pages/docs.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** docs.php	27 Nov 2001 16:23:55 -0000	1.1.1.1
--- docs.php	9 Jul 2002 21:01:10 -0000	1.2
***************
*** 7,22 ****
  						<br />
  						<p id="pInformation" class="text-normal">
! 							We are in the process of moving the project from greatbridge.org to SourceForge. 
! 							Please be patient as we move data and files.<br />
! 							<br />
! 							Thanks,<br />
! 							phpPgAdmin Development Team<br />
  						<br />
  						<a href="?page=project">
  							http://www.sourceforge.net/projects/phppgadmin
  						</a>
! 						<br />
! 						<a href="http://phppgadmin.sourceforge.net/phpPgAdmin2_3-dev.tar.gz">
! 							Latest development code
! 						</a>
! 						</p>
\ No newline at end of file
--- 7,14 ----
  						<br />
  						<p id="pInformation" class="text-normal">
! 							Please see the Documentation.html and INSTALL documents in the distribution for detail documentation.
  						<br />
  						<a href="?page=project">
  							http://www.sourceforge.net/projects/phppgadmin
  						</a>
! 						</p>

Index: download.php
===================================================================
RCS file: /cvsroot/phppgadmin/www-site/pages/download.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** download.php	19 Dec 2001 19:46:21 -0000	1.2
--- download.php	9 Jul 2002 21:01:10 -0000	1.3
***************
*** 76,83 ****
  								http://www.sourceforge.net/projects/phppgadmin
  							</a>
- 							<br />
- 							<a href="http://phppgadmin.sourceforge.net/phpPgAdmin2_3-dev.tar.gz">
- 								Latest development code
- 							</a>
  						</div-->
  						<div id="divInformation" class="text-normal">
--- 76,79 ----

Index: download_dev.php
===================================================================
RCS file: /cvsroot/phppgadmin/www-site/pages/download_dev.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** download_dev.php	27 Nov 2001 16:23:55 -0000	1.1.1.1
--- download_dev.php	9 Jul 2002 21:01:10 -0000	1.2
***************
*** 29,34 ****
  							</a>
  							<br />
! 							<a href="http://phppgadmin.sourceforge.net/phpPgAdmin2_3-dev.tar.gz">
! 								Latest development code
! 							</a>
! 						</div>
\ No newline at end of file
--- 29,31 ----
  							</a>
  							<br />
! 						</div>

Index: thanks.php
===================================================================
RCS file: /cvsroot/phppgadmin/www-site/pages/thanks.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** thanks.php	27 Nov 2001 16:23:55 -0000	1.1.1.1
--- thanks.php	9 Jul 2002 21:01:10 -0000	1.2
***************
*** 17,22 ****
  						</a>
  						<br />
! 						<a href="http://phppgadmin.sourceforge.net/phpPgAdmin2_3-dev.tar.gz">
! 							Latest development code
! 						</a>
! 						</p>
\ No newline at end of file
--- 17,19 ----
  						</a>
  						<br />
! 						</p>

[ppa-cvs] CVS: phpPgAdmin ChangeLog,1.25,1.26 config.inc.php-dist,1.10,1.11

From: Dan W. <kil...@us...> - 2002-07-08 16:41:39

Update of /cvsroot/phppgadmin/phpPgAdmin
In directory usw-pr-cvs1:/tmp/cvs-serv11399

Modified Files:
	ChangeLog config.inc.php-dist 
Log Message:
Prepare for release 2.4.2

Index: ChangeLog
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** ChangeLog	27 Jun 2002 16:42:37 -0000	1.25
--- ChangeLog	8 Jul 2002 16:41:36 -0000	1.26
***************
*** 1,4 ****
  phpPgAdmin - ChangeLog
! v 2.4.2 - 06/**/2002 
  	+ Lang: 	Added hungarian translation - Vizi Tibor [vi...@br...]
  	+ BugFix:	Fixed problem with new Pg 7.2 keywords 
--- 1,4 ----
  phpPgAdmin - ChangeLog
! v 2.4.2 - 07/08/2002 
  	+ Lang: 	Added hungarian translation - Vizi Tibor [vi...@br...]
  	+ BugFix:	Fixed problem with new Pg 7.2 keywords 

Index: config.inc.php-dist
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/config.inc.php-dist,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** config.inc.php-dist	4 Jun 2002 18:24:50 -0000	1.10
--- config.inc.php-dist	8 Jul 2002 16:41:36 -0000	1.11
***************
*** 4,8 ****
  // Set the name and version
  $cfgProgName 	= "phpPgAdmin";
! $cfgVersion 	= "2.4.2-beta";
  
  // The default database is used to connect to the database to check the adv_auth
--- 4,8 ----
  // Set the name and version
  $cfgProgName 	= "phpPgAdmin";
! $cfgVersion 	= "2.4.2";
  
  // The default database is used to connect to the database to check the adv_auth

[ppa-cvs] CVS: phpPgAdmin sql.php,1.19,1.20

From: Dan W. <kil...@us...> - 2002-07-08 16:19:50

Update of /cvsroot/phppgadmin/phpPgAdmin
In directory usw-pr-cvs1:/tmp/cvs-serv3960

Modified Files:
	sql.php 
Log Message:
Fixed the no table detected message from showing up when it is not a select

Index: sql.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/sql.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** sql.php	28 Jun 2002 17:06:25 -0000	1.19
--- sql.php	8 Jul 2002 16:19:46 -0000	1.20
***************
*** 50,54 ****
     <?php 
  } else {
! 	if (eregi("create table|drop table|create database|drop database", $sql_query)) {
  		$reload = "true";
  	}
--- 50,54 ----
     <?php 
  } else {
! 	if (eregi("(CREATE|DROP)[[:space:]]+(TABLE|DATABASE)[[:space:]]+", $sql_query)) {
  		$reload = "true";
  	}
***************
*** 101,105 ****
  				}
  			}
! 		} else {
  			echo "<p class=\"generic\">No table detected... unable to retrieve primary or unique keys for edit/delete</p>";
  		}
--- 101,105 ----
  				}
  			}
! 		} elseif (eregi("SELECT[[:space:]]+", $sql_query)) {
  			echo "<p class=\"generic\">No table detected... unable to retrieve primary or unique keys for edit/delete</p>";
  		}

[ppa-cvs] CVS: phpPgAdmin Documentation.html,1.9,1.10

From: Robert T. <xz...@us...> - 2002-07-02 23:24:04

Update of /cvsroot/phppgadmin/phpPgAdmin
In directory usw-pr-cvs1:/tmp/cvs-serv22601

Modified Files:
	Documentation.html 
Log Message:
Added note dissuading the use of view dump utility for mission critical tasks.


Index: Documentation.html
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/Documentation.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Documentation.html	1 Jul 2002 22:56:21 -0000	1.9
--- Documentation.html	2 Jul 2002 23:24:01 -0000	1.10
***************
*** 167,170 ****
--- 167,172 ----
      <li>You have already setup a security mechanism for the phpPgAdmin-directory, eg. a .htaccess file. This would interfere with phpPgAdmin's authentification, so remove it.</p>
     </ul>
+ <p><b>I can't reload the schema I got from the "view dump" utility, how can I back up my database?</b><br>
+     There are known issues with the view dump utility such as version conflicts and some problems with advanced features like functions and/or triggers. While it should be useful for everyday work, we don't recommend it's use for system back ups, migrations, or other mission critical tasks. In those cases it is strongly recommended you use the pg_dump program that is distributed with postgres. 
  <p><b>I would like to help out with the development of phpPgAdmin. How should I proceed?<br>
    </b>

[ppa-cvs] CVS: phpPgAdmin INSTALL,1.5,1.6

From: Robert T. <xz...@us...> - 2002-07-01 22:57:31

Update of /cvsroot/phppgadmin/phpPgAdmin
In directory usw-pr-cvs1:/tmp/cvs-serv10412

Modified Files:
	INSTALL 
Log Message:
formatting issue 


Index: INSTALL
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/INSTALL,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** INSTALL	29 May 2002 03:40:07 -0000	1.5
--- INSTALL	1 Jul 2002 22:57:29 -0000	1.6
***************
*** 11,16 ****
      [1] Untar the distribution (be sure to untar the subdirectories)
          tar xvf phpPgAdmin_x.x.x.tar.gz
! 	[2] The file config.inc.php-dist is an example config file. You will
! 		need to make a copy of it called config.inc.php. 
      [3] Open the file config.inc.php in your favorite editor and change
          the values for host, user and password to fit your environment.
--- 11,16 ----
      [1] Untar the distribution (be sure to untar the subdirectories)
          tar xvf phpPgAdmin_x.x.x.tar.gz
!     [2] The file config.inc.php-dist is an example config file. You will
!         need to make a copy of it called config.inc.php. 
      [3] Open the file config.inc.php in your favorite editor and change
          the values for host, user and password to fit your environment.
***************
*** 22,31 ****
          in your browser. phpPgAdmin should now display a welcome screen 
          and your databases or a login screen, depending on your 
! 		authentication method.
  
    Installation notes:
    + It is highly suggested that you create a user to use in 
      your config.inc.php file.  This user should have select access on the 
! 	pg_user table and no other permissions.
    + Be sure to protect the phpPgAdmin-directory. By default, it is not 
      protected in any way! It shouldn't be readable by anyone and 
--- 22,31 ----
          in your browser. phpPgAdmin should now display a welcome screen 
          and your databases or a login screen, depending on your 
!         authentication method.
  
    Installation notes:
    + It is highly suggested that you create a user to use in 
      your config.inc.php file.  This user should have select access on the 
!     pg_user table and no other permissions.
    + Be sure to protect the phpPgAdmin-directory. By default, it is not 
      protected in any way! It shouldn't be readable by anyone and

[ppa-cvs] CVS: phpPgAdmin Documentation.html,1.8,1.9

From: Robert T. <xz...@us...> - 2002-07-01 22:56:27

Update of /cvsroot/phppgadmin/phpPgAdmin
In directory usw-pr-cvs1:/tmp/cvs-serv9998

Modified Files:
	Documentation.html 
Log Message:
Added note regarding security


Index: Documentation.html
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/Documentation.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Documentation.html	7 Apr 2002 18:01:27 -0000	1.8
--- Documentation.html	1 Jul 2002 22:56:21 -0000	1.9
***************
*** 108,112 ****
  <p><b>$cfgPersistentConnections </b>boolean<br>
    Whether persistent connections should be used or not (pg_connect or pg_pconnect). 
!   Persistent connection are not currently recomended as the author has expirienced unexpected results.</p>
  <!--p><b>$cfgPostgreSQLadmin </b>string<br>
    Path to PostgreSQL Admin. Only used to reload PostgreSQL.</p-->
--- 108,112 ----
  <p><b>$cfgPersistentConnections </b>boolean<br>
    Whether persistent connections should be used or not (pg_connect or pg_pconnect). 
!   Persistent connection are not currently recomended as the author has experienced unexpected results.</p>
  <!--p><b>$cfgPostgreSQLadmin </b>string<br>
    Path to PostgreSQL Admin. Only used to reload PostgreSQL.</p-->
***************
*** 183,187 ****
  <p><b>What's the preferred way of making phpPgAdmin secure against evil access?<br>
    </b>
!   This depends on your system. If you're running a server which cannot be accessed by other people, it's sufficient to use the directory protection bundled with your webserver (with Apache you can use .htaccess files, for example). If other people have telnet access to your server, it's not a good idea to store the PostgreSQL password in clear text in your config.inc.php file. You should use phpPgAdmin's advanced authentification feature in this case.
  </body>
  </html>
--- 183,187 ----
  <p><b>What's the preferred way of making phpPgAdmin secure against evil access?<br>
    </b>
!   This depends on your system. If you're running a server which cannot be accessed by other people, it's sufficient to use the directory protection bundled with your webserver (with Apache you can use .htaccess files, for example). If other people have telnet access to your server, it's not a good idea to store the PostgreSQL password in clear text in your config.inc.php file. You should use phpPgAdmin's advanced authentification feature in this case. Please be aware that phpPgAdmin's security is only as good as your databases security itself. If you have an open configuration of the database (like using trusted connections) phpPgAdmin's security features probably won't help you. For more information on this see the postgresql documentation.    
  </body>
  </html>

[ppa-cvs] CVS: phpPgAdmin sql.php,1.18,1.19

From: Dan W. <kil...@us...> - 2002-06-28 17:06:28

Update of /cvsroot/phppgadmin/phpPgAdmin
In directory usw-pr-cvs1:/tmp/cvs-serv10967

Modified Files:
	sql.php 
Log Message:
* Fixed bug where the ereg would not work because of the urlencoding

Index: sql.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/sql.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** sql.php	27 Jun 2002 18:18:01 -0000	1.18
--- sql.php	28 Jun 2002 17:06:25 -0000	1.19
***************
*** 18,24 ****
  
  
! // Check if table should be dropped
! // $is_drop_sql_query = eregi("DROP +TABLE|DATABASE|SEQUENCE|FUNCTION|VIEW|USER ALTER TABLE +[[:alnum:]]* +DROP|DELETE FROM", $sql_query); // Get word "drop"
! $is_drop_sql_query = eregi("[[:space:]]*(DROP|ALTER|DELETE)[[:space:]]+", $sql_query); // Get word "drop"
  
  if (!$cfgConfirm) {
--- 18,23 ----
  
  
! // Check if query needs confirmation
! $is_drop_sql_query = eregi("[[:space:]]*(DROP|ALTER|DELETE)[[:space:]]+", urldecode($sql_query)); // Get word "drop"
  
  if (!$cfgConfirm) {
***************
*** 29,33 ****
     include("header.inc.php");
     echo $strDoYouReally.urldecode(stripslashes(nl2br(htmlentities($sql_query))))."?<br>";
! 	if (eregi("(CREATE|DROP)[[:space:]]+(TABLE|DATABASE)", $sql_query)) {
  		$reload = "true";
  	}
--- 28,32 ----
     include("header.inc.php");
     echo $strDoYouReally.urldecode(stripslashes(nl2br(htmlentities($sql_query))))."?<br>";
! 	if (eregi("(CREATE|DROP)[[:space:]]+(TABLE|DATABASE)[[:space:]]+", urldecode($sql_query))) {
  		$reload = "true";
  	}

[ppa-cvs] CVS: phpPgAdmin sql.php,1.17,1.18

From: Dan W. <kil...@us...> - 2002-06-27 18:18:04

Update of /cvsroot/phppgadmin/phpPgAdmin
In directory usw-pr-cvs1:/tmp/cvs-serv28783

Modified Files:
	sql.php 
Log Message:
Fixed bug that I introduced that would not catch the DROP for confirmation

Index: sql.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/sql.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** sql.php	17 Jun 2002 22:12:12 -0000	1.17
--- sql.php	27 Jun 2002 18:18:01 -0000	1.18
***************
*** 20,24 ****
  // Check if table should be dropped
  // $is_drop_sql_query = eregi("DROP +TABLE|DATABASE|SEQUENCE|FUNCTION|VIEW|USER ALTER TABLE +[[:alnum:]]* +DROP|DELETE FROM", $sql_query); // Get word "drop"
! $is_drop_sql_query = eregi("[[:space:]]+(DROP|ALTER|DELETE)[[:space:]]+", $sql_query); // Get word "drop"
  
  if (!$cfgConfirm) {
--- 20,24 ----
  // Check if table should be dropped
  // $is_drop_sql_query = eregi("DROP +TABLE|DATABASE|SEQUENCE|FUNCTION|VIEW|USER ALTER TABLE +[[:alnum:]]* +DROP|DELETE FROM", $sql_query); // Get word "drop"
! $is_drop_sql_query = eregi("[[:space:]]*(DROP|ALTER|DELETE)[[:space:]]+", $sql_query); // Get word "drop"
  
  if (!$cfgConfirm) {

[ppa-cvs] CVS: phpPgAdmin db_dump.php,1.19,1.20

From: Dan W. <kil...@us...> - 2002-06-27 18:16:27

Update of /cvsroot/phppgadmin/phpPgAdmin
In directory usw-pr-cvs1:/tmp/cvs-serv28491

Modified Files:
	db_dump.php 
Log Message:
Updated UPPER_CASE SQL for sequences

Index: db_dump.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/db_dump.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** db_dump.php	27 Jun 2002 16:42:37 -0000	1.19
--- db_dump.php	27 Jun 2002 18:16:23 -0000	1.20
***************
*** 71,75 ****
  			}
  			if ($drop) print "DROP SEQUENCE $cfgQuotes$sequence$cfgQuotes;$crlf";
! 			print "CREATE SEQUENCE $cfgQuotes$sequence$cfgQuotes start $row[last_value] increment $row[increment_by] maxvalue $row[max_value] minvalue $row[min_value] cache $row[cache_value]; $crlf";
  		}
  		if (($row[last_value] > 1) && ($what == "data")) {
--- 71,75 ----
  			}
  			if ($drop) print "DROP SEQUENCE $cfgQuotes$sequence$cfgQuotes;$crlf";
! 			print "CREATE SEQUENCE $cfgQuotes$sequence$cfgQuotes START $row[last_value] INCREMENT $row[increment_by] MAXVALUE $row[max_value] MINVALUE $row[min_value] CACHE $row[cache_value]; $crlf";
  		}
  		if (($row[last_value] > 1) && ($what == "data")) {

[ppa-cvs] CVS: phpPgAdmin ChangeLog,1.24,1.25 db_dump.php,1.18,1.19

From: Dan W. <kil...@us...> - 2002-06-27 16:42:40

Update of /cvsroot/phppgadmin/phpPgAdmin
In directory usw-pr-cvs1:/tmp/cvs-serv32140

Modified Files:
	ChangeLog db_dump.php 
Log Message:
Fixed bug #564600 -- corrupt triggers in dump as file

Index: ChangeLog
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/ChangeLog,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** ChangeLog	4 Jun 2002 18:24:50 -0000	1.24
--- ChangeLog	27 Jun 2002 16:42:37 -0000	1.25
***************
*** 1,24 ****
  phpPgAdmin - ChangeLog
  v 2.4.2 - 06/**/2002 
! 	+ Lang: Added hungarian translation - Vizi Tibor [vi...@br...]
! 	+ Fix: Fixed problem with new Pg 7.2 keywords 
! 	+ Fix: Cleaned up documentation links
! 	+ Lang: Added turkish translation
! 	+ Lang: Updated german translation - Jurgen Nagel [jn...@fi...]
! 	+ Lang: Updated portugese translation - Paulo Siqueira [pau...@us...]
! 	+ Feature: Added display of 'Database ' when creating new db
! 	+ BugFix: DROP DATABASE error in db_details.php
! 	+ Fix: Resolved problem with SERIALS and lengths and defaults
! 	+ Fix: Fixed error from NOT NULL clause in 7.2 install
! 	+ BugFix: Formalized the MD5 support
! 	+ BugFix: Fixed error on file stat when the goto was not just a filename
! 	+ BugFix: Enhanced nav menu and css support for various browsers
! 	+ BugFix: only_db setting wasn't being enforced on all_db view 
! 	+ Lang: Added basque translation - Pello Xabier Altadill Izura [pel...@te...]
! 	+ Feature: Added support for new 7.2 privileges keywords
! 	+ BugFix: Added code to allow for register_globals set to Off
! 	+ Feature: Added ability to login with user that has no password
! 	+ Feature: Added detection of table in manual entry query (allows for edit/delete buttons)
! 	+ Lang: Added Dutch translation - Hugo Jonker [hu...@ge...]
  	
  v 2.4.1	- 03/01/2002
--- 1,25 ----
  phpPgAdmin - ChangeLog
  v 2.4.2 - 06/**/2002 
! 	+ Lang: 	Added hungarian translation - Vizi Tibor [vi...@br...]
! 	+ BugFix:	Fixed problem with new Pg 7.2 keywords 
! 	+ BugFix:	Cleaned up documentation links
! 	+ Lang: 	Added turkish translation
! 	+ Lang: 	Updated german translation - Jurgen Nagel [jn...@fi...]
! 	+ Lang: 	Updated portugese translation - Paulo Siqueira [pau...@us...]
! 	+ Feature: 	Added display of 'Database ' when creating new db
! 	+ BugFix: 	DROP DATABASE error in db_details.php
! 	+ BugFix:	Resolved problem with SERIALS and lengths and defaults
! 	+ BugFix:	Fixed error from NOT NULL clause in 7.2 install
! 	+ BugFix:	Formalized the MD5 support
! 	+ BugFix:	Fixed error on file stat when the goto was not just a filename
! 	+ BugFix:	Enhanced nav menu and css support for various browsers
! 	+ BugFix:	only_db setting wasn't being enforced on all_db view 
! 	+ Lang: 	Added basque translation - Pello Xabier Altadill Izura [pel...@te...]
! 	+ Feature:	Added support for new 7.2 privileges keywords
! 	+ BugFix:	Added code to allow for register_globals set to Off
! 	+ Feature:	Added ability to login with user that has no password
! 	+ Feature:	Added detection of table in manual entry query (allows for edit/delete buttons)
! 	+ Lang: 	Added Dutch translation - Hugo Jonker [hu...@ge...]
! 	+ BugFix:	Fixed corrupt trigger dump [Bug #564600]
  	
  v 2.4.1	- 03/01/2002

Index: db_dump.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/db_dump.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** db_dump.php	4 Feb 2002 16:19:39 -0000	1.18
--- db_dump.php	27 Jun 2002 16:42:37 -0000	1.19
***************
*** 310,314 ****
  		}
  		$params = implode("', '", $params);
! 		echo htmlspecialchars($params), "');$crlf";
  	}
  }
--- 310,318 ----
  		}
  		$params = implode("', '", $params);
! 		if ($asfile) {
! 			echo htmlspecialchars($params), "');$crlf";
! 		} else {
! 			echo $params, "');$crlf";
! 		}
  	}
  }

[ppa-cvs] CVS: www-site/functions mail.php,1.3,1.4

From: Dan W. <kil...@us...> - 2002-06-22 14:53:54

Update of /cvsroot/phppgadmin/www-site/functions
In directory usw-pr-cvs1:/tmp/cvs-serv7951

Modified Files:
	mail.php 
Log Message:
Added a stripslashes to the text of the email

Index: mail.php
===================================================================
RCS file: /cvsroot/phppgadmin/www-site/functions/mail.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mail.php	29 Apr 2002 15:47:45 -0000	1.3
--- mail.php	22 Jun 2002 14:53:51 -0000	1.4
***************
*** 9,13 ****
  	$subject = "Online Contact Form";
  
! 	$message = $comments;
  	$message .= "\n\nSent via Contact Form on phppgadmin.sourceforge.net";
  
--- 9,13 ----
  	$subject = "Online Contact Form";
  
! 	$message =stripslashes($comments);
  	$message .= "\n\nSent via Contact Form on phppgadmin.sourceforge.net";

[ppa-cvs] CVS: phpPgAdmin db_details.php,1.24,1.25 tbl_properties.inc.php,1.8,1.9

From: Dan W. <kil...@us...> - 2002-06-20 17:19:41

Update of /cvsroot/phppgadmin/phpPgAdmin
In directory usw-pr-cvs1:/tmp/cvs-serv10339

Modified Files:
	db_details.php tbl_properties.inc.php 
Log Message:
Fixed bug #565402 (mozilla UI issues)

Index: db_details.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/db_details.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** db_details.php	1 Jun 2002 14:50:57 -0000	1.24
--- db_details.php	20 Jun 2002 17:19:37 -0000	1.25
***************
*** 409,413 ****
  <input type="hidden" name="goto" value="db_details.php">
  <input type="hidden" name="zero_rows" value="<?php echo $strSuccess; ?>">
! <?php echo $strRunSQLQuery.$db." ".show_docu("sql-select.html");?>:<br><a name="sql_box">
  <textarea name="sql_query" cols="60" rows="6" wrap="VIRTUAL" style="width: <?php echo $cfgMaxTextAreaSize;?>"><?php echo stripslashes($sql_query); ?></textarea>
  <input type="submit" name="SQL" value="<?php echo $strGo; ?>">
--- 409,413 ----
  <input type="hidden" name="goto" value="db_details.php">
  <input type="hidden" name="zero_rows" value="<?php echo $strSuccess; ?>">
! <?php echo $strRunSQLQuery.$db." ".show_docu("sql-select.html");?>:<br><a name="sql_box"></a>
  <textarea name="sql_query" cols="60" rows="6" wrap="VIRTUAL" style="width: <?php echo $cfgMaxTextAreaSize;?>"><?php echo stripslashes($sql_query); ?></textarea>
  <input type="submit" name="SQL" value="<?php echo $strGo; ?>">

Index: tbl_properties.inc.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/tbl_properties.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tbl_properties.inc.php	28 May 2002 22:48:35 -0000	1.8
--- tbl_properties.inc.php	20 Jun 2002 17:19:38 -0000	1.9
***************
*** 10,14 ****
  <th><?php echo $strField; ?></th>
  <?php
! 	if ($action != "tbl_alter.php") {
  		$strDocsLink = "sql-altertable.html";
  	} else {
--- 10,14 ----
  <th><?php echo $strField; ?></th>
  <?php
! 	if ($action == "tbl_alter.php") {
  		$strDocsLink = "sql-altertable.html";
  	} else {
***************
*** 208,212 ****
  	</tr>
  	<tr>
! 		<td align="center" colspan="5">
  			<?php print show_docu($strDocsLink);?>
  		</td>
--- 208,212 ----
  	</tr>
  	<tr>
! 		<td colspan="5">
  			<?php print show_docu($strDocsLink);?>
  		</td>

[ppa-cvs] CVS: phpPgAdmin lib.inc.php,1.64,1.65 sql.php,1.16,1.17

From: Dan W. <kil...@us...> - 2002-06-17 22:12:16

Update of /cvsroot/phppgadmin/phpPgAdmin
In directory usw-pr-cvs1:/tmp/cvs-serv24977

Modified Files:
	lib.inc.php sql.php 
Log Message:
Fixed problems with order by when sorting on a column

Index: lib.inc.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/lib.inc.php,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** lib.inc.php	1 Jun 2002 15:28:30 -0000	1.64
--- lib.inc.php	17 Jun 2002 22:12:12 -0000	1.65
***************
*** 906,910 ****
  			<td bgcolor="<?php echo $GLOBALS['cfgThBgcolor'];?>">
  				<b><?php echo $message; ?><b> 
! 				- <a href="db_details.php?<?php echo "server=", $GLOBALS['server'], "&db=", $GLOBALS['db'], "&sql_query=", urlencode($GLOBALS['sql_query'].$GLOBALS['sql_order']); ?>"><?php echo $GLOBALS['strEdit']; ?></a><br>
  			</td>
  		</tr>
--- 906,910 ----
  			<td bgcolor="<?php echo $GLOBALS['cfgThBgcolor'];?>">
  				<b><?php echo $message; ?><b> 
! 				- <a href="db_details.php?<?php echo "server=", $GLOBALS['server'], "&db=", $GLOBALS['db'], "&sql_query=", urlencode($GLOBALS['sql_query']. " " . $GLOBALS['sql_order']); ?>"><?php echo $GLOBALS['strEdit']; ?></a><br>
  			</td>
  		</tr>
***************
*** 917,921 ****
  				}
  			?>
! 			<?php echo $GLOBALS['strSQLQuery'].":\n<br>", stripslashes(nl2br(htmlentities($GLOBALS['sql_query'].$GLOBALS['sql_order'])));?>
  			</td>
  		</tr>
--- 917,921 ----
  				}
  			?>
! 			<?php echo $GLOBALS['strSQLQuery'].":\n<br>", stripslashes(nl2br(htmlentities($GLOBALS['sql_query'] . " " . $GLOBALS['sql_order'])));?>
  			</td>
  		</tr>

Index: sql.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/sql.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** sql.php	3 Jun 2002 17:22:58 -0000	1.16
--- sql.php	17 Jun 2002 22:12:12 -0000	1.17
***************
*** 20,24 ****
  // Check if table should be dropped
  // $is_drop_sql_query = eregi("DROP +TABLE|DATABASE|SEQUENCE|FUNCTION|VIEW|USER ALTER TABLE +[[:alnum:]]* +DROP|DELETE FROM", $sql_query); // Get word "drop"
! $is_drop_sql_query = eregi("DROP|ALTER|DELETE", $sql_query); // Get word "drop"
  
  if (!$cfgConfirm) {
--- 20,24 ----
  // Check if table should be dropped
  // $is_drop_sql_query = eregi("DROP +TABLE|DATABASE|SEQUENCE|FUNCTION|VIEW|USER ALTER TABLE +[[:alnum:]]* +DROP|DELETE FROM", $sql_query); // Get word "drop"
! $is_drop_sql_query = eregi("[[:space:]]+(DROP|ALTER|DELETE)[[:space:]]+", $sql_query); // Get word "drop"
  
  if (!$cfgConfirm) {
***************
*** 29,33 ****
     include("header.inc.php");
     echo $strDoYouReally.urldecode(stripslashes(nl2br(htmlentities($sql_query))))."?<br>";
! 	if (eregi("create table|drop table|create database|drop database", $sql_query)) {
  		$reload = "true";
  	}
--- 29,33 ----
     include("header.inc.php");
     echo $strDoYouReally.urldecode(stripslashes(nl2br(htmlentities($sql_query))))."?<br>";
! 	if (eregi("(CREATE|DROP)[[:space:]]+(TABLE|DATABASE)", $sql_query)) {
  		$reload = "true";
  	}
***************
*** 109,119 ****
  		$sql_order = isset($sql_order) ? stripslashes($sql_order) : '';
  		if (!$limited) {
! 			if (!$result = @pg_exec($link, pre_query($sql_query.$sql_order))) {
  				include("header.inc.php");
! 				pg_die(pg_errormessage($link), $sql_query.$sql_order, __FILE__, __LINE__);
  			}
  			$num_rows = @pg_numrows($result);
  			if ($num_rows < 1 || ($rel_type == "sequence" && eregi($sql_query, "setval"))) {
! 				if (eregi("delete|insert|update", $sql_query)) {
  					$affected_rows = @pg_cmdtuples($result);
  				} else {
--- 109,119 ----
  		$sql_order = isset($sql_order) ? stripslashes($sql_order) : '';
  		if (!$limited) {
! 			if (!$result = @pg_exec($link, pre_query($sql_query . " " . $sql_order))) {
  				include("header.inc.php");
! 				pg_die(pg_errormessage($link), $sql_query . " " . $sql_order, __FILE__, __LINE__);
  			}
  			$num_rows = @pg_numrows($result);
  			if ($num_rows < 1 || ($rel_type == "sequence" && eregi($sql_query, "setval"))) {
! 				if (eregi("(DELETE|INSERT|UPDATE)[[:space:]]+", $sql_query)) {
  					$affected_rows = @pg_cmdtuples($result);
  				} else {

[ppa-cvs] CVS: phpPgAdmin tbl_copy.php,1.3,1.4

From: Dan W. <kil...@us...> - 2002-06-17 17:39:38

Update of /cvsroot/phppgadmin/phpPgAdmin
In directory usw-pr-cvs1:/tmp/cvs-serv800

Modified Files:
	tbl_copy.php 
Log Message:
Fixed issues with table copy if table name is very short and conflicts with data types -- still might have problems if the primary key is named different from the name of the original table, but that hasn't changed

Index: tbl_copy.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/tbl_copy.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tbl_copy.php	19 Apr 2001 02:55:27 -0000	1.3
--- tbl_copy.php	17 Jun 2002 17:39:34 -0000	1.4
***************
*** 8,22 ****
  function my_handler($sql_insert)
  {
! 	global $table, $link, $new_name;
  	$sql_insert = ereg_replace($table, $new_name, $sql_insert);
  	$result = pg_exec($link, pre_query($sql_insert)) or pg_die(pg_errormessage($link), $sql_insert, __FILE__, __LINE__);
! 	$sql_query = $sql_insert;
  }
  
  $sql_structure = get_table_def($link, $table, "\n");
! $sql_structure = ereg_replace($table, $new_name, $sql_structure);
  
  $result = @pg_exec($link, pre_query($sql_structure)) or pg_die(pg_errormessage($link), $sql_structure, __FILE__, __LINE__);
! $sql_query .= "\n$sql_structure";
  
  if ($what == "data") {
--- 8,22 ----
  function my_handler($sql_insert)
  {
! 	global $table, $link, $new_name, $sql_query;
  	$sql_insert = ereg_replace($table, $new_name, $sql_insert);
  	$result = pg_exec($link, pre_query($sql_insert)) or pg_die(pg_errormessage($link), $sql_insert, __FILE__, __LINE__);
! 	$sql_query .= $sql_insert . ";\n";
  }
  
  $sql_structure = get_table_def($link, $table, "\n");
! $sql_structure = ereg_replace("([[:space:]]+[\"]*)" . $table . "([\"_]*[[:space:]]*)", "\\1" . $new_name . "\\2", $sql_structure);
  
  $result = @pg_exec($link, pre_query($sql_structure)) or pg_die(pg_errormessage($link), $sql_structure, __FILE__, __LINE__);
! $sql_query .= "\n$sql_structure\n";
  
  if ($what == "data") {

[ppa-cvs] CVS: phpPgAdmin tbl_replace.php,1.12,1.13

From: Christopher Kings-L. <ch...@us...> - 2002-06-13 02:08:49

Update of /cvsroot/phppgadmin/phpPgAdmin
In directory usw-pr-cvs1:/tmp/cvs-serv17720

Modified Files:
	tbl_replace.php 
Log Message:
Fixed failure to quote text fields.  From Steven Green (gre...@us...)

Index: tbl_replace.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/tbl_replace.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** tbl_replace.php	28 May 2002 20:47:29 -0000	1.12
--- tbl_replace.php	13 Jun 2002 02:08:44 -0000	1.13
***************
*** 14,18 ****
  	while (list($key, $val) = each($fields)) {
  		if (!eregi("^'[[:alnum:][:punct:][:cntrl:][:space:]]*'$", $val) && empty($funcs[$key])) {
! 			if (eregi("char|date|bool|time|inet", $field_type[$key])) {
  				$strValDelim = "'";
  			}
--- 14,18 ----
  	while (list($key, $val) = each($fields)) {
  		if (!eregi("^'[[:alnum:][:punct:][:cntrl:][:space:]]*'$", $val) && empty($funcs[$key])) {
! 			if (eregi("char|date|bool|time|inet|text", $field_type[$key])) {
  				$strValDelim = "'";
  			}
***************
*** 44,48 ****
  		// Check to see if there are already single quotes and are not a function
  		if (!eregi("^'[[:alnum:][:punct:][:cntrl:][:space:]]*'$", $val) && empty($funcs[$key])) {
! 			if (eregi("char|date|bool|time|inet", $field_type[$key])) {
  				$strValDelim = "'";
  			}
--- 44,48 ----
  		// Check to see if there are already single quotes and are not a function
  		if (!eregi("^'[[:alnum:][:punct:][:cntrl:][:space:]]*'$", $val) && empty($funcs[$key])) {
! 			if (eregi("char|date|bool|time|inet|text", $field_type[$key])) {
  				$strValDelim = "'";
  			}

[ppa-cvs] CVS: phpPgAdmin ChangeLog,1.23,1.24 config.inc.php-dist,1.9,1.10

From: Dan W. <kil...@us...> - 2002-06-04 18:24:55

Update of /cvsroot/phppgadmin/phpPgAdmin
In directory usw-pr-cvs1:/tmp/cvs-serv3018

Modified Files:
	ChangeLog config.inc.php-dist 
Log Message:
Prepare for beta release

Index: ChangeLog
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** ChangeLog	29 May 2002 04:14:47 -0000	1.23
--- ChangeLog	4 Jun 2002 18:24:50 -0000	1.24
***************
*** 1,7 ****
  phpPgAdmin - ChangeLog
! v 2.4.2 - 06/01/2002 
  	+ Lang: Added hungarian translation - Vizi Tibor [vi...@br...]
  	+ Fix: Fixed problem with new Pg 7.2 keywords 
! 	+ Fix: Cleaned up documentation 
  	+ Lang: Added turkish translation
  	+ Lang: Updated german translation - Jurgen Nagel [jn...@fi...]
--- 1,7 ----
  phpPgAdmin - ChangeLog
! v 2.4.2 - 06/**/2002 
  	+ Lang: Added hungarian translation - Vizi Tibor [vi...@br...]
  	+ Fix: Fixed problem with new Pg 7.2 keywords 
! 	+ Fix: Cleaned up documentation links
  	+ Lang: Added turkish translation
  	+ Lang: Updated german translation - Jurgen Nagel [jn...@fi...]
***************
*** 16,19 ****
--- 16,24 ----
  	+ BugFix: only_db setting wasn't being enforced on all_db view 
  	+ Lang: Added basque translation - Pello Xabier Altadill Izura [pel...@te...]
+ 	+ Feature: Added support for new 7.2 privileges keywords
+ 	+ BugFix: Added code to allow for register_globals set to Off
+ 	+ Feature: Added ability to login with user that has no password
+ 	+ Feature: Added detection of table in manual entry query (allows for edit/delete buttons)
+ 	+ Lang: Added Dutch translation - Hugo Jonker [hu...@ge...]
  	
  v 2.4.1	- 03/01/2002

Index: config.inc.php-dist
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/config.inc.php-dist,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** config.inc.php-dist	28 May 2002 22:48:35 -0000	1.9
--- config.inc.php-dist	4 Jun 2002 18:24:50 -0000	1.10
***************
*** 4,8 ****
  // Set the name and version
  $cfgProgName 	= "phpPgAdmin";
! $cfgVersion 	= "2.4.2";
  
  // The default database is used to connect to the database to check the adv_auth
--- 4,8 ----
  // Set the name and version
  $cfgProgName 	= "phpPgAdmin";
! $cfgVersion 	= "2.4.2-beta";
  
  // The default database is used to connect to the database to check the adv_auth

[ppa-cvs] CVS: phpPgAdmin sql.php,1.15,1.16

From: Dan W. <kil...@us...> - 2002-06-03 17:23:03

Update of /cvsroot/phppgadmin/phpPgAdmin
In directory usw-pr-cvs1:/tmp/cvs-serv3719

Modified Files:
	sql.php 
Log Message:
Fixed regex... this will not work on tables with spaces in the name (even with quotes around it)... if anyone else wants to try to figure this out with the spaces, feel free http://dan.acucore.com/regex.php for regex testing

Index: sql.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/sql.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** sql.php	1 Jun 2002 14:50:58 -0000	1.15
--- sql.php	3 Jun 2002 17:22:58 -0000	1.16
***************
*** 59,63 ****
  		$sql_order = isset($sql_order) ? trim(stripslashes($sql_order)) : '';
  
! 		$select_parse = "^SELECT[[:space:]]+.+[[:space:]]FROM[[:space:]]+[\"]*([[:alnum:][:space:]_]+)[\"]*[[:space:]]*[WHERE]*[[:space:]]*(.*)";
  		if (empty($table)) {
  			if (eregi($select_parse, trim(stripslashes($sql_query)), $qr_parts)) {
--- 59,63 ----
  		$sql_order = isset($sql_order) ? trim(stripslashes($sql_order)) : '';
  
! 		$select_parse = "^SELECT[[:space:]]+.+[[:space:]]FROM[[:space:]]+[\"]*([[:alnum:]_]+)[\"]*[[:space:]]*[WHERE]*[[:space:]]*(.*)";
  		if (empty($table)) {
  			if (eregi($select_parse, trim(stripslashes($sql_query)), $qr_parts)) {

[ppa-cvs] CVS: phpPgAdmin lib.inc.php,1.63,1.64

From: Dan W. <kil...@us...> - 2002-06-01 15:28:34

Update of /cvsroot/phppgadmin/phpPgAdmin
In directory usw-pr-cvs1:/tmp/cvs-serv25126

Modified Files:
	lib.inc.php 
Log Message:
slight adjustment to allowing nulls in unique keys

Index: lib.inc.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/lib.inc.php,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** lib.inc.php	1 Jun 2002 15:13:32 -0000	1.63
--- lib.inc.php	1 Jun 2002 15:28:30 -0000	1.64
***************
*** 487,491 ****
  					if (eregi("text|name|char|inet|bool", $field_type)) {
  						$strQuote = "'";
! 						$add_null = true;
  					} elseif (eregi("date|time", $field_type)) {
  						if (empty($row[$i_field])) {
--- 487,491 ----
  					if (eregi("text|name|char|inet|bool", $field_type)) {
  						$strQuote = "'";
! 						$add_null = empty($row[$i_field]) ? true : false;
  					} elseif (eregi("date|time", $field_type)) {
  						if (empty($row[$i_field])) {

[ppa-cvs] CVS: phpPgAdmin lib.inc.php,1.62,1.63

From: Dan W. <kil...@us...> - 2002-06-01 15:13:35

Update of /cvsroot/phppgadmin/phpPgAdmin
In directory usw-pr-cvs1:/tmp/cvs-serv21915

Modified Files:
	lib.inc.php 
Log Message:
Accounted for NULL in unique key for edit/delete

Index: lib.inc.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/lib.inc.php,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** lib.inc.php	1 Jun 2002 14:50:58 -0000	1.62
--- lib.inc.php	1 Jun 2002 15:13:32 -0000	1.63
***************
*** 484,492 ****
  			}
  			for ($i_pri_keys = 0; $i_pri_keys < count($pri_keys); $i_pri_keys++) {
- 				// echo $field_name;
  				if ($field_name == $pri_keys[$i_pri_keys]) {
- 					$primary_key .= "$cfgQuotes$field_name$cfgQuotes = ";
  					if (eregi("text|name|char|inet|bool", $field_type)) {
  						$strQuote = "'";
  					} elseif (eregi("date|time", $field_type)) {
  						if (empty($row[$i_field])) {
--- 484,491 ----
  			}
  			for ($i_pri_keys = 0; $i_pri_keys < count($pri_keys); $i_pri_keys++) {
  				if ($field_name == $pri_keys[$i_pri_keys]) {
  					if (eregi("text|name|char|inet|bool", $field_type)) {
  						$strQuote = "'";
+ 						$add_null = true;
  					} elseif (eregi("date|time", $field_type)) {
  						if (empty($row[$i_field])) {
***************
*** 498,504 ****
  					} else {
  						unset($strQuotes);
- 						// $primary_key .= "$row[$i_field]";
  					}
  					$primary_key .= $strQuote . $row[$i_field] . $strQuote;
  					$primary_key .= " AND ";
  					break; // This breaks us out in case the primary key column also has a seperate unique key index created on it
--- 497,505 ----
  					} else {
  						unset($strQuotes);
  					}
+ 					if ($add_null) $primary_key .= " (";
+ 					$primary_key .= "$cfgQuotes$field_name$cfgQuotes = ";
  					$primary_key .= $strQuote . $row[$i_field] . $strQuote;
+ 					if ($add_null) 	$primary_key .= " OR $cfgQuotes$field_name$cfgQuotes = NULL)";
  					$primary_key .= " AND ";
  					break; // This breaks us out in case the primary key column also has a seperate unique key index created on it

[ppa-cvs] CVS: phpPgAdmin db_details.php,1.23,1.24 lib.inc.php,1.61,1.62 sql.php,1.14,1.15

From: Dan W. <kil...@us...> - 2002-06-01 14:51:02

Update of /cvsroot/phppgadmin/phpPgAdmin
In directory usw-pr-cvs1:/tmp/cvs-serv16947

Modified Files:
	db_details.php lib.inc.php sql.php 
Log Message:
Allowed for detection of table in manually entered query (so we can grab primary keys for edit/delete) -- also provide edit link to edit the query again

Index: db_details.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/db_details.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** db_details.php	28 May 2002 22:48:35 -0000	1.23
--- db_details.php	1 Jun 2002 14:50:57 -0000	1.24
***************
*** 409,413 ****
  <input type="hidden" name="goto" value="db_details.php">
  <input type="hidden" name="zero_rows" value="<?php echo $strSuccess; ?>">
! <?php echo $strRunSQLQuery.$db." ".show_docu("sql-select.html");?>:<br>
  <textarea name="sql_query" cols="60" rows="6" wrap="VIRTUAL" style="width: <?php echo $cfgMaxTextAreaSize;?>"><?php echo stripslashes($sql_query); ?></textarea>
  <input type="submit" name="SQL" value="<?php echo $strGo; ?>">
--- 409,413 ----
  <input type="hidden" name="goto" value="db_details.php">
  <input type="hidden" name="zero_rows" value="<?php echo $strSuccess; ?>">
! <?php echo $strRunSQLQuery.$db." ".show_docu("sql-select.html");?>:<br><a name="sql_box">
  <textarea name="sql_query" cols="60" rows="6" wrap="VIRTUAL" style="width: <?php echo $cfgMaxTextAreaSize;?>"><?php echo stripslashes($sql_query); ?></textarea>
  <input type="submit" name="SQL" value="<?php echo $strGo; ?>">

Index: lib.inc.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/lib.inc.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** lib.inc.php	31 May 2002 00:04:36 -0000	1.61
--- lib.inc.php	1 Jun 2002 14:50:58 -0000	1.62
***************
*** 894,898 ****
  
  function show_message($message) {
- 	global $affected_rows;
  	if (!empty($GLOBALS['reload']) && ($GLOBALS['reload'] == "true")) { ?>
  	    <script language="JavaScript1.2">
--- 894,897 ----
***************
*** 905,909 ****
  		<tr>
  			<td bgcolor="<?php echo $GLOBALS['cfgThBgcolor'];?>">
! 				<b><?php echo $message; ?><b><br>
  			</td>
  		</tr>
--- 904,909 ----
  		<tr>
  			<td bgcolor="<?php echo $GLOBALS['cfgThBgcolor'];?>">
! 				<b><?php echo $message; ?><b> 
! 				- <a href="db_details.php?<?php echo "server=", $GLOBALS['server'], "&db=", $GLOBALS['db'], "&sql_query=", urlencode($GLOBALS['sql_query'].$GLOBALS['sql_order']); ?>"><?php echo $GLOBALS['strEdit']; ?></a><br>
  			</td>
  		</tr>
***************
*** 912,920 ****
  			<td bgcolor="<?php echo $GLOBALS['cfgBgcolorOne'];?>">
  			<?php 
! 				if (isset($affected_rows)) {
! 					echo $GLOBALS['strAffected'].": $affected_rows<br>\n"; 
  				}
  			?>
! 			<?php echo $GLOBALS['strSQLQuery'].":\n<br>", stripslashes(nl2br(htmlentities($GLOBALS['sql_query'])));?>
  			</td>
  		</tr>
--- 912,920 ----
  			<td bgcolor="<?php echo $GLOBALS['cfgBgcolorOne'];?>">
  			<?php 
! 				if (isset($GLOBALS['affected_rows'])) {
! 					echo $GLOBALS['strAffected'].": " . $GLOBALS['affected_rows'] . "<br>\n"; 
  				}
  			?>
! 			<?php echo $GLOBALS['strSQLQuery'].":\n<br>", stripslashes(nl2br(htmlentities($GLOBALS['sql_query'].$GLOBALS['sql_order'])));?>
  			</td>
  		</tr>

Index: sql.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/sql.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** sql.php	31 May 2002 00:02:55 -0000	1.14
--- sql.php	1 Jun 2002 14:50:58 -0000	1.15
***************
*** 54,90 ****
  		$reload = "true";
  	}
! 	// $sql_query = ereg_replace("\n|\r", " ", $sql_query);
  	if (!empty($sql_query)) {
! 		// Pull in the primary keys for this table
! 		$pri_query = "
! 			SELECT 
! 				ic.relname AS index_name, 
! 				bc.relname AS tab_name, 
! 				ta.attname AS column_name,
! 				i.indisunique AS unique_key,
! 				i.indisprimary AS primary_key
! 			FROM 
! 				pg_class bc,
! 				pg_class ic,
! 				pg_index i,
! 				pg_attribute ta,
! 				pg_attribute ia
! 			WHERE 
! 				bc.oid = i.indrelid
! 				AND ic.oid = i.indexrelid
! 				AND ia.attrelid = i.indexrelid
! 				AND ta.attrelid = bc.oid
! 				AND bc.relname = '$table'
! 				AND ta.attrelid = i.indrelid
! 				AND ta.attnum = i.indkey[ia.attnum-1]
! 			ORDER BY 
! 				index_name, tab_name, column_name
! 		";
! 	
! 		$pri_result = @pg_exec($link, pre_query($pri_query)) or pg_die(pg_errormessage(), $pri_query, __FILE__, __LINE__);
! 		$pri_num = @pg_numrows($pri_result);
  		
! 		for ($i_pri_rows = 0; $i_pri_rows < $pri_num; $i_pri_rows++) {
! 			 $pri_keys[] = pg_result($pri_result, $i_pri_rows, "column_name");
  		}
  		
--- 54,107 ----
  		$reload = "true";
  	}
! 
  	if (!empty($sql_query)) {
! 		$sql_query = isset($sql_query) ? trim(stripslashes($sql_query)) : '';
! 		$sql_order = isset($sql_order) ? trim(stripslashes($sql_order)) : '';
! 
! 		$select_parse = "^SELECT[[:space:]]+.+[[:space:]]FROM[[:space:]]+[\"]*([[:alnum:][:space:]_]+)[\"]*[[:space:]]*[WHERE]*[[:space:]]*(.*)";
! 		if (empty($table)) {
! 			if (eregi($select_parse, trim(stripslashes($sql_query)), $qr_parts)) {
! 				$table = $qr_parts[1];
! 			}
! 		}
! 
! 		if (!empty($table)) {
! 			// Pull in the primary keys for this table
! 			$pri_query = "
! 				SELECT 
! 					ic.relname AS index_name, 
! 					bc.relname AS tab_name, 
! 					ta.attname AS column_name,
! 					i.indisunique AS unique_key,
! 					i.indisprimary AS primary_key
! 				FROM 
! 					pg_class bc,
! 					pg_class ic,
! 					pg_index i,
! 					pg_attribute ta,
! 					pg_attribute ia
! 				WHERE 
! 					bc.oid = i.indrelid
! 					AND ic.oid = i.indexrelid
! 					AND ia.attrelid = i.indexrelid
! 					AND ta.attrelid = bc.oid
! 					AND bc.relname = '$table'
! 					AND ta.attrelid = i.indrelid
! 					AND ta.attnum = i.indkey[ia.attnum-1]
! 				ORDER BY 
! 					index_name, tab_name, column_name
! 			";
  		
! 			$pri_result = @pg_exec($link, pre_query($pri_query)) or pg_die(pg_errormessage(), $pri_query, __FILE__, __LINE__);
! 			$pri_num = @pg_numrows($pri_result);
! 			
! 			for ($i_pri_rows = 0; $i_pri_rows < $pri_num; $i_pri_rows++) {
! 				$pri_row = pg_fetch_array($pri_result, $i_pri_rows, PGSQL_ASSOC);
! 				if ($pri_row['primary_key'] == "t" || $pri_row['unique_key'] == "t") {
! 					$pri_keys[] = $pri_row['column_name'];
! 				}
! 			}
! 		} else {
! 			echo "<p class=\"generic\">No table detected... unable to retrieve primary or unique keys for edit/delete</p>";
  		}
  		
***************
*** 130,134 ****
  			case "sequence"	:
  				$sql_query = urlencode("SELECT SETVAL('$sequence', 1)");
! 				$goto = urlencode($QUERY_STRING);
  				echo "<li><a href=\"sql.php?server=$server&db=$db&table=$table&sql_query=$sql_query&goto=$goto\">Reset</a>";
  				break;
--- 147,151 ----
  			case "sequence"	:
  				$sql_query = urlencode("SELECT SETVAL('$sequence', 1)");
! 				$goto = urlencode($GLOBALS['QUERY_STRING']);
  				echo "<li><a href=\"sql.php?server=$server&db=$db&table=$table&sql_query=$sql_query&goto=$goto\">Reset</a>";
  				break;

[ppa-cvs] CVS: phpPgAdmin left.php,1.20,1.21

From: Dan W. <kil...@us...> - 2002-05-31 00:06:56

Update of /cvsroot/phppgadmin/phpPgAdmin
In directory usw-pr-cvs1:/tmp/cvs-serv2796

Modified Files:
	left.php 
Log Message:
simple code cleanup...

Index: left.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/left.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** left.php	28 May 2002 21:17:52 -0000	1.20
--- left.php	31 May 2002 00:06:43 -0000	1.21
***************
*** 89,96 ****
  
  <div ID="el<?php echo $j;?>Parent" CLASS="parent">
! <a class="item" HREF="db_details.php?server=<?php echo $server; ?>&db=<?php echo $db; ?>" onClick="expandBase('el<?php echo trim($j);?>', true); return false;">
!     <img NAME="imEx" ID="el<?php echo $j;?>Img" SRC="images/plus.gif" BORDER="0" ALT="+" width="9" height="9"></a>
! <a class="item" HREF="db_details.php?server=<?php echo $server; ?>&db=<?php echo $db; ?>" onClick="expandBase('el<?php echo trim($j);?>', false);">
!     <font color="black" class="heada"><?php echo trim($db);?></font></a>
  </div>
  
--- 89,94 ----
  
  <div ID="el<?php echo $j;?>Parent" CLASS="parent">
! <a class="item" HREF="db_details.php?server=<?php echo $server; ?>&db=<?php echo $db; ?>" onClick="expandBase('el<?php echo trim($j);?>', true); return false;"><img NAME="imEx" ID="el<?php echo $j;?>Img" SRC="images/plus.gif" BORDER="0" ALT="+" width="9" height="9"></a>
! <a class="item" HREF="db_details.php?server=<?php echo $server; ?>&db=<?php echo $db; ?>" onClick="expandBase('el<?php echo trim($j);?>', false);"><font color="black" class="heada"><?php echo trim($db);?></font></a>
  </div>
  
***************
*** 108,113 ****
  ?>
      <nobr><img src="images/spacer.gif" border="0" width="9" height="9" alt="" />
!     <a target="main" href="sql.php?sql_query=<?php echo urlencode("SELECT * FROM $cfgQuotes$table$cfgQuotes");?>&server=<?php echo $server;?>&db=<?php echo urlencode($db);?>&table=<?php echo urlencode($table);?>&goto=tbl_properties.php">
!         <img src="images/browse.gif" border="0" alt="<?php echo "$strBrowse $strTable: $table"; ?>"></a>
      <a class="item" target="main" HREF="tbl_properties.php?server=<?php echo $server;?>&db=<?php echo $db;?>&table=<?php echo urlencode($table);?>"><?php echo $table;?></a></nobr><br />
  
--- 106,110 ----
  ?>
      <nobr><img src="images/spacer.gif" border="0" width="9" height="9" alt="" />
!     <a target="main" href="sql.php?sql_query=<?php echo urlencode("SELECT * FROM $cfgQuotes$table$cfgQuotes");?>&server=<?php echo $server;?>&db=<?php echo urlencode($db);?>&table=<?php echo urlencode($table);?>&goto=tbl_properties.php"><img src="images/browse.gif" border="0" alt="<?php echo "$strBrowse $strTable: $table"; ?>"></a>
      <a class="item" target="main" HREF="tbl_properties.php?server=<?php echo $server;?>&db=<?php echo $db;?>&table=<?php echo urlencode($table);?>"><?php echo $table;?></a></nobr><br />

[ppa-cvs] CVS: phpPgAdmin lib.inc.php,1.60,1.61

From: Dan W. <kil...@us...> - 2002-05-31 00:04:40

Update of /cvsroot/phppgadmin/phpPgAdmin
In directory usw-pr-cvs1:/tmp/cvs-serv1886

Modified Files:
	lib.inc.php 
Log Message:
Added workaround for register_globals being off and some additional work for optimizing browse

Index: lib.inc.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/lib.inc.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** lib.inc.php	28 May 2002 22:48:35 -0000	1.60
--- lib.inc.php	31 May 2002 00:04:36 -0000	1.61
***************
*** 6,9 ****
--- 6,47 ----
  error_reporting(E_ALL ^ E_NOTICE);
  
+ // ------- Workaround for register_globals = Off ------ //
+ // ------  borrowed from phpMyAdmin and modified ------ //
+ if (!($reg_globals = ini_get("register_globals"))) {
+ 	if (!empty($HTTP_GET_VARS)) {
+ 		extract($HTTP_GET_VARS);
+ 	} elseif (!empty($_GET)) {
+ 		extract($_GET);
+ 	}
+ 	
+ 	if (!empty($HTTP_POST_VARS)) {
+ 		extract($HTTP_POST_VARS);
+ 	} elseif (!empty($_POST)) {
+ 		extract($_POST);
+ 	}
+ 	
+ 	if (!empty($HTTP_COOKIE_VARS)) {
+ 		extract($HTTP_COOKIE_VARS);
+ 	} elseif (!empty($_COOKIE)) {
+ 		extract($_COOKIE);
+ 	}
+ 
+ 	if (!empty($HTTP_POST_FILES)) {
+ 		while (list($name, $value) = each($HTTP_POST_FILES)) {
+ 		    $$name = $value['tmp_name'];
+ 		}
+ 	} elseif (!empty($_FILES)) {
+ 		while (list($name, $value) = each($_FILES)) {
+ 		    $$name = $value['tmp_name'];
+ 		}
+ 	}
+ 
+ 	//echo "Globals: $reg_globals";
+ } else {
+ 	//print_r($reg_globals);
+ }
+ // ----------------------- end ----------------------- //
+ 
+ 
  if (file_exists("config.inc.php")) { 
  	include("config.inc.php");
***************
*** 304,311 ****
  }
  	
! function display_table ($dt_result) {
  	global $cfgBorder, $cfgBgcolorOne, $cfgBgcolorTwo, $cfgMaxRows, $pos, $server, $link, $db, $table, $sql_query, $sql_order, $cfgOrder, $cfgShowBlob;
  	global $strShowingRecords,$strTotal,$strEdit,$strPrevious,$strNext,$strAction,$strDelete,$strDeleted,$strPos1,$strEnd,$pri_keys,$goto;
! 	global $cfgQuotes, $cfgMaxPages, $strMore, $cfgMaxText;
  
  	if (!isset($pos))
--- 342,349 ----
  }
  	
! function display_table ($qry_res, $limited = false) {
  	global $cfgBorder, $cfgBgcolorOne, $cfgBgcolorTwo, $cfgMaxRows, $pos, $server, $link, $db, $table, $sql_query, $sql_order, $cfgOrder, $cfgShowBlob;
  	global $strShowingRecords,$strTotal,$strEdit,$strPrevious,$strNext,$strAction,$strDelete,$strDeleted,$strPos1,$strEnd,$pri_keys,$goto;
! 	global $cfgQuotes, $cfgMaxPages, $strMore, $cfgMaxText, $link;
  
  	if (!isset($pos))
***************
*** 314,323 ****
  	$pos_next = $pos + $cfgMaxRows;
  	$pos_prev = $pos - $cfgMaxRows;
  
! 	$num_rows = @pg_numrows($dt_result);
! 
! 	$num_fields = @pg_numfields($dt_result);
  
- 	$iNumRows = $num_rows;
  	if ($num_rows < $pos_next) {
  		$pos_next = $num_rows;
--- 352,377 ----
  	$pos_next = $pos + $cfgMaxRows;
  	$pos_prev = $pos - $cfgMaxRows;
+ 	
+ 	if (!$limited) { 
+ 		$dt_result = $qry_res;
  
! 		$num_rows = @pg_numrows($dt_result);
! 		$num_fields = @pg_numfields($dt_result);
! 		$iNumRows = $num_rows;
! 	} else {
! 		if (!$cnt_result = @pg_exec($link, pre_query($qry_res))) {
! 			include("header.inc.php");
! 			pg_die(pg_errormessage($link), $cnt_result, __FILE__, __LINE__);
! 		} else {
! 			$num_rows = pg_numrows($cnt_result);
! 			$full_query = $qry_res . " LIMIT $pos, $cfgMaxRows";
! 			if (!$dt_result = @pg_exec($link, pre_query($full_query))) {
! 				include("header.inc.php");
! 				pg_die(pg_errormessage($link), $full_query, __FILE__, __LINE__);
! 			}
! 		}
! 		$iNumRows = $cgMaxRows;
! 	}
  
  	if ($num_rows < $pos_next) {
  		$pos_next = $num_rows;
***************
*** 476,480 ****
  					$strHiddens
  					<input type=\"submit\" name=\"edit_action\" value=\"$strEdit\">
- 					<!--a href=\"tbl_change.php?edit=1&primary_key=$primary_key$query\">".$strEdit."</a-->
  				</td>
  				</form>
--- 530,533 ----
***************
*** 485,494 ****
  			
  			echo "
- 				<td>
  				<form action=\"sql.php\" method=\"POST\">
  				<td>
  					$strHiddens
  					<input type=\"submit\" name=\"edit_action\" value=\"$strDelete\">
- 					<!--a href=\"sql.php?sql_query=".urlencode("DELETE FROM $cfgQuotes$table$cfgQuotes WHERE ").$primary_key."$query&zero_rows=".urlencode($strDeleted)."\">".$strDelete."</a-->
  				</td>
  				</form>
--- 538,545 ----

[ppa-cvs] CVS: phpPgAdmin sql.php,1.13,1.14

From: Dan W. <kil...@us...> - 2002-05-31 00:02:59

Update of /cvsroot/phppgadmin/phpPgAdmin
In directory usw-pr-cvs1:/tmp/cvs-serv1089

Modified Files:
	sql.php 
Log Message:
built some groundwork for optimizing browse with LIMIT... still don't know if this will work or even be worth the work on current version

Index: sql.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/sql.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** sql.php	30 May 2002 16:30:15 -0000	1.13
--- sql.php	31 May 2002 00:02:55 -0000	1.14
***************
*** 86,129 ****
  		
  		for ($i_pri_rows = 0; $i_pri_rows < $pri_num; $i_pri_rows++) {
! 			 $my_pri_key = pg_result($pri_result, $i_pri_rows, "column_name");
! 			 // if (!eregi($my_pri_key, $sql_query)) {
! 			 	// Need to figure out a way to determine whether the primary key for the table has been selected
! 				// If not, then we need to pull it in.  This is for use with the actions.
! 			 // }
! 			 $pri_keys[] = $my_pri_key;
  		}
  		
  		$sql_query = isset($sql_query) ? stripslashes($sql_query) : '';
  		$sql_order = isset($sql_order) ? stripslashes($sql_order) : '';
! 		if (!$result = @pg_exec($link, pre_query($sql_query.$sql_order))) {
! 			include("header.inc.php");
! 			pg_die(pg_errormessage($link), $sql_query.$sql_order, __FILE__, __LINE__);
! 		}
! 		$num_rows = @pg_numrows($result);
! 	}
! 	
! 	if ($num_rows < 1 || ($rel_type == "sequence" && eregi($sql_query, "setval"))) {
! 		if (eregi("delete|insert|update", $sql_query)) {
! 			$affected_rows = @pg_cmdtuples($result);	
! 		} else {
! 			unset($affected_rows);
! 		}
! 		if (file_exists("./$goto")) {
! 			include("header.inc.php");
! 			if (isset($zero_rows) && !empty($zero_rows)) {
! 				$message = $zero_rows;
  			} else {
! 				$message = $strEmptyResultSet;
  			}
- 			include(preg_replace('/\.\.*/', '.', $goto));
  		} else {
! 			$message = $zero_rows;
! 			Header("Location: $goto");
  		}
! 		exit;
! 	} else {
! 		include("header.inc.php");
! 		$query = display_table($result);
! 		// $query = "server=$server&db=$db&table=$table&goto=$goto";
  		echo "<br><li><a href=\"rep_create.php?server=$server&db_name=$db&rep_sql=", urlencode($sql_query), "\">$strCreateNew $strReport</a><br>";
  		echo "<li><a href=\"javascript:window.location.reload()\">$strRefresh</a><br><br>";
--- 86,128 ----
  		
  		for ($i_pri_rows = 0; $i_pri_rows < $pri_num; $i_pri_rows++) {
! 			 $pri_keys[] = pg_result($pri_result, $i_pri_rows, "column_name");
  		}
  		
  		$sql_query = isset($sql_query) ? stripslashes($sql_query) : '';
  		$sql_order = isset($sql_order) ? stripslashes($sql_order) : '';
! 		if (!$limited) {
! 			if (!$result = @pg_exec($link, pre_query($sql_query.$sql_order))) {
! 				include("header.inc.php");
! 				pg_die(pg_errormessage($link), $sql_query.$sql_order, __FILE__, __LINE__);
! 			}
! 			$num_rows = @pg_numrows($result);
! 			if ($num_rows < 1 || ($rel_type == "sequence" && eregi($sql_query, "setval"))) {
! 				if (eregi("delete|insert|update", $sql_query)) {
! 					$affected_rows = @pg_cmdtuples($result);
! 				} else {
! 					unset($affected_rows);
! 				}
! 				if (ereg("\?", $goto)) {
! 					$message = $zero_rows;
! 					Header("Location: $goto");
! 				} elseif (file_exists("./$goto")) {
! 					include("header.inc.php");
! 					if (isset($zero_rows) && !empty($zero_rows)) {
! 						$message = $zero_rows;
! 					} else {
! 						$message = $strEmptyResultSet;
! 					}
! 					include(preg_replace('/\.\.*/', '.', $goto));
! 				}
! 				exit;
  			} else {
! 				include("header.inc.php");
! 				$query = display_table($result, $limited);
  			}
  		} else {
! 			include("header.inc.php");
! 			$query = display_table($result, $limited);
  		}
! 	
  		echo "<br><li><a href=\"rep_create.php?server=$server&db_name=$db&rep_sql=", urlencode($sql_query), "\">$strCreateNew $strReport</a><br>";
  		echo "<li><a href=\"javascript:window.location.reload()\">$strRefresh</a><br><br>";

[ppa-cvs] CVS: phpPgAdmin sql.php,1.12,1.13

From: Dan W. <kil...@us...> - 2002-05-30 16:30:18

Update of /cvsroot/phppgadmin/phpPgAdmin
In directory usw-pr-cvs1:/tmp/cvs-serv5958

Modified Files:
	sql.php 
Log Message:
Optimized query for primary keys... this breaks 6.5.x, but we have it all over already anyway

Index: sql.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/sql.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** sql.php	28 Jan 2002 23:36:50 -0000	1.12
--- sql.php	30 May 2002 16:30:15 -0000	1.13
***************
*** 59,63 ****
  		$pri_query = "
  			SELECT 
! 				a.attname AS column_name,
  				i.indisunique AS unique_key,
  				i.indisprimary AS primary_key
--- 59,65 ----
  		$pri_query = "
  			SELECT 
! 				ic.relname AS index_name, 
! 				bc.relname AS tab_name, 
! 				ta.attname AS column_name,
  				i.indisunique AS unique_key,
  				i.indisprimary AS primary_key
***************
*** 66,95 ****
  				pg_class ic,
  				pg_index i,
! 				pg_attribute a
  			WHERE 
! 				i.indrelid = bc.oid
! 				and i.indexrelid = ic.oid
! 				and 
! 				(
! 					i.indkey[0] = a.attnum 
! 					or
! 					i.indkey[1] = a.attnum
! 					or
! 					i.indkey[2] = a.attnum
! 					or
! 					i.indkey[3] = a.attnum
! 					or
! 					i.indkey[4] = a.attnum
! 					or
! 					i.indkey[5] = a.attnum
! 					or
! 					i.indkey[6] = a.attnum
! 					or
! 					i.indkey[7] = a.attnum
! 				)
! 				and a.attrelid = bc.oid
! 				and i.indproc = '0'::oid
! 				and bc.relname = '$table'
! 				and (i.indisprimary = 't' or i.indisunique = 't')
  		";
  	
--- 68,83 ----
  				pg_class ic,
  				pg_index i,
! 				pg_attribute ta,
! 				pg_attribute ia
  			WHERE 
! 				bc.oid = i.indrelid
! 				AND ic.oid = i.indexrelid
! 				AND ia.attrelid = i.indexrelid
! 				AND ta.attrelid = bc.oid
! 				AND bc.relname = '$table'
! 				AND ta.attrelid = i.indrelid
! 				AND ta.attnum = i.indkey[ia.attnum-1]
! 			ORDER BY 
! 				index_name, tab_name, column_name
  		";

Flat | Threaded

<< < 1 .. 170 171 172 173 174 175 > >> (Page 172 of 175)