phppgadmin-cvs — CVS Commits

[ppa-cvs] CVS: phpPgAdmin db_privilege.php,1.5,1.6 tbl_privilege.php,1.10,1.11

[Dan W. <kil...@us...>]

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

Modified Files:
	db_privilege.php tbl_privilege.php 
Log Message:
Fixed privs to use new 7.2 acl and also fixed bug #561018 (problem with privs on views)

Index: db_privilege.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/db_privilege.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** db_privilege.php	17 Mar 2002 07:44:18 -0000	1.5
--- db_privilege.php	30 May 2002 16:10:47 -0000	1.6
***************
*** 11,18 ****
  
  $query = "server=$server&db=$db&goto=db_details.php";
! $arrPrivileges = array('select', 'insert', 'delete', 'rule');
! $arrAcl        = array('r',      'a',      'w',      'R');
  
! if ($major_version >= 7 && $minor_version >= 2) $arrPrivileges[2] = "update";
  
  if (!$tables && !$seq && !$views && isset($todo)) {
--- 11,23 ----
  
  $query = "server=$server&db=$db&goto=db_details.php";
! $arrPrivileges = array('select',	'insert', 	'update', 	'delete', 	'rule',	'references', 	'trigger');
! $arrAcl        = array('r',      	'a',      	'w',      	'd',		'R',	'x',			't');
  
! if ($common_ver < 7.2) {
! 	array_splice($arrPrivileges, 3, 1);
! 	array_splice($arrAcl, 3, 1);
! 	array_splice($arrPrivileges, 4, 3);
! 	array_splice($arrAcl, 4, 3);
! }
  
  if (!$tables && !$seq && !$views && isset($todo)) {

Index: tbl_privilege.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/tbl_privilege.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tbl_privilege.php	19 Mar 2002 19:37:59 -0000	1.10
--- tbl_privilege.php	30 May 2002 16:10:48 -0000	1.11
***************
*** 10,22 ****
  include("header.inc.php");
  
  $query = "server=$server&db=$db&table=$table&goto=tbl_privilege.php";
! $arrPrivileges = array('select', 'insert', 'delete', 'rule');
! $arrAcl        = array('r',      'a',      'w',      'R');
  
! if ($major_version >= 7 && $minor_version >= 2) {
! 	$arrPrivileges[2] = "update";
! 	$strUpdateTxt = "update";
! } else {
! 	$strUpdateTxt = "delete";
  }
  
--- 10,24 ----
  include("header.inc.php");
  
+ $table = empty($table) ? $view : $table;
+ 
  $query = "server=$server&db=$db&table=$table&goto=tbl_privilege.php";
! $arrPrivileges = array('select',	'insert', 	'update', 	'delete', 	'rule',	'references', 	'trigger');
! $arrAcl        = array('r',      	'a',      	'w',      	'd',		'R',	'x',			't');
  
! if ($common_ver < 7.2) {
! 	array_splice($arrPrivileges, 3, 1);
! 	array_splice($arrAcl, 3, 1);
! 	array_splice($arrPrivileges, 4, 3);
! 	array_splice($arrAcl, 4, 3);
  }
  
***************
*** 28,33 ****
  		pg_die(pg_errormessage($link), $sql_get_privilege, __FILE__, __LINE__);
  	} else {
! 		// query must return exactely one row (check this ?)
! 		$row = pg_fetch_array($res, 0);
  		$priv = trim(ereg_replace("[\{\"]", "", $row[relacl]));
  		
--- 30,37 ----
  		pg_die(pg_errormessage($link), $sql_get_privilege, __FILE__, __LINE__);
  	} else {
! 		// query must return exactly one row (check this ?)
! 		if (!($row = @pg_fetch_array($res, 0))) {
! 			echo "Error: unable to retrieve ACL for view: $table";
! 		}
  		$priv = trim(ereg_replace("[\{\"]", "", $row[relacl]));
  		
***************
*** 37,41 ****
  			$privilege = $aryUser[1]; 
  
! 			for ($i = 0; $i < 4; $i++) {
  				// $result[$username][$arrPrivileges[$i]] = strchr($privilege, $arrAcl[$i]) ? $strYes : $strNo;
  				$aryUser[0] = $aryUser[0] ? $aryUser[0] : "public";
--- 41,45 ----
  			$privilege = $aryUser[1]; 
  
! 			for ($i = 0; $i < 7; $i++) {
  				// $result[$username][$arrPrivileges[$i]] = strchr($privilege, $arrAcl[$i]) ? $strYes : $strNo;
  				$aryUser[0] = $aryUser[0] ? $aryUser[0] : "public";
***************
*** 73,77 ****
--- 77,84 ----
  		<TH><?php echo $strInsert;?></TH>
  		<TH><?php echo $strUpdate;?></TH>
+ 		<TH><?php echo $strDelete;?></TH>
  		<TH><?php echo $strRule;?></TH>
+ 		<TH><?php echo $strReferences;?></TH>
+ 		<TH><?php echo $strTrigger;?></TH>
  		<TH colspan="2"><?php echo $strAction;?></TH>
  		</TR>
***************
*** 87,92 ****
  		<TD><?php echo $priv['select'];?></TD>
  		<TD><?php echo $priv['insert'];?></TD>
! 		<TD><?php echo $priv[$strUpdateTxt];?></TD>
  		<TD><?php echo $priv['rule'];?></TD>
  		<TD><a href="tbl_privilege.php?<?php echo $query;?>&action=grant&user=<?php echo rawurlencode($name);?>">Grant</a></TD>
  		<TD><a href="tbl_privilege.php?<?php echo $query;?>&action=revoke&user=<?php echo rawurlencode($name);?>">Revoke</a></TD>
--- 94,102 ----
  		<TD><?php echo $priv['select'];?></TD>
  		<TD><?php echo $priv['insert'];?></TD>
! 		<TD><?php echo $priv['update'];?></TD>
! 		<TD><?php echo $priv['delete'];?></TD>
  		<TD><?php echo $priv['rule'];?></TD>
+ 		<TD><?php echo $priv['references'];?></TD>
+ 		<TD><?php echo $priv['trigger'];?></TD>
  		<TD><a href="tbl_privilege.php?<?php echo $query;?>&action=grant&user=<?php echo rawurlencode($name);?>">Grant</a></TD>
  		<TD><a href="tbl_privilege.php?<?php echo $query;?>&action=revoke&user=<?php echo rawurlencode($name);?>">Revoke</a></TD>

[ppa-cvs] CVS: phpPgAdmin dutch.inc.php,NONE,1.1

[Dan W. <kil...@us...>]

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

Added Files:
	dutch.inc.php 
Log Message:
Added dutch language file -- Hugo Jonker [hu...@ge...]

--- NEW FILE: dutch.inc.php ---
<?php
/* $Id: dutch.inc.php,v 1.1 2002/05/29 22:34:01 killroyboy Exp $ */

$strAPrimaryKey			= 'Een primaire sleutel is toegevoegd aan ';
$strAccessDenied		= 'Toegang geweigerd';
$strAction			= 'Actie';
$strAddNewField			= 'Voeg nieuw veld toe';
$strAddSearchConditions		= 'Voeg zoek-condities toe (de "where" clausule):';
$strAnIndex			= 'Een index is gemaakt op ';
$strAttr			= 'Attributen';
$strBack			= 'Terug';
$strBrowse			= 'Inhoud';
$strCarriage				= "Carriage return: \\r";
$strChange			= 'Wijzig';
$strColumnNames			= 'Kolom namen';
$strConstraintName		= 'Constraint Naam';
$strCopyTable			= 'Kopi&euml;er tabel naar:';
$strCopyTableOK			= "Tabel \$table is gekopieerd naar \$new_name.";
$strCreate			= 'Maak';
$strCreateNewDatabase		= 'Maak een nieuwe database';
$strCreateNewTable		= 'Cre&euml;er een nieuwe tabel in database ';
$strDatabase			= 'Database ';
$strDatabases			= 'databases';
$strDefault			= 'Standaardwaarde';
$strDeferrable				= 'Deferrable';
$strDelete			= 'Verwijder';
$strDeleted			= 'De rij is verwijderd';
$strDoAQuery			= 'Voer een "query by example" uit (wildcard: "%")';
$strDoYouReally			= 'Wilt u echt ';
$strDocu			= 'handleiding';
$strDrop			= 'Verwijder';
$strDropDB			= 'Verwijder database ';
$strDumpingData			= 'Dumpen van data uit tabel';
$strEdit			= 'Verander';
$strEmpty			= 'Legen';
$strEmptyResultSet		= 'Niets gevonden (geen enkele rij voldoet aan de query)';
$strEnabled			= 'Enabled';
$strEnclosedBy			= 'omsloten door';
$strEnd				= 'Einde';
$strError			= 'Fout';
$strEscapedBy				= 'escaped by';
$strExtra			= 'Extra';
$strField			= 'kolom';
$strNumFields			= '# kolommen';
$strFunction			= 'Functie';
$strGo				= 'Go';
$strHasBeenAltered		= 'is gewijzigd.';
$strHasBeenCreated		= 'is gecre&euml;erd.';
$strHasBeenDropped		= 'is verwijderd.';
$strHasBeenEmptied		= 'is geleegd.';
$strHome			= 'Start';
$strHost			= 'Host';
$strIfYouWish			= 'Indien u slechts enkele kolommen wenst te zien, dient u een door komma\'s gescheiden lijst van kolomnamen op te geven.';
$strIndex			= 'Index';
$strInitDeferred			= 'Init. Deferred';
$strInsert			= 'Voeg nieuwe rij toe';
$strInsertIntoTable		= 'Voeg toe aan tabel';
$strInsertNewRow		= 'Voeg volgende rij toe';
$strInsertTextfiles		= 'Voeg tekstbestanden toe aan tabel';
$strIsConstraint		= 'Constraint';
$strKeyname			= 'Sleutelnaam';
$strLengthSet			= 'Lengte/Set';
$strLineFeed				= "Linefeed: \\n";
$strLines			= 'Regels';
$strLocationTextfile		= 'Plaats van het tekstbestand';
$strLogout			= 'Uitloggen';
$strModifications		= 'Wijzigingen zijn opgeslagen';
$strMySQLReloaded		= 'PostgreSQL is herladen.';
$strMySQLSaid			= 'PostgreSQL meldt: ';
$strMySQLShowProcess		= 'Toon processen';
$strMySQLShowStatus		= 'Toon PostgreSQL runtime informatie';
$strMySQLShowVars		= 'Toon PostgreSQL systeem variablen';
$strName			= 'Naam';
$strNext			= 'Volgende';
$strNo				= 'Nee / Geen';
$strNoTablesFound		= 'Geen tabellen gevonden in de database.';
$strNull			= 'Null';
$strOftenQuotation		= 'Vaak quootjes ("). Betekent OPTIONEEL dat enkel kolommen van type char of type varchar omsloten zijn door het "omsloten door" karakter.';
$strOptionalControls		= 'Optioneel. Bepaalt hoe speciale karakters gelezen en geschreven worden.';
$strOptionally			= 'OPTIONEEL';
$strPos1			= 'Start';
$strPrevious			= 'Vorige';
$strPrimary			= 'Primaire';
$strPrimaryKey			= 'Primaire sleutel';
$strProducedAnError		= 'veroorzaakte een fout.';
$strProperties			= 'Eigenschappen';
$strQBE				= 'Query by Example';
$strReadTheDocs			= 'Lees de handleiding';
$strRecords			= 'Records';
$strRefresh			= 'Vernieuw';
$strReferences			= 'Referenties';
$strReloadFailed		= 'Het herladen van PostgreSQL is niet gelukt.';
$strReloadMySQL			= 'Herlaad PostgreSQL';
$strRenameTable			= 'Hernoem tabel als';
$strRenameTableOK		= "Tabel \$table is hernoemd als \$new_name";
$strReplace			= 'Vervang';
$strReplaceTable		= 'Vervang informatie in tabel met bestand';
$strReset			= 'Reset';
$strRun				= 'Voer uit';
$strRunSQLQuery			= 'Voer SQL queries uit op de database ';
$strRunning			= 'draaiend op ';
$strSQLQuery			= 'SQL-query';
$strSave			= 'Opslaan';
$strSelect			= 'Selecteer';
$strSelectFields		= 'Selecteer kolommen (minimaal &eacute;&eacute;n):';
$strSend			= 'verzend als bestand';
$strShowingRecords		= 'Toon records ';
$strStrucCSV			= 'CSV data';
$strStrucData			= 'Structuur en data';
$strStrucDrop			= 'Voeg "drop table" toe';
$strStrucOnly			= 'Enkel de structuur';
$strSubmit			= 'Verzend';
$strSuccess			= 'De SQL-query is succesvol uitgevoerd';
$strTable			= 'Tabel';
$strTableStructure		= 'Tabel structuur van tabel';
$strTerminatedBy		= 'Gescheiden door';
$strTheContent			= 'De inhoud van het bestand is toegevoegd.';
$strTheContents			= 'De inhoud van het bestand vervangt de inhoud van de tabel enkel voor die rijen die een in het bestand voorkomende primaire danwel unieke sleutel bevatten.';
$strTheTerminator		= 'Het kolom-afsluitingsteken.';
$strTotal			= 'totaal';
$strType			= 'Type';
$strUnique			= 'Uniek';
$strValue			= 'Waarde';
$strViewDump			= 'Bekijk een dump (schema) van de tabel';
$strViewDumpDB			= 'Bekijk een dump (schema) van de database';
$strWelcome			= 'Welkom bij ';
$strWrongUser 			= 'Ongeldige gebruikersnaam/wachtwoord combinatie. Toegang geweigerd.';
$strYes				= 'Ja';


// Added for phpPgAdmin
$strAddGroup			= 'Voeg groep toe';
$strAddConditions		= 'Extra voorwaarden';
$strAddUser			= 'Voeg gebruiker toe';
$strAffected			= 'Behandelde rijen';
$strAllDatabases		= 'Alle databases';
$strArg				= 'Argument';
$strArgs			= 'Argumenten';
$strCancel			= 'Annuleren';
$strCommutator       		= 'Commutator';
$strCreateNew			= 'Maak een nieuwe ';
$strCreateDB			= 'Cre&euml;er DB';
$strCreated			= 'Aangemaakt';
$strCatUpd			= 'Vernieuw Catalogus';
$strDate			= 'Datum';
$strDefinition			= 'Definitie';
$strDescription			= 'Descriptie';
$strDisplay			= 'Toon';
$strOnEvents				= 'On Events';
$strEncoding			= 'Encoding';
$strExecute			= 'Uitvoeren';
$strExpires			= 'Geldig tot';
$strFileLocation		= 'of locatie van het tekstbestand';
$strFound			= 'gevonden';
$strFunc			= 'Functie';
$strFuncs			= 'Functies';
$strGroup			= 'Groep';
$strGroupAdmin			= 'Groepsbeheer';
$strGroupDeleted		= 'Groep verwijderd';
$strGroupField			= 'Naam groep';
$strGroupID			= 'SysID';
$strGroupMessage		= 'Er zijn geen groepen gedefini&euml;erd.';
$strGroupModify			= 'Wijzig';
$strGroups			= 'Bestaande groepen';
$strGroupUpdated		= 'Groep gewijzigd';
$strGroupUpdate			= 'Wijzig';
$strHasBeenVacuumed		= 'is opgeschoond';
$strHashes          		= 'Hashes';
$strIndicies			= 'Indices';
$strJoin             		= 'Join';
$strLang			= 'Taal';
$strLeft             		= 'Links';
$strLength			= 'Lengte';
$strLinkKeys				= 'Linking keys';
$strLogin			= 'Inloggen';
$strLogOutInst			= 'Naderhand herladen';
$strLoggedInAs			= 'U bent ingelogd als';
$strMax				= 'Max';
$strMember			= 'Leden';
$strMore			= 'Meer';
$strNegator          		= 'Negator';
$strNewUser			= 'Nieuwe gebruiker';
$strNewGroup			= 'Nieuwe groep';
$strNonMember			= 'Niet-leden';
$strNoAuth			= 'Niet geautoriseerd';
$strNoData			= 'Geen data';
$strNoReports			= 'Geen rapporten';
$strNotDisplayed		= 'Niet getoond';
$strNotNull			= 'Not Null';
$strNotImp				= 'The PostgreSQL ALTER TABLE only supports renaming of the column.<br>Other options are left for (hopefull) future support';
$strOnDB			= ' op database ';
$strOwner			= 'Eigenaar';
$strOperator			= 'Operator';
$strOperators        		= 'Operators';
$strPassword			= 'wachtwoord';
$strPrintScreen			= 'Printbare versie';
$strPrivileges			= 'Privileges';
$strProperty         		= 'Eigenschap';
$strPostgres			= 'PostgreSQL';
$strReport			= 'Rapport';
$strReports			= 'Rapporten';
$strReportName			= 'Naam van het rapport';
$strReportsRequire		= 'De rapporteertool vereist het aanmaken van de phppgadmin database. U moet de database aanmaken om verder te kunnen gaan.';
$strRename			= 'Hernoem';
$strRetType			= 'Retourneert';
$strRestart			= 'Herstart';
$strRestrict         		= 'Beperk';
$strRevokeGroup			= 'Ontneem rechten van een groep';
$strRevokeUser			= 'Ontneem rechten van een gebruiker';
$strRight            		= 'Rechts';
$strRule			= 'Regel';
$strSequence			= 'Sequence';
$strSequences			= 'Sequences';
$strSort             		= 'Sorteer';
$strSrc				= 'Bron';
$strStart			= 'Start';
$strSuperUser			= 'Super User';
$strSystemTables		= 'Systeem Tabellen';
$strSysID			= 'SysID';
$strTable			= 'Tabel';
$strTables			= 'Tabellen';
$strTrigger			= 'Trigger';
$strTriggers			= 'Triggers';
$strUpdate			= 'Wijzig';
$strUpdated			= 'gewijzigd';
$strUseDefault			= 'Gebruik standaard waarde';
$strUserAdmin			= 'Gebruikersbeheer';
$strUserUpdated			= 'Gebruikerstabel gewijzigd';
$strUserName			= 'gebruikersnaam';
$strUserGroup			= 'Gebruiker/Groep';
$strVacuumDB			= 'Vacuum Database';
$strVacuumAnalyzeDB		= 'Vacuum Analyze Database';
$strView			= 'View';
$strViews			= 'Views';
$strWhen			= 'wanneer';
?>

[ppa-cvs] CVS: phpPgAdmin ChangeLog,1.22,1.23

[Robert T. <xz...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
Added changes for 2.4.2


Index: ChangeLog
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/ChangeLog,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** ChangeLog	14 Mar 2002 08:15:08 -0000	1.22
--- ChangeLog	29 May 2002 04:14:47 -0000	1.23
***************
*** 1,5 ****
  phpPgAdmin - ChangeLog
! v 2.4.2 - 
! 	+ Added hungarian translation - Vizi Tibor [vi...@br...]
  	
  v 2.4.1	- 03/01/2002
--- 1,19 ----
  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...]
! 	+ 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...]
  	
  v 2.4.1	- 03/01/2002

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

[Robert T. <xz...@us...>]

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

Modified Files:
	README 
Log Message:
updated version information and notes on software requirments.


Index: README
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/README,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** README	28 Feb 2002 19:33:09 -0000	1.5
--- README	29 May 2002 03:48:09 -0000	1.6
***************
*** 3,7 ****
    A set of PHP-scripts to adminstrate PostgreSQL over the WWW.
  
!   Version 2.4.1 - 3/1/2002
    http://sourceforge.net/projects/phppgadmin/  
    Copyright (C) 1999-2000 Dan Wilson <kil...@us...>
--- 3,7 ----
    A set of PHP-scripts to adminstrate PostgreSQL over the WWW.
  
!   Version 2.4.2 - 6/1/2002
    http://sourceforge.net/projects/phppgadmin/  
    Copyright (C) 1999-2000 Dan Wilson <kil...@us...>
***************
*** 22,25 ****
--- 22,27 ----
      PostgreSQL (tested with 6.5.x, 7.0.x, 7.1.x, 7.2)
      a web-browser (duh!)
+ 
+ 	- Note PHP 3.x and Postgres 6.5.x are no longer fully supported; YMMV.  
                  
    Summary:

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

[Robert T. <xz...@us...>]

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

Modified Files:
	INSTALL 
Log Message:
Added explicit step to copy config.inc.php-dist to config.inc.php.


Index: INSTALL
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/INSTALL,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** INSTALL	21 Dec 2001 21:42:26 -0000	1.4
--- INSTALL	29 May 2002 03:40:07 -0000	1.5
***************
*** 11,21 ****
      [1] Untar the distribution (be sure to untar the subdirectories)
          tar xvf phpPgAdmin_x.x.x.tar.gz
!     [2] Open the file config.inc.php in your favorite editor and change
          the values for host, user and password to fit your environment.
          Have a look at Documentation.html for an explanation of all values.
!     [3] It is recommended that you protect the directory in which
          you installed phpPgAdmin (unless it's on a closed intranet), 
          if you are not using adv_auth.
!     [4] Open the file <www.your-host.com>/<your-install-dir>/index.php
          in your browser. phpPgAdmin should now display a welcome screen 
          and your databases or a login screen, depending on your 
--- 11,23 ----
      [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.
          Have a look at Documentation.html for an explanation of all values.
!     [4] It is recommended that you protect the directory in which
          you installed phpPgAdmin (unless it's on a closed intranet), 
          if you are not using adv_auth.
!     [5] Open the file <www.your-host.com>/<your-install-dir>/index.php
          in your browser. phpPgAdmin should now display a welcome screen 
          and your databases or a login screen, depending on your 
***************
*** 43,45 ****
      to work with a different extension. Beware though, that currently changing 
      the extension from .html to something other won't work (it'd change all 
!     "string".htmlspecialchars() constructs).
\ No newline at end of file
--- 45,47 ----
      to work with a different extension. Beware though, that currently changing 
      the extension from .html to something other won't work (it'd change all 
!     "string".htmlspecialchars() constructs).

[ppa-cvs] CVS: phpPgAdmin basque.inc.php,NONE,1.1

[Robert T. <xz...@us...>]

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

Added Files:
	basque.inc.php 
Log Message:
Basque/Euskera Translation. Thanks to Pello Xabier Altadill Izura
<pel...@te...>


--- NEW FILE: basque.inc.php ---
<?php
/* $Id: basque.inc.php,v 0.1 26/05/2002 */
/* $Id: basque.inc.php P.X. Altadill Izura-k itzulia pel...@te... * */
/* $Id: spanish.inc.php-an oinarritua */
$strComment = "Oharrak";
$strAPrimaryKey = "Gakoa gehitu da";
$strAccessDenied = "Atzipen ezeztatua";
$strAction = "Ekintza";
$strAddNewField = "Eremu berria gehitu";
$strAddSearchConditions = "Bilaketa baldintzak sartu (\"where\" zatia):";
$strAnIndex = "Indizea gehitu da: ";
$strAttr = "Atributuak";
$strBack = "Itzuli";
$strBrowse = "Ikusi";
$strCarriage = "Return: \\r";
$strChange = "Aldatu";
$strColumnNames = "Zutabe izenak";
$strConstraintName = "Murrizpen izena ";
$strCopyTable = "Kopiatu taula hemen:";
$strCopyTableOK = "\$table taula \$new_name -ra kopiatu da.";
$strCreate = "Sortu";
$strCreateNewDatabase = "Datu-base berrria sortu ";
$strCreateNewTable = "Datu-basean taula berria sortu ";
$strDatabase = "Datu-basea ";
$strDatabases = "Datu-Baseak";
$strDefault = "Besterik ezean";
$strDeferrable = "Atzeratu daiteke";
$strDelete = "Ezabatu";
$strDeleted = "Tupla ezabatu da";
$strDoAQuery = "SQL Kontsulta bat egin (komodinak: \"%\")";
$strDoYouReally = "Benetan nahi duzu ";
$strDocu = "Dokumentazioa";
$strDrop = "Ezabatu";
$strDropDB = "Datu-basea ezabatu ";
$strDumpingData = "Datu-basearen datuak";
$strEdit = "Editatu";
$strEmpty = "Hustu";
$strEmptyResultSet = "PostgreSQL-ek emaitz hutsa itzuli du (0 tupla).";
$strEnabled = "Aktibatua";
$strEnclosedBy = "Karaktere hauen artean: ";
$strEnd = "Amaiera";
$strError = "Errorea";
$strEscapedBy = "\'Scape\' karakterea: ";
$strExtra = "Estra";
$strField = "Eremua";
$strFields = "Eremuak";
$strNumFields = "eremu kopurua";
$strFunction = "Funtzioa";
$strGo = "Segi";
$strHasBeenAltered = "aldatu da.";
$strHasBeenCreated = "sortua izan da.";
$strHasBeenDropped = "ezabatua izan da.";
$strHasBeenEmptied = "hustu da.";
$strHome = "Hasiera";
$strHost = "Zerbitzaria";
$strIfYouWish = "Taulako zutabe batzuk soilik kargatu nahi badituzu, zehaztu eremuak komaz bereiztuak.";
$strIndex = "Indizea";
$strInitDeferred = "Hasieraketa atzeratua";
$strInsert = "Sartu";
$strInsertIntoTable = "Taulan sartu";
$strInsertNewRow = "Tupla berria sartu.";
$strInsertTextfiles = "Testu fitxategia taulan sartu";
$strIsConstraint = "Murrizpena:";
$strKeyname = "Gako hitza";
$strLengthSet = "Luzera zehaztu";
$strLineFeed = "Lerro berria: \\n";
$strLines = "Lerroak";
$strLocationTextfile = "Testu fitxategiaren kokapena";
$strLogout = "Deskonektatu";
$strModifications = "Aldaketak gorde dira";
$strMySQLReloaded = "PostgreSQL hasieratu da.";
$strMySQLSaid = "PostgreSQLek esan du: ";
$strMySQLShowProcess = "Prozesuak erakutsi";
$strMySQLShowStatus = "PostgreSQLren egoera erakutsi";
$strMySQLShowVars = "PostgreSQLren sistema aldagaiak erakutsi";
$strName = "Izena";
$strNext = "Hurrengoa";
$strNo = "Ez";
$strNoTablesFound = "Ez da taularik topatu datu-basean";
$strNull = "Nulua";
$strOftenQuotation = "Komatxoak gehienetan. Normalean esan nahi du solik  char eta varchar motak \" artean jartzen direla.\" ";
$strOptionalControls = "Aukerazkoa. Karaktereak nola idatzi/irakurrikontrolatzen du.";
$strOptionally = "AUKERAZKOA";
$strPos1 = "Hasi";
$strPrevious = "Aurrenekoa";
$strPrimary = "Lehena";
$strPrimaryKey = "Gako lehena";
$strProducedAnError = "errorea eragin du.";
$strProperties = "Ezaugarriak";
$strQBE = "QBE lengoaiako kontsultak";
$strReadTheDocs = "Dokumentuak irakurri";
$strRecords = "Tuplak";
$strReferences = "Erreferentziak";
$strReloadFailed = "PostgreSQLren hasieraketak huts egin du";
$strReloadMySQL = "PostgreSQL berhasieratu";
$strRenameTable = "Taula berrizendatu ";
$strRenameTableOK = "\$table taula \$new_name izenarekin  berrizendatu da";
$strReplace = "Ordezkatu";
$strReplaceTable = "Taulako datuak fitxategiarekin ordezkatu";
$strReset = "Reset";
$strRun = "Egikaritu";
$strRunSQLQuery = "SQL kontsulta datu-basean egikaritu ";
$strRunning = "Egikaritzen hemen: ";
$strSQLQuery = "SQL-kontsulta";
$strSave = "Gorde";
$strSelect = "Aukeratu";
$strSelectFields = "Eremuak aukeratu (bat gutxienez):";
$strSend = "bidali";
$strShowingRecords = "Erregistroak ";
$strStrucCSV = "CSV moduko datuak";
$strStrucData = "Datuak eta egitura";
$strStrucDrop = "\'DROP TABLE\' agindua gehitu";
$strStrucOnly = "Egiturak solik";
$strSubmit = "Bidali";
$strSuccess = "Zure SQL agindua ongi egikaritu da";
$strTable = "Taula";
$strTableStructure = "Taula egitura: ";
$strTerminatedBy = "Bukatua ";
$strTheContent = "Fitxategiaren edukiera sartu da.";
$strTheContents = "Taularen edukia fitxategiaren edukiarekin aldatzen da zutabe berdinetan, gako lehenak edo gako bakarrak izanik.";
$strTheTerminator = "Eremuaren bukaera adierazten duen karakterea.";
$strTotal = "guztira";
$strType = "Mota";
$strUnique = "Bakarra";
$strValue = "Balioa";
$strViewDump = "Taularen edukiera erakusten (eskema)";
$strViewDumpDB = "Datu-basearen edukiera erakusten (eskema)";
$strWelcome = "Ongi etorria ";
$strWrongUser = "erabiltzaile/pasahitza okerrak. Atzipen ezeztatua.";
$strYes = "Bai";
$strAddGroup = "Taldea gehitu";
$strAddConditions = "Baldintza gehigarriak";
$strAddUser = "Erabiltzailea gehitu";
$strAffected = "Ilara afektatuak";
$strArgs = "Parametroak";
$strCancel = "Bertan behera";
$strCreateNew = "Berria sortu: ";
$strCreateDB = "DBa sortu";
$strCreated = "Sortua";
$strCatUpd = "Katalogoa eguneratu";
$strDate = "Data";
$strDefinition = "Definizioa";
$strDescription = "Deskribapena";
$strDisplay = "Erakutsi";
$strOnEvents = "Gertaeretan";
$strExecute = "Egikaritu";
$strExpires = "Iraungi";
$strFileLocation = "ala fitxategia egikaritu";
$strFound = "aurkitua/k";
$strFunc = "Funtzioa";
$strFuncs = "Funtzioak";
$strGroup = "Taldea";
$strGroupAdmin = "Talde kudeaketa";
$strGroupDeleted = "Taldea ezabatua";
$strGroupField = "Talde izena";
$strGroupID = "TaldeID";
$strGroupMessage = "Talde taula hutsik dago";
$strGroupModify = "Aldatu";
$strGroups = "Taldeak";
$strGroupUpdated = "Taldea aldatua";
$strGroupUpdate = "Taldea aldatu";
$strHasBeenVacuumed = "analizatua izan da";
$strIndicies = "Indizeak";
$strLang = "Hizkuntza";
$strLength = "Luzera";
$strLinkKeys = "Gako arrotzak";
$strLogin = "Login";
$strLogOutInst = "Bukatzean, berkargatu";
$strLoggedInAs = "Erabiltzaile honekin sartu zara";
$strMax = "Maximoa";
$strMember = "Partaidea";
$strMore = "Gehiago";
$strNewUser = "Erabiltzaile berria";
$strNewGroup = "Talde berria";
$strNonMember = "Ez partaidea";
$strNoAuth = "Ez baimenduak";
$strNoData = "Daturik gabe";
$strNoReports = "Informerik gabe";
$strNotDisplayed = "Ez erakutsia";
$strNotNull = "NULL onartu";
$strNotImp = "ALTER TABLE aginduak PostgreSQLen ez du zutabe izena aldatzerik.<br>Bestelakoak hurrengo bertsiotarako.";
$strOnDB = " datu-basean ";
$strOperator = "Operadorea";
$strOperators = "Operadoreak";
$strPassword = "Pasahitza";
$strPrintScreen = "Inprimatu";
$strPrivileges = "Pribilegioak";
$strPostgres = "PostgreSQL";
$strReport = "Informea";
$strReports = "Informeak";
$strReportName = "Informe izena";
$strReportsRequire = "Aukera hau aktibatzeko phppgadmin datu-basea sortzea ezinbestekoa da. Aurrera jarraitzeko datu-base hau sortu beharko duzu beraz."; 
$strRename = "Berrizendatu";
$strRetType = "Return modua";
$strRestart = "Berrasieratu";
$strRefresh = "Berkargatu";
$strRevokeGroup = "Talde pribilegioak ezabatu";
$strRevokeUser = "Erabiltzaile pribilegioak ezabatu";
$strRule = "Erregela";
$strSequence = "Sekuentzia";
$strSequences = "Sekuentzia";
$strSrc = "Jatorria(source)";
$strStart = "Hasi";
$strSuperUser = "Super erabiltzailea";
$strSystemTables = "Sistema taulak";
$strSysID = "SysID";
$strTable = "Taula";
$strTables = "Taulak";
$strTrigger = "Trigger";
$strTriggers = "Triggerrak";
$strUpdate = "Aldatu";
$strUpdated = "aldatuak";
$strUseDefault = "Besterik ezezko balioa erabili";
$strUserAdmin = "Erabiltzaile kudeaketa";
$strUserUpdated = "Erabiltzaile taula eguneratua";
$strUserName = "Erabiltzaile izena";
$strUserGroup = "Erabiltzaile/Taldea";
$strVacuumDB = "Datu-baseari Vacuum agindua eman";
$strVacuumAnalyzeDB = "Datu-baseari Vacuum Analyze agindua eman";
$strView = "Bista";
$strViews = "Bistak";
$strWhen = "Noiz";
$strOwner = "Jabea";

$strSort            = "Ordenatu";
$strAscending       = "Gorantz";
$strDescending     = "Beheruntz";
$strShow            = "Erakutsi";
$strCriteria        = "Erizpide";
$strAnd             = "ETA";
$strOr              = "EDO";
$strModify          = "Aldatu";
$strAddDeleteRow    = "Erizpide tupla gehitu/ezabatzeko";
$strAddDeleteColumn = "Erizpide zutabe gehitu/ezabatzeko";
$strUpdateQuery     = "Eguneratu agindua";
$strRunQuery        = "Kontsulta egikaritu";
$strUseTables       = "Taulak erabili";
?>

[ppa-cvs] CVS: phpPgAdmin config.inc.php-dist,1.8,1.9 db_details.php,1.22,1.23 lib.inc.php,1.59,1.60 tbl_properties.inc.php,1.7,1.8 tbl_properties.php,1.10,1.11 tbl_select.php,1.11,1.12 user_admin.php,1.5,1.6

[Dan W. <kil...@us...>]

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

Modified Files:
	config.inc.php-dist db_details.php lib.inc.php 
	tbl_properties.inc.php tbl_properties.php tbl_select.php 
	user_admin.php 
Log Message:
Cleaned up documentation link -- bug #550942

Index: config.inc.php-dist
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/config.inc.php-dist,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** config.inc.php-dist	17 Apr 2002 22:51:20 -0000	1.8
--- config.inc.php-dist	28 May 2002 22:48:35 -0000	1.9
***************
*** 93,97 ****
  unset($cfgServers[0]);		// Since 0 = no server, $cfgServers[0] must not be used
  
! $cfgManualBase 			= "http://www.postgresql.org/users-lounge/docs/7.0/user";
  
  $cfgConfirm 			= true;
--- 93,97 ----
  unset($cfgServers[0]);		// Since 0 = no server, $cfgServers[0] must not be used
  
! $cfgManualBase 			= "http://www.postgresql.org/idocs/index.php";
  
  $cfgConfirm 			= true;

Index: db_details.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/db_details.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** db_details.php	13 May 2002 14:08:11 -0000	1.22
--- db_details.php	28 May 2002 22:48:35 -0000	1.23
***************
*** 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.htm");?>:<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>
  <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.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** lib.inc.php	28 May 2002 22:36:40 -0000	1.59
--- lib.inc.php	28 May 2002 22:48:35 -0000	1.60
***************
*** 838,842 ****
  	global $cfgManualBase, $strDocu;
  	if (!empty($cfgManualBase)) {
! 		return("[<a href=\"$cfgManualBase/$link\">$strDocu</a>]");
  	}
  }
--- 838,842 ----
  	global $cfgManualBase, $strDocu;
  	if (!empty($cfgManualBase)) {
! 		return("[<a href=\"$cfgManualBase?$link\" target=\"_new\">$strDocu</a>]");
  	}
  }

Index: tbl_properties.inc.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/tbl_properties.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tbl_properties.inc.php	20 Mar 2002 19:49:01 -0000	1.7
--- tbl_properties.inc.php	28 May 2002 22:48:35 -0000	1.8
***************
*** 11,17 ****
  <?php
  	if ($action != "tbl_alter.php") {
! 		$strDocsLink = "sql-altertable.htm";
  	} else {
! 		$strDocsLink = "sql-createtable.htm";
  	}
  		// echo "<tr><th colspan=7 style=\"font-size : 12pt\">$strNotImp</font></th></tr>";
--- 11,17 ----
  <?php
  	if ($action != "tbl_alter.php") {
! 		$strDocsLink = "sql-altertable.html";
  	} else {
! 		$strDocsLink = "sql-createtable.html";
  	}
  		// echo "<tr><th colspan=7 style=\"font-size : 12pt\">$strNotImp</font></th></tr>";

Index: tbl_properties.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/tbl_properties.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tbl_properties.php	4 Feb 2002 16:08:11 -0000	1.10
--- tbl_properties.php	28 May 2002 22:48:35 -0000	1.11
***************
*** 197,201 ****
  		print "</table>\n";
  		if (!$printview) {
! 			print show_docu("indices.htm"); 
  		}
  	}
--- 197,201 ----
  		print "</table>\n";
  		if (!$printview) {
! 			print show_docu("indices.html"); 
  		}
  	}

Index: tbl_select.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/tbl_select.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** tbl_select.php	20 Mar 2002 05:20:17 -0000	1.11
--- tbl_select.php	28 May 2002 22:48:35 -0000	1.12
***************
*** 35,39 ****
  		<ul>
  		<li><?php echo $strAddSearchConditions; ?><br>
! 		<input type="text" name="where"> <?php print show_docu("sql-select.htm#SQL-WHERE");?><br>
  	
  		<br>
--- 35,39 ----
  		<ul>
  		<li><?php echo $strAddSearchConditions; ?><br>
! 		<input type="text" name="where"> <?php print show_docu("sql-select.html#SQL-WHERE");?><br>
  	
  		<br>

Index: user_admin.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/user_admin.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** user_admin.php	30 Jan 2002 21:00:36 -0000	1.5
--- user_admin.php	28 May 2002 22:48:35 -0000	1.6
***************
*** 120,128 ****
  		
  		if ($action == "edit") {
! 			echo "<b>$strEdit $usr</b><p>", show_docu("sql-alteruser.htm"), "<br>";
  			$strUserField = "<b>$usr</b><input type=hidden name=usr value=\"$usr\">";
  			$strActionVal = "ALTER";
  		} else {
! 			echo "<b>$strNewUser</b><p>", show_docu("sql-createuser.htm"), "<br>";
  			$strUserField = "<input type=\"text\" name=\"usr\">";
  			$strActionVal = "CREATE";
--- 120,128 ----
  		
  		if ($action == "edit") {
! 			echo "<b>$strEdit $usr</b><p>", show_docu("sql-alteruser.html"), "<br>";
  			$strUserField = "<b>$usr</b><input type=hidden name=usr value=\"$usr\">";
  			$strActionVal = "ALTER";
  		} else {
! 			echo "<b>$strNewUser</b><p>", show_docu("sql-createuser.html"), "<br>";
  			$strUserField = "<input type=\"text\" name=\"usr\">";
  			$strActionVal = "CREATE";

[ppa-cvs] CVS: phpPgAdmin lib.inc.php,1.58,1.59

[Dan W. <kil...@us...>]

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

Modified Files:
	lib.inc.php 
Log Message:
Fixed bug #550110 -- timestamp wasn't getting quoted correctly

Index: lib.inc.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/lib.inc.php,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** lib.inc.php	28 May 2002 22:10:07 -0000	1.58
--- lib.inc.php	28 May 2002 22:36:40 -0000	1.59
***************
*** 160,164 ****
  reset($cfgServers);
  while(list($key, $val) = each($cfgServers)) {
! 	// Don't use servers with no hostname and not local'
  	if (empty($val['host']) && !$val['local']) {
  		unset($cfgServers[$key]);
--- 160,164 ----
  reset($cfgServers);
  while(list($key, $val) = each($cfgServers)) {
! 	// Don't use servers with no hostname and not local
  	if (empty($val['host']) && !$val['local']) {
  		unset($cfgServers[$key]);
***************
*** 574,578 ****
  			}
  			if (!empty($row[rowdefault])) {
! 				if (eregi("text|name|char|date|timestamp|bool", $row[type])) {
  					//$delim = "'";
  				} else {
--- 574,578 ----
  			}
  			if (!empty($row[rowdefault])) {
! 				if (eregi("text|name|char|date|time|bool", $row[type])) {
  					//$delim = "'";
  				} else {
***************
*** 765,769 ****
  				$strEmpty = "";
  				$strVal = addslashes($strVal);
! 			} elseif (eregi("date|time|timestamp|inet|bool", $aryType[$iFieldVal])) {
  				if (empty($strVal)) {
  					$strQuote = "";
--- 765,769 ----
  				$strEmpty = "";
  				$strVal = addslashes($strVal);
! 			} elseif (eregi("date|time|inet|bool", $aryType[$iFieldVal])) {
  				if (empty($strVal)) {
  					$strQuote = "";

[ppa-cvs] CVS: phpPgAdmin all_db.php,1.6,1.7

[Dan W. <kil...@us...>]

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

Modified Files:
	all_db.php 
Log Message:
Fixed bug #545580 -- only_db setting wasn't being enforced on all_db view

Index: all_db.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/all_db.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** all_db.php	28 May 2002 21:09:43 -0000	1.6
--- all_db.php	28 May 2002 22:32:14 -0000	1.7
***************
*** 17,41 ****
  }
  
  if ($common_ver < 7.0) {
! 	$sql_get_dbs = "
! 		SELECT datname, usename AS owner, 'unknown' AS enc
! 		FROM pg_database d, pg_user u 
! 		WHERE d.datdba = u.usesysid AND datname NOT LIKE 'template_' $qrUserOnly
! 		UNION
! 		SELECT datname, NULL AS owner, 'unknown' AS enc
! 		FROM pg_database
! 		WHERE datdba NOT IN (SELECT usesysid FROM pg_user) AND datname NOT LIKE 'template_' $qrUserOnly
! 	";
  } else {
! 	$sql_get_dbs = "
! 		SELECT datname, usename AS owner, pg_encoding_to_char(encoding) AS enc
! 		FROM pg_database d, pg_user u 
! 		WHERE d.datdba = u.usesysid AND datname NOT LIKE 'template_' $qrUserOnly
! 		UNION
! 		SELECT datname, NULL AS owner, pg_encoding_to_char(encoding) AS enc
! 		FROM pg_database
! 		WHERE datdba NOT IN (SELECT usesysid FROM pg_user) AND datname NOT LIKE 'template_' $qrUserOnly
! 	";
  }
  
  $dbs = pg_exec($link, pre_query($sql_get_dbs)) or pg_die(pg_errormessage(), $sql_get_dbs, __FILE__, __LINE__);
--- 17,37 ----
  }
  
+ $qrOnlyDB = empty($cfgServer['only_db']) ? "" : " AND datname = '" . $cfgServer['only_db'] . "'";
+ 
  if ($common_ver < 7.0) {
! 	$qrEncoding = "'unknown'";
  } else {
! 	$qrEncoding = "pg_encoding_to_char(encoding)";
  }
+ 
+ $sql_get_dbs = "
+ 	SELECT datname, usename AS owner, pg_encoding_to_char(encoding) AS enc
+ 	FROM pg_database d, pg_user u 
+ 	WHERE d.datdba = u.usesysid AND datname NOT LIKE 'template_' $qrUserOnly $qrOnlyDB
+ 	UNION
+ 	SELECT datname, NULL AS owner, $qrEncoding AS enc
+ 	FROM pg_database
+ 	WHERE datdba NOT IN (SELECT usesysid FROM pg_user) AND datname NOT LIKE 'template_' $qrUserOnly $qrOnlyDB
+ ";
  
  $dbs = pg_exec($link, pre_query($sql_get_dbs)) or pg_die(pg_errormessage(), $sql_get_dbs, __FILE__, __LINE__);

[ppa-cvs] CVS: phpPgAdmin header.inc.php,1.3,1.4 main.php,1.6,1.7

[Dan W. <kil...@us...>]

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

Modified Files:
	header.inc.php main.php 
Log Message:
CSS formating issues

Index: header.inc.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/header.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** header.inc.php	17 Feb 2002 16:44:32 -0000	1.3
--- header.inc.php	28 May 2002 22:10:35 -0000	1.4
***************
*** 23,26 ****
--- 23,27 ----
  	A:hover.nav {  font-family: Verdana, Arial, Helvetica, sans-serif; color: red;}
  	.nav {  font-family: Verdana, Arial, Helvetica, sans-serif; color: #000000}
+ 	.generic {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size:10pt; color: #000000}
  	
  	//-->

Index: main.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/main.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** main.php	2 Feb 2002 20:23:17 -0000	1.6
--- main.php	28 May 2002 22:10:35 -0000	1.7
***************
*** 18,21 ****
--- 18,23 ----
  echo "<h1>", $strWelcome, " ", $cfgProgName, " ", $cfgVersion, "</h1>";
  
+ echo "<div class=\"generic\" align=\"left\">";
+ 
  if ($server > 0) {
  	echo "<b>PostgreSQL $ver_num[0] $strRunning ";
***************
*** 29,37 ****
  	echo "</b><br>\n";
  }
- 
  if ($cfgServer['adv_auth'])
  	echo "<br>$strLoggedInAs: <b>$PHP_PGADMIN_USER</b>";
  ?>
- <div align="left">
  <ul>
  <?php
--- 31,37 ----

[ppa-cvs] CVS: phpPgAdmin lib.inc.php,1.57,1.58

[Dan W. <kil...@us...>]

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

Modified Files:
	lib.inc.php 
Log Message:
Allow user to login without password -- for trust mode

Index: lib.inc.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/lib.inc.php,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** lib.inc.php	28 May 2002 20:36:43 -0000	1.57
--- lib.inc.php	28 May 2002 22:10:07 -0000	1.58
***************
*** 33,41 ****
  
  function build_connstr($settings) {
! 	if (!$GLOBALS['cfgServer']['local']) $conn['host'] = $GLOBALS['cfgServer']['host'];
  	if (!empty($GLOBALS['cfgServer']['port'])) $conn['port'] = $GLOBALS['cfgServer']['port'];
  	$conn['dbname']		= $settings['dbname'];
  	$conn['user']		= $settings['user'];
! 	$conn['password']	= $settings['password'];
  
  	while (list($param, $value) = each($conn)) {
--- 33,41 ----
  
  function build_connstr($settings) {
! 	$conn['host'] = $GLOBALS['cfgServer']['host']; // Even if it's a local connection, we need this so it doesn't use $PGHOST env-var
  	if (!empty($GLOBALS['cfgServer']['port'])) $conn['port'] = $GLOBALS['cfgServer']['port'];
  	$conn['dbname']		= $settings['dbname'];
  	$conn['user']		= $settings['user'];
! 	if (isset($settings['password'])) $conn['password'] = $settings['password'];
  
  	while (list($param, $value) = each($conn)) {
***************
*** 220,224 ****
  		}
  		
! 		if (empty($PHP_PGADMIN_USER) || empty($PHP_PGADMIN_PW)) {
  			$no_include = true;
  			include("header.inc.php");
--- 220,224 ----
  		}
  		
! 		if (empty($PHP_PGADMIN_USER)) {
  			$no_include = true;
  			include("header.inc.php");
***************
*** 226,230 ****
  			include("footer.inc.php");
  			exit;
! 		} else if (isset($PHP_PGADMIN_USER) && isset($PHP_PGADMIN_PW)) {
  			$conn_str = build_connstr(array("dbname"=>$db, "user"=>$PHP_PGADMIN_USER, "password"=>$PHP_PGADMIN_PW));
  			
--- 226,230 ----
  			include("footer.inc.php");
  			exit;
! 		} else if (isset($PHP_PGADMIN_USER)) {
  			$conn_str = build_connstr(array("dbname"=>$db, "user"=>$PHP_PGADMIN_USER, "password"=>$PHP_PGADMIN_PW));
  			

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

[Dan W. <kil...@us...>]

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

Modified Files:
	left.php 
Log Message:
Added some formatting and a logout link

Index: left.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/left.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** left.php	18 Feb 2002 23:12:46 -0000	1.19
--- left.php	28 May 2002 21:17:52 -0000	1.20
***************
*** 53,56 ****
--- 53,57 ----
        
        <A class="item" HREF="main.php?server=<?php echo $server; ?>"><FONT color="black" class="heada"><?php echo $strHome;?></FONT></A><br>
+ 	  <p>
  	  <?php if ($server) { ?>
        <A class="item" HREF="all_db.php?server=<?php echo $server; ?>"><FONT color="black" class="heada"><?php echo $strAllDatabases;?></FONT></A>
***************
*** 211,214 ****
--- 212,221 ----
  		";
  	}
+ 	echo "
+ 		<br>
+ 		<div ID=\"el300Parent\" CLASS=\"parent\">
+ 			<a class=\"item\" href=\"index.php?server=$server&mode=logout\" target=\"_top\">$strLogout</a>
+ 		</div>
+ 	";
  ?>
   <!-- Arrange collapsible/expandable db list at startup -->

[ppa-cvs] CVS: phpPgAdmin all_db.php,1.5,1.6

[Dan W. <kil...@us...>]

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

Modified Files:
	all_db.php 
Log Message:
Fixed encoding_to_char error for pre 7.0 installs on all db view: bug #544781

Index: all_db.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/all_db.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** all_db.php	11 Dec 2001 18:58:17 -0000	1.5
--- all_db.php	28 May 2002 21:09:43 -0000	1.6
***************
*** 17,29 ****
  }
  
! $sql_get_dbs = "
! 	SELECT datname, usename AS owner, pg_encoding_to_char(encoding) AS enc
! 	FROM pg_database d, pg_user u 
! 	WHERE d.datdba = u.usesysid AND datname NOT LIKE 'template_' $qrUserOnly
! 	UNION
! 	SELECT datname, NULL AS owner, pg_encoding_to_char(encoding) AS enc
! 	FROM pg_database
! 	WHERE datdba NOT IN (SELECT usesysid FROM pg_user) AND datname NOT LIKE 'template_' $qrUserOnly
! ";
  
  $dbs = pg_exec($link, pre_query($sql_get_dbs)) or pg_die(pg_errormessage(), $sql_get_dbs, __FILE__, __LINE__);
--- 17,41 ----
  }
  
! if ($common_ver < 7.0) {
! 	$sql_get_dbs = "
! 		SELECT datname, usename AS owner, 'unknown' AS enc
! 		FROM pg_database d, pg_user u 
! 		WHERE d.datdba = u.usesysid AND datname NOT LIKE 'template_' $qrUserOnly
! 		UNION
! 		SELECT datname, NULL AS owner, 'unknown' AS enc
! 		FROM pg_database
! 		WHERE datdba NOT IN (SELECT usesysid FROM pg_user) AND datname NOT LIKE 'template_' $qrUserOnly
! 	";
! } else {
! 	$sql_get_dbs = "
! 		SELECT datname, usename AS owner, pg_encoding_to_char(encoding) AS enc
! 		FROM pg_database d, pg_user u 
! 		WHERE d.datdba = u.usesysid AND datname NOT LIKE 'template_' $qrUserOnly
! 		UNION
! 		SELECT datname, NULL AS owner, pg_encoding_to_char(encoding) AS enc
! 		FROM pg_database
! 		WHERE datdba NOT IN (SELECT usesysid FROM pg_user) AND datname NOT LIKE 'template_' $qrUserOnly
! 	";
! }
  
  $dbs = pg_exec($link, pre_query($sql_get_dbs)) or pg_die(pg_errormessage(), $sql_get_dbs, __FILE__, __LINE__);

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

[Dan W. <kil...@us...>]

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

Modified Files:
	tbl_replace.php 
Log Message:
Fixed error on file stat when the goto was not just a filename

Index: tbl_replace.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/tbl_replace.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** tbl_replace.php	28 May 2002 20:36:43 -0000	1.11
--- tbl_replace.php	28 May 2002 20:47:29 -0000	1.12
***************
*** 82,91 ****
  		unset($affected_rows);
  	}
! 	if (file_exists("./$goto")) {
  		include("header.inc.php");
  		$message = $strModifications;
  		include(preg_replace('/\.\.*/', '.', $goto));
- 	} else {
- 		Header("Location: $goto");
  	}
  	exit;
--- 82,91 ----
  		unset($affected_rows);
  	}
! 	if (eregi("\?", $goto)) {
! 		Header("Location: $goto");
! 	} elseif (file_exists("./$goto")) {
  		include("header.inc.php");
  		$message = $strModifications;
  		include(preg_replace('/\.\.*/', '.', $goto));
  	}
  	exit;

[ppa-cvs] CVS: phpPgAdmin lib.inc.php,1.56,1.57 tbl_alter.php,1.2,1.3 tbl_replace.php,1.10,1.11

[Dan W. <kil...@us...>]

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

Modified Files:
	lib.inc.php tbl_alter.php tbl_replace.php 
Log Message:
Formalized the MD5 support... this just uses PHP's md5 function

Index: lib.inc.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/lib.inc.php,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** lib.inc.php	1 May 2002 15:42:17 -0000	1.56
--- lib.inc.php	28 May 2002 20:36:43 -0000	1.57
***************
*** 1015,1019 ****
  	"MASKLEN",
  	"NETMASK",
! 	"MD5"
  	);
  
--- 1015,1019 ----
  	"MASKLEN",
  	"NETMASK",
! 	"MD5 -- PHP"
  	);
  

Index: tbl_alter.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/tbl_alter.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tbl_alter.php	2 Feb 2001 06:03:08 -0000	1.2
--- tbl_alter.php	28 May 2002 20:36:43 -0000	1.3
***************
*** 6,10 ****
  if (isset($submit)) {
  	if(!isset($query)) $query = "";
- 	//   $query .= " $field_orig[0] $field_name[0] $field_type[0] ";
  	$query .= " $cfgQuotes$field_orig[0]$cfgQuotes TO $cfgQuotes$field_name[0]$cfgQuotes";
  	
--- 6,9 ----
***************
*** 15,21 ****
  	if ($field_attribute[0] != "") {
  		$query .= "$field_attribute[0] ";
- 	}
- 	if ($field_default[0] != "") {
- 		$query .= "DEFAULT $field_default[0] ";
  	}
  */
--- 14,17 ----

Index: tbl_replace.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/tbl_replace.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tbl_replace.php	28 May 2002 19:00:31 -0000	1.10
--- tbl_replace.php	28 May 2002 20:36:43 -0000	1.11
***************
*** 13,23 ****
  	unset($valuelist);
  	while (list($key, $val) = each($fields)) {
! 		if (strtolower($val) != "null")
! 			$val = "'$val'";
  		if (empty($funcs[$key])) {
  			$valuelist .= "$cfgQuotes$key$cfgQuotes = $val, ";
  		} else {
! 			if ($funcs[$key] == "MD5" && ($common_ver < 7.2)) {
! 				$valuelist .= "$cfgQuotes$key$cfgQuotes = '" . md5($val) . "', ";
  			} else {
  				$valuelist .= "$cfgQuotes$key$cfgQuotes = $funcs[$key]($val), ";
--- 13,29 ----
  	unset($valuelist);
  	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 = "'";
! 			}
! 			if (strtolower($val) != "null") {
! 				$val = $strValDelim . $val . $strValDelim;
! 			}
! 		}
  		if (empty($funcs[$key])) {
  			$valuelist .= "$cfgQuotes$key$cfgQuotes = $val, ";
  		} else {
! 			if ($funcs[$key] == "MD5 -- PHP") {
! 				$valuelist .= "$cfgQuotes$key$cfgQuotes = '" . md5(stripslashes(trim(ereg_replace("^'|'$", "", $val)))) . "', ";
  			} else {
  				$valuelist .= "$cfgQuotes$key$cfgQuotes = $funcs[$key]($val), ";
***************
*** 49,57 ****
  			$valuelist .= "$val, ";
  		} else {
! 			// $val = str_replace("'", "\"", $val);
! 			if ($funcs[$key] == "MD5" && ($common_version < 7.2)) {
  				// I'm leaving this in... just because people might want to insert/update an md5 value 
  				//  and then check it through PHP, but we can't use PHP's MD5 to query it.
! 				$valuelist .= "'" . md5(stripslashes($val)) . "', ";
  			} else {
  				$valuelist .= "$funcs[$key](" . stripslashes($val) . "), ";
--- 55,62 ----
  			$valuelist .= "$val, ";
  		} else {
! 			if (trim(strtoupper($funcs[$key])) == "MD5 -- PHP") {
  				// I'm leaving this in... just because people might want to insert/update an md5 value 
  				//  and then check it through PHP, but we can't use PHP's MD5 to query it.
! 				$valuelist .= "'" . md5(stripslashes(trim(ereg_replace("^'|'$", "", $val)))) . "', ";
  			} else {
  				$valuelist .= "$funcs[$key](" . stripslashes($val) . "), ";

[ppa-cvs] CVS: phpPgAdmin tbl_replace.php,1.9,1.10

[Dan W. <kil...@us...>]

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

Modified Files:
	tbl_replace.php 
Log Message:
Fixed bug of empty numeric type on insert... was trying to insert ''

Index: tbl_replace.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/tbl_replace.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** tbl_replace.php	20 Mar 2002 05:20:17 -0000	1.9
--- tbl_replace.php	28 May 2002 19:00:31 -0000	1.10
***************
*** 18,22 ****
  			$valuelist .= "$cfgQuotes$key$cfgQuotes = $val, ";
  		} else {
! 			if ($funcs[$key] == "MD5" && ("$major_version.$minor_version" < "7.2")) {
  				$valuelist .= "$cfgQuotes$key$cfgQuotes = '" . md5($val) . "', ";
  			} else {
--- 18,22 ----
  			$valuelist .= "$cfgQuotes$key$cfgQuotes = $val, ";
  		} else {
! 			if ($funcs[$key] == "MD5" && ($common_ver < 7.2)) {
  				$valuelist .= "$cfgQuotes$key$cfgQuotes = '" . md5($val) . "', ";
  			} else {
***************
*** 31,45 ****
  	unset($valuelist);
  	while (list($key, $val) = each($fields)) {
  		$fieldlist .= "$cfgQuotes$key$cfgQuotes, ";
! 		$strValDelim = "'";
  		// 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])) {
! 				if (!empty($val)) {
! 					$strValDelim = "'";
! 				} else {
! 					$val = "NULL";
! 					unset($strValDelim);
! 				}
  			}
  			if (strtolower($val) != "null") {
--- 31,43 ----
  	unset($valuelist);
  	while (list($key, $val) = each($fields)) {
+ 		if ($val != "0" && empty($val))  {
+ 			continue;
+ 		}
  		$fieldlist .= "$cfgQuotes$key$cfgQuotes, ";
! 		unset($strValDelim);
  		// 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 = "'";
  			}
  			if (strtolower($val) != "null") {
***************
*** 52,56 ****
  		} else {
  			// $val = str_replace("'", "\"", $val);
! 			if ($funcs[$key] == "MD5" && ("$major_version.$minor_version" < "7.2")) {
  				// I'm leaving this in... just because people might want to insert/update an md5 value 
  				//  and then check it through PHP, but we can't use PHP's MD5 to query it.
--- 50,54 ----
  		} else {
  			// $val = str_replace("'", "\"", $val);
! 			if ($funcs[$key] == "MD5" && ($common_version < 7.2)) {
  				// I'm leaving this in... just because people might want to insert/update an md5 value 
  				//  and then check it through PHP, but we can't use PHP's MD5 to query it.

[ppa-cvs] CVS: phpPgAdmin tbl_form.inc.php,1.14,1.15

[Dan W. <kil...@us...>]

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

Modified Files:
	tbl_form.inc.php 
Log Message:
Removed grabbing of comments because 7.2 no longer had oid in pg_attribute table... don't know how to get the comment now

Index: tbl_form.inc.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/tbl_form.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** tbl_form.inc.php	5 Apr 2002 05:07:28 -0000	1.14
--- tbl_form.inc.php	28 May 2002 18:59:11 -0000	1.15
***************
*** 6,51 ****
  //	Date:		19 Feb 2000
  
! $sql_get_fields = "
! 	SELECT 
! 		a.attnum,
! 		a.attname AS field, 
! 		t.typname AS type, 
! 		a.attlen AS length,
! 		a.atttypmod AS lengthvar,
! 		a.attnotnull AS notnull,
! 		a.atthasdef as hasdefault,
! 		t.typdefault as comment  /* '' as comment yielded type mismatch. */
! 	FROM 
! 		pg_class c, 
! 		pg_attribute a, 
! 		pg_type t
! 	WHERE 
! 		c.relname = '$table'
! 		and a.attnum > 0
! 		and a.attrelid = c.oid
! 		and a.atttypid = t.oid
! 		and NOT EXISTS  (SELECT objoid FROM pg_description WHERE a.oid=objoid)
!         UNION ALL                        /* Outer joins require Postgres >=7.1 */
!         SELECT
!                 a.attnum,
!                 a.attname AS field,
!                 t.typname AS type,
!                 a.attlen AS length,
!                 a.atttypmod AS lengthvar,
!                 a.attnotnull AS notnull,
!                 a.atthasdef as hasdefault,
!                 d.description as comment
!         FROM
!                 pg_class c,
!                 pg_attribute a,
!                 pg_type t,
!                 pg_description d
!         WHERE
!                 c.relname = '$table'
!                 and a.attnum > 0
!                 and a.attrelid = c.oid
!                 and a.atttypid = t.oid
!                 and d.objoid   = a.oid
! ";
  
  if ($cfgDoOrder) {
--- 6,74 ----
  //	Date:		19 Feb 2000
  
! if ($common_ver >= 7.2) {
! 	// We no longer have oid in the pg_attribute table, so we cannot grab the comment (at least not as far as I know)
! 	$sql_get_fields = "
! 		SELECT
! 			a.attnum,
! 			a.attname AS field,
! 			t.typname AS type,
! 			a.attlen AS length,
! 			a.atttypmod AS lengthvar,
! 			a.attnotnull AS notnull,
! 			a.atthasdef as hasdefault
! 		FROM
! 			pg_class c,
! 			pg_attribute a,
! 			pg_type t
! 		WHERE
! 			c.relname = '$table'
! 			and a.attnum > 0
! 			and a.attrelid = c.oid
! 			and a.atttypid = t.oid
! 	";
! } else {
! 	$sql_get_fields = "
! 		SELECT 
! 			a.attnum,
! 			a.attname AS field, 
! 			t.typname AS type, 
! 			a.attlen AS length,
! 			a.atttypmod AS lengthvar,
! 			a.attnotnull AS notnull,
! 			a.atthasdef as hasdefault,
! 			t.typdefault as comment  /* '' as comment yielded type mismatch. */
! 		FROM 
! 			pg_class c, 
! 			pg_attribute a, 
! 			pg_type t
! 		WHERE 
! 			c.relname = '$table'
! 			and a.attnum > 0
! 			and a.attrelid = c.oid
! 			and a.atttypid = t.oid
! 			and NOT EXISTS  (SELECT objoid FROM pg_description WHERE a.oid=objoid)
! 		UNION ALL                        /* Outer joins require Postgres >=7.1 */
! 		SELECT
! 			a.attnum,
! 			a.attname AS field,
! 			t.typname AS type,
! 			a.attlen AS length,
! 			a.atttypmod AS lengthvar,
! 			a.attnotnull AS notnull,
! 			a.atthasdef as hasdefault,
! 			d.description as comment
! 		FROM
! 			pg_class c,
! 			pg_attribute a,
! 			pg_type t,
! 			pg_description d
! 		WHERE
! 			c.relname = '$table'
! 			and a.attnum > 0
! 			and a.attrelid = c.oid
! 			and a.atttypid = t.oid
! 			and d.objoid   = a.oid
! 	";
! }
  
  if ($cfgDoOrder) {

[ppa-cvs] CVS: phpPgAdmin tbl_addfield.php,1.4,1.5

[Dan W. <kil...@us...>]

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

Modified Files:
	tbl_addfield.php 
Log Message:
Fixed error from NOT NULL clause in 7.2 install

Index: tbl_addfield.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/tbl_addfield.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tbl_addfield.php	28 Jan 2002 23:36:50 -0000	1.4
--- tbl_addfield.php	28 May 2002 18:57:51 -0000	1.5
***************
*** 12,25 ****
  			$query .= "(".stripslashes($field_length[$i]).") ";
  		}
! 		// if (!empty($field_null[$i])) {
! 			$query .= "$field_null[$i] " ;
! 		// }
  		if (!empty($field_default[$i]) && $common_ver >= 7.0 ) {
  			$field_default[$i] = stripslashes($field_default[$i]);
! 			$query_default = "ALTER TABLE $cfgQuotes$table$cfgQuotes ALTER $cfgQuotes$field_name[$i]$cfgQuotes SET DEFAULT $field_default[$i];";
  		}
  
! 		$sql_query .= "ALTER TABLE $cfgQuotes$table$cfgQuotes ADD $query;\n";
  		$sql_query .= $query_default;
  
  		$result = pg_exec($link, pre_query($sql_query)) or pg_die(pg_errormessage($link), $sql_query, __FILE__, __LINE__);
--- 12,32 ----
  			$query .= "(".stripslashes($field_length[$i]).") ";
  		}
! 
  		if (!empty($field_default[$i]) && $common_ver >= 7.0 ) {
  			$field_default[$i] = stripslashes($field_default[$i]);
! 			$query_default = "\nALTER TABLE $cfgQuotes$table$cfgQuotes ALTER $cfgQuotes$field_name[$i]$cfgQuotes SET DEFAULT $field_default[$i];";
  		}
  
! 		if (!empty($field_null[$i])) {
! 			if ($common_ver >= 7.3) {
! 				$query_null = "\nALTER TABLE $cfgQuotes$table$cfgQuotes SET NOT NULL $field_null[$i];" ;
! 			} else {
! 				$query_null = "\n-- NOTICE: ALTER TABLE DOES NOT SUPPORT 'NOT NULL' CLAUSE";
! 			}
! 		}
! 		
! 		$sql_query .= "ALTER TABLE $cfgQuotes$table$cfgQuotes ADD $query;";
  		$sql_query .= $query_default;
+ 		$sql_query .= $query_null;
  
  		$result = pg_exec($link, pre_query($sql_query)) or pg_die(pg_errormessage($link), $sql_query, __FILE__, __LINE__);

[ppa-cvs] CVS: phpPgAdmin catala.inc.php,1.3,NONE

[Robert T. <xz...@us...>]

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

Removed Files:
	catala.inc.php 
Log Message:
rename catala.inc.php file to catalan.inc.php since the langauge is catalan.
Original translation was done by (Marc Balcells Sanahuja [ma...@od...])


--- catala.inc.php DELETED ---

[ppa-cvs] CVS: phpPgAdmin catalan.inc.php,NONE,1.1

[Robert T. <xz...@us...>]

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

Added Files:
	catalan.inc.php 
Log Message:
rename catala.inc.php file to catalan.inc.php since the langauge is catalan.
Original translation was done by (Marc Balcells Sanahuja [ma...@od...])


--- NEW FILE: catalan.inc.php ---
<?php
/* $Id: catalan.inc.php,v 1.1 2002/05/26 22:17:38 xzilla Exp $ */
/* $Id: catalan.inc.php Translated by Marc Balcells ma...@od... */

$strAPrimaryKey			= "S'ha afegit una clau primaria ";
$strAccessDenied		= "Accés denegat";
$strAction				= "Acció";
$strAddNewField			= "Afegeix un nou camp";
$strAddSearchConditions	= "Afegeix condicions de cerca (cos de la clausula \"where\"):";
$strAnIndex				= "S'ha afegit un index a ";
$strAttr				= "Atributs";
$strBack				= "Enrera";
$strBrowse				= "Mostra";
$strCarriage			= "Retorn de carro: \\r";
$strChange				= "Canvia";
$strColumnNames			= "Noms de les columnes";
$strConstraintName		= "Nom de la restricció";
$strCopyTable			= "Copia la taula a:";
$strCopyTableOK			= "La taula \$table s'ha copiat a \$new_name.";
$strCreate				= "Crea";
$strCreateNewDatabase	= "Crea una base de dades nova ";
$strCreateNewTable		= "Crea una taula nova a la base de dades ";
$strDatabase			= "Base de dades ";
$strDatabases			= "bases de dades";
$strDefault				= "Per defecte";
$strDeferrable			= "Pot posposar-se";
$strDelete				= "Elimina";
$strDeleted				= "S'ha eliminat la fila";
$strDoAQuery			= "Fes una \"consulta per exemple\" (comodins: \"%\")";
$strDoYouReally			= "Realment vols ";
$strDocu				= "Documentació";
$strDrop				= "Elimina";
$strDropDB				= "Elimina la base de dades ";
$strDumpingData			= "Volcant les dades per la base de dades";
$strEdit				= "Edita";
$strEmpty				= "Buida";
$strEmptyResultSet		= "PostgreSQL ha tornat un conjunt de resultats buit (p.ex. zero files).";
$strEnabled				= "Activat";
$strEnclosedBy			= "envoltat per";
$strEnd					= "Final";
$strError				= "Error";
$strEscapedBy			= "escaped by";
$strExtra				= "Extra";
$strField				= "Camp";
$strNumFields			= "# de Camps";
$strFunction			= "Funció";
$strGo					= "Ves a";
$strHasBeenAltered		= "ha sigut modificada.";
$strHasBeenCreated		= "ha sigut creada.";
$strHasBeenDropped		= "ha sigut eliminada.";
$strHasBeenEmptied		= "ha sigut buidada.";
$strHome				= "Inici";
$strHost				= "Servidor";
$strIfYouWish			= "Si desitjeu carregar nomes algunes de les columnes d'una taula; especifiqueu una llista de camps separats per comes.";
$strIndex				= "Index";
$strInitDeferred		= "Inici posposat";
$strInsert				= "Inserta";
$strInsertIntoTable		= "Inserta a la taula";
$strInsertNewRow		= "Inserta la propera fila";
$strInsertTextfiles		= "Inserta fitxers de texte a la taula";
$strIsConstraint		= "Restricció";
$strKeyname				= "Nom de la clau";
$strLengthSet			= "Length/Set";
$strLineFeed			= "Nova linea: \\n";
$strLines				= "Linies";
$strLocationTextfile	= "Ubicació del fitxer de texte";
$strLogout				= "Desconnecta";
$strModifications		= "S'han desat les modificacions";
$strMySQLReloaded		= "S'ha tornat a carregar PostgreSQL.";
$strMySQLSaid			= "PostgreSQL ha dit: ";
$strMySQLShowProcess	= "Mostra els processos";
$strMySQLShowStatus		= "Mostra la informació de temps d'execució de PostgreSQL";
$strMySQLShowVars		= "Mostra les variables de sistema de PostgreSQL";
$strName				= "Nom";
$strNext				= "Següent";
$strNo					= "No";
$strNoTablesFound		= "No s'han trobat taules a la base de dades.";
$strNull				= "Buit";
$strOftenQuotation		= "Fes servir sovint les cometes. OPCIONALMENT significa que nomès els camps de tipus char i varchar estaràn envoltats per -caràcter \"envoltat per\".";
$strOptionalControls	= "Opcional. Controla com escriure o llegir caràcters especials.";
$strOptionally			= "OPTIONALMENT";
$strPos1				= "Comença";
$strPrevious			= "Anterior";
$strPrimary				= "Primari";
$strPrimaryKey			= "Clau primaria";
$strProducedAnError		= "ha produit un error.";
$strProperties			= "Propietats";
$strQBE					= "Consulta per exemple";
$strReadTheDocs			= "Llegeix els documents";
$strRecords				= "Registres";
$strReferences			= "Referencia";
$strReloadFailed		= "La recàrrega de PostgreSQL ha fallat.";
$strReloadMySQL			= "Torna a carregar PostgreSQL";
$strRenameTable			= "Reanomena la taula a";
$strRenameTableOK		= "La taula \$table s'ha reanomenat a \$new_name";
$strReplace				= "Substitueix";
$strReplaceTable		= "Substitueix les dades de la taula amb el fitxer";
$strReset				= "Reset(posa a zero)";
$strRun					= "Executa";
$strRunSQLQuery			= "Executa una consulta/es a la base de dades ";
$strRunning				= "executant-se a ";
$strSQLQuery			= "consulta-SQL";
$strSave				= "Desa";
$strSelect				= "Selecciona";
$strSelectFields		= "Selecciona camps (al menys un):";
$strSend				= "envia";
$strShowingRecords		= "Mostrant registres ";
$strStrucCSV			= "dades tipus CSV";
$strStrucData			= "Estructura i dades";
$strStrucDrop			= "Afegeix 'elimina la taula'";
$strStrucOnly			= "Nomès l'estructura";
$strSubmit				= "Envia";
$strSuccess				= "La vostra consulta-SQL s'ha executat correctament";
$strTable				= "Taula";
$strTableStructure		= "Estructura de taula per la taula";
$strTerminatedBy		= "acabat per";
$strTheContent			= "Els continguts del vostre fitxer s'han insertat.";
$strTheContents			= "Els continguts del fitxer substitueixen els continguts de la taula seleccionada per les files amb claus primaries o úniques identiques.";
$strTheTerminator		= "El caràcter finalitzador de camp.";
$strTotal				= "total";
$strType				= "Tipus";
$strUnique				= "Únic";
$strValue				= "Valor";
$strViewDump			= "Mostra el volcat (esquema) de la taula";
$strViewDumpDB			= "Mostra el volcat (esquema) de la base de dades";
$strWelcome				= "Benvingut a ";
$strWrongUser 			= "El nom d'usuari/contrasenya son incorrectes. Accès denegat.";
$strYes					= "Si";


// Added for phpPgAdmin
$strAddGroup			= "Afegeix grup";
$strAddConditions		= "Condicions adicionals";
$strAddUser				= "Afegeix usuari";
$strAffected			= "Files afectades";
$strArgs				= "Paràmetres";
$strCancel				= "Cancela";
$strCreateNew			= "Crea una nova ";
$strCreateDB			= "Crear BDs?";
$strCreated				= "Creada";
$strCatUpd				= "Actualitza el catàleg";
$strDate				= "Data";
$strDefinition			= "Definició";
$strDescription			= "Descripció";
$strDisplay				= "Mostra";
$strOnEvents			= "En els events";
$strExecute				= "Executa";
$strExpires				= "Caduca";
$strFileLocation		= "o la ubicació del fitxer de texte";
$strFound				= "trobat/s";
$strFunc				= "Funció";
$strFuncs				= "Funcions";
$strGroup				= "Grup";
$strGroupAdmin			= "Admin de grup.";
$strGroupDeleted		= "Grup eliminat";
$strGroupField			= "Nom del grup";
$strGroupID				= "SysID";
$strGroupMessage		= "La taula de grups està buida.";
$strGroupModify			= "Modifica";
$strGroups				= "Grups disponibles";
$strGroupUpdated		= "Grup actualitzat";
$strGroupUpdate			= "Actualitza";		
$strHasBeenVacuumed		= "ha sigut aspirat (analitzat)";
$strIndicies			= "Indexos";
$strLang				= "Llengua";
$strLength				= "Longitud";
$strLinkKeys			= "Claus enllaçants";
$strLogin				= "Login";
$strLogOutInst			= "En acabar, recarrega";
$strLoggedInAs			= "Has entrat com a";
$strMax					= "Máxim";
$strMember				= "Membres";
$strMore				= "Més";
$strNewUser				= "Nou Usuari";
$strNewGroup			= "Nou Grup";
$strNonMember			= "No-Membres";
$strNoAuth				= "Not autoritzats";
$strNoData				= "Sense dades";
$strNoReports			= "Sense informes";
$strNotDisplayed		= "Sense mostrar";
$strNotNull				= "Sense buits";
$strNotImp				= "L'ordre ALTER TABLE de PostgreSQL nomès suporta el canvi de nom de la columna.<br>Altres opcions s'han deixat (esperem) per properes versions";
$strOnDB				= " a la base de dades ";
$strOperator			= "Operador";
$strPassword			= "Contrasenya";
$strPrintScreen			= "Imprimeix";
$strPrivileges			= "Privilegis";
$strPostgres			= "PostgreSQL";
$strReport				= "Informe";
$strReports				= "Informes";
$strReportName			= "Nom de l'informe";
$strReportsRequire		= "La utilitat per crear informes requereix la creació de la base de dades phppgadmin. Heu de crear aquesta base de dades per continuar.";
$strRename				= "Canvia el nom";
$strRetType				= "Retorna"; 
$strRestart				= "Reincia";
$strRevokeGroup			= "Treu els drets del Grup";
$strRevokeUser			= "Treu els drets de l'usuari";
$strRule				= "Regla";
$strSequence			= "Seqüencia";
$strSequences			= "Seqüencies";
$strSrc					= "Origen(font)";
$strStart				= "Comença";
$strSuperUser			= "Super usuari";
$strSystemTables		= "Taules de sistema";
$strSysID				= "SysID";
$strTable				= "Taula";
$strTables				= "Taules";
$strTrigger				= "Trigger";
$strTriggers			= "Triggers";
$strUpdate				= "Actualitza";
$strUpdated				= "actualitzat";
$strUseDefault			= "Fes servir el valor per defecte";
$strUserAdmin			= "Admin d'usuaris.";
$strUserUpdated			= "Taula d'usuaris actualitzada";
$strUserName			= "Nom d'usuari";
$strUserGroup			= "Usuari/Grup";
$strVacuumDB			= "Aplicar l'ordre Vacuum a la base de dades";
$strVacuumAnalyzeDB		= "Aplicar l'ordre Vacuum Analyze a la base de dades";
$strView				= "Mostra";
$strViews				= "Vistes";
$strWhen				= "Quan";
?>

[ppa-cvs] CVS: webdb LICENSE,NONE,1.1

[Christopher Kings-L. <ch...@us...>]

Update of /cvsroot/phppgadmin/webdb
In directory usw-pr-cvs1:/tmp/cvs-serv19855

Added Files:
	LICENSE 
Log Message:
May as well add a license - does this meet with approval?

--- NEW FILE: LICENSE ---
Copyright (c) 2002 The WebDB Project

This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License <http://www.opensource.org/gpl-license.html>
for more details.

[ppa-cvs] CVS: webdb/conf .cvsignore,NONE,1.1

[Christopher Kings-L. <ch...@us...>]

Update of /cvsroot/phppgadmin/webdb/conf
In directory usw-pr-cvs1:/tmp/cvs-serv18820

Added Files:
	.cvsignore 
Log Message:
ignore config.inc.php

--- NEW FILE: .cvsignore ---
config.inc.php

[ppa-cvs] CVS: webdb/conf config.inc.php-dist,NONE,1.1 config.inc.php,1.6,NONE

[Christopher Kings-L. <ch...@us...>]

Update of /cvsroot/phppgadmin/webdb/conf
In directory usw-pr-cvs1:/tmp/cvs-serv18004/conf

Added Files:
	config.inc.php-dist 
Removed Files:
	config.inc.php 
Log Message:
Broke stuff out from config.inc.php into lib.inc.php
Renamed config.inc.php to config.inc.php-dist
Support everywhere except VIEWs for PHP 4.1 superglobals.
  (See users.php for good example code)



--- NEW FILE: config.inc.php-dist ---
<?php

	/**
	 * Central WebDB configuration.  As a user you may modify the
	 * settings here for your particular configuration.
	 *
	 * $Id: config.inc.php-dist,v 1.1 2002/05/15 09:57:55 chriskl Exp $
	 */

	// Set error reporting level
	error_reporting(E_ALL);

	// App settings
	$appName = 'WebDB';
	$appIntro = 'Welcome to WebDB.';
	$appBase = '../public_html';
	$appVersion = '0.1-dev';
	
	/*
	 * GUI settings
	 */	 
	
	// Width of the left frame
	$guiLeftFrameWidth = 200;
	// Which look & feel theme to use
	$guiTheme = 'default';

	// Servers and types
	$confServers = array();
	$confServers[0]['desc'] = 'Home-PG';
	$confServers[0]['host'] = 'localhost';
	$confServers[0]['port'] = '5432';
	$confServers[0]['type'] = 'Postgres71';
	$confServers[0]['default'] = 'template1';
	
	// Servers and types
	$confServers[1]['desc'] = 'Dev-PG';
	$confServers[1]['host'] = 'database-dev';
	$confServers[1]['port'] = '5432';
	$confServers[1]['type'] = 'Postgres71';
	$confServers[1]['default'] = 'template1';
	
	// MySQL example
	$confServers[2]['desc'] = 'Home-MySQL';
	$confServers[2]['host'] = 'localhost';
	$confServers[2]['port'] = 'xxx'; // Port isn't being used anywhere yet
	$confServers[2]['type'] = 'MySQL';
	$confServers[2]['default'] = '';
	
	/*****************************************
	 * Don't modify anything below this line *
	 *****************************************/

	// Language
	include_once('../lang/template.php');
	
	// Main library
	include_once('../libraries/lib.inc.php');
	
?>

--- config.inc.php DELETED ---

[ppa-cvs] CVS: webdb/public_html browser.php,1.5,1.6 login.php,1.2,1.3 tables.php,1.2,1.3 topbar.php,1.4,1.5 users.php,1.1,1.2 views.php,1.2,1.3

[Christopher Kings-L. <ch...@us...>]

Update of /cvsroot/phppgadmin/webdb/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv18004/public_html

Modified Files:
	browser.php login.php tables.php topbar.php users.php 
	views.php 
Log Message:
Broke stuff out from config.inc.php into lib.inc.php
Renamed config.inc.php to config.inc.php-dist
Support everywhere except VIEWs for PHP 4.1 superglobals.
  (See users.php for good example code)



Index: browser.php
===================================================================
RCS file: /cvsroot/phppgadmin/webdb/public_html/browser.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** browser.php	10 Apr 2002 04:09:47 -0000	1.5
--- browser.php	15 May 2002 09:57:55 -0000	1.6
***************
*** 23,27 ****
     $tree = new Tree ('class.tree');
     $tree->set_frame ('detail');
!    $root  = $tree->open_tree (htmlspecialchars($confServers[$webdbServerID]['desc']), '');
  
  	$databases = &$data->getDatabases();
--- 23,27 ----
     $tree = new Tree ('class.tree');
     $tree->set_frame ('detail');
!    $root  = $tree->open_tree (htmlspecialchars($confServers[$_COOKIE['webdbServerID']]['desc']), '');
  
  	$databases = &$data->getDatabases();

Index: login.php
===================================================================
RCS file: /cvsroot/phppgadmin/webdb/public_html/login.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** login.php	12 Feb 2002 01:11:58 -0000	1.2
--- login.php	15 May 2002 09:57:55 -0000	1.3
***************
*** 23,27 ****
  				<td height="115" align="center" valign="middle">
  					<table border="0" cellpadding="2" cellspacing="0">
! 						<form action="<?= $PHP_SELF ?>" method="post" name="login_form">
  						<tr>
  							<td class="form">Username:</td>
--- 23,27 ----
  				<td height="115" align="center" valign="middle">
  					<table border="0" cellpadding="2" cellspacing="0">
! 						<form action="<?= $_SERVER['PHP_SELF'] ?>" method="post" name="login_form">
  						<tr>
  							<td class="form">Username:</td>
***************
*** 50,64 ****
  						</form>
  					</table>
  				</td>
  			</tr>
- 		<script language=javascript>
- 			var uname = document.login_form.set_username;
- 			var pword = document.login_form.set_password;
- 			if (uname.value == "") { 
- 				uname.focus();
- 			} else {
- 				pword.focus();
- 			}
- 		</script>
  		</table>	
      </td>
--- 50,64 ----
  						</form>
  					</table>
+ 					<script language=javascript>
+ 						var uname = document.login_form.formUsername;
+ 						var pword = document.login_form.formPassword;
+ 						if (uname.value == "") { 
+ 							uname.focus();
+ 						} else {
+ 							pword.focus();
+ 						}
+ 					</script>
  				</td>
  			</tr>
  		</table>	
      </td>

Index: tables.php
===================================================================
RCS file: /cvsroot/phppgadmin/webdb/public_html/tables.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tables.php	10 Apr 2002 04:09:47 -0000	1.2
--- tables.php	15 May 2002 09:57:55 -0000	1.3
***************
*** 10,14 ****
  	include_once('../conf/config.inc.php');
  	
! 	if (!isset($action)) $action = '';
  	
  ?>
--- 10,15 ----
  	include_once('../conf/config.inc.php');
  	
! 	$action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
! 	$PHP_SELF = $_SERVER['PHP_SELF'];
  	
  ?>
***************
*** 21,26 ****
  switch ($action) {
  	case 'browse':		
! 		echo "<h2>", htmlspecialchars($database), ": ", htmlspecialchars($table), "</h2>\n";
! 		$rs = &$localData->browseTable($table, $offset, $limit);
  		
  		if ($rs->recordCount() > 0) {
--- 22,27 ----
  switch ($action) {
  	case 'browse':		
! 		echo "<h2>", htmlspecialchars($_GET['database']), ": ", htmlspecialchars($_GET['table']), "</h2>\n";
! 		$rs = &$localData->browseTable($_GET['table'], $_GET['offset'], $_GET['limit']);
  		
  		if ($rs->recordCount() > 0) {
***************
*** 51,55 ****
  		break;
  	default:
! 		echo "<h2>", htmlspecialchars($database), "</h2>\n";
  		
  		$tables = &$localData->getTables();
--- 52,56 ----
  		break;
  	default:
! 		echo "<h2>", htmlspecialchars($_GET['database']), "</h2>\n";
  		
  		$tables = &$localData->getTables();
***************
*** 63,68 ****
  				echo "<tr><td class=data{$id}>", htmlspecialchars($tables->f[$data->tbFields['tbname']]), "</td>\n";
  				echo "<td class=data{$id}>", htmlspecialchars($tables->f[$data->tbFields['tbowner']]), "</td>\n";
! 				echo "<td class=opbutton{$id}><a href=\"$PHP_SELF?action=browse&offset=0&limit=30&database=", 
! 					htmlspecialchars($database), "&table=", htmlspecialchars($tables->f[$data->tbFields['tbname']]), "\">Browse</a></td>\n";
  				echo "<td class=opbutton{$id}>Select</td>\n";
  				echo "<td class=opbutton{$id}>Insert</td>\n";
--- 64,69 ----
  				echo "<tr><td class=data{$id}>", htmlspecialchars($tables->f[$data->tbFields['tbname']]), "</td>\n";
  				echo "<td class=data{$id}>", htmlspecialchars($tables->f[$data->tbFields['tbowner']]), "</td>\n";
! 				echo "<td class=opbutton{$id}><a href=\"{$PHP_SELF}?action=browse&offset=0&limit=30&database=", 
! 					htmlspecialchars($_GET['database']), "&table=", htmlspecialchars($tables->f[$data->tbFields['tbname']]), "\">Browse</a></td>\n";
  				echo "<td class=opbutton{$id}>Select</td>\n";
  				echo "<td class=opbutton{$id}>Insert</td>\n";

Index: topbar.php
===================================================================
RCS file: /cvsroot/phppgadmin/webdb/public_html/topbar.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** topbar.php	1 May 2002 09:37:30 -0000	1.4
--- topbar.php	15 May 2002 09:57:55 -0000	1.5
***************
*** 17,23 ****
  	<tr> 
  		<td width="211" rowspan="2"><img src="images/themes/<?= $guiTheme ?>/title.gif" width=211 height=50 alt="<? htmlspecialchars($appName) ?>"></td>
! 		<td width="69%"><?= $confServers[$webdbServerID]['type'] ?> running on 
! 		<?= htmlspecialchars($confServers[$webdbServerID]['host']) ?>:<?= $confServers[$webdbServerID]['port'] ?>
! 		-- You are logged in as user <b><?= htmlspecialchars($webdbUsername) ?></b>, 
  			<?= date('jS M, Y g:iA') ?></font></td>
  	</tr>
--- 17,23 ----
  	<tr> 
  		<td width="211" rowspan="2"><img src="images/themes/<?= $guiTheme ?>/title.gif" width=211 height=50 alt="<? htmlspecialchars($appName) ?>"></td>
! 		<td width="69%"><?= $confServers[$_COOKIE['webdbServerID']]['type'] ?> running on 
! 		<?= htmlspecialchars($confServers[$_COOKIE['webdbServerID']]['host']) ?>:<?= $confServers[$_COOKIE['webdbServerID']]['port'] ?>
! 		-- You are logged in as user <b><?= htmlspecialchars($_COOKIE['webdbUsername']) ?></b>, 
  			<?= date('jS M, Y g:iA') ?></font></td>
  	</tr>

Index: users.php
===================================================================
RCS file: /cvsroot/phppgadmin/webdb/public_html/users.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** users.php	1 May 2002 09:37:30 -0000	1.1
--- users.php	15 May 2002 09:57:55 -0000	1.2
***************
*** 9,15 ****
  	// Include application functions
  	include_once('../conf/config.inc.php');
! 	
! 	if (!isset($action)) $action = '';
  	if (!isset($msg)) $msg = '';
  
  	/** 
--- 9,16 ----
  	// Include application functions
  	include_once('../conf/config.inc.php');
! 
! 	$action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
  	if (!isset($msg)) $msg = '';
+ 	$PHP_SELF = $_SERVER['PHP_SELF'];
  
  	/** 
***************
*** 17,23 ****
  	 */
  	function doSaveEdit() {
! 		global $data, $username, $formCreateDB, $formSuper, $formExpires, $form;
  		
! 		$status = $data->setUser($username, '', isset($formCreateDB), isset($formSuper), $formExpires);
  		if ($status == 0)
  			doProperties('User updated.');
--- 18,24 ----
  	 */
  	function doSaveEdit() {
! 		global $data;
  		
! 		$status = $data->setUser($_POST['username'], '', isset($_POST['formCreateDB']), isset($_POST['formSuper']), $_POST['formExpires']);
  		if ($status == 0)
  			doProperties('User updated.');
***************
*** 30,40 ****
  	 */
  	function doEdit($msg = '') {
! 		global $data, $misc, $username;
  		global $PHP_SELF, $strUsername, $strSuper, $strCreateDB, $strExpires, $strActions, $strNoUsers;
  	
! 		echo "<h2>Users: ", htmlspecialchars($username), ": Edit</h2>\n";
  		$misc->printMsg($msg);
  		
! 		$userdata = &$data->getUser($username);
  		
  		if ($userdata->recordCount() > 0) {
--- 31,41 ----
  	 */
  	function doEdit($msg = '') {
! 		global $data, $misc;
  		global $PHP_SELF, $strUsername, $strSuper, $strCreateDB, $strExpires, $strActions, $strNoUsers;
  	
! 		echo "<h2>Users: ", htmlspecialchars($_REQUEST['username']), ": Edit</h2>\n";
  		$misc->printMsg($msg);
  		
! 		$userdata = &$data->getUser($_REQUEST['username']);
  		
  		if ($userdata->recordCount() > 0) {
***************
*** 52,56 ****
  			echo "</table>\n";
  			echo "<input type=hidden name=action value=save_edit>\n";
! 			echo "<input type=hidden name=username value=\"", htmlspecialchars($username), "\">\n";
  			echo "<input type=submit value=Save> <input type=reset>\n";
  			echo "</form>\n";
--- 53,57 ----
  			echo "</table>\n";
  			echo "<input type=hidden name=action value=save_edit>\n";
! 			echo "<input type=hidden name=username value=\"", htmlspecialchars($_REQUEST['username']), "\">\n";
  			echo "<input type=submit value=Save> <input type=reset>\n";
  			echo "</form>\n";
***************
*** 60,64 ****
  		echo "<p><a class=navlink href=\"$PHP_SELF\">Show All Users</a> |\n";
  		echo "<a class=navlink href=\"$PHP_SELF?action=properties&username=", 
! 			urlencode($username), "\">Properties</a></p>\n";
  	}
  	
--- 61,65 ----
  		echo "<p><a class=navlink href=\"$PHP_SELF\">Show All Users</a> |\n";
  		echo "<a class=navlink href=\"$PHP_SELF?action=properties&username=", 
! 			urlencode($_REQUEST['username']), "\">Properties</a></p>\n";
  	}
  	
***************
*** 67,77 ****
  	 */
  	function doProperties($msg = '') {
! 		global $data, $misc, $username;
  		global $PHP_SELF, $strUsername, $strSuper, $strCreateDB, $strExpires, $strActions, $strNoUsers;
  	
! 		echo "<h2>Users: ", htmlspecialchars($username), ": Properties</h2>\n";
  		$misc->printMsg($msg);
  		
! 		$userdata = &$data->getUser($username);
  		
  		if ($userdata->recordCount() > 0) {
--- 68,78 ----
  	 */
  	function doProperties($msg = '') {
! 		global $data, $misc;
  		global $PHP_SELF, $strUsername, $strSuper, $strCreateDB, $strExpires, $strActions, $strNoUsers;
  	
! 		echo "<h2>Users: ", htmlspecialchars($_REQUEST['username']), ": Properties</h2>\n";
  		$misc->printMsg($msg);
  		
! 		$userdata = &$data->getUser($_REQUEST['username']);
  		
  		if ($userdata->recordCount() > 0) {
***************
*** 88,92 ****
  		echo "<p><a class=navlink href=\"$PHP_SELF\">Show All Users</a> |\n";
  		echo "<a class=navlink href=\"$PHP_SELF?action=edit&username=", 
! 			urlencode($username), "\">Edit</a></p>\n";
  	}
  	
--- 89,93 ----
  		echo "<p><a class=navlink href=\"$PHP_SELF\">Show All Users</a> |\n";
  		echo "<a class=navlink href=\"$PHP_SELF?action=edit&username=", 
! 			urlencode($_REQUEST['username']), "\">Edit</a></p>\n";
  	}
  	
***************
*** 95,114 ****
  	 */
  	function doDrop($confirm) {
! 		global $data, $username;
  		global $PHP_SELF;
  
  		if ($confirm) { 
! 			echo "<h2>Users: ", htmlspecialchars($username), ": Drop</h2>\n";
  			
! 			echo "<p>Are you sure you want to drop the user \"", htmlspecialchars($username), "\"?</p>\n";
  			
  			echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
  			echo "<input type=hidden name=action value=drop>\n";
! 			echo "<input type=hidden name=username value=\"", htmlspecialchars($username), "\">\n";
  			echo "<input type=submit name=choice value=\"Yes\"> <input type=submit name=choice value=\"No\">\n";
  			echo "</form>\n";
  		}
  		else {
! 			$status = $data->dropUser($username);
  			if ($status == 0)
  				doDefault('User dropped.');
--- 96,115 ----
  	 */
  	function doDrop($confirm) {
! 		global $data;
  		global $PHP_SELF;
  
  		if ($confirm) { 
! 			echo "<h2>Users: ", htmlspecialchars($_REQUEST['username']), ": Drop</h2>\n";
  			
! 			echo "<p>Are you sure you want to drop the user \"", htmlspecialchars($_REQUEST['username']), "\"?</p>\n";
  			
  			echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
  			echo "<input type=hidden name=action value=drop>\n";
! 			echo "<input type=hidden name=username value=\"", htmlspecialchars($_REQUEST['username']), "\">\n";
  			echo "<input type=submit name=choice value=\"Yes\"> <input type=submit name=choice value=\"No\">\n";
  			echo "</form>\n";
  		}
  		else {
! 			$status = $data->dropUser($_REQUEST['username']);
  			if ($status == 0)
  				doDefault('User dropped.');
***************
*** 155,162 ****
  	 */
  	function doSaveCreate() {
! 		global $data, $formUsername, $formPassword, $formSuper, $formCreateDB, $formExpires;
  		
  		// @@ NOTE: No groups handled yet
! 		$status = $data->createUser($formUsername, $formPassword, isset($formSuper), isset($formCreateDB), $formExpires, array());
  		if ($status == 0)
  			doDefault('User created.');
--- 156,164 ----
  	 */
  	function doSaveCreate() {
! 		global $data;
  		
  		// @@ NOTE: No groups handled yet
! 		$status = $data->createUser($_POST['formUsername'], $_POST['formPassword'], 
! 			isset($_POST['formSuper']), isset($_POST['formCreateDB']), $_POST['formExpires'], array());
  		if ($status == 0)
  			doDefault('User created.');
***************
*** 217,221 ****
  			break;
  		case 'drop':
! 			if ($choice == 'Yes') doDrop(false);
  			else doDefault();
  			break;
--- 219,223 ----
  			break;
  		case 'drop':
! 			if ($_REQUEST['choice'] == 'Yes') doDrop(false);
  			else doDefault();
  			break;

Index: views.php
===================================================================
RCS file: /cvsroot/phppgadmin/webdb/public_html/views.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** views.php	15 Apr 2002 12:16:35 -0000	1.2
--- views.php	15 May 2002 09:57:55 -0000	1.3
***************
*** 10,15 ****
  	include_once('../conf/config.inc.php');
  	
! 	if (!isset($action)) $action = '';
  	if (!isset($msg)) $msg = '';
  	
  	/** 
--- 10,16 ----
  	include_once('../conf/config.inc.php');
  	
! 	$action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
  	if (!isset($msg)) $msg = '';
+ 	$PHP_SELF = $_SERVER['PHP_SELF'];
  	
  	/** 

[ppa-cvs] CVS: webdb/libraries lib.inc.php,NONE,1.1

[Christopher Kings-L. <ch...@us...>]

Update of /cvsroot/phppgadmin/webdb/libraries
In directory usw-pr-cvs1:/tmp/cvs-serv18004/libraries

Added Files:
	lib.inc.php 
Log Message:
Broke stuff out from config.inc.php into lib.inc.php
Renamed config.inc.php to config.inc.php-dist
Support everywhere except VIEWs for PHP 4.1 superglobals.
  (See users.php for good example code)



--- NEW FILE: lib.inc.php ---
<?php

	/**
	 * Function library read in upon startup
	 *
	 * $Id: lib.inc.php,v 1.1 2002/05/15 09:57:55 chriskl Exp $
	 */

	// If login action is set, then set login variables
	if (isset($_POST['formServer']) && isset($_POST['formUsername']) && isset($_POST['formPassword'])) {
		$webdbServerID = $_POST['formServer'];
		$webdbUsername = $_POST['formUsername'];
		$webdbPassword = $_POST['formPassword'];
		setCookie('webdbServerID', $webdbServerID);
		setCookie('webdbUsername', $webdbUsername);
		setCookie('webdbPassword', $webdbPassword);
		$_COOKIE['webdbServerID'] = $webdbServerID;
		$_COOKIE['webdbUsername'] = $webdbUsername;
		$_COOKIE['webdbPassword'] = $webdbPassword;
	}
		
	// If the logged in settings aren't present, put up the login screen
	if (!isset($_COOKIE['webdbUsername']) || 
			!isset($_COOKIE['webdbPassword']) || 
			!isset($_COOKIE['webdbServerID']) || 
			!isset($confServers[$_COOKIE['webdbServerID']])) {
		include($appBase . '/login.php');
		exit;
	}
	
	// Create data accessor object, if valid
	if (isset($_COOKIE['webdbServerID']) && isset($confServers[$_COOKIE['webdbServerID']])) {
		$_type = $confServers[$_COOKIE['webdbServerID']]['type'];
		include_once('../classes/database/' . $_type . '.php');
		$data = new $_type(	$confServers[$_COOKIE['webdbServerID']]['host'],
									$confServers[$_COOKIE['webdbServerID']]['port'],
									$confServers[$_COOKIE['webdbServerID']]['default'],
									$_COOKIE['webdbUsername'],
									$_COOKIE['webdbPassword']);
	}

	// Create local (database-specific) data accessor object, if valid
	if (isset($_COOKIE['webdbServerID']) && isset($confServers[$_COOKIE['webdbServerID']]) && isset($_REQUEST['database'])) {
		$_type = $confServers[$_COOKIE['webdbServerID']]['type'];
		include_once('../classes/database/' . $_type . '.php');
		$localData = new $_type(	$confServers[$_COOKIE['webdbServerID']]['host'],
											$confServers[$_COOKIE['webdbServerID']]['port'],
											$_REQUEST['database'],
											$_COOKIE['webdbUsername'],
											$_COOKIE['webdbPassword']);
	}

	// Create Misc class references
	include_once('../classes/Misc.php');
	$misc = new Misc();

	// Theme
	echo "<style type=\"text/css\">\n<!--\n";
	include("../themes/{$guiTheme}/global.css");
	echo "\n-->\n</style>\n";
	
?>