VASSAL Engine

Revision: 5105
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5105&view=rev
Author:   uckelman
Date:     2009-02-18 21:56:58 +0000 (Wed, 18 Feb 2009)

Log Message:
-----------
Added SSO files.

Added Paths:
-----------
    site-src/trunk/site/AuthDB.php
    site-src/trunk/site/EmailAddressValidator.php
    site-src/trunk/site/UserDB.php
    site-src/trunk/site/confirm.php
    site-src/trunk/site/confirm_email.php
    site-src/trunk/site/login.php
    site-src/trunk/site/modify.php
    site-src/trunk/site/recaptchalib.php
    site-src/trunk/site/register.php
    site-src/trunk/site/resetpw.php
    site-src/trunk/site/sendpw.php
    site-src/trunk/site/ssoauth.php
    site-src/trunk/site/ssolib.php

Copied: site-src/trunk/site/AuthDB.php (from rev 5104, site-src/trunk/sso/AuthDB.php)
===================================================================
--- site-src/trunk/site/AuthDB.php	                        (rev 0)
+++ site-src/trunk/site/AuthDB.php	2009-02-18 21:56:58 UTC (rev 5105)
@@ -0,0 +1,44 @@
+<?php
+
+require_once('config.php');
+
+class AuthDB {
+  private $dbh;
+
+  public function __construct() {
+    $this->dbh = mysql_connect(SQL_HOST, SQL_USERNAME, SQL_PASSWORD);
+    if (!$this->dbh) {
+      throw new ErrorException(
+        'Cannot connect to MySQL server: ' . mysql_error());
+    }
+
+    if (!mysql_select_db(SQL_DB, $this->dbh)) {
+      throw new ErrorException(
+        'Cannot select database: ' . mysql_error());
+    }
+  }
+
+  public function __destruct() {
+    mysql_close($this->dbh);
+  }
+
+  public function read($query) {
+    $r = mysql_query($query, $this->dbh);
+    if (!$r) {
+      throw new ErrorException(
+        'Failed to read from database: ' . mysql_error());
+    }
+
+    return mysql_fetch_assoc($r);
+  }
+
+  public function write($query) {
+    $r = mysql_query($query, $this->dbh);
+    if (!$r) {
+      throw new ErrorException(
+        'Failed to write to database: ' . mysql_error());
+    }
+
+    return mysql_affected_rows($this->dbh);
+  }
+}


Property changes on: site-src/trunk/site/AuthDB.php
___________________________________________________________________
Added: svn:mergeinfo
   + 

Copied: site-src/trunk/site/EmailAddressValidator.php (from rev 5094, site-src/trunk/sso/EmailAddressValidator.php)
===================================================================
--- site-src/trunk/site/EmailAddressValidator.php	                        (rev 0)
+++ site-src/trunk/site/EmailAddressValidator.php	2009-02-18 21:56:58 UTC (rev 5105)
@@ -0,0 +1,181 @@
+<?php
+
+    /*
+
+        EmailAddressValidator Class
+        http://code.google.com/p/php-email-address-validation/
+
+        Released under New BSD license
+        http://www.opensource.org/licenses/bsd-license.php
+        
+        Sample Code
+        ----------------
+        $validator = new EmailAddressValidator;
+        if ($validator->check_email_address('test@...')) {
+            // Email address is technically valid
+        }
+
+    */
+
+    class EmailAddressValidator {
+
+        /**
+         * Check email address validity
+         * @param   strEmailAddress     Email address to be checked
+         * @return  True if email is valid, false if not
+         */
+        public function check_email_address($strEmailAddress) {
+            
+            // If magic quotes is "on", email addresses with quote marks will
+            // fail validation because of added escape characters. Uncommenting
+            // the next three lines will allow for this issue.
+            //if (get_magic_quotes_gpc()) { 
+            //    $strEmailAddress = stripslashes($strEmailAddress); 
+            //}
+
+            // Control characters are not allowed
+            if (preg_match('/[\x00-\x1F\x7F-\xFF]/', $strEmailAddress)) {
+                return false;
+            }
+
+            // Check email length - min 3 (a@...), max 256
+            if (!$this->check_text_length($strEmailAddress, 3, 256)) {
+                return false;
+            }
+
+            // Split it into sections using last instance of "@"
+            $intAtSymbol = strrpos($strEmailAddress, '@');
+            if ($intAtSymbol === false) {
+                // No "@" symbol in email.
+                return false;
+            }
+            $arrEmailAddress[0] = substr($strEmailAddress, 0, $intAtSymbol);
+            $arrEmailAddress[1] = substr($strEmailAddress, $intAtSymbol + 1);
+
+            // Count the "@" symbols. Only one is allowed, except where 
+            // contained in quote marks in the local part. Quickest way to
+            // check this is to remove anything in quotes. We also remove
+            // characters escaped with backslash, and the backslash
+            // character.
+            $arrTempAddress[0] = preg_replace('/\./'
+                                             ,''
+                                             ,$arrEmailAddress[0]);
+            $arrTempAddress[0] = preg_replace('/"[^"]+"/'
+                                             ,''
+                                             ,$arrTempAddress[0]);
+            $arrTempAddress[1] = $arrEmailAddress[1];
+            $strTempAddress = $arrTempAddress[0] . $arrTempAddress[1];
+            // Then check - should be no "@" symbols.
+            if (strrpos($strTempAddress, '@') !== false) {
+                // "@" symbol found
+                return false;
+            }
+
+            // Check local portion
+            if (!$this->check_local_portion($arrEmailAddress[0])) {
+                return false;
+            }
+
+            // Check domain portion
+            if (!$this->check_domain_portion($arrEmailAddress[1])) {
+                return false;
+            }
+
+            // If we're still here, all checks above passed. Email is valid.
+            return true;
+
+        }
+
+        /**
+         * Checks email section before "@" symbol for validity
+         * @param   strLocalPortion     Text to be checked
+         * @return  True if local portion is valid, false if not
+         */
+        protected function check_local_portion($strLocalPortion) {
+            // Local portion can only be from 1 to 64 characters, inclusive.
+            // Please note that servers are encouraged to accept longer local
+            // parts than 64 characters.
+            if (!$this->check_text_length($strLocalPortion, 1, 64)) {
+                return false;
+            }
+            // Local portion must be:
+            // 1) a dot-atom (strings separated by periods)
+            // 2) a quoted string
+            // 3) an obsolete format string (combination of the above)
+            $arrLocalPortion = explode('.', $strLocalPortion);
+            for ($i = 0, $max = sizeof($arrLocalPortion); $i < $max; $i++) {
+                 if (!preg_match('.^('
+                                .    '([A-Za-z0-9!#$%&\'*+/=?^_`{|}~-]' 
+                                .    '[A-Za-z0-9!#$%&\'*+/=?^_`{|}~-]{0,63})'
+                                .'|'
+                                .    '("[^\\\"]{0,62}")'
+                                .')$.'
+                                ,$arrLocalPortion[$i])) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        /**
+         * Checks email section after "@" symbol for validity
+         * @param   strDomainPortion     Text to be checked
+         * @return  True if domain portion is valid, false if not
+         */
+        protected function check_domain_portion($strDomainPortion) {
+            // Total domain can only be from 1 to 255 characters, inclusive
+            if (!$this->check_text_length($strDomainPortion, 1, 255)) {
+                return false;
+            }
+            // Check if domain is IP, possibly enclosed in square brackets.
+            if (preg_match('/^(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])'
+               .'(\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])){3}$/'
+               ,$strDomainPortion) || 
+                preg_match('/^\[(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])'
+               .'(\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])){3}\]$/'
+               ,$strDomainPortion)) {
+                return true;
+            } else {
+                $arrDomainPortion = explode('.', $strDomainPortion);
+                if (sizeof($arrDomainPortion) < 2) {
+                    return false; // Not enough parts to domain
+                }
+                for ($i = 0, $max = sizeof($arrDomainPortion); $i < $max; $i++) {
+                    // Each portion must be between 1 and 63 characters, inclusive
+                    if (!$this->check_text_length($arrDomainPortion[$i], 1, 63)) {
+                        return false;
+                    }
+                    if (!preg_match('/^(([A-Za-z0-9][A-Za-z0-9-]{0,61}[A-Za-z0-9])|'
+                       .'([A-Za-z0-9]+))$/', $arrDomainPortion[$i])) {
+                        return false;
+                    }
+                    if ($i == $max - 1) { // TLD cannot be only numbers
+                        if (strlen(preg_replace('/[0-9]/', '', $arrDomainPortion[$i])) <= 0) {
+                            return false;
+                        }
+                    }
+                }
+            }
+            return true;
+        }
+
+        /**
+         * Check given text length is between defined bounds
+         * @param   strText     Text to be checked
+         * @param   intMinimum  Minimum acceptable length
+         * @param   intMaximum  Maximum acceptable length
+         * @return  True if string is within bounds (inclusive), false if not
+         */
+        protected function check_text_length($strText, $intMinimum, $intMaximum) {
+            // Minimum and maximum are both inclusive
+            $intTextLength = strlen($strText);
+            if (($intTextLength < $intMinimum) || ($intTextLength > $intMaximum)) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+
+    }
+
+?>


Property changes on: site-src/trunk/site/EmailAddressValidator.php
___________________________________________________________________
Added: svn:mergeinfo
   + 

Copied: site-src/trunk/site/UserDB.php (from rev 5096, site-src/trunk/sso/UserDB.php)
===================================================================
--- site-src/trunk/site/UserDB.php	                        (rev 0)
+++ site-src/trunk/site/UserDB.php	2009-02-18 21:56:58 UTC (rev 5105)
@@ -0,0 +1,87 @@
+<?php
+
+require_once('config.php');
+
+class UserDB {
+  private $ds;  
+
+  public function __construct() {
+    $this->ds = @ldap_connect(LDAP_HOST);
+    if (!$this->ds) {
+      throw new ErrorException('Cannot connect to LDAP server.');
+    }
+  }
+
+  public function __destruct() {
+    @ldap_close($this->ds);
+  }
+
+  public function search($filter) {
+    if (!@ldap_bind($this->ds)) {
+      throw new ErrorException(
+        'Cannot bind to LDAP server: ' . ldap_error($this->ds)); 
+    }
+
+    $r = @ldap_search($this->ds, LDAP_BASE, $filter);
+    if (!$r) {
+      throw new ErrorException(
+        'LDAP search failed: ' . ldap_error($this->ds));
+    }
+
+    return @ldap_get_entries($this->ds, $r);
+  }
+
+  public function exists($username) {
+    return ${$this->search("uid=$username")}['count'] > 0;
+  }
+
+  public function auth($username, $password) {
+    $this->bind();
+
+    $r = @ldap_search($this->ds, LDAP_BASE, "uid=$username");
+    if (!$r) {
+      throw new ErrorException(
+        'LDAP search failed: ' . ldap_error($this->ds));
+    }
+
+    if (@ldap_count_entries($this->ds, $r) < 1) {
+      throw new ErrorException(
+        'The account "' . $username . '" does not exist.');
+    }
+
+    $result = @ldap_get_entries($this->ds, $r);
+
+    if (!@ldap_bind($this->ds, $result[0]['dn'], $password)) {
+      throw new ErrorException('Bad password.');
+    }
+  }
+
+  public function modify($username, $attr) {
+    $this->bind(LDAP_USERNAME, LDAP_PASSWORD);
+  
+    $dn = "uid=$username," . LDAP_BASE;
+    if (!@ldap_mod_replace($this->ds, $dn, $attr)) {
+      throw new ErrorException(
+        'Cannot reset user attributes: ' . ldap_error($this->ds));
+    }
+  }
+
+  public function create($username, $attr) {
+    $this->bind(LDAP_USERNAME, LDAP_PASSWORD);
+   
+    $dn = "uid=$username," . LDAP_BASE;
+    if (!@ldap_add($this->ds, $dn, $attr)) {
+      throw new ErrorException(
+        'Cannot write entry: ' . ldap_error($ds));
+    }
+  }
+
+  private function bind($dn = NULL, $pw = NULL) {
+    if (!@ldap_bind($this->ds, $dn, $pw)) {
+      throw new ErrorException(
+        'Cannot bind to LDAP server: ' . ldap_error($this->ds));
+    }
+  } 
+}
+
+?>


Property changes on: site-src/trunk/site/UserDB.php
___________________________________________________________________
Added: svn:mergeinfo
   + 

Copied: site-src/trunk/site/confirm.php (from rev 5095, site-src/trunk/sso/confirm.php)
===================================================================
--- site-src/trunk/site/confirm.php	                        (rev 0)
+++ site-src/trunk/site/confirm.php	2009-02-18 21:56:58 UTC (rev 5105)
@@ -0,0 +1,72 @@
+<?php
+require_once('AuthDB.php');
+require_once('UserDB.php');
+require_once('ssolib.php');
+
+$tilte = 'Confirm account';
+
+try {
+  # check whether this was an attempt to confirm
+  if (empty($_GET)) {
+    throw new ErrorException('No confirmation code.');
+  }
+
+  # sanitize the input
+  $key = addslashes($_GET['key']);
+
+  if (empty($key)) {
+    throw new ErrorException('No confirmation key.');
+  }
+
+  # get data for key from the registration database
+  $auth = new AuthDB();
+
+  $query = sprintf(
+    "SELECT username, password, email, realname
+     FROM pending
+     WHERE id='%s'",
+    mysql_real_escape_string($key)
+  );
+
+  $row = $auth->read($query);
+  if (!$row) {
+    throw new ErrorException('No results.');
+  }
+
+  extract($row);
+
+  # add user to LDAP
+  $user = new UserDB();
+
+  $attr = array(
+    'objectClass'  => 'inetOrgPerson',
+    'cn'           => $realname,
+    'sn'           => $username,
+    'uid'          => $username,
+    'mail'         => $email,
+    'userPassword' => $password
+  );
+
+  $user->create($username, $attr);
+
+  # remove row from the registration database
+  $query = sprintf(
+    "DELETE FROM pending WHERE id='%s'",
+    mysql_real_escape_string($key)
+  );
+  $auth->write($query);
+
+  # success!
+  print_top($title);
+  print '<p>Your account has been activated.</p>';
+  print_bottom();
+  exit;
+}
+catch (ErrorException $e) {
+  print_top($title);
+  warn($e->getMessage());
+  print_bottom();
+  exit;
+}
+
+?>


Property changes on: site-src/trunk/site/confirm.php
___________________________________________________________________
Added: svn:mergeinfo
   + 

Copied: site-src/trunk/site/confirm_email.php (from rev 5095, site-src/trunk/sso/confirm_email.php)
===================================================================
--- site-src/trunk/site/confirm_email.php	                        (rev 0)
+++ site-src/trunk/site/confirm_email.php	2009-02-18 21:56:58 UTC (rev 5105)
@@ -0,0 +1,64 @@
+<?php
+
+require_once('AuthDB.php');
+require_once('UserDB.php');
+require_once('ssolib.php');
+
+$tilte = 'Confirm email';
+
+try {
+  # check whether this was an attempt to confirm
+  if (empty($_GET)) {
+    throw new ErrorException('No confirmation key.');
+  }
+
+  # sanitize the input
+  $key = addslashes($_GET['key']);
+
+  if (empty($key)) {
+    throw new ErrorException('No confirmation key.');
+  }
+
+  # get data for key from the registration database
+  $auth = new AuthDB();
+  
+  $query = sprintf(
+    "SELECT username, email
+     FROM confirmemail
+     WHERE id='%s'",
+    mysql_real_escape_string($key)
+  );
+
+  $row = $auth->read($query);
+  if (!$row) {
+    throw new ErrorException('No results');
+  }
+
+  extract($row);
+
+  # set new email in LDAP
+  $user = new UserDB();
+  $user->modify($username, array('mail' => $email));
+  
+  # remove row from the registration database
+  $query = sprintf(
+    "DELETE FROM confirmemail WHERE id='%s'",
+    mysql_real_escape_string($key)
+  );
+
+  $auth->write($query);
+
+  # success!
+  print_top($title);
+  print '<p>Your email address has been updated.</p>';
+  print_bottom();
+  exit;
+}
+catch (ErrorException $e) {
+  print_top($title);
+  warn($e->getMessage());
+  print_bottom();
+  exit;
+}
+
+?>


Property changes on: site-src/trunk/site/confirm_email.php
___________________________________________________________________
Added: svn:mergeinfo
   + 

Copied: site-src/trunk/site/login.php (from rev 5095, site-src/trunk/sso/login.php)
===================================================================
--- site-src/trunk/site/login.php	                        (rev 0)
+++ site-src/trunk/site/login.php	2009-02-18 21:56:58 UTC (rev 5105)
@@ -0,0 +1,255 @@
+<?php
+require_once('AuthDB.php');
+require_once('UserDB.php');
+require_once('ssolib.php');
+
+$title = 'VASSAL Login';
+
+# check whether this was a login attempt
+if (empty($_POST)) {
+  print_top($title);
+  print_form();
+  print_bottom();
+  exit;
+}
+
+# sanitize the input
+$username = addslashes($_POST['username']);
+$password = addslashes($_POST['password']);
+
+try {
+  # check for blank username
+  if (empty($username)) {
+    throw new ErrorException('Invalid username.');
+  }
+
+  # check for blank password
+  if (empty($password)) {
+    throw new ErrorException('Blank password.');
+  }
+
+  # authenticate with LDAP server
+  $user = new UserDB();
+  $user->auth($username, $password);
+
+  # MediaWiki login
+  $url = 'http://www.test.nomic.net/wiki/api.php';
+  $data = array(
+    'format'     => 'php',
+    'action'     => 'login',
+    'lgname'     => $username,
+    'lgpassword' => $password,
+    'lgdomain'   => 'test'
+  );
+
+  $cookies = array();
+
+  $ch = curl_init($url);
+  curl_setopt($ch, CURLOPT_HEADER, false);
+  curl_setopt($ch, CURLOPT_HEADERFUNCTION, 'read_header');
+  curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+  curl_setopt($ch, CURLOPT_POST, true);
+  curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+  $result = curl_exec($ch);
+  curl_close($ch);
+
+  $result = unserialize($result);
+  $result = $result['login'];
+
+  if ($result['result'] != 'Success') {
+    if ($result['result'] == 'Illegal') {
+      throw new ErrorException('MediaWiki login failed: Invalid username.');
+    }
+    else if ($result['result'] == 'NotExists') {
+      throw new ErrorException('MediaWiki login failed: Invalid username.');
+    }
+    else if ($result['result'] == 'WrongPass') {
+      throw new ErrorException('MediaWiki login falied: Invalid password.');
+    }
+    else if ($result['result'] == 'WrongPluginPass') {
+      throw new ErrorException('MediaWiki login failed: Invalid password.');
+    }
+    else {
+      throw new ErrorException('MediaWiki login failed: ' . $result['result']);
+    }
+  }
+
+  # set MediaWiki cookies
+  foreach ($cookies as $name => $attr) {
+    setrawcookie(
+      $name,
+      $attr['value'],
+      array_key_exists('expires', $attr) ? strtotime($attr['expires']) : 0,
+      $attr['path'],
+      'www.test.nomic.net',
+      false,
+      array_key_exists('httponly', $attr)
+    );
+  }
+
+  # phpBB login 
+  define('IN_PHPBB', true);
+  $phpbb_root_path = 'forum/';
+  $phpEx = 'php';
+  include($phpbb_root_path . 'common.' . $phpEx);
+
+  $auth = new auth();
+  $user = new user();
+
+  $user->session_begin();
+  $auth->acl($user->data);
+  $user->setup();
+
+  $autologin = true;
+  $viewonline = true;
+
+  if (!$user->data['is_registered']) {
+    $result = $auth->login($username, $password, $autologin, $viewonline);
+
+    if ($result['status'] != LOGIN_SUCCESS) {
+      throw new ErrorException('phpBB login failed.');
+    }
+  }
+
+  # Bugzilla login
+  $cookies = array();
+
+  $params = array(
+    'login'    => $username,
+    'password' => $password
+  #  'remember' => true
+  );
+
+  $request = xmlrpc_encode_request('User.login', $params);
+  $header = array(
+    'Content-type: text/xml',
+    'Content-length: ' . strlen($request)
+  );
+
+  $url = 'http://www.test.nomic.net/bugzilla/xmlrpc.cgi';
+
+  $ch = curl_init();
+  curl_setopt($ch, CURLOPT_URL, $url);
+  curl_setopt($ch, CURLOPT_HEADERFUNCTION, 'read_header');
+  curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+  curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
+  curl_setopt($ch, CURLOPT_POST, true);
+  curl_setopt($ch, CURLOPT_POSTFIELDS, $request);
+  $data = curl_exec($ch);
+  curl_close($ch);
+
+  foreach ($cookies as $name => $attr) {
+    setrawcookie(
+      $name,
+      $attr['value'],
+      array_key_exists('expires', $attr) ? strtotime($attr['expires']) : 0,
+      $attr['path'],
+      'www.test.nomic.net',
+      false,
+      array_key_exists('httponly', $attr)
+    );
+  }
+
+  # FIXME: loop in case we have a cookie collision
+
+  # set our login cookie
+  $key = rand_base64_key();
+  $expires = time() + (60 * 60 * 24 * 30);
+
+  $auth = new AuthDB();
+
+  $query = sprintf(
+    "INSERT INTO cookies (id, username, expires)
+     VALUES('%s', '%s', FROM_UNIXTIME(%s))",
+    mysql_real_escape_string($key),
+    mysql_real_escape_string($username),
+    mysql_real_escape_string($expires)
+  );
+
+  $auth->write($query);
+
+  setrawcookie(
+    'VASSAL_login',
+    $key,
+    $expires,
+    '/',
+    'www.test.nomic.net',
+    false,
+    true
+  );
+    
+  #header('Location: http://www.test.nomic.net/wiki/index.php/Main_Page');
+  #header('Location: http://www.test.nomic.net/forum');
+
+  print_top($title);
+  print '<a href="http://www.test.nomic.net/wiki">wiki</a><br/>';
+  print '<a href="http://www.test.nomic.net/forum">forum</a><br/>';
+  print '<a href="http://www.test.nomic.net/bugzilla">bugs</a><br/>';
+  print_bottom();
+  exit;
+}
+catch (ErrorException $e) {
+  print_top($title);
+  warn($e->getMessage());
+  print_form();
+  print_bottom();
+  exit;
+}
+
+function read_header($ch, $string) {
+  $length = strlen($string);
+
+  if (!strncmp($string, "Set-Cookie:", 11)) {
+    parse_cookie_header($string);
+  }
+
+  return $length;
+}
+
+function parse_cookie_header($header) {
+  global $cookies;
+
+  $cookiestr = trim(substr($header, 11, -1));
+  $crumbs = explode(';', $cookiestr);
+    
+  $tmp = explode('=', array_shift($crumbs));
+  $name = trim($tmp[0]);
+  $cookies[$name]['value'] = trim($tmp[1]);
+  
+  foreach ($crumbs as $crumb) {
+    $tmp = explode('=', $crumb);
+    $cookies[$name][strtolower(trim($tmp[0]))] =
+      sizeof($tmp) > 1 ? trim($tmp[1]) : null;
+  }
+}
+
+function print_form() {
+  print <<<END
+<form class="loginform" action="login.php" method="post">
+  <fieldset>
+    <legend>Login</legend>
+    <p>Don't have an account? <a href="register.php">Create an account</a>.</p>
+    <table>
+      <tr>
+        <th><label for="username">Username:</label></th>
+        <td><input type="text" id="username" name="username" size="20"/></td>
+      </tr>
+      <tr>
+        <th><label for="password">Password:</label></th>
+        <td><input type="password" id="password" name="password" size="20"/></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td><a href="sendpw.php">I forgot my password!</a></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td><input type="submit" name="login" id="login" value="Log in" /></td>
+      </tr>
+    </table>
+  </fieldset>
+</form>
+END;
+}
+
+?>


Property changes on: site-src/trunk/site/login.php
___________________________________________________________________
Added: svn:mergeinfo
   + 

Copied: site-src/trunk/site/modify.php (from rev 5095, site-src/trunk/sso/modify.php)
===================================================================
--- site-src/trunk/site/modify.php	                        (rev 0)
+++ site-src/trunk/site/modify.php	2009-02-18 21:56:58 UTC (rev 5105)
@@ -0,0 +1,181 @@
+<?php
+
+require_once('AuthDB.php');
+require_once('UserDB.php');
+require_once('ssolib.php');
+require_once('EmailAddressValidator.php');
+
+$title = 'Modify Account';
+
+$key = $_COOKIE['VASSAL_login'];
+
+try {
+  if (empty($key)) {
+    throw new ErrorException('No key.');
+  }
+
+  # check cookie
+  $auth = new AuthDB();
+
+  $query = sprintf(
+    "SELECT username FROM cookies WHERE id='%s'",
+    mysql_real_escape_string($key)
+  );
+
+  $row = $auth->read($query);
+  if (!$row) {
+    throw new ErrorException('No result.');
+  }
+  
+  extract($row);
+
+  # check whether this was a modification attempt
+  if (empty($_POST)) {
+    print_top($title);
+    print_form();
+    print_bottom();
+    exit;
+  }
+
+  # sanitize the input
+  $password = addslashes($_POST['password']);
+  $retype_password = addslashes($_POST['retype_password']);
+  $email = addslashes($_POST['email']);
+  $retype_email = addslashes($_POST['retype_email']);
+  $realname = addslashes($_POST['realname']);
+
+  # check for password mismatch
+  if ($password != $retype_password) {
+    throw new ErrorException('Password mismatch.');
+  }
+
+  # check for email mismatch
+  if ($email != $retype_email) {
+    throw new ErrorException('Email mismatch.');
+  }
+
+  # build the attributes array
+  $attr = array();
+
+  if (!empty($password)) {
+    # check password strength
+    if (strlen($password) < 6) {
+      throw new ErrorException('Password must be at least 6 characters long.');
+    }
+
+    $attr['userPassword'] = $password;
+  }
+
+  if (!empty($realname)) {
+    $attr['cn'] = $realname;
+  }
+
+  if (empty($attr) && empty($email)) {
+    throw new ErrorException('No changes.');
+  }
+
+  if (!empty($attr)) {
+    # set new attributes in LDAP
+    $user = new UserDB();
+    $user->modify($username, $attr);
+  }
+
+  if (!empty($email)) {
+    # check for bad email address
+    $validator = new EmailAddressValidator;
+    if (!$validator->check_email_address($email)) {
+      throw new ErrorException('Bad email address.');
+    }
+
+    # build confirmation key
+    $key = rand_base64_key();
+
+    # store confirmation information in the database
+    $query = sprintf(
+      "INSERT INTO confirmemail
+       (id, username, email)
+       VALUES('%s', '%s', '%s')",
+      mysql_real_escape_string($key),
+      mysql_real_escape_string($username),
+      mysql_real_escape_string($email)
+    );
+
+    $auth->write($query);
+
+    # send confirmation email
+    $subject = 'vassalengine.org email address confirmation';
+    $message = <<<END
+Someone claiming to be "$realname", probably you, from IP address {$_SERVER['REMOTE_ADDR']}, has attempted to register the account "$username" with this email address at vassalengine.org.
+
+To confirm this email address, simply reply to this message, or open this link in your browser:
+
+http://www.test.nomic.net/confirm_email.php?key=$key
+
+If you do not wish to switch to this email address, please disregard this message. If you are not requesting to change the email address associated with this account, or you have any other questions, please contact webmaster@....
+
+END;
+
+    $message = wordwrap($message, 70);
+    $headers =
+      "From: webmaster@..." .
+      "Reply-To: confirm+$key@...";
+
+    if (!mail($email, $subject, $message, $headers)) {
+      throw new ErrorException('Failed to send confirmation email.');
+    }
+  }
+
+  # success!
+  print_top($title);
+  print '<p>Your settings have been updated.</p>';
+  print_bottom();
+  exit;
+}
+catch (ErrorException $e) {
+  print_top($title);
+  warn($e->getMessage());
+  print_form();
+  print_bottom();
+  exit;
+}
+
+function print_form() {
+  print <<<END
+<form class="modify_form" action="modify.php" method="post">
+  <fieldset>
+    <legend>Modify Settings</legend>
+    <table>
+      <tr>
+        <th><label for="password">Password:</label></th>
+        <td><input type="password" id="password" name="password" size="20"/></td
+>
+      </tr>
+      <tr>
+        <th><label for="retype_password">Retype password:</label></th>
+        <td><input type="password" id="retype_password" name="retype_password" size="20"/></td
+>
+      </tr>
+      <tr>
+        <th><label for="email">Email address:</label></th>
+        <td><input type="text" id="email" name="email" size="20"/></td
+>
+      </tr>
+      <tr>
+        <th><label for="retype_email">Retype email address:</label></th>
+        <td><input type="text" id="retype_email" name="retype_email" size="20"/></td>
+      </tr>
+      <tr>
+        <th><label for="realname">Real name:</label></th>
+        <td><input type="text" id="realname" name="realname" size="20"/></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td><input type="submit" name="modify" id="modify" value="Modify account" /></td>
+      </tr>
+    </table>
+  </fieldset>
+</form>
+END;
+}
+
+?>


Property changes on: site-src/trunk/site/modify.php
___________________________________________________________________
Added: svn:mergeinfo
   + 

Copied: site-src/trunk/site/recaptchalib.php (from rev 5094, site-src/trunk/sso/recaptchalib.php)
===================================================================
--- site-src/trunk/site/recaptchalib.php	                        (rev 0)
+++ site-src/trunk/site/recaptchalib.php	2009-02-18 21:56:58 UTC (rev 5105)
@@ -0,0 +1,277 @@
+<?php
+/*
+ * This is a PHP library that handles calling reCAPTCHA.
+ *    - Documentation and latest version
+ *          http://recaptcha.net/plugins/php/
+ *    - Get a reCAPTCHA API Key
+ *          http://recaptcha.net/api/getkey
+ *    - Discussion group
+ *          http://groups.google.com/group/recaptcha
+ *
+ * Copyright (c) 2007 reCAPTCHA -- http://recaptcha.net
+ * AUTHORS:
+ *   Mike Crawford
+ *   Ben Maurer
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/**
+ * The reCAPTCHA server URL's
+ */
+define("RECAPTCHA_API_SERVER", "http://api.recaptcha.net");
+define("RECAPTCHA_API_SECURE_SERVER", "https://api-secure.recaptcha.net");
+define("RECAPTCHA_VERIFY_SERVER", "api-verify.recaptcha.net");
+
+/**
+ * Encodes the given data into a query string format
+ * @param $data - array of string elements to be encoded
+ * @return string - encoded request
+ */
+function _recaptcha_qsencode ($data) {
+        $req = "";
+        foreach ( $data as $key => $value )
+                $req .= $key . '=' . urlencode( stripslashes($value) ) . '&';
+
+        // Cut the last '&'
+        $req=substr($req,0,strlen($req)-1);
+        return $req;
+}
+
+
+
+/**
+ * Submits an HTTP POST to a reCAPTCHA server
+ * @param string $host
+ * @param string $path
+ * @param array $data
+ * @param int port
+ * @return array response
+ */
+function _recaptcha_http_post($host, $path, $data, $port = 80) {
+
+        $req = _recaptcha_qsencode ($data);
+
+        $http_request  = "POST $path HTTP/1.0\r\n";
+        $http_request .= "Host: $host\r\n";
+        $http_request .= "Content-Type: application/x-www-form-urlencoded;\r\n";
+        $http_request .= "Content-Length: " . strlen($req) . "\r\n";
+        $http_request .= "User-Agent: reCAPTCHA/PHP\r\n";
+        $http_request .= "\r\n";
+        $http_request .= $req;
+
+        $response = '';
+        if( false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) ) ) {
+                die ('Could not open socket');
+        }
+
+        fwrite($fs, $http_request);
+
+        while ( !feof($fs) )
+                $response .= fgets($fs, 1160); // One TCP-IP packet
+        fclose($fs);
+        $response = explode("\r\n\r\n", $response, 2);
+
+        return $response;
+}
+
+
+
+/**
+ * Gets the challenge HTML (javascript and non-javascript version).
+ * This is called from the browser, and the resulting reCAPTCHA HTML widget
+ * is embedded within the HTML form it was called from.
+ * @param string $pubkey A public key for reCAPTCHA
+ * @param string $error The error given by reCAPTCHA (optional, default is null)
+ * @param boolean $use_ssl Should the request be made over ssl? (optional, default is false)
+
+ * @return string - The HTML to be embedded in the user's form.
+ */
+function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false)
+{
+	if ($pubkey == null || $pubkey == '') {
+		die ("To use reCAPTCHA you must get an API key from <a href='http://recaptcha.net/api/getkey'>http://recaptcha.net/api/getkey</a>");
+	}
+	
+	if ($use_ssl) {
+                $server = RECAPTCHA_API_SECURE_SERVER;
+        } else {
+                $server = RECAPTCHA_API_SERVER;
+        }
+
+        $errorpart = "";
+        if ($error) {
+           $errorpart = "&amp;error=" . $error;
+        }
+        return '<script type="text/javascript" src="'. $server . '/challenge?k=' . $pubkey . $errorpart . '"></script>
+
+	<noscript>
+  		<iframe src="'. $server . '/noscript?k=' . $pubkey . $errorpart . '" height="300" width="500" frameborder="0"></iframe><br/>
+  		<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
+  		<input type="hidden" name="recaptcha_response_field" value="manual_challenge"/>
+	</noscript>';
+}
+
+
+
+
+/**
+ * A ReCaptchaResponse is returned from recaptcha_check_answer()
+ */
+class ReCaptchaResponse {
+        var $is_valid;
+        var $error;
+}
+
+
+/**
+  * Calls an HTTP POST function to verify if the user's guess was correct
+  * @param string $privkey
+  * @param string $remoteip
+  * @param string $challenge
+  * @param string $response
+  * @param array $extra_params an array of extra variables to post to the server
+  * @return ReCaptchaResponse
+  */
+function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $extra_params = array())
+{
+	if ($privkey == null || $privkey == '') {
+		die ("To use reCAPTCHA you must get an API key from <a href='http://recaptcha.net/api/getkey'>http://recaptcha.net/api/getkey</a>");
+	}
+
+	if ($remoteip == null || $remoteip == '') {
+		die ("For security reasons, you must pass the remote ip to reCAPTCHA");
+	}
+
+	
+	
+        //discard spam submissions
+        if ($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0) {
+                $recaptcha_response = new ReCaptchaResponse();
+                $recaptcha_response->is_valid = false;
+                $recaptcha_response->error = 'incorrect-captcha-sol';
+                return $recaptcha_response;
+        }
+
+        $response = _recaptcha_http_post (RECAPTCHA_VERIFY_SERVER, "/verify",
+                                          array (
+                                                 'privatekey' => $privkey,
+                                                 'remoteip' => $remoteip,
+                                                 'challenge' => $challenge,
+                                                 'response' => $response
+                                                 ) + $extra_params
+                                          );
+
+        $answers = explode ("\n", $response [1]);
+        $recaptcha_response = new ReCaptchaResponse();
+
+        if (trim ($answers [0]) == 'true') {
+                $recaptcha_response->is_valid = true;
+        }
+        else {
+                $recaptcha_response->is_valid = false;
+                $recaptcha_response->error = $answers [1];
+        }
+        return $recaptcha_response;
+
+}
+
+/**
+ * gets a URL where the user can sign up for reCAPTCHA. If your application
+ * has a configuration page where you enter a key, you should provide a link
+ * using this function.
+ * @param string $domain The domain where the page is hosted
+ * @param string $appname The name of your application
+ */
+function recaptcha_get_signup_url ($domain = null, $appname = null) {
+	return "http://recaptcha.net/api/getkey?" .  _recaptcha_qsencode (array ('domain' => $domain, 'app' => $appname));
+}
+
+function _recaptcha_aes_pad($val) {
+	$block_size = 16;
+	$numpad = $block_size - (strlen ($val) % $block_size);
+	return str_pad($val, strlen ($val) + $numpad, chr($numpad));
+}
+
+/* Mailhide related code */
+
+function _recaptcha_aes_encrypt($val,$ky) {
+	if (! function_exists ("mcrypt_encrypt")) {
+		die ("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed.");
+	}
+	$mode=MCRYPT_MODE_CBC;   
+	$enc=MCRYPT_RIJNDAEL_128;
+	$val=_recaptcha_aes_pad($val);
+	return mcrypt_encrypt($enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
+}
+
+
+function _recaptcha_mailhide_urlbase64 ($x) {
+	return strtr(base64_encode ($x), '+/', '-_');
+}
+
+/* gets the reCAPTCHA Mailhide url for a given email, public key and private key */
+function recaptcha_mailhide_url($pubkey, $privkey, $email) {
+	if ($pubkey == '' || $pubkey == null || $privkey == "" || $privkey == null) {
+		die ("To use reCAPTCHA Mailhide, you have to sign up for a public and private key, " .
+		     "you can do so at <a href='http://mailhide.recaptcha.net/apikey'>http://mailhide.recaptcha.net/apikey</a>");
+	}
+	
+
+	$ky = pack('H*', $privkey);
+	$cryptmail = _recaptcha_aes_encrypt ($email, $ky);
+	
+	return "http://mailhide.recaptcha.net/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ($cryptmail);
+}
+
+/**
+ * gets the parts of the email to expose to the user.
+ * eg, given johndoe@... return ["john", "example.com"].
+ * the email is then displayed as john...@...
+ */
+function _recaptcha_mailhide_email_parts ($email) {
+	$arr = preg_split("/@/", $email );
+
+	if (strlen ($arr[0]) <= 4) {
+		$arr[0] = substr ($arr[0], 0, 1);
+	} else if (strlen ($arr[0]) <= 6) {
+		$arr[0] = substr ($arr[0], 0, 3);
+	} else {
+		$arr[0] = substr ($arr[0], 0, 4);
+	}
+	return $arr;
+}
+
+/**
+ * Gets html to display an email address given a public an private key.
+ * to get a key, go to:
+ *
+ * http://mailhide.recaptcha.net/apikey
+ */
+function recaptcha_mailhide_html($pubkey, $privkey, $email) {
+	$emailparts = _recaptcha_mailhide_email_parts ($email);
+	$url = recaptcha_mailhide_url ($pubkey, $privkey, $email);
+	
+	return htmlentities($emailparts[0]) . "<a href='" . htmlentities ($url) .
+		"' onclick=\"window.open('" . htmlentities ($url) . "', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;\" title=\"Reveal this e-mail address\">...</a>@" . htmlentities ($emailparts [1]);
+
+}
+
+
+?>


Property changes on: site-src/trunk/site/recaptchalib.php
___________________________________________________________________
Added: svn:mergeinfo
   + 

Copied: site-src/trunk/site/register.php (from rev 5095, site-src/trunk/sso/register.php)
===================================================================
--- site-src/trunk/site/register.php	                        (rev 0)
+++ site-src/trunk/site/register.php	2009-02-18 21:56:58 UTC (rev 5105)
@@ -0,0 +1,200 @@
+<?php
+require_once('AuthDB.php');
+require_once('UserDB.php');
+require_once('config.php');
+require_once('ssolib.php');
+require_once('recaptchalib.php');
+require_once('EmailAddressValidator.php');
+
+$title = 'Create Account';
+
+# check whether this was a registration attempt
+if (empty($_POST)) {
+  print_top($title);
+  print_form();
+  print_bottom();
+  exit;
+}
+
+# sanitize the input
+$username = addslashes($_POST['username']);
+$password = addslashes($_POST['password']);
+$retype_password = addslashes($_POST['retype_password']);
+$email = addslashes($_POST['email']);
+$retype_email = addslashes($_POST['retype_email']);
+$realname = addslashes($_POST['realname']);
+
+try {
+  # check for blank username
+  if (empty($username)) {
+    throw new ErrorException('Invalid username.');
+  }
+
+  # check for blank password
+  if (empty($password)) {
+    throw new ErrorException('Blank password.');
+  }
+
+  # check for password mismatch
+  if ($password != $retype_password) {
+    throw new ErrorException('Password mismatch.');
+  }
+
+  # check password strength
+  if (strlen($password) < 6) {
+    throw new ErrorException('Password must be at least 6 characters long.');
+  }
+
+  # check for blank email
+  if (empty($email)) {
+    throw new ErrorException('Blank email.');
+  }
+
+  # check for email mismatch
+  if ($email != $retype_email) {
+    throw new ErrorException('Email mismatch.');
+  }
+
+  # check for bad email address
+  $validator = new EmailAddressValidator;
+  if (!$validator->check_email_address($email)) {
+    throw new ErrorException('Bad email address.');
+  }
+
+  # check for blank realname
+  if (empty($realname)) {
+    throw new ErrorException('Blank realname.');
+  }
+
+  # check the CAPTCHA
+  $resp = recaptcha_check_answer(
+    RECAPTCHA_PRIVATE_KEY,
+    $_SERVER['REMOTE_ADDR'],
+    $_POST['recaptcha_challenge_field'],
+    $_POST['recaptcha_response_field']
+  );
+
+  if (!$resp->is_valid) {
+    throw new ErrorException(
+      "The reCAPTCHA wasn't entered correctly. Go back and try it again. " .
+      '(reCAPTCHA said: ' . $resp->error . ')');
+  }
+
+  # check that the username is not already taken
+  $user = new UserDB();
+  
+  if ($user->exists($username)) {
+    throw new ErrorException('The account "' . $username . '" already exists.');
+  }
+
+  # build confirmation key
+  $key = rand_base64_key();
+
+  # store confirmation information in the database
+  $auth = new AuthDB();
+
+  $query = sprintf(
+    "INSERT INTO pending
+      (id, username, password, email, realname)
+      VALUES('%s', '%s', '%s', '%s', '%s')",
+    mysql_real_escape_string($key),
+    mysql_real_escape_string($username),
+    mysql_real_escape_string($password),
+    mysql_real_escape_string($email),
+    mysql_real_escape_string($realname)
+  );
+
+  $auth->write($query);
+
+  # send confirmation email
+  $subject = 'vassalengine.org email address confirmation';
+  $message = <<<END
+Someone claiming to be "$realname", probably you, from IP address {$_SERVER['REMOTE_ADDR']}, has attempted to register the account "$username" with this email address at vassalengine.org.
+
+To active this account, simply reply to this message, or open this link in your browser:
+
+http://www.test.nomic.net/confirm.php?key=$key
+
+If you do not wish to activate this account, please disregard this message. If you think your email address is being maliciously associated with this account, or you have any other questions, please send them to webmaster@....
+
+END;
+
+  $message = wordwrap($message, 70);
+  $headers =
+    "From: webmaster@..." .
+    "Reply-To: confirm+$key@...";
+
+  if (!mail($email, $subject, $message, $headers)) {
+    throw new ErrorException('Failed to send confirmation email.');
+  }
+
+  # success!
+  print_top($title);
+  print '<p>A confirmation email has been sent.
+         Reply to it to activate your account.</p>'; 
+  print_bottom();
+  exit;
+}
+catch (ErrorException $e) {
+  print_top($title);
+  warn($e->getMessage());
+  print_form();
+  print_bottom();
+  exit;
+}
+
+function print_form() {
+  print <<<END
+<script>var RecaptchaOptions = { theme : 'white' };</script>
+<form class="registration_form" action="register.php" method="post">
+  <fieldset>
+    <legend>Create an Account</legend>
+    <p>Already have an account? <a href="login.php">Log in</a>.</p>
+    <table>
+      <tr>
+        <th><label for="username">Username:</label></th>
+        <td><input type="text" id="username" name="username" size="20"/></td>
+      </tr>
+      <tr>
+        <th><label for="password">Password:</label></th>
+        <td><input type="password" id="password" name="password" size="20"/></td
+>
+      </tr>
+      <tr>
+        <th><label for="retype_password">Retype password:</label></th>
+        <td><input type="password" id="retype_password" name="retype_password" size="20"/></td
+>
+      </tr>
+      <tr>
+        <th><label for="email">Email address:</label></th>
+        <td><input type="text" id="email" name="email" size="20"/></td
+>
+      </tr>
+      <tr>
+        <th><label for="retype_email">Retype email address:</label></th>
+        <td><input type="text" id="retype_email" name="retype_email" size="20"/></td>
+      </tr>
+      <tr>
+        <th><label for="realname">Real name:</label></th>
+        <td><input type="text" id="realname" name="realname" size="20"/></td>
+      </tr>
+      <tr>
+        <td colspan="2">
+END;
+
+  echo recaptcha_get_html(RECAPTCHA_PUBLIC_KEY);
+
+print <<<END
+        </td>
+      </tr>
+      <tr>
+        <td></td>
+        <td><input type="submit" name="create" id="create" value="Create account" /></td>
+      </tr>
+    </table>
+  </fieldset>
+</form>
+END;
+}
+
+?>


Property changes on: site-src/trunk/site/register.php
___________________________________________________________________
Added: svn:mergeinfo
   + 

Copied: site-src/trunk/site/resetpw.php (from rev 5095, site-src/trunk/sso/resetpw.php)
===================================================================
--- site-src/trunk/site/resetpw.php	                        (rev 0)
+++ site-src/trunk/site/resetpw.php	2009-02-18 21:56:58 UTC (rev 5105)
@@ -0,0 +1,134 @@
+<?php
+require_once('AuthDB.php');
+require_once('UserDB.php');
+require_once('ssolib.php');
+
+$title = 'Reset Password';
+
+# check whether this is an inital attempt to reset
+if ($_SERVER['REQUEST_METHOD'] == 'GET') {
+  # sanitize the input
+  $key = addslashes($_GET['key']);
+
+  if (empty($key)) {
+    print_top($title);
+    warn('No key.');
+    print_bottom();
+    exit;
+  }
+
+  print_top($title);
+  print_form($key);
+  print_bottom();
+  exit;
+}
+
+# check whether this is input from the reset form
+if (empty($_POST)) {
+  print_top($title);
+  warn('No key.');
+  print_bottom();
+  exit;
+}
+
+# sanitize the input
+$key = addslashes($_POST['key']);
+$password = addslashes($_POST['password']);
+$retype_password = addslashes($_POST['retype_password']);
+
+# check for blank key
+if (empty($key)) {
+  print_top($title);
+  warn('No key.');
+  print_bottom();
+  exit;
+}
+
+try {
+  # check for blank password
+  if (empty($password)) {
+    throw new ErrorException('Blank password.');
+  }
+
+  # check for password mismatch
+  if ($password != $retype_password) {
+    throw new ErrorException('Password mismatch.');
+  }
+
+  # check password strength
+  if (strlen($password) < 6) {
+    throw new ErrorException('Password must be at least 6 characters long.');
+  }
+
+  # get data for key from the registration database
+  $auth = new AuthDB();
+
+  $query = sprintf(
+    "SELECT username FROM resetpw WHERE id='%s'",
+    mysql_real_escape_string($key)
+  );
+
+  $row = $auth->read($query);
+  if (!$row) {
+    throw new ErrorException('No rows.');
+  }
+
+  extract($row);
+
+  # set new password in LDAP
+  $user = new UserDB();
+  $user->modify($username, array('userPassword' => $password));
+
+  # remove row from the registration database
+  $query = sprintf(
+    "DELETE FROM pending WHERE id='%s'",
+    mysql_real_escape_string($key)
+  );
+
+  $auth->write($query);
+
+  # success!
+  print_top($title);
+  print '<p>Your password has been reset.</p>';
+  print_bottom();
+  exit;
+}
+catch (ErrorException $e) {
+  print_top($title);
+  warn($e->getMessage());
+  print_form($key);
+  print_bottom();
+  exit;
+}
+
+
+# FIXME: should redirect to front page after some seconds:
+# <meta http-equiv="refresh" content="5;URL=index.html"/>
+
+
+function print_form($key) {
+  print <<<END
+<form class="resetpw_form" action="resetpw.php" method="post">
+  <fieldset>
+    <legend>Reset Password</legend>
+    <input type="hidden" id="key" name="key" value="$key"/>
+    <table>
+      <tr>
+        <th><label for="password">Password:</label></th>
+        <td><input type="password" id="password" name="password" size="20"/></td>
+      </tr>
+      <tr>
+        <th><label for="retype_password">Retype password:</label></th>
+        <td><input type="password" id="retype_password" name="retype_password" size="20"/></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td><input type="submit" name="resetpw" id="resetpw" value="Reset password"/></td>
+      </tr>
+    </table>
+  </fieldset>
+</form>
+END;
+}
+
+?>


Property changes on: site-src/trunk/site/resetpw.php
___________________________________________________________________
Added: svn:mergeinfo
   + 

Copied: site-src/trunk/site/sendpw.php (from rev 5095, site-src/trunk/sso/sendpw.php)
===================================================================
--- site-src/trunk/site/sendpw.php	                        (rev 0)
+++ site-src/trunk/site/sendpw.php	2009-02-18 21:56:58 UTC (rev 5105)
@@ -0,0 +1,118 @@
+<?php
+require_once('AuthDB.php');
+require_once('UserDB.php');
+require_once('ssolib.php');
+
+$title = 'Reset Password';
+
+# check whether this was a request attempt
+if (empty($_POST)) {
+  print_top($title);
+  print_form();
+  print_bottom();
+  exit;
+}
+
+# sanitize the input
+$username = addslashes($_POST['username']);
+$email = addslashes($_POST['email']);
+
+try {
+  # check for blank username and email
+  if (empty($username) && empty($email)) {
+    throw new ErrorException('You must enter a username or email address.');
+  }
+
+  # find the user account in LDAP
+  $user = new UserDB();
+
+  # search by username if it was given, otherwise by email
+  $entries = $auth->search(empty($username) ? "mail=$email" : "uid=$username");
+  $count = $entries['count'];
+  if ($count < 1) {
+    throw new ErrorException(
+      !empty($username) ?
+        'The account "' . $username . '" does not exist.' :
+        'There is no account for the address "' . $email . '".'
+    );
+  }
+
+  # store password change keys in the database
+  $auth = new AuthDB();
+
+  for ($i = 0; $i < $count; ++$i) {
+    $e = $entries[$i]; 
+
+    $key = rand_base64_key();
+
+    $query = sprintf(
+      "INSERT INTO resetpw (id, username) VALUES('%s', '%s')",
+      mysql_real_escape_string($key),
+      mysql_real_escape_string($e['uid'][0])
+    );
+
+    $auth->write($query);
+
+    # send confirmation email
+    $subject = 'vassalengine.org password reset';
+    $message = <<<END
+Someone. probably you, from IP address {$_SERVER['REMOTE_ADDR']}, has requested that a new password be set for your account at vassalengine.org.
+
+To reset the password for your account, simply open this link in your browser:
+
+http://www.test.nomic.net/resetpw.php?key=$key
+
+If you do not wish to reset your password, please disregard this message. If you receive multiple such notifications which you did not request, or you have any other questions, please conact webmaster@....
+
+END;
+
+    $message = wordwrap($message, 70);
+    $headers = 'From: webmaster@...';
+
+    if (!mail($e['mail'][0], $subject, $message, $headers)) {
+      throw new ErrorException('Failed to send confirmation email.');
+    }
+  }
+
+  # success!
+  print_top($title);
+  print '<p>A password reset email has been sent, which contains a link you can follow to reset your password.</p>';
+  print_bottom();
+  exit;
+}
+catch (ErrorException $e) {
+  print_top($title);
+  warn($e->getMessage());
+  print_form();
+  print_bottom();
+  exit;
+}
+
+function print_form() {
+  print <<<END
+<form class="sendpwform" action="sendpw.php" method="post">
+  <fieldset>
+    <legend>Send password</legend>
+    <table>
+      <tr>
+        <th><label for="username">Username:</label></th>
+        <td><input type="text" id="username" name="username" size="20"/></td>
+      </tr>
+      <tr>
+        <th colspan="2">OR</th>
+      </tr>
+      <tr>
+        <th><label for="email">Email address:</label></th>
+        <td><input type="text" id="email" name="email" size="20"/></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td><input type="submit" name="sendpw" id="sendpw" value="Send password" /></td>
+      </tr>
+    </table>
+  </fieldset>
+</form>
+END;
+}
+
+?>


Property changes on: site-src/trunk/site/sendpw.php
___________________________________________________________________
Added: svn:mergeinfo
   + 

Copied: site-src/trunk/site/ssoauth.php (from rev 5094, site-src/trunk/sso/ssoauth.php)
===================================================================
--- site-src/trunk/site/ssoauth.php	                        (rev 0)
+++ site-src/trunk/site/ssoauth.php	2009-02-18 21:56:58 UTC (rev 5105)
@@ -0,0 +1,100 @@
+<?php
+
+# Not a valid entry point, skip unless MEDIAWIKI is defined
+if(!defined( 'MEDIAWIKI' )) {
+  echo "Auth_SSO extension";
+  die();
+}
+
+# Extension credits that will show up on Special:Version
+$wgExtensionCredits['other'][] = array(
+  'name' => 'VASSAL SSO Authentication -> Auth_SSO',
+  'version' => '1.0',
+  'author' => 'Joel Uckelman',
+  'url' => '',
+  'description' => ''
+);
+
+require_once('./extensions/ssolib.php');
+
+if (!class_exists('AuthPlugin')) require_once('./includes/AuthPlugin.php');
+
+class Auth_SSO extends AuthPlugin {
+
+  public function userExists($username) {
+#    return sso_user_exists($username);
+    return true;
+  }
+
+  public function authenticate($username, $password) {
+    return sso_authenticate($username, $password);
+  }
+
+#  public function modifyUITemplate(&$template) {
+#  }
+
+#  public function setDomain($domain) {
+#    $this->domain = $domain;
+#  }
+ 
+#  public function validDomain($domain) {
+#    return true; 
+#  }
+
+  public function updateUser(&$user) {
+    $attr = sso_get_attr($user->getName());            
+    $user->setEmail($attr['mail'][0]);
+    $user->setRealName($attr['cn'][0]);
+    $user->setOption('language', $attr['preferredLanguage'][0]);
+
+    return true;
+  }
+
+  public function autoCreate() {
+    return true;
+  }
+
+  public function allowPasswordChange() {
+    return true;
+  }
+    
+  public function setPassword($user, $password) {
+    return sso_set_password($user->getName(), $password);
+  }
+
+  public function updateExternalDB($user) {
+  }
+
+  public function canCreateAccounts() {
+    return false;
+  }
+
+  public function addUser($user, $password, $email='', $realname='') {
+    return false;
+  }
+
+  public function strict() {
+    return true;
+  }
+
+  public function strictUserAuth($username) {
+    return true;
+  }
+
+  public function initUser(&$user, $autocreate=false) {
+    $this->updateUser($user);
+    $user->setToken();
+    $user->saveSettings();
+    return true;
+  }
+
+#  public function getCanonicalName($username) {
+#    return $username;
+#  }
+
+#  public function getUserInstance(User &$user) {
+#  }
+}
+
+
+?>


Property changes on: site-src/trunk/site/ssoauth.php
___________________________________________________________________
Added: svn:mergeinfo
   + 

Copied: site-src/trunk/site/ssolib.php (from rev 5095, site-src/trunk/sso/ssolib.php)
===================================================================
--- site-src/trunk/site/ssolib.php	                        (rev 0)
+++ site-src/trunk/site/ssolib.php	2009-02-18 21:56:58 UTC (rev 5105)
@@ -0,0 +1,34 @@
+<?php
+
+function rand_base64_key() {
+  $key = base64_encode(pack('L6', mt_rand(), mt_rand(), mt_rand(),
+                                  mt_rand(), mt_rand(), mt_rand()));
+  return strtr($key, '+/=', '-_');
+}
+
+function warn($err) {
+  print '<div class="errorbox"><h2>Error:</h2>' . $err . '</div>';
+}
+
+function print_top($title) {
+  print <<<END
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head profile="http://www.w3.org/2005/10/profile">
+  <link rel="stylesheet" type="text/css" href="style.css"/>
+  <link rel="icon" type="image/png" href="VASSAL.png"/>
+  <title>$title</title>
+</head>
+<body>
+END;
+}
+
+function print_bottom() {
+  print <<<END
+</body>
+</html>
+END;
+}
+
+?>


Property changes on: site-src/trunk/site/ssolib.php
___________________________________________________________________
Added: svn:mergeinfo
   + 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 5106
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5106&view=rev
Author:   uckelman
Date:     2009-02-18 22:14:24 +0000 (Wed, 18 Feb 2009)

Log Message:
-----------
Rearranged directory structure.
Don't permit clients to read from sso/.

Modified Paths:
--------------
    site-src/trunk/site/confirm.php
    site-src/trunk/site/confirm_email.php
    site-src/trunk/site/login.php
    site-src/trunk/site/modify.php
    site-src/trunk/site/register.php
    site-src/trunk/site/resetpw.php
    site-src/trunk/site/sendpw.php

Added Paths:
-----------
    site-src/trunk/site/sso/
    site-src/trunk/site/sso/.htaccess
    site-src/trunk/site/sso/AuthDB.php
    site-src/trunk/site/sso/EmailAddressValidator.php
    site-src/trunk/site/sso/UserDB.php
    site-src/trunk/site/sso/recaptchalib.php
    site-src/trunk/site/sso/ssolib.php

Removed Paths:
-------------
    site-src/trunk/site/AuthDB.php
    site-src/trunk/site/EmailAddressValidator.php
    site-src/trunk/site/UserDB.php
    site-src/trunk/site/recaptchalib.php
    site-src/trunk/site/ssolib.php

Deleted: site-src/trunk/site/AuthDB.php
===================================================================
--- site-src/trunk/site/AuthDB.php	2009-02-18 21:56:58 UTC (rev 5105)
+++ site-src/trunk/site/AuthDB.php	2009-02-18 22:14:24 UTC (rev 5106)
@@ -1,44 +0,0 @@
-<?php
-
-require_once('config.php');
-
-class AuthDB {
-  private $dbh;
-
-  public function __construct() {
-    $this->dbh = mysql_connect(SQL_HOST, SQL_USERNAME, SQL_PASSWORD);
-    if (!$this->dbh) {
-      throw new ErrorException(
-        'Cannot connect to MySQL server: ' . mysql_error());
-    }
-
-    if (!mysql_select_db(SQL_DB, $this->dbh)) {
-      throw new ErrorException(
-        'Cannot select database: ' . mysql_error());
-    }
-  }
-
-  public function __destruct() {
-    mysql_close($this->dbh);
-  }
-
-  public function read($query) {
-    $r = mysql_query($query, $this->dbh);
-    if (!$r) {
-      throw new ErrorException(
-        'Failed to read from database: ' . mysql_error());
-    }
-
-    return mysql_fetch_assoc($r);
-  }
-
-  public function write($query) {
-    $r = mysql_query($query, $this->dbh);
-    if (!$r) {
-      throw new ErrorException(
-        'Failed to write to database: ' . mysql_error());
-    }
-
-    return mysql_affected_rows($this->dbh);
-  }
-}

Deleted: site-src/trunk/site/EmailAddressValidator.php
===================================================================
--- site-src/trunk/site/EmailAddressValidator.php	2009-02-18 21:56:58 UTC (rev 5105)
+++ site-src/trunk/site/EmailAddressValidator.php	2009-02-18 22:14:24 UTC (rev 5106)
@@ -1,181 +0,0 @@
-<?php
-
-    /*
-
-        EmailAddressValidator Class
-        http://code.google.com/p/php-email-address-validation/
-
-        Released under New BSD license
-        http://www.opensource.org/licenses/bsd-license.php
-        
-        Sample Code
-        ----------------
-        $validator = new EmailAddressValidator;
-        if ($validator->check_email_address('test@...')) {
-            // Email address is technically valid
-        }
-
-    */
-
-    class EmailAddressValidator {
-
-        /**
-         * Check email address validity
-         * @param   strEmailAddress     Email address to be checked
-         * @return  True if email is valid, false if not
-         */
-        public function check_email_address($strEmailAddress) {
-            
-            // If magic quotes is "on", email addresses with quote marks will
-            // fail validation because of added escape characters. Uncommenting
-            // the next three lines will allow for this issue.
-            //if (get_magic_quotes_gpc()) { 
-            //    $strEmailAddress = stripslashes($strEmailAddress); 
-            //}
-
-            // Control characters are not allowed
-            if (preg_match('/[\x00-\x1F\x7F-\xFF]/', $strEmailAddress)) {
-                return false;
-            }
-
-            // Check email length - min 3 (a@...), max 256
-            if (!$this->check_text_length($strEmailAddress, 3, 256)) {
-                return false;
-            }
-
-            // Split it into sections using last instance of "@"
-            $intAtSymbol = strrpos($strEmailAddress, '@');
-            if ($intAtSymbol === false) {
-                // No "@" symbol in email.
-                return false;
-            }
-            $arrEmailAddress[0] = substr($strEmailAddress, 0, $intAtSymbol);
-            $arrEmailAddress[1] = substr($strEmailAddress, $intAtSymbol + 1);
-
-            // Count the "@" symbols. Only one is allowed, except where 
-            // contained in quote marks in the local part. Quickest way to
-            // check this is to remove anything in quotes. We also remove
-            // characters escaped with backslash, and the backslash
-            // character.
-            $arrTempAddress[0] = preg_replace('/\./'
-                                             ,''
-                                             ,$arrEmailAddress[0]);
-            $arrTempAddress[0] = preg_replace('/"[^"]+"/'
-                                             ,''
-                                             ,$arrTempAddress[0]);
-            $arrTempAddress[1] = $arrEmailAddress[1];
-            $strTempAddress = $arrTempAddress[0] . $arrTempAddress[1];
-            // Then check - should be no "@" symbols.
-            if (strrpos($strTempAddress, '@') !== false) {
-                // "@" symbol found
-                return false;
-            }
-
-            // Check local portion
-            if (!$this->check_local_portion($arrEmailAddress[0])) {
-                return false;
-            }
-
-            // Check domain portion
-            if (!$this->check_domain_portion($arrEmailAddress[1])) {
-                return false;
-            }
-
-            // If we're still here, all checks above passed. Email is valid.
-            return true;
-
-        }
-
-        /**
-         * Checks email section before "@" symbol for validity
-         * @param   strLocalPortion     Text to be checked
-         * @return  True if local portion is valid, false if not
-         */
-        protected function check_local_portion($strLocalPortion) {
-            // Local portion can only be from 1 to 64 characters, inclusive.
-            // Please note that servers are encouraged to accept longer local
-            // parts than 64 characters.
-            if (!$this->check_text_length($strLocalPortion, 1, 64)) {
-                return false;
-            }
-            // Local portion must be:
-            // 1) a dot-atom (strings separated by periods)
-            // 2) a quoted string
-            // 3) an obsolete format string (combination of the above)
-            $arrLocalPortion = explode('.', $strLocalPortion);
-            for ($i = 0, $max = sizeof($arrLocalPortion); $i < $max; $i++) {
-                 if (!preg_match('.^('
-                                .    '([A-Za-z0-9!#$%&\'*+/=?^_`{|}~-]' 
-                                .    '[A-Za-z0-9!#$%&\'*+/=?^_`{|}~-]{0,63})'
-                                .'|'
-                                .    '("[^\\\"]{0,62}")'
-                                .')$.'
-                                ,$arrLocalPortion[$i])) {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        /**
-         * Checks email section after "@" symbol for validity
-         * @param   strDomainPortion     Text to be checked
-         * @return  True if domain portion is valid, false if not
-         */
-        protected function check_domain_portion($strDomainPortion) {
-            // Total domain can only be from 1 to 255 characters, inclusive
-            if (!$this->check_text_length($strDomainPortion, 1, 255)) {
-                return false;
-            }
-            // Check if domain is IP, possibly enclosed in square brackets.
-            if (preg_match('/^(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])'
-               .'(\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])){3}$/'
-               ,$strDomainPortion) || 
-                preg_match('/^\[(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])'
-               .'(\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])){3}\]$/'
-               ,$strDomainPortion)) {
-                return true;
-            } else {
-                $arrDomainPortion = explode('.', $strDomainPortion);
-                if (sizeof($arrDomainPortion) < 2) {
-                    return false; // Not enough parts to domain
-                }
-                for ($i = 0, $max = sizeof($arrDomainPortion); $i < $max; $i++) {
-                    // Each portion must be between 1 and 63 characters, inclusive
-                    if (!$this->check_text_length($arrDomainPortion[$i], 1, 63)) {
-                        return false;
-                    }
-                    if (!preg_match('/^(([A-Za-z0-9][A-Za-z0-9-]{0,61}[A-Za-z0-9])|'
-                       .'([A-Za-z0-9]+))$/', $arrDomainPortion[$i])) {
-                        return false;
-                    }
-                    if ($i == $max - 1) { // TLD cannot be only numbers
-                        if (strlen(preg_replace('/[0-9]/', '', $arrDomainPortion[$i])) <= 0) {
-                            return false;
-                        }
-                    }
-                }
-            }
-            return true;
-        }
-
-        /**
-         * Check given text length is between defined bounds
-         * @param   strText     Text to be checked
-         * @param   intMinimum  Minimum acceptable length
-         * @param   intMaximum  Maximum acceptable length
-         * @return  True if string is within bounds (inclusive), false if not
-         */
-        protected function check_text_length($strText, $intMinimum, $intMaximum) {
-            // Minimum and maximum are both inclusive
-            $intTextLength = strlen($strText);
-            if (($intTextLength < $intMinimum) || ($intTextLength > $intMaximum)) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-
-    }
-
-?>

Deleted: site-src/trunk/site/UserDB.php
===================================================================
--- site-src/trunk/site/UserDB.php	2009-02-18 21:56:58 UTC (rev 5105)
+++ site-src/trunk/site/UserDB.php	2009-02-18 22:14:24 UTC (rev 5106)
@@ -1,87 +0,0 @@
-<?php
-
-require_once('config.php');
-
-class UserDB {
-  private $ds;  
-
-  public function __construct() {
-    $this->ds = @ldap_connect(LDAP_HOST);
-    if (!$this->ds) {
-      throw new ErrorException('Cannot connect to LDAP server.');
-    }
-  }
-
-  public function __destruct() {
-    @ldap_close($this->ds);
-  }
-
-  public function search($filter) {
-    if (!@ldap_bind($this->ds)) {
-      throw new ErrorException(
-        'Cannot bind to LDAP server: ' . ldap_error($this->ds)); 
-    }
-
-    $r = @ldap_search($this->ds, LDAP_BASE, $filter);
-    if (!$r) {
-      throw new ErrorException(
-        'LDAP search failed: ' . ldap_error($this->ds));
-    }
-
-    return @ldap_get_entries($this->ds, $r);
-  }
-
-  public function exists($username) {
-    return ${$this->search("uid=$username")}['count'] > 0;
-  }
-
-  public function auth($username, $password) {
-    $this->bind();
-
-    $r = @ldap_search($this->ds, LDAP_BASE, "uid=$username");
-    if (!$r) {
-      throw new ErrorException(
-        'LDAP search failed: ' . ldap_error($this->ds));
-    }
-
-    if (@ldap_count_entries($this->ds, $r) < 1) {
-      throw new ErrorException(
-        'The account "' . $username . '" does not exist.');
-    }
-
-    $result = @ldap_get_entries($this->ds, $r);
-
-    if (!@ldap_bind($this->ds, $result[0]['dn'], $password)) {
-      throw new ErrorException('Bad password.');
-    }
-  }
-
-  public function modify($username, $attr) {
-    $this->bind(LDAP_USERNAME, LDAP_PASSWORD);
-  
-    $dn = "uid=$username," . LDAP_BASE;
-    if (!@ldap_mod_replace($this->ds, $dn, $attr)) {
-      throw new ErrorException(
-        'Cannot reset user attributes: ' . ldap_error($this->ds));
-    }
-  }
-
-  public function create($username, $attr) {
-    $this->bind(LDAP_USERNAME, LDAP_PASSWORD);
-   
-    $dn = "uid=$username," . LDAP_BASE;
-    if (!@ldap_add($this->ds, $dn, $attr)) {
-      throw new ErrorException(
-        'Cannot write entry: ' . ldap_error($ds));
-    }
-  }
-
-  private function bind($dn = NULL, $pw = NULL) {
-    if (!@ldap_bind($this->ds, $dn, $pw)) {
-      throw new ErrorException(
-        'Cannot bind to LDAP server: ' . ldap_error($this->ds));
-    }
-  } 
-}
-
-?>

Modified: site-src/trunk/site/confirm.php
===================================================================
--- site-src/trunk/site/confirm.php	2009-02-18 21:56:58 UTC (rev 5105)
+++ site-src/trunk/site/confirm.php	2009-02-18 22:14:24 UTC (rev 5106)
@@ -1,7 +1,7 @@
 <?php
-require_once('AuthDB.php');
-require_once('UserDB.php');
-require_once('ssolib.php');
+require_once('sso/AuthDB.php');
+require_once('sso/UserDB.php');
+require_once('sso/ssolib.php');
 
 $tilte = 'Confirm account';
 

Modified: site-src/trunk/site/confirm_email.php
===================================================================
--- site-src/trunk/site/confirm_email.php	2009-02-18 21:56:58 UTC (rev 5105)
+++ site-src/trunk/site/confirm_email.php	2009-02-18 22:14:24 UTC (rev 5106)
@@ -1,8 +1,8 @@
 <?php
 
-require_once('AuthDB.php');
-require_once('UserDB.php');
-require_once('ssolib.php');
+require_once('sso/AuthDB.php');
+require_once('sso/UserDB.php');
+require_once('sso/ssolib.php');
 
 $tilte = 'Confirm email';
 

Modified: site-src/trunk/site/login.php
===================================================================
--- site-src/trunk/site/login.php	2009-02-18 21:56:58 UTC (rev 5105)
+++ site-src/trunk/site/login.php	2009-02-18 22:14:24 UTC (rev 5106)
@@ -1,7 +1,7 @@
 <?php
-require_once('AuthDB.php');
-require_once('UserDB.php');
-require_once('ssolib.php');
+require_once('sso/AuthDB.php');
+require_once('sso/UserDB.php');
+require_once('sso/ssolib.php');
 
 $title = 'VASSAL Login';
 
@@ -89,7 +89,7 @@
 
   # phpBB login 
   define('IN_PHPBB', true);
-  $phpbb_root_path = 'forum/';
+  $phpbb_root_path = '../forum/';
   $phpEx = 'php';
   include($phpbb_root_path . 'common.' . $phpEx);
 

Modified: site-src/trunk/site/modify.php
===================================================================
--- site-src/trunk/site/modify.php	2009-02-18 21:56:58 UTC (rev 5105)
+++ site-src/trunk/site/modify.php	2009-02-18 22:14:24 UTC (rev 5106)
@@ -1,9 +1,9 @@
 <?php
 
-require_once('AuthDB.php');
-require_once('UserDB.php');
-require_once('ssolib.php');
-require_once('EmailAddressValidator.php');
+require_once('sso/AuthDB.php');
+require_once('sso/UserDB.php');
+require_once('sso/ssolib.php');
+require_once('sso/EmailAddressValidator.php');
 
 $title = 'Modify Account';
 

Deleted: site-src/trunk/site/recaptchalib.php
===================================================================
--- site-src/trunk/site/recaptchalib.php	2009-02-18 21:56:58 UTC (rev 5105)
+++ site-src/trunk/site/recaptchalib.php	2009-02-18 22:14:24 UTC (rev 5106)
@@ -1,277 +0,0 @@
-<?php
-/*
- * This is a PHP library that handles calling reCAPTCHA.
- *    - Documentation and latest version
- *          http://recaptcha.net/plugins/php/
- *    - Get a reCAPTCHA API Key
- *          http://recaptcha.net/api/getkey
- *    - Discussion group
- *          http://groups.google.com/group/recaptcha
- *
- * Copyright (c) 2007 reCAPTCHA -- http://recaptcha.net
- * AUTHORS:
- *   Mike Crawford
- *   Ben Maurer
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-/**
- * The reCAPTCHA server URL's
- */
-define("RECAPTCHA_API_SERVER", "http://api.recaptcha.net");
-define("RECAPTCHA_API_SECURE_SERVER", "https://api-secure.recaptcha.net");
-define("RECAPTCHA_VERIFY_SERVER", "api-verify.recaptcha.net");
-
-/**
- * Encodes the given data into a query string format
- * @param $data - array of string elements to be encoded
- * @return string - encoded request
- */
-function _recaptcha_qsencode ($data) {
-        $req = "";
-        foreach ( $data as $key => $value )
-                $req .= $key . '=' . urlencode( stripslashes($value) ) . '&';
-
-        // Cut the last '&'
-        $req=substr($req,0,strlen($req)-1);
-        return $req;
-}
-
-
-
-/**
- * Submits an HTTP POST to a reCAPTCHA server
- * @param string $host
- * @param string $path
- * @param array $data
- * @param int port
- * @return array response
- */
-function _recaptcha_http_post($host, $path, $data, $port = 80) {
-
-        $req = _recaptcha_qsencode ($data);
-
-        $http_request  = "POST $path HTTP/1.0\r\n";
-        $http_request .= "Host: $host\r\n";
-        $http_request .= "Content-Type: application/x-www-form-urlencoded;\r\n";
-        $http_request .= "Content-Length: " . strlen($req) . "\r\n";
-        $http_request .= "User-Agent: reCAPTCHA/PHP\r\n";
-        $http_request .= "\r\n";
-        $http_request .= $req;
-
-        $response = '';
-        if( false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) ) ) {
-                die ('Could not open socket');
-        }
-
-        fwrite($fs, $http_request);
-
-        while ( !feof($fs) )
-                $response .= fgets($fs, 1160); // One TCP-IP packet
-        fclose($fs);
-        $response = explode("\r\n\r\n", $response, 2);
-
-        return $response;
-}
-
-
-
-/**
- * Gets the challenge HTML (javascript and non-javascript version).
- * This is called from the browser, and the resulting reCAPTCHA HTML widget
- * is embedded within the HTML form it was called from.
- * @param string $pubkey A public key for reCAPTCHA
- * @param string $error The error given by reCAPTCHA (optional, default is null)
- * @param boolean $use_ssl Should the request be made over ssl? (optional, default is false)
-
- * @return string - The HTML to be embedded in the user's form.
- */
-function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false)
-{
-	if ($pubkey == null || $pubkey == '') {
-		die ("To use reCAPTCHA you must get an API key from <a href='http://recaptcha.net/api/getkey'>http://recaptcha.net/api/getkey</a>");
-	}
-	
-	if ($use_ssl) {
-                $server = RECAPTCHA_API_SECURE_SERVER;
-        } else {
-                $server = RECAPTCHA_API_SERVER;
-        }
-
-        $errorpart = "";
-        if ($error) {
-           $errorpart = "&amp;error=" . $error;
-        }
-        return '<script type="text/javascript" src="'. $server . '/challenge?k=' . $pubkey . $errorpart . '"></script>
-
-	<noscript>
-  		<iframe src="'. $server . '/noscript?k=' . $pubkey . $errorpart . '" height="300" width="500" frameborder="0"></iframe><br/>
-  		<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
-  		<input type="hidden" name="recaptcha_response_field" value="manual_challenge"/>
-	</noscript>';
-}
-
-
-
-
-/**
- * A ReCaptchaResponse is returned from recaptcha_check_answer()
- */
-class ReCaptchaResponse {
-        var $is_valid;
-        var $error;
-}
-
-
-/**
-  * Calls an HTTP POST function to verify if the user's guess was correct
-  * @param string $privkey
-  * @param string $remoteip
-  * @param string $challenge
-  * @param string $response
-  * @param array $extra_params an array of extra variables to post to the server
-  * @return ReCaptchaResponse
-  */
-function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $extra_params = array())
-{
-	if ($privkey == null || $privkey == '') {
-		die ("To use reCAPTCHA you must get an API key from <a href='http://recaptcha.net/api/getkey'>http://recaptcha.net/api/getkey</a>");
-	}
-
-	if ($remoteip == null || $remoteip == '') {
-		die ("For security reasons, you must pass the remote ip to reCAPTCHA");
-	}
-
-	
-	
-        //discard spam submissions
-        if ($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0) {
-                $recaptcha_response = new ReCaptchaResponse();
-                $recaptcha_response->is_valid = false;
-                $recaptcha_response->error = 'incorrect-captcha-sol';
-                return $recaptcha_response;
-        }
-
-        $response = _recaptcha_http_post (RECAPTCHA_VERIFY_SERVER, "/verify",
-                                          array (
-                                                 'privatekey' => $privkey,
-                                                 'remoteip' => $remoteip,
-                                                 'challenge' => $challenge,
-                                                 'response' => $response
-                                                 ) + $extra_params
-                                          );
-
-        $answers = explode ("\n", $response [1]);
-        $recaptcha_response = new ReCaptchaResponse();
-
-        if (trim ($answers [0]) == 'true') {
-                $recaptcha_response->is_valid = true;
-        }
-        else {
-                $recaptcha_response->is_valid = false;
-                $recaptcha_response->error = $answers [1];
-        }
-        return $recaptcha_response;
-
-}
-
-/**
- * gets a URL where the user can sign up for reCAPTCHA. If your application
- * has a configuration page where you enter a key, you should provide a link
- * using this function.
- * @param string $domain The domain where the page is hosted
- * @param string $appname The name of your application
- */
-function recaptcha_get_signup_url ($domain = null, $appname = null) {
-	return "http://recaptcha.net/api/getkey?" .  _recaptcha_qsencode (array ('domain' => $domain, 'app' => $appname));
-}
-
-function _recaptcha_aes_pad($val) {
-	$block_size = 16;
-	$numpad = $block_size - (strlen ($val) % $block_size);
-	return str_pad($val, strlen ($val) + $numpad, chr($numpad));
-}
-
-/* Mailhide related code */
-
-function _recaptcha_aes_encrypt($val,$ky) {
-	if (! function_exists ("mcrypt_encrypt")) {
-		die ("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed.");
-	}
-	$mode=MCRYPT_MODE_CBC;   
-	$enc=MCRYPT_RIJNDAEL_128;
-	$val=_recaptcha_aes_pad($val);
-	return mcrypt_encrypt($enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
-}
-
-
-function _recaptcha_mailhide_urlbase64 ($x) {
-	return strtr(base64_encode ($x), '+/', '-_');
-}
-
-/* gets the reCAPTCHA Mailhide url for a given email, public key and private key */
-function recaptcha_mailhide_url($pubkey, $privkey, $email) {
-	if ($pubkey == '' || $pubkey == null || $privkey == "" || $privkey == null) {
-		die ("To use reCAPTCHA Mailhide, you have to sign up for a public and private key, " .
-		     "you can do so at <a href='http://mailhide.recaptcha.net/apikey'>http://mailhide.recaptcha.net/apikey</a>");
-	}
-	
-
-	$ky = pack('H*', $privkey);
-	$cryptmail = _recaptcha_aes_encrypt ($email, $ky);
-	
-	return "http://mailhide.recaptcha.net/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ($cryptmail);
-}
-
-/**
- * gets the parts of the email to expose to the user.
- * eg, given johndoe@... return ["john", "example.com"].
- * the email is then displayed as john...@...
- */
-function _recaptcha_mailhide_email_parts ($email) {
-	$arr = preg_split("/@/", $email );
-
-	if (strlen ($arr[0]) <= 4) {
-		$arr[0] = substr ($arr[0], 0, 1);
-	} else if (strlen ($arr[0]) <= 6) {
-		$arr[0] = substr ($arr[0], 0, 3);
-	} else {
-		$arr[0] = substr ($arr[0], 0, 4);
-	}
-	return $arr;
-}
-
-/**
- * Gets html to display an email address given a public an private key.
- * to get a key, go to:
- *
- * http://mailhide.recaptcha.net/apikey
- */
-function recaptcha_mailhide_html($pubkey, $privkey, $email) {
-	$emailparts = _recaptcha_mailhide_email_parts ($email);
-	$url = recaptcha_mailhide_url ($pubkey, $privkey, $email);
-	
-	return htmlentities($emailparts[0]) . "<a href='" . htmlentities ($url) .
-		"' onclick=\"window.open('" . htmlentities ($url) . "', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;\" title=\"Reveal this e-mail address\">...</a>@" . htmlentities ($emailparts [1]);
-
-}
-
-
-?>

Modified: site-src/trunk/site/register.php
===================================================================
--- site-src/trunk/site/register.php	2009-02-18 21:56:58 UTC (rev 5105)
+++ site-src/trunk/site/register.php	2009-02-18 22:14:24 UTC (rev 5106)
@@ -1,10 +1,10 @@
 <?php
-require_once('AuthDB.php');
-require_once('UserDB.php');
-require_once('config.php');
-require_once('ssolib.php');
-require_once('recaptchalib.php');
-require_once('EmailAddressValidator.php');
+require_once('sso/AuthDB.php');
+require_once('sso/UserDB.php');
+require_once('sso/config.php');
+require_once('sso/ssolib.php');
+require_once('sso/recaptchalib.php');
+require_once('sso/EmailAddressValidator.php');
 
 $title = 'Create Account';
 

Modified: site-src/trunk/site/resetpw.php
===================================================================
--- site-src/trunk/site/resetpw.php	2009-02-18 21:56:58 UTC (rev 5105)
+++ site-src/trunk/site/resetpw.php	2009-02-18 22:14:24 UTC (rev 5106)
@@ -1,7 +1,7 @@
 <?php
-require_once('AuthDB.php');
-require_once('UserDB.php');
-require_once('ssolib.php');
+require_once('sso/AuthDB.php');
+require_once('sso/UserDB.php');
+require_once('sso/ssolib.php');
 
 $title = 'Reset Password';
 

Modified: site-src/trunk/site/sendpw.php
===================================================================
--- site-src/trunk/site/sendpw.php	2009-02-18 21:56:58 UTC (rev 5105)
+++ site-src/trunk/site/sendpw.php	2009-02-18 22:14:24 UTC (rev 5106)
@@ -1,7 +1,7 @@
 <?php
-require_once('AuthDB.php');
-require_once('UserDB.php');
-require_once('ssolib.php');
+require_once('sso/AuthDB.php');
+require_once('sso/UserDB.php');
+require_once('sso/ssolib.php');
 
 $title = 'Reset Password';
 

Added: site-src/trunk/site/sso/.htaccess
===================================================================
--- site-src/trunk/site/sso/.htaccess	                        (rev 0)
+++ site-src/trunk/site/sso/.htaccess	2009-02-18 22:14:24 UTC (rev 5106)
@@ -0,0 +1,4 @@
+<Files *>
+  Order Allow,Deny
+  Deny from All
+</Files>

Copied: site-src/trunk/site/sso/AuthDB.php (from rev 5105, site-src/trunk/site/AuthDB.php)
===================================================================
--- site-src/trunk/site/sso/AuthDB.php	                        (rev 0)
+++ site-src/trunk/site/sso/AuthDB.php	2009-02-18 22:14:24 UTC (rev 5106)
@@ -0,0 +1,44 @@
+<?php
+
+require_once('config.php');
+
+class AuthDB {
+  private $dbh;
+
+  public function __construct() {
+    $this->dbh = mysql_connect(SQL_HOST, SQL_USERNAME, SQL_PASSWORD);
+    if (!$this->dbh) {
+      throw new ErrorException(
+        'Cannot connect to MySQL server: ' . mysql_error());
+    }
+
+    if (!mysql_select_db(SQL_DB, $this->dbh)) {
+      throw new ErrorException(
+        'Cannot select database: ' . mysql_error());
+    }
+  }
+
+  public function __destruct() {
+    mysql_close($this->dbh);
+  }
+
+  public function read($query) {
+    $r = mysql_query($query, $this->dbh);
+    if (!$r) {
+      throw new ErrorException(
+        'Failed to read from database: ' . mysql_error());
+    }
+
+    return mysql_fetch_assoc($r);
+  }
+
+  public function write($query) {
+    $r = mysql_query($query, $this->dbh);
+    if (!$r) {
+      throw new ErrorException(
+        'Failed to write to database: ' . mysql_error());
+    }
+
+    return mysql_affected_rows($this->dbh);
+  }
+}

Copied: site-src/trunk/site/sso/EmailAddressValidator.php (from rev 5105, site-src/trunk/site/EmailAddressValidator.php)
===================================================================
--- site-src/trunk/site/sso/EmailAddressValidator.php	                        (rev 0)
+++ site-src/trunk/site/sso/EmailAddressValidator.php	2009-02-18 22:14:24 UTC (rev 5106)
@@ -0,0 +1,181 @@
+<?php
+
+    /*
+
+        EmailAddressValidator Class
+        http://code.google.com/p/php-email-address-validation/
+
+        Released under New BSD license
+        http://www.opensource.org/licenses/bsd-license.php
+        
+        Sample Code
+        ----------------
+        $validator = new EmailAddressValidator;
+        if ($validator->check_email_address('test@...')) {
+            // Email address is technically valid
+        }
+
+    */
+
+    class EmailAddressValidator {
+
+        /**
+         * Check email address validity
+         * @param   strEmailAddress     Email address to be checked
+         * @return  True if email is valid, false if not
+         */
+        public function check_email_address($strEmailAddress) {
+            
+            // If magic quotes is "on", email addresses with quote marks will
+            // fail validation because of added escape characters. Uncommenting
+            // the next three lines will allow for this issue.
+            //if (get_magic_quotes_gpc()) { 
+            //    $strEmailAddress = stripslashes($strEmailAddress); 
+            //}
+
+            // Control characters are not allowed
+            if (preg_match('/[\x00-\x1F\x7F-\xFF]/', $strEmailAddress)) {
+                return false;
+            }
+
+            // Check email length - min 3 (a@...), max 256
+            if (!$this->check_text_length($strEmailAddress, 3, 256)) {
+                return false;
+            }
+
+            // Split it into sections using last instance of "@"
+            $intAtSymbol = strrpos($strEmailAddress, '@');
+            if ($intAtSymbol === false) {
+                // No "@" symbol in email.
+                return false;
+            }
+            $arrEmailAddress[0] = substr($strEmailAddress, 0, $intAtSymbol);
+            $arrEmailAddress[1] = substr($strEmailAddress, $intAtSymbol + 1);
+
+            // Count the "@" symbols. Only one is allowed, except where 
+            // contained in quote marks in the local part. Quickest way to
+            // check this is to remove anything in quotes. We also remove
+            // characters escaped with backslash, and the backslash
+            // character.
+            $arrTempAddress[0] = preg_replace('/\./'
+                                             ,''
+                                             ,$arrEmailAddress[0]);
+            $arrTempAddress[0] = preg_replace('/"[^"]+"/'
+                                             ,''
+                                             ,$arrTempAddress[0]);
+            $arrTempAddress[1] = $arrEmailAddress[1];
+            $strTempAddress = $arrTempAddress[0] . $arrTempAddress[1];
+            // Then check - should be no "@" symbols.
+            if (strrpos($strTempAddress, '@') !== false) {
+                // "@" symbol found
+                return false;
+            }
+
+            // Check local portion
+            if (!$this->check_local_portion($arrEmailAddress[0])) {
+                return false;
+            }
+
+            // Check domain portion
+            if (!$this->check_domain_portion($arrEmailAddress[1])) {
+                return false;
+            }
+
+            // If we're still here, all checks above passed. Email is valid.
+            return true;
+
+        }
+
+        /**
+         * Checks email section before "@" symbol for validity
+         * @param   strLocalPortion     Text to be checked
+         * @return  True if local portion is valid, false if not
+         */
+        protected function check_local_portion($strLocalPortion) {
+            // Local portion can only be from 1 to 64 characters, inclusive.
+            // Please note that servers are encouraged to accept longer local
+            // parts than 64 characters.
+            if (!$this->check_text_length($strLocalPortion, 1, 64)) {
+                return false;
+            }
+            // Local portion must be:
+            // 1) a dot-atom (strings separated by periods)
+            // 2) a quoted string
+            // 3) an obsolete format string (combination of the above)
+            $arrLocalPortion = explode('.', $strLocalPortion);
+            for ($i = 0, $max = sizeof($arrLocalPortion); $i < $max; $i++) {
+                 if (!preg_match('.^('
+                                .    '([A-Za-z0-9!#$%&\'*+/=?^_`{|}~-]' 
+                                .    '[A-Za-z0-9!#$%&\'*+/=?^_`{|}~-]{0,63})'
+                                .'|'
+                                .    '("[^\\\"]{0,62}")'
+                                .')$.'
+                                ,$arrLocalPortion[$i])) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        /**
+         * Checks email section after "@" symbol for validity
+         * @param   strDomainPortion     Text to be checked
+         * @return  True if domain portion is valid, false if not
+         */
+        protected function check_domain_portion($strDomainPortion) {
+            // Total domain can only be from 1 to 255 characters, inclusive
+            if (!$this->check_text_length($strDomainPortion, 1, 255)) {
+                return false;
+            }
+            // Check if domain is IP, possibly enclosed in square brackets.
+            if (preg_match('/^(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])'
+               .'(\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])){3}$/'
+               ,$strDomainPortion) || 
+                preg_match('/^\[(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])'
+               .'(\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])){3}\]$/'
+               ,$strDomainPortion)) {
+                return true;
+            } else {
+                $arrDomainPortion = explode('.', $strDomainPortion);
+                if (sizeof($arrDomainPortion) < 2) {
+                    return false; // Not enough parts to domain
+                }
+                for ($i = 0, $max = sizeof($arrDomainPortion); $i < $max; $i++) {
+                    // Each portion must be between 1 and 63 characters, inclusive
+                    if (!$this->check_text_length($arrDomainPortion[$i], 1, 63)) {
+                        return false;
+                    }
+                    if (!preg_match('/^(([A-Za-z0-9][A-Za-z0-9-]{0,61}[A-Za-z0-9])|'
+                       .'([A-Za-z0-9]+))$/', $arrDomainPortion[$i])) {
+                        return false;
+                    }
+                    if ($i == $max - 1) { // TLD cannot be only numbers
+                        if (strlen(preg_replace('/[0-9]/', '', $arrDomainPortion[$i])) <= 0) {
+                            return false;
+                        }
+                    }
+                }
+            }
+            return true;
+        }
+
+        /**
+         * Check given text length is between defined bounds
+         * @param   strText     Text to be checked
+         * @param   intMinimum  Minimum acceptable length
+         * @param   intMaximum  Maximum acceptable length
+         * @return  True if string is within bounds (inclusive), false if not
+         */
+        protected function check_text_length($strText, $intMinimum, $intMaximum) {
+            // Minimum and maximum are both inclusive
+            $intTextLength = strlen($strText);
+            if (($intTextLength < $intMinimum) || ($intTextLength > $intMaximum)) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+
+    }
+
+?>

Copied: site-src/trunk/site/sso/UserDB.php (from rev 5105, site-src/trunk/site/UserDB.php)
===================================================================
--- site-src/trunk/site/sso/UserDB.php	                        (rev 0)
+++ site-src/trunk/site/sso/UserDB.php	2009-02-18 22:14:24 UTC (rev 5106)
@@ -0,0 +1,87 @@
+<?php
+
+require_once('config.php');
+
+class UserDB {
+  private $ds;  
+
+  public function __construct() {
+    $this->ds = @ldap_connect(LDAP_HOST);
+    if (!$this->ds) {
+      throw new ErrorException('Cannot connect to LDAP server.');
+    }
+  }
+
+  public function __destruct() {
+    @ldap_close($this->ds);
+  }
+
+  public function search($filter) {
+    if (!@ldap_bind($this->ds)) {
+      throw new ErrorException(
+        'Cannot bind to LDAP server: ' . ldap_error($this->ds)); 
+    }
+
+    $r = @ldap_search($this->ds, LDAP_BASE, $filter);
+    if (!$r) {
+      throw new ErrorException(
+        'LDAP search failed: ' . ldap_error($this->ds));
+    }
+
+    return @ldap_get_entries($this->ds, $r);
+  }
+
+  public function exists($username) {
+    return ${$this->search("uid=$username")}['count'] > 0;
+  }
+
+  public function auth($username, $password) {
+    $this->bind();
+
+    $r = @ldap_search($this->ds, LDAP_BASE, "uid=$username");
+    if (!$r) {
+      throw new ErrorException(
+        'LDAP search failed: ' . ldap_error($this->ds));
+    }
+
+    if (@ldap_count_entries($this->ds, $r) < 1) {
+      throw new ErrorException(
+        'The account "' . $username . '" does not exist.');
+    }
+
+    $result = @ldap_get_entries($this->ds, $r);
+
+    if (!@ldap_bind($this->ds, $result[0]['dn'], $password)) {
+      throw new ErrorException('Bad password.');
+    }
+  }
+
+  public function modify($username, $attr) {
+    $this->bind(LDAP_USERNAME, LDAP_PASSWORD);
+  
+    $dn = "uid=$username," . LDAP_BASE;
+    if (!@ldap_mod_replace($this->ds, $dn, $attr)) {
+      throw new ErrorException(
+        'Cannot reset user attributes: ' . ldap_error($this->ds));
+    }
+  }
+
+  public function create($username, $attr) {
+    $this->bind(LDAP_USERNAME, LDAP_PASSWORD);
+   
+    $dn = "uid=$username," . LDAP_BASE;
+    if (!@ldap_add($this->ds, $dn, $attr)) {
+      throw new ErrorException(
+        'Cannot write entry: ' . ldap_error($ds));
+    }
+  }
+
+  private function bind($dn = NULL, $pw = NULL) {
+    if (!@ldap_bind($this->ds, $dn, $pw)) {
+      throw new ErrorException(
+        'Cannot bind to LDAP server: ' . ldap_error($this->ds));
+    }
+  } 
+}
+
+?>

Copied: site-src/trunk/site/sso/recaptchalib.php (from rev 5105, site-src/trunk/site/recaptchalib.php)
===================================================================
--- site-src/trunk/site/sso/recaptchalib.php	                        (rev 0)
+++ site-src/trunk/site/sso/recaptchalib.php	2009-02-18 22:14:24 UTC (rev 5106)
@@ -0,0 +1,277 @@
+<?php
+/*
+ * This is a PHP library that handles calling reCAPTCHA.
+ *    - Documentation and latest version
+ *          http://recaptcha.net/plugins/php/
+ *    - Get a reCAPTCHA API Key
+ *          http://recaptcha.net/api/getkey
+ *    - Discussion group
+ *          http://groups.google.com/group/recaptcha
+ *
+ * Copyright (c) 2007 reCAPTCHA -- http://recaptcha.net
+ * AUTHORS:
+ *   Mike Crawford
+ *   Ben Maurer
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/**
+ * The reCAPTCHA server URL's
+ */
+define("RECAPTCHA_API_SERVER", "http://api.recaptcha.net");
+define("RECAPTCHA_API_SECURE_SERVER", "https://api-secure.recaptcha.net");
+define("RECAPTCHA_VERIFY_SERVER", "api-verify.recaptcha.net");
+
+/**
+ * Encodes the given data into a query string format
+ * @param $data - array of string elements to be encoded
+ * @return string - encoded request
+ */
+function _recaptcha_qsencode ($data) {
+        $req = "";
+        foreach ( $data as $key => $value )
+                $req .= $key . '=' . urlencode( stripslashes($value) ) . '&';
+
+        // Cut the last '&'
+        $req=substr($req,0,strlen($req)-1);
+        return $req;
+}
+
+
+
+/**
+ * Submits an HTTP POST to a reCAPTCHA server
+ * @param string $host
+ * @param string $path
+ * @param array $data
+ * @param int port
+ * @return array response
+ */
+function _recaptcha_http_post($host, $path, $data, $port = 80) {
+
+        $req = _recaptcha_qsencode ($data);
+
+        $http_request  = "POST $path HTTP/1.0\r\n";
+        $http_request .= "Host: $host\r\n";
+        $http_request .= "Content-Type: application/x-www-form-urlencoded;\r\n";
+        $http_request .= "Content-Length: " . strlen($req) . "\r\n";
+        $http_request .= "User-Agent: reCAPTCHA/PHP\r\n";
+        $http_request .= "\r\n";
+        $http_request .= $req;
+
+        $response = '';
+        if( false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) ) ) {
+                die ('Could not open socket');
+        }
+
+        fwrite($fs, $http_request);
+
+        while ( !feof($fs) )
+                $response .= fgets($fs, 1160); // One TCP-IP packet
+        fclose($fs);
+        $response = explode("\r\n\r\n", $response, 2);
+
+        return $response;
+}
+
+
+
+/**
+ * Gets the challenge HTML (javascript and non-javascript version).
+ * This is called from the browser, and the resulting reCAPTCHA HTML widget
+ * is embedded within the HTML form it was called from.
+ * @param string $pubkey A public key for reCAPTCHA
+ * @param string $error The error given by reCAPTCHA (optional, default is null)
+ * @param boolean $use_ssl Should the request be made over ssl? (optional, default is false)
+
+ * @return string - The HTML to be embedded in the user's form.
+ */
+function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false)
+{
+	if ($pubkey == null || $pubkey == '') {
+		die ("To use reCAPTCHA you must get an API key from <a href='http://recaptcha.net/api/getkey'>http://recaptcha.net/api/getkey</a>");
+	}
+	
+	if ($use_ssl) {
+                $server = RECAPTCHA_API_SECURE_SERVER;
+        } else {
+                $server = RECAPTCHA_API_SERVER;
+        }
+
+        $errorpart = "";
+        if ($error) {
+           $errorpart = "&amp;error=" . $error;
+        }
+        return '<script type="text/javascript" src="'. $server . '/challenge?k=' . $pubkey . $errorpart . '"></script>
+
+	<noscript>
+  		<iframe src="'. $server . '/noscript?k=' . $pubkey . $errorpart . '" height="300" width="500" frameborder="0"></iframe><br/>
+  		<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
+  		<input type="hidden" name="recaptcha_response_field" value="manual_challenge"/>
+	</noscript>';
+}
+
+
+
+
+/**
+ * A ReCaptchaResponse is returned from recaptcha_check_answer()
+ */
+class ReCaptchaResponse {
+        var $is_valid;
+        var $error;
+}
+
+
+/**
+  * Calls an HTTP POST function to verify if the user's guess was correct
+  * @param string $privkey
+  * @param string $remoteip
+  * @param string $challenge
+  * @param string $response
+  * @param array $extra_params an array of extra variables to post to the server
+  * @return ReCaptchaResponse
+  */
+function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $extra_params = array())
+{
+	if ($privkey == null || $privkey == '') {
+		die ("To use reCAPTCHA you must get an API key from <a href='http://recaptcha.net/api/getkey'>http://recaptcha.net/api/getkey</a>");
+	}
+
+	if ($remoteip == null || $remoteip == '') {
+		die ("For security reasons, you must pass the remote ip to reCAPTCHA");
+	}
+
+	
+	
+        //discard spam submissions
+        if ($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0) {
+                $recaptcha_response = new ReCaptchaResponse();
+                $recaptcha_response->is_valid = false;
+                $recaptcha_response->error = 'incorrect-captcha-sol';
+                return $recaptcha_response;
+        }
+
+        $response = _recaptcha_http_post (RECAPTCHA_VERIFY_SERVER, "/verify",
+                                          array (
+                                                 'privatekey' => $privkey,
+                                                 'remoteip' => $remoteip,
+                                                 'challenge' => $challenge,
+                                                 'response' => $response
+                                                 ) + $extra_params
+                                          );
+
+        $answers = explode ("\n", $response [1]);
+        $recaptcha_response = new ReCaptchaResponse();
+
+        if (trim ($answers [0]) == 'true') {
+                $recaptcha_response->is_valid = true;
+        }
+        else {
+                $recaptcha_response->is_valid = false;
+                $recaptcha_response->error = $answers [1];
+        }
+        return $recaptcha_response;
+
+}
+
+/**
+ * gets a URL where the user can sign up for reCAPTCHA. If your application
+ * has a configuration page where you enter a key, you should provide a link
+ * using this function.
+ * @param string $domain The domain where the page is hosted
+ * @param string $appname The name of your application
+ */
+function recaptcha_get_signup_url ($domain = null, $appname = null) {
+	return "http://recaptcha.net/api/getkey?" .  _recaptcha_qsencode (array ('domain' => $domain, 'app' => $appname));
+}
+
+function _recaptcha_aes_pad($val) {
+	$block_size = 16;
+	$numpad = $block_size - (strlen ($val) % $block_size);
+	return str_pad($val, strlen ($val) + $numpad, chr($numpad));
+}
+
+/* Mailhide related code */
+
+function _recaptcha_aes_encrypt($val,$ky) {
+	if (! function_exists ("mcrypt_encrypt")) {
+		die ("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed.");
+	}
+	$mode=MCRYPT_MODE_CBC;   
+	$enc=MCRYPT_RIJNDAEL_128;
+	$val=_recaptcha_aes_pad($val);
+	return mcrypt_encrypt($enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
+}
+
+
+function _recaptcha_mailhide_urlbase64 ($x) {
+	return strtr(base64_encode ($x), '+/', '-_');
+}
+
+/* gets the reCAPTCHA Mailhide url for a given email, public key and private key */
+function recaptcha_mailhide_url($pubkey, $privkey, $email) {
+	if ($pubkey == '' || $pubkey == null || $privkey == "" || $privkey == null) {
+		die ("To use reCAPTCHA Mailhide, you have to sign up for a public and private key, " .
+		     "you can do so at <a href='http://mailhide.recaptcha.net/apikey'>http://mailhide.recaptcha.net/apikey</a>");
+	}
+	
+
+	$ky = pack('H*', $privkey);
+	$cryptmail = _recaptcha_aes_encrypt ($email, $ky);
+	
+	return "http://mailhide.recaptcha.net/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ($cryptmail);
+}
+
+/**
+ * gets the parts of the email to expose to the user.
+ * eg, given johndoe@... return ["john", "example.com"].
+ * the email is then displayed as john...@...
+ */
+function _recaptcha_mailhide_email_parts ($email) {
+	$arr = preg_split("/@/", $email );
+
+	if (strlen ($arr[0]) <= 4) {
+		$arr[0] = substr ($arr[0], 0, 1);
+	} else if (strlen ($arr[0]) <= 6) {
+		$arr[0] = substr ($arr[0], 0, 3);
+	} else {
+		$arr[0] = substr ($arr[0], 0, 4);
+	}
+	return $arr;
+}
+
+/**
+ * Gets html to display an email address given a public an private key.
+ * to get a key, go to:
+ *
+ * http://mailhide.recaptcha.net/apikey
+ */
+function recaptcha_mailhide_html($pubkey, $privkey, $email) {
+	$emailparts = _recaptcha_mailhide_email_parts ($email);
+	$url = recaptcha_mailhide_url ($pubkey, $privkey, $email);
+	
+	return htmlentities($emailparts[0]) . "<a href='" . htmlentities ($url) .
+		"' onclick=\"window.open('" . htmlentities ($url) . "', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;\" title=\"Reveal this e-mail address\">...</a>@" . htmlentities ($emailparts [1]);
+
+}
+
+
+?>

Copied: site-src/trunk/site/sso/ssolib.php (from rev 5105, site-src/trunk/site/ssolib.php)
===================================================================
--- site-src/trunk/site/sso/ssolib.php	                        (rev 0)
+++ site-src/trunk/site/sso/ssolib.php	2009-02-18 22:14:24 UTC (rev 5106)
@@ -0,0 +1,34 @@
+<?php
+
+function rand_base64_key() {
+  $key = base64_encode(pack('L6', mt_rand(), mt_rand(), mt_rand(),
+                                  mt_rand(), mt_rand(), mt_rand()));
+  return strtr($key, '+/=', '-_');
+}
+
+function warn($err) {
+  print '<div class="errorbox"><h2>Error:</h2>' . $err . '</div>';
+}
+
+function print_top($title) {
+  print <<<END
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head profile="http://www.w3.org/2005/10/profile">
+  <link rel="stylesheet" type="text/css" href="style.css"/>
+  <link rel="icon" type="image/png" href="VASSAL.png"/>
+  <title>$title</title>
+</head>
+<body>
+END;
+}
+
+function print_bottom() {
+  print <<<END
+</body>
+</html>
+END;
+}
+
+?>

Deleted: site-src/trunk/site/ssolib.php
===================================================================
--- site-src/trunk/site/ssolib.php	2009-02-18 21:56:58 UTC (rev 5105)
+++ site-src/trunk/site/ssolib.php	2009-02-18 22:14:24 UTC (rev 5106)
@@ -1,34 +0,0 @@
-<?php
-
-function rand_base64_key() {
-  $key = base64_encode(pack('L6', mt_rand(), mt_rand(), mt_rand(),
-                                  mt_rand(), mt_rand(), mt_rand()));
-  return strtr($key, '+/=', '-_');
-}
-
-function warn($err) {
-  print '<div class="errorbox"><h2>Error:</h2>' . $err . '</div>';
-}
-
-function print_top($title) {
-  print <<<END
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head profile="http://www.w3.org/2005/10/profile">
-  <link rel="stylesheet" type="text/css" href="style.css"/>
-  <link rel="icon" type="image/png" href="VASSAL.png"/>
-  <title>$title</title>
-</head>
-<body>
-END;
-}
-
-function print_bottom() {
-  print <<<END
-</body>
-</html>
-END;
-}
-
-?>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 5108
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5108&view=rev
Author:   uckelman
Date:     2009-02-18 22:46:54 +0000 (Wed, 18 Feb 2009)

Log Message:
-----------
Refactored cookie checking.

Modified Paths:
--------------
    site-src/trunk/site/modify.php
    site-src/trunk/site/sso/AuthDB.php

Modified: site-src/trunk/site/modify.php
===================================================================
--- site-src/trunk/site/modify.php	2009-02-18 22:23:10 UTC (rev 5107)
+++ site-src/trunk/site/modify.php	2009-02-18 22:46:54 UTC (rev 5108)
@@ -16,19 +16,8 @@
 
   # check cookie
   $auth = new AuthDB();
+  $username = $auth->user_for_cookie($key);
 
-  $query = sprintf(
-    "SELECT username FROM cookies WHERE id='%s'",
-    mysql_real_escape_string($key)
-  );
-
-  $row = $auth->read($query);
-  if (!$row) {
-    throw new ErrorException('No result.');
-  }
-  
-  extract($row);
-
   # check whether this was a modification attempt
   if (empty($_POST)) {
     print_top($title);

Modified: site-src/trunk/site/sso/AuthDB.php
===================================================================
--- site-src/trunk/site/sso/AuthDB.php	2009-02-18 22:23:10 UTC (rev 5107)
+++ site-src/trunk/site/sso/AuthDB.php	2009-02-18 22:46:54 UTC (rev 5108)
@@ -22,6 +22,20 @@
     mysql_close($this->dbh);
   }
 
+  public function user_for_cookie($key) {
+    $query = sprintf(
+      "SELECT username FROM cookies WHERE id='%s'",
+      mysql_real_escape_string($key)
+    );
+
+    $row = $this->read($query);
+    if (!$row) {
+      throw new ErrorException('No such key in cookie database.');
+    }
+
+    return $row['username'];
+  }
+
   public function read($query) {
     $r = mysql_query($query, $this->dbh);
     if (!$r) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 5118
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5118&view=rev
Author:   uckelman
Date:     2009-02-19 20:29:19 +0000 (Thu, 19 Feb 2009)

Log Message:
-----------
Added logout page.
Make login and logout possible from front page.

Modified Paths:
--------------
    site-src/trunk/site/sso/AuthDB.php

Added Paths:
-----------
    site-src/trunk/site/index.php
    site-src/trunk/site/logout.php

Removed Paths:
-------------
    site-src/trunk/site/index.html

Deleted: site-src/trunk/site/index.html
===================================================================
--- site-src/trunk/site/index.html	2009-02-19 05:37:19 UTC (rev 5117)
+++ site-src/trunk/site/index.html	2009-02-19 20:29:19 UTC (rev 5118)
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head profile="http://www.w3.org/2005/10/profile">
-  <link rel="stylesheet" type="text/css" href="/style.css"/>
-  <link rel="alternate" type="application/rss+xml" title="RSS" href="" />
-  <link rel="icon" type="image/png" href="images/VASSAL.png"/>
-  <title>VASSAL</title>
-</head>
-<body>
-<div id="vassal-page">
-  <div id="vassal-header">
-    <div id="vassal-logo">
-      <a href="index.html"><img src="images/header.png"/></a>
-    </div>
-
-    <div id="vassal-search">
-    </div>
-
-    <div id="vassal-login">
-      <a href="login.php">Log in</a>
-    </div>
-  </div>
-
-  <div id="vassal-navigation">
-    <ul id="vassal-nav-list">
-      <li><a href="download.html">Download</a></li>
-  	  <li><a href="">Modules</a></li>
-  	  <li><a href="">FAQ</a></li>
-	    <li><a href="">Documentation</a></li>
-	    <li><a href="forum/">Forum</a></li>
-  	  <li><a href="">News</a></li>
-  	  <li><a href="">Help</a></li>
-    </ul>
-  </div>
-
-  <div id="content">
-    <div class="content_box_left">
-      <div id="vassal-about">
-        <h1>What is VASSAL?</h1>
-        <p>VASSAL is a game engine for building and playing online adaptations of board games and card games. It allows users to play in real time over the Internet, or by email. VASSAL runs on all platforms, and is free, open-source software.</p>
-        <p>Click <a href="">here</a> to learn more about VASSAL</p>
-
-        <table class="screenshot">
-          <tr>
-            <td><a href="images/screenshot1.png"><img src="thumbs/screenshot1.png" /></a></td>
-            <td><a href="images/screenshot2.png"><img src="thumbs/screenshot2.png" /></a></td>
-          </tr>
-        </table>
-  
-        <h1>What Games Are There?</h1>
-        <p>Hundreds of boardgames have been converted for use with VASSAL, so there's a good chance that you'll find the games you own in our <a href="">module library</a> already. If there is not yet a VASSAL module for your favorite game, you can use the VASSAL Editor to build your own module, and should you run into trouble, help is only a click away in our <a href="">forum</a>.</p>
-
-        <table class="screenshot">
-          <tr>
-            <td><a href="images/screenshot2.png"><img src="thumbs/screenshot2.png" /></a></td>
-            <td><a href="images/screenshot1.png"><img src="thumbs/screenshot1.png" /></a></td>
-          </tr>
-        </table>
-      </div>
-    </div>
-
-    <div class="content_box_right">
-      <div id="vassal-download">
-        <h1>Get VASSAL</h1>
-        <p>VASSAL is free, open-source software, created by volunteers. Our current release is 3.1.0.</p> 
-        <div class="dlbutton">
-          <div>Download 3.1.0</div>
-          <ul class="dllist">
-            <li><a href="http://downloads.sourceforge.net/vassalengine/VASSAL-3.1.0-beta8-generic.zip">Linux</a></li>
-            <li><a href="http://downloads.sourceforge.net/vassalengine/VASSAL-3.1.0-beta8-windows.exe">Mac OS</a></li>
-            <li><a href="http://downloads.sourceforge.net/vassalengine/VASSAL-3.1.0-beta8-macosx.dmg">Windows</a></li>
-          </ul>
-        </div>
-
-        <div class="dlbutton">
-          <div>Support VASSAL</div>
-          <a href=""><img src="images/paypal_donate.png"/></a>
-        </div>
-        <p>VASSAL is free, but development and hosting are not. If you enjoy using VASSAL, please consider helping us with these costs.</p>
-      </div>
-
-      <div id="vassal-help">
-        <h1>Get Help</h1>
-        <p>Need help with using VASSAL? Stuck while creating a module? If you can't find an answer in our extensive <a href="">documentation</a>, check our friendly <a href="">forum</a> for help.</p>
-      </div>
-
-      <div id="vassal-contribute">
-        <h1>Get Involved</h1>
-        <p>The VASSAL project is run by volunteers and makes progress by the efforts of volunteers. Is there a feature you'd like to see in the next release? Did you find a bug? Request that feature or report the bug <a href="">here</a>. Are you a programmer? We could use your help. Join us in the <a href="">developers' forum</a>. Not a programmer? Help us improve our <a href="">documentation</a>.</p>
-      </div>
-    </div>
-  </div>
-
-  <div class="content_box_full" id="vassal-news">
-    <h1>Latest News <a href=""><img src="images/feed-icon-14x14.png"/></a></h1>
-    <ul class="news">
-      <li class="day">
-        <div class="date">Feb<br/>1</div>
-        <ul class="events">
-          <li><a href="">This is a news item in the future</a></li>
-        </ul>
-      </li>
-      <li class="day">
-        <div class="date">Jan<br/>31</div>
-        <ul class="events">
-          <li><a href="">VASSAL 3.1.0 released</a></li>
-          <li><a href="">VASSAL has a new web site</a></li>
-          <li><a href="">This is a test news item</a></li>
-          <li><a href="">No news is good news</a></li>
-        </ul>
-      </li>
-      <li class="day">
-        <div class="date">Jan<br/>30</div>
-        <ul class="events">
-          <li><a href="">Monsterpocalypse 1.01 released</a></li>
-        </ul>
-      </li>
-      <li class="day">
-        <div class="date">Jan<br/>26</div>
-        <ul class="events">
-          <li><a href="">VASSAL 3.1.0-beta8 released</a></li>
-          <li><a href="">Zombies are eating my brain</a></li>
-        </ul>
-      </li>
-      <li class="day">
-        <div class="date">Jan<br/>25</div>
-        <ul class="events">
-          <li><a href="">VASSAL 3.1.0-beta8 released</a></li>
-          <li><a href="">Zombies are eating my brain</a></li>
-        </ul>
-      </li>
-      <li class="day">
-        <div class="date">Jan<br/>24</div>
-        <ul class="events">
-          <li><a href="">Star Wars Tactics Version 1.4 released</a></li>
-          <li><a href="">This is a very, very long news item, put here just to test what happens when we have a very, very long news item</a></li>
-        </ul>
-      </li>
-    </ul>
-    <em><a id="more-news" href="">...more news</a></em>
-
-  </div>
-
-  <div id="vassal-footer">
-    <ul id="vassal-footer-list">
-<!--      <li>Copyright &copy; 2009 <a href="">VASSAL dev team</a></li>
-      <li><a href="">License</a></li>
-      <li><a href="">Donate</a></li>
-      <li><a href="">Sitemap</a></li>
-      <li><a href="">Search</a></li>
-      <li><a href="">About</a></li>
-    </ul>
-    <ul>
--->
-      <li><a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=90612&amp;type=2" width="125" height="37" alt="SourceForge.net Logo" /></a></li>
-      <li><a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml11" alt="Valid XHTML 1.1" height="31" width="88" /></a></li>
-      <li><a href="http://jigsaw.w3.org/css-validator/"><img style="width: 88px; height: 31px" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!" /></a></li>
-    </ul>
-  </div>
-</div>
-</body>
-</html>

Added: site-src/trunk/site/index.php
===================================================================
--- site-src/trunk/site/index.php	                        (rev 0)
+++ site-src/trunk/site/index.php	2009-02-19 20:29:19 UTC (rev 5118)
@@ -0,0 +1,180 @@
+<?php echo '<?xml version="1.0" encoding="UTF-8"?>' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head profile="http://www.w3.org/2005/10/profile">
+  <link rel="stylesheet" type="text/css" href="/style.css"/>
+  <link rel="alternate" type="application/rss+xml" title="RSS" href="" />
+  <link rel="icon" type="image/png" href="images/VASSAL.png"/>
+  <title>VASSAL</title>
+</head>
+<body>
+<div id="vassal-page">
+  <div id="vassal-header">
+    <div id="vassal-logo">
+      <a href="index.html"><img src="images/header.png"/></a>
+    </div>
+
+    <div id="vassal-search">
+    </div>
+
+    <div id="vassal-login">
+<?php
+  $key = $_COOKIE['VASSAL_login'];
+  if (!empty($key)) { 
+    require_once('sso/AuthDB.php');
+  
+    try {
+      $auth = new AuthDB();
+      $username = $auth->user_for_cookie($key);
+      print '<a href="logout.php">Log out</a>';
+    }
+    catch (ErrorException $e) {
+      print '<a href="login.php">Log in</a>';
+    }
+  }
+  else {
+    print '<a href="login.php">Log in</a>';
+  }
+?>
+    </div>
+  </div>
+
+  <div id="vassal-navigation">
+    <ul id="vassal-nav-list">
+      <li><a href="download.html">Download</a></li>
+  	  <li><a href="">Modules</a></li>
+  	  <li><a href="">FAQ</a></li>
+	    <li><a href="">Documentation</a></li>
+	    <li><a href="forum/">Forum</a></li>
+  	  <li><a href="">News</a></li>
+  	  <li><a href="">Help</a></li>
+    </ul>
+  </div>
+
+  <div id="content">
+    <div class="content_box_left">
+      <div id="vassal-about">
+        <h1>What is VASSAL?</h1>
+        <p>VASSAL is a game engine for building and playing online adaptations of board games and card games. It allows users to play in real time over the Internet, or by email. VASSAL runs on all platforms, and is free, open-source software.</p>
+        <p>Click <a href="">here</a> to learn more about VASSAL</p>
+
+        <table class="screenshot">
+          <tr>
+            <td><a href="images/screenshot1.png"><img src="thumbs/screenshot1.png" /></a></td>
+            <td><a href="images/screenshot2.png"><img src="thumbs/screenshot2.png" /></a></td>
+          </tr>
+        </table>
+  
+        <h1>What Games Are There?</h1>
+        <p>Hundreds of boardgames have been converted for use with VASSAL, so there's a good chance that you'll find the games you own in our <a href="">module library</a> already. If there is not yet a VASSAL module for your favorite game, you can use the VASSAL Editor to build your own module, and should you run into trouble, help is only a click away in our <a href="forum/">forum</a>.</p>
+
+        <table class="screenshot">
+          <tr>
+            <td><a href="images/screenshot2.png"><img src="thumbs/screenshot2.png" /></a></td>
+            <td><a href="images/screenshot1.png"><img src="thumbs/screenshot1.png" /></a></td>
+          </tr>
+        </table>
+      </div>
+    </div>
+
+    <div class="content_box_right">
+      <div id="vassal-download">
+        <h1>Get VASSAL</h1>
+        <p>VASSAL is free, open-source software, created by volunteers. Our current release is 3.1.0.</p> 
+        <div class="dlbutton">
+          <div>Download 3.1.0</div>
+          <ul class="dllist">
+            <li><a href="http://downloads.sourceforge.net/vassalengine/VASSAL-3.1.0-beta8-generic.zip">Linux</a></li>
+            <li><a href="http://downloads.sourceforge.net/vassalengine/VASSAL-3.1.0-beta8-windows.exe">Mac OS</a></li>
+            <li><a href="http://downloads.sourceforge.net/vassalengine/VASSAL-3.1.0-beta8-macosx.dmg">Windows</a></li>
+          </ul>
+        </div>
+
+        <div class="dlbutton">
+          <div>Support VASSAL</div>
+          <a href=""><img src="images/paypal_donate.png"/></a>
+        </div>
+        <p>VASSAL is free, but development and hosting are not. If you enjoy using VASSAL, please consider helping us with these costs.</p>
+      </div>
+
+      <div id="vassal-help">
+        <h1>Get Help</h1>
+        <p>Need help with using VASSAL? Stuck while creating a module? If you can't find an answer in our extensive <a href="">documentation</a>, check our friendly <a href="">forum</a> for help.</p>
+      </div>
+
+      <div id="vassal-contribute">
+        <h1>Get Involved</h1>
+        <p>The VASSAL project is run by volunteers and makes progress by the efforts of volunteers. Is there a feature you'd like to see in the next release? Did you find a bug? Request that feature or report the bug <a href="bugzilla/">here</a>. Are you a programmer? We could use your help. Join us in the <a href="">developers' forum</a>. Not a programmer? Help us improve our <a href="">documentation</a>.</p>
+      </div>
+    </div>
+  </div>
+
+  <div class="content_box_full" id="vassal-news">
+    <h1>Latest News <a href=""><img src="images/feed-icon-14x14.png"/></a></h1>
+    <ul class="news">
+      <li class="day">
+        <div class="date">Feb<br/>1</div>
+        <ul class="events">
+          <li><a href="">This is a news item in the future</a></li>
+        </ul>
+      </li>
+      <li class="day">
+        <div class="date">Jan<br/>31</div>
+        <ul class="events">
+          <li><a href="">VASSAL 3.1.0 released</a></li>
+          <li><a href="">VASSAL has a new web site</a></li>
+          <li><a href="">This is a test news item</a></li>
+          <li><a href="">No news is good news</a></li>
+        </ul>
+      </li>
+      <li class="day">
+        <div class="date">Jan<br/>30</div>
+        <ul class="events">
+          <li><a href="">Monsterpocalypse 1.01 released</a></li>
+        </ul>
+      </li>
+      <li class="day">
+        <div class="date">Jan<br/>26</div>
+        <ul class="events">
+          <li><a href="">VASSAL 3.1.0-beta8 released</a></li>
+          <li><a href="">Zombies are eating my brain</a></li>
+        </ul>
+      </li>
+      <li class="day">
+        <div class="date">Jan<br/>25</div>
+        <ul class="events">
+          <li><a href="">VASSAL 3.1.0-beta8 released</a></li>
+          <li><a href="">Zombies are eating my brain</a></li>
+        </ul>
+      </li>
+      <li class="day">
+        <div class="date">Jan<br/>24</div>
+        <ul class="events">
+          <li><a href="">Star Wars Tactics Version 1.4 released</a></li>
+          <li><a href="">This is a very, very long news item, put here just to test what happens when we have a very, very long news item</a></li>
+        </ul>
+      </li>
+    </ul>
+    <em><a id="more-news" href="">...more news</a></em>
+
+  </div>
+
+  <div id="vassal-footer">
+    <ul id="vassal-footer-list">
+<!--      <li>Copyright &copy; 2009 <a href="">VASSAL dev team</a></li>
+      <li><a href="">License</a></li>
+      <li><a href="">Donate</a></li>
+      <li><a href="">Sitemap</a></li>
+      <li><a href="">Search</a></li>
+      <li><a href="">About</a></li>
+    </ul>
+    <ul>
+-->
+      <li><a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=90612&amp;type=2" width="125" height="37" alt="SourceForge.net Logo" /></a></li>
+      <li><a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml11" alt="Valid XHTML 1.1" height="31" width="88" /></a></li>
+      <li><a href="http://jigsaw.w3.org/css-validator/"><img style="width: 88px; height: 31px" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!" /></a></li>
+    </ul>
+  </div>
+</div>
+</body>
+</html>

Added: site-src/trunk/site/logout.php
===================================================================
--- site-src/trunk/site/logout.php	                        (rev 0)
+++ site-src/trunk/site/logout.php	2009-02-19 20:29:19 UTC (rev 5118)
@@ -0,0 +1,30 @@
+<?php
+
+require_once('sso/ssolib.php');
+
+$title = 'Log out';
+
+$key = $_COOKIE['VASSAL_login'];
+if (!empty($key)) {
+
+  require_once('sso/AuthDB.php');
+
+  try {
+    $auth = new AuthDB();
+    $auth->expire_cookie($key);
+
+    
+  }
+  catch (ErrorException $e) {
+    print_top($title);
+    warn($e->getMessage());
+    print_bottom();
+    exit;
+  }
+}
+
+print_top($title);
+print '<p>You are now logged out.</p>';
+print_bottom();
+
+?>

Modified: site-src/trunk/site/sso/AuthDB.php
===================================================================
--- site-src/trunk/site/sso/AuthDB.php	2009-02-19 05:37:19 UTC (rev 5117)
+++ site-src/trunk/site/sso/AuthDB.php	2009-02-19 20:29:19 UTC (rev 5118)
@@ -36,6 +36,15 @@
     return $row['username'];
   }
 
+  public function expire_cookie($key) {
+    $query = sprintf(
+      "DELETE FROM cookies WHERE id='%s'",
+      mysql_real_escape_string($key)
+    );
+
+    $this->write($query);
+  }
+
   public function read($query) {
     $r = mysql_query($query, $this->dbh);
     if (!$r) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 5119
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5119&view=rev
Author:   uckelman
Date:     2009-02-19 20:39:38 +0000 (Thu, 19 Feb 2009)

Log Message:
-----------
Moved cookie creation query into AuthDB.

Modified Paths:
--------------
    site-src/trunk/site/login.php
    site-src/trunk/site/sso/AuthDB.php

Modified: site-src/trunk/site/login.php
===================================================================
--- site-src/trunk/site/login.php	2009-02-19 20:29:19 UTC (rev 5118)
+++ site-src/trunk/site/login.php	2009-02-19 20:39:38 UTC (rev 5119)
@@ -157,17 +157,8 @@
   $expires = time() + (60 * 60 * 24 * 30);
 
   $auth = new AuthDB();
+  $auth->create_cookie($key, $username, $expires);
 
-  $query = sprintf(
-    "INSERT INTO cookies (id, username, expires)
-     VALUES('%s', '%s', FROM_UNIXTIME(%s))",
-    mysql_real_escape_string($key),
-    mysql_real_escape_string($username),
-    mysql_real_escape_string($expires)
-  );
-
-  $auth->write($query);
-
   setrawcookie(
     'VASSAL_login',
     $key,

Modified: site-src/trunk/site/sso/AuthDB.php
===================================================================
--- site-src/trunk/site/sso/AuthDB.php	2009-02-19 20:29:19 UTC (rev 5118)
+++ site-src/trunk/site/sso/AuthDB.php	2009-02-19 20:39:38 UTC (rev 5119)
@@ -36,6 +36,18 @@
     return $row['username'];
   }
 
+  public function create_cookie($username, $key, $expires) {
+    $query = sprintf(
+      "INSERT INTO cookies (id, username, expires)
+       VALUES('%s', '%s', FROM_UNIXTIME(%s))",
+      mysql_real_escape_string($key),
+      mysql_real_escape_string($username),
+      mysql_real_escape_string($expires)
+    );
+
+    $this->write($query);
+  }
+
   public function expire_cookie($key) {
     $query = sprintf(
       "DELETE FROM cookies WHERE id='%s'",


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 5120
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5120&view=rev
Author:   uckelman
Date:     2009-02-19 21:29:53 +0000 (Thu, 19 Feb 2009)

Log Message:
-----------
Added header, footer to print_top(), print_bottom().
Call AuthDB::create_cookie() with correct argument order.
Added errorbox to style sheet.

Modified Paths:
--------------
    site-src/trunk/site/index.php
    site-src/trunk/site/login.php
    site-src/trunk/site/sso/ssolib.php
    site-src/trunk/site/style.css

Modified: site-src/trunk/site/index.php
===================================================================
--- site-src/trunk/site/index.php	2009-02-19 20:39:38 UTC (rev 5119)
+++ site-src/trunk/site/index.php	2009-02-19 21:29:53 UTC (rev 5120)
@@ -11,7 +11,7 @@
 <div id="vassal-page">
   <div id="vassal-header">
     <div id="vassal-logo">
-      <a href="index.html"><img src="images/header.png"/></a>
+      <a href="/index.php"><img src="images/header.png"/></a>
     </div>
 
     <div id="vassal-search">

Modified: site-src/trunk/site/login.php
===================================================================
--- site-src/trunk/site/login.php	2009-02-19 20:39:38 UTC (rev 5119)
+++ site-src/trunk/site/login.php	2009-02-19 21:29:53 UTC (rev 5120)
@@ -157,7 +157,7 @@
   $expires = time() + (60 * 60 * 24 * 30);
 
   $auth = new AuthDB();
-  $auth->create_cookie($key, $username, $expires);
+  $auth->create_cookie($username, $key, $expires);
 
   setrawcookie(
     'VASSAL_login',

Modified: site-src/trunk/site/sso/ssolib.php
===================================================================
--- site-src/trunk/site/sso/ssolib.php	2009-02-19 20:39:38 UTC (rev 5119)
+++ site-src/trunk/site/sso/ssolib.php	2009-02-19 21:29:53 UTC (rev 5120)
@@ -21,11 +21,39 @@
   <title>$title</title>
 </head>
 <body>
+<div id="vassal-page">
+  <div id="vassal-header">
+    <div id="vassal-logo">
+      <a href="/index.php"><img src="images/header.png"/></a>
+    </div>
+  </div>
+  <div id="vassal-navigation">
+    <ul id="vassal-nav-list">
+      <li><a href="download.html">Download</a></li>
+      <li><a href="">Modules</a></li>
+      <li><a href="">FAQ</a></li>
+      <li><a href="">Documentation</a></li>
+      <li><a href="forum/">Forum</a></li>
+      <li><a href="">News</a></li>
+      <li><a href="">Help</a></li>
+    </ul>
+  </div>
+
+  <div id="content">
 END;
 }
 
 function print_bottom() {
   print <<<END
+  </div>
+  <div id="vassal-footer">
+    <ul id="vassal-footer-list">
+      <li><a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=90612&amp;type=2" width="125" height="37" alt="SourceForge.net Logo" /></a></li>
+      <li><a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml11" alt="Valid XHTML 1.1" height="31" width="88" /></a></li>
+      <li><a href="http://jigsaw.w3.org/css-validator/"><img style="width: 88px; height: 31px" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!" /></a></li>
+    </ul>
+  </div> 
+</div>
 </body>
 </html>
 END;

Modified: site-src/trunk/site/style.css
===================================================================
--- site-src/trunk/site/style.css	2009-02-19 20:39:38 UTC (rev 5119)
+++ site-src/trunk/site/style.css	2009-02-19 21:29:53 UTC (rev 5120)
@@ -45,6 +45,31 @@
   margin: 5px 5px 0 0;
 }
 
+.loginform fieldset {
+  margin: 10px auto;
+  max-width: 20em;
+}
+
+.loginform legend {
+  font-weight: bold;
+  font-size: 110%; 
+}
+
+.errorbox {
+  margin: 10px auto;
+  border: 2px red solid;
+  padding: 0.5em 1em;
+  background-color: #fff2f2;
+}
+
+.errorbox h2 {
+  font-size: 1em;
+  font-weight: bold;
+  display: inline;
+  margin: 0 .5em 0 0;
+  border: none;
+}
+
 #vassal-nav-list {
   margin: 0;
   padding: 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 5123
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5123&view=rev
Author:   uckelman
Date:     2009-02-19 23:06:59 +0000 (Thu, 19 Feb 2009)

Log Message:
-----------
Cleanup.

Modified Paths:
--------------
    site-src/trunk/site/login.php
    site-src/trunk/site/modify.php
    site-src/trunk/site/style.css

Modified: site-src/trunk/site/login.php
===================================================================
--- site-src/trunk/site/login.php	2009-02-19 22:41:52 UTC (rev 5122)
+++ site-src/trunk/site/login.php	2009-02-19 23:06:59 UTC (rev 5123)
@@ -216,7 +216,7 @@
   if (!empty($returnto)) $action .= "?returnto=$returnto";
 
   print <<<END
-<form class="loginform" action="$action" method="post">
+<form class="login_form" action="$action" method="post">
   <fieldset>
     <legend>Login</legend>
     <p>Don't have an account? <a href="register.php">Create an account</a>.</p>

Modified: site-src/trunk/site/modify.php
===================================================================
--- site-src/trunk/site/modify.php	2009-02-19 22:41:52 UTC (rev 5122)
+++ site-src/trunk/site/modify.php	2009-02-19 23:06:59 UTC (rev 5123)
@@ -132,7 +132,7 @@
   print <<<END
 <form class="modify_form" action="modify.php" method="post">
   <fieldset>
-    <legend>Modify Settings</legend>
+    <legend>Modify Account</legend>
     <table>
       <tr>
         <th><label for="password">Password:</label></th>

Modified: site-src/trunk/site/style.css
===================================================================
--- site-src/trunk/site/style.css	2009-02-19 22:41:52 UTC (rev 5122)
+++ site-src/trunk/site/style.css	2009-02-19 23:06:59 UTC (rev 5123)
@@ -45,16 +45,42 @@
   margin: 5px 5px 0 0;
 }
 
-.loginform fieldset {
+.login_form fieldset {
   margin: 10px auto;
   max-width: 20em;
 }
 
-.loginform legend {
+.login_form legend {
   font-weight: bold;
   font-size: 110%; 
 }
 
+.login_form th {
+  text-align: right;
+}
+
+.login_form label {
+  font-weight: normal;
+}
+
+.modify_form fieldset {
+  margin: 10px auto;
+  max-width: 30em;
+}
+
+.modify_form legend {
+  font-weight: bold;
+  font-size: 110%;
+}
+
+.modify_form th {
+  text-align: right;
+}
+
+.modify_form label {
+  font-weight: normal;
+}
+
 .errorbox {
   margin: 10px auto;
   border: 2px red solid;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 5121
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5121&view=rev
Author:   uckelman
Date:     2009-02-19 22:18:21 +0000 (Thu, 19 Feb 2009)

Log Message:
-----------
Added returnto option to login, logout.

Modified Paths:
--------------
    site-src/trunk/site/index.php
    site-src/trunk/site/login.php
    site-src/trunk/site/logout.php

Modified: site-src/trunk/site/index.php
===================================================================
--- site-src/trunk/site/index.php	2009-02-19 21:29:53 UTC (rev 5120)
+++ site-src/trunk/site/index.php	2009-02-19 22:18:21 UTC (rev 5121)
@@ -26,14 +26,14 @@
     try {
       $auth = new AuthDB();
       $username = $auth->user_for_cookie($key);
-      print '<a href="logout.php">Log out</a>';
+      print '<a href="logout.php?returnto=/index.php">Log out</a>';
     }
     catch (ErrorException $e) {
-      print '<a href="login.php">Log in</a>';
+      print '<a href="login.php?returnto=/index.php">Log in</a>';
     }
   }
   else {
-    print '<a href="login.php">Log in</a>';
+    print '<a href="login.php?returnto=/index.php">Log in</a>';
   }
 ?>
     </div>

Modified: site-src/trunk/site/login.php
===================================================================
--- site-src/trunk/site/login.php	2009-02-19 21:29:53 UTC (rev 5120)
+++ site-src/trunk/site/login.php	2009-02-19 22:18:21 UTC (rev 5121)
@@ -5,10 +5,12 @@
 
 $title = 'VASSAL Login';
 
+$returnto = $_GET['returnto'];
+
 # check whether this was a login attempt
 if (empty($_POST)) {
   print_top($title);
-  print_form();
+  print_form($returnto);
   print_bottom();
   exit;
 }
@@ -168,21 +170,16 @@
     false,
     true
   );
-    
-  #header('Location: http://www.test.nomic.net/wiki/index.php/Main_Page');
-  #header('Location: http://www.test.nomic.net/forum');
 
-  print_top($title);
-  print '<a href="http://www.test.nomic.net/wiki">wiki</a><br/>';
-  print '<a href="http://www.test.nomic.net/forum">forum</a><br/>';
-  print '<a href="http://www.test.nomic.net/bugzilla">bugs</a><br/>';
-  print_bottom();
+  # go back where we came from
+  if (!empty($returnto)) $returnto = '/index.php';
+  header("Location: $returnto");
   exit;
 }
 catch (ErrorException $e) {
   print_top($title);
   warn($e->getMessage());
-  print_form();
+  print_form($returnto);
   print_bottom();
   exit;
 }
@@ -214,9 +211,12 @@
   }
 }
 
-function print_form() {
+function print_form($returnto) {
+  $action = 'login.php';
+  if (!empty($returnto)) $action .= "?returnto=$returnto";
+
   print <<<END
-<form class="loginform" action="login.php" method="post">
+<form class="loginform" action="$action" method="post">
   <fieldset>
     <legend>Login</legend>
     <p>Don't have an account? <a href="register.php">Create an account</a>.</p>

Modified: site-src/trunk/site/logout.php
===================================================================
--- site-src/trunk/site/logout.php	2009-02-19 21:29:53 UTC (rev 5120)
+++ site-src/trunk/site/logout.php	2009-02-19 22:18:21 UTC (rev 5121)
@@ -4,6 +4,9 @@
 
 $title = 'Log out';
 
+$returnto = $_GET['returnto'];
+
+# expire the cookie if we have one
 $key = $_COOKIE['VASSAL_login'];
 if (!empty($key)) {
 
@@ -12,8 +15,6 @@
   try {
     $auth = new AuthDB();
     $auth->expire_cookie($key);
-
-    
   }
   catch (ErrorException $e) {
     print_top($title);
@@ -23,8 +24,14 @@
   }
 }
 
-print_top($title);
-print '<p>You are now logged out.</p>';
-print_bottom();
+# go back where we came from, if asked
+if (!empty($returnto)) {
+  header("Location: $returnto");
+}
+else {
+  print_top($title);
+  print '<p>You are now logged out.</p>';
+  print_bottom();
+}
 
 ?>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 5122
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5122&view=rev
Author:   uckelman
Date:     2009-02-19 22:41:52 +0000 (Thu, 19 Feb 2009)

Log Message:
-----------
Read footer using virtual().

Modified Paths:
--------------
    site-src/trunk/site/index.php
    site-src/trunk/site/sso/ssolib.php

Added Paths:
-----------
    site-src/trunk/site/footer.shtml

Added: site-src/trunk/site/footer.shtml
===================================================================
--- site-src/trunk/site/footer.shtml	                        (rev 0)
+++ site-src/trunk/site/footer.shtml	2009-02-19 22:41:52 UTC (rev 5122)
@@ -0,0 +1,7 @@
+  <div id="vassal-footer">
+    <ul id="vassal-footer-list">
+      <li><a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=90612&amp;type=2" width="125" height="37" alt="SourceForge.net Logo" /></a></li>
+      <li><a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml11" alt="Valid XHTML 1.1" height="31" width="88" /></a></li>
+      <li><a href="http://jigsaw.w3.org/css-validator/"><img style="width: 88px; height: 31px" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!" /></a></li>
+    </ul>
+  </div> 

Modified: site-src/trunk/site/index.php
===================================================================
--- site-src/trunk/site/index.php	2009-02-19 22:18:21 UTC (rev 5121)
+++ site-src/trunk/site/index.php	2009-02-19 22:41:52 UTC (rev 5122)
@@ -159,8 +159,11 @@
 
   </div>
 
+  <?php virtual('/footer.shtml'); ?>
+<!--
   <div id="vassal-footer">
     <ul id="vassal-footer-list">
+-->
 <!--      <li>Copyright &copy; 2009 <a href="">VASSAL dev team</a></li>
       <li><a href="">License</a></li>
       <li><a href="">Donate</a></li>
@@ -170,11 +173,6 @@
     </ul>
     <ul>
 -->
-      <li><a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=90612&amp;type=2" width="125" height="37" alt="SourceForge.net Logo" /></a></li>
-      <li><a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml11" alt="Valid XHTML 1.1" height="31" width="88" /></a></li>
-      <li><a href="http://jigsaw.w3.org/css-validator/"><img style="width: 88px; height: 31px" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!" /></a></li>
-    </ul>
-  </div>
 </div>
 </body>
 </html>

Modified: site-src/trunk/site/sso/ssolib.php
===================================================================
--- site-src/trunk/site/sso/ssolib.php	2009-02-19 22:18:21 UTC (rev 5121)
+++ site-src/trunk/site/sso/ssolib.php	2009-02-19 22:41:52 UTC (rev 5122)
@@ -44,15 +44,9 @@
 }
 
 function print_bottom() {
+  print '</div>';
+  virtual('/footer.shtml');
   print <<<END
-  </div>
-  <div id="vassal-footer">
-    <ul id="vassal-footer-list">
-      <li><a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=90612&amp;type=2" width="125" height="37" alt="SourceForge.net Logo" /></a></li>
-      <li><a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml11" alt="Valid XHTML 1.1" height="31" width="88" /></a></li>
-      <li><a href="http://jigsaw.w3.org/css-validator/"><img style="width: 88px; height: 31px" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!" /></a></li>
-    </ul>
-  </div> 
 </div>
 </body>
 </html>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 5124
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5124&view=rev
Author:   uckelman
Date:     2009-02-20 00:04:19 +0000 (Fri, 20 Feb 2009)

Log Message:
-----------
Added news page.

Modified Paths:
--------------
    site-src/trunk/site/index.php
    site-src/trunk/site/sso/ssolib.php

Added Paths:
-----------
    site-src/trunk/site/news.php
    site-src/trunk/site/sso/NewsDB.php

Modified: site-src/trunk/site/index.php
===================================================================
--- site-src/trunk/site/index.php	2009-02-19 23:06:59 UTC (rev 5123)
+++ site-src/trunk/site/index.php	2009-02-20 00:04:19 UTC (rev 5124)
@@ -46,7 +46,7 @@
   	  <li><a href="">FAQ</a></li>
 	    <li><a href="">Documentation</a></li>
 	    <li><a href="forum/">Forum</a></li>
-  	  <li><a href="">News</a></li>
+  	  <li><a href="news.php">News</a></li>
   	  <li><a href="">Help</a></li>
     </ul>
   </div>
@@ -110,7 +110,7 @@
   </div>
 
   <div class="content_box_full" id="vassal-news">
-    <h1>Latest News <a href=""><img src="images/feed-icon-14x14.png"/></a></h1>
+    <h1>Latest News <a href="news.php"><img src="images/feed-icon-14x14.png"/></a></h1>
     <ul class="news">
       <li class="day">
         <div class="date">Feb<br/>1</div>

Added: site-src/trunk/site/news.php
===================================================================
--- site-src/trunk/site/news.php	                        (rev 0)
+++ site-src/trunk/site/news.php	2009-02-20 00:04:19 UTC (rev 5124)
@@ -0,0 +1,96 @@
+<?php echo '<?xml version="1.0" encoding="UTF-8"?>' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head profile="http://www.w3.org/2005/10/profile">
+  <link rel="stylesheet" type="text/css" href="/style.css"/>
+  <link rel="alternate" type="application/rss+xml" title="RSS" href="" />
+  <link rel="icon" type="image/png" href="images/VASSAL.png"/>
+  <title>VASSAL</title>
+</head>
+<body>
+<div id="vassal-page">
+  <div id="vassal-header">
+    <div id="vassal-logo">
+      <a href="/index.php"><img src="images/header.png"/></a>
+    </div>
+
+    <div id="vassal-search">
+    </div>
+
+    <div id="vassal-login">
+<?php
+  $key = $_COOKIE['VASSAL_login'];
+  if (!empty($key)) { 
+    require_once('sso/AuthDB.php');
+  
+    try {
+      $auth = new AuthDB();
+      $username = $auth->user_for_cookie($key);
+      print '<a href="logout.php?returnto=/news.php">Log out</a>';
+    }
+    catch (ErrorException $e) {
+      print '<a href="login.php?returnto=/news.php">Log in</a>';
+    }
+  }
+  else {
+    print '<a href="login.php?returnto=/news.php">Log in</a>';
+  }
+?>
+    </div>
+  </div>
+
+  <div id="vassal-navigation">
+    <ul id="vassal-nav-list">
+      <li><a href="download.html">Download</a></li>
+  	  <li><a href="">Modules</a></li>
+  	  <li><a href="">FAQ</a></li>
+	    <li><a href="">Documentation</a></li>
+	    <li><a href="forum/">Forum</a></li>
+  	  <li><a href="">News</a></li>
+  	  <li><a href="">Help</a></li>
+    </ul>
+  </div>
+
+  <div id="content">
+    <div class="content_box_full">
+      <h1>News</h1>
+<?php
+
+require_once('sso/NewsDB.php');
+
+try {
+  $news = new NewsDB();
+  $query = 'SELECT DATE_FORMAT(date,"%b") AS month, DAYOFMONTH(date) AS day, headline, text FROM news ORDER BY date DESC LIMIT 50';
+  $rows = $news->read_all($query);
+
+  print '<ul>';
+
+  $day = 0;
+
+  foreach ($rows as $item) {
+    if ($day != $item['day']) {
+      if ($day != 0) {
+        print '</ul></li>';
+      }
+
+      print '<li class="day"><div class="date">' .
+        $item['month'] . '<br/>' . $item['day'] . '</div><ul class="events">';
+
+    }
+
+    print '<li><h2>' . $item['headline'] . '</h2><p>'
+                     . $item['text'] . '</p></li>'; 
+  }
+  
+  print '</ul></li></ul>';
+}
+catch (ErrorException $e) {
+  warn($e->getMessage());
+}
+?>
+    </div>
+  </div>
+  <?php virtual('/footer.shtml'); ?>
+</div>
+</body>
+</html>

Added: site-src/trunk/site/sso/NewsDB.php
===================================================================
--- site-src/trunk/site/sso/NewsDB.php	                        (rev 0)
+++ site-src/trunk/site/sso/NewsDB.php	2009-02-20 00:04:19 UTC (rev 5124)
@@ -0,0 +1,56 @@
+<?php
+
+require_once('config.php');
+
+class NewsDB {
+  private $dbh;
+
+  public function __construct() {
+    $this->dbh = mysql_connect(SQL_HOST, SQL_USERNAME, SQL_PASSWORD);
+    if (!$this->dbh) {
+      throw new ErrorException(
+        'Cannot connect to MySQL server: ' . mysql_error());
+    }
+
+    if (!mysql_select_db(SQL_DB, $this->dbh)) {
+      throw new ErrorException(
+        'Cannot select database: ' . mysql_error());
+    }
+  }
+
+  public function __destruct() {
+    mysql_close($this->dbh);
+  }
+
+  public function read_all($query) {
+    $r = mysql_query($query, $this->dbh);
+    if (!$r) {
+      throw new ErrorException(
+        'Failed to read from database: ' . mysql_error());
+    }
+
+    $result = array();
+    while ($row = mysql_fetch_assoc($r)) $result[] = $row;
+    return $result;
+  }
+
+  public function read($query) {
+    $r = mysql_query($query, $this->dbh);
+    if (!$r) {
+      throw new ErrorException(
+        'Failed to read from database: ' . mysql_error());
+    }
+
+    return mysql_fetch_assoc($r);
+  }
+
+  public function write($query) {
+    $r = mysql_query($query, $this->dbh);
+    if (!$r) {
+      throw new ErrorException(
+        'Failed to write to database: ' . mysql_error());
+    }
+
+    return mysql_affected_rows($this->dbh);
+  }
+}

Modified: site-src/trunk/site/sso/ssolib.php
===================================================================
--- site-src/trunk/site/sso/ssolib.php	2009-02-19 23:06:59 UTC (rev 5123)
+++ site-src/trunk/site/sso/ssolib.php	2009-02-20 00:04:19 UTC (rev 5124)
@@ -34,7 +34,7 @@
       <li><a href="">FAQ</a></li>
       <li><a href="">Documentation</a></li>
       <li><a href="forum/">Forum</a></li>
-      <li><a href="">News</a></li>
+      <li><a href="news.php">News</a></li>
       <li><a href="">Help</a></li>
     </ul>
   </div>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 5126
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5126&view=rev
Author:   uckelman
Date:     2009-02-21 00:08:29 +0000 (Sat, 21 Feb 2009)

Log Message:
-----------
Refactored logins.
Created shim for phpBB login.
Capture Set-Cookie headers uniformly.

Modified Paths:
--------------
    site-src/trunk/site/login.php

Added Paths:
-----------
    site-src/trunk/site/phpbb_login.php

Modified: site-src/trunk/site/login.php
===================================================================
--- site-src/trunk/site/login.php	2009-02-20 23:53:38 UTC (rev 5125)
+++ site-src/trunk/site/login.php	2009-02-21 00:08:29 UTC (rev 5126)
@@ -34,109 +34,200 @@
   $user = new UserDB();
   $user->auth($username, $password);
 
+  $cookies = array();
+
   # MediaWiki login
   $url = 'http://www.test.nomic.net/wiki/api.php';
-  $data = array(
+  $cookies += mediawiki_login($url, $username, $password);
+
+  # phpBB login
+  $url = 'http://www.test.nomic.net/phpbb_login.php';
+  $cookies += phpbb_login($url, $username, $password);
+
+  # Bugzilla login
+  $url = 'http://www.test.nomic.net/bugzilla/xmlrpc.cgi';
+  $cookies += bugzilla_login($url, $username, $password);
+
+  # write out the cookies captured from the logins 
+  put_cookies($cookies);
+
+  # FIXME: loop in case we have a cookie collision
+
+  # set our login cookie
+  $key = rand_base64_key();
+  $expires = time() + (60 * 60 * 24 * 30);
+
+  $auth = new AuthDB();
+  $auth->create_cookie($username, $key, $expires);
+
+  setrawcookie(
+    'VASSAL_login',
+    $key,
+    $expires,
+    '/',
+    'www.test.nomic.net',
+    false,
+    true
+  );
+
+  # go back where we came from
+  if (empty($returnto)) $returnto = '/index.php';
+  header("Location: $returnto");
+  exit;
+}
+catch (ErrorException $e) {
+  print_top($title);
+  warn($e->getMessage());
+  print_form($returnto);
+  print_bottom();
+  exit;
+}
+
+#
+# Login to MediaWiki.
+#
+function mediawiki_login($url, $username, $password) {
+  $params = array(
     'format'     => 'php',
     'action'     => 'login',
     'lgname'     => $username,
     'lgpassword' => $password,
     'lgdomain'   => 'test'
   );
+ 
+  $request = http_build_query($params);
 
-  $cookies = array();
+  $opts = array(
+    'http' => array(
+      'method' => 'POST',
+      'header' => "Content-type: application/x-www-form-urlencoded\r\n" .
+                  'Content-Length: ' . strlen($request) . "\r\n",
+      'content' => $request
+    )
+  );
 
-  $ch = curl_init($url);
-  curl_setopt($ch, CURLOPT_HEADER, false);
-  curl_setopt($ch, CURLOPT_HEADERFUNCTION, 'read_header');
-  curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-  curl_setopt($ch, CURLOPT_POST, true);
-  curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
-  $result = curl_exec($ch);
-  curl_close($ch);
+  $ctx = stream_context_create($opts);
+  $content = file_get_contents($url, 0 , $ctx);
 
-  $result = unserialize($result);
-  $result = $result['login'];
+  $reply = unserialize($content);
+  $reply = $reply['login'];
 
-  if ($result['result'] != 'Success') {
-    if ($result['result'] == 'Illegal') {
+  if ($reply['result'] != 'Success') {
+    if ($reply['result'] == 'Illegal') {
       throw new ErrorException('MediaWiki login failed: Invalid username.');
     }
-    else if ($result['result'] == 'NotExists') {
+    else if ($reply['result'] == 'NotExists') {
       throw new ErrorException('MediaWiki login failed: Invalid username.');
     }
-    else if ($result['result'] == 'WrongPass') {
+    else if ($reply['result'] == 'WrongPass') {
       throw new ErrorException('MediaWiki login falied: Invalid password.');
     }
-    else if ($result['result'] == 'WrongPluginPass') {
+    else if ($reply['result'] == 'WrongPluginPass') {
       throw new ErrorException('MediaWiki login failed: Invalid password.');
     }
     else {
-      throw new ErrorException('MediaWiki login failed: ' . $result['result']);
+      throw new ErrorException('MediaWiki login failed: ' . $reply['result']);
     }
   }
 
-  # set MediaWiki cookies
-  foreach ($cookies as $name => $attr) {
-    setrawcookie(
-      $name,
-      $attr['value'],
-      array_key_exists('expires', $attr) ? strtotime($attr['expires']) : 0,
-      $attr['path'],
-      'www.test.nomic.net',
-      false,
-      array_key_exists('httponly', $attr)
-    );
-  }
+  return get_cookies($http_response_header);
+}
 
-  # phpBB login 
-  define('IN_PHPBB', true);
-  $phpbb_root_path = '../forum/';
-  $phpEx = 'php';
-  include($phpbb_root_path . 'common.' . $phpEx);
+#
+# Login to phpBB.
+#
+function phpbb_login($url, $username, $password) {
+  $params = array(
+    'username' => $username,
+    'password' => $password,
+  );
+ 
+  $request = http_build_query($params);
 
-  $user->session_begin();
-  $auth->acl($user->data);
-  $user->setup();
+  $opts = array(
+    'http' => array(
+      'method' => 'POST',
+      'header' => "Content-type: application/x-www-form-urlencoded\r\n" .
+                  'Content-Length: ' . strlen($request) . "\r\n",
+      'content' => $request
+    )
+  );
 
-  $autologin = true;
-  $viewonline = true;
+  $ctx = stream_context_create($opts);
+  $content = file_get_contents($url, 0 , $ctx);
 
-  if (!$user->data['is_registered']) {
-    $result = $auth->login($username, $password, $autologin, $viewonline);
-
-    if ($result['status'] != LOGIN_SUCCESS) {
-      throw new ErrorException('phpBB login failed.');
-    }
+  if ($content != '1') {
+    throw new ErrorException('phpBB login failed.');
   }
 
-  # Bugzilla login
-  $cookies = array();
+  return get_cookies($http_response_header);
+}
 
+#
+# Login to Bugzilla.
+#
+function bugzilla_login($url, $username, $password) {
   $params = array(
     'login'    => $username,
     'password' => $password
-  #  'remember' => true
+    #  'remember' => true
   );
 
   $request = xmlrpc_encode_request('User.login', $params);
-  $header = array(
-    'Content-type: text/xml',
-    'Content-length: ' . strlen($request)
+
+  $opts = array(
+    'http' => array(
+      'method' => 'POST',
+      'header' => "Content-type: text/xml\r\n" .
+                  'Content-Length: ' . strlen($request) . "\r\n",
+      'content' => $request
+    )
   );
 
-  $url = 'http://www.test.nomic.net/bugzilla/xmlrpc.cgi';
+  $ctx = stream_context_create($opts);
+  $content = file_get_contents($url, 0 , $ctx);
 
-  $ch = curl_init();
-  curl_setopt($ch, CURLOPT_URL, $url);
-  curl_setopt($ch, CURLOPT_HEADERFUNCTION, 'read_header');
-  curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-  curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
-  curl_setopt($ch, CURLOPT_POST, true);
-  curl_setopt($ch, CURLOPT_POSTFIELDS, $request);
-  $data = curl_exec($ch);
-  curl_close($ch);
+  $reply = xmlrpc_decode($content);
+  if (xmlrpc_is_fault($reply)) {
+    throw new ErrorException(
+      $reply['faultString'] . ' (' . $reply['faultCode'] . ')');
+  }
 
+  return get_cookies($http_response_header);
+}
+
+#
+# Capture and parse cookies from an array of headers.
+#
+function get_cookies($headers) {
+  $cookies = array();
+
+  foreach ($headers as $header) {
+    if (!strncmp($header, 'Set-Cookie: ', 12)) {
+      # knock off the header name and split on attributes
+      $crumbs = explode('; ', substr($header, 12));
+      
+      # get the cookie name and value
+      $tmp = explode('=', array_shift($crumbs));
+      $name = trim($tmp[0]);
+      $cookies[$name]['value'] = trim($tmp[1]);
+ 
+      # get each attribute 
+      foreach ($crumbs as $crumb) {
+        $tmp = explode('=', $crumb);
+        $cookies[$name][strtolower(trim($tmp[0]))] =
+          sizeof($tmp) > 1 ? trim($tmp[1]) : null;
+      }
+    }
+  }
+
+  return $cookies;
+}
+
+#
+# Write an array of cookies created by get_cookies() as output.
+#
+function put_cookies($cookies) {
   foreach ($cookies as $name => $attr) {
     setrawcookie(
       $name,
@@ -148,66 +239,10 @@
       array_key_exists('httponly', $attr)
     );
   }
-
-  # FIXME: loop in case we have a cookie collision
-
-  # set our login cookie
-  $key = rand_base64_key();
-  $expires = time() + (60 * 60 * 24 * 30);
-
-  $auth = new AuthDB();
-  $auth->create_cookie($username, $key, $expires);
-
-  setrawcookie(
-    'VASSAL_login',
-    $key,
-    $expires,
-    '/',
-    'www.test.nomic.net',
-    false,
-    true
-  );
-
-  # go back where we came from
-  if (empty($returnto)) $returnto = '/index.php';
-  header("Location: $returnto");
-  exit;
 }
-catch (ErrorException $e) {
-  print_top($title);
-  warn($e->getMessage());
-  print_form($returnto);
-  print_bottom();
-  exit;
-}
 
-function read_header($ch, $string) {
-  $length = strlen($string);
 
-  if (!strncmp($string, "Set-Cookie:", 11)) {
-    parse_cookie_header($string);
-  }
 
-  return $length;
-}
-
-function parse_cookie_header($header) {
-  global $cookies;
-
-  $cookiestr = trim(substr($header, 11, -1));
-  $crumbs = explode(';', $cookiestr);
-    
-  $tmp = explode('=', array_shift($crumbs));
-  $name = trim($tmp[0]);
-  $cookies[$name]['value'] = trim($tmp[1]);
-  
-  foreach ($crumbs as $crumb) {
-    $tmp = explode('=', $crumb);
-    $cookies[$name][strtolower(trim($tmp[0]))] =
-      sizeof($tmp) > 1 ? trim($tmp[1]) : null;
-  }
-}
-
 function print_form($returnto) {
   $action = 'login.php';
   if (!empty($returnto)) $action .= "?returnto=$returnto";

Added: site-src/trunk/site/phpbb_login.php
===================================================================
--- site-src/trunk/site/phpbb_login.php	                        (rev 0)
+++ site-src/trunk/site/phpbb_login.php	2009-02-21 00:08:29 UTC (rev 5126)
@@ -0,0 +1,37 @@
+<?php
+
+# This is a shim for phpBB's login so that we can capture the Set-Cookie
+# headers it sends.
+
+$username = addslashes($_POST['username']);
+$password = addslashes($_POST['password']);
+
+if (empty($username) || empty($password)) {
+  print 0;
+  exit;
+}
+
+define('IN_PHPBB', true);
+$phpbb_root_path = '../forum/';
+$phpEx = 'php';
+include($phpbb_root_path . 'common.' . $phpEx);
+
+$user->session_begin(false);
+$auth->acl($user->data);
+$user->setup();
+
+$autologin = true;
+$viewonline = true;
+
+if (!$user->data['is_registered']) {
+  $reply = $auth->login($username, $password, $autologin, $viewonline);
+
+  if ($reply['status'] != LOGIN_SUCCESS) {
+    print 0;
+    exit;
+  }
+}
+
+print 1;
+
+?>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 5129
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5129&view=rev
Author:   uckelman
Date:     2009-02-21 15:26:19 +0000 (Sat, 21 Feb 2009)

Log Message:
-----------
Refactored cookie handling.
Logout works now.

Modified Paths:
--------------
    site-src/trunk/site/login.php
    site-src/trunk/site/logout.php
    site-src/trunk/site/sso/ssolib.php

Added Paths:
-----------
    site-src/trunk/site/phpbb_logout.php

Modified: site-src/trunk/site/login.php
===================================================================
--- site-src/trunk/site/login.php	2009-02-21 07:04:46 UTC (rev 5128)
+++ site-src/trunk/site/login.php	2009-02-21 15:26:19 UTC (rev 5129)
@@ -49,7 +49,7 @@
   $cookies += bugzilla_login($url, $username, $password);
 
   # write out the cookies captured from the logins 
-  put_cookies($cookies);
+  set_cookies($cookies);
 
   # FIXME: loop in case we have a cookie collision
 
@@ -130,7 +130,7 @@
     }
   }
 
-  return get_cookies($http_response_header);
+  return extract_cookies($http_response_header);
 }
 
 #
@@ -160,7 +160,7 @@
     throw new ErrorException('phpBB login failed.');
   }
 
-  return get_cookies($http_response_header);
+  return extract_cookies($http_response_header);
 }
 
 #
@@ -193,56 +193,9 @@
       $reply['faultString'] . ' (' . $reply['faultCode'] . ')');
   }
 
-  return get_cookies($http_response_header);
+  return extract_cookies($http_response_header);
 }
 
-#
-# Capture and parse cookies from an array of headers.
-#
-function get_cookies($headers) {
-  $cookies = array();
-
-  foreach ($headers as $header) {
-    if (!strncmp($header, 'Set-Cookie: ', 12)) {
-      # knock off the header name and split on attributes
-      $crumbs = explode('; ', substr($header, 12));
-      
-      # get the cookie name and value
-      $tmp = explode('=', array_shift($crumbs));
-      $name = trim($tmp[0]);
-      $cookies[$name]['value'] = trim($tmp[1]);
- 
-      # get each attribute 
-      foreach ($crumbs as $crumb) {
-        $tmp = explode('=', $crumb);
-        $cookies[$name][strtolower(trim($tmp[0]))] =
-          sizeof($tmp) > 1 ? trim($tmp[1]) : null;
-      }
-    }
-  }
-
-  return $cookies;
-}
-
-#
-# Write an array of cookies created by get_cookies() as output.
-#
-function put_cookies($cookies) {
-  foreach ($cookies as $name => $attr) {
-    setrawcookie(
-      $name,
-      $attr['value'],
-      array_key_exists('expires', $attr) ? strtotime($attr['expires']) : 0,
-      $attr['path'],
-      'www.test.nomic.net',
-      false,
-      array_key_exists('httponly', $attr)
-    );
-  }
-}
-
-
-
 function print_form($returnto) {
   $action = 'login.php';
   if (!empty($returnto)) $action .= "?returnto=$returnto";

Modified: site-src/trunk/site/logout.php
===================================================================
--- site-src/trunk/site/logout.php	2009-02-21 07:04:46 UTC (rev 5128)
+++ site-src/trunk/site/logout.php	2009-02-21 15:26:19 UTC (rev 5129)
@@ -1,4 +1,4 @@
-<?php
+<?php 
 
 require_once('sso/ssolib.php');
 
@@ -24,6 +24,30 @@
   }
 }
 
+try {
+  $cookies = array();
+
+  # MediaWiki logout
+  $url = 'http://www.test.nomic.net/wiki/api.php';
+  $cookies += mediawiki_logout($url);
+
+  # phpBB logout
+  $url = 'http://www.test.nomic.net/phpbb_logout.php';
+  $cookies += phpbb_logout($url);
+
+  # Bugzilla logout
+  $url = 'http://www.test.nomic.net/bugzilla/xmlrpc.cgi';
+  $cookies += bugzilla_logout($url);
+
+  set_cookies($cookies);  
+}
+catch (ErrorException $e) {
+  print_top($title);
+  warn($e->getMessage());
+  print_bottom();
+  exit;
+}
+
 # go back where we came from, if asked
 if (!empty($returnto)) {
   header("Location: $returnto");
@@ -34,4 +58,62 @@
   print_bottom();
 }
 
+
+function mediawiki_logout($url) {
+  $params = array(
+    'format'     => 'php',
+    'action'     => 'logout',
+  );
+ 
+  $request = http_build_query($params);
+
+  $opts = array(
+    'http' => array(
+      'method' => 'POST',
+      'header' => "Content-type: application/x-www-form-urlencoded\r\n" .
+                  'Content-Length: ' . strlen($request) . "\r\n" .
+                  'Cookie: ' . cookies_list($_COOKIE) . "\r\n",
+      'content' => $request
+    )
+  );
+
+  $ctx = stream_context_create($opts);
+  $content = file_get_contents($url, 0 , $ctx);
+
+  return extract_cookies($http_response_header);
+}
+
+function phpBB_logout($url) {
+  $opts = array(
+    'http' => array(
+      'method' => 'GET',
+      'header' => 'Cookie: ' . cookies_list($_COOKIE) . "\r\n"
+    )
+  );
+
+  $ctx = stream_context_create($opts);
+  $content = file_get_contents($url, 0 , $ctx);
+
+  return extract_cookies($http_response_header);
+}
+
+function bugzilla_logout($url) {
+  $request = xmlrpc_encode_request('User.logout', null);
+
+  $opts = array(
+    'http' => array(
+      'method' => 'POST',
+      'header' => "Content-type: text/xml\r\n" .
+                  'Content-Length: ' . strlen($request) . "\r\n" .
+                  'Cookie: ' . cookies_list($_COOKIE) . "\r\n",
+      'content' => $request
+    )
+  );
+
+  $ctx = stream_context_create($opts);
+  $content = file_get_contents($url, 0 , $ctx);
+
+  return extract_cookies($http_response_header);
+}
+
 ?>

Added: site-src/trunk/site/phpbb_logout.php
===================================================================
--- site-src/trunk/site/phpbb_logout.php	                        (rev 0)
+++ site-src/trunk/site/phpbb_logout.php	2009-02-21 15:26:19 UTC (rev 5129)
@@ -0,0 +1,13 @@
+<?php
+
+# This is a shim for phpBB's logout so that we can capture the Set-Cookie
+# headers it sends.
+
+define('IN_PHPBB', true);
+$phpbb_root_path = '../forum/';
+$phpEx = 'php';
+include($phpbb_root_path . 'common.' . $phpEx);
+
+$user->session_kill(false);
+
+?>

Modified: site-src/trunk/site/sso/ssolib.php
===================================================================
--- site-src/trunk/site/sso/ssolib.php	2009-02-21 07:04:46 UTC (rev 5128)
+++ site-src/trunk/site/sso/ssolib.php	2009-02-21 15:26:19 UTC (rev 5129)
@@ -6,6 +6,68 @@
   return strtr($key, '+/=', '-_');
 }
 
+#
+# Create a list of cookies for use in a 'Cookie:' header.
+#
+function cookies_list($cookies) {
+  $str = '';
+
+  $first = true;
+  foreach ($cookies as $name => $value) {
+    if ($first) $first = false;
+    else $str .= '; ';
+
+    $str .=  $name . '=' . $value;
+  }
+
+  return $str;
+}
+
+#
+# Capture and parse cookies from an array of headers.
+#
+function extract_cookies($headers) {
+  $cookies = array();
+
+  foreach ($headers as $header) {
+    if (!strncmp($header, 'Set-Cookie: ', 12)) {
+      # knock off the header name and split on attributes
+      $crumbs = explode('; ', substr($header, 12));
+
+      # get the cookie name and value
+      $tmp = explode('=', array_shift($crumbs));
+      $name = trim($tmp[0]);
+      $cookies[$name]['value'] = trim($tmp[1]);
+
+      # get each attribute 
+      foreach ($crumbs as $crumb) {
+        $tmp = explode('=', $crumb);
+        $cookies[$name][strtolower(trim($tmp[0]))] =
+          sizeof($tmp) > 1 ? trim($tmp[1]) : null;
+      }
+    }
+  }
+
+  return $cookies;
+}
+
+#
+# Write an array of cookies created by extract_cookies() as output.
+#
+function set_cookies($cookies) {
+  foreach ($cookies as $name => $attr) {
+    setrawcookie(
+      $name,
+      $attr['value'],
+      array_key_exists('expires', $attr) ? strtotime($attr['expires']) : 0,
+      $attr['path'],
+      'www.test.nomic.net',
+      false,
+      array_key_exists('httponly', $attr)
+    );
+  }
+}
+
 function warn($err) {
   print '<div class="errorbox"><h2>Error:</h2>' . $err . '</div>';
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 5130
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5130&view=rev
Author:   uckelman
Date:     2009-02-21 15:37:25 +0000 (Sat, 21 Feb 2009)

Log Message:
-----------
Set returnto to avoid warnings.

Modified Paths:
--------------
    site-src/trunk/site/login.php
    site-src/trunk/site/logout.php

Modified: site-src/trunk/site/login.php
===================================================================
--- site-src/trunk/site/login.php	2009-02-21 15:26:19 UTC (rev 5129)
+++ site-src/trunk/site/login.php	2009-02-21 15:37:25 UTC (rev 5130)
@@ -5,7 +5,7 @@
 
 $title = 'VASSAL Login';
 
-$returnto = $_GET['returnto'];
+$returnto = array_key_exists('returnto', $_GET) ? $_GET['returnto'] : '';
 
 # check whether this was a login attempt
 if (empty($_POST)) {

Modified: site-src/trunk/site/logout.php
===================================================================
--- site-src/trunk/site/logout.php	2009-02-21 15:26:19 UTC (rev 5129)
+++ site-src/trunk/site/logout.php	2009-02-21 15:37:25 UTC (rev 5130)
@@ -4,7 +4,7 @@
 
 $title = 'Log out';
 
-$returnto = $_GET['returnto'];
+$returnto = array_key_exists('returnto', $_GET) ? $_GET['returnto'] : '';
 
 # expire the cookie if we have one
 $key = $_COOKIE['VASSAL_login'];


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 5131
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5131&view=rev
Author:   uckelman
Date:     2009-02-21 15:57:17 +0000 (Sat, 21 Feb 2009)

Log Message:
-----------
Check for key existence in $_GET.

Modified Paths:
--------------
    site-src/trunk/site/login.php
    site-src/trunk/site/logout.php
    site-src/trunk/site/sso/ssolib.php

Modified: site-src/trunk/site/login.php
===================================================================
--- site-src/trunk/site/login.php	2009-02-21 15:37:25 UTC (rev 5130)
+++ site-src/trunk/site/login.php	2009-02-21 15:57:17 UTC (rev 5131)
@@ -5,7 +5,7 @@
 
 $title = 'VASSAL Login';
 
-$returnto = array_key_exists('returnto', $_GET) ? $_GET['returnto'] : '';
+$returnto = getval($_GET, 'returnto');
 
 # check whether this was a login attempt
 if (empty($_POST)) {

Modified: site-src/trunk/site/logout.php
===================================================================
--- site-src/trunk/site/logout.php	2009-02-21 15:37:25 UTC (rev 5130)
+++ site-src/trunk/site/logout.php	2009-02-21 15:57:17 UTC (rev 5131)
@@ -4,10 +4,10 @@
 
 $title = 'Log out';
 
-$returnto = array_key_exists('returnto', $_GET) ? $_GET['returnto'] : '';
+$returnto = getval($_GET, 'returnto');
 
 # expire the cookie if we have one
-$key = $_COOKIE['VASSAL_login'];
+$key = getval($_COOKIE, 'VASSAL_login');
 if (!empty($key)) {
 
   require_once('sso/AuthDB.php');

Modified: site-src/trunk/site/sso/ssolib.php
===================================================================
--- site-src/trunk/site/sso/ssolib.php	2009-02-21 15:37:25 UTC (rev 5130)
+++ site-src/trunk/site/sso/ssolib.php	2009-02-21 15:57:17 UTC (rev 5131)
@@ -6,6 +6,10 @@
   return strtr($key, '+/=', '-_');
 }
 
+function getval($hash, $key) {
+  return array_key_exists($key, $hash) ? $hash[$key]: '';
+}
+
 #
 # Create a list of cookies for use in a 'Cookie:' header.
 #


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 5132
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5132&view=rev
Author:   uckelman
Date:     2009-02-21 16:49:18 +0000 (Sat, 21 Feb 2009)

Log Message:
-----------
Moved login, logout functions to ssolib.

Modified Paths:
--------------
    site-src/trunk/site/login.php
    site-src/trunk/site/logout.php
    site-src/trunk/site/sso/ssolib.php

Modified: site-src/trunk/site/login.php
===================================================================
--- site-src/trunk/site/login.php	2009-02-21 15:57:17 UTC (rev 5131)
+++ site-src/trunk/site/login.php	2009-02-21 16:49:18 UTC (rev 5132)
@@ -83,119 +83,6 @@
   exit;
 }
 
-#
-# Login to MediaWiki.
-#
-function mediawiki_login($url, $username, $password) {
-  $params = array(
-    'format'     => 'php',
-    'action'     => 'login',
-    'lgname'     => $username,
-    'lgpassword' => $password,
-    'lgdomain'   => 'test'
-  );
- 
-  $request = http_build_query($params);
-
-  $opts = array(
-    'http' => array(
-      'method' => 'POST',
-      'header' => "Content-type: application/x-www-form-urlencoded\r\n" .
-                  'Content-Length: ' . strlen($request) . "\r\n",
-      'content' => $request
-    )
-  );
-
-  $ctx = stream_context_create($opts);
-  $content = file_get_contents($url, 0 , $ctx);
-
-  $reply = unserialize($content);
-  $reply = $reply['login'];
-
-  if ($reply['result'] != 'Success') {
-    if ($reply['result'] == 'Illegal') {
-      throw new ErrorException('MediaWiki login failed: Invalid username.');
-    }
-    else if ($reply['result'] == 'NotExists') {
-      throw new ErrorException('MediaWiki login failed: Invalid username.');
-    }
-    else if ($reply['result'] == 'WrongPass') {
-      throw new ErrorException('MediaWiki login falied: Invalid password.');
-    }
-    else if ($reply['result'] == 'WrongPluginPass') {
-      throw new ErrorException('MediaWiki login failed: Invalid password.');
-    }
-    else {
-      throw new ErrorException('MediaWiki login failed: ' . $reply['result']);
-    }
-  }
-
-  return extract_cookies($http_response_header);
-}
-
-#
-# Login to phpBB.
-#
-function phpbb_login($url, $username, $password) {
-  $params = array(
-    'username' => $username,
-    'password' => $password,
-  );
- 
-  $request = http_build_query($params);
-
-  $opts = array(
-    'http' => array(
-      'method' => 'POST',
-      'header' => "Content-type: application/x-www-form-urlencoded\r\n" .
-                  'Content-Length: ' . strlen($request) . "\r\n",
-      'content' => $request
-    )
-  );
-
-  $ctx = stream_context_create($opts);
-  $content = file_get_contents($url, 0 , $ctx);
-
-  if ($content != '1') {
-    throw new ErrorException('phpBB login failed.');
-  }
-
-  return extract_cookies($http_response_header);
-}
-
-#
-# Login to Bugzilla.
-#
-function bugzilla_login($url, $username, $password) {
-  $params = array(
-    'login'    => $username,
-    'password' => $password
-    #  'remember' => true
-  );
-
-  $request = xmlrpc_encode_request('User.login', $params);
-
-  $opts = array(
-    'http' => array(
-      'method' => 'POST',
-      'header' => "Content-type: text/xml\r\n" .
-                  'Content-Length: ' . strlen($request) . "\r\n",
-      'content' => $request
-    )
-  );
-
-  $ctx = stream_context_create($opts);
-  $content = file_get_contents($url, 0 , $ctx);
-
-  $reply = xmlrpc_decode($content);
-  if (xmlrpc_is_fault($reply)) {
-    throw new ErrorException(
-      $reply['faultString'] . ' (' . $reply['faultCode'] . ')');
-  }
-
-  return extract_cookies($http_response_header);
-}
-
 function print_form($returnto) {
   $action = 'login.php';
   if (!empty($returnto)) $action .= "?returnto=$returnto";

Modified: site-src/trunk/site/logout.php
===================================================================
--- site-src/trunk/site/logout.php	2009-02-21 15:57:17 UTC (rev 5131)
+++ site-src/trunk/site/logout.php	2009-02-21 16:49:18 UTC (rev 5132)
@@ -58,62 +58,4 @@
   print_bottom();
 }
 
-
-function mediawiki_logout($url) {
-  $params = array(
-    'format'     => 'php',
-    'action'     => 'logout',
-  );
- 
-  $request = http_build_query($params);
-
-  $opts = array(
-    'http' => array(
-      'method' => 'POST',
-      'header' => "Content-type: application/x-www-form-urlencoded\r\n" .
-                  'Content-Length: ' . strlen($request) . "\r\n" .
-                  'Cookie: ' . cookies_list($_COOKIE) . "\r\n",
-      'content' => $request
-    )
-  );
-
-  $ctx = stream_context_create($opts);
-  $content = file_get_contents($url, 0 , $ctx);
-
-  return extract_cookies($http_response_header);
-}
-
-function phpBB_logout($url) {
-  $opts = array(
-    'http' => array(
-      'method' => 'GET',
-      'header' => 'Cookie: ' . cookies_list($_COOKIE) . "\r\n"
-    )
-  );
-
-  $ctx = stream_context_create($opts);
-  $content = file_get_contents($url, 0 , $ctx);
-
-  return extract_cookies($http_response_header);
-}
-
-function bugzilla_logout($url) {
-  $request = xmlrpc_encode_request('User.logout', null);
-
-  $opts = array(
-    'http' => array(
-      'method' => 'POST',
-      'header' => "Content-type: text/xml\r\n" .
-                  'Content-Length: ' . strlen($request) . "\r\n" .
-                  'Cookie: ' . cookies_list($_COOKIE) . "\r\n",
-      'content' => $request
-    )
-  );
-
-  $ctx = stream_context_create($opts);
-  $content = file_get_contents($url, 0 , $ctx);
-
-  return extract_cookies($http_response_header);
-}
-
 ?>

Modified: site-src/trunk/site/sso/ssolib.php
===================================================================
--- site-src/trunk/site/sso/ssolib.php	2009-02-21 15:57:17 UTC (rev 5131)
+++ site-src/trunk/site/sso/ssolib.php	2009-02-21 16:49:18 UTC (rev 5132)
@@ -11,6 +11,185 @@
 }
 
 #
+# Login to MediaWiki.
+#
+function mediawiki_login($url, $username, $password) {
+  $params = array(
+    'format'     => 'php',
+    'action'     => 'login',
+    'lgname'     => $username,
+    'lgpassword' => $password,
+    'lgdomain'   => 'test'
+  );
+
+  $request = http_build_query($params);
+
+  $opts = array(
+    'http' => array(
+      'method' => 'POST',
+      'header' => "Content-type: application/x-www-form-urlencoded\r\n" .
+                  'Content-Length: ' . strlen($request) . "\r\n",
+      'content' => $request
+    )
+  );
+
+  $ctx = stream_context_create($opts);
+  $content = file_get_contents($url, 0 , $ctx);
+
+  $reply = unserialize($content);
+  $reply = $reply['login'];
+
+  if ($reply['result'] != 'Success') {
+    if ($reply['result'] == 'Illegal') {
+      throw new ErrorException('MediaWiki login failed: Invalid username.');
+    }
+    else if ($reply['result'] == 'NotExists') {
+      throw new ErrorException('MediaWiki login failed: Invalid username.');
+    }
+    else if ($reply['result'] == 'WrongPass') {
+      throw new ErrorException('MediaWiki login falied: Invalid password.');
+    }
+    else if ($reply['result'] == 'WrongPluginPass') {
+      throw new ErrorException('MediaWiki login failed: Invalid password.');
+    }
+    else {
+      throw new ErrorException('MediaWiki login failed: ' . $reply['result']);
+    }
+  }
+
+  return extract_cookies($http_response_header);
+}
+
+#
+# Logout of MediaWiki
+#
+function mediawiki_logout($url) {
+  $params = array(
+    'format'     => 'php',
+    'action'     => 'logout',
+  );
+
+  $request = http_build_query($params);
+
+  $opts = array(
+    'http' => array(
+      'method' => 'POST',
+      'header' => "Content-type: application/x-www-form-urlencoded\r\n" .
+                  'Content-Length: ' . strlen($request) . "\r\n" .
+                  'Cookie: ' . cookies_list($_COOKIE) . "\r\n",
+      'content' => $request
+    )
+  );
+
+  $ctx = stream_context_create($opts);
+  $content = file_get_contents($url, 0 , $ctx);
+
+  return extract_cookies($http_response_header);
+}
+
+#
+# Login to phpBB.
+#
+function phpbb_login($url, $username, $password) {
+  $params = array(
+    'username' => $username,
+    'password' => $password,
+  );
+
+  $request = http_build_query($params);
+
+  $opts = array(
+    'http' => array(
+      'method' => 'POST',
+      'header' => "Content-type: application/x-www-form-urlencoded\r\n" .
+                  'Content-Length: ' . strlen($request) . "\r\n",
+      'content' => $request
+    )
+  );
+
+  $ctx = stream_context_create($opts);
+  $content = file_get_contents($url, 0 , $ctx);
+
+  if ($content != '1') {
+    throw new ErrorException('phpBB login failed.');
+  }
+
+  return extract_cookies($http_response_header);
+}
+
+#
+# Logout of phpBB.
+#
+function phpBB_logout($url) {
+  $opts = array(
+    'http' => array(
+      'method' => 'GET',
+      'header' => 'Cookie: ' . cookies_list($_COOKIE) . "\r\n"
+    )
+  );
+
+  $ctx = stream_context_create($opts);
+  $content = file_get_contents($url, 0 , $ctx);
+
+  return extract_cookies($http_response_header);
+}
+
+#
+# Login to Bugzilla.
+#
+function bugzilla_login($url, $username, $password) {
+  $params = array(
+    'login'    => $username,
+    'password' => $password
+    #  'remember' => true
+  );
+
+  $request = xmlrpc_encode_request('User.login', $params);
+
+  $opts = array(
+    'http' => array(
+      'method' => 'POST',
+      'header' => "Content-type: text/xml\r\n" .
+                  'Content-Length: ' . strlen($request) . "\r\n",
+      'content' => $request
+    )
+  );
+
+  $ctx = stream_context_create($opts);
+  $content = file_get_contents($url, 0 , $ctx);
+
+  $reply = xmlrpc_decode($content);
+  if (xmlrpc_is_fault($reply)) {
+    throw new ErrorException(
+      $reply['faultString'] . ' (' . $reply['faultCode'] . ')');
+  }
+
+  return extract_cookies($http_response_header);
+}
+
+#
+# Logout of Bugzilla.
+#
+function bugzilla_logout($url) {
+  $request = xmlrpc_encode_request('User.logout', null);
+
+  $opts = array(
+    'http' => array(
+      'method' => 'POST',
+      'header' => "Content-type: text/xml\r\n" .
+                  'Content-Length: ' . strlen($request) . "\r\n" .
+                  'Cookie: ' . cookies_list($_COOKIE) . "\r\n",
+      'content' => $request
+    )
+  );
+
+  $ctx = stream_context_create($opts);
+  $content = file_get_contents($url, 0 , $ctx);
+
+  return extract_cookies($http_response_header);
+}
+
+#
 # Create a list of cookies for use in a 'Cookie:' header.
 #
 function cookies_list($cookies) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 5168
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5168&view=rev
Author:   uckelman
Date:     2009-02-25 20:14:56 +0000 (Wed, 25 Feb 2009)

Log Message:
-----------
Remove getval().

Modified Paths:
--------------
    site-src/trunk/site/login.php
    site-src/trunk/site/logout.php
    site-src/trunk/site/sso/ssolib.php

Modified: site-src/trunk/site/login.php
===================================================================
--- site-src/trunk/site/login.php	2009-02-25 12:08:02 UTC (rev 5167)
+++ site-src/trunk/site/login.php	2009-02-25 20:14:56 UTC (rev 5168)
@@ -5,7 +5,7 @@
 
 $title = 'VASSAL Login';
 
-$returnto = getval($_GET, 'returnto');
+$returnto = isset($_GET['returnto']) ? $_GET['returnto'] : '';
 
 # check whether this was a login attempt
 if (empty($_POST)) {

Modified: site-src/trunk/site/logout.php
===================================================================
--- site-src/trunk/site/logout.php	2009-02-25 12:08:02 UTC (rev 5167)
+++ site-src/trunk/site/logout.php	2009-02-25 20:14:56 UTC (rev 5168)
@@ -4,10 +4,10 @@
 
 $title = 'Log out';
 
-$returnto = getval($_GET, 'returnto');
+$returnto = isset($_GET['returnto']) ? $_GET['returnto'] : '';
 
 # expire the cookie if we have one
-$key = getval($_COOKIE, 'VASSAL_login');
+$key = isset($_COOKIE['VASSAL_login']) ? $_COOKIE['VASSAL_login'] : '';
 if (!empty($key)) {
 
   require_once('sso/AuthDB.php');

Modified: site-src/trunk/site/sso/ssolib.php
===================================================================
--- site-src/trunk/site/sso/ssolib.php	2009-02-25 12:08:02 UTC (rev 5167)
+++ site-src/trunk/site/sso/ssolib.php	2009-02-25 20:14:56 UTC (rev 5168)
@@ -6,10 +6,6 @@
   return strtr($key, '+/=', '-_');
 }
 
-function getval($hash, $key) {
-  return array_key_exists($key, $hash) ? $hash[$key]: '';
-}
-
 #
 # Login to MediaWiki.
 #


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 5171
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5171&view=rev
Author:   uckelman
Date:     2009-02-27 19:39:31 +0000 (Fri, 27 Feb 2009)

Log Message:
-----------
Color scheme work.

Modified Paths:
--------------
    site-src/trunk/site/index.php
    site-src/trunk/site/style.css

Added Paths:
-----------
    site-src/trunk/site/images/stripe.jpg
    site-src/trunk/site/images/stripe2.jpg

Added: site-src/trunk/site/images/stripe.jpg
===================================================================
(Binary files differ)


Property changes on: site-src/trunk/site/images/stripe.jpg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: site-src/trunk/site/images/stripe2.jpg
===================================================================
(Binary files differ)


Property changes on: site-src/trunk/site/images/stripe2.jpg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: site-src/trunk/site/index.php
===================================================================
--- site-src/trunk/site/index.php	2009-02-27 18:49:13 UTC (rev 5170)
+++ site-src/trunk/site/index.php	2009-02-27 19:39:31 UTC (rev 5171)
@@ -56,7 +56,7 @@
       <div id="vassal-about">
         <h1>What is VASSAL?</h1>
         <p>VASSAL is a game engine for building and playing online adaptations of board games and card games. It allows users to play in real time over the Internet, or by email. VASSAL runs on all platforms, and is free, open-source software.</p>
-        <p>Click <a href="">here</a> to learn more about VASSAL</p>
+        <p>Click <a href="foo">here</a> to learn more about VASSAL</p>
 
         <table class="screenshot">
           <tr>
@@ -107,56 +107,55 @@
         <p>The VASSAL project is run by volunteers and makes progress by the efforts of volunteers. Is there a feature you'd like to see in the next release? Did you find a bug? Request that feature or report the bug <a href="bugzilla/">here</a>. Are you a programmer? We could use your help. Join us in the <a href="">developers' forum</a>. Not a programmer? Help us improve our <a href="">documentation</a>.</p>
       </div>
     </div>
-  </div>
 
-  <div class="content_box_full" id="vassal-news">
-    <h1>Latest News <a href="news.php"><img src="images/feed-icon-14x14.png"/></a></h1>
-    <ul class="news">
-      <li class="day">
-        <div class="date">Feb<br/>1</div>
-        <ul class="events">
-          <li><a href="">This is a news item in the future</a></li>
-        </ul>
-      </li>
-      <li class="day">
-        <div class="date">Jan<br/>31</div>
-        <ul class="events">
-          <li><a href="">VASSAL 3.1.0 released</a></li>
-          <li><a href="">VASSAL has a new web site</a></li>
-          <li><a href="">This is a test news item</a></li>
-          <li><a href="">No news is good news</a></li>
-        </ul>
-      </li>
-      <li class="day">
-        <div class="date">Jan<br/>30</div>
-        <ul class="events">
-          <li><a href="">Monsterpocalypse 1.01 released</a></li>
-        </ul>
-      </li>
-      <li class="day">
-        <div class="date">Jan<br/>26</div>
-        <ul class="events">
-          <li><a href="">VASSAL 3.1.0-beta8 released</a></li>
-          <li><a href="">Zombies are eating my brain</a></li>
-        </ul>
-      </li>
-      <li class="day">
-        <div class="date">Jan<br/>25</div>
-        <ul class="events">
-          <li><a href="">VASSAL 3.1.0-beta8 released</a></li>
-          <li><a href="">Zombies are eating my brain</a></li>
-        </ul>
-      </li>
-      <li class="day">
-        <div class="date">Jan<br/>24</div>
-        <ul class="events">
-          <li><a href="">Star Wars Tactics Version 1.4 released</a></li>
-          <li><a href="">This is a very, very long news item, put here just to test what happens when we have a very, very long news item</a></li>
-        </ul>
-      </li>
-    </ul>
-    <em><a id="more-news" href="">...more news</a></em>
-
+    <div class="content_box_full" id="vassal-news">
+      <h1>Latest News <a href="news.php"><img src="images/feed-icon-14x14.png"/></a></h1>
+      <ul class="news">
+        <li class="day">
+          <div class="date">Feb<br/>1</div>
+          <ul class="events">
+            <li><a href="">This is a news item in the future</a></li>
+          </ul>
+        </li>
+        <li class="day">
+          <div class="date">Jan<br/>31</div>
+          <ul class="events">
+            <li><a href="">VASSAL 3.1.0 released</a></li>
+            <li><a href="">VASSAL has a new web site</a></li>
+            <li><a href="">This is a test news item</a></li>
+            <li><a href="">No news is good news</a></li>
+          </ul>
+        </li>
+        <li class="day">
+          <div class="date">Jan<br/>30</div>
+          <ul class="events">
+            <li><a href="">Monsterpocalypse 1.01 released</a></li>
+          </ul>
+        </li>
+        <li class="day">
+          <div class="date">Jan<br/>26</div>
+          <ul class="events">
+            <li><a href="">VASSAL 3.1.0-beta8 released</a></li>
+            <li><a href="">Zombies are eating my brain</a></li>
+          </ul>
+        </li>
+        <li class="day">
+          <div class="date">Jan<br/>25</div>
+          <ul class="events">
+            <li><a href="">VASSAL 3.1.0-beta8 released</a></li>
+            <li><a href="">Zombies are eating my brain</a></li>
+          </ul>
+        </li>
+        <li class="day">
+          <div class="date">Jan<br/>24</div>
+          <ul class="events">
+            <li><a href="">Star Wars Tactics Version 1.4 released</a></li>
+            <li><a href="">This is a very, very long news item, put here just to test what happens when we have a very, very long news item</a></li>
+          </ul>
+        </li>
+      </ul>
+      <em><a id="more-news" href="">...more news</a></em>
+    </div>
   </div>
 
   <?php virtual('/footer.shtml'); ?>

Modified: site-src/trunk/site/style.css
===================================================================
--- site-src/trunk/site/style.css	2009-02-27 18:49:13 UTC (rev 5170)
+++ site-src/trunk/site/style.css	2009-02-27 19:39:31 UTC (rev 5171)
@@ -3,7 +3,7 @@
   font-size: small;
   margin: 0 auto;
   padding: 0;
-  background: none;
+  background-color: white;
   min-width: 700px;
   width: 790px;
 }
@@ -16,6 +16,18 @@
   text-align: justify;
 }
 
+a { 
+  color: #546035; 
+}
+ 
+a:visited { 
+  color: #384024; 
+} 
+
+a:hover { 
+  color: #9caa79;
+} 
+
 a img {
   border: 0;
 }
@@ -99,11 +111,9 @@
 #vassal-nav-list {
   margin: 0;
   padding: 0;
-
-  height: 28px;
-  background: transparent url('images/stripe.png') left repeat-x;
-  border-top: 1px solid #c7c7c7;
-  border-bottom: 1px solid #e7e7e7;
+  height: 29px;
+  background: transparent url('images/stripe.jpg') left repeat-x;
+  border-bottom: 1px solid black;
 }
 
 #vassal-nav-list li {
@@ -116,8 +126,8 @@
 
 #vassal-nav-list a {
   display: block;
-  color: #333333;
-  padding: 8px 10px;
+  color: white;
+  padding: 10px 10px 5px 10px;
   font-weight: bold;
   font-size: 110%;
   text-decoration: none;
@@ -125,8 +135,8 @@
 }
 
 #vassal-nav-list a:hover {
-  color: #eeeeee;
-  background-color: #5e5a5a;
+  color: #f8d530;
+  background: transparent url('images/stripe2.jpg') left repeat-x;
 }
 
 #vassal-footer {
@@ -161,6 +171,13 @@
   clear: both;
 }
 
+#content h1 {
+  display: block;
+/*  margin: 0.67em, 0, 0.67em, 0; */
+/*  line-height: 0.3; */  /* why? */ 
+  color: #384024; 
+} 
+
 .content_box_left { 
   width: 48%;
   float: left;
@@ -205,7 +222,7 @@
   text-align: center;
 }
 
-div.dlbutton a {
+div.dlbutton a, div.dlbutton a:hover, div.dlbutton a:visited {
   color: white;
   text-decoration: none;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 5173
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5173&view=rev
Author:   uckelman
Date:     2009-02-27 20:19:04 +0000 (Fri, 27 Feb 2009)

Log Message:
-----------
Switched VASSAL to smallcaps.

Modified Paths:
--------------
    site-src/trunk/site/index.php
    site-src/trunk/site/style.css

Modified: site-src/trunk/site/index.php
===================================================================
--- site-src/trunk/site/index.php	2009-02-27 20:08:46 UTC (rev 5172)
+++ site-src/trunk/site/index.php	2009-02-27 20:19:04 UTC (rev 5173)
@@ -44,8 +44,10 @@
       <li><a href="download.html">Download</a></li>
   	  <li><a href="">Modules</a></li>
   	  <li><a href="">FAQ</a></li>
-	    <li><a href="">Documentation</a></li>
-	    <li><a href="forum/">Forum</a></li>
+	    <li><a href="">Docs</a></li>
+	    <li><a href="/forum/">Forum</a></li>
+  	  <li><a href="/wiki/">Wiki</a></li>
+  	  <li><a href="/bugzilla/">Tracker</a></li>
   	  <li><a href="news.php">News</a></li>
   	  <li><a href="">Help</a></li>
     </ul>
@@ -54,9 +56,9 @@
   <div id="content">
     <div class="content_box_left">
       <div id="vassal-about">
-        <h1>What is VASSAL?</h1>
-        <p>VASSAL is a game engine for building and playing online adaptations of board games and card games. It allows users to play in real time over the Internet, or by email. VASSAL runs on all platforms, and is free, open-source software.</p>
-        <p>Click <a href="foo">here</a> to learn more about VASSAL</p>
+        <h1>What is <span class="sc">Vassal</span>?</h1>
+        <p><span class="sc">Vassal</span> is a game engine for building and playing online adaptations of board games and card games. It allows users to play in real time over the Internet, or by email. <span class="sc">Vassal</span> runs on all platforms, and is free, open-source software.</p>
+        <p>Click <a href="foo">here</a> to learn more about <span class="sc">Vassal</span>.</p>
 
         <table class="screenshot">
           <tr>
@@ -66,7 +68,7 @@
         </table>
   
         <h1>What Games Are There?</h1>
-        <p>Hundreds of boardgames have been converted for use with VASSAL, so there's a good chance that you'll find the games you own in our <a href="">module library</a> already. If there is not yet a VASSAL module for your favorite game, you can use the VASSAL Editor to build your own module, and should you run into trouble, help is only a click away in our <a href="forum/">forum</a>.</p>
+        <p>Hundreds of boardgames have been converted for use with <span class="sc">Vassal</span>, so there's a good chance that you'll find the games you own in our <a href="">module library</a> already. If there is not yet a <span class="sc">Vassal</span> module for your favorite game, you can use the <span class="sc">Vassal</span> Editor to build your own module, and should you run into trouble, help is only a click away in our <a href="forum/">forum</a>.</p>
 
         <table class="screenshot">
           <tr>
@@ -79,8 +81,8 @@
 
     <div class="content_box_right">
       <div id="vassal-download">
-        <h1>Get VASSAL</h1>
-        <p>VASSAL is free, open-source software, created by volunteers. Our current release is 3.1.0.</p> 
+        <h1>Get <span class="sc">Vassal</span></h1>
+        <p><span class="sc">Vassal</span> is free, open-source software, created by volunteers. Our current release is 3.1.0.</p> 
         <div class="dlbutton">
           <div>Download 3.1.0</div>
           <ul class="dllist">
@@ -91,20 +93,20 @@
         </div>
 
         <div class="dlbutton">
-          <div>Support VASSAL</div>
+          <div>Support <span class="sc">Vassal</span></div>
           <a href=""><img src="images/paypal_donate.png"/></a>
         </div>
-        <p>VASSAL is free, but development and hosting are not. If you enjoy using VASSAL, please consider helping us with these costs.</p>
+        <p><span class="sc">Vassal</span> is free, but development and hosting are not. If you enjoy using <span class="sc">Vassal</span>, please consider helping us with these costs.</p>
       </div>
 
       <div id="vassal-help">
         <h1>Get Help</h1>
-        <p>Need help with using VASSAL? Stuck while creating a module? If you can't find an answer in our extensive <a href="">documentation</a>, check our friendly <a href="forum/">forum</a> for help.</p>
+        <p>Need help using <span class="sc">Vassal</span>? Stuck while creating a module? If you can't find an answer in our extensive <a href="">documentation</a>, check our friendly <a href="forum/">forum</a> for help.</p>
       </div>
 
       <div id="vassal-contribute">
         <h1>Get Involved</h1>
-        <p>The VASSAL project is run by volunteers and makes progress by the efforts of volunteers. Is there a feature you'd like to see in the next release? Did you find a bug? Request that feature or report the bug <a href="bugzilla/">here</a>. Are you a programmer? We could use your help. Join us in the <a href="">developers' forum</a>. Not a programmer? Help us improve our <a href="">documentation</a>.</p>
+        <p>The <span class="sc">Vassal</span> project is run by volunteers and makes progress by the efforts of volunteers. Is there a feature you'd like to see in the next release? Did you find a bug? Request that feature or report the bug <a href="bugzilla/">here</a>. Are you a programmer? We could use your help. Join us in the <a href="">developers' forum</a>. Not a programmer? Help us improve our <a href="">documentation</a>.</p>
       </div>
     </div>
 
@@ -120,8 +122,8 @@
         <li class="day">
           <div class="date">Jan<br/>31</div>
           <ul class="events">
-            <li><a href="">VASSAL 3.1.0 released</a></li>
-            <li><a href="">VASSAL has a new web site</a></li>
+            <li><a href=""><span class="sc">Vassal</span> 3.1.0 released</a></li>
+            <li><a href=""><span class="sc">Vassal</span> has a new web site</a></li>
             <li><a href="">This is a test news item</a></li>
             <li><a href="">No news is good news</a></li>
           </ul>
@@ -135,14 +137,14 @@
         <li class="day">
           <div class="date">Jan<br/>26</div>
           <ul class="events">
-            <li><a href="">VASSAL 3.1.0-beta8 released</a></li>
+            <li><a href=""><span class="sc">Vassal</span> 3.1.0-beta8 released</a></li>
             <li><a href="">Zombies are eating my brain</a></li>
           </ul>
         </li>
         <li class="day">
           <div class="date">Jan<br/>25</div>
           <ul class="events">
-            <li><a href="">VASSAL 3.1.0-beta8 released</a></li>
+            <li><a href=""><span class="sc">Vassal</span> 3.1.0-beta8 released</a></li>
             <li><a href="">Zombies are eating my brain</a></li>
           </ul>
         </li>

Modified: site-src/trunk/site/style.css
===================================================================
--- site-src/trunk/site/style.css	2009-02-27 20:08:46 UTC (rev 5172)
+++ site-src/trunk/site/style.css	2009-02-27 20:19:04 UTC (rev 5173)
@@ -32,6 +32,10 @@
   border: 0;
 }
 
+.sc {
+  font-variant: small-caps;
+}
+
 #vassal-page {
   margin: 0 5px;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 5175
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5175&view=rev
Author:   uckelman
Date:     2009-02-27 20:22:52 +0000 (Fri, 27 Feb 2009)

Log Message:
-----------
Switched JPEG gradients to PNGs.

Modified Paths:
--------------
    site-src/trunk/site/style.css

Added Paths:
-----------
    site-src/trunk/site/images/stripe.png
    site-src/trunk/site/images/stripe2.png

Removed Paths:
-------------
    site-src/trunk/site/images/stripe.jpg
    site-src/trunk/site/images/stripe2.jpg

Deleted: site-src/trunk/site/images/stripe.jpg
===================================================================
(Binary files differ)

Added: site-src/trunk/site/images/stripe.png
===================================================================
(Binary files differ)


Property changes on: site-src/trunk/site/images/stripe.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Deleted: site-src/trunk/site/images/stripe2.jpg
===================================================================
(Binary files differ)

Added: site-src/trunk/site/images/stripe2.png
===================================================================
(Binary files differ)


Property changes on: site-src/trunk/site/images/stripe2.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: site-src/trunk/site/style.css
===================================================================
--- site-src/trunk/site/style.css	2009-02-27 20:20:26 UTC (rev 5174)
+++ site-src/trunk/site/style.css	2009-02-27 20:22:52 UTC (rev 5175)
@@ -116,7 +116,7 @@
   margin: 0;
   padding: 0;
   height: 29px;
-  background: transparent url('images/stripe.jpg') left repeat-x;
+  background: transparent url('images/stripe.png') left repeat-x;
   border-bottom: 1px solid black;
 }
 
@@ -140,7 +140,7 @@
 
 #vassal-nav-list a:hover {
   color: #f8d530;
-  background: transparent url('images/stripe2.jpg') left repeat-x;
+  background: transparent url('images/stripe2.png') left repeat-x;
 }
 
 #vassal-footer {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 5178
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5178&view=rev
Author:   uckelman
Date:     2009-02-27 23:57:07 +0000 (Fri, 27 Feb 2009)

Log Message:
-----------
Spiffed up nav bar.

Modified Paths:
--------------
    site-src/trunk/site/footer.shtml
    site-src/trunk/site/images/footer.png
    site-src/trunk/site/index.php
    site-src/trunk/site/style.css

Added Paths:
-----------
    site-src/trunk/site/images/header_bg-w.png

Modified: site-src/trunk/site/footer.shtml
===================================================================
--- site-src/trunk/site/footer.shtml	2009-02-27 21:03:14 UTC (rev 5177)
+++ site-src/trunk/site/footer.shtml	2009-02-27 23:57:07 UTC (rev 5178)
@@ -1,7 +1,7 @@
-  <div id="vassal-footer">
-    <ul id="vassal-footer-list">
-      <li><a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=90612&amp;type=2" width="125" height="37" alt="SourceForge.net Logo" /></a></li>
-      <li><a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml11" alt="Valid XHTML 1.1" height="31" width="88" /></a></li>
-      <li><a href="http://jigsaw.w3.org/css-validator/"><img style="width: 88px; height: 31px" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!" /></a></li>
-    </ul>
-  </div> 
+<div id="vassal-footer">
+  <ul id="vassal-footer-list">
+    <li><a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=90612&amp;type=2" width="125" height="37" alt="SourceForge.net Logo" /></a></li>
+    <li><a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml11" alt="Valid XHTML 1.1" height="31" width="88" /></a></li>
+    <li><a href="http://jigsaw.w3.org/css-validator/"><img style="width: 88px; height: 31px" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!" /></a></li>
+  </ul>
+</div> 

Modified: site-src/trunk/site/images/footer.png
===================================================================
(Binary files differ)

Added: site-src/trunk/site/images/header_bg-w.png
===================================================================
(Binary files differ)


Property changes on: site-src/trunk/site/images/header_bg-w.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: site-src/trunk/site/index.php
===================================================================
--- site-src/trunk/site/index.php	2009-02-27 21:03:14 UTC (rev 5177)
+++ site-src/trunk/site/index.php	2009-02-27 23:57:07 UTC (rev 5178)
@@ -8,16 +8,13 @@
   <title>VASSAL</title>
 </head>
 <body>
-<div id="vassal-page">
-  <div id="vassal-header">
-    <div id="vassal-logo">
-      <a href="/index.php"><img src="/images/header.png"/></a>
-    </div>
+<div id="vassal-header">
+  <div id="vassal-logo">
+    <a href="/index.php"><img src="/images/header.png"/></a>
+  </div>
+  <?php virtual('/navigation.shtml'); ?>
 
-    <div id="vassal-search">
-    </div>
-
-    <div id="vassal-login">
+  <div id="vassal-login">
 <?php
   $key = $_COOKIE['VASSAL_login'];
   if (!empty($key)) { 
@@ -36,131 +33,117 @@
     print '<a href="login.php?returnto=/index.php">Log in</a>';
   }
 ?>
-    </div>
   </div>
+</div>
 
-  <div id="vassal-navigation">
-    <ul id="vassal-nav-list">
-      <li><a href="download.html">Download</a></li>
-  	  <li><a href="">Modules</a></li>
-  	  <li><a href="">FAQ</a></li>
-	    <li><a href="">Docs</a></li>
-	    <li><a href="/forum/">Forum</a></li>
-  	  <li><a href="/wiki/">Wiki</a></li>
-  	  <li><a href="/bugzilla/">Tracker</a></li>
-  	  <li><a href="news.php">News</a></li>
-  	  <li><a href="">Help</a></li>
-    </ul>
-  </div>
+<div id="content">
+  <div class="content_box_left">
+    <div id="vassal-about">
+      <h1>What is <span class="sc">Vassal</span>?</h1>
+      <p><span class="sc">Vassal</span> is a game engine for building and playing online adaptations of board games and card games. It allows users to play in real time over the Internet, or by email. <span class="sc">Vassal</span> runs on all platforms, and is free, open-source software.</p>
+      <p>Click <a href="foo">here</a> to learn more about <span class="sc">Vassal</span>.</p>
 
-  <div id="content">
-    <div class="content_box_left">
-      <div id="vassal-about">
-        <h1>What is <span class="sc">Vassal</span>?</h1>
-        <p><span class="sc">Vassal</span> is a game engine for building and playing online adaptations of board games and card games. It allows users to play in real time over the Internet, or by email. <span class="sc">Vassal</span> runs on all platforms, and is free, open-source software.</p>
-        <p>Click <a href="foo">here</a> to learn more about <span class="sc">Vassal</span>.</p>
-
-        <table class="screenshot">
-          <tr>
-            <td><a href="/images/screenshot1.png"><img src="/thumbs/screenshot1.png" /></a></td>
-            <td><a href="/images/screenshot2.png"><img src="/thumbs/screenshot2.png" /></a></td>
-          </tr>
-        </table>
+      <table class="screenshot">
+        <tr>
+          <td><a href="/images/screenshot1.png"><img src="/thumbs/screenshot1.png" /></a></td>
+          <td><a href="/images/screenshot2.png"><img src="/thumbs/screenshot2.png" /></a></td>
+        </tr>
+      </table>
   
-        <h1>What Games Are There?</h1>
-        <p>Hundreds of boardgames have been converted for use with <span class="sc">Vassal</span>, so there's a good chance that you'll find the games you own in our <a href="">module library</a> already. If there is not yet a <span class="sc">Vassal</span> module for your favorite game, you can use the <span class="sc">Vassal</span> Editor to build your own module, and should you run into trouble, help is only a click away in our <a href="forum/">forum</a>.</p>
+      <h1>What Games Are There?</h1>
+      <p>Hundreds of boardgames have been converted for use with <span class="sc">Vassal</span>, so there's a good chance that you'll find the games you own in our <a href="">module library</a> already. If there is not yet a <span class="sc">Vassal</span> module for your favorite game, you can use the <span class="sc">Vassal</span> Editor to build your own module, and should you run into trouble, help is only a click away in our <a href="forum/">forum</a>.</p>
 
-        <table class="screenshot">
-          <tr>
-            <td><a href="/images/screenshot2.png"><img src="/thumbs/screenshot2.png" /></a></td>
-            <td><a href="/images/screenshot1.png"><img src="/thumbs/screenshot1.png" /></a></td>
-          </tr>
-        </table>
-      </div>
+      <table class="screenshot">
+        <tr>
+          <td><a href="/images/screenshot2.png"><img src="/thumbs/screenshot2.png" /></a></td>
+          <td><a href="/images/screenshot1.png"><img src="/thumbs/screenshot1.png" /></a></td>
+        </tr>
+      </table>
     </div>
+  </div>
 
-    <div class="content_box_right">
-      <div id="vassal-download">
-        <h1>Get <span class="sc">Vassal</span></h1>
-        <p><span class="sc">Vassal</span> is free, open-source software, created by volunteers. Our current release is 3.1.0.</p> 
-        <div class="dlbutton">
-          <div>Download 3.1.0</div>
-          <ul class="dllist">
-            <li><a href="http://downloads.sourceforge.net/vassalengine/VASSAL-3.1.0-beta8-generic.zip">Linux</a></li>
-            <li><a href="http://downloads.sourceforge.net/vassalengine/VASSAL-3.1.0-beta8-windows.exe">Mac OS</a></li>
-            <li><a href="http://downloads.sourceforge.net/vassalengine/VASSAL-3.1.0-beta8-macosx.dmg">Windows</a></li>
-          </ul>
-        </div>
-
-        <div class="dlbutton">
-          <div>Support <span class="sc">Vassal</span></div>
-          <a href=""><img src="/images/paypal_donate.png"/></a>
-        </div>
-        <p><span class="sc">Vassal</span> is free, but development and hosting are not. If you enjoy using <span class="sc">Vassal</span>, please consider helping us with these costs.</p>
+  <div class="content_box_right">
+    <div id="vassal-download">
+      <h1>Get <span class="sc">Vassal</span></h1>
+      <p><span class="sc">Vassal</span> is free, open-source software, created by volunteers. Our current release is 3.1.0.</p> 
+      <div class="dlbutton">
+        <div>Download 3.1.0</div>
+        <ul class="dllist">
+          <li><a href="http://downloads.sourceforge.net/vassalengine/VASSAL-3.1.0-beta8-generic.zip">Linux</a></li>
+          <li><a href="http://downloads.sourceforge.net/vassalengine/VASSAL-3.1.0-beta8-windows.exe">Mac OS</a></li>
+          <li><a href="http://downloads.sourceforge.net/vassalengine/VASSAL-3.1.0-beta8-macosx.dmg">Windows</a></li>
+        </ul>
       </div>
 
-      <div id="vassal-help">
-        <h1>Get Help</h1>
-        <p>Need help using <span class="sc">Vassal</span>? Stuck while creating a module? If you can't find an answer in our extensive <a href="">documentation</a>, check our friendly <a href="forum/">forum</a> for help.</p>
+      <div class="dlbutton">
+        <div>Support <span class="sc">Vassal</span></div>
+        <a href=""><img src="/images/paypal_donate.png"/></a>
       </div>
+      <p><span class="sc">Vassal</span> is free, but development and hosting are not. If you enjoy using <span class="sc">Vassal</span>, please consider helping us with these costs.</p>
+    </div>
 
-      <div id="vassal-contribute">
-        <h1>Get Involved</h1>
-        <p>The <span class="sc">Vassal</span> project is run by volunteers and makes progress by the efforts of volunteers. Is there a feature you'd like to see in the next release? Did you find a bug? Request that feature or report the bug <a href="bugzilla/">here</a>. Are you a programmer? We could use your help. Join us in the <a href="">developers' forum</a>. Not a programmer? Help us improve our <a href="">documentation</a>.</p>
-      </div>
+    <div id="vassal-help">
+      <h1>Get Help</h1>
+      <p>Need help using <span class="sc">Vassal</span>? Stuck while creating a module? If you can't find an answer in our extensive <a href="">documentation</a>, check our friendly <a href="forum/">forum</a> for help.</p>
     </div>
 
-    <div class="content_box_full" id="vassal-news">
-      <h1>Latest News <a href="news.php"><img src="/images/feed-icon-14x14.png"/></a></h1>
-      <ul class="news">
-        <li class="day">
-          <div class="date">Feb<br/>1</div>
-          <ul class="events">
-            <li><a href="">This is a news item in the future</a></li>
-          </ul>
-        </li>
-        <li class="day">
-          <div class="date">Jan<br/>31</div>
-          <ul class="events">
-            <li><a href=""><span class="sc">Vassal</span> 3.1.0 released</a></li>
-            <li><a href=""><span class="sc">Vassal</span> has a new web site</a></li>
-            <li><a href="">This is a test news item</a></li>
-            <li><a href="">No news is good news</a></li>
-          </ul>
-        </li>
-        <li class="day">
-          <div class="date">Jan<br/>30</div>
-          <ul class="events">
-            <li><a href="">Monsterpocalypse 1.01 released</a></li>
-          </ul>
-        </li>
-        <li class="day">
-          <div class="date">Jan<br/>26</div>
-          <ul class="events">
-            <li><a href=""><span class="sc">Vassal</span> 3.1.0-beta8 released</a></li>
-            <li><a href="">Zombies are eating my brain</a></li>
-          </ul>
-        </li>
-        <li class="day">
-          <div class="date">Jan<br/>25</div>
-          <ul class="events">
-            <li><a href=""><span class="sc">Vassal</span> 3.1.0-beta8 released</a></li>
-            <li><a href="">Zombies are eating my brain</a></li>
-          </ul>
-        </li>
-        <li class="day">
-          <div class="date">Jan<br/>24</div>
-          <ul class="events">
-            <li><a href="">Star Wars Tactics Version 1.4 released</a></li>
-            <li><a href="">This is a very, very long news item, put here just to test what happens when we have a very, very long news item</a></li>
-          </ul>
-        </li>
-      </ul>
-      <em><a id="more-news" href="">...more news</a></em>
+    <div id="vassal-contribute">
+      <h1>Get Involved</h1>
+      <p>The <span class="sc">Vassal</span> project is run by volunteers and makes progress by the efforts of volunteers. Is there a feature you'd like to see in the next release? Did you find a bug? Request that feature or report the bug <a href="bugzilla/">here</a>. Are you a programmer? We could use your help. Join us in the <a href="">developers' forum</a>. Not a programmer? Help us improve our <a href="">documentation</a>.</p>
     </div>
   </div>
 
-  <?php virtual('/footer.shtml'); ?>
+  <div class="content_box_full" id="vassal-news">
+    <h1>Latest News <a href="news.php"><img src="/images/feed-icon-14x14.png"/></a></h1>
+    <ul class="news">
+      <li class="day">
+        <div class="date">Feb<br/>1</div>
+        <ul class="events">
+          <li><a href="">This is a news item in the future</a></li>
+        </ul>
+      </li>
+      <li class="day">
+        <div class="date">Jan<br/>31</div>
+        <ul class="events">
+          <li><a href=""><span class="sc">Vassal</span> 3.1.0 released</a></li>
+          <li><a href=""><span class="sc">Vassal</span> has a new web site</a></li>
+          <li><a href="">This is a test news item</a></li>
+          <li><a href="">No news is good news</a></li>
+        </ul>
+      </li>
+      <li class="day">
+        <div class="date">Jan<br/>30</div>
+        <ul class="events">
+          <li><a href="">Monsterpocalypse 1.01 released</a></li>
+        </ul>
+      </li>
+      <li class="day">
+        <div class="date">Jan<br/>26</div>
+        <ul class="events">
+          <li><a href=""><span class="sc">Vassal</span> 3.1.0-beta8 released</a></li>
+          <li><a href="">Zombies are eating my brain</a></li>
+        </ul>
+      </li>
+      <li class="day">
+        <div class="date">Jan<br/>25</div>
+        <ul class="events">
+          <li><a href=""><span class="sc">Vassal</span> 3.1.0-beta8 released</a></li>
+          <li><a href="">Zombies are eating my brain</a></li>
+        </ul>
+      </li>
+      <li class="day">
+        <div class="date">Jan<br/>24</div>
+        <ul class="events">
+          <li><a href="">Star Wars Tactics Version 1.4 released</a></li>
+          <li><a href="">This is a very, very long news item, put here just to test what happens when we have a very, very long news item</a></li>
+        </ul>
+      </li>
+    </ul>
+    <em><a id="more-news" href="">...more news</a></em>
+  </div>
+</div>
+
+<?php virtual('/footer.shtml'); ?>
 <!--
   <div id="vassal-footer">
     <ul id="vassal-footer-list">
@@ -174,6 +157,5 @@
     </ul>
     <ul>
 -->
-</div>
 </body>
 </html>

Modified: site-src/trunk/site/style.css
===================================================================
--- site-src/trunk/site/style.css	2009-02-27 21:03:14 UTC (rev 5177)
+++ site-src/trunk/site/style.css	2009-02-27 23:57:07 UTC (rev 5178)
@@ -1,11 +1,10 @@
-
 body {
-  font-size: small;
   margin: 0 auto;
   padding: 0;
+/*  font-size: small; */
+  font-size: 72.5%;
   background-color: white;
-  min-width: 700px;
-  width: 790px;
+  max-width: 900px;
 }
 
 body, td, th, input, textarea, pre, h1, h2, h3, h4, h5, h6 { color: #222; }
@@ -36,24 +35,23 @@
   font-variant: small-caps;
 }
 
-#vassal-page {
-  margin: 0 5px;
+#vassal-header {
+  overflow: auto;
+  border-bottom: 1px solid black;
 }
 
 #vassal-logo {
   float: left;
-  margin-top: 5px;
+  margin: 0;
+  padding: 10px 20px 10px 10px;
+  background: transparent url('/images/header_bg-w.png') top left no-repeat;
 }
 
 #vassal-logo a img {
   border: none;
 }
 
-#vassal-header {
-  min-height: 82px;
-  height: 82px;
-  margin: 0 auto;
-  padding: 0;
+#vassal-navigation {
 }
 
 #vassal-login {
@@ -116,7 +114,7 @@
   margin: 0;
   padding: 0;
   height: 29px;
-  background: transparent url('images/stripe.png') left repeat-x;
+  background: transparent url('/images/stripe.png') left repeat-x;
   border-bottom: 1px solid black;
 }
 
@@ -133,21 +131,21 @@
   color: white;
   padding: 10px 10px 5px 10px;
   font-weight: bold;
-  font-size: 110%;
+/*  font-size: 72.5%; */
   text-decoration: none;
   line-height: 1;
 }
 
 #vassal-nav-list a:hover {
   color: #f8d530;
-  background: transparent url('images/stripe2.png') left repeat-x;
+  background: transparent url('/images/stripe2.png') left repeat-x;
 }
 
 #vassal-footer {
   clear: both;
   margin-top: 15px;
-  padding-top: 76px;
-  background: transparent url('images/footer.png') top repeat-x;
+  padding-top: 36px;
+  background: transparent url('/images/footer.png') top;
 }
 
 #vassal-footer-list {
@@ -172,7 +170,15 @@
 }
 
 #content {
+  margin: 0 auto;
+  padding: 0;
+  min-width: 700px;
+  max-width: 790px;
+  width: 790px;
   clear: both;
+
+  font-size: 1.2em;
+  line-height: 1.25em;
 }
 
 #content h1 {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 5191
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5191&view=rev
Author:   uckelman
Date:     2009-02-28 17:20:32 +0000 (Sat, 28 Feb 2009)

Log Message:
-----------
Use <acronym> for smallcaps. More semantic that way.
Ditched footer image.

Modified Paths:
--------------
    site-src/trunk/site/footer.shtml
    site-src/trunk/site/index.php
    site-src/trunk/site/style.css

Removed Paths:
-------------
    site-src/trunk/site/images/footer.png

Modified: site-src/trunk/site/footer.shtml
===================================================================
--- site-src/trunk/site/footer.shtml	2009-02-28 16:36:21 UTC (rev 5190)
+++ site-src/trunk/site/footer.shtml	2009-02-28 17:20:32 UTC (rev 5191)
@@ -2,6 +2,6 @@
   <ul id="vassal-footer-list">
     <li><a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=90612&amp;type=2" width="125" height="37" alt="SourceForge.net Logo" /></a></li>
     <li><a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml11" alt="Valid XHTML 1.1" height="31" width="88" /></a></li>
-    <li><a href="http://jigsaw.w3.org/css-validator/"><img style="width: 88px; height: 31px" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!" /></a></li>
+    <li><a href="http://jigsaw.w3.org/css-validator/validator?uri=www.test.nomic.net"><img style="width: 88px; height: 31px" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!" /></a></li>
   </ul>
 </div> 

Deleted: site-src/trunk/site/images/footer.png
===================================================================
(Binary files differ)

Modified: site-src/trunk/site/index.php
===================================================================
--- site-src/trunk/site/index.php	2009-02-28 16:36:21 UTC (rev 5190)
+++ site-src/trunk/site/index.php	2009-02-28 17:20:32 UTC (rev 5191)
@@ -39,9 +39,9 @@
 <div id="content">
   <div class="content_box_left">
     <div id="vassal-about">
-      <h1>What is <span class="sc">Vassal</span>?</h1>
-      <p><span class="sc">Vassal</span> is a game engine for building and playing online adaptations of board games and card games. It allows users to play in real time over the Internet, or by email. <span class="sc">Vassal</span> runs on all platforms, and is free, open-source software.</p>
-      <p>Click <a href="foo">here</a> to learn more about <span class="sc">Vassal</span>.</p>
+      <h1>What is <acronym>Vassal</acronym>?</h1>
+      <p><acronym>Vassal</acronym> is a game engine for building and playing online adaptations of board games and card games. It allows users to play in real time over the Internet, or by email. <acronym>Vassal</acronym> runs on all platforms, and is free, open-source software.</p>
+      <p>Click <a href="foo">here</a> to learn more about <acronym>Vassal</acronym>.</p>
 
       <table class="screenshot">
         <tr>
@@ -51,7 +51,7 @@
       </table>
   
       <h1>What Games Are There?</h1>
-      <p>Hundreds of boardgames have been converted for use with <span class="sc">Vassal</span>, so there's a good chance that you'll find the games you own in our <a href="">module library</a> already. If there is not yet a <span class="sc">Vassal</span> module for your favorite game, you can use the <span class="sc">Vassal</span> Editor to build your own module, and should you run into trouble, help is only a click away in our <a href="forum/">forum</a>.</p>
+      <p>Hundreds of boardgames have been converted for use with <acronym>Vassal</acronym>, so there's a good chance that you'll find the games you own in our <a href="">module library</a> already. If there is not yet a <acronym>Vassal</acronym> module for your favorite game, you can use the <acronym>Vassal</acronym> Editor to build your own module, and should you run into trouble, help is only a click away in our <a href="forum/">forum</a>.</p>
 
       <table class="screenshot">
         <tr>
@@ -64,8 +64,8 @@
 
   <div class="content_box_right">
     <div id="vassal-download">
-      <h1>Get <span class="sc">Vassal</span></h1>
-      <p><span class="sc">Vassal</span> is free, open-source software, created by volunteers. Our current release is 3.1.0.</p> 
+      <h1>Get <acronym>Vassal</acronym></h1>
+      <p><acronym>Vassal</acronym> is free, open-source software, created by volunteers. Our current release is 3.1.0.</p> 
       <div class="dlbutton">
         <div>Download 3.1.0</div>
         <ul class="dllist">
@@ -76,20 +76,20 @@
       </div>
 
       <div class="dlbutton">
-        <div>Support <span class="sc">Vassal</span></div>
+        <div>Support <acronym>Vassal</acronym></div>
         <a href=""><img src="/images/paypal_donate.png"/></a>
       </div>
-      <p><span class="sc">Vassal</span> is free, but development and hosting are not. If you enjoy using <span class="sc">Vassal</span>, please consider helping us with these costs.</p>
+      <p><acronym>Vassal</acronym> is free, but development and hosting are not. If you enjoy using <acronym>Vassal</acronym>, please consider helping us with these costs.</p>
     </div>
 
     <div id="vassal-help">
       <h1>Get Help</h1>
-      <p>Need help using <span class="sc">Vassal</span>? Stuck while creating a module? If you can't find an answer in our extensive <a href="">documentation</a>, check our friendly <a href="forum/">forum</a> for help.</p>
+      <p>Need help using <acronym>Vassal</acronym>? Stuck while creating a module? If you can't find an answer in our extensive <a href="">documentation</a>, check our friendly <a href="forum/">forum</a> for help.</p>
     </div>
 
     <div id="vassal-contribute">
       <h1>Get Involved</h1>
-      <p>The <span class="sc">Vassal</span> project is run by volunteers and makes progress by the efforts of volunteers. Is there a feature you'd like to see in the next release? Did you find a bug? Request that feature or report the bug <a href="bugzilla/">here</a>. Are you a programmer? We could use your help. Join us in the <a href="">developers' forum</a>. Not a programmer? Help us improve our <a href="">documentation</a>.</p>
+      <p>The <acronym>Vassal</acronym> project is run by volunteers and makes progress by the efforts of volunteers. Is there a feature you'd like to see in the next release? Did you find a bug? Request that feature or report the bug <a href="bugzilla/">here</a>. Are you a programmer? We could use your help. Join us in the <a href="">developers' forum</a>. Not a programmer? Help us improve our <a href="">documentation</a>.</p>
     </div>
   </div>
 
@@ -105,8 +105,8 @@
       <li class="day">
         <div class="date">Jan<br/>31</div>
         <ul class="events">
-          <li><a href=""><span class="sc">Vassal</span> 3.1.0 released</a></li>
-          <li><a href=""><span class="sc">Vassal</span> has a new web site</a></li>
+          <li><a href=""><acronym>Vassal</acronym> 3.1.0 released</a></li>
+          <li><a href=""><acronym>Vassal</acronym> has a new web site</a></li>
           <li><a href="">This is a test news item</a></li>
           <li><a href="">No news is good news</a></li>
         </ul>
@@ -120,14 +120,14 @@
       <li class="day">
         <div class="date">Jan<br/>26</div>
         <ul class="events">
-          <li><a href=""><span class="sc">Vassal</span> 3.1.0-beta8 released</a></li>
+          <li><a href=""><acronym>Vassal</acronym> 3.1.0-beta8 released</a></li>
           <li><a href="">Zombies are eating my brain</a></li>
         </ul>
       </li>
       <li class="day">
         <div class="date">Jan<br/>25</div>
         <ul class="events">
-          <li><a href=""><span class="sc">Vassal</span> 3.1.0-beta8 released</a></li>
+          <li><a href=""><acronym>Vassal</acronym> 3.1.0-beta8 released</a></li>
           <li><a href="">Zombies are eating my brain</a></li>
         </ul>
       </li>

Modified: site-src/trunk/site/style.css
===================================================================
--- site-src/trunk/site/style.css	2009-02-28 16:36:21 UTC (rev 5190)
+++ site-src/trunk/site/style.css	2009-02-28 17:20:32 UTC (rev 5191)
@@ -31,7 +31,7 @@
   border: 0;
 }
 
-.sc {
+acronym {
   font-variant: small-caps;
 }
 
@@ -143,9 +143,8 @@
 
 #vassal-footer {
   clear: both;
-  margin-top: 15px;
-  padding-top: 36px;
-  background: transparent url('/images/footer.png') top;
+  margin-top: 4em;
+  border-top: 1px solid black;
 }
 
 #vassal-footer-list {
@@ -157,20 +156,19 @@
   display: inline;
   list-style: none;
   margin: 0;
-  padding: 0;
+  padding: 8px 10px;
   float: left;
 }
 
 #vassal-footer-list a {
   display: block;
-  padding: 8px 10px;
   font-size: small;
   text-decoration: none;
   line-height: 1;
 }
 
 #content {
-  margin: 0 auto;
+  margin: 1em auto;
   padding: 0;
   min-width: 700px;
   max-width: 790px;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 5192
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5192&view=rev
Author:   uckelman
Date:     2009-02-28 19:08:21 +0000 (Sat, 28 Feb 2009)

Log Message:
-----------
Split header and footer to site.css.
Added YourKit logo in footer.

Modified Paths:
--------------
    site-src/trunk/site/footer.shtml
    site-src/trunk/site/index.php
    site-src/trunk/site/style.css

Added Paths:
-----------
    site-src/trunk/site/images/YourKit_logo.png
    site-src/trunk/site/site.css

Modified: site-src/trunk/site/footer.shtml
===================================================================
--- site-src/trunk/site/footer.shtml	2009-02-28 17:20:32 UTC (rev 5191)
+++ site-src/trunk/site/footer.shtml	2009-02-28 19:08:21 UTC (rev 5192)
@@ -1,6 +1,7 @@
 <div id="vassal-footer">
   <ul id="vassal-footer-list">
     <li><a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=90612&amp;type=2" width="125" height="37" alt="SourceForge.net Logo" /></a></li>
+    <li><a href="http://www.yourkit.com/"><img src="/images/YourKit_logo.png" alt="YourKit Java Profiler" /></a></li>
     <li><a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml11" alt="Valid XHTML 1.1" height="31" width="88" /></a></li>
     <li><a href="http://jigsaw.w3.org/css-validator/validator?uri=www.test.nomic.net"><img style="width: 88px; height: 31px" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!" /></a></li>
   </ul>

Added: site-src/trunk/site/images/YourKit_logo.png
===================================================================
(Binary files differ)


Property changes on: site-src/trunk/site/images/YourKit_logo.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: site-src/trunk/site/index.php
===================================================================
--- site-src/trunk/site/index.php	2009-02-28 17:20:32 UTC (rev 5191)
+++ site-src/trunk/site/index.php	2009-02-28 19:08:21 UTC (rev 5192)
@@ -3,6 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head profile="http://www.w3.org/2005/10/profile">
   <link rel="stylesheet" type="text/css" href="/style.css"/>
+  <link rel="stylesheet" type="text/css" href="/site.css"/>
   <link rel="alternate" type="application/rss+xml" title="RSS" href="" />
   <link rel="icon" type="image/png" href="/images/VASSAL.png"/>
   <title>VASSAL</title>

Added: site-src/trunk/site/site.css
===================================================================
--- site-src/trunk/site/site.css	                        (rev 0)
+++ site-src/trunk/site/site.css	2009-02-28 19:08:21 UTC (rev 5192)
@@ -0,0 +1,84 @@
+/* Site header */
+
+#vassal-header {
+  overflow: auto;
+  border-bottom: 1px solid black;
+  margin-bottom: 10px;
+}
+
+#vassal-logo {
+  float: left;
+  margin: 0;
+  padding: 10px 20px 10px 10px;
+  background: transparent url('/images/header_bg-w.png') top left no-repeat;
+}
+
+#vassal-logo a img {
+  border: none;
+}
+
+
+/* Site navigation bar */
+
+#vassal-nav-list {
+  margin: 0;
+  padding: 0;
+  height: 29px;
+  background: transparent url('/images/stripe.png') left repeat-x;
+  border-bottom: 1px solid black;
+}
+
+#vassal-nav-list li {
+  display: inline;
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  float: left;
+}
+
+#vassal-nav-list a {
+  display: block;
+  color: white;
+  padding: 10px 10px 5px 9px;
+  font-family: sans-serif;
+  font-weight: bold;
+  font-size: 8pt;
+/*  font-size: 72.5%; */
+  text-decoration: none;
+  line-height: 1;
+}
+
+#vassal-nav-list a:hover {
+  color: #f8d530;
+  background: transparent url('/images/stripe2.png') left repeat-x;
+}
+
+
+/* Site footer */
+
+#vassal-footer {
+  clear: both;
+  margin-top: 4em;
+  border-top: 1px solid black;
+}
+
+#vassal-footer-list {
+  float: right;
+  margin: 0;
+  padding: 0px 5px;
+}
+
+#vassal-footer-list li {
+  display: inline;
+  list-style: none;
+  margin: 0;
+  padding: 8px 10px;
+  float: left;
+}
+
+#vassal-footer-list a {
+  display: block;
+  font-size: small;
+  text-decoration: none;
+  line-height: 1;
+}

Modified: site-src/trunk/site/style.css
===================================================================
--- site-src/trunk/site/style.css	2009-02-28 17:20:32 UTC (rev 5191)
+++ site-src/trunk/site/style.css	2009-02-28 19:08:21 UTC (rev 5192)
@@ -1,6 +1,6 @@
 body {
   margin: 0 auto;
-  padding: 0;
+  padding: 0 0 1em 0;
 /*  font-size: small; */
   font-size: 72.5%;
   background-color: white;
@@ -35,25 +35,6 @@
   font-variant: small-caps;
 }
 
-#vassal-header {
-  overflow: auto;
-  border-bottom: 1px solid black;
-}
-
-#vassal-logo {
-  float: left;
-  margin: 0;
-  padding: 10px 20px 10px 10px;
-  background: transparent url('/images/header_bg-w.png') top left no-repeat;
-}
-
-#vassal-logo a img {
-  border: none;
-}
-
-#vassal-navigation {
-}
-
 #vassal-login {
   float: right;
   margin: 5px 5px 0 0;
@@ -110,63 +91,6 @@
   border: none;
 }
 
-#vassal-nav-list {
-  margin: 0;
-  padding: 0;
-  height: 29px;
-  background: transparent url('/images/stripe.png') left repeat-x;
-  border-bottom: 1px solid black;
-}
-
-#vassal-nav-list li {
-  display: inline;
-  list-style: none;
-  margin: 0;
-  padding: 0;
-  float: left;
-}
-
-#vassal-nav-list a {
-  display: block;
-  color: white;
-  padding: 10px 10px 5px 10px;
-  font-weight: bold;
-/*  font-size: 72.5%; */
-  text-decoration: none;
-  line-height: 1;
-}
-
-#vassal-nav-list a:hover {
-  color: #f8d530;
-  background: transparent url('/images/stripe2.png') left repeat-x;
-}
-
-#vassal-footer {
-  clear: both;
-  margin-top: 4em;
-  border-top: 1px solid black;
-}
-
-#vassal-footer-list {
-  margin: 0;
-  padding: 0px 5px;
-}
-
-#vassal-footer-list li {
-  display: inline;
-  list-style: none;
-  margin: 0;
-  padding: 8px 10px;
-  float: left;
-}
-
-#vassal-footer-list a {
-  display: block;
-  font-size: small;
-  text-decoration: none;
-  line-height: 1;
-}
-
 #content {
   margin: 1em auto;
   padding: 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 5197
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5197&view=rev
Author:   uckelman
Date:     2009-03-02 16:26:54 +0000 (Mon, 02 Mar 2009)

Log Message:
-----------
Download quick link now auto-detects user's operating system.

Modified Paths:
--------------
    site-src/trunk/site/index.php
    site-src/trunk/site/style.css

Added Paths:
-----------
    site-src/trunk/site/images/button.download.png
    site-src/trunk/site/inc/
    site-src/trunk/site/inc/download-detect.php

Added: site-src/trunk/site/images/button.download.png
===================================================================
(Binary files differ)


Property changes on: site-src/trunk/site/images/button.download.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: site-src/trunk/site/inc/download-detect.php
===================================================================
--- site-src/trunk/site/inc/download-detect.php	                        (rev 0)
+++ site-src/trunk/site/inc/download-detect.php	2009-03-02 16:26:54 UTC (rev 5197)
@@ -0,0 +1,26 @@
+<?php
+
+$version = '3.1.0';
+$base_url = 'http://downloads.sourceforge.net/vassalengine';
+ 
+// Get the user's browser
+$useragent = $_SERVER['HTTP_USER_AGENT'];
+
+if (strstr($useragent, 'Win')) {
+  $download_os = ' for Windows';
+  $download_url = "$base_url/VASSAL-$version-windows.exe";
+}
+else if (strstr($useragent, 'Linux')) {
+  $download_os = ' for Linux';
+  $download_url = "$base_url/VASSAL-$version-linux.zip";
+}
+else if (strstr($useragent, 'Mac')) {
+  $download_os = ' for Mac OS X';
+  $download_url = "$base_url/VASSAL-$version-macosx.dmg";
+}
+else {
+  $download_os = '';
+  $download_url = "$base_url/VASSAL-$version-other.zip";
+}
+
+?>

Modified: site-src/trunk/site/index.php
===================================================================
--- site-src/trunk/site/index.php	2009-03-02 11:44:52 UTC (rev 5196)
+++ site-src/trunk/site/index.php	2009-03-02 16:26:54 UTC (rev 5197)
@@ -68,17 +68,13 @@
       <h1>Get <acronym>Vassal</acronym></h1>
       <p><acronym>Vassal</acronym> is free, open-source software, created by volunteers. Our current release is 3.1.0.</p> 
       <div class="dlbutton">
-        <div>Download 3.1.0</div>
-        <ul class="dllist">
-          <li><a href="http://downloads.sourceforge.net/vassalengine/VASSAL-3.1.0-beta8-generic.zip">Linux</a></li>
-          <li><a href="http://downloads.sourceforge.net/vassalengine/VASSAL-3.1.0-beta8-windows.exe">Mac OS</a></li>
-          <li><a href="http://downloads.sourceforge.net/vassalengine/VASSAL-3.1.0-beta8-macosx.dmg">Windows</a></li>
-        </ul>
+        <?php
+          include 'inc/download-detect.php';
+          echo "<a href=\"$download_url\"><span>Download <acronym>Vassal</acronym><br/>$version$download_os</span><img src=\"/images/button.download.png\"/></a>";
+        ?>
       </div>
-
       <div class="dlbutton">
-        <div>Support <acronym>Vassal</acronym></div>
-        <a href=""><img src="/images/paypal_donate.png"/></a>
+        <a href=""><span>Support <acronym>Vassal</acronym></span><img src="/images/paypal_donate.png"/></a>
       </div>
       <p><acronym>Vassal</acronym> is free, but development and hosting are not. If you enjoy using <acronym>Vassal</acronym>, please consider helping us with these costs.</p>
     </div>

Modified: site-src/trunk/site/style.css
===================================================================
--- site-src/trunk/site/style.css	2009-03-02 11:44:52 UTC (rev 5196)
+++ site-src/trunk/site/style.css	2009-03-02 16:26:54 UTC (rev 5197)
@@ -100,14 +100,13 @@
   clear: both;
 
   font-size: 1.2em;
-  line-height: 1.25em;
+/*  line-height: 1.25em; */
 }
 
 #content h1 {
-  display: block;
 /*  margin: 0.67em, 0, 0.67em, 0; */
 /*  line-height: 0.3; */  /* why? */ 
-  color: #384024; 
+  color: #384024;
 } 
 
 .content_box_left { 
@@ -126,21 +125,11 @@
   clear: both;
 }
 
-ul.dllist {
-  display: block;
-  margin: 0;
-  padding: 0.5em;
-}
 
-ul.dllist li {
-  margin: 0 5px;
-  padding: 0;
-  list-style: none;
-  display: inline;
-}
 
+
 div.dlbutton {
-  padding: 0.5em;
+  padding: 1em;
   margin: 1em auto;
   border: 1px solid #8dea34;
   border-radius: 5px;
@@ -154,19 +143,36 @@
   text-align: center;
 }
 
-div.dlbutton a, div.dlbutton a:hover, div.dlbutton a:visited {
+div.dlbutton a {
+  display: block;
+  overflow: auto;
   color: white;
   text-decoration: none;
 }
 
-div.dlbutton a:hover {
+div.dlbutton a:hover, div.dlbutton a:visited {
+  color: white;
+  text-decoration: none;
+}
+
+div.dlbutton a:hover span {
   text-decoration: underline;
 }
 
-div.dlbutton div {
-  margin: 0.5em;
+div.dlbutton a span {
+  display: inline-block;
+  vertical-align: middle;
+  text-align: center;
+  padding: 12px;
 }
 
+div.dlbutton a img {
+  vertical-align: middle;
+}
+
+
+
+
 table.screenshot {
   margin: 0 auto;
 }
@@ -224,3 +230,59 @@
 div.date:first-line {
   font-size: 70%;
 }
+
+
+
+
+
+
+
+#download {
+   margin-left: auto;
+   margin-right: auto;
+   border-collapse: collapse;
+}
+
+#download th {
+   font-weight: bold;
+   font-size: 0.85em;
+}
+
+#download tr.release {
+   background: #eeeeee;
+   border: 1px solid #cccccc;
+   font-weight: bold;
+}
+
+#download tr {
+   border: 1px solid #cccccc;
+}
+
+#download td.date {
+   text-align: right;
+}
+
+#download tbody.formatgroup {
+   border: 1px solid #cccccc;
+}
+
+#download td.format {
+   padding: 0 0.5em 0 0.5em;
+}
+
+#download td.name, #download td.note {
+   font-size: 0.85em;
+   padding: 2px 0.5em 2px 0.5em;
+}
+
+#download td.size {
+   font-family: monospace;
+   text-align: right;
+   padding: 0 0.5em 0 0.5em;
+}
+
+#download td.md5sum {
+   font-family: monospace;
+   padding: 0 0.5em 0 0.5em;
+}
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 5198
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5198&view=rev
Author:   uckelman
Date:     2009-03-02 16:39:17 +0000 (Mon, 02 Mar 2009)

Log Message:
-----------
Added more links to footer.

Modified Paths:
--------------
    site-src/trunk/site/footer.shtml
    site-src/trunk/site/index.php
    site-src/trunk/site/site.css

Modified: site-src/trunk/site/footer.shtml
===================================================================
--- site-src/trunk/site/footer.shtml	2009-03-02 16:26:54 UTC (rev 5197)
+++ site-src/trunk/site/footer.shtml	2009-03-02 16:39:17 UTC (rev 5198)
@@ -1,5 +1,11 @@
 <div id="vassal-footer">
   <ul id="vassal-footer-list">
+    <li>Copyright &copy; 2009 <a href="/about.html">The <acronym>Vassal</acronym> Team</a></li>
+    <li><a href="/license.html">License</a></li>
+    <li><a href="/donate.html">Donate</a></li>
+    <li><a href="/sitemap.html">Sitemap</a></li>
+    <li><a href="/search.html">Search</a></li>
+    <li><a href="/about.html">About</a></li>
     <li><a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=90612&amp;type=2" width="125" height="37" alt="SourceForge.net Logo" /></a></li>
     <li><a href="http://www.yourkit.com/"><img src="/images/YourKit_logo.png" alt="YourKit Java Profiler" /></a></li>
   </ul>

Modified: site-src/trunk/site/index.php
===================================================================
--- site-src/trunk/site/index.php	2009-03-02 16:26:54 UTC (rev 5197)
+++ site-src/trunk/site/index.php	2009-03-02 16:39:17 UTC (rev 5198)
@@ -141,18 +141,5 @@
 </div>
 
 <?php virtual('/footer.shtml'); ?>
-<!--
-  <div id="vassal-footer">
-    <ul id="vassal-footer-list">
--->
-<!--      <li>Copyright &copy; 2009 <a href="">VASSAL dev team</a></li>
-      <li><a href="">License</a></li>
-      <li><a href="">Donate</a></li>
-      <li><a href="">Sitemap</a></li>
-      <li><a href="">Search</a></li>
-      <li><a href="">About</a></li>
-    </ul>
-    <ul>
--->
 </body>
 </html>

Modified: site-src/trunk/site/site.css
===================================================================
--- site-src/trunk/site/site.css	2009-03-02 16:26:54 UTC (rev 5197)
+++ site-src/trunk/site/site.css	2009-03-02 16:39:17 UTC (rev 5198)
@@ -59,6 +59,8 @@
 #vassal-footer {
   clear: both;
   margin-top: 4em;
+  padding-top: 10px;
+  margin-bottom: 4em;
   border-top: 1px solid black;
 }
 
@@ -73,12 +75,18 @@
   list-style: none;
   margin: 0;
   padding: 8px 10px;
-  float: left;
+/*  float: left; */
 }
 
 #vassal-footer-list a {
-  display: block;
+/*  display: block; */
   font-size: small;
   text-decoration: none;
   line-height: 1;
 }
+
+#vassal-footer-list a img {
+  vertical-align: middle;
+}
+
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 5200
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5200&view=rev
Author:   uckelman
Date:     2009-03-02 22:07:37 +0000 (Mon, 02 Mar 2009)

Log Message:
-----------
Footer modifications.

Modified Paths:
--------------
    site-src/trunk/site/footer.shtml
    site-src/trunk/site/images/YourKit_logo.png
    site-src/trunk/site/site.css

Modified: site-src/trunk/site/footer.shtml
===================================================================
--- site-src/trunk/site/footer.shtml	2009-03-02 20:23:47 UTC (rev 5199)
+++ site-src/trunk/site/footer.shtml	2009-03-02 22:07:37 UTC (rev 5200)
@@ -1,12 +1,12 @@
 <div id="vassal-footer">
   <ul id="vassal-footer-list">
-    <li>Copyright &copy; 2009 <a href="/about.html">The <acronym>Vassal</acronym> Team</a></li>
+    <li><span class="copyright">Copyright &copy; 2009</span> <a href="/about.html">The <acronym>Vassal</acronym> Team</a></li>
     <li><a href="/license.html">License</a></li>
     <li><a href="/donate.html">Donate</a></li>
     <li><a href="/sitemap.html">Sitemap</a></li>
     <li><a href="/search.html">Search</a></li>
     <li><a href="/about.html">About</a></li>
-    <li><a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=90612&amp;type=2" width="125" height="37" alt="SourceForge.net Logo" /></a></li>
-    <li><a href="http://www.yourkit.com/"><img src="/images/YourKit_logo.png" alt="YourKit Java Profiler" /></a></li>
+    <li><a href="http://sourceforge.net/projects/vassalengine"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=90612&type=12" width="120" height="30" alt="Get VASSAL Engine at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a></li>
+    <li><a href="http://www.yourkit.com/"><img src="/images/YourKit_logo.png" alt="YourKit Java Profiler" width="96" height="30" /></a></li>
   </ul>
 </div> 

Modified: site-src/trunk/site/images/YourKit_logo.png
===================================================================
(Binary files differ)

Modified: site-src/trunk/site/site.css
===================================================================
--- site-src/trunk/site/site.css	2009-03-02 20:23:47 UTC (rev 5199)
+++ site-src/trunk/site/site.css	2009-03-02 22:07:37 UTC (rev 5200)
@@ -17,7 +17,6 @@
   border: none;
 }
 
-
 /* Site navigation bar */
 
 #vassal-nav-list {
@@ -43,7 +42,6 @@
   font-family: sans-serif;
   font-weight: bold;
   font-size: 8pt;
-/*  font-size: 72.5%; */
   text-decoration: none;
   line-height: 1;
 }
@@ -58,35 +56,48 @@
 
 #vassal-footer {
   clear: both;
-  margin-top: 4em;
-  padding-top: 10px;
-  margin-bottom: 4em;
+  margin: 4em 0;
+  padding: 10px 0 0 0;
   border-top: 1px solid black;
+  color: #222222;
+  font-size: 9pt;
+  font-family: sans-serif;
 }
 
+#vassal-footer acronym {
+  font-variant: small-caps;
+}
+
+#vassal-footer .copyright {
+  font-size: smaller;
+}
+
+#vassal-footer a {
+  color: #546035;
+}
+
+#vassal-footer a:visited {
+  color: #384024;
+}
+
+#vassal-footer a:hover {
+  color: #9caa79;
+}
+
 #vassal-footer-list {
-  float: right;
+  text-align: center;
   margin: 0;
-  padding: 0px 5px;
+  padding: 0 5px;
 }
 
 #vassal-footer-list li {
   display: inline;
   list-style: none;
   margin: 0;
-  padding: 8px 10px;
-/*  float: left; */
+  padding: 8px 8px;
 }
 
-#vassal-footer-list a {
-/*  display: block; */
-  font-size: small;
-  text-decoration: none;
-  line-height: 1;
-}
-
 #vassal-footer-list a img {
   vertical-align: middle;
+  border: 0;
 }
-
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 5202
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5202&view=rev
Author:   uckelman
Date:     2009-03-03 13:10:14 +0000 (Tue, 03 Mar 2009)

Log Message:
-----------
Built downloads page.
Added all releases available to me.

Added Paths:
-----------
    site-src/trunk/site/builds/
    site-src/trunk/site/download.php
    site-src/trunk/site/images/linux.png
    site-src/trunk/site/images/macosx.png
    site-src/trunk/site/images/windows.png
    site-src/trunk/site/releases/
    site-src/trunk/site/releases/VASSAL-2.0.5-generic.zip
    site-src/trunk/site/releases/VASSAL-2.1.1-generic.zip
    site-src/trunk/site/releases/VASSAL-2.2.2-generic.zip
    site-src/trunk/site/releases/VASSAL-2.3.2-generic.zip
    site-src/trunk/site/releases/VASSAL-2.4.2-generic.zip
    site-src/trunk/site/releases/VASSAL-2.5.2-generic.zip
    site-src/trunk/site/releases/VASSAL-2.6.4-generic.zip
    site-src/trunk/site/releases/VASSAL-2.7-generic.zip
    site-src/trunk/site/releases/VASSAL-2.8-generic.zip
    site-src/trunk/site/releases/VASSAL-2.9.9-generic.zip
    site-src/trunk/site/releases/VASSAL-3.0.17-generic.zip
    site-src/trunk/site/releases/VASSAL-3.1.0-linux.zip
    site-src/trunk/site/releases/VASSAL-3.1.0-macosx.dmg
    site-src/trunk/site/releases/VASSAL-3.1.0-other.zip
    site-src/trunk/site/releases/VASSAL-3.1.0-src.zip
    site-src/trunk/site/releases/VASSAL-3.1.0-windows.exe

Added: site-src/trunk/site/download.php
===================================================================
--- site-src/trunk/site/download.php	                        (rev 0)
+++ site-src/trunk/site/download.php	2009-03-03 13:10:14 UTC (rev 5202)
@@ -0,0 +1,130 @@
+<?php echo '<?xml version="1.0" encoding="UTF-8"?>' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head profile="http://www.w3.org/2005/10/profile">
+  <link rel="stylesheet" type="text/css" href="/style.css"/>
+  <link rel="stylesheet" type="text/css" href="/site.css"/>
+  <link rel="icon" type="image/png" href="/images/VASSAL.png"/>
+
+  <style type="text/css">
+dt {
+  font-weight: bold;
+}
+
+dd{
+  margin: 0.5em 0 0.5em 0px;
+  padding-left: 10px;
+}
+
+dl{
+  padding: 0em 2em 1em 1em;
+  display: inline-block;
+  vertical-align: middle;
+}
+
+table {
+  margin: 0 auto;
+}
+
+code {
+  color: blue;
+}
+
+  </style>
+
+  <title>Download VASSAL</title>
+</head>
+<body>
+<div id="vassal-header">
+  <div id="vassal-logo">
+    <a href="/index.php"><img src="/images/header.png"/></a>
+  </div>
+  <?php virtual('/navigation.shtml'); ?>
+</div>
+
+<div id="content">
+<div class="content_box_full">
+  <h1>Download <acronym>Vassal</acronym></h1>
+
+  <p>Download <acronym>Vassal</acronym>, the free, open-source boardgame engine. <acronym>Vassal</acronym> runs on Linux, Mac OS X, Windows, and any other system which has a Java JRE. Find your operating system below for instructions for downloading and installing <acronym>Vassal</acronym>.</p>
+
+  <h2><acronym>Vassal</acronym> 3.1.0</h2>
+  <p>This is the current release. <acronym>Vassal</acronym> 3.1.0 contains a large number of changes over 3.0.17. See the <a href="">release notes</a> for details.</p>
+
+  <table>
+    <tr>
+      <td>
+        <img src="/images/linux.png"/>
+        <dl>
+          <dt>Linux</dt>
+          <dd>Download <a href="http://downloads.sourceforge.net/vassalengine/VASSAL-3.1.0-linux.zip">ZIP archive</a> (13MB) <br/>Unpack it and run <code>VASSAL.sh</code></dd>
+        </dl>
+      </td>
+      <td>
+        <span style="font-size: 48px;">*</span>
+        <dl>
+          <dt>Other</dt>
+          <dd>Download <a href="http://downloads.sourceforge.net/vassalengine/VASSAL-3.1.0-other.zip">ZIP archive</a> (13MB)<br/>Unpack it and run <code>VASSAL.sh</code></dd>
+        </dl>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <img src="/images/macosx.png"/>
+        <dl>
+          <dt>Mac OS X</dt>
+          <dd>Download <a href="http://downloads.sourceforge.net/vassalengine/VASSAL-3.1.0-macosx.dmg">disk image</a> (16MB)</dd>
+        </dl>
+      </td>
+      <td>
+        <span style="font-size: 24px;">{}</span>
+        <dl>
+          <dt>Source</dt>
+          <dd>Download <a href="http://downloads.sourceforge.net/vassalengine/VASSAL-3.1.0-src.zip">ZIP archive</a> (13MB)<br/>Look <a href="">here</a> for build instructions.</dd>
+        </dl>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <img src="/images/windows.png"/>
+        <dl>
+          <dt>Windows</dt>
+          <dd>Download and run <a href="">installer</a> (12MB)</dd>
+        </dl>
+      </td>
+    </tr>
+  </table>
+
+  <h3>Notes</h3>
+
+  <h4>All Operating Systems</h4>
+  <p><acronym>Vassal</acronym> 3.1.0 requires Java Runtime Envionment (JRE) 5 or later. See the OS-specific notes below for how to get an appropriate JRE for your system.</p>
+
+  <h4>Linux</h4>
+  <p>Most Linux distributions ship a JRE. If you do not have a JRE installed, you must install one before running <acronym>Vassal</acronym>. On Fedora: <code>yum install java-1.6.0-openjdk</code>, and on Ubuntu: <code>apt-get openjdk-6-jre</code>.</p>
+
+  <h4>Mac OS X</h4>
+  <p>Mac OS X comes with Java already installed. However, if you use OS X 10.3 or earlier, Apple has decided not to provide you with Java 5 or later, and so the last version of <acronym>Vassal</acronym> you will be able to run without upgrading your OS is 2.9.9.</p>
+
+  <h4>Windows</h4>
+  <p>If you do not already have Java 5 or later, the <acronym>Vassal</acronym> installer will download and install it for you. Alternatively, you may install Java yourself before installing <acronym>Vassal</acronym>. Current versions of Java are available at <a href="http://www.java.com">java.com</a>.</p>
+
+  <h4>Other</h4>
+  <p>This is the package to use if you run an OS without a dedicated package.</p>
+
+  <h4>Source</h4>
+  <p>This is the source code for <acronym>Vassal</acronym>. If you want to <em>use</em> <acronym>Vassal</acronym>, you should consider installing the pre-built package for your operating system, found above. If, instead, you are interested in doing development work on <acronym>Vassal</acronym>, you might instead want to check out the current code from our <a href="">source repository</a>.</p>
+
+  <h2>Older Releases</h2>
+  <p>Older releases of <acronym>Vassal</acronym> are available in our <a href="/releases/">release archive</a>. We do not recommend older releases for normal use. If you find it necessary to use an older release due to a flaw in the current release, please <a href="/tracker/">file a bug report</a>.</p>
+
+  <h2>Development Snapshots</h2>
+  <p><acronym>Vassal</acronym> is under constant development. Current development snapshots are available <a href="/builds/">here</a>. The development build named <code>VASSAL-x.y.z-svnNNNN-branch</code> is a development build for version <code>x.y.z</code> of <acronym>Vassal</acronym> based on revision <code>NNNN</code> on branch <code>branch</code> in our Subversion repository. We do not provide support for development builds, nor do we guarantee the they even work. If you use one for regular play or module design, you do so at your own risk. However, we greatfully accept bug reports from <em>current</em> development builds.</p>
+ 
+
+</div>
+</div>
+
+<?php virtual('/footer.shtml'); ?>
+</body>
+</html>

Added: site-src/trunk/site/images/linux.png
===================================================================
(Binary files differ)


Property changes on: site-src/trunk/site/images/linux.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: site-src/trunk/site/images/macosx.png
===================================================================
(Binary files differ)


Property changes on: site-src/trunk/site/images/macosx.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: site-src/trunk/site/images/windows.png
===================================================================
(Binary files differ)


Property changes on: site-src/trunk/site/images/windows.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: site-src/trunk/site/releases/VASSAL-2.0.5-generic.zip
===================================================================
(Binary files differ)


Property changes on: site-src/trunk/site/releases/VASSAL-2.0.5-generic.zip
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: site-src/trunk/site/releases/VASSAL-2.1.1-generic.zip
===================================================================
(Binary files differ)


Property changes on: site-src/trunk/site/releases/VASSAL-2.1.1-generic.zip
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: site-src/trunk/site/releases/VASSAL-2.2.2-generic.zip
===================================================================
(Binary files differ)


Property changes on: site-src/trunk/site/releases/VASSAL-2.2.2-generic.zip
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: site-src/trunk/site/releases/VASSAL-2.3.2-generic.zip
===================================================================
(Binary files differ)


Property changes on: site-src/trunk/site/releases/VASSAL-2.3.2-generic.zip
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: site-src/trunk/site/releases/VASSAL-2.4.2-generic.zip
===================================================================
(Binary files differ)


Property changes on: site-src/trunk/site/releases/VASSAL-2.4.2-generic.zip
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: site-src/trunk/site/releases/VASSAL-2.5.2-generic.zip
===================================================================
(Binary files differ)


Property changes on: site-src/trunk/site/releases/VASSAL-2.5.2-generic.zip
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: site-src/trunk/site/releases/VASSAL-2.6.4-generic.zip
===================================================================
(Binary files differ)


Property changes on: site-src/trunk/site/releases/VASSAL-2.6.4-generic.zip
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: site-src/trunk/site/releases/VASSAL-2.7-generic.zip
===================================================================
(Binary files differ)


Property changes on: site-src/trunk/site/releases/VASSAL-2.7-generic.zip
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: site-src/trunk/site/releases/VASSAL-2.8-generic.zip
===================================================================
(Binary files differ)


Property changes on: site-src/trunk/site/releases/VASSAL-2.8-generic.zip
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: site-src/trunk/site/releases/VASSAL-2.9.9-generic.zip
===================================================================
(Binary files differ)


Property changes on: site-src/trunk/site/releases/VASSAL-2.9.9-generic.zip
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: site-src/trunk/site/releases/VASSAL-3.0.17-generic.zip
===================================================================
(Binary files differ)


Property changes on: site-src/trunk/site/releases/VASSAL-3.0.17-generic.zip
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: site-src/trunk/site/releases/VASSAL-3.1.0-linux.zip
===================================================================
(Binary files differ)


Property changes on: site-src/trunk/site/releases/VASSAL-3.1.0-linux.zip
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: site-src/trunk/site/releases/VASSAL-3.1.0-macosx.dmg
===================================================================
(Binary files differ)


Property changes on: site-src/trunk/site/releases/VASSAL-3.1.0-macosx.dmg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: site-src/trunk/site/releases/VASSAL-3.1.0-other.zip
===================================================================
(Binary files differ)


Property changes on: site-src/trunk/site/releases/VASSAL-3.1.0-other.zip
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: site-src/trunk/site/releases/VASSAL-3.1.0-src.zip
===================================================================
(Binary files differ)


Property changes on: site-src/trunk/site/releases/VASSAL-3.1.0-src.zip
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: site-src/trunk/site/releases/VASSAL-3.1.0-windows.exe
===================================================================
(Binary files differ)


Property changes on: site-src/trunk/site/releases/VASSAL-3.1.0-windows.exe
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 5203
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5203&view=rev
Author:   uckelman
Date:     2009-03-03 13:14:20 +0000 (Tue, 03 Mar 2009)

Log Message:
-----------
Added license page.

Modified Paths:
--------------
    site-src/trunk/site/footer.shtml

Added Paths:
-----------
    site-src/trunk/site/license.php

Modified: site-src/trunk/site/footer.shtml
===================================================================
--- site-src/trunk/site/footer.shtml	2009-03-03 13:10:14 UTC (rev 5202)
+++ site-src/trunk/site/footer.shtml	2009-03-03 13:14:20 UTC (rev 5203)
@@ -1,7 +1,7 @@
 <div id="vassal-footer">
   <ul id="vassal-footer-list">
     <li><span class="copyright">Copyright &copy; 2009</span> <a href="/about.html">The <acronym>Vassal</acronym> Team</a></li>
-    <li><a href="/license.html">License</a></li>
+    <li><a href="/license.php">License</a></li>
     <li><a href="/donate.html">Donate</a></li>
     <li><a href="/sitemap.html">Sitemap</a></li>
     <li><a href="/search.html">Search</a></li>

Added: site-src/trunk/site/license.php
===================================================================
--- site-src/trunk/site/license.php	                        (rev 0)
+++ site-src/trunk/site/license.php	2009-03-03 13:14:20 UTC (rev 5203)
@@ -0,0 +1,47 @@
+<?php echo '<?xml version="1.0" encoding="UTF-8"?>' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head profile="http://www.w3.org/2005/10/profile">
+  <link rel="stylesheet" type="text/css" href="/style.css"/>
+  <link rel="stylesheet" type="text/css" href="/site.css"/>
+  <link rel="icon" type="image/png" href="/images/VASSAL.png"/>
+  <title>VASSAL License</title>
+</head>
+<body>
+<div id="vassal-header">
+  <div id="vassal-logo">
+    <a href="/index.php"><img src="/images/header.png"/></a>
+  </div>
+  <?php virtual('/navigation.shtml'); ?>
+</div>
+
+<div id="content">
+<div class="content_box_full">
+  <h1><acronym>Vassal</acronym> License</h1>
+  <p><acronym>Vassal</acronym> is released under the <a href="http://creativecommons.org/licenses/LGPL/2.1/">GNU Lesser General Public License, version 2.1 or later</a>.</p>
+
+  <p>This programs free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.</p>
+
+  <p>This library 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
+    Lesser General Public License for more details.</p>
+
+   <p>You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA</p>
+
+  <h1>Website Content</h1>
+  <p>Website content (except game modules) is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share Alike 3.0 Unported.</a> license.</p>
+
+  <p>All products mentioned on these pages are trademarks of their respective owners, where appropriate.</p>
+
+</div>
+</div>
+
+<?php virtual('/footer.shtml'); ?>
+</body>
+</html>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 5213
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5213&view=rev
Author:   uckelman
Date:     2009-03-04 21:10:20 +0000 (Wed, 04 Mar 2009)

Log Message:
-----------
Much refactoring.

Modified Paths:
--------------
    site-src/trunk/site/download.php
    site-src/trunk/site/index.php
    site-src/trunk/site/license.php
    site-src/trunk/site/login.php
    site-src/trunk/site/modify.php
    site-src/trunk/site/news.php
    site-src/trunk/site/register.php
    site-src/trunk/site/sendpw.php
    site-src/trunk/site/sso/AuthDB.php
    site-src/trunk/site/sso/NewsDB.php
    site-src/trunk/site/sso/UserDB.php
    site-src/trunk/site/sso/ssolib.php
    site-src/trunk/site/style.css

Added Paths:
-----------
    site-src/trunk/site/css/
    site-src/trunk/site/css/site.css
    site-src/trunk/site/css/sso.css
    site-src/trunk/site/inc/footer.shtml
    site-src/trunk/site/inc/header.php
    site-src/trunk/site/inc/login-logout.php
    site-src/trunk/site/inc/navigation.shtml
    site-src/trunk/site/sso/config.php.example

Removed Paths:
-------------
    site-src/trunk/site/site.css

Copied: site-src/trunk/site/css/site.css (from rev 5212, site-src/trunk/site/site.css)
===================================================================
--- site-src/trunk/site/css/site.css	                        (rev 0)
+++ site-src/trunk/site/css/site.css	2009-03-04 21:10:20 UTC (rev 5213)
@@ -0,0 +1,122 @@
+/* Site header */
+
+#vassal-header {
+  overflow: auto;
+  border-bottom: 1px solid black;
+  margin-bottom: 10px;
+  background: #ffffff;
+}
+
+#vassal-logo {
+  float: left;
+  margin: 0;
+  padding: 10px 20px 10px 10px;
+  background: transparent url('/images/header_bg-w.png') top left no-repeat;
+}
+
+#vassal-logo a img {
+  border: none;
+}
+
+/* Site navigation bar */
+
+#vassal-nav-list {
+  margin: 0;
+  padding: 0;
+  height: 29px;
+  background: transparent url('/images/stripe.png') left repeat-x;
+  border-bottom: 1px solid black;
+}
+
+#vassal-nav-list li {
+  display: inline;
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  float: left;
+}
+
+#vassal-nav-list a {
+  display: block;
+  color: white;
+  padding: 10px 10px 5px 9px;
+  font-family: sans-serif;
+  font-weight: bold;
+  font-size: 8pt;
+  text-decoration: none;
+  line-height: 1;
+}
+
+#vassal-nav-list a:hover {
+  color: #f8d530;
+  background: transparent url('/images/stripe2.png') left repeat-x;
+}
+
+/* Site login/logout block */
+
+#vassal-login {
+  float: right;
+  margin: 5px 5px 0 0;
+  font-size: 9pt;
+}
+
+#vassal-login a, #vassal-login a:visited {
+  color: #546035;
+  text-decoration: none;
+}
+
+#vassal-login a:hover {
+  color: #9caa79;
+  text-decoration: underline;
+}
+
+/* Site footer */
+
+#vassal-footer {
+  clear: both;
+  margin: 4em 0;
+  padding: 10px 0 0 0;
+  border-top: 1px solid black;
+  color: #222222;
+  font-size: 9pt;
+  font-family: sans-serif;
+  background: #ffffff;
+}
+
+#vassal-footer acronym {
+  font-variant: small-caps;
+}
+
+#vassal-footer .copyright {
+  font-size: smaller;
+}
+
+#vassal-footer a {
+  color: #546035;
+}
+
+#vassal-footer a:visited {
+  color: #384024;
+}
+
+#vassal-footer a:hover {
+  color: #9caa79;
+}
+
+#vassal-footer-list {
+  text-align: center;
+  margin: 0;
+  padding: 0 5px;
+}
+
+#vassal-footer-list li {
+  display: inline;
+  list-style: none;
+  margin: 0;
+  padding: 8px 8px;
+}
+
+#vassal-footer-list a img {
+  vertical-align: middle;
+  border: 0;
+}


Property changes on: site-src/trunk/site/css/site.css
___________________________________________________________________
Added: svn:mergeinfo
   + 

Added: site-src/trunk/site/css/sso.css
===================================================================
--- site-src/trunk/site/css/sso.css	                        (rev 0)
+++ site-src/trunk/site/css/sso.css	2009-03-04 21:10:20 UTC (rev 5213)
@@ -0,0 +1,19 @@
+
+.sso_form {
+  margin: 10px auto;
+  display: table;
+}
+
+.sso_form legend {
+  font-weight: bold;
+  font-size: 110%;
+}
+
+.sso_form th {
+  text-align: right;
+}
+
+.sso_form label {
+  font-weight: normal;
+}
+

Modified: site-src/trunk/site/download.php
===================================================================
--- site-src/trunk/site/download.php	2009-03-04 13:32:01 UTC (rev 5212)
+++ site-src/trunk/site/download.php	2009-03-04 21:10:20 UTC (rev 5213)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head profile="http://www.w3.org/2005/10/profile">
   <link rel="stylesheet" type="text/css" href="/style.css"/>
-  <link rel="stylesheet" type="text/css" href="/site.css"/>
+  <link rel="stylesheet" type="text/css" href="/css/site.css"/>
   <link rel="icon" type="image/png" href="/images/VASSAL.png"/>
 
   <style type="text/css">
@@ -39,12 +39,7 @@
   <title>Download VASSAL</title>
 </head>
 <body>
-<div id="vassal-header">
-  <div id="vassal-logo">
-    <a href="/index.php"><img src="/images/header.png"/></a>
-  </div>
-  <?php virtual('/navigation.shtml'); ?>
-</div>
+<?php include('inc/header.php'); ?>
 
 <div id="content">
 <div class="content_box_full">
@@ -129,6 +124,6 @@
 </div>
 </div>
 
-<?php virtual('/footer.shtml'); ?>
+<?php include('inc/footer.shtml'); ?>
 </body>
 </html>

Added: site-src/trunk/site/inc/footer.shtml
===================================================================
--- site-src/trunk/site/inc/footer.shtml	                        (rev 0)
+++ site-src/trunk/site/inc/footer.shtml	2009-03-04 21:10:20 UTC (rev 5213)
@@ -0,0 +1,12 @@
+<div id="vassal-footer">
+  <ul id="vassal-footer-list">
+    <li><span class="copyright">Copyright &copy; 2009</span> <a href="/about.html">The <acronym>Vassal</acronym> Team</a></li>
+    <li><a href="/license.php">License</a></li>
+    <li><a href="/donate.html">Donate</a></li>
+    <li><a href="/sitemap.html">Sitemap</a></li>
+    <li><a href="/search.html">Search</a></li>
+    <li><a href="/about.html">About</a></li>
+    <li><a href="http://sourceforge.net/projects/vassalengine"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=90612&type=12" width="120" height="30" alt="Get VASSAL Engine at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a></li>
+    <li><a href="http://www.yourkit.com/"><img src="/images/YourKit_logo.png" alt="YourKit Java Profiler" width="96" height="30" /></a></li>
+  </ul>
+</div>

Added: site-src/trunk/site/inc/header.php
===================================================================
--- site-src/trunk/site/inc/header.php	                        (rev 0)
+++ site-src/trunk/site/inc/header.php	2009-03-04 21:10:20 UTC (rev 5213)
@@ -0,0 +1,9 @@
+<div id="vassal-header">
+  <div id="vassal-logo">
+    <a href="/index.php"><img src="/images/header.png"/></a>
+  </div>
+  <?php 
+    include(dirname(__FILE__) . '/navigation.shtml');
+    include(dirname(__FILE__) . '/login-logout.php');
+  ?>
+</div>

Added: site-src/trunk/site/inc/login-logout.php
===================================================================
--- site-src/trunk/site/inc/login-logout.php	                        (rev 0)
+++ site-src/trunk/site/inc/login-logout.php	2009-03-04 21:10:20 UTC (rev 5213)
@@ -0,0 +1,23 @@
+<div id="vassal-login">
+<?php
+
+if (isset($_COOKIE['VASSAL_login'])) {
+  $key = $_COOKIE['VASSAL_login'];
+
+  require_once(dirname(__FILE__) . '/../sso/AuthDB.php');
+  
+  try {
+    $auth = new AuthDB();
+    $username = $auth->user_for_cookie($key);
+    echo '<a href="/logout.php?returnto=', $_SERVER['REQUEST_URI'], '">Log out</a>';
+  }
+  catch (ErrorException $e) {
+    echo '<a href="/login.php?returnto=', $_SERVER['REQUEST_URI'], '">Log in</a>';
+  } 
+}   
+else {
+  echo '<a href="/login.php?returnto=', $_SERVER['REQUEST_URI'], '">Log in</a>';
+} 
+
+?>
+</div>

Added: site-src/trunk/site/inc/navigation.shtml
===================================================================
--- site-src/trunk/site/inc/navigation.shtml	                        (rev 0)
+++ site-src/trunk/site/inc/navigation.shtml	2009-03-04 21:10:20 UTC (rev 5213)
@@ -0,0 +1,13 @@
+<div id="vassal-navigation">
+  <ul id="vassal-nav-list">
+    <li><a href="/download.php">Download</a></li>
+    <li><a href="/">Modules</a></li>
+    <li><a href="/">FAQ</a></li>
+    <li><a href="/">Docs</a></li>
+    <li><a href="/forum/">Forum</a></li>
+    <li><a href="/wiki/">Wiki</a></li>
+    <li><a href="/bugzilla/">Tracker</a></li>
+    <li><a href="/news.php">News</a></li>
+    <li><a href="/">Help</a></li>
+  </ul>
+</div>

Modified: site-src/trunk/site/index.php
===================================================================
--- site-src/trunk/site/index.php	2009-03-04 13:32:01 UTC (rev 5212)
+++ site-src/trunk/site/index.php	2009-03-04 21:10:20 UTC (rev 5213)
@@ -3,40 +3,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head profile="http://www.w3.org/2005/10/profile">
   <link rel="stylesheet" type="text/css" href="/style.css"/>
-  <link rel="stylesheet" type="text/css" href="/site.css"/>
+  <link rel="stylesheet" type="text/css" href="/css/site.css"/>
   <link rel="alternate" type="application/rss+xml" title="RSS" href="" />
   <link rel="icon" type="image/png" href="/images/VASSAL.png"/>
   <title>VASSAL</title>
 </head>
 <body>
-<div id="vassal-header">
-  <div id="vassal-logo">
-    <a href="/index.php"><img src="/images/header.png"/></a>
-  </div>
-  <?php virtual('/navigation.shtml'); ?>
+<?php include('inc/header.php'); ?>
 
-  <div id="vassal-login">
-<?php
-  $key = $_COOKIE['VASSAL_login'];
-  if (!empty($key)) { 
-    require_once('sso/AuthDB.php');
-  
-    try {
-      $auth = new AuthDB();
-      $username = $auth->user_for_cookie($key);
-      print '<a href="logout.php?returnto=/index.php">Log out</a>';
-    }
-    catch (ErrorException $e) {
-      print '<a href="login.php?returnto=/index.php">Log in</a>';
-    }
-  }
-  else {
-    print '<a href="login.php?returnto=/index.php">Log in</a>';
-  }
-?>
-  </div>
-</div>
-
 <div id="content">
   <div class="content_box_left">
     <div id="vassal-about">
@@ -140,6 +114,6 @@
   </div>
 </div>
 
-<?php virtual('/footer.shtml'); ?>
+<?php include('inc/footer.shtml'); ?>
 </body>
 </html>

Modified: site-src/trunk/site/license.php
===================================================================
--- site-src/trunk/site/license.php	2009-03-04 13:32:01 UTC (rev 5212)
+++ site-src/trunk/site/license.php	2009-03-04 21:10:20 UTC (rev 5213)
@@ -3,17 +3,12 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head profile="http://www.w3.org/2005/10/profile">
   <link rel="stylesheet" type="text/css" href="/style.css"/>
-  <link rel="stylesheet" type="text/css" href="/site.css"/>
+  <link rel="stylesheet" type="text/css" href="/css/site.css"/>
   <link rel="icon" type="image/png" href="/images/VASSAL.png"/>
   <title>VASSAL License</title>
 </head>
 <body>
-<div id="vassal-header">
-  <div id="vassal-logo">
-    <a href="/index.php"><img src="/images/header.png"/></a>
-  </div>
-  <?php virtual('/navigation.shtml'); ?>
-</div>
+<?php include('inc/header.php') ?>
 
 <div id="content">
 <div class="content_box_full">
@@ -42,6 +37,6 @@
 </div>
 </div>
 
-<?php virtual('/footer.shtml'); ?>
+<?php include('inc/footer.shtml'); ?>
 </body>
 </html>

Modified: site-src/trunk/site/login.php
===================================================================
--- site-src/trunk/site/login.php	2009-03-04 13:32:01 UTC (rev 5212)
+++ site-src/trunk/site/login.php	2009-03-04 21:10:20 UTC (rev 5213)
@@ -88,7 +88,7 @@
   if (!empty($returnto)) $action .= "?returnto=$returnto";
 
   print <<<END
-<form class="login_form" action="$action" method="post">
+<form class="sso_form" action="$action" method="post">
   <fieldset>
     <legend>Login</legend>
     <p>Don't have an account? <a href="register.php">Create an account</a>.</p>

Modified: site-src/trunk/site/modify.php
===================================================================
--- site-src/trunk/site/modify.php	2009-03-04 13:32:01 UTC (rev 5212)
+++ site-src/trunk/site/modify.php	2009-03-04 21:10:20 UTC (rev 5213)
@@ -130,7 +130,7 @@
 
 function print_form() {
   print <<<END
-<form class="modify_form" action="modify.php" method="post">
+<form class="sso_form" action="modify.php" method="post">
   <fieldset>
     <legend>Modify Account</legend>
     <table>

Modified: site-src/trunk/site/news.php
===================================================================
--- site-src/trunk/site/news.php	2009-03-04 13:32:01 UTC (rev 5212)
+++ site-src/trunk/site/news.php	2009-03-04 21:10:20 UTC (rev 5213)
@@ -3,59 +3,19 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head profile="http://www.w3.org/2005/10/profile">
   <link rel="stylesheet" type="text/css" href="/style.css"/>
+  <link rel="stylesheet" type="text/css" href="/css/site.css"/>
   <link rel="alternate" type="application/rss+xml" title="RSS" href="" />
   <link rel="icon" type="image/png" href="images/VASSAL.png"/>
   <title>VASSAL</title>
 </head>
 <body>
-<div id="vassal-page">
-  <div id="vassal-header">
-    <div id="vassal-logo">
-      <a href="/index.php"><img src="images/header.png"/></a>
-    </div>
+<?php include('inc/header.php'); ?>
 
-    <div id="vassal-search">
-    </div>
-
-    <div id="vassal-login">
+<div id="content">
+  <div class="content_box_full">
+    <h1>News</h1>
 <?php
-  $key = $_COOKIE['VASSAL_login'];
-  if (!empty($key)) { 
-    require_once('sso/AuthDB.php');
-  
-    try {
-      $auth = new AuthDB();
-      $username = $auth->user_for_cookie($key);
-      print '<a href="logout.php?returnto=/news.php">Log out</a>';
-    }
-    catch (ErrorException $e) {
-      print '<a href="login.php?returnto=/news.php">Log in</a>';
-    }
-  }
-  else {
-    print '<a href="login.php?returnto=/news.php">Log in</a>';
-  }
-?>
-    </div>
-  </div>
 
-  <div id="vassal-navigation">
-    <ul id="vassal-nav-list">
-      <li><a href="download.html">Download</a></li>
-  	  <li><a href="">Modules</a></li>
-  	  <li><a href="">FAQ</a></li>
-	    <li><a href="">Documentation</a></li>
-	    <li><a href="forum/">Forum</a></li>
-  	  <li><a href="">News</a></li>
-  	  <li><a href="">Help</a></li>
-    </ul>
-  </div>
-
-  <div id="content">
-    <div class="content_box_full">
-      <h1>News</h1>
-<?php
-
 require_once('sso/NewsDB.php');
 
 try {
@@ -88,9 +48,9 @@
   warn($e->getMessage());
 }
 ?>
-    </div>
   </div>
-  <?php virtual('/footer.shtml'); ?>
 </div>
+
+<?php include('inc/footer.shtml'); ?>
 </body>
 </html>

Modified: site-src/trunk/site/register.php
===================================================================
--- site-src/trunk/site/register.php	2009-03-04 13:32:01 UTC (rev 5212)
+++ site-src/trunk/site/register.php	2009-03-04 21:10:20 UTC (rev 5213)
@@ -146,7 +146,7 @@
 function print_form() {
   print <<<END
 <script>var RecaptchaOptions = { theme : 'white' };</script>
-<form class="registration_form" action="register.php" method="post">
+<form class="sso_form" action="register.php" method="post">
   <fieldset>
     <legend>Create an Account</legend>
     <p>Already have an account? <a href="login.php">Log in</a>.</p>
@@ -179,7 +179,7 @@
         <td><input type="text" id="realname" name="realname" size="20"/></td>
       </tr>
       <tr>
-        <td colspan="2">
+        <td colspan="2" align="center"><div style="margin: 0 auto;">
 END;
 
   echo recaptcha_get_html(RECAPTCHA_PUBLIC_KEY);

Modified: site-src/trunk/site/sendpw.php
===================================================================
--- site-src/trunk/site/sendpw.php	2009-03-04 13:32:01 UTC (rev 5212)
+++ site-src/trunk/site/sendpw.php	2009-03-04 21:10:20 UTC (rev 5213)
@@ -90,7 +90,7 @@
 
 function print_form() {
   print <<<END
-<form class="sendpwform" action="sendpw.php" method="post">
+<form class="sso_form" action="sendpw.php" method="post">
   <fieldset>
     <legend>Send password</legend>
     <table>
@@ -99,7 +99,7 @@
         <td><input type="text" id="username" name="username" size="20"/></td>
       </tr>
       <tr>
-        <th colspan="2">OR</th>
+        <th>OR</th>
       </tr>
       <tr>
         <th><label for="email">Email address:</label></th>

Deleted: site-src/trunk/site/site.css
===================================================================
--- site-src/trunk/site/site.css	2009-03-04 13:32:01 UTC (rev 5212)
+++ site-src/trunk/site/site.css	2009-03-04 21:10:20 UTC (rev 5213)
@@ -1,105 +0,0 @@
-/* Site header */
-
-#vassal-header {
-  overflow: auto;
-  border-bottom: 1px solid black;
-  margin-bottom: 10px;
-  background: #ffffff;
-}
-
-#vassal-logo {
-  float: left;
-  margin: 0;
-  padding: 10px 20px 10px 10px;
-  background: transparent url('/images/header_bg-w.png') top left no-repeat;
-}
-
-#vassal-logo a img {
-  border: none;
-}
-
-/* Site navigation bar */
-
-#vassal-nav-list {
-  margin: 0;
-  padding: 0;
-  height: 29px;
-  background: transparent url('/images/stripe.png') left repeat-x;
-  border-bottom: 1px solid black;
-}
-
-#vassal-nav-list li {
-  display: inline;
-  list-style: none;
-  margin: 0;
-  padding: 0;
-  float: left;
-}
-
-#vassal-nav-list a {
-  display: block;
-  color: white;
-  padding: 10px 10px 5px 9px;
-  font-family: sans-serif;
-  font-weight: bold;
-  font-size: 8pt;
-  text-decoration: none;
-  line-height: 1;
-}
-
-#vassal-nav-list a:hover {
-  color: #f8d530;
-  background: transparent url('/images/stripe2.png') left repeat-x;
-}
-
-
-/* Site footer */
-
-#vassal-footer {
-  clear: both;
-  margin: 4em 0;
-  padding: 10px 0 0 0;
-  border-top: 1px solid black;
-  color: #222222;
-  font-size: 9pt;
-  font-family: sans-serif;
-  background: #ffffff;
-}
-
-#vassal-footer acronym {
-  font-variant: small-caps;
-}
-
-#vassal-footer .copyright {
-  font-size: smaller;
-}
-
-#vassal-footer a {
-  color: #546035;
-}
-
-#vassal-footer a:visited {
-  color: #384024;
-}
-
-#vassal-footer a:hover {
-  color: #9caa79;
-}
-
-#vassal-footer-list {
-  text-align: center;
-  margin: 0;
-  padding: 0 5px;
-}
-
-#vassal-footer-list li {
-  display: inline;
-  list-style: none;
-  margin: 0;
-  padding: 8px 8px;
-}
-
-#vassal-footer-list a img {
-  vertical-align: middle;
-  border: 0;
-}

Modified: site-src/trunk/site/sso/AuthDB.php
===================================================================
--- site-src/trunk/site/sso/AuthDB.php	2009-03-04 13:32:01 UTC (rev 5212)
+++ site-src/trunk/site/sso/AuthDB.php	2009-03-04 21:10:20 UTC (rev 5213)
@@ -1,6 +1,6 @@
 <?php
 
-require_once('config.php');
+require_once(dirname(__FILE__) . '/config.php');
 
 class AuthDB {
   private $dbh;

Modified: site-src/trunk/site/sso/NewsDB.php
===================================================================
--- site-src/trunk/site/sso/NewsDB.php	2009-03-04 13:32:01 UTC (rev 5212)
+++ site-src/trunk/site/sso/NewsDB.php	2009-03-04 21:10:20 UTC (rev 5213)
@@ -1,6 +1,6 @@
 <?php
 
-require_once('config.php');
+require_once(dirname(__FILE__) . '/config.php');
 
 class NewsDB {
   private $dbh;

Modified: site-src/trunk/site/sso/UserDB.php
===================================================================
--- site-src/trunk/site/sso/UserDB.php	2009-03-04 13:32:01 UTC (rev 5212)
+++ site-src/trunk/site/sso/UserDB.php	2009-03-04 21:10:20 UTC (rev 5213)
@@ -1,6 +1,6 @@
 <?php
 
-require_once('config.php');
+require_once(dirname(__FILE__) . '/config.php');
 
 class UserDB {
   private $ds;  

Added: site-src/trunk/site/sso/config.php.example
===================================================================
--- site-src/trunk/site/sso/config.php.example	                        (rev 0)
+++ site-src/trunk/site/sso/config.php.example	2009-03-04 21:10:20 UTC (rev 5213)
@@ -0,0 +1,19 @@
+<?php
+
+# constants used by AuthDB
+define('SQL_HOST', 'localhost');
+define('SQL_USERNAME', 'registration');
+define('SQL_PASSWORD', 'password');
+define('SQL_DB', 'registration');
+
+# constants used by UserDB
+define('LDAP_HOST', 'localhost');
+define('LDAP_BASE', 'ou=people,dc=test,dc=nomic,dc=net');
+define('LDAP_USERNAME', 'uid=worker,dc=test,dc=nomic,dc=net');
+define('LDAP_PASSWORD', 'password');
+
+# reCAPTCHA account: vassalengine !Rr8txMu7
+define('RECAPTCHA_PUBLIC_KEY',  '6LfXHwUAAAAAAKMG3C8uog9sAQSCkBNKp43ky5XX');
+define('RECAPTCHA_PRIVATE_KEY', 'private_key');
+
+?>

Modified: site-src/trunk/site/sso/ssolib.php
===================================================================
--- site-src/trunk/site/sso/ssolib.php	2009-03-04 13:32:01 UTC (rev 5212)
+++ site-src/trunk/site/sso/ssolib.php	2009-03-04 21:10:20 UTC (rev 5213)
@@ -257,31 +257,23 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head profile="http://www.w3.org/2005/10/profile">
-  <link rel="stylesheet" type="text/css" href="style.css"/>
-  <link rel="stylesheet" type="text/css" href="/site.css"/>
+  <link rel="stylesheet" type="text/css" href="/style.css"/>
+  <link rel="stylesheet" type="text/css" href="/css/site.css"/>
+  <link rel="stylesheet" type="text/css" href="/css/sso.css"/>
   <link rel="icon" type="image/png" href="VASSAL.png"/>
   <title>$title</title>
 </head>
 <body>
-<div id="vassal-header">
-  <div id="vassal-logo">
-    <a href="/index.php"><img src="images/header.png"/></a>
-  </div>
 END;
 
-  virtual('/navigation.shtml');
-
-  echo <<<END
-</div>
-<div id="content">
-END;
+  include(dirname(__FILE__) . '/../inc/header.php');
+  echo '<div id="content">';
 }
 
 function print_bottom() {
-  print '</div>';
-  virtual('/footer.shtml');
+  echo '</div>';
+  include(dirname(__FILE__) . '/../inc/footer.shtml');
   print <<<END
-</div>
 </body>
 </html>
 END;

Modified: site-src/trunk/site/style.css
===================================================================
--- site-src/trunk/site/style.css	2009-03-04 13:32:01 UTC (rev 5212)
+++ site-src/trunk/site/style.css	2009-03-04 21:10:20 UTC (rev 5213)
@@ -35,47 +35,6 @@
   font-variant: small-caps;
 }
 
-#vassal-login {
-  float: right;
-  margin: 5px 5px 0 0;
-}
-
-.login_form fieldset {
-  margin: 10px auto;
-  max-width: 20em;
-}
-
-.login_form legend {
-  font-weight: bold;
-  font-size: 110%; 
-}
-
-.login_form th {
-  text-align: right;
-}
-
-.login_form label {
-  font-weight: normal;
-}
-
-.modify_form fieldset {
-  margin: 10px auto;
-  max-width: 30em;
-}
-
-.modify_form legend {
-  font-weight: bold;
-  font-size: 110%;
-}
-
-.modify_form th {
-  text-align: right;
-}
-
-.modify_form label {
-  font-weight: normal;
-}
-
 .errorbox {
   margin: 10px auto;
   border: 2px red solid;
@@ -232,57 +191,3 @@
 }
 
 
-
-
-
-
-
-#download {
-   margin-left: auto;
-   margin-right: auto;
-   border-collapse: collapse;
-}
-
-#download th {
-   font-weight: bold;
-   font-size: 0.85em;
-}
-
-#download tr.release {
-   background: #eeeeee;
-   border: 1px solid #cccccc;
-   font-weight: bold;
-}
-
-#download tr {
-   border: 1px solid #cccccc;
-}
-
-#download td.date {
-   text-align: right;
-}
-
-#download tbody.formatgroup {
-   border: 1px solid #cccccc;
-}
-
-#download td.format {
-   padding: 0 0.5em 0 0.5em;
-}
-
-#download td.name, #download td.note {
-   font-size: 0.85em;
-   padding: 2px 0.5em 2px 0.5em;
-}
-
-#download td.size {
-   font-family: monospace;
-   text-align: right;
-   padding: 0 0.5em 0 0.5em;
-}
-
-#download td.md5sum {
-   font-family: monospace;
-   padding: 0 0.5em 0 0.5em;
-}
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 5219
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5219&view=rev
Author:   uckelman
Date:     2009-03-05 19:17:12 +0000 (Thu, 05 Mar 2009)

Log Message:
-----------
Added stubs for missing pages.

Added Paths:
-----------
    site-src/trunk/site/about.php
    site-src/trunk/site/donate.php
    site-src/trunk/site/help.php
    site-src/trunk/site/search.php
    site-src/trunk/site/sitemap.php

Added: site-src/trunk/site/about.php
===================================================================
--- site-src/trunk/site/about.php	                        (rev 0)
+++ site-src/trunk/site/about.php	2009-03-05 19:17:12 UTC (rev 5219)
@@ -0,0 +1,21 @@
+<?php echo '<?xml version="1.0" encoding="UTF-8"?>' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head profile="http://www.w3.org/2005/10/profile">
+  <link rel="stylesheet" type="text/css" href="/style.css"/>
+  <link rel="stylesheet" type="text/css" href="/css/site.css"/>
+  <link rel="icon" type="image/png" href="/images/VASSAL.png"/>
+  <title>About VASSAL</title>
+</head>
+<body>
+<?php include('inc/header.php'); ?>
+
+<div id="content">
+  <div id="content_box_full">
+    <h1>About</h1>
+  </div>
+</div>
+
+<?php include('inc/footer.shtml'); ?>
+</body>
+</html>

Added: site-src/trunk/site/donate.php
===================================================================
--- site-src/trunk/site/donate.php	                        (rev 0)
+++ site-src/trunk/site/donate.php	2009-03-05 19:17:12 UTC (rev 5219)
@@ -0,0 +1,21 @@
+<?php echo '<?xml version="1.0" encoding="UTF-8"?>' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head profile="http://www.w3.org/2005/10/profile">
+  <link rel="stylesheet" type="text/css" href="/style.css"/>
+  <link rel="stylesheet" type="text/css" href="/css/site.css"/>
+  <link rel="icon" type="image/png" href="/images/VASSAL.png"/>
+  <title>Support VASSAL</title>
+</head>
+<body>
+<?php include('inc/header.php'); ?>
+
+<div id="content">
+  <div id="content_box_full">
+    <h1>Support <acronym>Vassal</acronym></h1>
+  </div>
+</div>
+
+<?php include('inc/footer.shtml'); ?>
+</body>
+</html>

Added: site-src/trunk/site/help.php
===================================================================
--- site-src/trunk/site/help.php	                        (rev 0)
+++ site-src/trunk/site/help.php	2009-03-05 19:17:12 UTC (rev 5219)
@@ -0,0 +1,21 @@
+<?php echo '<?xml version="1.0" encoding="UTF-8"?>' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head profile="http://www.w3.org/2005/10/profile">
+  <link rel="stylesheet" type="text/css" href="/style.css"/>
+  <link rel="stylesheet" type="text/css" href="/css/site.css"/>
+  <link rel="icon" type="image/png" href="/images/VASSAL.png"/>
+  <title>VASSAL Help</title>
+</head>
+<body>
+<?php include('inc/header.php'); ?>
+
+<div id="content">
+  <div id="content_box_full">
+    <h1>Help</h1>
+  </div>
+</div>
+
+<?php include('inc/footer.shtml'); ?>
+</body>
+</html>

Added: site-src/trunk/site/search.php
===================================================================
--- site-src/trunk/site/search.php	                        (rev 0)
+++ site-src/trunk/site/search.php	2009-03-05 19:17:12 UTC (rev 5219)
@@ -0,0 +1,21 @@
+<?php echo '<?xml version="1.0" encoding="UTF-8"?>' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head profile="http://www.w3.org/2005/10/profile">
+  <link rel="stylesheet" type="text/css" href="/style.css"/>
+  <link rel="stylesheet" type="text/css" href="/css/site.css"/>
+  <link rel="icon" type="image/png" href="/images/VASSAL.png"/>
+  <title>VASSAL Search</title>
+</head>
+<body>
+<?php include('inc/header.php'); ?>
+
+<div id="content">
+  <div id="content_box_full">
+    <h1>Search</h1>
+  </div>
+</div>
+
+<?php include('inc/footer.shtml'); ?>
+</body>
+</html>

Added: site-src/trunk/site/sitemap.php
===================================================================
--- site-src/trunk/site/sitemap.php	                        (rev 0)
+++ site-src/trunk/site/sitemap.php	2009-03-05 19:17:12 UTC (rev 5219)
@@ -0,0 +1,37 @@
+<?php echo '<?xml version="1.0" encoding="UTF-8"?>' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head profile="http://www.w3.org/2005/10/profile">
+  <link rel="stylesheet" type="text/css" href="/style.css"/>
+  <link rel="stylesheet" type="text/css" href="/css/site.css"/>
+  <link rel="icon" type="image/png" href="/images/VASSAL.png"/>
+  <title>VASSAL Sitemap</title>
+</head>
+<body>
+<?php include('inc/header.php'); ?>
+
+<div id="content">
+  <div id="content_box_full">
+    <h1>Sitemap</h1>
+    <ul>
+      <li><a href="/about.php">About</a></li>
+      <li><a href="/documentation.php">Documentation</a></li>
+      <li><a href="/donate.php">Donate</a></li>
+      <li><a href="/download.php">Download</a></li>
+      <li><a href="/forum/">Forum</a></li>
+      <li><a href="/help.php">Help</a></li>
+      <li><a href="/index.php">Index</a></li>
+      <li><a href="/license.php">License</a></li>
+      <li><a href="">Modules</a></li>
+      <li><a href="/news.php">News</a></li>
+      <li><a href="/search.php">Search</a></li>
+      <li><a href="/sitemap.php">Sitemap</a></li>
+      <li><a href="/tracker/">Tracker</a></li>
+      <li><a href="/wiki/">Wiki</a></li>
+    </ul>
+  </div>
+</div>
+
+<?php include('inc/footer.shtml'); ?>
+</body>
+</html>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 5222
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5222&view=rev
Author:   uckelman
Date:     2009-03-05 19:45:52 +0000 (Thu, 05 Mar 2009)

Log Message:
-----------
Moved to inc/.

Removed Paths:
-------------
    site-src/trunk/site/footer.shtml
    site-src/trunk/site/navigation.shtml

Deleted: site-src/trunk/site/footer.shtml
===================================================================
--- site-src/trunk/site/footer.shtml	2009-03-05 19:45:07 UTC (rev 5221)
+++ site-src/trunk/site/footer.shtml	2009-03-05 19:45:52 UTC (rev 5222)
@@ -1,12 +0,0 @@
-<div id="vassal-footer">
-  <ul id="vassal-footer-list">
-    <li><span class="copyright">Copyright &copy; 2009</span> <a href="/about.html">The <acronym>Vassal</acronym> Team</a></li>
-    <li><a href="/license.php">License</a></li>
-    <li><a href="/donate.html">Donate</a></li>
-    <li><a href="/sitemap.html">Sitemap</a></li>
-    <li><a href="/search.html">Search</a></li>
-    <li><a href="/about.html">About</a></li>
-    <li><a href="http://sourceforge.net/projects/vassalengine"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=90612&type=12" width="120" height="30" alt="Get VASSAL Engine at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a></li>
-    <li><a href="http://www.yourkit.com/"><img src="/images/YourKit_logo.png" alt="YourKit Java Profiler" width="96" height="30" /></a></li>
-  </ul>
-</div> 

Deleted: site-src/trunk/site/navigation.shtml
===================================================================
--- site-src/trunk/site/navigation.shtml	2009-03-05 19:45:07 UTC (rev 5221)
+++ site-src/trunk/site/navigation.shtml	2009-03-05 19:45:52 UTC (rev 5222)
@@ -1,13 +0,0 @@
-<div id="vassal-navigation">
-  <ul id="vassal-nav-list">
-    <li><a href="/download.php">Download</a></li>
-    <li><a href="/">Modules</a></li>
-    <li><a href="/">FAQ</a></li>
-    <li><a href="/">Docs</a></li>
-    <li><a href="/forum/">Forum</a></li>
-    <li><a href="/wiki/">Wiki</a></li>
-    <li><a href="/bugzilla/">Tracker</a></li>
-    <li><a href="/news.php">News</a></li>
-    <li><a href="/">Help</a></li>
-  </ul>
-</div>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 5226
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5226&view=rev
Author:   uckelman
Date:     2009-03-05 23:50:57 +0000 (Thu, 05 Mar 2009)

Log Message:
-----------
Fixed link CSS to not apply to non-link anchors.

Modified Paths:
--------------
    site-src/trunk/site/css/site.css
    site-src/trunk/site/style.css

Modified: site-src/trunk/site/css/site.css
===================================================================
--- site-src/trunk/site/css/site.css	2009-03-05 21:10:06 UTC (rev 5225)
+++ site-src/trunk/site/css/site.css	2009-03-05 23:50:57 UTC (rev 5226)
@@ -60,7 +60,7 @@
   font-size: 9pt;
 }
 
-#vassal-login a, #vassal-login a:visited {
+#vassal-login a:link, #vassal-login a:visited {
   color: #546035;
   text-decoration: none;
 }
@@ -91,7 +91,7 @@
   font-size: smaller;
 }
 
-#vassal-footer a {
+#vassal-footer a:link {
   color: #546035;
 }
 

Modified: site-src/trunk/site/style.css
===================================================================
--- site-src/trunk/site/style.css	2009-03-05 21:10:06 UTC (rev 5225)
+++ site-src/trunk/site/style.css	2009-03-05 23:50:57 UTC (rev 5226)
@@ -15,7 +15,7 @@
   text-align: justify;
 }
 
-a { 
+a:link { 
   color: #546035; 
 }
  
@@ -23,7 +23,7 @@
   color: #384024; 
 } 
 
-a:hover { 
+a:link:hover, a:visited:hover { 
   color: #9caa79;
 } 
 
@@ -109,15 +109,11 @@
   text-decoration: none;
 }
 
-div.dlbutton a:hover, div.dlbutton a:visited {
+div.dlbutton a:hover {
   color: white;
   text-decoration: none;
 }
 
-div.dlbutton a:hover span {
-  text-decoration: underline;
-}
-
 div.dlbutton a span {
   display: inline-block;
   vertical-align: middle;
@@ -125,6 +121,10 @@
   padding: 12px;
 }
 
+div.dlbutton a:hover span {
+  text-decoration: underline;
+}
+
 div.dlbutton a img {
   vertical-align: middle;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 5227
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5227&view=rev
Author:   uckelman
Date:     2009-03-05 23:51:25 +0000 (Thu, 05 Mar 2009)

Log Message:
-----------
Fixed bugzilla URL.

Modified Paths:
--------------
    site-src/trunk/site/login.php
    site-src/trunk/site/logout.php

Modified: site-src/trunk/site/login.php
===================================================================
--- site-src/trunk/site/login.php	2009-03-05 23:50:57 UTC (rev 5226)
+++ site-src/trunk/site/login.php	2009-03-05 23:51:25 UTC (rev 5227)
@@ -45,7 +45,7 @@
   $cookies += phpbb_login($url, $username, $password);
 
   # Bugzilla login
-  $url = 'http://www.test.nomic.net/bugzilla/xmlrpc.cgi';
+  $url = 'http://www.test.nomic.net/tracker/xmlrpc.cgi';
   $cookies += bugzilla_login($url, $username, $password);
 
   # write out the cookies captured from the logins 

Modified: site-src/trunk/site/logout.php
===================================================================
--- site-src/trunk/site/logout.php	2009-03-05 23:50:57 UTC (rev 5226)
+++ site-src/trunk/site/logout.php	2009-03-05 23:51:25 UTC (rev 5227)
@@ -36,7 +36,7 @@
   $cookies += phpbb_logout($url);
 
   # Bugzilla logout
-  $url = 'http://www.test.nomic.net/bugzilla/xmlrpc.cgi';
+  $url = 'http://www.test.nomic.net/tracker/xmlrpc.cgi';
   $cookies += bugzilla_logout($url);
 
   set_cookies($cookies);  


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 5237
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5237&view=rev
Author:   uckelman
Date:     2009-03-06 11:25:53 +0000 (Fri, 06 Mar 2009)

Log Message:
-----------
Urlencode returnto argument.

Modified Paths:
--------------
    site-src/trunk/site/inc/login-logout.php
    site-src/trunk/site/login.php
    site-src/trunk/site/logout.php

Modified: site-src/trunk/site/inc/login-logout.php
===================================================================
--- site-src/trunk/site/inc/login-logout.php	2009-03-06 07:13:18 UTC (rev 5236)
+++ site-src/trunk/site/inc/login-logout.php	2009-03-06 11:25:53 UTC (rev 5237)
@@ -1,6 +1,8 @@
 <div id="vassal-login">
 <?php
 
+$returnto = urlencode($_SERVER['REQUEST_URI']);
+
 if (isset($_COOKIE['VASSAL_login'])) {
   $key = $_COOKIE['VASSAL_login'];
 
@@ -9,15 +11,17 @@
   try {
     $auth = new AuthDB();
     $username = $auth->user_for_cookie($key);
-    echo '<a href="/logout.php?returnto=', $_SERVER['REQUEST_URI'], '">Log out</a>';
+    $op = 'out';
   }
   catch (ErrorException $e) {
-    echo '<a href="/login.php?returnto=', $_SERVER['REQUEST_URI'], '">Log in</a>';
+    $op = 'in';
   } 
 }   
 else {
-  echo '<a href="/login.php?returnto=', $_SERVER['REQUEST_URI'], '">Log in</a>';
+  $op = 'in';
 } 
 
+echo "<a href=\"/log$op.php?returnto=$returnto\">Log $op</a>";
+
 ?>
 </div>

Modified: site-src/trunk/site/login.php
===================================================================
--- site-src/trunk/site/login.php	2009-03-06 07:13:18 UTC (rev 5236)
+++ site-src/trunk/site/login.php	2009-03-06 11:25:53 UTC (rev 5237)
@@ -5,7 +5,7 @@
 
 $title = 'VASSAL Login';
 
-$returnto = isset($_GET['returnto']) ? $_GET['returnto'] : '';
+$returnto = isset($_GET['returnto']) ? urldecode($_GET['returnto']) : '';
 
 # check whether this was a login attempt
 if (empty($_POST)) {
@@ -85,7 +85,7 @@
 
 function print_form($returnto) {
   $action = 'login.php';
-  if (!empty($returnto)) $action .= "?returnto=$returnto";
+  if (!empty($returnto)) $action .= '?returnto=' . urlencode($returnto) . '"';
 
   print <<<END
 <form class="sso_form" action="$action" method="post">

Modified: site-src/trunk/site/logout.php
===================================================================
--- site-src/trunk/site/logout.php	2009-03-06 07:13:18 UTC (rev 5236)
+++ site-src/trunk/site/logout.php	2009-03-06 11:25:53 UTC (rev 5237)
@@ -4,7 +4,7 @@
 
 $title = 'Log out';
 
-$returnto = isset($_GET['returnto']) ? $_GET['returnto'] : '';
+$returnto = isset($_GET['returnto']) ? urldecode($_GET['returnto']) : '';
 
 # expire the cookie if we have one
 $key = isset($_COOKIE['VASSAL_login']) ? $_COOKIE['VASSAL_login'] : '';


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 5238
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5238&view=rev
Author:   uckelman
Date:     2009-03-08 00:19:40 +0000 (Sun, 08 Mar 2009)

Log Message:
-----------
Added news page.
Added RSS feed.

Modified Paths:
--------------
    site-src/trunk/site/index.php
    site-src/trunk/site/news.php
    site-src/trunk/site/style.css

Added Paths:
-----------
    site-src/trunk/site/news_rss.php
    site-src/trunk/site/news_submit.php

Modified: site-src/trunk/site/index.php
===================================================================
--- site-src/trunk/site/index.php	2009-03-06 11:25:53 UTC (rev 5237)
+++ site-src/trunk/site/index.php	2009-03-08 00:19:40 UTC (rev 5238)
@@ -4,7 +4,7 @@
 <head profile="http://www.w3.org/2005/10/profile">
   <link rel="stylesheet" type="text/css" href="/style.css"/>
   <link rel="stylesheet" type="text/css" href="/css/site.css"/>
-  <link rel="alternate" type="application/rss+xml" title="RSS" href="" />
+  <link rel="alternate" type="application/rss+xml" title="RSS" href="/news_rss.php" />
   <link rel="icon" type="image/png" href="/images/VASSAL.png"/>
   <title>VASSAL</title>
 </head>
@@ -55,62 +55,62 @@
 
     <div id="vassal-help">
       <h1>Get Help</h1>
-      <p>Need help using <acronym>Vassal</acronym>? Stuck while creating a module? If you can't find an answer in our extensive <a href="">documentation</a>, check our friendly <a href="forum/">forum</a> for help.</p>
+      <p>Need help using <acronym>Vassal</acronym>? Stuck while creating a module? If you can't find an answer in our extensive <a href="">documentation</a>, check our friendly <a href="/forum/">forum</a> for help.</p>
     </div>
 
     <div id="vassal-contribute">
       <h1>Get Involved</h1>
-      <p>The <acronym>Vassal</acronym> project is run by volunteers and makes progress by the efforts of volunteers. Is there a feature you'd like to see in the next release? Did you find a bug? Request that feature or report the bug <a href="bugzilla/">here</a>. Are you a programmer? We could use your help. Join us in the <a href="">developers' forum</a>. Not a programmer? Help us improve our <a href="">documentation</a>.</p>
+      <p>The <acronym>Vassal</acronym> project is run by volunteers and makes progress by the efforts of volunteers. Is there a feature you'd like to see in the next release? Did you find a bug? Request that feature or report the bug <a href="/tracker/">here</a>. Are you a programmer? We could use your help. Join us in the <a href="">developers' forum</a>. Not a programmer? Help us improve our <a href="">documentation</a>.</p>
     </div>
   </div>
 
   <div class="content_box_full" id="vassal-news">
-    <h1>Latest News <a href="news.php"><img src="/images/feed-icon-14x14.png"/></a></h1>
-    <ul class="news">
-      <li class="day">
-        <div class="date">Feb<br/>1</div>
-        <ul class="events">
-          <li><a href="">This is a news item in the future</a></li>
-        </ul>
-      </li>
-      <li class="day">
-        <div class="date">Jan<br/>31</div>
-        <ul class="events">
-          <li><a href=""><acronym>Vassal</acronym> 3.1.0 released</a></li>
-          <li><a href=""><acronym>Vassal</acronym> has a new web site</a></li>
-          <li><a href="">This is a test news item</a></li>
-          <li><a href="">No news is good news</a></li>
-        </ul>
-      </li>
-      <li class="day">
-        <div class="date">Jan<br/>30</div>
-        <ul class="events">
-          <li><a href="">Monsterpocalypse 1.01 released</a></li>
-        </ul>
-      </li>
-      <li class="day">
-        <div class="date">Jan<br/>26</div>
-        <ul class="events">
-          <li><a href=""><acronym>Vassal</acronym> 3.1.0-beta8 released</a></li>
-          <li><a href="">Zombies are eating my brain</a></li>
-        </ul>
-      </li>
-      <li class="day">
-        <div class="date">Jan<br/>25</div>
-        <ul class="events">
-          <li><a href=""><acronym>Vassal</acronym> 3.1.0-beta8 released</a></li>
-          <li><a href="">Zombies are eating my brain</a></li>
-        </ul>
-      </li>
-      <li class="day">
-        <div class="date">Jan<br/>24</div>
-        <ul class="events">
-          <li><a href="">Star Wars Tactics Version 1.4 released</a></li>
-          <li><a href="">This is a very, very long news item, put here just to test what happens when we have a very, very long news item</a></li>
-        </ul>
-      </li>
-    </ul>
-    <em><a id="more-news" href="">...more news</a></em>
+    <h1>Latest News <a href="/news_rss.php"><img src="/images/feed-icon-14x14.png"/></a></h1>
+<?php
+
+$rows = array();
+
+try {
+  require_once('sso/NewsDB.php');
+
+  $news = new NewsDB();
+  $limit = 10;
+  $query = "SELECT id, DATE_FORMAT(date,\"%b\") AS month, DAYOFMONTH(date) AS day, headline FROM news ORDER BY date DESC LIMIT $limit";
+  
+  $rows = $news->read_all($query);
+}
+catch (ErrorException $e) {
+  warn($e->getMessage());
+}
+
+if (count($rows) > 0) {
+  echo '<ul class="news threecol">';
+
+  $month = '';
+  $day = 0;
+
+  # print each item
+  foreach ($rows as $item) {
+    if ($day != $item['day'] || $month != $item['month']) {
+      if ($day != 0) echo '</ul></li>';
+
+      echo '<li class="day"><div class="date">',
+        $item['month'], '<br/>', $item['day'], '</div><ul class="events">';
+
+      $day = $item['day'];
+      $month = $item['month'];
+    }
+
+    echo '<li><a href="/news.php#', $item['id'], '">',
+      $item['headline'], '</a></li>';
+  }
+
+  echo '</ul></li></ul>';
+}
+?>
+    <div class="news-nav">
+      <em><a href="/news.php">...more news</a></em>
+    </div>
   </div>
 </div>
 

Modified: site-src/trunk/site/news.php
===================================================================
--- site-src/trunk/site/news.php	2009-03-06 11:25:53 UTC (rev 5237)
+++ site-src/trunk/site/news.php	2009-03-08 00:19:40 UTC (rev 5238)
@@ -4,53 +4,135 @@
 <head profile="http://www.w3.org/2005/10/profile">
   <link rel="stylesheet" type="text/css" href="/style.css"/>
   <link rel="stylesheet" type="text/css" href="/css/site.css"/>
-  <link rel="alternate" type="application/rss+xml" title="RSS" href="" />
-  <link rel="icon" type="image/png" href="images/VASSAL.png"/>
-  <title>VASSAL</title>
+  <link rel="alternate" type="application/rss+xml" title="RSS" href="/news_rss.php" />
+  <link rel="icon" type="image/png" href="/images/VASSAL.png"/>
+  <title>VASSAL News</title>
 </head>
 <body>
 <?php include('inc/header.php'); ?>
 
 <div id="content">
   <div class="content_box_full">
-    <h1>News</h1>
+  <h1>News <a href="/news_rss.php"><img src="/images/feed-icon-14x14.png"/></a></h1>
+
 <?php
 
+require_once('sso/ssolib.php');
 require_once('sso/NewsDB.php');
 
+if (isset($_GET['id'])) {
+  $id = $_GET['id'];
+  if (!is_numeric($id) || $id < 0) unset($id);
+}
+
+if (isset($_GET['from'])) {
+  $from = $_GET['from'];
+  if (!is_numeric($from) || $from < 0) unset($from);
+}
+
+if (isset($_GET['to'])) {
+  $to = $_GET['to'];
+  if (!is_numeric($to) || $to < 0) unset($to);
+}
+
+$rows = array();
+$prev = -1;
+$next = -1;
+
 try {
   $news = new NewsDB();
-  $query = 'SELECT DATE_FORMAT(date,"%b") AS month, DAYOFMONTH(date) AS day, headline, text FROM news ORDER BY date DESC LIMIT 50';
-  $rows = $news->read_all($query);
 
-  print '<ul>';
+  $limit = 10;
 
-  $day = 0;
+  $limit++;
+  if (isset($id)) {
+    $query = "SELECT id, DATE_FORMAT(date,\"%b\") AS month, DAYOFMONTH(date) AS day, headline, text FROM news WHERE id = $id";
+  }
+  else if (isset($from)) {
+    $query = "SELECT id, DATE_FORMAT(date,\"%b\") AS month, DAYOFMONTH(date) AS day, headline, text FROM news WHERE id >= $from ORDER BY date ASC LIMIT $limit";
+  }
+  else if (isset($to)) {
+    $query = "SELECT id, DATE_FORMAT(date,\"%b\") AS month, DAYOFMONTH(date) AS day, headline, text FROM news WHERE id <= $to ORDER BY date DESC LIMIT $limit";
+  }
+  else {
+    $query = "SELECT id, DATE_FORMAT(date,\"%b\") AS month, DAYOFMONTH(date) AS day, headline, text FROM news ORDER BY date DESC LIMIT $limit";
+  }
+  $limit--;
 
-  foreach ($rows as $item) {
-    if ($day != $item['day']) {
-      if ($day != 0) {
-        print '</ul></li>';
+  $rows = $news->read_all($query);
+  if (isset($from)) $rows = array_reverse($rows);
+
+  if (count($rows) > 0) {
+    # are there entries newer thant the display window?
+    $next = -1;
+    if (isset($from) && count($rows) > $limit) {
+      $next = $rows[1]['id'] + 1;
+    }
+    else if (isset($to)) {
+      $query = "SELECT 1 FROM news WHERE id > $to LIMIT 1";
+      if (count($news->read_all($query)) > 0) {
+        $next = $to + 1;
       }
+    }
 
-      print '<li class="day"><div class="date">' .
-        $item['month'] . '<br/>' . $item['day'] . '</div><ul class="events">';
+    # are there entries older than the display window?
+    $prev = -1;
+    if (isset($to) && count($rows) > $limit) {
+      $prev = $rows[count($rows)-2]['id'] - 1;
+    }
+    else if (!isset($id)) {
+      if (!isset($from)) $from = $rows[count($rows)-1]['id'];
 
+      $query = "SELECT 1 FROM news WHERE id < $from LIMIT 1";
+      if (count($news->read_all($query)) > 0) {
+        $prev = $from - 1;
+      }
     }
-
-    print '<li><h2>' . $item['headline'] . '</h2><p>'
-                     . $item['text'] . '</p></li>'; 
   }
-  
-  print '</ul></li></ul>';
 }
 catch (ErrorException $e) {
   warn($e->getMessage());
+  echo '</div></div>';
+  print_bottom();
+  exit;
 }
+
+# print the 'newer' link, if necessary
+if ($next >= 0) {
+  echo '<em><a class="news-nav" href="?from=', $next, '">newer</a></em>';
+}
+
+echo '<ul class="news">';
+
+$month = '';
+$day = 0;
+
+# print each item
+foreach ($rows as $item) {
+  if ($day != $item['day'] || $month != $item['month']) {
+    if ($day != 0) echo '</ul></li>';
+
+    echo '<li class="day"><div class="date">',
+        $item['month'], '<br/>', $item['day'], '</div><ul class="events">';
+
+    $day = $item['day'];
+    $month = $item['month'];
+  }
+
+  echo '<li><h2><a name="', $item['id'], '">', $item['headline'],
+       '</a></h2><p>', $item['text'], '</p></li>'; 
+} 
+  
+echo '</ul></li></ul>';
+
+# print the 'older' link, if necessary
+if ($prev >= 0) {
+  echo '<em><a class="news-nav" href="?to=', $prev, '">older</a></em>';
+}
 ?>
+
   </div>
 </div>
-
 <?php include('inc/footer.shtml'); ?>
 </body>
 </html>

Added: site-src/trunk/site/news_rss.php
===================================================================
--- site-src/trunk/site/news_rss.php	                        (rev 0)
+++ site-src/trunk/site/news_rss.php	2009-03-08 00:19:40 UTC (rev 5238)
@@ -0,0 +1,52 @@
+<?php echo '<?xml version="1.0" encoding="UTF-8"?>' ?>
+<rss version="2.0">
+  <channel>
+    <title>VASSAL News</title>
+    <link>http://www.test.nomic.net</link>
+    <description>News about the VASSAL Engine and VASSAL modules</description>
+    <language>en-us</language>
+<!--    <image>
+      <title>VASSAL News</title>
+      <url>http://www.test.nomic.net/images/header.png</url>
+      <link>http://www.test.nomic.net</link>
+    </image>
+-->
+    <generator>news_rss.php</generator>
+    <managingEditor>webmaster@...>
+    <webMaster>webmaster@...>
+    <docs>http://blogs.law.harvard.edu/tech/rss</docs>
+    <ttl>60</ttl>
+<?php
+
+require_once('sso/NewsDB.php');
+
+try {
+  $baseurl = 'http://www.test.nomic.net/news.php';
+
+  $news = new NewsDB();
+  $query = 'SELECT id, DATE_FORMAT(date, "%a, %d %b %Y %T") AS pubdate, headline, text FROM news ORDER BY date DESC LIMIT 10';
+  $rows = $news->read_all($query);
+
+  echo "<lastBuildDate>{$rows[0]['pubdate']}</lastBuildDate>";
+
+  foreach ($rows as $item) {
+    echo <<<END
+    <item>
+      <title>{$item['headline']}</title>
+      <description><![CDATA[{$item['text']}]]></description>
+      <pubDate>{$item['pubdate']} GMT</pubDate>
+      <link>$baseurl?id={$item['id']}</link>
+      <guid>$baseurl?id={$item['id']}</guid> 
+    </item>
+END;
+  }
+}
+catch (ErrorException $e) {
+  warn($e->getMessage());
+}
+
+
+?>
+
+  </channel>
+</rss>

Added: site-src/trunk/site/news_submit.php
===================================================================
--- site-src/trunk/site/news_submit.php	                        (rev 0)
+++ site-src/trunk/site/news_submit.php	2009-03-08 00:19:40 UTC (rev 5238)
@@ -0,0 +1,87 @@
+<?php
+require_once('sso/ssolib.php');
+
+$title = 'Submit VASSAL News';
+
+# check whether this was a submission attempt
+if (empty($_POST)) {
+  print_top($title);
+  print_form('', '');
+  print_bottom();
+  exit;
+}
+
+$key = $_COOKIE['VASSAL_login'];
+
+# sanitize the input
+$headline = addslashes($_POST['headline']);
+$text = addslashes($_POST['text']);
+
+try {
+  # check for blank headline
+  if (empty($headline)) {
+    throw new ErrorException('Empty headline.');
+  }
+
+  # check for blank text
+  if (empty($text)) {
+    throw new ErrorException('Empty text.');
+  }
+
+  # check cookie
+   if (empty($key)) {
+    throw new ErrorException('No key.');
+  }
+
+  require_once('sso/AuthDB.php');  
+
+  $auth = new AuthDB();
+  $username = $auth->user_for_cookie($key);
+
+
+  require_once('sso/NewsDB.php');
+
+  $news = new NewsDB();
+
+  $query = "INSERT INTO news (headline, text) VALUES ('$headline', '$text')";
+  $news->write($query);
+
+  print_top($title);
+  echo '<p>Item submitted.</p>';
+  print_bottom();
+  exit;
+}
+catch (ErrorException $e) {
+  print_top($title);
+  warn($e->getMessage());
+  print_form($headline, $text);
+  print_bottom();
+  exit;
+}
+
+function print_form($headline, $text) {
+  print <<<END
+<form class="sso_form" action="/news_submit.php" method="post">
+  <fieldset>
+    <legend>Submit News Item</legend>
+    <table>
+      <tr>
+        <th><label for="headline">Headline:</label></th>
+        <td><input type="text" id="headline" name="headline" value="$headline" /></td>
+      </tr>
+      <tr>
+        <th><label for="text">Text:</label></th>
+        <td><textarea id="text" name="text" cols="40" rows="10">$text</textarea></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td><input type="submit" name="submit" id="submit" value="Submit" /></td>
+      </tr>
+    </table>
+  </fieldset>
+</form>
+END;
+}
+
+
+?>

Modified: site-src/trunk/site/style.css
===================================================================
--- site-src/trunk/site/style.css	2009-03-06 11:25:53 UTC (rev 5237)
+++ site-src/trunk/site/style.css	2009-03-08 00:19:40 UTC (rev 5238)
@@ -143,11 +143,13 @@
 ul.news {
   margin: 0;
   padding: 0;
+}
+
+.threecol {
   -moz-column-count: 3;
   -moz-column-gap: 5px;
 }
 
-
 li.day {
   margin: 0.5em;
 	padding: 0;
@@ -181,7 +183,7 @@
 	margin: 0 0.5em 0em 0;
 }
 
-#more-news {
+.news-nav {
   float: right;
   clear: both;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 5242
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5242&view=rev
Author:   uckelman
Date:     2009-03-08 17:44:06 +0000 (Sun, 08 Mar 2009)

Log Message:
-----------
Initial version of search page.

Modified Paths:
--------------
    site-src/trunk/site/search.php

Added Paths:
-----------
    site-src/trunk/site/inc/search.shtml

Added: site-src/trunk/site/inc/search.shtml
===================================================================
--- site-src/trunk/site/inc/search.shtml	                        (rev 0)
+++ site-src/trunk/site/inc/search.shtml	2009-03-08 17:44:06 UTC (rev 5242)
@@ -0,0 +1,13 @@
+<div id="vassal-search">
+  <form action="http://www.test.nomic.net/search.php" id="cse-search-box">
+    <div>
+      <input type="hidden" name="cx" value="009624425637032310479:wa4dtyo3sma" />
+      <input type="hidden" name="cof" value="FORID:9" />
+      <input type="hidden" name="ie" value="UTF-8" />
+      <input type="text" name="q" size="15" />
+      <input type="hidden" name="sa" value="Search" />
+    </div>
+  </form>
+
+  <script type="text/javascript" src="http://www.google.com/coop/cse/brand?form=cse-search-box&lang=en"></script>
+</div>

Modified: site-src/trunk/site/search.php
===================================================================
--- site-src/trunk/site/search.php	2009-03-08 14:45:26 UTC (rev 5241)
+++ site-src/trunk/site/search.php	2009-03-08 17:44:06 UTC (rev 5242)
@@ -6,6 +6,34 @@
   <link rel="stylesheet" type="text/css" href="/css/site.css"/>
   <link rel="icon" type="image/png" href="/images/VASSAL.png"/>
   <title>VASSAL Search</title>
+
+  <style type="text/css">
+.search-block {
+  margin: 1ex 0;
+}
+
+.search-block input[type="submit"] {
+  width: 9em;
+}
+
+#google-search {
+  margin-bottom: -5pt;
+}
+
+#search {
+  margin: 0 auto;
+  width: 45em;
+}
+
+#content {
+  overflow: visible;
+}
+
+#cse-search-results {
+  margin-top: 2em;
+}
+
+  </style>
 </head>
 <body>
 <?php include('inc/header.php'); ?>
@@ -13,6 +41,73 @@
 <div id="content">
   <div id="content_box_full">
     <h1>Search</h1>
+    <p>Looking for something? You can search our site in four ways: the whole site, only the <a href="/wiki">wiki</a>, only the <a href="/forum">forum</a>, or only the <a href="/tracker">tracker</a>. Additionally, each of the wiki, forum, and tracker provide an advanced search interface for special searches.</p>
+
+    <div id="search">
+<!-- search code from Google -->
+    <div class="search-block" id="google-search">
+      <style type="text/css">
+        @import url(http://www.google.com/cse/api/branding.css);
+      </style>
+      <div class="cse-branding-right" style="background-color:#FFFFFF;color:#000000">
+        <div class="cse-branding-form">
+          <form action="" id="cse-search-box-main">
+            <div>
+              <input type="hidden" name="cx" value="009624425637032310479:wa4dtyo3sma" />
+              <input type="hidden" name="cof" value="FORID:10" />
+              <input type="hidden" name="ie" value="UTF-8" />
+              <input type="text" name="q" size="31" />
+              <input type="submit" name="sa" value="Search Site" />
+            </div>
+          </form>
+        </div>
+        <div class="cse-branding-logo">
+          <img src="http://www.google.com/images/poweredby_transparent/poweredby_FFFFFF.gif" alt="Google" />
+        </div>
+        <div class="cse-branding-text">
+          Custom Search
+        </div>
+      </div>
+    </div>
+
+<!-- search code from MediaWiki -->
+    <div class="search-block">
+      <form action="/wiki/index.php/Special:Search" id="searchform">
+        <input id="searchInput" name="search" type="text" size="31" />
+        <input type='submit' name="fulltext" value="Search Wiki" />
+        <a href="/wiki/index.php/Special:Search">Advanced search</a>
+      </form>
+    </div>
+  
+<!-- search code from phpBB -->
+    <div class="search-block">
+      <form action="/forum/search.php" method="post" id="search">
+        <input name="keywords" id="keywords" type="text" maxlength="128" size="31" /> 
+        <input value="Search Forum" type="submit" />
+        <a href="/forum/search.php" title="View the advanced search options">Advanced search</a>
+      </form>
+    </div>
+
+<!-- search code from Bugzilla -->
+    <div class="search-block">
+      <form action="/tracker/buglist.cgi" method="get">
+        <input type="text" name="quicksearch" size="31" />
+        <input type="submit" value="Search Tracker" id="find_top" />
+        <a href="/tracker/query.cgi?format=advanced">Advanced search</a>
+      </form>
+    </div>
+
+    </div> 
+
+    <div id="cse-search-results"></div>
+    <script type="text/javascript">
+      var googleSearchIframeName = "cse-search-results";
+      var googleSearchFormName = "cse-search-box-main";
+      var googleSearchFrameWidth = 600;
+      var googleSearchDomain = "www.google.com";
+      var googleSearchPath = "/cse";
+    </script>
+    <script type="text/javascript" src="http://www.google.com/afsonline/show_afs_search.js"></script>
   </div>
 </div>
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 5253
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5253&view=rev
Author:   uckelman
Date:     2009-03-08 20:39:30 +0000 (Sun, 08 Mar 2009)

Log Message:
-----------
Enabled image for RSS feed.
Added favicon for RSS feed (and older browsers).

Modified Paths:
--------------
    site-src/trunk/site/news_rss.php

Added Paths:
-----------
    site-src/trunk/site/favicon.ico

Added: site-src/trunk/site/favicon.ico
===================================================================
(Binary files differ)


Property changes on: site-src/trunk/site/favicon.ico
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: site-src/trunk/site/news_rss.php
===================================================================
--- site-src/trunk/site/news_rss.php	2009-03-08 20:34:19 UTC (rev 5252)
+++ site-src/trunk/site/news_rss.php	2009-03-08 20:39:30 UTC (rev 5253)
@@ -5,12 +5,13 @@
     <link>http://www.test.nomic.net</link>
     <description>News about the VASSAL Engine and VASSAL modules</description>
     <language>en-us</language>
-<!--    <image>
+    <image>
       <title>VASSAL News</title>
       <url>http://www.test.nomic.net/images/header.png</url>
       <link>http://www.test.nomic.net</link>
+      <width>270</width>
+      <height>72</height>
     </image>
--->
     <generator>news_rss.php</generator>
     <managingEditor>webmaster@...>
     <webMaster>webmaster@...>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 5254
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5254&view=rev
Author:   uckelman
Date:     2009-03-08 21:38:49 +0000 (Sun, 08 Mar 2009)

Log Message:
-----------
Fixed invalid XHTML.

Modified Paths:
--------------
    site-src/trunk/site/about.php
    site-src/trunk/site/download.php
    site-src/trunk/site/inc/footer.shtml
    site-src/trunk/site/inc/header.php
    site-src/trunk/site/inc/search.shtml
    site-src/trunk/site/index.php
    site-src/trunk/site/news.php

Modified: site-src/trunk/site/about.php
===================================================================
--- site-src/trunk/site/about.php	2009-03-08 20:39:30 UTC (rev 5253)
+++ site-src/trunk/site/about.php	2009-03-08 21:38:49 UTC (rev 5254)
@@ -13,10 +13,10 @@
 <div id="content">
   <div id="content_box_full">
     <h1>About</h1>
-    <h2><a name="vassal">About <acronym>Vassal</acronym></a></h2>
-    <h2><a name="team">About The <acronym>Vassal</acronym> Team</a></h2>
+    <h2><a id="vassal">About <acronym>Vassal</acronym></a></h2>
+    <h2><a id="team">About The <acronym>Vassal</acronym> Team</a></h2>
 
-    <h2><a name="site">About the Website</a></h2>
+    <h2><a id="site">About the Website</a></h2>
     <p>The site was originally designed by <a href="">Joel Uckelman</a> using <a href="http://www.php.net">PHP</a> and <a href="http://www.vim.org">Vim</a>. Source code for the site is available in the <acronym>Vassal</acronym> <a href="http://vassalengine.svn.sourceforge.net/viewvc/vassalengine/">Subversion repository</a> under <code>/site-src</code>.</p>
 
     <p>All hand-coded pages on the site are intended to be valid XHTML and CSS. If you find that is not the case, please notify the <a href="webmaster@...> so the problem can be rectified.</p>

Modified: site-src/trunk/site/download.php
===================================================================
--- site-src/trunk/site/download.php	2009-03-08 20:39:30 UTC (rev 5253)
+++ site-src/trunk/site/download.php	2009-03-08 21:38:49 UTC (rev 5254)
@@ -53,7 +53,7 @@
   <table>
     <tr>
       <td>
-        <img src="/images/linux.png"/>
+        <img src="/images/linux.png" alt="Linux" />
         <dl>
           <dt>Linux</dt>
           <dd>Download <a href="http://downloads.sourceforge.net/vassalengine/VASSAL-3.1.0-linux.zip">ZIP archive</a> (13MB) <br/>Unpack it and run <code>VASSAL.sh</code></dd>
@@ -69,7 +69,7 @@
     </tr>
     <tr>
       <td>
-        <img src="/images/macosx.png"/>
+        <img src="/images/macosx.png" alt="Mac OS X"/>
         <dl>
           <dt>Mac OS X</dt>
           <dd>Download <a href="http://downloads.sourceforge.net/vassalengine/VASSAL-3.1.0-macosx.dmg">disk image</a> (16MB)</dd>
@@ -85,7 +85,7 @@
     </tr>
     <tr>
       <td>
-        <img src="/images/windows.png"/>
+        <img src="/images/windows.png" alt="Windows" />
         <dl>
           <dt>Windows</dt>
           <dd>Download and run <a href="">installer</a> (12MB)</dd>

Modified: site-src/trunk/site/inc/footer.shtml
===================================================================
--- site-src/trunk/site/inc/footer.shtml	2009-03-08 20:39:30 UTC (rev 5253)
+++ site-src/trunk/site/inc/footer.shtml	2009-03-08 21:38:49 UTC (rev 5254)
@@ -6,7 +6,7 @@
     <li><a href="/sitemap.php">Sitemap</a></li>
     <li><a href="/search.php">Search</a></li>
     <li><a href="/about.php">About</a></li>
-    <li><a href="http://sourceforge.net/projects/vassalengine"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=90612&type=12" width="120" height="30" alt="Get VASSAL Engine at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a></li>
+    <li><a href="http://sourceforge.net/projects/vassalengine"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=90612&amp;type=12" width="120" height="30" alt="Get VASSAL Engine at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a></li>
     <li><a href="http://www.yourkit.com/"><img src="/images/YourKit_logo.png" alt="YourKit Java Profiler" width="96" height="30" /></a></li>
   </ul>
 </div>

Modified: site-src/trunk/site/inc/header.php
===================================================================
--- site-src/trunk/site/inc/header.php	2009-03-08 20:39:30 UTC (rev 5253)
+++ site-src/trunk/site/inc/header.php	2009-03-08 21:38:49 UTC (rev 5254)
@@ -1,6 +1,6 @@
 <div id="vassal-header">
   <div id="vassal-logo">
-    <a href="/index.php"><img src="/images/header.png"/></a>
+    <a href="/index.php"><img src="/images/header.png" alt="VASSA, the open-source boardgame engine" /></a>
   </div>
   <?php 
     include(dirname(__FILE__) . '/navigation.shtml');

Modified: site-src/trunk/site/inc/search.shtml
===================================================================
--- site-src/trunk/site/inc/search.shtml	2009-03-08 20:39:30 UTC (rev 5253)
+++ site-src/trunk/site/inc/search.shtml	2009-03-08 21:38:49 UTC (rev 5254)
@@ -9,5 +9,5 @@
     </div>
   </form>
 
-  <script type="text/javascript" src="http://www.google.com/coop/cse/brand?form=cse-search-box&lang=en"></script>
+  <script type="text/javascript" src="http://www.google.com/coop/cse/brand?form=cse-search-box&amp;lang=en"></script>
 </div>

Modified: site-src/trunk/site/index.php
===================================================================
--- site-src/trunk/site/index.php	2009-03-08 20:39:30 UTC (rev 5253)
+++ site-src/trunk/site/index.php	2009-03-08 21:38:49 UTC (rev 5254)
@@ -20,8 +20,8 @@
 
       <table class="screenshot">
         <tr>
-          <td><a href="/images/screenshot1.png"><img src="/thumbs/screenshot1.png" /></a></td>
-          <td><a href="/images/screenshot2.png"><img src="/thumbs/screenshot2.png" /></a></td>
+          <td><a href="/images/screenshot1.png"><img src="/thumbs/screenshot1.png" alt="screenshot" /></a></td>
+          <td><a href="/images/screenshot2.png"><img src="/thumbs/screenshot2.png" alt="screenshot" /></a></td>
         </tr>
       </table>
   
@@ -30,8 +30,8 @@
 
       <table class="screenshot">
         <tr>
-          <td><a href="/images/screenshot2.png"><img src="/thumbs/screenshot2.png" /></a></td>
-          <td><a href="/images/screenshot1.png"><img src="/thumbs/screenshot1.png" /></a></td>
+          <td><a href="/images/screenshot2.png"><img src="/thumbs/screenshot2.png" alt="screenshot" /></a></td>
+          <td><a href="/images/screenshot1.png"><img src="/thumbs/screenshot1.png" alt="screenshot" /></a></td>
         </tr>
       </table>
     </div>
@@ -44,11 +44,11 @@
       <div class="dlbutton">
         <?php
           include 'inc/download-detect.php';
-          echo "<a href=\"$download_url\"><span>Download <acronym>Vassal</acronym><br/>$version$download_os</span><img src=\"/images/button.download.png\"/></a>";
+          echo "<a href=\"$download_url\"><span>Download <acronym>Vassal</acronym><br/>$version$download_os</span><img src=\"/images/button.download.png\" alt=\"\" /></a>";
         ?>
       </div>
       <div class="dlbutton">
-        <a target="_blank" href="https://www.paypal.com/us/cgi-bin/webscr?cmd=_flow&SESSION=gS5hJbXNrYzfhrwcaHyrBsSqND22MpcGz07W_M7D94YX9wq1CFH4rbdTb7e&dispatch=5885d80a13c0db1fa798f5a5f5ae42e779d4b5655493f6171509c5b2ec019b86"><span>Support <acronym>Vassal</acronym></span><img src="/images/paypal_donate.png"/></a>
+        <a target="_blank" href="https://www.paypal.com/us/cgi-bin/webscr?cmd=_flow&amp;SESSION=gS5hJbXNrYzfhrwcaHyrBsSqND22MpcGz07W_M7D94YX9wq1CFH4rbdTb7e&amp;dispatch=5885d80a13c0db1fa798f5a5f5ae42e779d4b5655493f6171509c5b2ec019b86"><span>Support <acronym>Vassal</acronym></span><img src="/images/paypal_donate.png" alt="" /></a>
       </div>
       <p><acronym>Vassal</acronym> is free, but development and hosting are not. If you enjoy using <acronym>Vassal</acronym>, please consider helping us with these costs.</p>
     </div>
@@ -65,7 +65,7 @@
   </div>
 
   <div class="content_box_full" id="vassal-news">
-    <h1>Latest News <a href="/news_rss.php"><img src="/images/feed-icon-14x14.png"/></a></h1>
+    <h1>Latest News <a href="/news_rss.php"><img src="/images/feed-icon-14x14.png" alt="RSS feed" /></a></h1>
 <?php
 
 $rows = array();
@@ -101,7 +101,7 @@
       $month = $item['month'];
     }
 
-    echo '<li><a href="/news.php#', $item['id'], '">',
+    echo '<li><a href="/news.php#_', $item['id'], '">',
       $item['headline'], '</a></li>';
   }
 

Modified: site-src/trunk/site/news.php
===================================================================
--- site-src/trunk/site/news.php	2009-03-08 20:39:30 UTC (rev 5253)
+++ site-src/trunk/site/news.php	2009-03-08 21:38:49 UTC (rev 5254)
@@ -13,7 +13,7 @@
 
 <div id="content">
   <div class="content_box_full">
-  <h1>News <a href="/news_rss.php"><img src="/images/feed-icon-14x14.png"/></a></h1>
+  <h1>News <a href="/news_rss.php"><img src="/images/feed-icon-14x14.png" alt="RSS feed" /></a></h1>
 
 <?php
 
@@ -119,7 +119,7 @@
     $month = $item['month'];
   }
 
-  echo '<li><h2><a name="', $item['id'], '">', $item['headline'],
+  echo '<li><h2><a id="_', $item['id'], '">', $item['headline'],
        '</a></h2><p>', $item['text'], '</p></li>'; 
 } 
   


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 6595
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=6595&view=rev
Author:   uckelman
Date:     2010-03-07 18:03:36 +0000 (Sun, 07 Mar 2010)

Log Message:
-----------
Improved error messages.

Modified Paths:
--------------
    site-src/trunk/site/phpbb_login.php
    site-src/trunk/site/sso/ssolib.php

Modified: site-src/trunk/site/phpbb_login.php
===================================================================
--- site-src/trunk/site/phpbb_login.php	2010-03-07 17:47:57 UTC (rev 6594)
+++ site-src/trunk/site/phpbb_login.php	2010-03-07 18:03:36 UTC (rev 6595)
@@ -6,9 +6,14 @@
 $username = addslashes($_POST['username']);
 $password = addslashes($_POST['password']);
 
-if (empty($username) || empty($password)) {
-  print -1;
+if (empty($username)) {
+  print 'Empty username.';
   exit;
+} 
+
+if (empty($password)) {
+  print 'Empty password.';
+  exit;
 }
 
 define('IN_PHPBB', true);
@@ -27,7 +32,7 @@
   $reply = $auth->login($username, $password, $autologin, $viewonline);
 
   if ($reply['status'] != LOGIN_SUCCESS) {
-    print -1;
+    print $reply['error_msg'];
     exit;
   }
 }

Modified: site-src/trunk/site/sso/ssolib.php
===================================================================
--- site-src/trunk/site/sso/ssolib.php	2010-03-07 17:47:57 UTC (rev 6594)
+++ site-src/trunk/site/sso/ssolib.php	2010-03-07 18:03:36 UTC (rev 6595)
@@ -116,7 +116,7 @@
   }
 
   if ($content != '1') {
-    throw new ErrorException('phpBB login failed.');
+    throw new ErrorException("phpBB login failed: $content");
   }
 
   return extract_cookies($http_response_header);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 6858
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=6858&view=rev
Author:   uckelman
Date:     2010-05-12 19:12:50 +0000 (Wed, 12 May 2010)

Log Message:
-----------
* Moved much information from from page to About.
* Moved latest news to right column.
* Read current version from release-current.

Modified Paths:
--------------
    site-src/trunk/site/about.php
    site-src/trunk/site/inc/download-detect.php
    site-src/trunk/site/index.php
    site-src/trunk/site/style.css

Added Paths:
-----------
    site-src/trunk/site/util/
    site-src/trunk/site/util/release-current

Modified: site-src/trunk/site/about.php
===================================================================
--- site-src/trunk/site/about.php	2010-05-12 17:40:16 UTC (rev 6857)
+++ site-src/trunk/site/about.php	2010-05-12 19:12:50 UTC (rev 6858)
@@ -14,6 +14,28 @@
   <div id="content_box_full">
     <h1>About</h1>
     <h2><a id="vassal">About <acronym>Vassal</acronym></a></h2>
+
+    <h3>What is <acronym>Vassal</acronym>?</h3>
+    <p><acronym>Vassal</acronym> is a game engine for building and playing online adaptations of board games and card games. You can use <acronym>Vassal</acronym> to play in real time over the Internet or by email. <acronym>Vassal</acronym> runs on all platforms, and is free, open-source software.</p>
+
+    <table class="screenshot">
+      <tbody>
+        <tr>
+          <td><a href="/images/screenshot1.png"><img src="/thumbs/screenshot1.png" alt="screenshot"></a></td>
+          <td><a href="/images/screenshot2.png"><img src="/thumbs/screenshot2.png" alt="screenshot"></a></td>
+        </tr>
+      </tbody>
+    </table>
+  
+    <h3>What games can I play using <acronym>Vassal</acronym>?</h3>
+    <p>Hundreds of boardgames have been converted for use with <acronym>Vassal</acronym>, so there's a good chance that you'll find the games you own in our <a href="">module library</a> already. If there is not yet a <acronym>Vassal</acronym> module for your favorite game, you can use the <acronym>Vassal</acronym> Editor to build your own module, and should you run into trouble, help is only a click away in our <a href="http://www.test.nomic.net/forum/">forum</a>.</p>
+
+    <h3>How can I get help?</h3>
+    <p>Need help using <acronym>Vassal</acronym>? Stuck while creating a module? If you can't find an answer in our extensive <a href="">documentation</a>, check our friendly <a href="http://www.test.nomic.net/forum/">forum</a> for help.</p>
+
+    <h3>How can I get involved?</h3>
+    <p>The <acronym>Vassal</acronym>project is run by volunteers and progresses through the efforts of volunteers. Is there a feature you'd like to see in the next release? Did you find a bug? Request that feature or report the bug <a href="http://www.test.nomic.net/tracker/">here</a>. Are you a programmer? We could use your help. Join us in the <a href="http://www.test.nomic.net/forum/viewforum.php?f=8">developers' forum</a>. Not a programmer? Help us improve our <a href="">documentation</a>.</p>
+
     <h2><a id="team">About The <acronym>Vassal</acronym> Team</a></h2>
 
     <h2><a id="site">About the Website</a></h2>

Modified: site-src/trunk/site/inc/download-detect.php
===================================================================
--- site-src/trunk/site/inc/download-detect.php	2010-05-12 17:40:16 UTC (rev 6857)
+++ site-src/trunk/site/inc/download-detect.php	2010-05-12 19:12:50 UTC (rev 6858)
@@ -1,9 +1,10 @@
 <?php
 
-$version = '3.1.0';
+# NB: $version should already be defined before calling this script
+
 $base_url = 'http://downloads.sourceforge.net/vassalengine';
  
-// Get the user's browser
+# Get the user's browser
 $useragent = $_SERVER['HTTP_USER_AGENT'];
 
 if (strstr($useragent, 'Win')) {

Modified: site-src/trunk/site/index.php
===================================================================
--- site-src/trunk/site/index.php	2010-05-12 17:40:16 UTC (rev 6857)
+++ site-src/trunk/site/index.php	2010-05-12 19:12:50 UTC (rev 6858)
@@ -13,37 +13,34 @@
 
 <div id="content">
   <div class="content_box_left">
-    <div id="vassal-about">
+    <div id="about">
       <h1>What is <acronym>Vassal</acronym>?</h1>
-      <p><acronym>Vassal</acronym> is a game engine for building and playing online adaptations of board games and card games. It allows users to play in real time over the Internet, or by email. <acronym>Vassal</acronym> runs on all platforms, and is free, open-source software.</p>
-      <p>Click <a href="foo">here</a> to learn more about <acronym>Vassal</acronym>.</p>
+      <p><acronym>Vassal</acronym> is a game engine for building and playing online adaptations of board games and card games. Play live on the Internet or by email. <acronym>Vassal</acronym> runs on all platforms, and is free, open-source software.</p>
 
-      <table class="screenshot">
-        <tr>
-          <td><a href="/images/screenshot1.png"><img src="/thumbs/screenshot1.png" alt="screenshot" /></a></td>
-          <td><a href="/images/screenshot2.png"><img src="/thumbs/screenshot2.png" alt="screenshot" /></a></td>
-        </tr>
-      </table>
-  
-      <h1>What Games Are There?</h1>
-      <p>Hundreds of boardgames have been converted for use with <acronym>Vassal</acronym>, so there's a good chance that you'll find the games you own in our <a href="">module library</a> already. If there is not yet a <acronym>Vassal</acronym> module for your favorite game, you can use the <acronym>Vassal</acronym> Editor to build your own module, and should you run into trouble, help is only a click away in our <a href="forum/">forum</a>.</p>
+      <p><a href="/about.php">Learn more</a> about <acronym>Vassal</acronym>.</p>
 
       <table class="screenshot">
-        <tr>
-          <td><a href="/images/screenshot2.png"><img src="/thumbs/screenshot2.png" alt="screenshot" /></a></td>
-          <td><a href="/images/screenshot1.png"><img src="/thumbs/screenshot1.png" alt="screenshot" /></a></td>
-        </tr>
+        <tbody>
+          <tr>
+            <td><a href="/images/screenshot1.png"><img src="/thumbs/screenshot1.png" alt="screenshot"></a></td>
+            <td><a href="/images/screenshot2.png"><img src="/thumbs/screenshot2.png" alt="screenshot"></a></td>
+          </tr>
+        </tbody>
       </table>
     </div>
-  </div>
 
-  <div class="content_box_right">
-    <div id="vassal-download">
+    <div id="download">
       <h1>Get <acronym>Vassal</acronym></h1>
-      <p><acronym>Vassal</acronym> is free, open-source software, created by volunteers. Our current release is 3.1.0.</p> 
+      <p><acronym>Vassal</acronym> is free, open-source software, created by volunteers. Our current release is 
+        <?php 
+          $version = file_get_contents('util/release-current');
+          echo $version;
+        ?>
+      .</p> 
+
       <div class="dlbutton">
         <?php
-          include 'inc/download-detect.php';
+          include('inc/download-detect.php');
           echo "<a href=\"$download_url\"><span>Download <acronym>Vassal</acronym><br/>$version$download_os</span><img src=\"/images/button.download.png\" alt=\"\" /></a>";
         ?>
       </div>
@@ -52,20 +49,12 @@
       </div>
       <p><acronym>Vassal</acronym> is free, but development and hosting are not. If you enjoy using <acronym>Vassal</acronym>, please consider helping us with these costs.</p>
     </div>
-
-    <div id="vassal-help">
-      <h1>Get Help</h1>
-      <p>Need help using <acronym>Vassal</acronym>? Stuck while creating a module? If you can't find an answer in our extensive <a href="">documentation</a>, check our friendly <a href="/forum/">forum</a> for help.</p>
-    </div>
-
-    <div id="vassal-contribute">
-      <h1>Get Involved</h1>
-      <p>The <acronym>Vassal</acronym> project is run by volunteers and makes progress by the efforts of volunteers. Is there a feature you'd like to see in the next release? Did you find a bug? Request that feature or report the bug <a href="/tracker/">here</a>. Are you a programmer? We could use your help. Join us in the <a href="/forum/viewforum.php?f=8">developers' forum</a>. Not a programmer? Help us improve our <a href="">documentation</a>.</p>
-    </div>
   </div>
 
-  <div class="content_box_full" id="vassal-news">
-    <h1>Latest News <a href="/news_rss.php"><img src="/images/feed-icon-14x14.png" alt="RSS feed" /></a></h1>
+  <div class="content_box_right">
+    <div id="news">
+      <h1>Latest News <a href="/news_rss.php"><img src="/images/feed-icon-14x14.png" alt="RSS feed"></a></h1>
+
 <?php
 
 $rows = array();
@@ -84,7 +73,7 @@
 }
 
 if (count($rows) > 0) {
-  echo '<ul class="news threecol">';
+  echo '<ul>';
 
   $month = '';
   $day = 0;
@@ -108,8 +97,9 @@
   echo '</ul></li></ul>';
 }
 ?>
-    <div class="news-nav">
-      <em><a href="/news.php">...more news</a></em>
+      <div class="news-nav">
+        <em><a href="/news.php">...more news</a></em>
+      </div>
     </div>
   </div>
 </div>

Modified: site-src/trunk/site/style.css
===================================================================
--- site-src/trunk/site/style.css	2010-05-12 17:40:16 UTC (rev 6857)
+++ site-src/trunk/site/style.css	2010-05-12 19:12:50 UTC (rev 6858)
@@ -127,9 +127,6 @@
   vertical-align: middle;
 }
 
-
-
-
 table.screenshot {
   margin: 0 auto;
 }
@@ -143,11 +140,6 @@
   padding: 0;
 }
 
-.threecol {
-  -moz-column-count: 3;
-  -moz-column-gap: 5px;
-}
-
 li.day {
   margin: 0.5em;
 	padding: 0;

Added: site-src/trunk/site/util/release-current
===================================================================
--- site-src/trunk/site/util/release-current	                        (rev 0)
+++ site-src/trunk/site/util/release-current	2010-05-12 19:12:50 UTC (rev 6858)
@@ -0,0 +1 @@
+3.1.14


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------

_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 6870
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=6870&view=rev
Author:   uckelman
Date:     2010-05-15 17:40:32 +0000 (Sat, 15 May 2010)

Log Message:
-----------
Move style.css.

Modified Paths:
--------------
    site-src/trunk/site/about.php
    site-src/trunk/site/donate.php
    site-src/trunk/site/download.php
    site-src/trunk/site/license.php
    site-src/trunk/site/search.php
    site-src/trunk/site/sitemap.php

Added Paths:
-----------
    site-src/trunk/site/css/style.css

Removed Paths:
-------------
    site-src/trunk/site/style.css

Modified: site-src/trunk/site/about.php
===================================================================
--- site-src/trunk/site/about.php	2010-05-15 17:35:43 UTC (rev 6869)
+++ site-src/trunk/site/about.php	2010-05-15 17:40:32 UTC (rev 6870)
@@ -2,7 +2,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head profile="http://www.w3.org/2005/10/profile">
-  <link rel="stylesheet" type="text/css" href="/style.css"/>
+  <link rel="stylesheet" type="text/css" href="/css/style.css"/>
   <link rel="stylesheet" type="text/css" href="/css/site.css"/>
   <link rel="icon" type="image/png" href="/images/VASSAL.png"/>
   <title>About VASSAL</title>

Copied: site-src/trunk/site/css/style.css (from rev 6869, site-src/trunk/site/style.css)
===================================================================
--- site-src/trunk/site/css/style.css	                        (rev 0)
+++ site-src/trunk/site/css/style.css	2010-05-15 17:40:32 UTC (rev 6870)
@@ -0,0 +1,183 @@
+body {
+  margin: 0 auto;
+  padding: 0 0 1em 0;
+  font-size: 72.5%;
+  background-color: white;
+  max-width: 900px;
+}
+
+body, td, th, input, textarea, pre, h1, h2, h3, h4, h5, h6 { color: #222222; }
+body, td, th, input, textarea { font-family: sans-serif; }
+pre { font-family: monospace; }
+
+p {
+  text-align: justify;
+}
+
+a:link { 
+  color: #546035; 
+}
+ 
+a:visited { 
+  color: #384024; 
+} 
+
+a:link:hover, a:visited:hover { 
+  color: #9caa79;
+} 
+
+a img {
+  border: 0;
+}
+
+acronym {
+  font-variant: small-caps;
+}
+
+.errorbox {
+  margin: 10px auto;
+  border: 2px red solid;
+  padding: 0.5em 1em;
+  background-color: #fff2f2;
+}
+
+.errorbox h2 {
+  font-size: 1em;
+  font-weight: bold;
+  display: inline;
+  margin: 0 .5em 0 0;
+  border: none;
+}
+
+#content {
+  margin: 0 auto;
+  padding: 0;
+  min-width: 700px;
+  max-width: 790px;
+  width: 790px;
+  clear: both;
+  font-size: 1.2em;
+}
+
+#content h1 {
+  color: #384024;
+  margin-bottom: 0;
+} 
+
+.content_box_left { 
+  width: 48%;
+  float: left;
+  clear: left;
+}
+
+.content_box_right {
+  width: 48%;
+  float: right;
+  clear: right;
+}
+
+.content_box_full {
+  clear: both;
+}
+
+
+
+
+div.dlbutton {
+  padding: 1em;
+  margin: 1em auto;
+  border: 1px solid #8dea34;
+  border-radius: 5px;
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
+  background-color: #62a324;
+  color: white;
+  font-weight: bold;
+  font-size: 110%;
+  width: 18em;
+  text-align: center;
+}
+
+div.dlbutton a {
+  display: block;
+  overflow: auto;
+  color: white;
+  text-decoration: none;
+}
+
+div.dlbutton a:hover {
+  color: white;
+  text-decoration: none;
+}
+
+div.dlbutton a span {
+  display: inline-block;
+  vertical-align: middle;
+  text-align: center;
+  padding: 12px;
+}
+
+div.dlbutton a:hover span {
+  text-decoration: underline;
+}
+
+div.dlbutton a img {
+  vertical-align: middle;
+}
+
+table.screenshot {
+  margin: 0 auto;
+}
+
+table.screenshot td {
+  padding: 0 5px;
+}
+
+ul.news {
+  margin: 0;
+  padding: 0;
+}
+
+li.day {
+  margin: 0.5em;
+	padding: 0;
+	list-style-type: none;
+  float: left;
+}
+
+ul.events {
+  margin: 0 0 0 1em;
+  padding: 0;
+}
+
+ul.events li {
+  list-style-type: disc;
+  margin: 0 0 0.5em 3.5em;
+  padding-left: 0;
+}
+
+div.date {
+  background: #FAF4C8;
+	border-right: 1px solid #E3DE9F;
+	border-bottom: 1px solid #E3DE9F;
+	float: left;
+  clear: both;
+	text-align: center;
+	line-height: 1.1em;
+	padding: 2px 1px 5px 1px;
+	width: 2.2em;
+	margin: 0 0.5em 0em 0;
+}
+
+.news-nav {
+  float: right;
+  clear: both;
+}
+
+div.date:first-line {
+  font-size: 70%;
+}
+
+div.costbox div {
+  margin: 1em auto;
+}

Modified: site-src/trunk/site/donate.php
===================================================================
--- site-src/trunk/site/donate.php	2010-05-15 17:35:43 UTC (rev 6869)
+++ site-src/trunk/site/donate.php	2010-05-15 17:40:32 UTC (rev 6870)
@@ -2,7 +2,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head profile="http://www.w3.org/2005/10/profile">
-  <link rel="stylesheet" type="text/css" href="/style.css"/>
+  <link rel="stylesheet" type="text/css" href="/css/style.css"/>
   <link rel="stylesheet" type="text/css" href="/css/site.css"/>
   <link rel="icon" type="image/png" href="/images/VASSAL.png"/>
   <title>Support VASSAL</title>

Modified: site-src/trunk/site/download.php
===================================================================
--- site-src/trunk/site/download.php	2010-05-15 17:35:43 UTC (rev 6869)
+++ site-src/trunk/site/download.php	2010-05-15 17:40:32 UTC (rev 6870)
@@ -2,7 +2,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head profile="http://www.w3.org/2005/10/profile">
-  <link rel="stylesheet" type="text/css" href="/style.css"/>
+  <link rel="stylesheet" type="text/css" href="/css/style.css"/>
   <link rel="stylesheet" type="text/css" href="/css/site.css"/>
   <link rel="icon" type="image/png" href="/images/VASSAL.png"/>
 

Modified: site-src/trunk/site/license.php
===================================================================
--- site-src/trunk/site/license.php	2010-05-15 17:35:43 UTC (rev 6869)
+++ site-src/trunk/site/license.php	2010-05-15 17:40:32 UTC (rev 6870)
@@ -2,7 +2,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head profile="http://www.w3.org/2005/10/profile">
-  <link rel="stylesheet" type="text/css" href="/style.css"/>
+  <link rel="stylesheet" type="text/css" href="/css/style.css"/>
   <link rel="stylesheet" type="text/css" href="/css/site.css"/>
   <link rel="icon" type="image/png" href="/images/VASSAL.png"/>
   <title>VASSAL License</title>

Modified: site-src/trunk/site/search.php
===================================================================
--- site-src/trunk/site/search.php	2010-05-15 17:35:43 UTC (rev 6869)
+++ site-src/trunk/site/search.php	2010-05-15 17:40:32 UTC (rev 6870)
@@ -2,7 +2,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head profile="http://www.w3.org/2005/10/profile">
-  <link rel="stylesheet" type="text/css" href="/style.css"/>
+  <link rel="stylesheet" type="text/css" href="/css/style.css"/>
   <link rel="stylesheet" type="text/css" href="/css/site.css"/>
   <link rel="icon" type="image/png" href="/images/VASSAL.png"/>
   <title>VASSAL Search</title>

Modified: site-src/trunk/site/sitemap.php
===================================================================
--- site-src/trunk/site/sitemap.php	2010-05-15 17:35:43 UTC (rev 6869)
+++ site-src/trunk/site/sitemap.php	2010-05-15 17:40:32 UTC (rev 6870)
@@ -2,7 +2,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head profile="http://www.w3.org/2005/10/profile">
-  <link rel="stylesheet" type="text/css" href="/style.css"/>
+  <link rel="stylesheet" type="text/css" href="/css/style.css"/>
   <link rel="stylesheet" type="text/css" href="/css/site.css"/>
   <link rel="icon" type="image/png" href="/images/VASSAL.png"/>
   <title>VASSAL Sitemap</title>

Deleted: site-src/trunk/site/style.css
===================================================================
--- site-src/trunk/site/style.css	2010-05-15 17:35:43 UTC (rev 6869)
+++ site-src/trunk/site/style.css	2010-05-15 17:40:32 UTC (rev 6870)
@@ -1,183 +0,0 @@
-body {
-  margin: 0 auto;
-  padding: 0 0 1em 0;
-  font-size: 72.5%;
-  background-color: white;
-  max-width: 900px;
-}
-
-body, td, th, input, textarea, pre, h1, h2, h3, h4, h5, h6 { color: #222222; }
-body, td, th, input, textarea { font-family: sans-serif; }
-pre { font-family: monospace; }
-
-p {
-  text-align: justify;
-}
-
-a:link { 
-  color: #546035; 
-}
- 
-a:visited { 
-  color: #384024; 
-} 
-
-a:link:hover, a:visited:hover { 
-  color: #9caa79;
-} 
-
-a img {
-  border: 0;
-}
-
-acronym {
-  font-variant: small-caps;
-}
-
-.errorbox {
-  margin: 10px auto;
-  border: 2px red solid;
-  padding: 0.5em 1em;
-  background-color: #fff2f2;
-}
-
-.errorbox h2 {
-  font-size: 1em;
-  font-weight: bold;
-  display: inline;
-  margin: 0 .5em 0 0;
-  border: none;
-}
-
-#content {
-  margin: 0 auto;
-  padding: 0;
-  min-width: 700px;
-  max-width: 790px;
-  width: 790px;
-  clear: both;
-  font-size: 1.2em;
-}
-
-#content h1 {
-  color: #384024;
-  margin-bottom: 0;
-} 
-
-.content_box_left { 
-  width: 48%;
-  float: left;
-  clear: left;
-}
-
-.content_box_right {
-  width: 48%;
-  float: right;
-  clear: right;
-}
-
-.content_box_full {
-  clear: both;
-}
-
-
-
-
-div.dlbutton {
-  padding: 1em;
-  margin: 1em auto;
-  border: 1px solid #8dea34;
-  border-radius: 5px;
-  -moz-border-radius: 5px;
-  -webkit-border-radius: 5px;
-  background-color: #62a324;
-  color: white;
-  font-weight: bold;
-  font-size: 110%;
-  width: 18em;
-  text-align: center;
-}
-
-div.dlbutton a {
-  display: block;
-  overflow: auto;
-  color: white;
-  text-decoration: none;
-}
-
-div.dlbutton a:hover {
-  color: white;
-  text-decoration: none;
-}
-
-div.dlbutton a span {
-  display: inline-block;
-  vertical-align: middle;
-  text-align: center;
-  padding: 12px;
-}
-
-div.dlbutton a:hover span {
-  text-decoration: underline;
-}
-
-div.dlbutton a img {
-  vertical-align: middle;
-}
-
-table.screenshot {
-  margin: 0 auto;
-}
-
-table.screenshot td {
-  padding: 0 5px;
-}
-
-ul.news {
-  margin: 0;
-  padding: 0;
-}
-
-li.day {
-  margin: 0.5em;
-	padding: 0;
-	list-style-type: none;
-  float: left;
-}
-
-ul.events {
-  margin: 0 0 0 1em;
-  padding: 0;
-}
-
-ul.events li {
-  list-style-type: disc;
-  margin: 0 0 0.5em 3.5em;
-  padding-left: 0;
-}
-
-div.date {
-  background: #FAF4C8;
-	border-right: 1px solid #E3DE9F;
-	border-bottom: 1px solid #E3DE9F;
-	float: left;
-  clear: both;
-	text-align: center;
-	line-height: 1.1em;
-	padding: 2px 1px 5px 1px;
-	width: 2.2em;
-	margin: 0 0.5em 0em 0;
-}
-
-.news-nav {
-  float: right;
-  clear: both;
-}
-
-div.date:first-line {
-  font-size: 70%;
-}
-
-div.costbox div {
-  margin: 1em auto;
-}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------

_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 6908
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=6908&view=rev
Author:   uckelman
Date:     2010-05-27 13:39:38 +0000 (Thu, 27 May 2010)

Log Message:
-----------
Use phpns for news.

Modified Paths:
--------------
    site-src/trunk/site/news.php
    site-src/trunk/site/news_rss.php

Modified: site-src/trunk/site/news.php
===================================================================
--- site-src/trunk/site/news.php	2010-05-27 13:27:16 UTC (rev 6907)
+++ site-src/trunk/site/news.php	2010-05-27 13:39:38 UTC (rev 6908)
@@ -2,7 +2,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head profile="http://www.w3.org/2005/10/profile">
-  <link rel="stylesheet" type="text/css" href="/style.css"/>
+  <link rel="stylesheet" type="text/css" href="/css/style.css"/>
   <link rel="stylesheet" type="text/css" href="/css/site.css"/>
   <link rel="alternate" type="application/rss+xml" title="RSS" href="/news_rss.php" />
   <link rel="icon" type="image/png" href="/images/VASSAL.png"/>
@@ -15,122 +15,8 @@
   <div class="content_box_full">
   <h1>News <a href="/news_rss.php"><img src="/images/feed-icon-14x14.png" alt="RSS feed" /></a></h1>
 
-<?php
+  <?php include('/var/www/news/shownews.php'); ?>
 
-require_once('sso/ssolib.php');
-require_once('sso/NewsDB.php');
-
-if (isset($_GET['id'])) {
-  $id = $_GET['id'];
-  if (!is_numeric($id) || $id < 0) unset($id);
-}
-
-if (isset($_GET['from'])) {
-  $from = $_GET['from'];
-  if (!is_numeric($from) || $from < 0) unset($from);
-}
-
-if (isset($_GET['to'])) {
-  $to = $_GET['to'];
-  if (!is_numeric($to) || $to < 0) unset($to);
-}
-
-$rows = array();
-$prev = -1;
-$next = -1;
-
-try {
-  $news = new NewsDB();
-
-  $limit = 10;
-
-  $limit++;
-  if (isset($id)) {
-    $query = "SELECT id, DATE_FORMAT(date,\"%b\") AS month, DAYOFMONTH(date) AS day, headline, text FROM news WHERE id = $id";
-  }
-  else if (isset($from)) {
-    $query = "SELECT id, DATE_FORMAT(date,\"%b\") AS month, DAYOFMONTH(date) AS day, headline, text FROM news WHERE id >= $from ORDER BY date ASC LIMIT $limit";
-  }
-  else if (isset($to)) {
-    $query = "SELECT id, DATE_FORMAT(date,\"%b\") AS month, DAYOFMONTH(date) AS day, headline, text FROM news WHERE id <= $to ORDER BY date DESC LIMIT $limit";
-  }
-  else {
-    $query = "SELECT id, DATE_FORMAT(date,\"%b\") AS month, DAYOFMONTH(date) AS day, headline, text FROM news ORDER BY date DESC LIMIT $limit";
-  }
-  $limit--;
-
-  $rows = $news->read_all($query);
-  if (isset($from)) $rows = array_reverse($rows);
-
-  if (count($rows) > 0) {
-    # are there entries newer thant the display window?
-    $next = -1;
-    if (isset($from) && count($rows) > $limit) {
-      $next = $rows[1]['id'] + 1;
-    }
-    else if (isset($to)) {
-      $query = "SELECT 1 FROM news WHERE id > $to LIMIT 1";
-      if (count($news->read_all($query)) > 0) {
-        $next = $to + 1;
-      }
-    }
-
-    # are there entries older than the display window?
-    $prev = -1;
-    if (isset($to) && count($rows) > $limit) {
-      $prev = $rows[count($rows)-2]['id'] - 1;
-    }
-    else if (!isset($id)) {
-      if (!isset($from)) $from = $rows[count($rows)-1]['id'];
-
-      $query = "SELECT 1 FROM news WHERE id < $from LIMIT 1";
-      if (count($news->read_all($query)) > 0) {
-        $prev = $from - 1;
-      }
-    }
-  }
-}
-catch (ErrorException $e) {
-  warn($e->getMessage());
-  echo '</div></div>';
-  print_bottom();
-  exit;
-}
-
-# print the 'newer' link, if necessary
-if ($next >= 0) {
-  echo '<em><a class="news-nav" href="?from=', $next, '">newer</a></em>';
-}
-
-echo '<ul class="news">';
-
-$month = '';
-$day = 0;
-
-# print each item
-foreach ($rows as $item) {
-  if ($day != $item['day'] || $month != $item['month']) {
-    if ($day != 0) echo '</ul></li>';
-
-    echo '<li class="day"><div class="date">',
-        $item['month'], '<br/>', $item['day'], '</div><ul class="events">';
-
-    $day = $item['day'];
-    $month = $item['month'];
-  }
-
-  echo '<li><h2><a id="_', $item['id'], '">', $item['headline'],
-       '</a></h2><p>', $item['text'], '</p></li>'; 
-} 
-  
-echo '</ul></li></ul>';
-
-# print the 'older' link, if necessary
-if ($prev >= 0) {
-  echo '<em><a class="news-nav" href="?to=', $prev, '">older</a></em>';
-}
-?>
-
   </div>
 </div>
 <?php include('inc/footer.shtml'); ?>

Modified: site-src/trunk/site/news_rss.php
===================================================================
--- site-src/trunk/site/news_rss.php	2010-05-27 13:27:16 UTC (rev 6907)
+++ site-src/trunk/site/news_rss.php	2010-05-27 13:39:38 UTC (rev 6908)
@@ -1,53 +1,7 @@
-<?php echo '<?xml version="1.0" encoding="UTF-8"?>' ?>
-<rss version="2.0">
-  <channel>
-    <title>VASSAL News</title>
-    <link>http://www.test.nomic.net</link>
-    <description>News about the VASSAL Engine and VASSAL modules</description>
-    <language>en-us</language>
-    <image>
-      <title>VASSAL News</title>
-      <url>http://www.test.nomic.net/images/header.png</url>
-      <link>http://www.test.nomic.net</link>
-      <width>270</width>
-      <height>72</height>
-    </image>
-    <generator>news_rss.php</generator>
-    <managingEditor>webmaster@...>
-    <webMaster>webmaster@...>
-    <docs>http://blogs.law.harvard.edu/tech/rss</docs>
-    <ttl>60</ttl>
 <?php
-
-require_once('sso/NewsDB.php');
-
-try {
-  $baseurl = 'http://www.test.nomic.net/news.php';
-
-  $news = new NewsDB();
-  $query = 'SELECT id, DATE_FORMAT(date, "%a, %d %b %Y %T") AS pubdate, headline, text FROM news ORDER BY date DESC LIMIT 10';
-  $rows = $news->read_all($query);
-
-  echo "<lastBuildDate>{$rows[0]['pubdate']}</lastBuildDate>";
-
-  foreach ($rows as $item) {
-    echo <<<END
-    <item>
-      <title>{$item['headline']}</title>
-      <description><![CDATA[{$item['text']}]]></description>
-      <pubDate>{$item['pubdate']} GMT</pubDate>
-      <link>$baseurl?id={$item['id']}</link>
-      <guid>$baseurl?id={$item['id']}</guid> 
-    </item>
-END;
-  }
-}
-catch (ErrorException $e) {
-  warn($e->getMessage());
-}
-
-
+  $phpns['mode'] = 'rss';
+  $phpns['order'] = 'DESC';
+  $phpns['limit'] = 15;
+  $phpns['script_link'] = 'http://test.nomic.net/news.php';
+  include('/var/www/news/shownews.php');
 ?>
-
-  </channel>
-</rss>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------

_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 6916
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=6916&view=rev
Author:   uckelman
Date:     2010-05-29 00:50:59 +0000 (Sat, 29 May 2010)

Log Message:
-----------
Spacing adjustments for headlines.

Modified Paths:
--------------
    site-src/trunk/site/css/style.css
    site-src/trunk/site/index.php

Modified: site-src/trunk/site/css/style.css
===================================================================
--- site-src/trunk/site/css/style.css	2010-05-28 21:42:30 UTC (rev 6915)
+++ site-src/trunk/site/css/style.css	2010-05-29 00:50:59 UTC (rev 6916)
@@ -134,7 +134,7 @@
 }
 
 ul.news {
-  margin: 0;
+  margin: 0.5em 0 0.5em 1em;
   padding: 0;
 }
 
@@ -143,6 +143,7 @@
 	padding: 0;
 	list-style-type: none;
   float: left;
+  clear: both;
 }
 
 ul.events {

Modified: site-src/trunk/site/index.php
===================================================================
--- site-src/trunk/site/index.php	2010-05-28 21:42:30 UTC (rev 6915)
+++ site-src/trunk/site/index.php	2010-05-29 00:50:59 UTC (rev 6916)
@@ -61,7 +61,9 @@
     <div id="news">
       <h1>Latest News <a href="/news_rss.php"><img src="/images/feed-icon-14x14.png" alt="RSS feed"></a></h1>
 
+      <ul class="news">
       <?php include('inc/headlines.php'); ?>
+      </ul>
 
       <div class="news-nav">
         <em><a href="/news.php">...more news</a></em>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------

_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 6921
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=6921&view=rev
Author:   uckelman
Date:     2010-05-29 16:15:45 +0000 (Sat, 29 May 2010)

Log Message:
-----------
Moved CSS out of Downloads page.

Modified Paths:
--------------
    site-src/trunk/site/css/style.css
    site-src/trunk/site/download.php

Modified: site-src/trunk/site/css/style.css
===================================================================
--- site-src/trunk/site/css/style.css	2010-05-29 16:14:53 UTC (rev 6920)
+++ site-src/trunk/site/css/style.css	2010-05-29 16:15:45 UTC (rev 6921)
@@ -30,6 +30,8 @@
   border: 0;
 }
 
+/* Containers */
+
 #content {
   margin: 0 auto;
   padding: 0;
@@ -61,6 +63,8 @@
   clear: both;
 }
 
+/* Front page */
+
 div.dlbutton {
   padding: 1em;
   margin: 1em auto;
@@ -111,6 +115,8 @@
   padding: 0 5px;
 }
 
+/* Headline news */
+
 ul.news {
   margin: 1em 0 0.5em 1em;
   padding: 0;
@@ -157,6 +163,38 @@
   font-size: 70%;
 }
 
+/* Donations */
+
 div.costbox div {
   margin: 1em auto;
 }
+
+/* Downloads */
+
+table.dl {
+  margin: 1em auto;
+}
+
+table.dl td img, td span {
+  vertical-align: top;
+}
+
+table.dl dt {
+  font-weight: bold;
+}
+
+table.dl dd {
+  margin: 0.5em 0 0.5em 0px;
+  padding-left: 10px;
+}
+
+table.dl dl {
+  margin-bottom: 0;
+  padding: 0em 2em 1em 1em;
+  display: inline-block;
+}
+
+code {
+  color: blue;
+}
+

Modified: site-src/trunk/site/download.php
===================================================================
--- site-src/trunk/site/download.php	2010-05-29 16:14:53 UTC (rev 6920)
+++ site-src/trunk/site/download.php	2010-05-29 16:15:45 UTC (rev 6921)
@@ -5,37 +5,6 @@
   <link rel="stylesheet" type="text/css" href="/css/style.css"/>
   <link rel="stylesheet" type="text/css" href="/css/site.css"/>
   <link rel="icon" type="image/png" href="/images/VASSAL.png"/>
-
-  <style type="text/css">
-dt {
-  font-weight: bold;
-}
-
-dd{
-  margin: 0.5em 0 0.5em 0px;
-  padding-left: 10px;
-}
-
-dl{
-  margin-bottom: 0;
-  padding: 0em 2em 1em 1em;
-  display: inline-block;
-}
-
-td img, td span {
-  vertical-align: top;
-}
-
-table {
-  margin: 1em auto;
-}
-
-code {
-  color: blue;
-}
-
-  </style>
-
   <title>Download VASSAL</title>
 </head>
 <body>
@@ -52,7 +21,7 @@
   <h2><acronym>Vassal</acronym> <?php echo $version; ?></h2>
   <p>This is the current release. <acronym>Vassal</acronym> <?php echo $version; ?> contains a large number of changes over 3.0.17. See the <a href="">release notes</a> for details.</p>
 
-  <table>
+  <table class="dl">
     <tr>
       <td>
         <img src="/images/linux.png" alt="Linux" />


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------

_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 6923
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=6923&view=rev
Author:   uckelman
Date:     2010-06-03 10:17:11 +0000 (Thu, 03 Jun 2010)

Log Message:
-----------
Adjusted for short wiki URLs.

Modified Paths:
--------------
    site-src/trunk/site/login.php
    site-src/trunk/site/logout.php
    site-src/trunk/site/robots.txt
    site-src/trunk/site/search.php

Modified: site-src/trunk/site/login.php
===================================================================
--- site-src/trunk/site/login.php	2010-05-31 20:35:51 UTC (rev 6922)
+++ site-src/trunk/site/login.php	2010-06-03 10:17:11 UTC (rev 6923)
@@ -37,7 +37,7 @@
   $cookies = array();
 
   # MediaWiki login
-  $url = 'http://www.test.nomic.net/wiki/api.php';
+  $url = 'http://www.test.nomic.net/mediawiki/api.php';
   $cookies += mediawiki_login($url, $username, $password);
 
   # phpBB login

Modified: site-src/trunk/site/logout.php
===================================================================
--- site-src/trunk/site/logout.php	2010-05-31 20:35:51 UTC (rev 6922)
+++ site-src/trunk/site/logout.php	2010-06-03 10:17:11 UTC (rev 6923)
@@ -28,7 +28,7 @@
   $cookies = array();
 
   # MediaWiki logout
-  $url = 'http://www.test.nomic.net/wiki/api.php';
+  $url = 'http://www.test.nomic.net/mediawiki/api.php';
   $cookies += mediawiki_logout($url);
 
   # phpBB logout

Modified: site-src/trunk/site/robots.txt
===================================================================
--- site-src/trunk/site/robots.txt	2010-05-31 20:35:51 UTC (rev 6922)
+++ site-src/trunk/site/robots.txt	2010-06-03 10:17:11 UTC (rev 6923)
@@ -1,4 +1,4 @@
 User-agent: *
-Disallow: /wiki/index.php?
+Disallow: /mediawiki/
 Disallow: /wiki/Special:Search
 Disallow: /wiki/Special:Random

Modified: site-src/trunk/site/search.php
===================================================================
--- site-src/trunk/site/search.php	2010-05-31 20:35:51 UTC (rev 6922)
+++ site-src/trunk/site/search.php	2010-06-03 10:17:11 UTC (rev 6923)
@@ -75,11 +75,11 @@
 
 <!-- search code from MediaWiki -->
     <div class="search-block">
-      <form action="/wiki/index.php/Special:Search" method="get">
+      <form action="/wiki/Special:Search" method="get">
         <div>
           <input name="search" type="text" size="31" />
           <input type='submit' name="fulltext" value="Search Wiki" />
-          <a href="/wiki/index.php/Special:Search">Advanced search</a>
+          <a href="/wiki/Special:Search">Advanced search</a>
         </div>
       </form>
     </div>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate 
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the 
lucky parental unit.  See the prize list and enter to win: 
http://p.sf.net/sfu/thinkgeek-promo
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 6967
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=6967&view=rev
Author:   uckelman
Date:     2010-07-03 12:47:14 +0000 (Sat, 03 Jul 2010)

Log Message:
-----------
Adjusted site domain.

Modified Paths:
--------------
    site-src/trunk/site/about.php
    site-src/trunk/site/inc/headlines.php
    site-src/trunk/site/inc/search.shtml
    site-src/trunk/site/login.php
    site-src/trunk/site/logout.php
    site-src/trunk/site/modify.php
    site-src/trunk/site/news_rss.php
    site-src/trunk/site/register.php
    site-src/trunk/site/sendpw.php
    site-src/trunk/site/sso/ssolib.php

Modified: site-src/trunk/site/about.php
===================================================================
--- site-src/trunk/site/about.php	2010-06-30 06:13:04 UTC (rev 6966)
+++ site-src/trunk/site/about.php	2010-07-03 12:47:14 UTC (rev 6967)
@@ -28,13 +28,13 @@
     </table>
   
     <h3>What games can I play using <acronym>Vassal</acronym>?</h3>
-    <p>Hundreds of boardgames have been converted for use with <acronym>Vassal</acronym>, so there's a good chance that you'll find the games you own in our <a href="">module library</a> already. If there is not yet a <acronym>Vassal</acronym> module for your favorite game, you can use the <acronym>Vassal</acronym> Editor to build your own module, and should you run into trouble, help is only a click away in our <a href="http://www.test.nomic.net/forum/">forum</a>.</p>
+    <p>Hundreds of boardgames have been converted for use with <acronym>Vassal</acronym>, so there's a good chance that you'll find the games you own in our <a href="">module library</a> already. If there is not yet a <acronym>Vassal</acronym> module for your favorite game, you can use the <acronym>Vassal</acronym> Editor to build your own module, and should you run into trouble, help is only a click away in our <a href="http://www.test2.nomic.net/forum/">forum</a>.</p>
 
     <h3>How can I get help?</h3>
-    <p>Need help using <acronym>Vassal</acronym>? Stuck while creating a module? If you can't find an answer in our extensive <a href="">documentation</a>, check our friendly <a href="http://www.test.nomic.net/forum/">forum</a> for help.</p>
+    <p>Need help using <acronym>Vassal</acronym>? Stuck while creating a module? If you can't find an answer in our extensive <a href="">documentation</a>, check our friendly <a href="http://www.test2.nomic.net/forum/">forum</a> for help.</p>
 
     <h3>How can I get involved?</h3>
-    <p>The <acronym>Vassal</acronym> project is run by volunteers and progresses through the efforts of volunteers. Is there a feature you'd like to see in the next release? Did you find a bug? Request that feature or report the bug <a href="http://www.test.nomic.net/tracker/">here</a>. Are you a programmer? We could use your help. Join us in the <a href="http://www.test.nomic.net/forum/viewforum.php?f=8">developers' forum</a>. Not a programmer? Help us improve our <a href="">documentation</a>.</p>
+    <p>The <acronym>Vassal</acronym> project is run by volunteers and progresses through the efforts of volunteers. Is there a feature you'd like to see in the next release? Did you find a bug? Request that feature or report the bug <a href="http://www.test2.nomic.net/tracker/">here</a>. Are you a programmer? We could use your help. Join us in the <a href="http://www.test2.nomic.net/forum/viewforum.php?f=8">developers' forum</a>. Not a programmer? Help us improve our <a href="">documentation</a>.</p>
 
     <h2><a id="team">About The <acronym>Vassal</acronym> Team</a></h2>
 

Modified: site-src/trunk/site/inc/headlines.php
===================================================================
--- site-src/trunk/site/inc/headlines.php	2010-06-30 06:13:04 UTC (rev 6966)
+++ site-src/trunk/site/inc/headlines.php	2010-07-03 12:47:14 UTC (rev 6967)
@@ -1,6 +1,6 @@
 <?php
 
-$url = 'http://test.nomic.net/news_rss.php';
+$url = 'http://test2.nomic.net/news_rss.php';
 
 $rss = file_get_contents($url);
 if ($rss === false) {

Modified: site-src/trunk/site/inc/search.shtml
===================================================================
--- site-src/trunk/site/inc/search.shtml	2010-06-30 06:13:04 UTC (rev 6966)
+++ site-src/trunk/site/inc/search.shtml	2010-07-03 12:47:14 UTC (rev 6967)
@@ -1,5 +1,5 @@
 <div id="vassal-search">
-  <form action="http://www.test.nomic.net/search.php" id="cse-search-box">
+  <form action="http://www.test2.nomic.net/search.php" id="cse-search-box">
     <div>
       <input type="hidden" name="cx" value="009624425637032310479:wa4dtyo3sma" />
       <input type="hidden" name="cof" value="FORID:9" />

Modified: site-src/trunk/site/login.php
===================================================================
--- site-src/trunk/site/login.php	2010-06-30 06:13:04 UTC (rev 6966)
+++ site-src/trunk/site/login.php	2010-07-03 12:47:14 UTC (rev 6967)
@@ -37,15 +37,15 @@
   $cookies = array();
 
   # MediaWiki login
-  $url = 'http://www.test.nomic.net/mediawiki/api.php';
+  $url = 'http://www.test2.nomic.net/mediawiki/api.php';
   $cookies += mediawiki_login($url, $username, $password);
 
   # phpBB login
-  $url = 'http://www.test.nomic.net/phpbb_login.php';
+  $url = 'http://www.test2.nomic.net/phpbb_login.php';
   $cookies += phpbb_login($url, $username, $password);
 
   # Bugzilla login
-  $url = 'http://www.test.nomic.net/tracker/xmlrpc.cgi';
+  $url = 'http://www.test2.nomic.net/tracker/xmlrpc.cgi';
   $cookies += bugzilla_login($url, $username, $password);
 
   # write out the cookies captured from the logins 
@@ -65,7 +65,7 @@
     $key,
     $expires,
     '/',
-    'www.test.nomic.net',
+    'www.test2.nomic.net',
     false,
     true
   );

Modified: site-src/trunk/site/logout.php
===================================================================
--- site-src/trunk/site/logout.php	2010-06-30 06:13:04 UTC (rev 6966)
+++ site-src/trunk/site/logout.php	2010-07-03 12:47:14 UTC (rev 6967)
@@ -28,15 +28,15 @@
   $cookies = array();
 
   # MediaWiki logout
-  $url = 'http://www.test.nomic.net/mediawiki/api.php';
+  $url = 'http://www.test2.nomic.net/mediawiki/api.php';
   $cookies += mediawiki_logout($url);
 
   # phpBB logout
-  $url = 'http://www.test.nomic.net/phpbb_logout.php';
+  $url = 'http://www.test2.nomic.net/phpbb_logout.php';
   $cookies += phpbb_logout($url);
 
   # Bugzilla logout
-  $url = 'http://www.test.nomic.net/tracker/xmlrpc.cgi';
+  $url = 'http://www.test2.nomic.net/tracker/xmlrpc.cgi';
   $cookies += bugzilla_logout($url);
 
   set_cookies($cookies);  

Modified: site-src/trunk/site/modify.php
===================================================================
--- site-src/trunk/site/modify.php	2010-06-30 06:13:04 UTC (rev 6966)
+++ site-src/trunk/site/modify.php	2010-07-03 12:47:14 UTC (rev 6967)
@@ -98,16 +98,16 @@
 
 To confirm this email address, simply reply to this message, or open this link in your browser:
 
-http://www.test.nomic.net/confirm_email.php?key=$key
+http://www.test2.nomic.net/confirm_email.php?key=$key
 
-If you do not wish to switch to this email address, please disregard this message. If you are not requesting to change the email address associated with this account, or you have any other questions, please contact webmaster@....
+If you do not wish to switch to this email address, please disregard this message. If you are not requesting to change the email address associated with this account, or you have any other questions, please contact webmaster@....
 
 END;
 
     $message = wordwrap($message, 70);
     $headers =
-      "From: webmaster@..." .
-      "Reply-To: confirm+$key@...";
+      "From: webmaster@..." .
+      "Reply-To: confirm+$key@...";
 
     if (!mail($email, $subject, $message, $headers)) {
       throw new ErrorException('Failed to send confirmation email.');

Modified: site-src/trunk/site/news_rss.php
===================================================================
--- site-src/trunk/site/news_rss.php	2010-06-30 06:13:04 UTC (rev 6966)
+++ site-src/trunk/site/news_rss.php	2010-07-03 12:47:14 UTC (rev 6967)
@@ -2,6 +2,6 @@
   $phpns['mode'] = 'rss';
   $phpns['order'] = 'DESC';
   $phpns['limit'] = 15;
-  $phpns['script_link'] = 'http://test.nomic.net/news.php';
+  $phpns['script_link'] = 'http://test2.nomic.net/news.php';
   include('/var/www/news/shownews.php');
 ?>

Modified: site-src/trunk/site/register.php
===================================================================
--- site-src/trunk/site/register.php	2010-06-30 06:13:04 UTC (rev 6966)
+++ site-src/trunk/site/register.php	2010-07-03 12:47:14 UTC (rev 6967)
@@ -113,16 +113,16 @@
 
 To active this account, simply reply to this message, or open this link in your browser:
 
-http://www.test.nomic.net/confirm.php?key=$key
+http://www.test2.nomic.net/confirm.php?key=$key
 
-If you do not wish to activate this account, please disregard this message. If you think your email address is being maliciously associated with this account, or you have any other questions, please send them to webmaster@....
+If you do not wish to activate this account, please disregard this message. If you think your email address is being maliciously associated with this account, or you have any other questions, please send them to webmaster@....
 
 END;
 
   $message = wordwrap($message, 70);
   $headers =
-    "From: webmaster@..." .
-    "Reply-To: confirm+$key@...";
+    "From: webmaster@..." .
+    "Reply-To: confirm+$key@...";
 
   if (!mail($email, $subject, $message, $headers)) {
     throw new ErrorException('Failed to send confirmation email.');

Modified: site-src/trunk/site/sendpw.php
===================================================================
--- site-src/trunk/site/sendpw.php	2010-06-30 06:13:04 UTC (rev 6966)
+++ site-src/trunk/site/sendpw.php	2010-07-03 12:47:14 UTC (rev 6967)
@@ -60,14 +60,14 @@
 
 To reset the password for your account, simply open this link in your browser:
 
-http://www.test.nomic.net/resetpw.php?key=$key
+http://www.test2.nomic.net/resetpw.php?key=$key
 
-If you do not wish to reset your password, please disregard this message. If you receive multiple such notifications which you did not request, or you have any other questions, please conact webmaster@....
+If you do not wish to reset your password, please disregard this message. If you receive multiple such notifications which you did not request, or you have any other questions, please conact webmaster@....
 
 END;
 
     $message = wordwrap($message, 70);
-    $headers = 'From: webmaster@...';
+    $headers = 'From: webmaster@...';
 
     if (!mail($e['mail'][0], $subject, $message, $headers)) {
       throw new ErrorException('Failed to send confirmation email.');

Modified: site-src/trunk/site/sso/ssolib.php
===================================================================
--- site-src/trunk/site/sso/ssolib.php	2010-06-30 06:13:04 UTC (rev 6966)
+++ site-src/trunk/site/sso/ssolib.php	2010-07-03 12:47:14 UTC (rev 6967)
@@ -256,7 +256,7 @@
       $attr['value'],
       array_key_exists('expires', $attr) ? strtotime($attr['expires']) : 0,
       $attr['path'],
-      'www.test.nomic.net',
+      'www.test2.nomic.net',
       false,
       array_key_exists('httponly', $attr)
     );


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 7006
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=7006&view=rev
Author:   uckelman
Date:     2010-07-18 21:03:46 +0000 (Sun, 18 Jul 2010)

Log Message:
-----------
* Refactored.
* Only clear bad fields on bad registration inputs.

Modified Paths:
--------------
    site-src/trunk/site/register.php
    site-src/trunk/site/resetpw.php
    site-src/trunk/site/sso/ssolib.php

Modified: site-src/trunk/site/register.php
===================================================================
--- site-src/trunk/site/register.php	2010-07-18 20:05:14 UTC (rev 7005)
+++ site-src/trunk/site/register.php	2010-07-18 21:03:46 UTC (rev 7006)
@@ -1,10 +1,7 @@
 <?php
-require_once('sso/AuthDB.php');
-require_once('sso/UserDB.php');
 require_once('sso/config.php');
 require_once('sso/ssolib.php');
 require_once('sso/recaptchalib.php');
-require_once('sso/EmailAddressValidator.php');
 
 $title = 'Create Account';
 
@@ -16,9 +13,6 @@
   exit;
 }
 
-# FIXME: Don't clear all the fields on error. This is frustrating
-# for the user.
-
 # sanitize the input
 $username = isset($_POST['username']) ? addslashes($_POST['username']) : '';
 $password = isset($_POST['password']) ? addslashes($_POST['password']) : '';
@@ -32,40 +26,74 @@
 try {
   # check for blank username
   if (empty($username)) {
+    unset($_POST['username']);
     throw new ErrorException('Invalid username.');
   }
 
   # reject ridiculously long usernames
   if (strlen($username) > 32) {
+    unset($_POST['username']);
     throw new ErrorException(
       'Username must be no more than 32 characters long.');
   }
 
-  validate_password($password, $retype_password);
+  # check for blank password
+  if (empty($password)) {
+    unset($_POST['password'], $_POST['retype_password']);
+    throw new ErrorException('Blank password.');
+  }
 
+  # check for password mismatch
+  if ($password != $retype_password) {
+    unset($_POST['password'], $_POST['retype_password']);
+    throw new ErrorException('Password mismatch.');
+  }
+
+  $pwlen = strlen($password);
+
+  # reject ridiculously short passwords
+  if ($pwlen < 6) {
+    unset($_POST['password'], $_POST['retype_password']);
+    throw new ErrorException('Password must be at least 6 characters long.');
+  }
+
+  # reject ridiculously long passwords
+  if ($pwlen > 128) {
+    unset($_POST['password'], $_POST['retype_password']);
+    throw new ErrorException(
+      'Password must be no more than 128 characters long.');
+  }
+
   # check for blank email
   if (empty($email)) {
+    unset($_POST['email'], $_POST['retype_email']);
     throw new ErrorException('Blank email.');
   }
 
   # check for email mismatch
   if ($email != $retype_email) {
+    unset($_POST['email'], $_POST['retype_email']);
     throw new ErrorException('Email mismatch.');
   }
 
+  require_once('sso/EmailAddressValidator.php');
+
   # check for bad email address
   $validator = new EmailAddressValidator;
   if (!$validator->check_email_address($email)) {
+    unset($_POST['email'], $_POST['retype_email']);
     throw new ErrorException('Bad email address.');
   }
 
   # check for blank realname
   if (empty($realname)) {
+    unset($_POST['realname']);
     throw new ErrorException('Blank realname.');
   }
 
   # reject ridiculously long realname 
   if (strlen($realname) > 64) {
+    unset($_POST['realname']);
     throw new ErrorException(
       'Real name must be no more than 64 characters long.');
   }
@@ -96,10 +124,14 @@
       '(reCAPTCHA said: ' . $resp->error . ')');
   }
 
+  require_once('sso/AuthDB.php');
+  require_once('sso/UserDB.php');
+
   # check that the username is not already taken
   $user = new UserDB();
   
   if ($user->exists($username)) {
+    unset($_POST['username']);
     throw new ErrorException('The account "' . $username . '" already exists.');
   }
 
@@ -159,7 +191,18 @@
   exit;
 }
 
+function HTMLify_POST($key) {
+  return isset($_POST[$key]) ? htmlspecialchars($_POST[$key]) : '';
+}
+
 function print_form() {
+  $username = HTMLify_POST('username');
+  $password = HTMLify_POST('password');
+  $retype_password = HTMLify_POST('retype_password');
+  $email = HTMLify_POST('email');
+  $retype_email = HTMLify_POST('retype_email');
+  $realname = HTMLify_POST('realname');
+
   print <<<END
 <script type="text/javascript">
 <!--
@@ -173,30 +216,30 @@
     <table>
       <tr>
         <th><label for="username">Username:</label></th>
-        <td><input type="text" id="username" name="username" size="20"/></td>
+        <td><input type="text" id="username" name="username" size="20" value="$username"/></td>
       </tr>
       <tr>
         <th><label for="password">Password:</label></th>
-        <td><input type="password" id="password" name="password" size="20"/></td
+        <td><input type="password" id="password" name="password" size="20" value="$password"/></td
 >
       </tr>
       <tr>
         <th><label for="retype_password">Retype password:</label></th>
-        <td><input type="password" id="retype_password" name="retype_password" size="20"/></td
+        <td><input type="password" id="retype_password" name="retype_password" size="20" value="$retype_password"/></td
 >
       </tr>
       <tr>
         <th><label for="email">Email address:</label></th>
-        <td><input type="text" id="email" name="email" size="20"/></td
+        <td><input type="text" id="email" name="email" size="20" value="$email"/></td
 >
       </tr>
       <tr>
         <th><label for="retype_email">Retype email address:</label></th>
-        <td><input type="text" id="retype_email" name="retype_email" size="20"/></td>
+        <td><input type="text" id="retype_email" name="retype_email" size="20" value="$retype_email"/></td>
       </tr>
       <tr>
         <th><label for="realname">Real name:</label></th>
-        <td><input type="text" id="realname" name="realname" size="20"/></td>
+        <td><input type="text" id="realname" name="realname" size="20" value="$realname"/></td>
       </tr>
       <tr>
         <th><label>Type some words:</label></th>

Modified: site-src/trunk/site/resetpw.php
===================================================================
--- site-src/trunk/site/resetpw.php	2010-07-18 20:05:14 UTC (rev 7005)
+++ site-src/trunk/site/resetpw.php	2010-07-18 21:03:46 UTC (rev 7006)
@@ -1,6 +1,4 @@
 <?php
-require_once('sso/AuthDB.php');
-require_once('sso/UserDB.php');
 require_once('sso/ssolib.php');
 
 $title = 'Reset Password';
@@ -46,8 +44,32 @@
 }
 
 try {
-  validate_password($password, $retype_password);
+  # check for blank password
+  if (empty($password)) {
+    throw new ErrorException('Blank password.');
+  }
 
+  # check for password mismatch
+  if ($password != $retype_password) {
+    throw new ErrorException('Password mismatch.');
+  }
+
+  $pwlen = strlen($password);
+
+  # reject ridiculously short passwords
+  if ($pwlen < 6) {
+    throw new ErrorException('Password must be at least 6 characters long.');
+  }
+
+  # reject ridiculously long passwords
+  if ($pwlen > 128) {
+    throw new ErrorException(
+      'Password must be no more than 128 characters long.');
+  }
+
+  require_once('sso/AuthDB.php');
+  require_once('sso/UserDB.php');
+
   # get data for key from the registration database
   $auth = new AuthDB();
 

Modified: site-src/trunk/site/sso/ssolib.php
===================================================================
--- site-src/trunk/site/sso/ssolib.php	2010-07-18 20:05:14 UTC (rev 7005)
+++ site-src/trunk/site/sso/ssolib.php	2010-07-18 21:03:46 UTC (rev 7006)
@@ -251,34 +251,6 @@
   }
 }
 
-#
-# Check that a password meets our standards.
-#
-function validate_password($password, $retype_password) {
-  # check for blank password
-  if (empty($password)) {
-    throw new ErrorException('Blank password.');
-  }
-
-  # check for password mismatch
-  if ($password != $retype_password) {
-    throw new ErrorException('Password mismatch.');
-  }
-
-  $pwlen = strlen($password);
-
-  # reject ridiculously short passwords
-  if ($pwlen < 6) {
-    throw new ErrorException('Password must be at least 6 characters long.');
-  }
-
-  # reject ridiculously long passwords
-  if ($pwlen > 128) {
-    throw new ErrorException(
-      'Password must be no more than 128 characters long.');
-  }
-}
-
 function warn($err) {
   print '<div class="errorbox"><h2>Error:</h2>' . $err . '</div>';
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 7005
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=7005&view=rev
Author:   uckelman
Date:     2010-07-18 20:05:14 +0000 (Sun, 18 Jul 2010)

Log Message:
-----------
Refactored password validation.

Modified Paths:
--------------
    site-src/trunk/site/register.php
    site-src/trunk/site/resetpw.php
    site-src/trunk/site/sso/ssolib.php

Modified: site-src/trunk/site/register.php
===================================================================
--- site-src/trunk/site/register.php	2010-07-18 19:41:19 UTC (rev 7004)
+++ site-src/trunk/site/register.php	2010-07-18 20:05:14 UTC (rev 7005)
@@ -41,29 +41,8 @@
       'Username must be no more than 32 characters long.');
   }
 
-  # check for blank password
-  if (empty($password)) {
-    throw new ErrorException('Blank password.');
-  }
+  validate_password($password, $retype_password);
 
-  # check for password mismatch
-  if ($password != $retype_password) {
-    throw new ErrorException('Password mismatch.');
-  }
-
-  $pwlen = strlen($password);
-
-  # check password strength
-  if ($pwlen < 6) {
-    throw new ErrorException('Password must be at least 6 characters long.');
-  }
-  
-  # reject ridiculously long passwords
-  if ($pwlen > 128) {
-    throw new ErrorException(
-      'Password must be no more than 128 characters long.');
-  }
-
   # check for blank email
   if (empty($email)) {
     throw new ErrorException('Blank email.');

Modified: site-src/trunk/site/resetpw.php
===================================================================
--- site-src/trunk/site/resetpw.php	2010-07-18 19:41:19 UTC (rev 7004)
+++ site-src/trunk/site/resetpw.php	2010-07-18 20:05:14 UTC (rev 7005)
@@ -8,7 +8,7 @@
 # check whether this is an inital attempt to reset
 if ($_SERVER['REQUEST_METHOD'] == 'GET') {
   # sanitize the input
-  $key = addslashes($_GET['key']);
+  $key = isset($_GET['key']) ? addslashes($_GET['key']) : ''; 
 
   if (empty($key)) {
     print_top($title);
@@ -32,9 +32,10 @@
 }
 
 # sanitize the input
-$key = addslashes($_POST['key']);
-$password = addslashes($_POST['password']);
-$retype_password = addslashes($_POST['retype_password']);
+$key = isset($_POST['key']) ? addslashes($_POST['key']) : '';
+$password = isset($_POST['password']) ? addslashes($_POST['password']) : '';
+$retype_password = isset($_POST['retype_password']) ?
+                        addslashes($_POST['retype_password']) : '';
 
 # check for blank key
 if (empty($key)) {
@@ -45,21 +46,8 @@
 }
 
 try {
-  # check for blank password
-  if (empty($password)) {
-    throw new ErrorException('Blank password.');
-  }
+  validate_password($password, $retype_password);
 
-  # check for password mismatch
-  if ($password != $retype_password) {
-    throw new ErrorException('Password mismatch.');
-  }
-
-  # check password strength
-  if (strlen($password) < 6) {
-    throw new ErrorException('Password must be at least 6 characters long.');
-  }
-
   # get data for key from the registration database
   $auth = new AuthDB();
 

Modified: site-src/trunk/site/sso/ssolib.php
===================================================================
--- site-src/trunk/site/sso/ssolib.php	2010-07-18 19:41:19 UTC (rev 7004)
+++ site-src/trunk/site/sso/ssolib.php	2010-07-18 20:05:14 UTC (rev 7005)
@@ -251,6 +251,34 @@
   }
 }
 
+#
+# Check that a password meets our standards.
+#
+function validate_password($password, $retype_password) {
+  # check for blank password
+  if (empty($password)) {
+    throw new ErrorException('Blank password.');
+  }
+
+  # check for password mismatch
+  if ($password != $retype_password) {
+    throw new ErrorException('Password mismatch.');
+  }
+
+  $pwlen = strlen($password);
+
+  # reject ridiculously short passwords
+  if ($pwlen < 6) {
+    throw new ErrorException('Password must be at least 6 characters long.');
+  }
+
+  # reject ridiculously long passwords
+  if ($pwlen > 128) {
+    throw new ErrorException(
+      'Password must be no more than 128 characters long.');
+  }
+}
+
 function warn($err) {
   print '<div class="errorbox"><h2>Error:</h2>' . $err . '</div>';
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 7022
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=7022&view=rev
Author:   uckelman
Date:     2010-07-23 12:57:57 +0000 (Fri, 23 Jul 2010)

Log Message:
-----------
Read current version from util/release-stable.

Modified Paths:
--------------
    site-src/trunk/site/download.php
    site-src/trunk/site/index.php

Modified: site-src/trunk/site/download.php
===================================================================
--- site-src/trunk/site/download.php	2010-07-23 12:56:40 UTC (rev 7021)
+++ site-src/trunk/site/download.php	2010-07-23 12:57:57 UTC (rev 7022)
@@ -16,7 +16,7 @@
 
   <p>Download <acronym>Vassal</acronym>, the free, open-source boardgame engine. <acronym>Vassal</acronym> runs on Linux, Mac OS X, Windows, and any other system which has a Java JRE. Find your operating system below for instructions for downloading and installing <acronym>Vassal</acronym>.</p>
 
-  <?php $version = file_get_contents('util/release-current'); ?>
+  <?php $version = file_get_contents('util/release-stable'); ?>
 
   <h2><acronym>Vassal</acronym> <?php echo $version; ?></h2>
   <p>This is the current release. <acronym>Vassal</acronym> <?php echo $version; ?> contains a large number of changes over 3.0.17. See the <a href="">release notes</a> for details.</p>

Modified: site-src/trunk/site/index.php
===================================================================
--- site-src/trunk/site/index.php	2010-07-23 12:56:40 UTC (rev 7021)
+++ site-src/trunk/site/index.php	2010-07-23 12:57:57 UTC (rev 7022)
@@ -41,7 +41,7 @@
       <h1>Get <acronym>Vassal</acronym></h1>
       <p><acronym>Vassal</acronym> is free, open-source software, created by volunteers. Our current release is 
         <?php 
-          $version = trim(file_get_contents('util/release-current'));
+          $version = trim(file_get_contents('util/release-stable'));
           echo $version;
         ?>.</p> 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 7023
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=7023&view=rev
Author:   uckelman
Date:     2010-07-23 13:00:15 +0000 (Fri, 23 Jul 2010)

Log Message:
-----------
Updated for vassalengine.org.

Modified Paths:
--------------
    site-src/trunk/site/modify.php
    site-src/trunk/site/register.php
    site-src/trunk/site/sendpw.php

Modified: site-src/trunk/site/modify.php
===================================================================
--- site-src/trunk/site/modify.php	2010-07-23 12:57:57 UTC (rev 7022)
+++ site-src/trunk/site/modify.php	2010-07-23 13:00:15 UTC (rev 7023)
@@ -98,16 +98,16 @@
 
 To confirm this email address, simply reply to this message, or open this link in your browser:
 
-http://www.test2.nomic.net/confirm_email.php?key=$key
+http://www.vassalengine.org/confirm_email.php?key=$key
 
-If you do not wish to switch to this email address, please disregard this message. If you are not requesting to change the email address associated with this account, or you have any other questions, please contact webmaster@....
+If you do not wish to switch to this email address, please disregard this message. If you are not requesting to change the email address associated with this account, or you have any other questions, please contact webmaster@....
 
 END;
 
     $message = wordwrap($message, 70);
     $headers =
-      "From: webmaster@..." .
-      "Reply-To: confirm+$key@...";
+      "From: webmaster@..." .
+      "Reply-To: confirm+$key@...";
 
     if (!mail($email, $subject, $message, $headers)) {
       throw new ErrorException('Failed to send confirmation email.');

Modified: site-src/trunk/site/register.php
===================================================================
--- site-src/trunk/site/register.php	2010-07-23 12:57:57 UTC (rev 7022)
+++ site-src/trunk/site/register.php	2010-07-23 13:00:15 UTC (rev 7023)
@@ -167,16 +167,16 @@
 
 To active this account, simply reply to this message, or open this link in your browser:
 
-http://www.test2.nomic.net/confirm.php?key=$key
+http://www.vassalengine.org/confirm.php?key=$key
 
-If you do not wish to activate this account, please disregard this message. If you think your email address is being maliciously associated with this account, or you have any other questions, please send them to webmaster@....
+If you do not wish to activate this account, please disregard this message. If you think your email address is being maliciously associated with this account, or you have any other questions, please send them to webmaster@....
 
 END;
 
   $message = wordwrap($message, 70);
   $headers =
-    "From: webmaster@..." .
-    "Reply-To: confirm+$key@...";
+    "From: webmaster@..." .
+    "Reply-To: confirm+$key@...";
 
   if (!mail($email, $subject, $message, $headers)) {
     throw new ErrorException('Failed to send confirmation email.');

Modified: site-src/trunk/site/sendpw.php
===================================================================
--- site-src/trunk/site/sendpw.php	2010-07-23 12:57:57 UTC (rev 7022)
+++ site-src/trunk/site/sendpw.php	2010-07-23 13:00:15 UTC (rev 7023)
@@ -60,14 +60,14 @@
 
 To reset the password for your account, simply open this link in your browser:
 
-http://www.test2.nomic.net/resetpw.php?key=$key
+http://www.vassalengine.org/resetpw.php?key=$key
 
-If you do not wish to reset your password, please disregard this message. If you receive multiple such notifications which you did not request, or you have any other questions, please conact webmaster@....
+If you do not wish to reset your password, please disregard this message. If you receive multiple such notifications which you did not request, or you have any other questions, please conact webmaster@....
 
 END;
 
     $message = wordwrap($message, 70);
-    $headers = 'From: webmaster@...';
+    $headers = 'From: webmaster@...';
 
     if (!mail($e['mail'][0], $subject, $message, $headers)) {
       throw new ErrorException('Failed to send confirmation email.');


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 7032
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=7032&view=rev
Author:   uckelman
Date:     2010-07-25 17:59:23 +0000 (Sun, 25 Jul 2010)

Log Message:
-----------
* Define keys to avoid warnings.
* Updated for new URL. 

Modified Paths:
--------------
    site-src/trunk/site/news.php
    site-src/trunk/site/news_rss.php

Modified: site-src/trunk/site/news.php
===================================================================
--- site-src/trunk/site/news.php	2010-07-25 17:40:17 UTC (rev 7031)
+++ site-src/trunk/site/news.php	2010-07-25 17:59:23 UTC (rev 7032)
@@ -15,8 +15,22 @@
   <div class="content_box_full">
   <h1>News <a href="/news_rss.php"><img src="/images/feed-icon-14x14.png" alt="RSS feed" /></a></h1>
 
-  <?php include('/var/www/news/shownews.php'); ?>
+<?php
+  $phpns = array(
+    'limit'                        => 9999,
+    'template'                     => 9,
+    'offset'                       => 0,
+    'order'                        => 'DESC',
+    'sef'                          => 'news/',
+    'comment_override'             => false,
+    'items_per_page'               => 20,
+    'always_show_extended_article' => false,
+    'script_link'                  => 'http://www.vassalengine.org/news.php',
+  );
 
+  include('/var/www/news/shownews.php');
+?>
+
   </div>
 </div>
 <?php include('inc/footer.shtml'); ?>

Modified: site-src/trunk/site/news_rss.php
===================================================================
--- site-src/trunk/site/news_rss.php	2010-07-25 17:40:17 UTC (rev 7031)
+++ site-src/trunk/site/news_rss.php	2010-07-25 17:59:23 UTC (rev 7032)
@@ -1,7 +1,12 @@
 <?php
-  $phpns['mode'] = 'rss';
-  $phpns['order'] = 'DESC';
-  $phpns['limit'] = 15;
-  $phpns['script_link'] = 'http://test2.nomic.net/news.php';
+  $phpns = array(
+    'limit'                        => 15,
+    'template'                     => 9,
+    'mode'                         => 'rss',
+    'order'                        => 'DESC',
+    'sef'                          => 'news/',
+    'script_link'                  => 'http://www.vassalengine.org/news.php',
+  );
+
   include('/var/www/news/shownews.php');
 ?>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 7037
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=7037&view=rev
Author:   uckelman
Date:     2010-07-26 21:35:49 +0000 (Mon, 26 Jul 2010)

Log Message:
-----------
* Fixed typo.
* Don't use addslashes on key, already using mysql_real_escape_string.

Modified Paths:
--------------
    site-src/trunk/site/confirm.php
    site-src/trunk/site/confirm_email.php

Modified: site-src/trunk/site/confirm.php
===================================================================
--- site-src/trunk/site/confirm.php	2010-07-25 20:27:14 UTC (rev 7036)
+++ site-src/trunk/site/confirm.php	2010-07-26 21:35:49 UTC (rev 7037)
@@ -12,7 +12,7 @@
   }
 
   # sanitize the input
-  $key = addslashes($_GET['key']);
+  $key = mysql_real_escape_string($_GET['key']);
 
   # get data for key from the registration database
   $auth = new AuthDB();
@@ -21,7 +21,7 @@
     "SELECT username, password, email, realname
      FROM pending
      WHERE id='%s'",
-    mysql_real_escape_string($key)
+    $key
   );
 
   $row = $auth->read($query);
@@ -48,7 +48,7 @@
   # remove row from the registration database
   $query = sprintf(
     "DELETE FROM pending WHERE id='%s'",
-    mysql_real_escape_string($key)
+    $key
   );
   $auth->write($query);
 

Modified: site-src/trunk/site/confirm_email.php
===================================================================
--- site-src/trunk/site/confirm_email.php	2010-07-25 20:27:14 UTC (rev 7036)
+++ site-src/trunk/site/confirm_email.php	2010-07-26 21:35:49 UTC (rev 7037)
@@ -4,16 +4,16 @@
 require_once('sso/UserDB.php');
 require_once('sso/ssolib.php');
 
-$tilte = 'Confirm email';
+$title = 'Confirm email';
 
 try {
   # check whether this was an attempt to confirm
-  if (empty($_GET)) {
+  if (!isset($_GET['key'])) {
     throw new ErrorException('No confirmation key.');
   }
 
   # sanitize the input
-  $key = addslashes($_GET['key']);
+  $key = mysql_real_escape_string($_GET['key']);
 
   if (empty($key)) {
     throw new ErrorException('No confirmation key.');
@@ -26,7 +26,7 @@
     "SELECT username, email
      FROM confirmemail
      WHERE id='%s'",
-    mysql_real_escape_string($key)
+    $key
   );
 
   $row = $auth->read($query);
@@ -43,7 +43,7 @@
   # remove row from the registration database
   $query = sprintf(
     "DELETE FROM confirmemail WHERE id='%s'",
-    mysql_real_escape_string($key)
+    $key
   );
 
   $auth->write($query);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
The Palm PDK Hot Apps Program offers developers who use the
Plug-In Development Kit to bring their C/C++ apps to Palm for a share 
of $1 Million in cash or HP Products. Visit us here for more details:
http://ad.doubleclick.net/clk;226879339;13503038;l?
http://clk.atdmt.com/CRS/go/247765532/direct/01/
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 7108
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=7108&view=rev
Author:   uckelman
Date:     2010-08-11 20:26:07 +0000 (Wed, 11 Aug 2010)

Log Message:
-----------
* Added mktree files (used on status page).
* Added IE fixes.

Added Paths:
-----------
    site-src/trunk/site/images/bullet.gif
    site-src/trunk/site/images/green-minus.png
    site-src/trunk/site/images/green-plus.png
    site-src/trunk/site/images/minus.gif
    site-src/trunk/site/images/plus.gif
    site-src/trunk/site/images/user-icon.png
    site-src/trunk/site/js/
    site-src/trunk/site/js/IE9.js
    site-src/trunk/site/js/blank.gif
    site-src/trunk/site/js/mktree.js

Added: site-src/trunk/site/images/bullet.gif
===================================================================
(Binary files differ)


Property changes on: site-src/trunk/site/images/bullet.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: site-src/trunk/site/images/green-minus.png
===================================================================
(Binary files differ)


Property changes on: site-src/trunk/site/images/green-minus.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: site-src/trunk/site/images/green-plus.png
===================================================================
(Binary files differ)


Property changes on: site-src/trunk/site/images/green-plus.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: site-src/trunk/site/images/minus.gif
===================================================================
(Binary files differ)


Property changes on: site-src/trunk/site/images/minus.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: site-src/trunk/site/images/plus.gif
===================================================================
(Binary files differ)


Property changes on: site-src/trunk/site/images/plus.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: site-src/trunk/site/images/user-icon.png
===================================================================
(Binary files differ)


Property changes on: site-src/trunk/site/images/user-icon.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: site-src/trunk/site/js/IE9.js
===================================================================
--- site-src/trunk/site/js/IE9.js	                        (rev 0)
+++ site-src/trunk/site/js/IE9.js	2010-08-11 20:26:07 UTC (rev 7108)
@@ -0,0 +1,6 @@
+/*
+  IE7/IE8/IE9.js - copyright 2004-2010, Dean Edwards
+  http://code.google.com/p/ie7-js/
+  http://www.opensource.org/licenses/mit-license.php
+*/
+;(function(N,p){var h=N.IE7={version:"2.1(beta4)",toString:bT("[IE7]")};h.compat=9;var t=h.appVersion=navigator.appVersion.match(/MSIE (\d\.\d)/)[1]-0;if(/ie7_off/.test(top.location.search)||t<5.5||t>=h.compat)return;var E=t<6,bj=bT(),bx=p.documentElement,B,x,cy="!",U=":link{ie7-link:link}:visited{ie7-link:visited}",cz=/^[\w\.]+[^:]*$/;function bk(c,a){if(cz.test(c))c=(a||"")+c;return c};function by(c,a){c=bk(c,a);return c.slice(0,c.lastIndexOf("/")+1)};var bU=p.scripts[p.scripts.length-1],cA=by(bU.src);try{var V=new ActiveXObject("Microsoft.XMLHTTP")}catch(ex){}var bl={};function cB(c,a){try{c=bk(c,a);if(!bl[c]){V.open("GET",c,false);V.send();if(V.status==0||V.status==200){bl[c]=V.responseText}}}catch(ex){}return bl[c]||""};var dA=Array.prototype.slice,dB=/%([1-9])/g,cC=/^\s\s*/,cD=/\s\s*$/,cE=/([\/()[\]{}|*+-.,^$?\\])/g,bV=/\bbase\b/,bW=["constructor","toString"],bm;function F(){};F.extend=function(g,f){bm=true;var d=new this;O(d,g);bm=false;var c=d.constructor;function a(){if(!bm)c.apply(this,arguments)};d.constructor=a;a.extend=arguments.callee;O(a,f);a.prototype=d;return a};F.prototype.extend=function(a){return O(this,a)};var P="#",Q="#",bc=".",bn="/",dC=/\\(\d+)/g,cF=/\[(\\.|[^\]\\])+\]|\\.|\(\?/g,cG=/\(/g,cH=/\$(\d+)/,cI=/^\$\d+$/,cJ=/(\[(\\.|[^\]\\])+\]|\\.|\(\?)|\(/g,cK=/^<#\w+>$/,cL=/<#(\w+)>/g,G=F.extend({constructor:function(a){this[bc]=[];this[Q]={};this.merge(a)},add:function(c,a){delete this[bn];if(c instanceof RegExp){c=c.source}if(!this[P+c])this[bc].push(String(c));return this[Q][P+c]=new G.Item(c,a,this)},compile:function(a){if(a||!this[bn]){this[bn]=new RegExp(this,this.ignoreCase?"gi":"g")}return this[bn]},merge:function(c){for(var a in c)this.add(a,c[a])},exec:function(o){var k=this,l=k[bc],m=k[Q],j,i=this.compile(true).exec(o);if(i){var g=0,f=1;while((j=m[P+l[g++]])){var d=f+j.length+1;if(i[f]){if(j.replacement===0){return k.exec(o)}else{var c=i.slice(f,d),a=c.length;while(--a)c[a]=c[a]||"";c[0]={match:c[0],item:j};return c}}f=d}}return null},parse:function(o){o+="";var k=this,l=k[bc],m=k[Q];return o.replace(this.compile(),function(j){var i=[],g,f=1,d=arguments.length;while(--d)i[d]=arguments[d]||"";while((g=m[P+l[d++]])){var c=f+g.length+1;if(i[f]){var a=g.replacement;switch(typeof a){case"function":return a.apply(k,i.slice(f,c));case"number":return i[f+a];default:return a}}f=c}return j})},toString:function(){var g=[],f=this[bc],d=this[Q],c;for(var a=0;c=d[P+f[a]];a++){g[a]=c.source}return"("+g.join(")|(")+")"}},{IGNORE:null,Item:F.extend({constructor:function(k,l,m){var j=k.indexOf("(")===-1?0:G.count(k),i=m.dictionary;if(i&&k.indexOf("<#")!==-1){if(cK.test(k)){var g=i[Q][P+k.slice(2,-1)];k=g.replacement;j=g._5}else{k=i.parse(k)}}if(typeof l=="number")l=String(l);else if(l==null)l=0;if(typeof l=="string"&&cH.test(l)){if(cI.test(l)){var f=l.slice(1)-0;if(f&&f<=j)l=f}else{var d=l,c;l=function(a){if(!c){c=new RegExp(k,"g"+(this.ignoreCase?"i":""))}return a.replace(c,d)}}}this.length=j;this.source=String(k);this.replacement=l}}),count:function(a){return(String(a).replace(cF,"").match(cG)||"").length}}),cM=G.extend({parse:function(f){var d=this[Q];return f.replace(cL,function(c,a){a=d[P+a];return a?a._6:c})},add:function(g,f){if(f instanceof RegExp){f=f.source}var d=f.replace(cJ,cN);if(f.indexOf("(")!==-1){var c=G.count(f)}if(f.indexOf("<#")!==-1){f=this.parse(f);d=this.parse(d)}var a=this.base(g,f);a._6=d;a._5=c||a.length;return a},toString:function(){return"(<#"+this[PATTERNS].join(">)|(<#")+">)"}});function cN(c,a){return a||"(?:"};function O(i,g){if(i&&g){var f=(typeof g=="function"?Function:Object).prototype;var d=bW.length,c;if(bm)while(c=bW[--d]){var a=g[c];if(a!=f[c]){if(bV.test(a)){bX(i,c,a)}else{i[c]=a}}}for(c in g)if(typeof f[c]=="undefined"){var a=g[c];if(i[c]&&typeof a=="function"&&bV.test(a)){bX(i,c,a)}else{i[c]=a}}}return i};function bX(i,g,f){var d=i[g];i[g]=function(){var c=this.base;this.base=d;var a=f.apply(this,arguments);this.base=c;return a}};function cO(f,d){if(!d)d=f;var c={};for(var a in f)c[a]=d[a];return c};function H(g){var f=arguments,d=new RegExp("%([1-"+arguments.length+"])","g");return String(g).replace(d,function(c,a){return a<f.length?f[a]:c})};function bo(c,a){return String(c).match(a)||[]};function bY(a){return String(a).replace(cE,"\\$1")};function bZ(a){return String(a).replace(cC,"").replace(cD,"")};function bT(a){return function(){return a}};var ca=G.extend({ignoreCase:true}),cP=/'/g,cb=/'(\d+)'/g,dD=/\\/g,bz=/\\([nrtf'"])/g,W=[],cc=new ca({"<!\\-\\-|\\-\\->":"","\\/\\*[^*]*\\*+([^\\/][^*]*\\*+)*\\/":"","@(namespace|import)[^;\\n]+[;\\n]":"","'(\\\\.|[^'\\\\])*'":cd,'"(\\\\.|[^"\\\\])*"':cd,"\\s+":" "});function cQ(a){return cc.parse(a).replace(bz,"$1")};function bd(a){return a.replace(cb,cR)};function cd(c){var a=W.length;W[a]=c.slice(1,-1).replace(bz,"$1").replace(cP,"\\'");return"'"+a+"'"};function cR(d,c){var a=W[c];if(a==null)return d;return"'"+W[c]+"'"};function bp(a){return a.indexOf("'")===0?W[a.slice(1,-1)]:a};var cS=new G({Width:"Height",width:"height",Left:"Top",left:"top",Right:"Bottom",right:"bottom",onX:"onY"});function ce(a){return cS.parse(a)};var cf=[];function bA(a){cT(a);y(N,"onresize",a)};function y(d,c,a){d.attachEvent(c,a);cf.push(arguments)};function cU(d,c,a){try{d.detachEvent(c,a)}catch(ex){}};y(N,"onunload",function(){var a;while(a=cf.pop()){cU(a[0],a[1],a[2])}});function be(d,c,a){if(!d.elements)d.elements={};if(a)d.elements[c.uniqueID]=c;else delete d.elements[c.uniqueID];return a};y(N,"onbeforeprint",function(){if(!h.CSS.print)new cg("print");h.CSS.print.recalc()});var ch=/^\d+(px)?$/i,X=/^\d+%$/,C=function(f,d){if(ch.test(d))return parseInt(d);var c=f.style.left,a=f.runtimeStyle.left;f.runtimeStyle.left=f.currentStyle.left;f.style.left=d||0;d=f.style.pixelLeft;f.style.left=c;f.runtimeStyle.left=a;return d},bB="ie7-",ci=F.extend({constructor:function(){this.fixes=[];this.recalcs=[]},init:bj}),bC=[];function cT(a){bC.push(a)};h.recalc=function(){h.HTML.recalc();h.CSS.recalc();for(var a=0;a<bC.length;a++)bC[a]()};function bq(a){return a.currentStyle["ie7-position"]=="fixed"};function bD(c,a){return c.currentStyle[bB+a]||c.currentStyle[a]};function Y(d,c,a){if(d.currentStyle[bB+c]==null){d.runtimeStyle[bB+c]=d.currentStyle[c]}d.runtimeStyle[c]=a};function cj(c){var a=p.createElement(c||"object");a.style.cssText="position:absolute;padding:0;display:block;border:none;clip:rect(0 0 0 0);left:-9999";a.ie7_anon=true;return a};var bE="(e.nextSibling&&IE7._1(e,'next'))",ck=bE.replace(/next/g,"previous"),cl="e.nodeName>'@'",cm="if("+cl+"){",cn="(e.nodeName==='FORM'?IE7._0(e,'id'):e.id)",cV=/a(#[\w-]+)?(\.[\w-]+)?:(hover|active)/i,cW=/(.*)(:first-(line|letter))/,cX=/\s/,cY=/((?:\\.|[^{\\])+)\{((?:\\.|[^}\\])+)\}/g,cZ=/(?:\\.|[^,\\])+/g,I=p.styleSheets,bF=[];h.CSS=new(ci.extend({parser:new ca,screen:"",print:"",styles:[],rules:[],pseudoClasses:t<7?"first\\-child":"",dynamicPseudoClasses:{toString:function(){var c=[];for(var a in this)c.push(a);return c.join("|")}},init:function(){var j="^\x01$",i="\\[class=?[^\\]]*\\]",g=[];if(this.pseudoClasses)g.push(this.pseudoClasses);var f=this.dynamicPseudoClasses.toString();if(f)g.push(f);g=g.join("|");var d=t<7?["[>+~\\[(]|([:.])[\\w-]+\\1"]:[i];if(g)d.push(":("+g+")");this.UNKNOWN=new RegExp(d.join("|")||j,"i");var c=t<7?["\\[[^\\]]+\\]|[^\\s(\\[]+\\s*[+~]"]:[i],a=c.concat();if(g)a.push(":("+g+")");u.COMPLEX=new RegExp(a.join("|")||j,"ig");if(this.pseudoClasses)c.push(":("+this.pseudoClasses+")");bf.COMPLEX=new RegExp(c.join("|")||j,"i");f="not\\(:"+f.split("|").join("\\)|not\\(:")+"\\)|"+f;bf.MATCH=new RegExp(f?"(.*?):("+f+")(.*)":j,"i");this.createStyleSheet();this.refresh()},addEventHandler:function(){y.apply(null,arguments)},addFix:function(c,a){this.parser.add(c,a)},addRecalc:function(i,g,f,d){i=i.source||i;g=new RegExp("([{;\\s])"+i+"\\s*:\\s*"+g+"[^;}]*");var c=this.recalcs.length;if(typeof d=="string")d=i+":"+d;this.addFix(g,function(a){if(typeof d=="function")d=d(a);return(d?d:a)+";ie7-"+a.slice(1)+";ie7_recalc"+c+":1"});this.recalcs.push(arguments);return c},apply:function(){this.getInlineCSS();new cg("screen");this.trash()},createStyleSheet:function(){p.getElementsByTagName("head")[0].appendChild(p.createElement("style"));this.styleSheet=I[I.length-1];this.styleSheet.ie7=true;this.styleSheet.owningElement.ie7=true;this.styleSheet.cssText=U},getInlineCSS:function(){var d=p.getElementsByTagName("style"),c;for(var a=d.length-1;c=d[a];a--){if(!c.disabled&&!c.ie7){c._7=c.innerHTML}}},getText:function(d,c){try{var a=d.cssText}catch(e){a=""}if(V)a=cB(d.href,c)||a;return a},recalc:function(){this.screen.recalc();var q=/ie7_recalc\d+/g,n=U.match(/[{,]/g).length,o=this.styleSheet.rules,k,l,m,j,i,g,f,d,c;for(g=n;k=o[g];g++){var a=k.style.cssText;if(l=a.match(q)){j=J(k.selectorText);if(j.length)for(f=0;f<l.length;f++){c=l[f];m=h.CSS.recalcs[c.slice(10)][2];for(d=0;(i=j[d]);d++){if(i.currentStyle[c])m(i,a)}}}}},refresh:function(){this.styleSheet.cssText=U+this.screen+this.print},trash:function(){for(var c=0;c<I.length;c++){if(!I[c].ie7){try{var a=I[c].cssText}catch(e){a=""}if(a)I[c].cssText=""}}}}));var cg=F.extend({constructor:function(a){this.media=a;this.load();h.CSS[a]=this;h.CSS.refresh()},createRule:function(d,c){var a;if(R&&(a=d.match(R.MATCH))){return new R(a[1],a[2],c)}else if(a=d.match(bf.MATCH)){if(!cV.test(a[0])||bf.COMPLEX.test(a[0])){return new bf(d,a[1],a[2],a[3],c)}}else{return new u(d,c)}return d+" {"+c+"}"},getText:function(){var v=/@media\s+([^{]+?)\s*\{([^@]+\})\s*\}/gi,Z=/@import[^;\n]+/gi,S=/@import\s+url\s*\(\s*["']?|["']?\s*\)\s*/gi,ba=/(url\s*\(\s*['"]?)([\w\.]+[^:\)]*['"]?\))/gi,K=this,L={};function z(k,l,m,j){var i="";if(!j){m=q(k.media);j=0}if(m==="none"){k.disabled=true;return""}if(m==="all"||m===K.media){try{var g=!!k.cssText}catch(exe){}if(j<3&&g){var f=k.cssText.match(Z);for(var d=0,c;d<k.imports.length;d++){var c=k.imports[d];var a=k._2||k.href;c._2=f[d].replace(S,"");i+=z(c,by(a,l),m,j+1)}}i+=cQ(k.href?n(k,l):k.owningElement._7);i=A(i,K.media)}return i};for(var w=0;w<I.length;w++){var r=I[w];if(!r.disabled&&!r.ie7)this.cssText+=z(r)}function A(c,a){s.value=a;return c.replace(v,s)};function s(d,c,a){c=q(c);switch(c){case"screen":case"print":if(c!==s.value)return"";case"all":return a}return""};function q(d){if(!d)return"all";var c=d.toLowerCase().split(/\s*,\s*/);d="none";for(var a=0;a<c.length;a++){if(c[a]==="all")return"all";if(c[a]==="screen"){if(d==="print")return"all";d="screen"}else if(c[a]==="print"){if(d==="screen")return"all";d="print"}}return d};function n(f,d){var c=f._2||f.href,a=bk(c,d);if(L[a])return"";L[a]=f.disabled?"":o(h.CSS.getText(f,d),by(c,d));return L[a]};function o(c,a){return c.replace(ba,"$1"+a.slice(0,a.lastIndexOf("/")+1)+"$2")}},load:function(){this.cssText="";this.getText();this.parse();if(bF.length){this.cssText=da(this.cssText)}this.cssText=bd(this.cssText);bl={}},parse:function(){var j=h.CSS.parser.parse(this.cssText),o="";this.cssText=j.replace(/@charset[^;]+;|@font\-face[^\}]+\}/g,function(a){o+=a+"\n";return""});this.declarations=bd(o);var k=h.CSS.rules.length,l=[],m;while((m=cY.exec(this.cssText))){var j=m[2];if(j){var i=t<7&&j.indexOf("AlphaImageLoader")!==-1;var g=m[1].match(cZ),f;for(var d=0;f=g[d];d++){f=bZ(f);var c=h.CSS.UNKNOWN.test(f);g[d]=c?this.createRule(f,j):f+"{"+j+"}";if(i)g[d]+=this.createRule(f+">*","position:relative")}l.push(g.join("\n"))}}this.cssText=l.join("\n");this.rules=h.CSS.rules.slice(k)},recalc:function(){var c,a;for(a=0;(c=this.rules[a]);a++)c.recalc()},toString:function(){return this.declarations+"@media "+this.media+"{"+this.cssText+"}"}}),R,u=h.Rule=F.extend({constructor:function(d,c){this.id=h.CSS.rules.length;this.className=u.PREFIX+this.id;var a=d.match(cW);this.selector=(a?a[1]:d)||"*";this.selectorText=this.parse(this.selector)+(a?a[2]:"");this.cssText=c;this.MATCH=new RegExp("\\s"+this.className+"(\\s|$)","g");h.CSS.rules.push(this);this.init()},init:bj,add:function(a){a.className+=" "+this.className},recalc:function(){var c=J(this.selector);for(var a=0;a<c.length;a++)this.add(c[a])},parse:function(g){var f=g.replace(u.CHILD," ").replace(u.COMPLEX,"");if(t<7)f=f.replace(u.MULTI,"");var d=bo(f,u.TAGS).length-bo(g,u.TAGS).length,c=bo(f,u.CLASSES).length-bo(g,u.CLASSES).length+1;while(c>0&&u.CLASS.test(f)){f=f.replace(u.CLASS,"");c--}while(d>0&&u.TAG.test(f)){f=f.replace(u.TAG,"$1*");d--}f+="."+this.className;c=Math.min(c,2);d=Math.min(d,2);var a=-10*c-d;if(a>0){f=f+","+u.MAP[a]+" "+f}return f},remove:function(a){a.className=a.className.replace(this.MATCH,"$1")},toString:function(){return H("%1 {%2}",this.selectorText,this.cssText)}},{CHILD:/>/g,CLASS:/\.[\w-]+/,CLASSES:/[.:\[]/g,MULTI:/(\.[\w-]+)+/g,PREFIX:"ie7_class",TAG:/^\w+|([\s>+~])\w+/,TAGS:/^\w|[\s>+~]\w/g,MAP:{"1":"html","2":"html body","10":".ie7_html","11":"html.ie7_html","12":"html.ie7_html body","20":".ie7_html .ie7_body","21":"html.ie7_html .ie7_body","22":"html.ie7_html body.ie7_body"}}),bf=u.extend({constructor:function(g,f,d,c,a){this.negated=d.indexOf("not")===0;if(this.negated)d=d.slice(5,-1);this.attach=f||"*";this.dynamicPseudoClass=h.CSS.dynamicPseudoClasses[d];this.target=c;this.base(g,a)},recalc:function(){var f=J(this.attach),d;for(var c=0;d=f[c];c++){var a=this.target?J(this.target,d):[d];if(a.length)this.dynamicPseudoClass.apply(d,a,this)}}}),M=F.extend({constructor:function(c,a){this.name=c;this.apply=a;this.instances={};h.CSS.dynamicPseudoClasses[c]=this},register:function(g,f){var d=g[2];if(!f&&d.negated){this.unregister(g,true)}else{g.id=d.id+g[0].uniqueID;if(!this.instances[g.id]){var c=g[1],a;for(a=0;a<c.length;a++)d.add(c[a]);this.instances[g.id]=g}}},unregister:function(g,f){var d=g[2];if(!f&&d.negated){this.register(g,true)}else{if(this.instances[g.id]){var c=g[1],a;for(a=0;a<c.length;a++)d.remove(c[a]);delete this.instances[g.id]}}}}),br=new M("hover",function(c){var a=arguments;h.CSS.addEventHandler(c,"onmouseenter",function(){br.register(a)});h.CSS.addEventHandler(c,"onmouseleave",function(){br.unregister(a)})});y(p,"onmouseup",function(){var c=br.instances;for(var a in c)if(!c[a][0].contains(event.srcElement))br.unregister(c[a])});var co={"=":"%1==='%2'","~=":"(' '+%1+' ').indexOf(' %2 ')!==-1","|=":"%1==='%2'||%1.indexOf('%2-')===0","^=":"%1.indexOf('%2')===0","$=":"%1.slice(-'%2'.length)==='%2'","*=":"%1.indexOf('%2')!==-1"};co[""]="%1!=null";var T={"<#attr>":function(g,f,d,c){var a="IE7._0(e,'"+f+"')";c=bp(c);if(d.length>1){if(!c||d==="~="&&cX.test(c)){return"false&&"}a="("+a+"||'')"}return"("+H(co[d],a,c)+")&&"},"<#id>":cn+"==='$1'&&","<#class>":"e.className&&(' '+e.className+' ').indexOf(' $1 ')!==-1&&",":first-child":"!"+ck+"&&",":link":"e.currentStyle['ie7-link']=='link'&&",":visited":"e.currentStyle['ie7-link']=='visited'&&"};h.HTML=new(ci.extend({fixed:{},init:bj,addFix:function(){this.fixes.push(arguments)},apply:function(){for(var f=0;f<this.fixes.length;f++){var d=J(this.fixes[f][0]);var c=this.fixes[f][1];for(var a=0;a<d.length;a++)c(d[a])}},addRecalc:function(){this.recalcs.push(arguments)},recalc:function(){for(var j=0;j<this.recalcs.length;j++){var i=J(this.recalcs[j][0]);var g=this.recalcs[j][1],f;var d=Math.pow(2,j);for(var c=0;(f=i[c]);c++){var a=f.uniqueID;if((this.fixed[a]&d)===0){f=g(f)||f;this.fixed[a]|=d}}}}}));if(t<7){p.createElement("abbr");h.HTML.addRecalc("label",function(c){if(!c.htmlFor){var a=J("input,textarea",c,true);if(a){y(c,"onclick",function(){a.click()})}}})}var bg="[.\\d]";(function(){var v=h.Layout={};U+="*{boxSizing:content-box}";v.boxSizing=function(a){if(!a.currentStyle.hasLayout){a.style.height="0cm";if(a.currentStyle.verticalAlign==="auto")a.runtimeStyle.verticalAlign="top";Z(a)}};function Z(a){if(a!=x&&a.currentStyle.position!=="absolute"){S(a,"marginTop");S(a,"marginBottom")}};function S(g,f){if(!g.runtimeStyle[f]){var d=g.parentElement;var c=f==="marginTop";if(d&&d.currentStyle.hasLayout&&!h._1(g,c?"previous":"next"))return;var a=g[c?"firstChild":"lastChild"];if(a&&a.nodeName<"@")a=h._1(a,c?"next":"previous");if(a&&a.currentStyle.styleFloat==="none"&&a.currentStyle.hasLayout){S(a,f);margin=ba(g,g.currentStyle[f]);childMargin=ba(a,a.currentStyle[f]);if(margin<0||childMargin<0){g.runtimeStyle[f]=margin+childMargin}else{g.runtimeStyle[f]=Math.max(childMargin,margin)}a.runtimeStyle[f]="0px"}}};function ba(c,a){return a==="auto"?0:C(c,a)};var K=/^[.\d][\w]*$/,L=/^(auto|0cm)$/,z={};v.borderBox=function(a){z.Width(a);z.Height(a)};var w=function(r){z.Width=function(a){if(!X.test(a.currentStyle.width))A(a);if(r)Z(a)};function A(c,a){if(!c.runtimeStyle.fixedWidth){if(!a)a=c.currentStyle.width;c.runtimeStyle.fixedWidth=K.test(a)?Math.max(0,n(c,a))+"px":a;Y(c,"width",c.runtimeStyle.fixedWidth)}};function s(c){if(!bq(c)){var a=c.offsetParent;while(a&&!a.currentStyle.hasLayout)a=a.offsetParent}return(a||x).clientWidth};function q(c,a){if(X.test(a))return parseInt(parseFloat(a)/100*s(c));return C(c,a)};var n=function(f,d){var c=f.currentStyle["ie7-box-sizing"]==="border-box",a=0;if(E&&!c)a+=o(f)+k(f,"padding");else if(!E&&c)a-=o(f)+k(f,"padding");return q(f,d)+a};function o(a){return a.offsetWidth-a.clientWidth};function k(c,a){return q(c,c.currentStyle[a+"Left"])+q(c,c.currentStyle[a+"Right"])};U+="*{minWidth:none;maxWidth:none;min-width:none;max-width:none}";v.minWidth=function(a){if(a.currentStyle["min-width"]!=null){a.style.minWidth=a.currentStyle["min-width"]}if(be(arguments.callee,a,a.currentStyle.minWidth!=="none")){v.boxSizing(a);A(a);l(a)}};eval("IE7.Layout.maxWidth="+String(v.minWidth).replace(/min/g,"max"));function l(d){if(d==p.body){var c=d.clientWidth}else{var a=d.getBoundingClientRect();c=a.right-a.left}if(d.currentStyle.minWidth!=="none"&&c<n(d,d.currentStyle.minWidth)){d.runtimeStyle.width=d.currentStyle.minWidth}else if(d.currentStyle.maxWidth!=="none"&&c>=n(d,d.currentStyle.maxWidth)){d.runtimeStyle.width=d.currentStyle.maxWidth}else{d.runtimeStyle.width=d.runtimeStyle.fixedWidth}};function m(a){if(be(m,a,/^(fixed|absolute)$/.test(a.currentStyle.position)&&bD(a,"left")!=="auto"&&bD(a,"right")!=="auto"&&L.test(bD(a,"width")))){j(a);v.boxSizing(a)}};v.fixRight=m;function j(d){var c=q(d,d.runtimeStyle._3||d.currentStyle.left),a=s(d)-q(d,d.currentStyle.right)-c-k(d,"margin");if(parseInt(d.runtimeStyle.width)===a)return;d.runtimeStyle.width="";if(bq(d)||r||d.offsetWidth<a){if(!E)a-=o(d)+k(d,"padding");if(a<0)a=0;d.runtimeStyle.fixedWidth=a;Y(d,"width",a)}};var i=0;bA(function(){if(!x)return;var g,f=(i<x.clientWidth);i=x.clientWidth;var d=v.minWidth.elements;for(g in d){var c=d[g];var a=(parseInt(c.runtimeStyle.width)===n(c,c.currentStyle.minWidth));if(f&&a)c.runtimeStyle.width="";if(f==a)l(c)}var d=v.maxWidth.elements;for(g in d){var c=d[g];var a=(parseInt(c.runtimeStyle.width)===n(c,c.currentStyle.maxWidth));if(!f&&a)c.runtimeStyle.width="";if(f!==a)l(c)}for(g in m.elements)j(m.elements[g])});if(E){h.CSS.addRecalc("width",bg,z.Width)}if(t<7){h.CSS.addRecalc("max-width",bg,v.maxWidth);h.CSS.addRecalc("right",bg,m)}else if(t==7){if(r)h.CSS.addRecalc("height","[\\d.]+%",function(element){element.runtimeStyle.pixelHeight=parseInt(s(element)*element.currentStyle["ie7-height"].slice(0,-1)/100)})}};eval("var _8="+ce(w));w();_8(true);if(t<7){h.CSS.addRecalc("min-width",bg,v.minWidth);h.CSS.addFix(/\bmin-height\s*/,"height")}})();var bG=bk("blank.gif",cA),bH="DXImageTransform.Microsoft.AlphaImageLoader",cp="progid:"+bH+"(src='%1',sizingMethod='%2')",bh,bi=[];function cq(c){if(bh.test(c.src)){var a=new Image(c.width,c.height);a.onload=function(){c.width=a.width;c.height=a.height;a=null};a.src=c.src;c.pngSrc=c.src;bs(c)}};if(t<7){h.CSS.addFix(/background(-image)?\s*:\s*([^};]*)?url\(([^\)]+)\)([^;}]*)?/,function(g,f,d,c,a){c=bp(c);return bh.test(c)?"filter:"+H(cp,c,a.indexOf("no-repeat")===-1?"scale":"crop")+";zoom:1;background"+(f||"")+":"+(d||"")+"none"+(a||""):g});h.CSS.addRecalc(/list\-style(\-image)?/,"[^};]*url",function(f){var d=f.currentStyle.listStyleImage.slice(5,-2);if(bh.test(d)){if(f.nodeName==="LI"){cr(f,d)}else if(f.nodeName==="UL"){for(var c=0,a;a=f.childNodes[c];c++){if(a.nodeName==="LI")cr(a,d)}}}});function cr(i,g){var f=i.runtimeStyle,d=i.offsetHeight,c=new Image;c.onload=function(){var a=i.currentStyle.paddingLeft;a=a==="0px"?0:C(i,a);f.paddingLeft=(a+this.width)+"px";f.marginLeft=-this.width+"px";f.listStyleType="none";f.listStyleImage="none";f.paddingTop=Math.max(d-i.offsetHeight,0)+"px";bs(i,"crop",g);i.style.zoom="100%"};c.src=g};h.HTML.addRecalc("img,input",function(a){if(a.nodeName==="INPUT"&&a.type!=="image")return;cq(a);y(a,"onpropertychange",function(){if(!bI&&event.propertyName==="src"&&a.src.indexOf(bG)===-1)cq(a)})});var bI=false;y(N,"onbeforeprint",function(){bI=true;for(var a=0;a<bi.length;a++)db(bi[a])});y(N,"onafterprint",function(){for(var a=0;a<bi.length;a++)bs(bi[a]);bI=false})}function bs(f,d,c){var a=f.filters[bH];if(a){a.src=c||f.src;a.enabled=true}else{f.runtimeStyle.filter=H(cp,c||f.src,d||"scale");bi.push(f)}f.src=bG};function db(a){a.src=a.pngSrc;a.filters[bH].enabled=false};(function(){if(t>=7)return;h.CSS.addRecalc("position","fixed",o,"absolute");h.CSS.addRecalc("background(-attachment)?","[^};]*fixed",q);var z=E?"body":"documentElement";function w(){if(B.currentStyle.backgroundAttachment!=="fixed"){if(B.currentStyle.backgroundImage==="none"){B.runtimeStyle.backgroundRepeat="no-repeat";B.runtimeStyle.backgroundImage="url("+bG+")"}B.runtimeStyle.backgroundAttachment="fixed"}w=bj};var r=cj("img");function A(a){return a?bq(a)||A(a.parentElement):false};function s(d,c,a){setTimeout("document.all."+d.uniqueID+".runtimeStyle.setExpression('"+c+"','"+a+"')",0)};function q(a){if(be(q,a,a.currentStyle.backgroundAttachment==="fixed"&&!a.contains(B))){w();j.bgLeft(a);j.bgTop(a);n(a)}};function n(c){r.src=c.currentStyle.backgroundImage.slice(5,-2);var a=c.canHaveChildren?c:c.parentElement;a.appendChild(r);j.setOffsetLeft(c);j.setOffsetTop(c);a.removeChild(r)};function o(a){if(be(o,a,bq(a))){Y(a,"position","absolute");Y(a,"left",a.currentStyle.left);Y(a,"top",a.currentStyle.top);w();h.Layout.fixRight(a);k(a)}};function k(d,c){p.body.getBoundingClientRect();j.positionTop(d,c);j.positionLeft(d,c,true);if(!d.runtimeStyle.autoLeft&&d.currentStyle.marginLeft==="auto"&&d.currentStyle.right!=="auto"){var a=x.clientWidth-j.getPixelWidth(d,d.currentStyle.right)-j.getPixelWidth(d,d.runtimeStyle._3)-d.clientWidth;if(d.currentStyle.marginRight==="auto")a=parseInt(a/2);if(A(d.offsetParent))d.runtimeStyle.pixelLeft+=a;else d.runtimeStyle.shiftLeft=a}if(!d.runtimeStyle.fixedWidth)j.clipWidth(d);if(!d.runtimeStyle.fixedHeight)j.clipHeight(d)};function l(){var c=q.elements;for(var a in c)n(c[a]);c=o.elements;for(a in c){k(c[a],true);k(c[a],true)}m=0};var m;bA(function(){if(!m)m=setTimeout(l,100)});var j={},i=function(g){g.bgLeft=function(a){a.style.backgroundPositionX=a.currentStyle.backgroundPositionX;if(!A(a)){s(a,"backgroundPositionX","(parseInt(runtimeStyle.offsetLeft)+document."+z+".scrollLeft)||0")}};g.setOffsetLeft=function(c){var a=A(c)?"backgroundPositionX":"offsetLeft";c.runtimeStyle[a]=g.getOffsetLeft(c,c.style.backgroundPositionX)-c.getBoundingClientRect().left-c.clientLeft+2};g.getOffsetLeft=function(c,a){switch(a){case"left":case"top":return 0;case"right":case"bottom":return x.clientWidth-r.offsetWidth;case"center":return(x.clientWidth-r.offsetWidth)/2;default:if(X.test(a)){return parseInt((x.clientWidth-r.offsetWidth)*parseFloat(a)/100)}r.style.left=a;return r.offsetLeft}};g.clipWidth=function(f){var d=f.runtimeStyle.fixWidth;f.runtimeStyle.borderRightWidth="";f.runtimeStyle.width=d?g.getPixelWidth(f,d)+"px":"";if(f.currentStyle.width!=="auto"){var c=f.getBoundingClientRect();var a=f.offsetWidth-x.clientWidth+c.left-2;if(a>=0){f.runtimeStyle.borderRightWidth="0px";a=Math.max(C(f,f.currentStyle.width)-a,0);Y(f,"width",a);return a}}};g.positionLeft=function(c,a){if(!a&&X.test(c.currentStyle.width)){c.runtimeStyle.fixWidth=c.currentStyle.width}if(c.runtimeStyle.fixWidth){c.runtimeStyle.width=g.getPixelWidth(c,c.runtimeStyle.fixWidth)}c.runtimeStyle.shiftLeft=0;c.runtimeStyle._3=c.currentStyle.left;c.runtimeStyle.autoLeft=c.currentStyle.right!=="auto"&&c.currentStyle.left==="auto";c.runtimeStyle.left="";c.runtimeStyle.screenLeft=g.getScreenLeft(c);c.runtimeStyle.pixelLeft=c.runtimeStyle.screenLeft;if(!a&&!A(c.offsetParent)){s(c,"pixelLeft","runtimeStyle.screenLeft+runtimeStyle.shiftLeft+document."+z+".scrollLeft")}};g.getScreenLeft=function(d){var c=d.offsetLeft,a=1;if(d.runtimeStyle.autoLeft){c=x.clientWidth-d.offsetWidth-g.getPixelWidth(d,d.currentStyle.right)}if(d.currentStyle.marginLeft!=="auto"){c-=g.getPixelWidth(d,d.currentStyle.marginLeft)}while(d=d.offsetParent){if(d.currentStyle.position!=="static")a=-1;c+=d.offsetLeft*a}return c};g.getPixelWidth=function(c,a){return X.test(a)?parseInt(parseFloat(a)/100*x.clientWidth):C(c,a)}};eval("var _9="+ce(i));i(j);_9(j)})();if(t<7){var bJ={backgroundColor:"transparent",backgroundImage:"none",backgroundPositionX:null,backgroundPositionY:null,backgroundRepeat:null,borderTopWidth:0,borderRightWidth:0,borderBottomWidth:0,borderLeftStyle:"none",borderTopStyle:"none",borderRightStyle:"none",borderBottomStyle:"none",borderLeftWidth:0,borderLeftColor:"#000",borderTopColor:"#000",borderRightColor:"#000",borderBottomColor:"#000",height:null,marginTop:0,marginBottom:0,marginRight:0,marginLeft:0,width:"100%"};h.CSS.addRecalc("overflow","visible",function(d){if(d.currentStyle.position==="absolute")return;if(d.parentNode.ie7_wrapped)return;if(h.Layout&&d.currentStyle["max-height"]!=="auto"){h.Layout.maxHeight(d)}if(d.currentStyle.marginLeft==="auto")d.style.marginLeft=0;if(d.currentStyle.marginRight==="auto")d.style.marginRight=0;var c=p.createElement(cy);c.ie7_wrapped=d;for(var a in bJ){c.style[a]=d.currentStyle[a];if(bJ[a]!=null){d.runtimeStyle[a]=bJ[a]}}c.style.display="block";c.style.position="relative";d.runtimeStyle.position="absolute";d.parentNode.insertBefore(c,d);c.appendChild(d)})}function dc(){var s="xx-small,x-small,small,medium,large,x-large,xx-large".split(",");for(var q=0;q<s.length;q++){s[s[q]]=s[q-1]||"0.67em"}h.CSS.addFix(/(font(-size)?\s*:\s*)([\w.-]+)/,function(f,d,c,a){return d+(s[a]||a)});var n=/^\-/,o=/(em|ex)$/i,k=/em$/i,l=/ex$/i;C=function(d,c){if(ch.test(c))return parseInt(c)||0;var a=n.test(c)?-1:1;if(o.test(c))a*=j(d);m.style.width=a<0?c.slice(1):c;B.appendChild(m);c=a*m.offsetWidth;m.removeNode();return parseInt(c)};var m=cj();function j(d){var c=1;m.style.fontFamily=d.currentStyle.fontFamily;m.style.lineHeight=d.currentStyle.lineHeight;while(d!=B){var a=d.currentStyle["ie7-font-size"];if(a){if(k.test(a))c*=parseFloat(a);else if(X.test(a))c*=(parseFloat(a)/100);else if(l.test(a))c*=(parseFloat(a)/2);else{m.style.fontSize=a;return 1}}d=d.parentElement}return c};h.CSS.addFix(/cursor\s*:\s*pointer/,"cursor:hand");h.CSS.addFix(/display\s*:\s*list-item/,"display:block");function i(f){var d=f.parentElement,c=d.offsetWidth-f.offsetWidth-g(d),a=(f.currentStyle["ie7-margin"]&&f.currentStyle.marginRight==="auto")||f.currentStyle["ie7-margin-right"]==="auto";switch(d.currentStyle.textAlign){case"right":c=a?parseInt(c/2):0;f.runtimeStyle.marginRight=c+"px";break;case"center":if(a)c=0;default:if(a)c/=2;f.runtimeStyle.marginLeft=parseInt(c)+"px"}};function g(a){return C(a,a.currentStyle.paddingLeft)+C(a,a.currentStyle.paddingRight)};h.CSS.addRecalc("margin(-left|-right)?","[^};]*auto",function(a){if(be(i,a,a.parentElement&&a.currentStyle.display==="block"&&a.currentStyle.marginLeft==="auto"&&a.currentStyle.position!=="absolute")){i(a)}});bA(function(){for(var c in i.elements){var a=i.elements[c];a.runtimeStyle.marginLeft=a.runtimeStyle.marginRight="";i(a)}})};var bK="\\([^)]+\\)";cc.add(/::(before|after)/,":$1");if(t<8){if(h.CSS.pseudoClasses)h.CSS.pseudoClasses+="|";h.CSS.pseudoClasses+="before|after|lang"+bK;function da(a){return a.replace(new RegExp("([{;\\s])("+bF.join("|")+")\\s*:\\s*([^;}]+)","g"),"$1$2:$3;ie7-$2:$3")};var dd=/[\w-]+\s*:\s*inherit/g;var de=/ie7\-|\s*:\s*inherit/g;var df=/\-([a-z])/g;function dg(c,a){return a.toUpperCase()};h.CSS.addRecalc("[\\w-]+","inherit",function(g,f){if(g.parentElement){var d=f.match(dd);for(var c=0;c<d.length;c++){var a=d[c].replace(de,"");if(g.currentStyle["ie7-"+a]==="inherit"){a=a.replace(df,dg);g.runtimeStyle[a]=g.parentElement.currentStyle[a]}}}},function(a){bF.push(bY(a.slice(1).split(":")[0]));return a});var bt=new M("focus",function(c){var a=arguments;h.CSS.addEventHandler(c,"onfocus",function(){bt.unregister(a);bt.register(a)});h.CSS.addEventHandler(c,"onblur",function(){bt.unregister(a)});if(c==p.activeElement){bt.register(a)}});var bL=new M("active",function(c){var a=arguments;h.CSS.addEventHandler(c,"onmousedown",function(){bL.register(a)})});y(p,"onmouseup",function(){var c=bL.instances;for(var a in c)bL.unregister(c[a])});var dh=/^url\s*\(\s*([^)]*)\)$/;var di={before0:"beforeBegin",before1:"afterBegin",after0:"afterEnd",after1:"beforeEnd"};var R=h.PseudoElement=u.extend({constructor:function(j,i,g){this.position=i;var f=g.match(R.CONTENT),d,c;if(f){f=f[1];d=f.split(/\s+/);for(var a=0;(c=d[a]);a++){d[a]=/^attr/.test(c)?{attr:c.slice(5,-1)}:c.charAt(0)==="'"?bp(c):bd(c)}f=d}this.content=f;this.base(j,bd(g))},init:function(){this.match=J(this.selector);for(var c=0;c<this.match.length;c++){var a=this.match[c].runtimeStyle;if(!a[this.position])a[this.position]={cssText:""};a[this.position].cssText+=";"+this.cssText;if(this.content!=null)a[this.position].content=this.content}},create:function(n){var o=n.runtimeStyle[this.position];if(o){var k=[].concat(o.content||"");for(var l=0;l<k.length;l++){if(typeof k[l]=="object"){k[l]=n.getAttribute(k[l].attr)}}k=k.join("");var m=k.match(dh);var j="overflow:hidden;"+o.cssText.replace(/'/g,'"');var i=di[this.position+Number(n.canHaveChildren)];var g='ie7_pseudo'+R.count++;n.insertAdjacentHTML(i,H(R.ANON,this.className,g,j,m?"":k));if(m){var f=bp(m[1]);var d=p.getElementById(g);d.src=f;bs(d,"crop");var c=n.currentStyle.styleFloat!=="none";if(d.currentStyle.display==="inline"||c){if(t<7&&c&&n.canHaveChildren){n.runtimeStyle.display="inline";n.runtimeStyle.position="relative";d.runtimeStyle.position="absolute"}d.style.display="inline-block";if(n.currentStyle.styleFloat!=="none"){d.style.pixelWidth=n.offsetWidth}var a=new Image;a.onload=function(){d.style.pixelWidth=this.width;d.style.pixelHeight=Math.max(this.height,d.offsetHeight)};a.src=f}}n.runtimeStyle[this.position]=null}},recalc:function(){if(this.content==null)return;for(var a=0;a<this.match.length;a++){this.create(this.match[a])}},toString:function(){return"."+this.className+"{display:inline}"}},{CONTENT:/content\s*:\s*([^;]*)(;|$)/,ANON:"<ie7:! class='ie7_anon %1' id=%2 style='%3'>%4</ie7:!>",MATCH:/(.*):(before|after).*/,count:0});h._getLang=function(c){var a="";while(c&&c.nodeType===1){a=c.lang||c.getAttribute("lang")||"";if(a)break;c=c.parentNode}return a};T=O(T,{":lang\\(([^)]+)\\)":"((ii=IE7._getLang(e))==='$1'||ii.indexOf('$1-')===0)&&"})}var dj=/^(submit|reset|button)$/;h.HTML.addRecalc("button,input",function(c){if(c.nodeName==="BUTTON"){var a=c.outerHTML.match(/ value="([^"]*)"/i);c.runtimeStyle.value=a?a[1]:""}if(c.type==="submit"){y(c,"onclick",function(){c.runtimeStyle.clicked=true;setTimeout("document.all."+c.uniqueID+".runtimeStyle.clicked=false",1)})}});h.HTML.addRecalc("form",function(d){y(d,"onsubmit",function(){for(var c,a=0;c=d[a];a++){if(dj.test(c.type)&&!c.disabled&&!c.runtimeStyle.clicked){c.disabled=true;setTimeout("document.all."+c.uniqueID+".disabled=false",1)}else if(c.nodeName==="BUTTON"&&c.type==="submit"){setTimeout("document.all."+c.uniqueID+".value='"+c.value+"'",1);c.value=c.runtimeStyle.value}}})});h.HTML.addRecalc("img",function(a){if(a.alt&&!a.title)a.title=""});if(t<8){h.CSS.addRecalc("border-spacing",bg,function(a){if(a.currentStyle.borderCollapse!=="collapse"){a.cellSpacing=C(a,a.currentStyle["ie7-border-spacing"].split(" ")[0])}});h.CSS.addRecalc("box-sizing","content-box",h.Layout.boxSizing);h.CSS.addRecalc("box-sizing","border-box",h.Layout.borderBox)}if(t<8){var dk=/^image/i;h.HTML.addRecalc("object",function(a){if(dk.test(a.type)){a.body.style.cssText="margin:0;padding:0;border:none;overflow:hidden";return a}})}var bM="!IE7._a(e,'next')&&",cs=bM.replace("next","previous");if(h.CSS.pseudoClasses)h.CSS.pseudoClasses+="|";h.CSS.pseudoClasses+="(?:first|last|only)\\-(?:child|of\\-type)|empty|root|target|"+("not|nth\\-child|nth\\-last\\-child|nth\\-of\\-type|nth\\-last\\-of\\-type".split("|").join(bK+"|")+bK);var bN=new M("checked",function(c){if(typeof c.checked!=="boolean")return;var a=arguments;h.CSS.addEventHandler(c,"onpropertychange",function(){if(event.propertyName==="checked"){if(c.checked===true)bN.register(a);else bN.unregister(a)}});if(c.checked===true)bN.register(a)}),bO=new M("enabled",function(c){if(typeof c.disabled!=="boolean")return;var a=arguments;h.CSS.addEventHandler(c,"onpropertychange",function(){if(event.propertyName==="disabled"){if(c.disabled===false)bO.register(a);else bO.unregister(a)}});if(c.disabled===false)bO.register(a)}),bP=new M("disabled",function(c){if(typeof c.disabled!=="boolean")return;var a=arguments;h.CSS.addEventHandler(c,"onpropertychange",function(){if(event.propertyName==="disabled"){if(c.disabled===true)bP.register(a);else bP.unregister(a)}});if(c.disabled===true)bP.register(a)}),bQ=new M("indeterminate",function(c){if(typeof c.indeterminate!=="boolean")return;var a=arguments;h.CSS.addEventHandler(c,"onpropertychange",function(){if(event.propertyName==="indeterminate"){if(c.indeterminate===true)bQ.register(a);else bQ.unregister(a)}});h.CSS.addEventHandler(c,"onclick",function(){bQ.unregister(a)})}),bR=new M("target",function(c){var a=arguments;if(!c.tabIndex)c.tabIndex=0;h.CSS.addEventHandler(p,"onpropertychange",function(){if(event.propertyName==="activeElement"){if(c.id&&c.id===location.hash.slice(1))bR.register(a);else bR.unregister(a)}});if(c.id&&c.id===location.hash.slice(1))bR.register(a)}),ct=1,bu={_4:1};h._b=function(l,m,j){var i=l.parentNode;if(!i||i.nodeType!==1)return NaN;var g=j?l.nodeName:"";if(g==="TR"&&l.sectionRowIndex>=0){var c=l.sectionRowIndex;return m?l.parentNode.rows.length-c+1:c}if((g==="TD"||g==="TH")&&l.cellIndex>=0){c=l.cellIndex;return m?l.parentNode.cells.length-c+1:c}if(bu._4!==ct){bu={_4:ct}}var f=(i.uniqueID)+"-"+g,d=bu[f];if(!d){d={};var c=0,a=i.firstChild;while(a){if(j?a.nodeName===g:a.nodeName>"@"){d[a.uniqueID]=++c}a=a.nextSibling}d.length=c;bu[f]=d}c=d[l.uniqueID];return m?d.length-c+1:c};h._c=function(a){a=a.firstChild;while(a){if(a.nodeType===3||a.nodeName>"@")return false;a=a.nextSibling}return true};h._a=function(d,c){var a=d.nodeName;c+="Sibling";do{d=d[c];if(d&&d.nodeName===a)break}while(d);return d};var dl={"+":1,"-":-1},dm=/ /g;T=O(O({":nth(-last)?-(?:child|(of-type))\\((<#nth_arg>)\\)(<#filter>)?":function(m,j,i,g,f){g=g.replace(dm,"");var d="IE7._b(e,"+!!j+","+!!i+")";if(g==="even")g="2n";else if(g==="odd")g="2n+1";else if(!isNaN(g))g="0n"+~~g;g=g.split("n");var c=~~(dl[g[0]]||g[0]||1),b=~~g[1];if(c===0){var a=d+"==="+b}else{a="((ii="+d+")-("+b+"))%"+c+"===0&&ii"+(c<0?"<":">")+"="+b}return this.parse(f)+a+"&&"},"<#negation>":function(c,a){if(/:not/i.test(a))bv();if(/^[#.:\[]/.test(a)){a="*"+a}return"!("+D.parse(a).slice(3,-2)+")&&"}},T),{":checked":"e.checked===true&&",":disabled":"e.disabled===true&&",":enabled":"e.disabled===false&&",":last-child":"!"+bE+"&&",":only-child":"!"+ck+"&&!"+bE+"&&",":first-of-type":cs,":last-of-type":bM,":only-of-type":cs+bM,":empty":"IE7._c(e)&&",":root":"e==R&&",":target":"H&&"+cn+"===H&&"});var dn="article,aside,audio,canvas,details,figcaption,figure,footer,header,hgroup,mark,menu,meter,nav,output,progress,section,summary,time,video".split(",");for(var cu=0,cv;cv=dn[cu];cu++)p.createElement(cv);U+="datalist{display:none}details{padding-left:40px;display:block;margin:1em 0}meter,progress{vertical-align:-0.2em;width:5em;height:1em;display:inline-block}progress{width:10em;}article,aside,figcaption,footer,header,hgroup,summary,section,nav{display:block;margin:1em 0}figure{margin:1em 40px;display:block}mark{background:yellow}";h.CSS.addFix(/\bopacity\s*:\s*([\d.]+)/,function(c,a){return"zoom:1;filter:Alpha(opacity="+((a*100)||1)+")"});var D,J=(function(){var o0=/^[>+~]/,bw=false;function dp(f,d,c){f=bZ(f);if(!d)d=p;var a=d;bw=o0.test(f);if(bw){d=d.parentNode;f="*"+f}try{return n.create(f,bw)(d,c?null:[],a)}catch(ex){return c?null:[]}};var dq=/^(\\.|[' >+~#.\[\]:*(),\w-\^|$=]|[^\x00-\xa0])+$/,dE=/^(href|src)$/,cw={"class":"className","for":"htmlFor"},dF=/\sie7_\w+/g,dr=/^(action|cite|codebase|data|dynsrc|href|longdesc|lowsrc|src|usemap|url)$/i;h._0=function(f,d){if(f.getAttributeNode){var c=f.getAttributeNode(d)}d=cw[d.toLowerCase()]||d;if(!c)c=f.attributes[d];var a=c&&c.specified;if(f[d]&&typeof f[d]=="boolean")return d.toLowerCase();if((a&&dr.test(d))||(!c&&E)||d==="value"||d==="type"){return f.getAttribute(d,2)}if(d==="style")return f.style.cssText.toLowerCase()||null;return a?String(c.nodeValue):null};var cx="colSpan,rowSpan,vAlign,dateTime,accessKey,tabIndex,encType,maxLength,readOnly,longDesc";O(cw,cO(cx.toLowerCase().split(","),cx.split(",")));h._1=function(c,a){a+="Sibling";do{c=c[a];if(c&&c.nodeName>"@")break}while(c);return c};var ds=/(^|[, >+~])([#.:\[])/g,dG=/\)\{/g,dt=/,/,dH=/^['"]/,du=/\\([\da-f]{2,2})/gi,dI=/last/i;h._d=function(f,d){var c=f.all[d]||null;if(!c||(c.nodeType&&h._0(c,"id")===d))return c;for(var a=0;a<c.length;a++){if(h._0(c[a],"id")===d)return c[a]}return null};var bb=G.extend({dictionary:new cM({ident:/\-?(\\.|[_a-z]|[^\x00-\xa0])(\\.|[\w-]|[^\x00-\xa0])*/,combinator:/[\s>+~]/,operator:/[\^~|$*]?=/,nth_arg:/[+-]?\d+|[+-]?\d*n(?:\s*[+-]\s*\d+)?|even|odd/,tag:/\*|<#ident>/,id:/#(<#ident>)/,'class':/\.(<#ident>)/,pseudo:/\:([\w-]+)(?:\(([^)]+)\))?/,attr:/\[(<#ident>)(?:(<#operator>)((?:\\.|[^\[\]#.:])+))?\]/,negation:/:not\((<#tag>|<#id>|<#class>|<#attr>|<#pseudo>)\)/,sequence:/(\\.|[~*]=|\+\d|\+?\d*n\s*\+\s*\d|[^\s>+~,\*])+/,filter:/[#.:\[]<#sequence>/,selector:/[^>+~](\\.|[^,])*?/,grammar:/^(<#selector>)((,<#selector>)*)$/}),ignoreCase:true}),dv=new bb({"\\\\.|[~*]\\s+=|\\+\\s+\\d":G.IGNORE,"\\[\\s+":"[","\\(\\s+":"(","\\s+\\)":")","\\s+\\]":"]","\\s*([,>+~]|<#operator>)\\s*":"$1","\\s+$":"","\\s+":" "});function dw(a){a=dv.parse(a.replace(du,"\\x$1")).replace(bz,"$1").replace(ds,"$1*$2");if(!dq.test(a))bv();return a};function dJ(a){return a.replace(cb,dx)};function dx(c,a){return W[a]};var dy=/\{/g,dz=/\\{/g;function bS(a){return Array((a.replace(dz,"").match(dy)||"").length+1).join("}")};T=new bb(T);var v=/:target/i,Z=/:root/i;function S(c){var a="";if(Z.test(c))a+=",R=d.documentElement";if(v.test(c))a+=",H=d.location;H=H&&H.hash.replace('#','')";if(a||c.indexOf("#")!==-1){a=",t=c.nodeType,d=t===9?c:c.ownerDocument||(c.document||c).parentWindow.document"+a}return"var ii"+a+";"};var ba={" ":";while(e!=s&&(e=e.parentNode)&&e.nodeType===1){",">":".parentElement;if(e){","+":";while((e=e.previousSibling)&&!("+cl+"))continue;if(e){","~":";while((e=e.previousSibling)){"+cm},K=/\be\b/g;D=new bb({"(?:(<#selector>)(<#combinator>))?(<#tag>)(<#filter>)?$":function(j,i,g,f,d){var c="";if(f!=="*"){var a=f.toUpperCase();c+="if(e.nodeName==='"+a+(a===f?"":"'||e.nodeName==='"+f)+"'){"}if(d){c+="if("+T.parse(d).slice(0,-2)+"){"}c=c.replace(K,"e"+this.index);if(g){c+="var e=e"+(this.index++)+ba[g];c=c.replace(K,"e"+this.index)}if(i){c+=this.parse(i)}return c}});var L="e0=IE7._d(d,'%1');if(e0){",z="var n=c.getElementsByTagName('%1');",w="if(r==null)return e0;r[k++]=e0;",r=1,A=new bb({"^((?:<#selector>)?(?:<#combinator>))(<#tag>)(<#filter>)?$":true}),s={},q=new bb({"^(<#tag>)#(<#ident>)(<#filter>)?( [^,]*)?$":function(j,i,g,f,d){var c=H(L,g),a="}";if(f){c+=D.parse(i+f);a=bS(c)}if(d){c+="s=c=e0;"+n.parse("*"+d)}else{c+=w}return c+a},"^([^#,]+)#(<#ident>)(<#filter>)?$":function(g,f,d,c){var a=H(L,d);if(f==="*"){a+=w}else{a+=D.parse(f+c)+w+"break"}return a+bS(a)},"^.*$":""}),n=new bb({"<#grammar>":function(k,l,m){if(!this.groups)this.groups=[];var j=A.exec(" "+l);if(!j)bv();this.groups.push(j.slice(1));if(m){return this.parse(m.replace(dt,""))}var i=this.groups,g=i[0][r];for(var c=1;j=i[c];c++){if(g!==j[r]){g="*";break}}var f="",d=w+"continue filtering;";for(var c=0;j=i[c];c++){D.index=0;if(g!=="*")j[r]="*";j=j.join("");if(j===" *"){f=d;break}else{j=D.parse(j);if(bw)j+="if(e"+D.index+"==s){";f+=j+d+bS(j)}}var a=g==="*";return(a?"var n=c.all;":H(z,g))+"filtering:while((e0=n[i++]))"+(a?cm.replace(K,"e0"):"{")+f+"}"},"^.*$":bv}),o=/\&\&(e\d+)\.nodeType===1(\)\{\s*if\(\1\.nodeName=)/g;n.create=function(d){if(!s[d]){d=dw(d);this.groups=null;D.index=0;var c=this.parse(d);this.groups=null;D.index=0;if(d.indexOf("#")!==-1){var a=q.parse(d);if(a){c="if(t===1||t===11|!c.getElementById){"+c+"}else{"+a+"}"}}c=c.replace(o,"$2");c=S(d)+bd(c);s[d]=new Function("return function(c,r,s){var i=0,k=0,e0;"+c+"return r}")()}return s[d]};return dp})();function bv(){throw new SyntaxError("Invalid selector.");};h.loaded=true;(function(){try{if(!p.body)throw"continue";bx.doScroll("left")}catch(ex){setTimeout(arguments.callee,1);return}try{eval(bU.innerHTML)}catch(ex){}if(typeof IE7_PNG_SUFFIX=="object"){bh=IE7_PNG_SUFFIX}else{bh=new RegExp(bY(N.IE7_PNG_SUFFIX||"-trans.png")+"(\\?.*)?$","i")}B=p.body;x=E?B:bx;B.className+=" ie7_body";bx.className+=" ie7_html";if(E)dc();h.CSS.init();h.HTML.init();h.HTML.apply();h.CSS.apply();h.recalc()})()})(this,document);

Added: site-src/trunk/site/js/blank.gif
===================================================================
(Binary files differ)


Property changes on: site-src/trunk/site/js/blank.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: site-src/trunk/site/js/mktree.js
===================================================================
--- site-src/trunk/site/js/mktree.js	                        (rev 0)
+++ site-src/trunk/site/js/mktree.js	2010-08-11 20:26:07 UTC (rev 7108)
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c)2005-2009 Matt Kruse (javascripttoolbox.com)
+ * 
+ * Dual licensed under the MIT and GPL licenses. 
+ * This basically means you can use this code however you want for
+ * free, but don't claim to have written it yourself!
+ * Donations always accepted: http://www.JavascriptToolbox.com/donate/
+ * 
+ * Please do not link to the .js files on javascripttoolbox.com from
+ * your site. Copy the files locally to your server instead.
+ * 
+ */
+eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('I(C,"1a",M);8 I(o,e,f){1(o.J){o.J(e,f,7);5 k}F 1(o.G){5 o.G("15"+e,f)}F{5 7}}8 h(A,P){1(17(C[A])=="18"||C[A]==a){C[A]=P}}8 10(j){2 3=g.B(j);1(3==a){5 7}q(3,p)}8 11(j){2 3=g.B(j);1(3==a){5 7}q(3,y)}8 13(j,b){2 3=g.B(j);1(3==a){5 7}2 z=q(3,p,b);1(z){2 o=g.B(b);1(o.K){o.K(7)}}}8 q(3,x,b){1(!3.6||3.6.i==0){5 7}r(2 c=0;c<3.6.i;c++){2 4=3.6[c];1(b!=a&&4.1i==b){5 k}1(4.n=="Y"){2 m=7;r(2 d=0;d<4.6.i;d++){2 l=4.6[d];1(l.n=="D"){m=k;2 z=q(l,x,b);1(b!=a&&z){4.9=x;5 k}}}1(m&&b==a){4.9=x}}}}8 M(){h("H","1f");h("y","1b");h("p","1c");h("S","1d");h("V","1e");h("L",k);1(L){1(!g.X){5}2 w=g.1h("3");1(w==a){5}2 O=w.i;r(2 u=0;u<O;u++){2 3=w[u];1(3.n=="D"&&3.9==H){E(3)}}}}8 W(){N.R.9=(N.R.9==p)?y:p;5 7}8 U(){5 7}8 E(3){1(!3.6||3.6.i==0){5}2 Q=3.6.i;r(2 c=0;c<Q;c++){2 4=3.6[c];1(4.n=="Y"){2 m=7;2 Z=4.6.i;r(2 d=0;d<Z;d++){2 l=4.6[d];1(l.n=="D"){m=k;E(l)}}2 s=g.X("12");2 t=\'\\1g\';s.9=V;1(m){1(4.9==a||4.9==""){4.9=y}1(4.v.n=="#1k"){t=t+4.v.1l;4.1j(4.v)}s.T=W}F{4.9=S;s.T=U}s.14(g.19(t));4.16(s,4.v)}}}',62,84,'|if|var|ul|item|return|childNodes|false|function|className|null|itemId|itemi|sitemi|||document|setDefault|length|treeId|true|sitem|subLists|nodeName||nodeOpenClass|expandCollapseList|for|||uli|firstChild|uls|cName|nodeClosedClass|ret|name|getElementById|window|UL|processList|else|attachEvent|treeClass|addEvent|addEventListener|scrollIntoView|preProcessTrees|convertTrees|this|uls_length|val|childNodesLength|parentNode|nodeBulletClass|onclick|retFalse|nodeLinkClass|treeNodeOnclick|createElement|LI|itemChildNodesLength|expandTree|collapseTree|SPAN|expandToItem|appendChild|on|insertBefore|typeof|undefined|createTextNode|load|liClosed|liOpen|liBullet|bullet|mktree|u00A0|getElementsByTagName|id|removeChild|text|nodeValue'.split('|'),0,{}))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
This SF.net email is sponsored by 

Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev 
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 7110
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=7110&view=rev
Author:   uckelman
Date:     2010-08-11 20:36:17 +0000 (Wed, 11 Aug 2010)

Log Message:
-----------
Added server status page.

Added Paths:
-----------
    site-src/trunk/site/css/status.css
    site-src/trunk/site/js/status.js
    site-src/trunk/site/status.php

Added: site-src/trunk/site/css/status.css
===================================================================
--- site-src/trunk/site/css/status.css	                        (rev 0)
+++ site-src/trunk/site/css/status.css	2010-08-11 20:36:17 UTC (rev 7110)
@@ -0,0 +1,71 @@
+ul.mktree li.liBullet .bullet {
+  background: url(/images/user-icon.png) center left no-repeat;
+}
+
+.tab_menu {
+  border-bottom: 1px solid #ccc;
+  margin: 0 auto;
+  padding-bottom: 19px;
+  padding-left: 10px;
+}
+
+.tab_menu ul, .tab_menu li  {
+  display: inline;
+  list-style-type: none;
+  margin: 0;
+  padding: 0;
+}
+
+.tab_menu a:link, .tab_menu a:visited {
+  background: #E8EBF0;
+  border: 1px solid #ccc;
+  color: #666;
+  float: left;
+  font-size: small;
+  font-weight: normal;
+  line-height: 14px;
+  margin-right: 8px;
+  padding: 2px 10px 2px 10px;
+  text-decoration: none;
+}
+
+.tab_menu img {
+  cursor: pointer;
+  float: right;
+  margin-right: 8px;
+  padding: 2px 10px 2px 10px;
+}
+
+.tab_menu a:link.active, .tab_menu a:visited.active {
+  background: #fff;
+  border-bottom: 1px solid #fff;
+  color: #000;
+}
+
+.tab_menu a:hover {
+  color: #f00;
+}
+
+.tab_menu ul a:hover {
+  color: #f00 !important;
+}
+
+.tab_menu li.showing a {
+  background: #fff;
+  border-bottom: 1px solid #fff;
+  color: #000;
+}
+
+.tab_contents {
+  background: #fff;
+  border: 1px solid #ccc;
+  border-top: none;
+  clear: both;
+  margin: 0 auto;
+  padding: 15px;
+}
+
+.status_box {
+  margin: 2em auto 1em auto;
+  width: 30em;
+}

Added: site-src/trunk/site/js/status.js
===================================================================
--- site-src/trunk/site/js/status.js	                        (rev 0)
+++ site-src/trunk/site/js/status.js	2010-08-11 20:36:17 UTC (rev 7110)
@@ -0,0 +1,23 @@
+function treeToggle() {
+  var toggle = document.getElementById("toggle");
+
+  if (toggle.src.match("/green-plus.png$")) {
+    expandTree("stree");
+    toggle.src = "/images/green-minus.png";
+    toggle.alt = "Collapse";
+  }
+  else {
+    collapseTree("stree");
+    expandToItem("stree", "first_module");
+    toggle.src = "/images/green-plus.png";
+    toggle.alt = "Expand";
+  }
+}
+
+window.onload = function() {
+  // pop open the tree to the module level
+  expandToItem("stree", "first_module");
+
+  // hook up the expand/collapse button
+  document.getElementById("toggle").onclick = treeToggle;
+};

Added: site-src/trunk/site/status.php
===================================================================
--- site-src/trunk/site/status.php	                        (rev 0)
+++ site-src/trunk/site/status.php	2010-08-11 20:36:17 UTC (rev 7110)
@@ -0,0 +1,180 @@
+<?php echo '<?xml version="1.0" encoding="UTF-8"?>' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head profile="http://www.w3.org/2005/10/profile">
+  <link rel="stylesheet" type="text/css" href="/css/style.css"/>
+  <link rel="stylesheet" type="text/css" href="/css/site.css"/>
+  <link rel="alternate" type="application/rss+xml" title="RSS" href="/news_rss.php" />
+  <link rel="icon" type="image/png" href="/images/VASSAL.png"/>
+  <title>VASSAL</title>
+
+  <!--[if lte IE 9]>
+    <script src="/js/IE9.js" type="text/javascript">IE7_PNG_SUFFIX=".png";</script>
+  <![endif]-->
+
+  <script type="text/javascript" src="/js/mktree.js"></script>
+  <script type="text/javascript" src="/js/status.js"></script>
+
+  <link rel="stylesheet" type="text/css" href="/css/mktree.css"/>
+  <link rel="stylesheet" type="text/css" href="/css/status.css"/>
+</head>
+<body> 
+<?php include('inc/header.php'); ?>
+
+<div id="content">
+<div class="content_box_full">
+
+<h1>Server Status</h1>
+
+<p>Here you can see which modules are being used with the game server at present, and which modules have been used in the past day, week, and month.</p>
+
+<div class="status_box">
+<ul class="tab_menu">
+
+<?php
+
+$when = isset($_GET['when']) ? $_GET['when'] : 'current';
+
+switch ($when) {
+case 'current':
+  echo <<<END
+  <li class="showing"><a href="?when=current">Current</a></li>
+  <li><a href="?when=day">Day</a></li>
+  <li><a href="?when=week">Week</a></li>
+  <li><a href="?when=month">Month</a></li>
+END;
+  break;
+case 'day':
+  echo <<<END
+  <li><a href="?when=current">Current</a></li>
+  <li class="showing"><a href="?when=day">Day</a></li>
+  <li><a href="?when=week">Week</a></li>
+  <li><a href="?when=month">Month</a></li>
+END;
+  break;
+case 'week':
+  echo <<<END
+  <li><a href="?when=current">Current</a></li>
+  <li><a href="?when=day">Day</a></li>
+  <li class="showing"><a href="?when=week">Week</a></li>
+  <li><a href="?when=month">Month</a></li>
+END;
+  break;
+case 'month':
+  echo <<<END
+  <li><a href="?when=current">Current</a></li>
+  <li><a href="?when=day">Day</a></li>
+  <li><a href="?when=week">Week</a></li>
+  <li class="showing"><a href="?when=month">Month</a></li>
+END;
+  break;
+default:
+  throw new ErrorException('Unrecognized when: ' . $when);
+}
+  
+?>
+<li><img id="toggle" src="/images/green-plus.png" alt="Expand"/></li>
+</ul>
+<div class="tab_contents">
+<ul class="mktree" id="stree">
+
+<?php
+
+# connect to the SQL server
+require_once('util/vserver-config.php');
+
+$dbh = mysql_connect(SQL_HOST, SQL_USERNAME, SQL_PASSWORD);
+if (!$dbh) {
+  throw new ErrorException('Cannot connect to MySQL server: ' . mysql_error());
+}
+
+if (!mysql_select_db(SQL_DB, $dbh)) {
+  throw new ErrorException('Cannot select database: ' . mysql_error());
+}
+
+$query = 'SELECT module_name, game_room, player_name FROM connections ';
+
+switch ($when) {
+case 'current':
+  # get the set of rows having the most recent timestamp
+  $query .= 'WHERE time = (SELECT MAX(time) FROM connections) ';
+  break;
+case 'day':
+  $query .= 'WHERE DATEDIFF(NOW(), time) <= 1 ';
+  break;
+case 'week':
+  $query .= 'WHERE DATEDIFF(NOW(), time) <= 7 '; 
+  break;
+case 'month':
+  $query .= 'WHERE DATEDIFF(NOW(), time) <= 30 ';
+  break;
+default:
+  throw new ErrorException('Unrecognized when: ' . $when);
+}
+
+$query .= 'ORDER BY module_name, game_room, player_name';
+
+$r = mysql_query($query, $dbh);
+if (!$r) {
+  throw new ErrorException('SELECT failed: ' . mysql_error());
+}
+
+$tree = array();
+
+while (($row = mysql_fetch_row($r))) {
+  $tree[$row[0]][$row[1]][] = $row[2]; 
+}
+
+# NB: root is liClosed to prevent the tree from being
+# rendered as expanded before all the parts are loaded
+echo sprintf(
+  "<li id=\"root\" class=\"liClosed\">VASSAL (%d)\n",
+  mysql_num_rows($r)
+);
+
+echo ' <ul>', "\n";
+
+$first = true;
+foreach ($tree as $module => $rooms) {
+  echo sprintf(
+    " <li%s>%s (%d)\n",
+    $first ? ' id="first_module"' : '',
+    htmlspecialchars($module, ENT_QUOTES),
+    count($rooms, COUNT_RECURSIVE) - count($rooms)
+  );
+  echo '  <ul>', "\n";
+
+  $first = false;
+
+  foreach ($rooms as $room => $players) {
+    echo sprintf(
+      "   <li>%s (%d)\n",
+      htmlspecialchars($room, ENT_QUOTES),
+      count($players)
+    );
+    echo '    <ul>', "\n";
+
+    foreach ($players as $player) {
+      echo '     <li>', htmlspecialchars($player, ENT_QUOTES), "</li>\n";
+    }
+
+    echo '    </ul>', "\n";
+    echo '   </li>', "\n";
+  }
+
+  echo '  </ul>', "\n";
+  echo ' </li>', "\n";
+}
+?>
+
+</ul>
+</li>
+</ul>
+</div>
+</div>
+</div>
+</div>
+
+<?php include('inc/footer.shtml'); ?>
+</body>
+</html>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
This SF.net email is sponsored by 

Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev 
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 7112
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=7112&view=rev
Author:   uckelman
Date:     2010-08-12 20:36:41 +0000 (Thu, 12 Aug 2010)

Log Message:
-----------
Connected news submission form to phpns.

Modified Paths:
--------------
    site-src/trunk/site/news_submit.php

Added Paths:
-----------
    site-src/trunk/site/util/newsbot-config.php.example

Modified: site-src/trunk/site/news_submit.php
===================================================================
--- site-src/trunk/site/news_submit.php	2010-08-12 14:02:26 UTC (rev 7111)
+++ site-src/trunk/site/news_submit.php	2010-08-12 20:36:41 UTC (rev 7112)
@@ -11,11 +11,10 @@
   exit;
 }
 
-$key = $_COOKIE['VASSAL_login'];
+$key = isset($_COOKIE['VASSAL_login']) ? $_COOKIE['VASSAL_login'] : '';
 
-# sanitize the input
-$headline = addslashes($_POST['headline']);
-$text = addslashes($_POST['text']);
+$headline = isset($_POST['headline']) ? $_POST['headline'] : '';
+$text = isset($_POST['text']) ? $_POST['text'] : '';
 
 try {
   # check for blank headline
@@ -38,16 +37,10 @@
   $auth = new AuthDB();
   $username = $auth->user_for_cookie($key);
 
+  submit_story($username, $headline, $text);
 
-  require_once('sso/NewsDB.php');
-
-  $news = new NewsDB();
-
-  $query = "INSERT INTO news (headline, text) VALUES ('$headline', '$text')";
-  $news->write($query);
-
   print_top($title);
-  echo '<p>Item submitted.</p>';
+  echo '<p>Your news item has been submitted. It will appear in the news feed after approval by the news editor.</p>';
   print_bottom();
   exit;
 }
@@ -83,5 +76,105 @@
 END;
 }
 
+#
+# This is a shim for submitting items to phpns
+#
+function submit_story($username, $headline, $text) {
+  $ch = curl_init();
 
+  $cfile = tempnam('/tmp', 'cookies');
+
+  # login
+  $url = 'http://localhost/news/login.php?do=p';
+
+  require_once('util/newsbot-config.php');
+
+  $data = array(
+    'username' => NEWSBOT_USERNAME,
+    'password' => NEWSBOT_PASSWORD,
+    'remember' => 0
+  );
+
+  curl_setopt_array($ch, array(
+    CURLOPT_URL            => $url,
+    CURLOPT_HEADER         => false,  # don't need it
+    CURLOPT_RETURNTRANSFER => true,   # prevent printing
+    CURLOPT_COOKIEJAR      => $cfile,
+    CURLOPT_POST           => true,
+    CURLOPT_POSTFIELDS     => $data,
+    CURLOPT_FOLLOWLOCATION => false   # 302 is expected result
+  ));
+
+  curl_exec($ch);
+  if (curl_errno($ch) != 0) {
+    throw new ErrorException('curl: ' . curl_error($ch));
+  }
+  
+  # phpns redirects to index.php on success, so check for 302
+  $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+  if ($code != 302) {
+    throw new ErrorException("login failed: $code");
+  }
+
+  # post an article
+  $url = 'http://localhost/news/article.php?do=p';
+
+  $data = array(
+    'article_title'    => $headline,
+#    'article_subtitle' => '',
+    'article_cat'      => 'all',
+    'article_text'     => $text,
+#    'article_exptext'  => '',
+#    'image'            => '',
+#    'start_date'       => '',
+#    'end_date'         => '',
+#    'acchecked'        => '0',
+#    'achecked'         => '0',
+  );
+
+  curl_setopt_array($ch, array(
+    CURLOPT_URL            => $url,
+    CURLOPT_HEADER         => false,  # don't need it
+    CURLOPT_RETURNTRANSFER => true,
+    CURLOPT_COOKIEFILE     => $cfile,
+    CURLOPT_POST           => true,
+    CURLOPT_POSTFIELDS     => $data,
+    CURLOPT_FOLLOWLOCATION => false
+  ));
+
+  $result = curl_exec($ch);
+  if (curl_errno($ch) != 0) {
+    throw new ErrorException('curl: ' . curl_error($ch));
+  }
+
+  # check that posting succeeded 
+  if (strpos($result, 'Article Success') === false) {
+    throw new ErrorException('posting failed');
+  }
+
+  # logout
+  $url = 'http://localhost/news/login.php?do=logout';
+
+  curl_setopt_array($ch, array(
+    CURLOPT_URL            => $url,
+    CURLOPT_HEADER         => false,  # don't need it
+    CURLOPT_RETURNTRANSFER => true,
+    CURLOPT_COOKIEFILE     => $cfile,
+    CURLOPT_HTTPGET        => true,
+    CURLOPT_FOLLOWLOCATION => false   # 302 is expected result
+  ));
+
+  $result = curl_exec($ch);
+  if (curl_errno($ch) != 0) {
+    throw new ErrorException('curl: ' . curl_error($ch));
+  }
+
+  # cleanup
+  if (!unlink($cfile)) {
+    die("failed to delete $cfile");
+  }
+
+  curl_close($ch);
+}
+
 ?>

Added: site-src/trunk/site/util/newsbot-config.php.example
===================================================================
--- site-src/trunk/site/util/newsbot-config.php.example	                        (rev 0)
+++ site-src/trunk/site/util/newsbot-config.php.example	2010-08-12 20:36:41 UTC (rev 7112)
@@ -0,0 +1,7 @@
+<?php
+
+# constants used by news bot
+define('NEWSBOT_USERNAME', 'news_bot');
+define('NEWSBOT_PASSWORD', 'password');
+
+?>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
This SF.net email is sponsored by 

Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev 
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 7113
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=7113&view=rev
Author:   uckelman
Date:     2010-08-12 21:06:43 +0000 (Thu, 12 Aug 2010)

Log Message:
-----------
Added news submission link to front page.

Modified Paths:
--------------
    site-src/trunk/site/css/style.css
    site-src/trunk/site/index.php

Modified: site-src/trunk/site/css/style.css
===================================================================
--- site-src/trunk/site/css/style.css	2010-08-12 20:36:41 UTC (rev 7112)
+++ site-src/trunk/site/css/style.css	2010-08-12 21:06:43 UTC (rev 7113)
@@ -157,12 +157,20 @@
 	margin: 0 0.5em 1em 0;
 }
 
-.news-nav {
-  float: right;
+#news-nav {
   clear: both;
   margin: 0 0 1em 0;
+  padding: 0.5em 0 0 0;
 }
 
+#news-submit {
+  float: left;
+}
+
+#news-more {
+  float: right;
+}
+
 div.date:first-line {
   font-size: 70%;
 }

Modified: site-src/trunk/site/index.php
===================================================================
--- site-src/trunk/site/index.php	2010-08-12 20:36:41 UTC (rev 7112)
+++ site-src/trunk/site/index.php	2010-08-12 21:06:43 UTC (rev 7113)
@@ -74,8 +74,14 @@
       <?php include('inc/headlines.php'); ?>
       </ul>
 
-      <div class="news-nav">
-        <em><a href="/news.php">...more news</a></em>
+      <div id="news-nav">
+        <div id="news-submit">
+          <em><a href="/news_submit.php">Submit News</a></em>
+        </div>
+  
+        <div id="news-more">
+          <em><a href="/news.php">&hellip;more news</a></em>
+        </div>
       </div>
     </div>
   </div>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
This SF.net email is sponsored by 

Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev 
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 7172
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=7172&view=rev
Author:   uckelman
Date:     2010-09-05 20:40:12 +0000 (Sun, 05 Sep 2010)

Log Message:
-----------
phpBB doesn't like single quotes in passwords, so we don't let users enter them.

Modified Paths:
--------------
    site-src/trunk/site/modify.php
    site-src/trunk/site/register.php

Modified: site-src/trunk/site/modify.php
===================================================================
--- site-src/trunk/site/modify.php	2010-09-05 19:25:53 UTC (rev 7171)
+++ site-src/trunk/site/modify.php	2010-09-05 20:40:12 UTC (rev 7172)
@@ -27,9 +27,10 @@
   }
 
   # sanitize the input
-  $password = isset($_POST['password']) ? addslashes($_POST['password']) : '';
+  $password = isset($_POST['password']) ? $_POST['password'] : '';
   $retype_password = isset($_POST['retype_password']) ?
-                           addslashes($_POST['retype_password']) : '';
+                           $_POST['retype_password'] : '';
+
   $email = isset($_POST['email']) ? addslashes($_POST['email']) : '';
   $retype_email = isset($_POST['retype_email']) ?
                         addslashes($_POST['retype_email']) : '';
@@ -58,6 +59,11 @@
       throw new ErrorException(
         'Password must be no more than 128 characters long.');
     }
+
+     # reject passwords with problematic characters
+    if (preg_match('/[\']/', $password)) {
+      throw new ErrorException('Password must not contain single quotes.');
+    }
   }
 
   # check for email mismatch
@@ -69,11 +75,6 @@
   $attr = array();
 
   if (!empty($password)) {
-    # check password strength
-    if (strlen($password) < 6) {
-      throw new ErrorException('Password must be at least 6 characters long.');
-    }
-
     $attr['userPassword'] = $password;
   }
 
@@ -116,7 +117,7 @@
     # send confirmation email
     $subject = 'vassalengine.org email address confirmation';
     $message = <<<END
-Someone claiming to be "$realname", probably you, from IP address {$_SERVER['REMOTE_ADDR']}, has attempted to register the account "$username" with this email address at vassalengine.org.
+Someone claiming to be "$realname", probably you, from IP address {$_SERVER['REMOTE_ADDR']}, has attempted to associate the account "$username" at vassalengine.org with this email address.
 
 To confirm this email address, simply reply to this message, or open this link in your browser:
 

Modified: site-src/trunk/site/register.php
===================================================================
--- site-src/trunk/site/register.php	2010-09-05 19:25:53 UTC (rev 7171)
+++ site-src/trunk/site/register.php	2010-09-05 20:40:12 UTC (rev 7172)
@@ -15,9 +15,11 @@
 
 # sanitize the input
 $username = isset($_POST['username']) ? addslashes($_POST['username']) : '';
-$password = isset($_POST['password']) ? addslashes($_POST['password']) : '';
+
+$password = isset($_POST['password']) ? $_POST['password'] : '';
 $retype_password = isset($_POST['retype_password']) ?
-                         addslashes($_POST['retype_password']) : '';
+                         $_POST['retype_password'] : '';
+
 $email = isset($_POST['email']) ? addslashes($_POST['email']) : '';
 $retype_email = isset($_POST['retype_email']) ?
                       addslashes($_POST['retype_email']) : '';
@@ -76,6 +78,12 @@
       'Password must be no more than 128 characters long.');
   }
 
+  # reject passwords with problematic characters
+  if (preg_match('/[\']/', $password)) {
+    unset($_POST['password'], $_POST['retype_password']);
+    throw new ErrorException('Password must not contain single quotes.');
+  }
+
   # check for blank email
   if (empty($email)) {
     unset($_POST['email'], $_POST['retype_email']);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
This SF.net Dev2Dev email is sponsored by:

Show off your parallel programming skills.
Enter the Intel(R) Threading Challenge 2010.
http://p.sf.net/sfu/intel-thread-sfd
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 7300
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=7300&view=rev
Author:   uckelman
Date:     2010-10-07 11:50:44 +0000 (Thu, 07 Oct 2010)

Log Message:
-----------
* Renamed dlbutton class to roadsign.
* Updated donation button to use vassalengine.org PayPal account.

Modified Paths:
--------------
    site-src/trunk/site/css/style.css
    site-src/trunk/site/donate.php
    site-src/trunk/site/index.php

Modified: site-src/trunk/site/css/style.css
===================================================================
--- site-src/trunk/site/css/style.css	2010-10-06 21:51:40 UTC (rev 7299)
+++ site-src/trunk/site/css/style.css	2010-10-07 11:50:44 UTC (rev 7300)
@@ -69,7 +69,7 @@
 
 /* Front page */
 
-div.dlbutton {
+div.roadsign {
   padding: 1em;
   margin: 1em auto;
   border: 1px solid #8dea34;
@@ -84,33 +84,59 @@
   text-align: center;
 }
 
-div.dlbutton a {
+div.roadsign a {
   display: block;
   overflow: auto;
   color: white;
   text-decoration: none;
 }
 
-div.dlbutton a:hover {
+div.roadsign a:hover {
   color: white;
   text-decoration: none;
 }
 
-div.dlbutton a span {
+div.roadsign a span {
   display: inline-block;
   vertical-align: middle;
   text-align: center;
   padding: 12px;
 }
 
-div.dlbutton a:hover span {
+div.roadsign a:hover span {
   text-decoration: underline;
 }
 
-div.dlbutton a img {
+div.roadsign a img {
   vertical-align: middle;
 }
 
+div.roadsign form span {
+  display: inline-block;
+  vertical-align: middle;
+  text-align: center;
+  padding: 12px;
+}
+
+form#donate button[type="submit"] img {
+  vertical-align: middle;
+}
+
+form#donate button[type="submit"] {
+  border: 0;
+  margin: 0;
+  padding: 0;
+  background-color: transparent;
+  font-family: sans-serif;
+  font-weight: bold;
+  font-size: 100%;
+  color: white;
+}
+
+form#donate button[type="submit"]:hover span {
+  text-decoration: underline;
+}
+
 table.screenshot {
   margin: 0 auto;
 }

Modified: site-src/trunk/site/donate.php
===================================================================
--- site-src/trunk/site/donate.php	2010-10-06 21:51:40 UTC (rev 7299)
+++ site-src/trunk/site/donate.php	2010-10-07 11:50:44 UTC (rev 7300)
@@ -16,8 +16,16 @@
    
     <p><acronym>Vassal</acronym> is free, open-source software, created by volunteers. While <acronym>Vassal</acronym> is free, development and hosting are not. If you enjoy using <acronym>Vassal</acronym>, please consider helping us with these costs.</p>
 
-    <div class="dlbutton">
-      <a href="https://www.paypal.com/us/cgi-bin/webscr?cmd=_flow&amp;SESSION=gS5hJbXNrYzfhrwcaHyrBsSqND22MpcGz07W_M7D94YX9wq1CFH4rbdTb7e&amp;dispatch=5885d80a13c0db1fa798f5a5f5ae42e779d4b5655493f6171509c5b2ec019b86"><span>Support <acronym>Vassal</acronym></span><img src="/images/paypal_donate.png" alt="PayPal" /></a>
+    <div class="roadsign">
+      <form id="donate" action="https://www.paypal.com/cgi-bin/webscr" method="post">
+        <button type="submit" name="submit">
+          <span>Support <acronym>Vassal</acronym></span>
+          <img src="https://www.paypal.com/en_GB/i/btn/btn_donate_LG.gif" alt="Donate"/>
+        </button>
+        <input type="hidden" name="cmd" value="_s-xclick"/>
+        <input type="hidden" name="hosted_button_id" value="Y584SZ4XBMGW6"/>
+        <img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1"/>
+      </form>
     </div>
 
     <p>Have you ever wondered just how much effort we've put into <acronym>Vassal</acronym>? Have a look a this project cost calculator to get an idea:</p>

Modified: site-src/trunk/site/index.php
===================================================================
--- site-src/trunk/site/index.php	2010-10-06 21:51:40 UTC (rev 7299)
+++ site-src/trunk/site/index.php	2010-10-07 11:50:44 UTC (rev 7300)
@@ -45,7 +45,7 @@
           echo $version;
         ?>.</p> 
 
-      <div class="dlbutton">
+      <div class="roadsign">
         <?php
           include('inc/download-detect.php');
           echo "<a href=\"$download_url\"><span>Download <acronym>Vassal</acronym><br/>$version$download_os</span><img src=\"/images/button.download.png\" alt=\"\" /></a>";
@@ -53,9 +53,18 @@
       </div>
       <p>Or, <a href="/download.php">download <acronym>Vassal</acronym></a> for other operating systems.</p> 
 
-      <div class="dlbutton">
-        <a href="https://www.paypal.com/us/cgi-bin/webscr?cmd=_flow&amp;SESSION=gS5hJbXNrYzfhrwcaHyrBsSqND22MpcGz07W_M7D94YX9wq1CFH4rbdTb7e&amp;dispatch=5885d80a13c0db1fa798f5a5f5ae42e779d4b5655493f6171509c5b2ec019b86"><span>Support <acronym>Vassal</acronym></span><img src="/images/paypal_donate.png" alt="" /></a>
+      <div class="roadsign">
+        <form id="donate" action="https://www.paypal.com/cgi-bin/webscr" method="post">
+          <button type="submit" name="submit">
+            <span>Support <acronym>Vassal</acronym></span>
+            <img src="https://www.paypal.com/en_GB/i/btn/btn_donate_LG.gif" alt="Donate"/>
+          </button>
+          <input type="hidden" name="cmd" value="_s-xclick"/>
+          <input type="hidden" name="hosted_button_id" value="Y584SZ4XBMGW6"/>
+          <img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1"/>
+        </form>
       </div>
+
       <p><acronym>Vassal</acronym> is free, but development and hosting are not. If you enjoy using <acronym>Vassal</acronym>, please consider helping us with these costs.</p>
     </div>
   


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1,  ECMAScript5, and DOM L2 & L3.
Spend less time writing and  rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn

Revision: 7686
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=7686&view=rev
Author:   uckelman
Date:     2011-06-25 16:33:43 +0000 (Sat, 25 Jun 2011)

Log Message:
-----------
Added IRC page.

Modified Paths:
--------------
    site-src/trunk/site/css/style.css
    site-src/trunk/site/inc/navigation.shtml

Added Paths:
-----------
    site-src/trunk/site/irc.php

Modified: site-src/trunk/site/css/style.css
===================================================================
--- site-src/trunk/site/css/style.css	2011-06-25 16:29:03 UTC (rev 7685)
+++ site-src/trunk/site/css/style.css	2011-06-25 16:33:43 UTC (rev 7686)
@@ -236,3 +236,18 @@
   color: blue;
 }
 
+/* IRC */
+
+#irc-container {
+  width: 50em;
+  height: 50em;
+  margin: 3em auto 0em auto;
+  border: 1px solid #222222;
+  padding: 1px;
+}
+
+#irc-widget {
+  width: 50em; 
+  height: 50em;   
+}
+

Modified: site-src/trunk/site/inc/navigation.shtml
===================================================================
--- site-src/trunk/site/inc/navigation.shtml	2011-06-25 16:29:03 UTC (rev 7685)
+++ site-src/trunk/site/inc/navigation.shtml	2011-06-25 16:33:43 UTC (rev 7686)
@@ -7,6 +7,7 @@
     <li><a href="/wiki/">Wiki</a></li>
     <li><a href="/tracker/">Tracker</a></li>
     <li><a href="/news.php">News</a></li>
+    <li><a href="/irc.php">Chat</a></li>
     <li><a href="/help.php">Help</a></li>
   </ul>
 </div>

Added: site-src/trunk/site/irc.php
===================================================================
--- site-src/trunk/site/irc.php	                        (rev 0)
+++ site-src/trunk/site/irc.php	2011-06-25 16:33:43 UTC (rev 7686)
@@ -0,0 +1,34 @@
+<?php echo '<?xml version="1.0" encoding="UTF-8"?>' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head profile="http://www.w3.org/2005/10/profile">
+  <link rel="stylesheet" type="text/css" href="/css/style.css"/>
+  <link rel="stylesheet" type="text/css" href="/css/site.css"/>
+  <link rel="icon" type="image/png" href="/images/VASSAL.png"/>
+  <title>VASSAL on IRC</title>
+</head>
+<body>
+<?php include('/var/www/html/inc/header.php'); ?>
+
+<div id="content">
+  <div id="content_box_full">
+    <h1>#vassal IRC</h1>
+
+    <p>We maintain the #vassal IRC channel at <a href="irc://chat.freenode.net/%23vassal">chat.freenode.net</a> for real-time discussion of <acronym>VASSAL</acronym>, which you can join using your own IRC client or the web-based one below. See <a href="http://www.irchelp.org/irchelp/irctutorial.html">here</a> for a basic guide to IRC.</p>
+
+    <div id="irc-container">
+      <object id="irc-widget" data="http://webchat.freenode.net?channels=vassal&amp;uio=OT10cnVlde" type="text/html"> 
+        <!--[if IE]>
+          <iframe src="http://webchat.freenode.net?channels=vassal&amp;uio=OT10cnVlde" style="width: 50em; height: 50em; border: none;">
+            <p>If you see this message, it means that your browser was unable to display the IRC widget. Please try joining the IRC channel via this <a href="ttp://webchat.freenode.net?channels=vassal&amp;uio=OT10cnVlde">link</a>.</p>
+          </iframe>
+        <![endif]-->
+      </object>
+    </div>
+
+  </div>
+</div>
+
+<?php include('/var/www/html/inc/footer.shtml'); ?>
+</body>
+</html>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a 
definitive record of customers, application performance, security 
threats, fraudulent activity and more. Splunk takes this data and makes 
sense of it. Business sense. IT sense. Common sense.. 
http://p.sf.net/sfu/splunk-d2d-c1
_______________________________________________
vassalengine-svn mailing list
vassalengine-svn@...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn