memship-cvs — Mailing list for CVS commit messages

[Memship-cvs] memship registrere2.php,1.1.1.1,NONE

[<se...@us...>]

Update of /cvsroot/memship/memship
In directory usw-pr-cvs1:/tmp/cvs-serv13638

Removed Files:
	registrere2.php 
Log Message:
Oppdatere header og fjerne overflødig fil.


--- registrere2.php DELETED ---

[Memship-cvs] memship/includes head.php,1.2,1.3

[<se...@us...>]

Update of /cvsroot/memship/memship/includes
In directory usw-pr-cvs1:/tmp/cvs-serv13638/includes

Modified Files:
	head.php 
Log Message:
Oppdatere header og fjerne overflødig fil.


Index: head.php
===================================================================
RCS file: /cvsroot/memship/memship/includes/head.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** head.php	18 Aug 2002 13:33:07 -0000	1.2
--- head.php	3 Sep 2002 15:01:02 -0000	1.3
***************
*** 19,24 ****
   <td width="20%" valign="top" class="menu">
    <table width="100%"><tr>
!   <td> [ <a href="liste.php">Søk</a> ] </td>
!   <td> [ <a href="registrere.php">Nytt medlem</a> ] </td>
    <td> [ <a href="betalt.php">Betaling</a> ] </td>
    <td> [ <a href="grupper.php">Grupper</a> ] </td>
--- 19,24 ----
   <td width="20%" valign="top" class="menu">
    <table width="100%"><tr>
!   <td> [ <a href="index.php">Søk</a> ] </td>
!   <td> [ <a href="newmember.php">Nytt medlem</a> ] </td>
    <td> [ <a href="betalt.php">Betaling</a> ] </td>
    <td> [ <a href="grupper.php">Grupper</a> ] </td>

[Memship-cvs] memship newmember.php,NONE,1.1

[<se...@us...>]

Update of /cvsroot/memship/memship
In directory usw-pr-cvs1:/tmp/cvs-serv10731

Added Files:
	newmember.php 
Log Message:
Nå funker det å legge til folk. Bare helt basic felt funker, men det er
en smal sak å utvide. Når du prøver å legge til en bruker med samme
navn som en eksiterende bruker, får du opp en liste over disse brukerne
og et spørsmål om du virkelig vil legge til en til.


--- NEW FILE: newmember.php ---
<?php
include("includes/liblogin.php");
include("includes/head.php");

$done = $_POST['done'];
$final = $_POST['final'];
$data = $_POST['data'];

if ($done == "1") print '<h1>Du har registrert dette:</h1>';
else print '<h1>Registrer nytt medlem</h1>';

function make_input($name, $type, $var) {
  print "<td with=\"100%\"> $name: </td><td><input type=\"$type\"
        name=\"data[$name]\" value=\"$var]\"></td>";
}

print '<table width="100%"><tr><td>
	<form action="newmember.php" method="post">
	<table><tr><td width=100>';

print "Fornavn:</td><td><input type=\"text\" name=\"data[fornavn]\" 
       value=\"$data[fornavn]\">";

print '</td></tr><tr><td>';
print "Etternavn:</td><td><input type=\"text\" name=\"data[etternavn]\"
        value=\"$data[etternavn]\">";

print '</td></tr><tr><td>';
print "Adresse:</td><td><input type=\"text\" name=\"data[adresse]\"
        value=\"$data[adresse]\"></td></tr><tr><td>
	Postnr:</td><td><input type=\"text\" size=\"4\"
	name=\"data[postnr]\" value=\"$data[postnr]\">
	</td></tr><tr><td>
	Hjemmetelefon:</td><td><input type=\"text\" name=\"data[telhjem]\">
	</td></tr><tr><td>
	Jobbtelefon:</td><td><input type=\"text\" name=\"data[teljobb]\">
</td></tr><tr><td>
	Mobiltelefon:</td><td><input type=\"text\" name=\"data[telmob]\">
</td></tr><tr><td>
	Epost:</td><td><input type=\"text\" name=\"data[epost]\">
</td></tr><tr><td>
	Kjønn: </td><td><input type=\"radio\" name=\"data[kjønn]\"
value=\"Gutt\">gutt
	<input type=\"radio\" name=\"data[kjønn]\" value=\"Jente\">jente
</td></tr><tr><td>
	Gruppe: </td><td>
	<input type=\"checkbox\" name=\"data[rv]\" value=\"rv\">RV
	<input type=\"checkbox\" name=\"data[ru]\" value=\"ru\">RU
	<input type=\"checkbox\" name=\"data[rebell]\" value=\"ru\">Rebell
</td></tr><tr><td>
	Skole/jobb:</td><td><input type=\"text\" name=\"data[skolejobb]\">
</td></tr><tr><td>
";
echo"	Status:</td><td><select name=\"data[status]\">
		<option value=\"medlem\">medlem</option>
		<option value=\"kontakt\">kontakt</option>
		<option value=\"bøllekontakt\">bøllekontakt</option>
		<option value=\"ute\">ute</option>
</td></tr><tr><td>";
?>

	Kommentarer:</td><td>
	<input type="textarea" name="data[kommentar]">
</td></tr>
</table>

</td><td>

<?php
$forename = $data['fornavn'];
$surname = $data['etternavn'];
$dochanges = true;

if (($done == "1") && !($final == "1")) {

$sql = <<<ENDSQL
        SELECT forename, surname, address, postal
          FROM member
         WHERE forename='$forename'
           AND surname='$surname';
ENDSQL;
$result = &$conn->Execute($sql);
if (!$result) print $conn->ErrorMsg();
else if ($result->RecordCount() > 0) { 
  while (!$result->EOF) {
   $sur = $result->fields['surname'];
   $fore = $result->fields['forename'];
   $addr = $result->fields['address'];
   $post = $result->fields['postal'];
   print "<p>Konflikt: $sur, $fore, $addr ($post)</p>";
   $result->MoveNext();
  }
  print '<input name="final" type="hidden" value="1">';
  print '<input name="done" type="hidden" value="1">';
  $final = "0"; /* må trykke igjen */
  print "<p>Trykk knappen en gang til for å legge til uansett</p>";
  print '<input type="submit" value="Ok">';
} else {
  $final = "1";
}
} else {
  print '<input name="done" type="hidden" value="1">';
  print '<input type="submit">';
} /* end of done but not final */

if ($final == "1") {
$forename = $data['fornavn'];
$surname = $data['etternavn'];
$address = $data['adresse'];
$postal = $data['postnr'];
$sql = <<<ENDSQL
        INSERT INTO member (forename, surname, address, postal)
        VALUES ('$forename','$surname','$address', '$postal')
ENDSQL;
$conn->debug = 1;
$result = &$conn->Execute($sql);
$conn->debug = 0;
if (!$result) print $conn->ErrorMsg();
}
?>

</td></tr></table>

</form>
<?php
include("includes/tail.php");
?>

[Memship-cvs] memship/includes liblogin.php,1.4,1.5

[<se...@us...>]

Update of /cvsroot/memship/memship/includes
In directory usw-pr-cvs1:/tmp/cvs-serv15947/includes

Modified Files:
	liblogin.php 
Log Message:
Ditched crap http authentication and added proper php authentication.
Looks crap but is better. Trust me.


Index: liblogin.php
===================================================================
RCS file: /cvsroot/memship/memship/includes/liblogin.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** liblogin.php	21 Aug 2002 14:38:23 -0000	1.4
--- liblogin.php	3 Sep 2002 13:38:37 -0000	1.5
***************
*** 15,50 ****
  $user;
  $result;
  
  $conn = &ADONewConnection('postgres7');
  $conn->PConnect('localhost', "$dbuser", "", "$dbname");
  
! function authenticate() {
! 	header("WWW-Authenticate: Basic realm=\":-!\"");
! 	header("HTTP/1.0 401 Unauthorized");
! 	print("You must enter a valid login username and password 
! 		to access this resource.\n");
! 	exit;
! }
! 
! if (!isset($HTTP_SERVER_VARS['PHP_AUTH_USER'])) { 
!   authenticate();
! } else {
!   $user = $HTTP_SERVER_VARS['PHP_AUTH_USER'];
!   $password = $HTTP_SERVER_VARS['PHP_AUTH_PW']; /* plaintext for now */
!   $sql = <<<ENDSQL
!     SELECT member, email, password FROM member
!      WHERE email='$user'
!        AND password='$password';
  ENDSQL;
!   $result = $conn->Execute($sql);
!   if ($result->RecordCount() <= 0) {
!     authenticate();
    }
- /*    AND ipaddress='%s'",
-     $HTTP_SERVER_VARS['REMOTE_ADDR']); */
  }
  
- /*** Session code ***/
  
  $member = $result->fields['member'];
  session_name("memship");
--- 15,66 ----
  $user;
  $result;
+ $success = 0;
  
  $conn = &ADONewConnection('postgres7');
  $conn->PConnect('localhost', "$dbuser", "", "$dbname");
  
! session_name("memship");
! session_start();
! if (!isset($_SESSION['user'])) {
!   // not authenticated
!   if (isset($_POST['user'])) {
!     // we tried to log in previous page, try to authenticate
!     $user = $_POST['user'];
!     $password = $_POST['password'];
!     $sql = <<<ENDSQL
!       SELECT member, email, password FROM member
!        WHERE email='$user'
!          AND password='$password';
  ENDSQL;
!     $result = $conn->Execute($sql);
!     if ($result->RecordCount() == 1) {
!       // success
!       $_SESSION['user'] = $_POST['user'];
!       $success = 1;
!     }
!   }
!   if (!$success) {
!     // we haven't tried to log in yet or failed to
!     $server = $_SERVER['SERVER_ADDR'] . $_SERVER['PHP_SELF'];
!     echo<<<ENDHTML
! 	<html>
! 	<body>
! 	<form method="post">
! 	<blockquote><h1>Login</h1>
! 	<p>User: <input type="text" name="user" size="12"><br>
! 	Pass: <input type="password" name="password" size="12"><br>
! 	</p><input type="submit" value="Ok"></blockquote>
! 	</form>
! 	</body>
! 	</html>
! ENDHTML;
!     exit;
    }
  }
  
  
+ /*** We are now authenticated ***/
+ 
+ $user = $_SESSION['user'];
  $member = $result->fields['member'];
  session_name("memship");

[Memship-cvs] memship logout.php,1.1,1.2

[<se...@us...>]

Update of /cvsroot/memship/memship
In directory usw-pr-cvs1:/tmp/cvs-serv15947

Modified Files:
	logout.php 
Log Message:
Ditched crap http authentication and added proper php authentication.
Looks crap but is better. Trust me.


Index: logout.php
===================================================================
RCS file: /cvsroot/memship/memship/logout.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** logout.php	21 Aug 2002 13:44:13 -0000	1.1
--- logout.php	3 Sep 2002 13:38:38 -0000	1.2
***************
*** 1,6 ****
  <?php
! header("WWW-Authenticate: Basic realm=\":-!\"");
! header("HTTP/1.0 401 Unauthorized");
  include('includes/head.php');
  ?>
  
--- 1,7 ----
  <?php
! include('includes/liblogin.php');
  include('includes/head.php');
+ 
+ session_destroy();
  ?>
  

[Memship-cvs] memship list2.php,NONE,1.1 liste-rader.php,1.1.1.1,1.2

[<to...@us...>]

Update of /cvsroot/memship/memship
In directory usw-pr-cvs1:/tmp/cvs-serv32738

Modified Files:
	liste-rader.php 
Added Files:
	list2.php 
Log Message:
Har laget ei ny fil som heter list2.php, som skal ta over for liste2.php
og en del av de andre liste-*.php-filene. Som den står nå kjører den
bare en select i "member", men den må bygges ut så den kan lage
spørringa si utfra inndata fra list.php, som også må lages.


--- NEW FILE: list2.php ---
<?php
include("includes/liblogin.php");

function print_table ($recordSet, $interactive)
{
  /*
  Created by: Tor Berg 21.08.02

  External variables: $recordSet   Database object to be displayed
                      $interactive TRUE for interactive mode

  Description: This function prints a table containing all the data returned with 
               the object $recordSet, and also adds a header with the keys from the array

  */

  if($interactive){
    print "<form name=\"myForm\" action=\"list2.php\" method=\"post\">";
    print "<table><tr><th>select";
    
  }
  else{
    print "<table><tr>";
  }

  while(list($key, $val)= each($recordSet->fields)){
    print "<th>";
    print $key;
 }


  while(!$recordSet->EOF){
    reset($recordSet->fields);

    print "<tr>";

    if ($interactive) {
      list($key, $val)=each($recordSet->fields);
      print "<td><input name=\"\" value=\"$val\" type=\"checkbox\">";
      print "<td><a href=\"edit2.php?member=" . $val . "\">$val </a>";
    }
    
    while(list($key, $val)=each($recordSet->fields)){
      print "<td>";
      print $val;
    }   

    print "</tr>";
    $recordSet->MoveNext();
  }

  print "</table>";
  
  if ($interactive) {
    print '<br> <input name="vanlig2" type="submit" value="Begrens">
           <input name="ren2" type="submit" value="Utskriftsvennlig">
           <input name="giroer" type="submit" value="Giroer">
           <input name="klistrelapper" type="submit" value="Klistrelapper">
           <input name="sms" type="submit" value="Send melding"><br />
           Font:<input name="font_size" type="text" value="24" size="2">
           X:<input name="x" type="text" value="80" size="2">
           Y:<input name="y" type="text" value="240" size="2">
           PapirX:<input name="paper_x" type="text" value="595" size="3">
           PapirY:<input name="paper_y" type="text" value="842" size="3">
           Rotasjon:<input name="rotate" type="text" value="0" size="2">
           <input name="adressefelt" type="submit" value="Adressefelt">
           ';
    print "</form>";
  }

}


//Main part starts here


include("includes/head.php");
$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
$recordSet = &$conn->Execute('select member,forename,surname,email from member');

if (!$recordSet) {
  print $conn->ErrorMsg();
}

print_table($recordSet,TRUE);

?>

<?php
include("includes/tail.php");
?>

Index: liste-rader.php
===================================================================
RCS file: /cvsroot/memship/memship/liste-rader.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** liste-rader.php	2 Jul 2002 20:32:52 -0000	1.1.1.1
--- liste-rader.php	29 Aug 2002 19:33:04 -0000	1.2
***************
*** 1,33 ****
  <?PHP
!         $betaltres = pg_exec("SELECT * FROM betalt WHERE etternavn='$row[etternavn]' AND
!                 fornavn='$row[fornavn]' AND betalt.gruppenavn=ANY (SELECT gruppenavn
!                 FROM gruppe WHERE betalt.fornavn=gruppe.fornavn AND
!                 betalt.etternavn=gruppe.etternavn $grupper) ORDER BY år DESC");
!         if (pg_numrows($betaltres) > 0) $betalt = pg_fetch_array($betaltres, 0);
  
! 	if ($vanlig) {
! 	  $useme = implode(",",array("$row[etternavn]","$row[fornavn]"));
! 	  echo "<input name=\"navn[$i]\" value=\"$useme\" type=\"checkbox\"></td><td>";
! 	  echo "<a target=\"_new\" href=\"redigere2.php?medlem=" . htmlentities($row[fornavn]) . 
! 			"%2C" . htmlentities($row[etternavn]) . "\">
  			$row[etternavn], $row[fornavn]</a></td><td> ";
! 	} else {
! 		echo "$row[etternavn], $row[fornavn]</td><td>";
! 	}
! 	if ($data[adresse] == "medlem.adresse") echo "$row[adresse]</td><td>";
! 	if ($data[postnr] == "medlem.postnr") echo "$row[postnr]</td><td>";
! 	if ($data[poststed] == "postnr.poststed") echo "$row[poststed]</td><td>";
! 	if ($data[telhjem] == "medlem.telhjem") echo "$row[telhjem]</td><td>";
! 	if ($data[teljobb] == "medlem.teljobb") echo "$row[teljobb]</td><td>";
! 	if ($data[telmob] == "medlem.telmob") echo "$row[telmob]</td><td>";
! 	if ($data[epost] == "medlem.epost") echo "$row[epost]</td><td>";
! 	if ($data[skolejobb] == "medlem.skolejobb") echo "$row[skolejobb]</td><td>";
! 	if ($data[kjønn] == "medlem.kjønn") echo "$row[kjønn]</td><td>";
! 	if ($data[regsentralt] == "medlem.regsentralt") echo "$row[regsentralt]</td><td>";
! 	if ($data[fondtype] == "medlem.fondtype") echo "$row[fondtype]</td><td>";
! 	if ($data[fondbank] == "medlem.fondbank") echo "$row[fondbank]</td><td>";
! 	if ($data[fondbeløp] == "medlem.fondbeløp") echo "$row[fondbeløp]</td><td>";
! 	if ($data[medlemstype] == "medlem.medlemstype") echo "$row[medlemstype]</td><td>";
! 	if ($data[ikkepost] == "medlem.ikkepost") echo "$row[ikkepost]</td><td>";
! 	if ($betalt && $data[betalt1] == "medlem.betalt1") echo "$betalt[beløp]</td><td>";
! 	if ($betalt && $data[betalt2] == "medlem.betalt2") echo "$betalt[år]</td><td>";
--- 1,80 ----
  <?PHP
! function print_row ($item, $key){
!   print "<td>$item ";
! }
  
! 
! function print_table ($recordSet, $interactive)
! {
!   /*
!   Created by: Tor Berg 21.08.02
! 
!   External variables: $row results that are to be printed
! 
!   Description: This function prints out <tr> and </tr> tags, and the contents of array $row with "</td><td>" appended
! 
!   */
! 
!   print_r($recordSet->fields); // 
! 
!   print "<table><tr>";
! 
!   while(current($recordSet->fields)){
!     print "<th>";
!     print key($recordSet->fields);
!     next($recordSet->fields);
!  }
! 
! 
!   while(!$recordSet->EOF){
!     print "<tr>";
!     
!     reset($recordSet->fields);
! 
!     while(current($recordSet->fields)){
!       print "<td>";
!       print current($recordSet->fields);
!       next($recordSet->fields);
!     }   
! 
!     print "</tr><table>";
!     $recordSet->MoveNext();
! 
!   }
!   
! 
! 
! 
!   /*
!   if ($interactive) {
!     $useme = implode(",",array("$row[etternavn]","$row[fornavn]"));
!     echo "<input name=\"navn[$i]\" value=\"$useme\" type=\"checkbox\"></td><td>";
!     echo "<a target=\"_new\" href=\"redigere2.php?medlem=" . htmlentities($row[fornavn]) . 
!       "%2C" . htmlentities($row[etternavn]) . "\">
  			$row[etternavn], $row[fornavn]</a></td><td> ";
!   } else {
!     echo "$row[etternavn], $row[fornavn]</td><td>";
!   }
!   if ($data[adresse] == "medlem.adresse") echo "$row[adresse]</td><td>";
!   if ($data[postnr] == "medlem.postnr") echo "$row[postnr]</td><td>";
!   if ($data[poststed] == "postnr.poststed") echo "$row[poststed]</td><td>";
!   if ($data[telhjem] == "medlem.telhjem") echo "$row[telhjem]</td><td>";
!   if ($data[teljobb] == "medlem.teljobb") echo "$row[teljobb]</td><td>";
!   if ($data[telmob] == "medlem.telmob") echo "$row[telmob]</td><td>";
!   if ($data[epost] == "medlem.epost") echo "$row[epost]</td><td>";
!   if ($data[skolejobb] == "medlem.skolejobb") echo "$row[skolejobb]</td><td>";
!   if ($data[kjønn] == "medlem.kjønn") echo "$row[kjønn]</td><td>";
!   if ($data[regsentralt] == "medlem.regsentralt") echo "$row[regsentralt]</td><td>";
!   if ($data[fondtype] == "medlem.fondtype") echo "$row[fondtype]</td><td>";
!   if ($data[fondbank] == "medlem.fondbank") echo "$row[fondbank]</td><td>";
!   if ($data[fondbeløp] == "medlem.fondbeløp") echo "$row[fondbeløp]</td><td>";
!   if ($data[medlemstype] == "medlem.medlemstype") echo "$row[medlemstype]</td><td>";
!   if ($data[ikkepost] == "medlem.ikkepost") echo "$row[ikkepost]</td><td>";
!   //  if ($betalt && $data[betalt1] == "medlem.betalt1") echo "$betalt[beløp]</td><td>";
!   //  if ($betalt && $data[betalt2] == "medlem.betalt2") echo "$betalt[år]</td><td>";
!   */
!   echo("</tr>");
! 
!   //phpinfo();
! }
! 

[Memship-cvs] memship/includes liblogin.php,1.3,1.4

[<se...@us...>]

Update of /cvsroot/memship/memship/includes
In directory usw-pr-cvs1:/tmp/cvs-serv28319/includes

Modified Files:
	liblogin.php 
Log Message:
fix liten feil i session kode og insert


Index: liblogin.php
===================================================================
RCS file: /cvsroot/memship/memship/includes/liblogin.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** liblogin.php	21 Aug 2002 14:27:24 -0000	1.3
--- liblogin.php	21 Aug 2002 14:38:23 -0000	1.4
***************
*** 48,55 ****
  
  $member = $result->fields['member'];
! session_name("Memship database for $dbname");
  session_start();
- $conn->debug = true;
  if (!isset($_SESSION['user'])) {
    $_SESSION['user'] = $user;
    $time = $conn->DBDate(time());
--- 48,55 ----
  
  $member = $result->fields['member'];
! session_name("memship");
  session_start();
  if (!isset($_SESSION['user'])) {
+   session_register("user"); /* HACK, remove me when register_globals go */
    $_SESSION['user'] = $user;
    $time = $conn->DBDate(time());
***************
*** 61,65 ****
  ENDSQL;
    $conn->Execute($sql);
- $conn->debug = false;
  }
  
--- 61,64 ----

[Memship-cvs] memship/includes liblogin.php,1.2,1.3

[<se...@us...>]

Update of /cvsroot/memship/memship/includes
In directory usw-pr-cvs1:/tmp/cvs-serv24454/includes

Modified Files:
	liblogin.php 
Log Message:
For Tor


Index: liblogin.php
===================================================================
RCS file: /cvsroot/memship/memship/includes/liblogin.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** liblogin.php	21 Aug 2002 13:44:13 -0000	1.2
--- liblogin.php	21 Aug 2002 14:27:24 -0000	1.3
***************
*** 13,22 ****
  $dbname = "rebell";
  $dbuser = "www-data";
  
  $conn = &ADONewConnection('postgres7');
  $conn->PConnect('localhost', "$dbuser", "", "$dbname");
  
- // $conn->debug = true;
- 
  function authenticate() {
  	header("WWW-Authenticate: Basic realm=\":-!\"");
--- 13,22 ----
  $dbname = "rebell";
  $dbuser = "www-data";
+ $user;
+ $result;
  
  $conn = &ADONewConnection('postgres7');
  $conn->PConnect('localhost', "$dbuser", "", "$dbname");
  
  function authenticate() {
  	header("WWW-Authenticate: Basic realm=\":-!\"");
***************
*** 33,37 ****
    $password = $HTTP_SERVER_VARS['PHP_AUTH_PW']; /* plaintext for now */
    $sql = <<<ENDSQL
!     SELECT email, password FROM member
       WHERE email='$user'
         AND password='$password';
--- 33,37 ----
    $password = $HTTP_SERVER_VARS['PHP_AUTH_PW']; /* plaintext for now */
    $sql = <<<ENDSQL
!     SELECT member, email, password FROM member
       WHERE email='$user'
         AND password='$password';
***************
*** 45,55 ****
  }
  
- 
  /*** Session code ***/
  
  session_name("Memship database for $dbname");
  session_start();
  if (!isset($_SESSION['user'])) {
!   $_SESSION['user'] = 'none'; /* TEMP */
  }
  
--- 45,65 ----
  }
  
  /*** Session code ***/
  
+ $member = $result->fields['member'];
  session_name("Memship database for $dbname");
  session_start();
+ $conn->debug = true;
  if (!isset($_SESSION['user'])) {
!   $_SESSION['user'] = $user;
!   $time = $conn->DBDate(time());
!   $ip = $HTTP_SERVER_VARS['REMOTE_ADDR'];
!   $sql = <<<ENDSQL
! 	INSERT INTO login_log
! 	            (member, ip_address, login_time)
! 	     VALUES ('$member', '$ip', $time);
! ENDSQL;
!   $conn->Execute($sql);
! $conn->debug = false;
  }
  

[Memship-cvs] memship logout.php,NONE,1.1 index.php,1.4,1.5

[<se...@us...>]

Update of /cvsroot/memship/memship
In directory usw-pr-cvs1:/tmp/cvs-serv10681

Modified Files:
	index.php 
Added Files:
	logout.php 
Log Message:
Login authentication now works!


--- NEW FILE: logout.php ---
<?php
header("WWW-Authenticate: Basic realm=\":-!\"");
header("HTTP/1.0 401 Unauthorized");
include('includes/head.php');
?>

<p>Goodbye and <a href="index.php">welcome back</a>!</p>

<?php
include('includes/tail.php');
?>

Index: index.php
===================================================================
RCS file: /cvsroot/memship/memship/index.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** index.php	18 Aug 2002 13:33:06 -0000	1.4
--- index.php	21 Aug 2002 13:44:13 -0000	1.5
***************
*** 1,5 ****
  <?php
! include('includes/liblogin.php');
! include('includes/head'.php');
  ?>
  
--- 1,5 ----
  <?php
! include("includes/liblogin.php");
! include("includes/head.php");
  ?>
  
***************
*** 89,93 ****
    <td>Mobilisering:</td><td><select name="krit[mobilisering]">
  	<option value="">Ingen</option>
! <?PHP
  /*
    $result = pg_exec("SELECT navn FROM arrangement");
--- 89,93 ----
    <td>Mobilisering:</td><td><select name="krit[mobilisering]">
  	<option value="">Ingen</option>
! <?php
  /*
    $result = pg_exec("SELECT navn FROM arrangement");
***************
*** 123,127 ****
                  <option value="kontakt">kontakt</option>
   <!-- obs bare for RU: -->
! <?PHP
  /*
  if ($ses_db==ru){
--- 123,127 ----
                  <option value="kontakt">kontakt</option>
   <!-- obs bare for RU: -->
! <?php
  /*
  if ($ses_db==ru){
***************
*** 164,167 ****
  
  <?php
! include('includes/tail.php');
  ?>
--- 164,167 ----
  
  <?php
! include("includes/tail.php");
  ?>

[Memship-cvs] memship/includes liblogin.php,1.1,1.2

[<se...@us...>]

Update of /cvsroot/memship/memship/includes
In directory usw-pr-cvs1:/tmp/cvs-serv10681/includes

Modified Files:
	liblogin.php 
Log Message:
Login authentication now works!


Index: liblogin.php
===================================================================
RCS file: /cvsroot/memship/memship/includes/liblogin.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** liblogin.php	18 Aug 2002 12:43:10 -0000	1.1
--- liblogin.php	21 Aug 2002 13:44:13 -0000	1.2
***************
*** 11,21 ****
  // BAAAAD HACKS
  $year = "2002";
! $dbname = "rebell"
! $dbuser = "perrin"
  
  $conn = &ADONewConnection('postgres7');
! $conn->PConnect('localhost', '$dbuser', '$dbname');
  
! $conn->debug = true;
  
  function authenticate() {
--- 11,21 ----
  // BAAAAD HACKS
  $year = "2002";
! $dbname = "rebell";
! $dbuser = "www-data";
  
  $conn = &ADONewConnection('postgres7');
! $conn->PConnect('localhost', "$dbuser", "", "$dbname");
  
! // $conn->debug = true;
  
  function authenticate() {
***************
*** 32,42 ****
    $user = $HTTP_SERVER_VARS['PHP_AUTH_USER'];
    $password = $HTTP_SERVER_VARS['PHP_AUTH_PW']; /* plaintext for now */
!   $sql << ENDSQL
!     SELECT username, password FROM authenticateTable
!      WHERE username='$user'
         AND password='$password';
!   ENDSQL
    $result = $conn->Execute($sql);
!   if (!$result) {
      authenticate();
    }
--- 32,42 ----
    $user = $HTTP_SERVER_VARS['PHP_AUTH_USER'];
    $password = $HTTP_SERVER_VARS['PHP_AUTH_PW']; /* plaintext for now */
!   $sql = <<<ENDSQL
!     SELECT email, password FROM member
!      WHERE email='$user'
         AND password='$password';
! ENDSQL;
    $result = $conn->Execute($sql);
!   if ($result->RecordCount() <= 0) {
      authenticate();
    }
***************
*** 50,54 ****
  session_name("Memship database for $dbname");
  session_start();
! if (!isset($_SESSION['user']) {
    $_SESSION['user'] = 'none'; /* TEMP */
  }
--- 50,54 ----
  session_name("Memship database for $dbname");
  session_start();
! if (!isset($_SESSION['user'])) {
    $_SESSION['user'] = 'none'; /* TEMP */
  }
***************
*** 68,101 ****
  
  ?>
- 
- <!-- ?xml version="1.0" encoding="UTF-8"? -->
- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">
- <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
-  <link rel="STYLESHEET" type="text/css" href="p14.css" />
-  <SCRIPT LANGUAGE="JavaScript">
- 	function switchAll() {
- 	 for (var j = 1; j <= document.myForm.length; j++) {
- 		document.myForm.elements[j].checked = !document.myForm.elements[j].checked;
-    	 }
- 	}
-  </script>
- </head>
- 
- <body>
- 
- <table width="100%" cellspacing="0" cellpadding="10">
- <tr>
-  <td width="20%" valign="top" class="menu">
-   <table width="100%"><tr>
-   <td> [ <a href="liste.php">Søk</a> ] </td>
-   <td> [ <a href="registrere.php">Nytt medlem</a> ] </td>
-   <td> [ <a href="betalt.php">Betaling</a> ] </td>
-   <td> [ <a href="grupper.php">Grupper</a> ] </td>
-   <td> [ RV-Fond ] </td>
-   <td> [ <a href="mobilisere.php">Mobilisering</a> ] </td>
-   </tr></table>
-  </td></tr>
- </table>
- 
-  <!-- div align="justify" -->
--- 68,69 ----

[Memship-cvs] memship/includes head.php,1.1,1.2

[<se...@us...>]

Update of /cvsroot/memship/memship/includes
In directory usw-pr-cvs1:/tmp/cvs-serv19985/includes

Modified Files:
	head.php 
Log Message:
Update


Index: head.php
===================================================================
RCS file: /cvsroot/memship/memship/includes/head.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** head.php	18 Aug 2002 12:43:10 -0000	1.1
--- head.php	18 Aug 2002 13:33:07 -0000	1.2
***************
*** 23,28 ****
    <td> [ <a href="betalt.php">Betaling</a> ] </td>
    <td> [ <a href="grupper.php">Grupper</a> ] </td>
-   <td> [ RV-Fond ] </td>
    <td> [ <a href="mobilisere.php">Mobilisering</a> ] </td>
    </tr></table>
   </td></tr>
--- 23,28 ----
    <td> [ <a href="betalt.php">Betaling</a> ] </td>
    <td> [ <a href="grupper.php">Grupper</a> ] </td>
    <td> [ <a href="mobilisere.php">Mobilisering</a> ] </td>
+   <td> [ <a href="logout.php">Avslutt</a> ] </td>
    </tr></table>
   </td></tr>

[Memship-cvs] memship index.php,1.3,1.4 admin.php,1.1.1.1,NONE fail.php,1.1.1.1,NONE hode.php,1.1.1.1,NONE index2.php,1.1.1.1,NONE insert.php,1.1.1.1,NONE liste.php,1.1.1.1,NONE

[<se...@us...>]

Update of /cvsroot/memship/memship
In directory usw-pr-cvs1:/tmp/cvs-serv19985

Modified Files:
	index.php 
Removed Files:
	admin.php fail.php hode.php index2.php insert.php liste.php 
Log Message:
Update


Index: index.php
===================================================================
RCS file: /cvsroot/memship/memship/index.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** index.php	18 Aug 2002 12:41:24 -0000	1.3
--- index.php	18 Aug 2002 13:33:06 -0000	1.4
***************
*** 1,37 ****
  <?php
! include('liblogin.php');
  ?>
- <html>
- <head>
- <style type="text/css">
-  .head { color: black; }
-  h1 { color: black; }
-  .hover { background: blue; }
- </style>
- </head>
- <body text="#000000" bgcolor="#ffffff">
- <h1 align="center">Sør-Trøndelag RV / RU</h1>
  
! <center> <!-- center-taggen er bare for IE -->
  
- <form method="POST" action="$form_target">
  <table>
! <tr><td>Brukernavn: <td><input type="text" name="username" value="">
! <tr><td>Passord: <td><input type="password" name="password"><br><br>
! <tr><td><td><input type="submit" name="submit" value="Logg inn">
  </table>
- </form>
- <br>
- <p>Er du allerede logget inn, kan du gå <a href="liste.php">hit</a>.<br>
- Du kan bruke den gamle databasen <a href="../gammelt2/index.php">her</a>.</p>
  
  <br>
! <font size=-1>
! <p><b>Endringer i det siste:</b><br>
! ...
! </font>
  
! </center>
  
! </body>
! </html>
--- 1,167 ----
  <?php
! include('includes/liblogin.php');
! include('includes/head'.php');
  ?>
  
! <h1>Søk i medlemsarkivet</h1>
! 
! <form action="liste2.php" method="post">
! 
! <!-- INFORMASJON -->
! 
! <h3>Kryss av for den informasjonen du vil ha med.</h3>
  
  <table>
!  <tr>
!   <td><input type="checkbox" name="data[betalt1]" value="medlem.betalt1">
! 	Beløp betalt
!   </td>
!   <td><input type="checkbox" name="data[betalt2]" value="medlem.betalt2">
! 	Betalt år
!   </td>
!   <td><input type="checkbox" name="data[adresse]" value="medlem.adresse">
!        Adresse
!   </td>
!   <td><input type="checkbox" name="data[postnr]" value="medlem.postnr">
!        Postnr
!   </td>
!   <!-- obs annen tabell -->
!   <td><input type="checkbox" name="data[poststed]" value="postnr.poststed">
!        Poststed
!   </td>
!   <td><input type="checkbox" name="data[status]" value="medlem.status">
!       Status
!   </td>
!   <td><input type="checkbox" name="data[telhjem]" value="medlem.telhjem">
!       Telefon
!   </td>
!  </tr>
!  <tr>
!   <td><input type="checkbox" name="data[teljobb]" value="medlem.teljobb">
!       Telefon jobb
!   </td>
!   <td><input type="checkbox" name="data[telmob]" value="medlem.telmob">
!       Telefon mobil
!   </td>
!   <td><input type="checkbox" name="data[epost]" value="medlem.epost">
!       Epost
!   </td>
!   <td><input type="checkbox" name="data[kjønn]" value="medlem.kjønn">
!       Kjønn
!   </td>
!   <td><input type="checkbox" name="data[skolejobb]" value="medlem.skolejobb">
!       Skole/jobb
!   </td>
!  </tr>
! </table>
! 
! <!-- SORTERING -->
! 
! <h3>Sorter etter:</h3>
! <input type="hidden" name="testme" value="blah">
! <table>
!  <tr>
!   <td><input type="radio" name="sortby" value="medlem.etternavn" checked>Etternavn</td>
!   <td><input type="radio" name="sortby" value="medlem.fornavn">Fornavn</td>
!   <td><input type="radio" name="sortby" value="medlem.postnr">Postnr</td>
!   <td><input type="radio" name="sortby" value="medlem.medlemstype">Medlemstype</td>
! </table>
! 
! <!-- KRITERIER -->
! 
! <h3>Kriterier:</h3>
! 
! <p>Du må skille mellom store og små bokstaver for å få korrekt søkeresultat.
! (FIKS!!) 
! Bruk % for å representere et ukjent antall ukjente tegn. Ved å fylle ut flere
! felt begrenser du resultatmengden, med unntak av grupper, der øker du resultatmengden
! for hver du krysser av for.</p>
! 
! <table>
!  <tr>
!   <td>Fornavn:</td><td><input type="text" name="krit[fornavn]"></td>
!   <td>Etternavn:</td><td><input type="text" name="krit[etternavn]"></td>
!   <td>Adresse:</td><td><input type="text" name="krit[adresse]"></td>
!  </tr>
!  <tr>
!   <td>Postnr:</td><td><input type="text" name="krit[postnr]"></td>
!   <td>Poststed:</td><td><input type="text" name="krit[poststed]"></td>
!   <td>Mobilisering:</td><td><select name="krit[mobilisering]">
! 	<option value="">Ingen</option>
! <?PHP
! /*
!   $result = pg_exec("SELECT navn FROM arrangement");
!   $j=pg_numrows($result);
!   for($i=0;$i<$j;$i++){
!         $row = pg_fetch_array($result, $i);
!         echo "<option value=\"$row[navn]\">$row[navn]</option>";
!   }
! */
! ?>
!   </select></td>
!  </tr>
!  <tr>
!   <td>Kjønn:</td><td><input type="radio" name="krit[kjønn]" value="gutt">gutt
!       <input type="radio" name="krit[kjønn]" value="jente">jente
!   </td>
!   <td>Lag:</td><td><input type="text" name="krit[lag]"></td>
!   <td>Skole/jobb:</td><td><input type="text" name="krit[skolejobb]"></td>
!  </tr>
!  <tr>
!   <td>Epost:</td><td><input type="text" name="krit[epost]"></td>
!   <td>Betalt:</td><td> 
!      <select name="krit[betalt]">
! 	<option value="0">Irrelevant</option>
! 	<option value="1">Betalt</option>
! 	<option value="2">Ikke betalt</option>
!      </select>
!   </td>
!   <td>Status:</td>
!   <td><select name="krit[status]">
!                 <option selected value="">alle</option>
! 		<option value="medlem">medlem</option>
!                 <option value="kontakt">kontakt</option>
!  <!-- obs bare for RU: -->
! <?PHP
! /*
! if ($ses_db==ru){
! echo "
!                 <option value=\"bøllekontakt\">bøllekontakt</option>
!                 <option value=\"ute\">ute</option>
! ";} else {
! echo "
!                 <option value=\"nytt medlem\">nytt medlem</option>
! ";}
! */
! ?>
!       </select>
!   </td>
!  </tr>
! <tr><td>Gruppe:</td>
! <td colspan="6">
! <?php
! /*
! $result = pg_exec("SELECT DISTINCT gruppenavn FROM gruppebeskrivelse");
! $j=pg_numrows($result);
! for($i=0;$i<$j;$i++){
!   $row = pg_fetch_array($result, $i);
!   $checked = "";
!   if ($row[gruppenavn] == $ses_db) $checked = "checked";
!   echo " [ $row[gruppenavn] <input type=\"checkbox\" name=\"gruppe[$i]\" 
!          value=\"$row[gruppenavn]\" $checked> ] ";
! }
! */
! ?>
! </td>
! </tr>
  </table>
  
  <br>
! <input name="vanlig" type="submit" value="Interaktivt resultat">
! <input name="ren" type="submit" value="Utskriftsvennlig resultat">
  
! </form>
  
! <?php
! include('includes/tail.php');
! ?>

--- admin.php DELETED ---

--- fail.php DELETED ---

--- hode.php DELETED ---

--- index2.php DELETED ---

--- insert.php DELETED ---

--- liste.php DELETED ---

[Memship-cvs] memship/includes tail.php,NONE,1.1

[<se...@us...>]

Update of /cvsroot/memship/memship/includes
In directory usw-pr-cvs1:/tmp/cvs-serv11377/includes

Added Files:
	tail.php 
Log Message:
Add tail html file


--- NEW FILE: tail.php ---
</body>
</html>

[Memship-cvs] memship hale.php,1.1.1.1,NONE

[<se...@us...>]

Update of /cvsroot/memship/memship
In directory usw-pr-cvs1:/tmp/cvs-serv11377

Removed Files:
	hale.php 
Log Message:
Add tail html file


--- hale.php DELETED ---

[Memship-cvs] memship/includes head.php,NONE,1.1 liblogin.php,NONE,1.1

[<se...@us...>]

Update of /cvsroot/memship/memship/includes
In directory usw-pr-cvs1:/tmp/cvs-serv11132/includes

Added Files:
	head.php liblogin.php 
Log Message:
Adding basic login code and html head file


--- NEW FILE: head.php ---
<!-- ?xml version="1.0" encoding="UTF-8"? -->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
 <link rel="STYLESHEET" type="text/css" href="p14.css" />
 <SCRIPT LANGUAGE="JavaScript">
	function switchAll() {
	 for (var j = 1; j <= document.myForm.length; j++) {
		document.myForm.elements[j].checked = !document.myForm.elements[j].checked;
   	 }
	}
 </script>
</head>

<body>

<table width="100%" cellspacing="0" cellpadding="10">
<tr>
 <td width="20%" valign="top" class="menu">
  <table width="100%"><tr>
  <td> [ <a href="liste.php">Søk</a> ] </td>
  <td> [ <a href="registrere.php">Nytt medlem</a> ] </td>
  <td> [ <a href="betalt.php">Betaling</a> ] </td>
  <td> [ <a href="grupper.php">Grupper</a> ] </td>
  <td> [ RV-Fond ] </td>
  <td> [ <a href="mobilisere.php">Mobilisering</a> ] </td>
  </tr></table>
 </td></tr>
</table>

--- NEW FILE: liblogin.php ---
<?php


/*** Includes ***/

include('adodb/adodb.inc.php');


/*** Authentication ***/

// BAAAAD HACKS
$year = "2002";
$dbname = "rebell"
$dbuser = "perrin"

$conn = &ADONewConnection('postgres7');
$conn->PConnect('localhost', '$dbuser', '$dbname');

$conn->debug = true;

function authenticate() {
	header("WWW-Authenticate: Basic realm=\":-!\"");
	header("HTTP/1.0 401 Unauthorized");
	print("You must enter a valid login username and password 
		to access this resource.\n");
	exit;
}

if (!isset($HTTP_SERVER_VARS['PHP_AUTH_USER'])) { 
  authenticate();
} else {
  $user = $HTTP_SERVER_VARS['PHP_AUTH_USER'];
  $password = $HTTP_SERVER_VARS['PHP_AUTH_PW']; /* plaintext for now */
  $sql << ENDSQL
    SELECT username, password FROM authenticateTable
     WHERE username='$user'
       AND password='$password';
  ENDSQL
  $result = $conn->Execute($sql);
  if (!$result) {
    authenticate();
  }
/*    AND ipaddress='%s'",
    $HTTP_SERVER_VARS['REMOTE_ADDR']); */
}


/*** Session code ***/

session_name("Memship database for $dbname");
session_start();
if (!isset($_SESSION['user']) {
  $_SESSION['user'] = 'none'; /* TEMP */
}

/*
function nedtrekksmeny_gruppe() {
 echo "<select name=\"gruppe\">";
 $result = pg_exec("SELECT DISTINCT gruppenavn FROM gruppe");
 $j=pg_numrows($result);
 for($i=0;$i<$j;$i++){
        $row = pg_fetch_array($result, $i);
        echo "<option>$row[gruppenavn]</option>";
 }
 echo "</select>";
}
*/

?>

<!-- ?xml version="1.0" encoding="UTF-8"? -->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
 <link rel="STYLESHEET" type="text/css" href="p14.css" />
 <SCRIPT LANGUAGE="JavaScript">
	function switchAll() {
	 for (var j = 1; j <= document.myForm.length; j++) {
		document.myForm.elements[j].checked = !document.myForm.elements[j].checked;
   	 }
	}
 </script>
</head>

<body>

<table width="100%" cellspacing="0" cellpadding="10">
<tr>
 <td width="20%" valign="top" class="menu">
  <table width="100%"><tr>
  <td> [ <a href="liste.php">Søk</a> ] </td>
  <td> [ <a href="registrere.php">Nytt medlem</a> ] </td>
  <td> [ <a href="betalt.php">Betaling</a> ] </td>
  <td> [ <a href="grupper.php">Grupper</a> ] </td>
  <td> [ RV-Fond ] </td>
  <td> [ <a href="mobilisere.php">Mobilisering</a> ] </td>
  </tr></table>
 </td></tr>
</table>

 <!-- div align="justify" -->

[Memship-cvs] memship/doc STYLE,NONE,1.1 TODO,NONE,1.1 memship_schema_mysql.txt,NONE,1.1 memship_schema_pgsql.txt,NONE,1.1

[<se...@us...>]

Update of /cvsroot/memship/memship/doc
In directory usw-pr-cvs1:/tmp/cvs-serv10778/doc

Added Files:
	STYLE TODO memship_schema_mysql.txt memship_schema_pgsql.txt 
Log Message:
Reorganize source code a bit. Added doc/ directory


--- NEW FILE: STYLE ---
Not much.

- All files that are includes should be called "lib*".
- All include files should be put in include/ directory.
- Never use session_register(), session_is_registered() or session_unregister()
- Never rely on register_globals setting (it will be turned off for security reasons)

--- NEW FILE: TODO ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: memship_schema_mysql.txt ---
create table member (member INT NOT NULL AUTO_INCREMENT, forename
varchar(40), surname varchar(40), address varchar(60), postal
varchar(12), phone_home varchar(20), phone_work varchar(20),
phone_mobile varchar(20), email varchar(30), gender bool, occupation
varchar(30), comments varchar(200), secret_delivery bool, address_error
bool, synchronised bool, country char(2), last_login timestamp, password
varchar(20), login_errors smallint, primary key(member));

create table postal_errors (member INT NOT NULL, subgroup INT NOT NULL,
unit int, primary key(member, subgroup));

create table payment_required (member INT NOT NULL, subgroup INT NOT
NULL, unit int, payment int, primary key(member, subgroup));

create table access (member int not null, country char(2) not null,
postal varchar(12) not null, primary key (member,country,postal));

create table login_log (member int not null, login_time timestamp not
null, ip_address char(15), dns_name varchar(40), primary
key(member,login_time));

create table user_change_log (member int not null, changed_time
timestamp not null, changed_member int not null, primary key(member,
changed_time, changed_member));

create table subgroup_change_log (member int not null, changed_time
timestamp not null, changed_subgroup int not null, primary key (member,
changed_time, changed_subgroup));

create table subgroup (subgroup int not null, member int not null,
member_status int default '0', member_type int default '0', primary
key(subgroup, member));

create table group_description (subgroup int not null auto_increment,
name varchar(30), account varchar(20), address varchar(40), postal
varchar(12), country char(2), phone varchar(20), email varchar(30),
primary key(subgroup));

create table group_administration (member int not null, subgroup int not
null, primary key(member, subgroup));

create table payment (member int not null, start int not null, subgroup
int not null, units int default 0, payment int default 0, primary
key(member, start, subgroup));

create table postal (postal_number int not null, postal_address
varchar(40), country char(2) not null, primary key (postal_number,
country));

create table ipaccess (member int not null, ipclass char(11) not null,
access bool, password varchar(12), primary key (member, ipclass));

create table member_status (member_status varchar(20) not null, primary
key(member_status));

create table member_type (member_type varchar(20) not null, primary
key(member_type));


--- NEW FILE: memship_schema_pgsql.txt ---
# Changed from mysql original: SERIAL instead of int AUTO_INCREMENT NOT
# NULL) and datetime instead of timestamp

create table member (member SERIAL, forename
varchar(40), surname varchar(40), address varchar(60), postal
varchar(12), phone_home varchar(20), phone_work varchar(20),
phone_mobile varchar(20), email varchar(30), gender bool, occupation
varchar(30), comments varchar(200), secret_delivery bool, address_error
bool, synchronised bool, country char(2), last_login timestamp, password
varchar(20), login_errors smallint, primary key(member));

create table postal_errors (member INT NOT NULL, subgroup INT NOT NULL,
unit int, primary key(member, subgroup));

create table payment_required (member INT NOT NULL, subgroup INT NOT
NULL, unit int, payment int, primary key(member, subgroup));

create table access (member int not null, country char(2) not null,
postal varchar(12) not null, primary key (member,country,postal));

create table login_log (member int not null, login_time datetime not
null, ip_address char(15), dns_name varchar(40), primary key(member,
login_time));

create table user_change_log (member int not null, changed_time
datetime not null, changed_member int not null, primary key(member,
changed_time, changed_member));

create table subgroup_change_log (member int not null, changed_time
datetime not null, changed_subgroup int not null, primary key (member,
changed_time, changed_subgroup));

create table subgroup (subgroup int not null, member int not null,
member_status int default '0', member_type int default '0', primary
key(subgroup, member));

create table group_description (subgroup SERIAL,
name varchar(30), account varchar(20), address varchar(40), postal
varchar(12), country char(2), phone varchar(20), email varchar(30),
primary key(subgroup));

create table group_administration (member int not null, subgroup int not
null, primary key(member, subgroup));

create table payment (member int not null, start int not null, subgroup
int not null, units int default 0, payment int default 0, primary
key(member, start, subgroup));

create table postal (postal_number int not null, postal_address
varchar(40), country char(2) not null, primary key (postal_number,
country));

create table ipaccess (member int not null, ipclass char(11) not null,
access bool, password varchar(12), primary key (member, ipclass));

create table member_status (member_status varchar(20) not null, primary
key(member_status));

create table member_type (member_type varchar(20) not null, primary
key(member_type));

[Memship-cvs] memship README,NONE,1.1 index.php,1.2,1.3 STYLE,1.1,NONE TODO,1.2,NONE memship_schema_mysql.txt,1.1,NONE memship_schema_pgsql.txt,1.1,NONE

[<se...@us...>]

Update of /cvsroot/memship/memship
In directory usw-pr-cvs1:/tmp/cvs-serv10778

Modified Files:
	index.php 
Added Files:
	README 
Removed Files:
	STYLE TODO memship_schema_mysql.txt memship_schema_pgsql.txt 
Log Message:
Reorganize source code a bit. Added doc/ directory


--- NEW FILE: README ---
For a new installation of Memship, edit these files

	includes/head.php	html outline
	includes/liblogin.php	db info

Index: index.php
===================================================================
RCS file: /cvsroot/memship/memship/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** index.php	16 Aug 2002 15:28:04 -0000	1.2
--- index.php	18 Aug 2002 12:41:24 -0000	1.3
***************
*** 1,2 ****
--- 1,5 ----
+ <?php
+ include('liblogin.php');
+ ?>
  <html>
  <head>

--- STYLE DELETED ---

--- TODO DELETED ---

--- memship_schema_mysql.txt DELETED ---

--- memship_schema_pgsql.txt DELETED ---

[Memship-cvs] memship/doc - New directory

[<se...@us...>]

Update of /cvsroot/memship/memship/doc
In directory usw-pr-cvs1:/tmp/cvs-serv10557/doc

Log Message:
Directory /cvsroot/memship/memship/doc added to the repository

[Memship-cvs] memship/includes - New directory

[<se...@us...>]

Update of /cvsroot/memship/memship/includes
In directory usw-pr-cvs1:/tmp/cvs-serv10042/includes

Log Message:
Directory /cvsroot/memship/memship/includes added to the repository

[Memship-cvs] memship STYLE,NONE,1.1

[<se...@us...>]

Update of /cvsroot/memship/memship
In directory usw-pr-cvs1:/tmp/cvs-serv31511

Added Files:
	STYLE 
Log Message:
Add STYLE, a file describing our (non-existent) coding style


--- NEW FILE: STYLE ---
Not much.

All files that are includes should be called "lib*".